(no commit message)

diff --git a/ImageMagick.spec b/ImageMagick.spec
index cfc4752d850e447e9e711d7f0bc8adf363c95b56..eec327900e4add9427944016c852083782b8b173 100644 (file)
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -1,5 +1,5 @@
 %define VERSION  6.5.6
-%define Patchlevel  4
+%define Patchlevel  3
 
 Name:           ImageMagick
 Version:        %{VERSION}

diff --git a/config/configure.xml b/config/configure.xml
index cc1725bbf1b5ca85689ce794b2192d54839e9c6b..124f695c7e7cdde35a96ef6c09ef308f3ab424d6 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,4"/>
+  <configure name="LIB_VERSION_NUMBER" value="6,5,6,3"/>
   <configure name="RELEASE_DATE" value="2009-09-21"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>

diff --git a/libtool b/libtool
index 1b4821b1bd9925ef890464d175614eddf75a953d..7473059fc1a76401f3fa0a77050efa3f7e34871a 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-4
+# Generated automatically by config.status (ImageMagick) 6.5.6-3
 # 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/composite.c b/magick/composite.c
index 8fda479b791c2260022b236d2d4ea43884606a28..f22ffe2ed83a74890547a16a18d7254373bcabf3 100644 (file)
--- a/magick/composite.c
+++ b/magick/composite.c
@@ -1353,6 +1353,8 @@ MagickExport MagickBooleanType CompositeImageChannel(Image *image,
     {
       if (image->matte != MagickFalse)
         break;
+      if (composite_image->matte != MagickFalse)
+        break;
     }
     case CopyCompositeOp:
     {

diff --git a/magick/version.h b/magick/version.h
index 8a2711e55045df370882c4a8259c454a72669f1c..621d8bffdc901c93396aaccaacf4d784cbd00c41 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  "-4"
+#define MagickLibSubversion  "-3"
 #define MagickReleaseDate  "2009-09-21"
 #define MagickChangeDate   "20090921"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"

diff --git a/version.sh b/version.sh
index e32987b66e43b80966dcd7ece7817cc5a58fab1e..c6d29405e813a8560f8800768ef0864e353591a2 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="4"
+PACKAGE_RELEASE="3"
 PACKAGE_LIB_VERSION_NUMBER="6,5,6,${PACKAGE_RELEASE}"
 PACKAGE_RELEASE_DATE=`date +%F`
 PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION"