From: cristy <urban-warrior@git.imagemagick.org>
Date: Tue, 22 Sep 2009 00:34:01 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~10658
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c34241c52422b780ffcad494551fe4654f965668;p=imagemagick

---

diff --git a/ImageMagick.spec b/ImageMagick.spec
index cfc4752d8..eec327900 100644
--- 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 cc1725bbf..124f695c7 100644
--- 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 1b4821b1b..7473059fc 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.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 8fda479b7..f22ffe2ed 100644
--- 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 8a2711e55..621d8bffd 100644
--- 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 e32987b66..c6d29405e 100644
--- 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"