From 1ab35fb0b10c06730fb3997d82b99ef7c284c7ad Mon Sep 17 00:00:00 2001 From: cristy Date: Fri, 15 Apr 2011 01:25:56 +0000 Subject: [PATCH] --- ImageMagick.spec | 2 +- config/configure.xml | 2 +- libtool | 2 +- magick/image.c | 8 ++++++++ magick/version.h | 2 +- version.sh | 2 +- 6 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ImageMagick.spec b/ImageMagick.spec index aca3344be..79ea9d17e 100644 --- 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 1f0f67660..361c73c18 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -9,7 +9,7 @@ - + diff --git a/libtool b/libtool index 84d64fb50..e74ce33df 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.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 9845f85bb..f5aaa8922 100644 --- 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 7307b4028..3652b9625 100644 --- 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 57197d01b..c48505773 100644 --- 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" -- 2.49.0