Replaced calls to SetImageMonochrome and SetImageGray with IsImageMonochrome and...

diff --git a/coders/psd.c b/coders/psd.c
index e0a52b2d7e6d55db4ceb628afe4998d0637b7373..108599026a0d91c4e061bb9304847457a6e9599a 100644 (file)
--- a/coders/psd.c
+++ b/coders/psd.c
@@ -2152,7 +2152,7 @@ static void WriteOneChannel(const PSDInfo *psd_info,const ImageInfo *image_info,
     (void) WriteBlobMSBShort(image,0);
   if (next_image->depth > 8)
     next_image->depth=16;
-  monochrome=SetImageMonochrome(image,exception) && (image->depth == 1) ?
+  monochrome=IsImageMonochrome(image) && (image->depth == 1) ?
     MagickTrue : MagickFalse;
   packet_size=next_image->depth > 8UL ? 2UL : 1UL;
   (void) packet_size;
@@ -2204,7 +2204,7 @@ static MagickBooleanType WriteImageChannels(const PSDInfo *psd_info,
       if (compact_pixels == (unsigned char *) NULL)
         ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed");
     }
-  if (SetImageGray(next_image,exception) != MagickFalse)
+  if (IsImageGray(next_image) != MagickFalse)
     {
       if (next_image->compression == RLECompression)
         {
@@ -2511,7 +2511,7 @@ static MagickBooleanType WritePSDImage(const ImageInfo *image_info,Image *image,
   (void) WriteBlobMSBShort(image,psd_info.version);  /* version */
   for (i=1; i <= 6; i++)
     (void) WriteBlobByte(image, 0);  /* 6 bytes of reserved */
-  if (SetImageGray(image,exception) != MagickFalse)
+  if (IsImageGray(image) != MagickFalse)
     num_channels=(image->alpha_trait != UndefinedPixelTrait ? 2UL : 1UL);
   else
     if (image->storage_class == PseudoClass)
@@ -2526,7 +2526,7 @@ static MagickBooleanType WritePSDImage(const ImageInfo *image_info,Image *image,
   (void) WriteBlobMSBShort(image,(unsigned short) num_channels);
   (void) WriteBlobMSBLong(image,(unsigned int) image->rows);
   (void) WriteBlobMSBLong(image,(unsigned int) image->columns);
-  if (SetImageGray(image,exception) != MagickFalse)
+  if (IsImageGray(image) != MagickFalse)
     {
       MagickBooleanType
         monochrome;
@@ -2534,7 +2534,7 @@ static MagickBooleanType WritePSDImage(const ImageInfo *image_info,Image *image,
       /*
         Write depth & mode.
       */
-      monochrome=SetImageMonochrome(image,exception) && (image->depth == 1) ?
+      monochrome=IsImageMonochrome(image) && (image->depth == 1) ?
         MagickTrue : MagickFalse;
       (void) WriteBlobMSBShort(image,(unsigned short)
         (monochrome != MagickFalse ? 1 : image->depth > 8 ? 16 : 8));
@@ -2561,7 +2561,7 @@ static MagickBooleanType WritePSDImage(const ImageInfo *image_info,Image *image,
           (void) WriteBlobMSBShort(image,CMYKMode);
         }
     }
-  if ((SetImageGray(image,exception) != MagickFalse) ||
+  if ((IsImageGray(image) != MagickFalse) ||
       (image->storage_class == DirectClass) || (image->colors > 256))
     (void) WriteBlobMSBLong(image,0);
   else
@@ -2630,7 +2630,7 @@ static MagickBooleanType WritePSDImage(const ImageInfo *image_info,Image *image,
   while ( next_image != NULL )
   {
     packet_size=next_image->depth > 8 ? 2UL : 1UL;
-    if (SetImageGray(next_image,exception) != MagickFalse)
+    if (IsImageGray(next_image) != MagickFalse)
       num_channels=next_image->alpha_trait != UndefinedPixelTrait ? 2UL : 1UL;
     else
       if (next_image->storage_class == PseudoClass)
@@ -2689,7 +2689,7 @@ static MagickBooleanType WritePSDImage(const ImageInfo *image_info,Image *image,
         packet_size=next_image->depth > 8 ? 2UL : 1UL;
         channel_size=(unsigned int) ((packet_size*next_image->rows*
           next_image->columns)+2);
-        if ((SetImageGray(next_image,exception) != MagickFalse) ||
+        if ((IsImageGray(next_image) != MagickFalse) ||
             (next_image->storage_class == PseudoClass))
           {
              (void) WriteBlobMSBShort(image,(unsigned short)