(no commit message)

diff --git a/ImageMagick.spec b/ImageMagick.spec
index aca3344be7a0408aa7baff215ac2aa1f81d36eae..79ea9d17e8906bc774100307223d6c1878e0575d 100644 (file)
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -1,5 +1,5 @@
 %global VERSION  6.6.9
-%global Patchlevel  6
+%global Patchlevel  5
 
 Name:           ImageMagick
 Version:        %{VERSION}

diff --git a/config/configure.xml b/config/configure.xml
index 1f0f67660b16e32b1af77b60e60c03d757a59aeb..361c73c18422d6a8ae84f4726a4a2170848df158 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -9,7 +9,7 @@
   <configure name="NAME" value="ImageMagick"/>
   <configure name="VERSION" value="6.6.9"/>
   <configure name="LIB_VERSION" value="0x669"/>
-  <configure name="LIB_VERSION_NUMBER" value="6,6,9,6"/>
+  <configure name="LIB_VERSION_NUMBER" value="6,6,9,5"/>
   <configure name="SVN_REVISION" value="4226" />
   <configure name="RELEASE_DATE" value="2011-04-14"/>
   <configure name="CONFIGURE" value="./configure "/>

diff --git a/libtool b/libtool
index 84d64fb505ec4b50e5176ccf39f99f144c092e3f..e74ce33df9c92496c0f0a572357bb11d9f8d95b0 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.9-6
+# Generated automatically by config.status (ImageMagick) 6.6.9-5
 # 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/image.c b/magick/image.c
index 9845f85bb4c5bdb62ed3ad122744156e4b9e82e9..f5aaa892283c6def18685878bad56524eb8f1682 100644 (file)
--- a/magick/image.c
+++ b/magick/image.c
@@ -847,6 +847,14 @@ MagickExport Image *CloneImage(const Image *image,const size_t columns,
       clone_image->cache=ReferencePixelCache(image->cache);
       return(clone_image);
     }
+  if ((columns == image->columns) && (rows == image->rows))
+    {
+      if (image->clip_mask != (Image *) NULL)
+        clone_image->clip_mask=CloneImage(image->clip_mask,0,0,MagickTrue,
+          exception);
+      if (image->mask != (Image *) NULL)
+        clone_image->mask=CloneImage(image->mask,0,0,MagickTrue,exception);
+    }
   scale=(MagickRealType) columns/(MagickRealType) image->columns;
   clone_image->page.width=(size_t) floor(scale*image->page.width+0.5);
   clone_image->page.x=(ssize_t) ceil(scale*image->page.x-0.5);

diff --git a/magick/version.h b/magick/version.h
index 7307b40283402e9ec16560032bf1847b48d7e561..3652b9625af5b644a0ef11ef66950de78ab66b58 100644 (file)
--- a/magick/version.h
+++ b/magick/version.h
@@ -31,7 +31,7 @@ extern "C" {
 #define MagickLibVersion  0x669
 #define MagickLibVersionText  "6.6.9"
 #define MagickLibVersionNumber  4,0,1
-#define MagickLibAddendum  "-6"
+#define MagickLibAddendum  "-5"
 #define MagickLibInterface  4
 #define MagickLibMinInterface  4
 #define MagickReleaseDate  "2011-04-14"

diff --git a/version.sh b/version.sh
index 57197d01b16346bcbce4176eb0192bef5db58282..c48505773a53d793e262755b2a86a31eb9d9a3b5 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.9'
 PACKAGE_LIB_VERSION="0x669"
-PACKAGE_RELEASE="6"
+PACKAGE_RELEASE="5"
 PACKAGE_LIB_VERSION_NUMBER="6,6,9,${PACKAGE_RELEASE}"
 PACKAGE_RELEASE_DATE=`date +%F`
 PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION"