(no commit message)

diff --git a/ImageMagick.spec b/ImageMagick.spec
index 78be29a36573ad718260e8fa7875716458d19418..d3a89e656ba4bbc67e939bebe9718cc72724150a 100644 (file)
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -1,5 +1,5 @@
 %define VERSION  6.5.5
-%define Patchlevel  9
+%define Patchlevel  8
 
 Name:           ImageMagick
 Version:        %{VERSION}

diff --git a/coders/pdf.c b/coders/pdf.c
index 0bdf59a5d8eefbb7eed16cee3431574599f725c0..8da6eab1f407d6787ff0a4c3adde730dd0a4ce30 100644 (file)
--- a/coders/pdf.c
+++ b/coders/pdf.c
@@ -565,11 +565,10 @@ static Image *ReadPDFImage(const ImageInfo *image_info,ExceptionInfo *exception)
      if (cmyk != MagickFalse)
        delegate_info=GetDelegateInfo("ps:cmyk",(char *) NULL,exception);
      else
-#if defined(MAGICKCORE_PNG_DELEGATE)
-       delegate_info=GetDelegateInfo("ps:alpha",(char *) NULL,exception);
-#else
-       delegate_info=GetDelegateInfo("ps:color",(char *) NULL,exception);
-#endif
+       if (LocaleCompare(image_info->magick,"AI") == 0)
+         delegate_info=GetDelegateInfo("ps:alpha",(char *) NULL,exception);
+       else
+         delegate_info=GetDelegateInfo("ps:color",(char *) NULL,exception);
   if (delegate_info == (const DelegateInfo *) NULL)
     {
       (void) RelinquishUniqueFileResource(postscript_filename);

diff --git a/coders/ps.c b/coders/ps.c
index 948bcce6d90f3e67168d3153148b448cfbb77abe..b12242383ec5ff1264fad82514ef489865729b66 100644 (file)
--- a/coders/ps.c
+++ b/coders/ps.c
@@ -698,11 +698,10 @@ static Image *ReadPSImage(const ImageInfo *image_info,ExceptionInfo *exception)
     if (cmyk != MagickFalse)
       delegate_info=GetDelegateInfo("ps:cmyk",(char *) NULL,exception);
     else
-#if defined(MAGICKCORE_PNG_DELEGATE)
-      delegate_info=GetDelegateInfo("ps:alpha",(char *) NULL,exception);
-#else
-      delegate_info=GetDelegateInfo("ps:color",(char *) NULL,exception);
-#endif
+      if (pages == 1)
+        delegate_info=GetDelegateInfo("ps:alpha",(char *) NULL,exception);
+      else
+        delegate_info=GetDelegateInfo("ps:color",(char *) NULL,exception);
   if (delegate_info == (const DelegateInfo *) NULL)
     {
       (void) RelinquishUniqueFileResource(postscript_filename);

diff --git a/config/configure.xml b/config/configure.xml
index da0939e4f81547d22552f5b330a68f285c6b53b7..78bf1a8fc4e395e5720e46c4f51128ac5c0223a7 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="0x655"/>
-  <configure name="LIB_VERSION_NUMBER" value="6,5,5,9"/>
+  <configure name="LIB_VERSION_NUMBER" value="6,5,5,8"/>
   <configure name="RELEASE_DATE" value="2009-09-08"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>

diff --git a/libtool b/libtool
index 4d9e86bf86a0a8c99b89028afb81701d020683e8..c3c09755e3b838431269b24d1763fb8e53547813 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.5-9
+# Generated automatically by config.status (ImageMagick) 6.5.5-8
 # 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 097d32011f71490b742a67ab8caecbbad4d85f8f..1b17b828bd426a091223a343d74dbcb1fd639f83 100644 (file)
--- a/magick/version.h
+++ b/magick/version.h
@@ -30,7 +30,7 @@ extern "C" {
 #define MagickLibVersion  0x655
 #define MagickLibVersionText  "6.5.5"
 #define MagickLibVersionNumber  2,0,0
-#define MagickLibSubversion  "-9"
+#define MagickLibSubversion  "-8"
 #define MagickReleaseDate  "2009-09-08"
 #define MagickChangeDate   "20090907"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"

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