(no commit message)

diff --git a/ImageMagick.spec b/ImageMagick.spec
index 303d8d0ffbe8c22658b3b796dbe707a876800030..adbe6d2d5ec05ec82ae85924b991839c8cb2c061 100644 (file)
--- 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 6b128297836b52532063bfa6bd59e2ddd9b795ed..def30964d13ecda266dfa61efaf45b59a7c871df 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="0x657"/>
-  <configure name="LIB_VERSION_NUMBER" value="6,5,7,3"/>
+  <configure name="LIB_VERSION_NUMBER" value="6,5,7,2"/>
   <configure name="RELEASE_DATE" value="2009-10-27"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>

diff --git a/libtool b/libtool
index 23e67186cd765395b4cddfdf794ced62be68ad55..f0cc226b8bb8e65a11dce2b4cd54fbd86163114a 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.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 5d87a0a6ae8a71f0dd3f628f29a963fda17e56cd..17ae3d98a3db1b1ef8d0a8a4f5aabaf176648bda 100644 (file)
--- 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 cadc1721bd75d1a74b758bec530d560c8f398d77..52033443b28d4232aa367d895c2e286332b59fb0 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.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 e964769d318c05bcc5ee07149492bd2bf3309bde..924f4e8fb3642f0ac481905cc8ac3bf9247c41b8 100644 (file)
--- 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)) \