diff --git a/ImageMagick.spec b/ImageMagick.spec
index 9dd1054..f40e6ac 100644
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -1,5 +1,5 @@
%define VERSION 6.6.0
-%define Patchlevel 1
+%define Patchlevel 0
Name: ImageMagick
Version: %{VERSION}
diff --git a/coders/bmp.c b/coders/bmp.c
index 6324d3e..90f4430 100644
--- a/coders/bmp.c
+++ b/coders/bmp.c
@@ -1145,7 +1145,7 @@
q->blue=ScaleShortToQuantum((unsigned short) blue);
SetOpacityPixelComponent(q,OpaqueOpacity);
if (image->matte != MagickFalse)
- q->opacity=ScaleShortToQuantum((unsigned short) opacity);
+ q->opacity=ScaleShortToQuantum((unsigned short) (65535-opacity));
q++;
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
diff --git a/config/configure.xml b/config/configure.xml
index aea8bd9..6904528 100644
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -8,7 +8,7 @@
<configuremap>
<configure name="NAME" value="ImageMagick"/>
<configure name="LIB_VERSION" value="0x660"/>
- <configure name="LIB_VERSION_NUMBER" value="6,6,0,1"/>
+ <configure name="LIB_VERSION_NUMBER" value="6,6,0,0"/>
<configure name="RELEASE_DATE" value="2010-02-26"/>
<configure name="CONFIGURE" value="./configure "/>
<configure name="PREFIX" value="/usr/local"/>
diff --git a/libtool b/libtool
index 1f16d18..7c00875 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.0-1
+# Generated automatically by config.status (ImageMagick) 6.6.0-0
# 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 cd9e495..950008f 100644
--- a/magick/identify.c
+++ b/magick/identify.c
@@ -201,27 +201,15 @@
" mean: %g (%g)\n standard deviation: %g (%g)\n" \
" kurtosis: %g\n skewness: %g\n"
- double
- maxima,
- mean,
- minima;
-
int
status;
- minima=channel_statistics[channel].minima;
- maxima=channel_statistics[channel].maxima;
- mean=channel_statistics[channel].mean;
- if (channel == AlphaChannel)
- {
- minima=QuantumRange-minima;
- maxima=QuantumRange-maxima;
- mean=QuantumRange-mean;
- }
- status=fprintf(file,StatisticsFormat,name,(Quantum) (scale*minima+0.5),minima/
- (double) QuantumRange,(Quantum) (scale*maxima+0.5),maxima/(double)
- QuantumRange,scale*mean,mean/(double) QuantumRange,scale*
- channel_statistics[channel].standard_deviation,
+ status=fprintf(file,StatisticsFormat,name,(Quantum) (scale*
+ channel_statistics[channel].minima+0.5),channel_statistics[channel].minima/
+ (double) QuantumRange,(Quantum) (scale*channel_statistics[channel].maxima+
+ 0.5),channel_statistics[channel].maxima/(double) QuantumRange,scale*
+ channel_statistics[channel].mean,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);
diff --git a/magick/version.h b/magick/version.h
index 20d9958..ab3a850 100644
--- a/magick/version.h
+++ b/magick/version.h
@@ -30,7 +30,7 @@
#define MagickLibVersion 0x660
#define MagickLibVersionText "6.6.0"
#define MagickLibVersionNumber 3,0,0
-#define MagickLibAddendum "-1"
+#define MagickLibAddendum "-0"
#define MagickLibInterface 3
#define MagickLibMinInterface 3
#define MagickReleaseDate "2010-02-26"
diff --git a/version.sh b/version.sh
index 06c00d2..b61ab6e 100644
--- a/version.sh
+++ b/version.sh
@@ -12,7 +12,7 @@
# PACKAGE_NAME (e.g. "1.0.0").
PACKAGE_VERSION='6.6.0'
PACKAGE_LIB_VERSION="0x660"
-PACKAGE_RELEASE="1"
+PACKAGE_RELEASE="0"
PACKAGE_LIB_VERSION_NUMBER="6,6,0,${PACKAGE_RELEASE}"
PACKAGE_RELEASE_DATE=`date +%F`
PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION"