(no commit message)

diff --git a/ImageMagick.spec b/ImageMagick.spec
index 8fce0f6b5acb77970569217742c7fd2a8a0e3103..2bf9570d811f70c76856536736727f629b57b1b5 100644 (file)
--- 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 893dcb8d1b73115c6553be74045912cc1f692fd3..51cdc41f3dc564192a03414f73742034a64189b9 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -8,7 +8,7 @@
 <configuremap>
   <configure name="NAME" value="ImageMagick"/>
   <configure name="LIB_VERSION" value="0x661"/>
-  <configure name="LIB_VERSION_NUMBER" value="6,6,1,7"/>
+  <configure name="LIB_VERSION_NUMBER" value="6,6,1,6"/>
   <configure name="RELEASE_DATE" value="2010-05-07"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>

diff --git a/libtool b/libtool
index 7d3e443bbbf8cfe6bb8c9b8705d09700ec260793..1609b6e23e6ba687c4aa1009cf11ecf4ca21dc05 100755 (executable)
--- 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 20e7cb52967484723499892c4c91fe5be5193ec5..adb132a46cda1b2384f4b8064a98ec081c9153b7 100644 (file)
--- 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 a9a6268c1b754f9c97f1c4a2bbfa2f61ca4f55d9..6473098dfcb4ced1e6a0a45c3b6f4f8d6f7035f0 100644 (file)
--- 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 3ab00f0f514cb0799fb3ff4485efdd08446178f0..eb0d7b5649ac6616e0bd6b2891b93635e629ece2 100644 (file)
--- 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"