(no commit message)

diff --git a/ImageMagick.spec b/ImageMagick.spec
index d87ef78cbb2fd4f7c9c9d7285d4744a48fd629c5..b328c52fc09c4e55da9f49e3511a909620a4a5fb 100644 (file)
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -1,5 +1,5 @@
 %define VERSION  6.5.6
-%define Patchlevel  7
+%define Patchlevel  6
 
 Name:           ImageMagick
 Version:        %{VERSION}

diff --git a/coders/jp2.c b/coders/jp2.c
index 9bec9edb40677891cd3d7a39088509845759bc9c..0f61cbc85cccdeb32b9f806ba81f90c9e2cb1a53 100644 (file)
--- a/coders/jp2.c
+++ b/coders/jp2.c
@@ -592,7 +592,7 @@ static Image *ReadJP2Image(const ImageInfo *image_info,ExceptionInfo *exception)
           pixel=(QuantumAny) jas_matrix_getv(pixels[2],x/x_step[2]);
           q->blue=(Quantum) map[2][pixel];
           pixel=(QuantumAny) jas_matrix_getv(pixels[3],x/x_step[3]);
-          q->opacity=(Quantum) map[3][QuantumRange-pixel];
+          q->opacity=(Quantum) map[3][(QuantumAny) (QuantumRange-pixel)];
           q++;
         }
         break;

diff --git a/config/configure.xml b/config/configure.xml
index f229f71ff5eb0c4672c8c3e14e491087316d958d..78fbc0f3153668b8c667da57a2c0ba83a822900f 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="0x656"/>
-  <configure name="LIB_VERSION_NUMBER" value="6,5,6,7"/>
+  <configure name="LIB_VERSION_NUMBER" value="6,5,6,6"/>
   <configure name="RELEASE_DATE" value="2009-09-30"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>

diff --git a/libtool b/libtool
index 07520bfb5c814a8e1bbc9d2e062b144ea97a11d7..715b436c6e90b15dbf56f3123b70895fcdfadbc9 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.5.6-7
+# Generated automatically by config.status (ImageMagick) 6.5.6-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/version.h b/magick/version.h
index 595132ab96f8b0a497103afbf3d5f0b50419ec24..498f11e19ecbfc7e23ea79b6abc6f679386f2160 100644 (file)
--- a/magick/version.h
+++ b/magick/version.h
@@ -30,7 +30,7 @@ extern "C" {
 #define MagickLibVersion  0x656
 #define MagickLibVersionText  "6.5.6"
 #define MagickLibVersionNumber  2,0,0
-#define MagickLibSubversion  "-7"
+#define MagickLibSubversion  "-6"
 #define MagickReleaseDate  "2009-09-30"
 #define MagickChangeDate   "20090925"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"

diff --git a/version.sh b/version.sh
index 024fe647c0ad567ea1f3556c70fb633075cd32d2..0ac1bd130cb856fccc468d5a3039aa8072fc3262 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.5.6'
 PACKAGE_LIB_VERSION="0x656"
-PACKAGE_RELEASE="7"
+PACKAGE_RELEASE="6"
 PACKAGE_LIB_VERSION_NUMBER="6,5,6,${PACKAGE_RELEASE}"
 PACKAGE_RELEASE_DATE=`date +%F`
 PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION"