(no commit message)

diff --git a/ImageMagick.spec.in b/ImageMagick.spec.in
index 9392b269ec5adddc7931166ab67e10994a59f337..d9945642d260bf6347e5cf6ea66858c3cddec2dc 100644 (file)
--- a/ImageMagick.spec.in
+++ b/ImageMagick.spec.in
@@ -1,5 +1,5 @@
-%define VERSION  @PACKAGE_VERSION@
-%define Patchlevel  @PACKAGE_RELEASE@
+%global VERSION  @PACKAGE_VERSION@
+%global Patchlevel  @PACKAGE_RELEASE@
 
 Name:           @PACKAGE_NAME@
 Version:        %{VERSION}

diff --git a/coders/psd.c b/coders/psd.c
index 722723818e5e272e5a88341b09bb8c3cf9b14c8e..f3d00c59566015d3f8e3261d7b582957b793d070 100644 (file)
--- a/coders/psd.c
+++ b/coders/psd.c
@@ -1670,7 +1670,7 @@ static void WriteOneChannel(const PSDInfo *psd_info,const ImageInfo *image_info,
     (void) WriteBlobMSBShort(image,0);
   if (tmp_image->depth > 8)
     tmp_image->depth=16;
-  monochrome=IsMonochromeImage(image,&image->exception);
+  monochrome=IsMonochromeImage(image,&image->exception) && (image->depth == 1);
   packet_size=tmp_image->depth > 8UL ? 2UL : 1UL;
   quantum_info=AcquireQuantumInfo(image_info,image);
   for (y=0; y < (ssize_t) tmp_image->rows; y++)
@@ -2066,7 +2066,8 @@ static MagickBooleanType WritePSDImage(const ImageInfo *image_info,Image *image)
       /*
         Write depth & mode.
       */
-      monochrome=IsMonochromeImage(image,&image->exception);
+      monochrome=IsMonochromeImage(image,&image->exception) &&
+        (image->depth == 1);
       (void) WriteBlobMSBShort(image,(unsigned short)
         (monochrome != MagickFalse ? 1 : image->depth > 8 ? 16 : 8));
       (void) WriteBlobMSBShort(image,monochrome != MagickFalse ?