From c70de514ab2ec97e7c3d4365d137b0dc16386d28 Mon Sep 17 00:00:00 2001 From: cristy Date: Fri, 7 May 2010 23:32:04 +0000 Subject: [PATCH] --- ImageMagick.spec | 2 +- config/configure.xml | 2 +- libtool | 2 +- magick/identify.c | 15 +++++++++++++++ magick/version.h | 2 +- version.sh | 2 +- 6 files changed, 20 insertions(+), 5 deletions(-) diff --git a/ImageMagick.spec b/ImageMagick.spec index 8fce0f6b5..2bf9570d8 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,5 +1,5 @@ %define VERSION 6.6.1 -%define Patchlevel 7 +%define Patchlevel 6 Name: ImageMagick Version: %{VERSION} diff --git a/config/configure.xml b/config/configure.xml index 893dcb8d1..51cdc41f3 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -8,7 +8,7 @@ - + diff --git a/libtool b/libtool index 7d3e443bb..1609b6e23 100755 --- a/libtool +++ b/libtool @@ -1,7 +1,7 @@ #! /bin/sh # libtool - Provide generalized library-building support services. -# Generated automatically by config.status (ImageMagick) 6.6.1-7 +# Generated automatically by config.status (ImageMagick) 6.6.1-6 # Libtool was configured on host magick.imagemagick.org: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # diff --git a/magick/identify.c b/magick/identify.c index 20e7cb529..adb132a46 100644 --- a/magick/identify.c +++ b/magick/identify.c @@ -217,6 +217,21 @@ static int PrintChannelStatistics(FILE *file,const ChannelType channel, int status; + if (channel == AlphaChannel) + { + status=fprintf(file,StatisticsFormat,name,ClampToQuantum(scale* + (QuantumRange-channel_statistics[channel].minima)), + (QuantumRange-channel_statistics[channel].minima)/(double) QuantumRange, + ClampToQuantum(scale*(QuantumRange-channel_statistics[channel].maxima)), + (QuantumRange-channel_statistics[channel].maxima)/(double) QuantumRange, + scale*(QuantumRange-channel_statistics[channel].mean),(QuantumRange- + channel_statistics[channel].mean)/(double) QuantumRange,scale* + channel_statistics[channel].standard_deviation, + channel_statistics[channel].standard_deviation/(double) QuantumRange, + channel_statistics[channel].kurtosis, + channel_statistics[channel].skewness); + return(status); + } status=fprintf(file,StatisticsFormat,name,ClampToQuantum(scale* channel_statistics[channel].minima),channel_statistics[channel].minima/ (double) QuantumRange,ClampToQuantum(scale* diff --git a/magick/version.h b/magick/version.h index a9a6268c1..6473098df 100644 --- a/magick/version.h +++ b/magick/version.h @@ -30,7 +30,7 @@ extern "C" { #define MagickLibVersion 0x661 #define MagickLibVersionText "6.6.1" #define MagickLibVersionNumber 3,0,0 -#define MagickLibAddendum "-7" +#define MagickLibAddendum "-6" #define MagickLibInterface 3 #define MagickLibMinInterface 3 #define MagickReleaseDate "2010-05-07" diff --git a/version.sh b/version.sh index 3ab00f0f5..eb0d7b564 100644 --- a/version.sh +++ b/version.sh @@ -12,7 +12,7 @@ PACKAGE_NAME='ImageMagick' # PACKAGE_NAME (e.g. "1.0.0"). PACKAGE_VERSION='6.6.1' PACKAGE_LIB_VERSION="0x661" -PACKAGE_RELEASE="7" +PACKAGE_RELEASE="6" PACKAGE_LIB_VERSION_NUMBER="6,6,1,${PACKAGE_RELEASE}" PACKAGE_RELEASE_DATE=`date +%F` PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION" -- 2.40.0