(no commit message)

diff --git a/ImageMagick.spec b/ImageMagick.spec
index 95daa8abc4c6c4af4ccd517b650a7fe950e5fa0f..c2669f3c9ba8382ffff9e363c0026d5d734215f5 100644 (file)
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -1,5 +1,5 @@
 %define VERSION  6.6.1
-%define Patchlevel  2
+%define Patchlevel  1
 
 Name:           ImageMagick
 Version:        %{VERSION}

diff --git a/config/configure.xml b/config/configure.xml
index a347ac94962bf07f6e29f0725cd9b9d39e375daa..0493c096942723e1be4c540c59e56fcebb193cbd 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="0x661"/>
-  <configure name="LIB_VERSION_NUMBER" value="6,6,1,2"/>
+  <configure name="LIB_VERSION_NUMBER" value="6,6,1,1"/>
   <configure name="RELEASE_DATE" value="2010-04-07"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>

diff --git a/libtool b/libtool
index fce435f6ed660674c4357e0910c09c5c04e9571b..6b7a4f2d4cb25ba4d45096621056a9831ade2c09 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.1-2
+# Generated automatically by config.status (ImageMagick) 6.6.1-1
 # 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/profile.c b/magick/profile.c
index 66d7560f79da190f8b4a02eb182eba42e161e9aa..0560c27c0b38c22e1d658b0192fcac200e12316d 100644 (file)
--- a/magick/profile.c
+++ b/magick/profile.c
@@ -1001,6 +1001,7 @@ MagickExport MagickBooleanType ProfileImage(Image *image,const char *name,
               if (source_profile == (cmsHPROFILE) NULL)
                 ThrowBinaryException(ResourceLimitError,
                   "ColorspaceColorProfileMismatch",name);
+              target_profile=(cmsHPROFILE) NULL;
             }
           else
             {

diff --git a/magick/version.h b/magick/version.h
index 818adaa532cb418d8922fd549385151aa08fd74f..8c98518ddd9300668f57f639edf57d76a2a1e05b 100644 (file)
--- a/magick/version.h
+++ b/magick/version.h
@@ -30,7 +30,7 @@ extern "C" {
 #define MagickLibVersion  0x661
 #define MagickLibVersionText  "6.6.1"
 #define MagickLibVersionNumber  3,0,0
-#define MagickLibAddendum  "-2"
+#define MagickLibAddendum  "-1"
 #define MagickLibInterface  3
 #define MagickLibMinInterface  3
 #define MagickReleaseDate  "2010-04-07"

diff --git a/version.sh b/version.sh
index f06712c9df1e22534362687354b031e98bdaac42..3db5a94f6f46a48f6563e4bcfc44dacca9396a47 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.1'
 PACKAGE_LIB_VERSION="0x661"
-PACKAGE_RELEASE="2"
+PACKAGE_RELEASE="1"
 PACKAGE_LIB_VERSION_NUMBER="6,6,1,${PACKAGE_RELEASE}"
 PACKAGE_RELEASE_DATE=`date +%F`
 PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION"