From 4ea7c281b70a0e3a24f54d29044595ec6a73141d Mon Sep 17 00:00:00 2001 From: cristy Date: Tue, 27 Oct 2009 13:29:17 +0000 Subject: [PATCH] --- ImageMagick.spec | 2 +- config/configure.xml | 2 +- libtool | 2 +- magick/version.h | 2 +- version.sh | 2 +- wand/mogrify-private.h | 5 ++++- 6 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ImageMagick.spec b/ImageMagick.spec index 303d8d0ff..adbe6d2d5 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,5 +1,5 @@ %define VERSION 6.5.7 -%define Patchlevel 3 +%define Patchlevel 2 Name: ImageMagick Version: %{VERSION} diff --git a/config/configure.xml b/config/configure.xml index 6b1282978..def30964d 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -8,7 +8,7 @@ - + diff --git a/libtool b/libtool index 23e67186c..f0cc226b8 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.7-3 +# Generated automatically by config.status (ImageMagick) 6.5.7-2 # 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 5d87a0a6a..17ae3d98a 100644 --- a/magick/version.h +++ b/magick/version.h @@ -30,7 +30,7 @@ extern "C" { #define MagickLibVersion 0x657 #define MagickLibVersionText "6.5.7" #define MagickLibVersionNumber 2,0,0 -#define MagickLibSubversion "-3" +#define MagickLibSubversion "-2" #define MagickReleaseDate "2009-10-27" #define MagickChangeDate "20091026" #define MagickAuthoritativeURL "http://www.imagemagick.org" diff --git a/version.sh b/version.sh index cadc1721b..52033443b 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.7' PACKAGE_LIB_VERSION="0x657" -PACKAGE_RELEASE="3" +PACKAGE_RELEASE="2" PACKAGE_LIB_VERSION_NUMBER="6,5,7,${PACKAGE_RELEASE}" PACKAGE_RELEASE_DATE=`date +%F` PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION" diff --git a/wand/mogrify-private.h b/wand/mogrify-private.h index e964769d3..924f4e8fb 100644 --- a/wand/mogrify-private.h +++ b/wand/mogrify-private.h @@ -41,7 +41,10 @@ extern "C" { ResetImageOptions(image_info); \ FireImageStack(MagickTrue,advance,MagickTrue); \ if (image != (Image *) NULL) \ - (void) SyncImagesSettings(image_info,image); \ + { \ + InheritException(exception,&(image)->exception); \ + (void) SyncImagesSettings(image_info,image); \ + } \ } #define FireImageStack(postfix,advance,fire) \ if ((j <= i) && (i < argc)) \ -- 2.40.0