(no commit message)

diff --git a/ImageMagick.spec b/ImageMagick.spec
index fe16aee64614fb2c88958d207ccd69c17eb9cb82..86af5cd891b42bef0adcb9ca81ec7881b218796e 100644 (file)
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -1,5 +1,5 @@
 %global VERSION  6.6.5
-%global Patchlevel  7
+%global Patchlevel  6
 
 Name:           ImageMagick
 Version:        %{VERSION}

diff --git a/coders/psd.c b/coders/psd.c
index 6264641dda642eab159912cf322f510758de0c80..7f4ccb682ee6176c7074dcd5bc84a1b7ada1a51d 100644 (file)
--- a/coders/psd.c
+++ b/coders/psd.c
@@ -818,7 +818,8 @@ static Image *ReadPSDImage(const ImageInfo *image_info,ExceptionInfo *exception)
   image->depth=psd_info.depth;
   image->columns=psd_info.columns;
   image->rows=psd_info.rows;
-  if (SetImageBackgroundColor(image) == MagickFalse)
+  if ((image_info->ping != MagickFalse) &&
+      (SetImageBackgroundColor(image) == MagickFalse))
     {
       InheritException(exception,&image->exception);
       image=DestroyImageList(image);

diff --git a/config/configure.xml b/config/configure.xml
index d2b7cbd789a10eb26271384e5d9bbf1947901b8c..9b00a2a1eab91afa3e5f6fcacc5409ca7d00bcd0 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="0x665"/>
-  <configure name="LIB_VERSION_NUMBER" value="6,6,5,7"/>
+  <configure name="LIB_VERSION_NUMBER" value="6,6,5,6"/>
   <configure name="RELEASE_DATE" value="2010-11-05"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>

diff --git a/libtool b/libtool
index 62fe88f196f07faa2bd1f13e2659e8f4527c3bc4..67d8d9a574ef886d720400b78fe0860b1f94071b 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.5-7
+# Generated automatically by config.status (ImageMagick) 6.6.5-6
 # 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 faabfc2b17ac940862cb31ea46326ca423e036ff..50c76f061f07cc71e3dcdafe56bf5e544f428a50 100644 (file)
--- a/magick/version.h
+++ b/magick/version.h
@@ -30,7 +30,7 @@ extern "C" {
 #define MagickLibVersion  0x665
 #define MagickLibVersionText  "6.6.5"
 #define MagickLibVersionNumber  4,0,0
-#define MagickLibAddendum  "-7"
+#define MagickLibAddendum  "-6"
 #define MagickLibInterface  4
 #define MagickLibMinInterface  4
 #define MagickReleaseDate  "2010-11-05"

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