From 0b55dd38f08fb9f12850e2f7fb5720bc42da1ed6 Mon Sep 17 00:00:00 2001 From: cristy Date: Sun, 13 Jun 2010 19:04:44 +0000 Subject: [PATCH] --- ImageMagick.spec.in | 4 ++-- coders/psd.c | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ImageMagick.spec.in b/ImageMagick.spec.in index 9392b269e..d9945642d 100644 --- 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 722723818..f3d00c595 100644 --- 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 ? -- 2.50.1