From: cristy <urban-warrior@git.imagemagick.org>
Date: Mon, 12 Sep 2011 12:01:33 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~7024
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=669e5c729a18317753b086c5ae47899f98a766d4;p=imagemagick

---

diff --git a/MagickCore/attribute.c b/MagickCore/attribute.c
index 54a670cae..abef95646 100644
--- a/MagickCore/attribute.c
+++ b/MagickCore/attribute.c
@@ -589,7 +589,7 @@ MagickExport MagickBooleanType IsImageGray(const Image *image,
   if ((image->type == BilevelType) || (image->type == GrayscaleType) ||
       (image->type == GrayscaleMatteType))
     return(MagickTrue);
-  if (image->colorspace == CMYKColorspace)
+  if ((image->colorspace == sRGB) || (image->colorspace == CMYKColorspace))
     return(MagickFalse);
   type=BilevelType;
   image_view=AcquireCacheView(image);
@@ -673,7 +673,7 @@ MagickExport MagickBooleanType IsImageMonochrome(const Image *image,
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
   if (image->type == BilevelType)
     return(MagickTrue);
-  if (image->colorspace == CMYKColorspace)
+  if ((image->colorspace == sRGB) || (image->colorspace == CMYKColorspace))
     return(MagickFalse);
   type=BilevelType;
   image_view=AcquireCacheView(image);
diff --git a/coders/miff.c b/coders/miff.c
index 5f803340a..b50db22c1 100644
--- a/coders/miff.c
+++ b/coders/miff.c
@@ -1896,8 +1896,7 @@ static MagickBooleanType WriteMIFFImage(const ImageInfo *image_info,
     if ((image->storage_class == PseudoClass) &&
         (image->colors > (size_t) (GetQuantumRange(image->depth)+1)))
       (void) SetImageStorageClass(image,DirectClass,exception);
-    if ((image->colorspace != sRGBColorspace) &&
-        (IsImageGray(image,exception) != MagickFalse))
+    if (IsImageGray(image,exception) != MagickFalse)
       {
         (void) SetImageStorageClass(image,DirectClass,exception);
         (void) SetImageColorspace(image,GRAYColorspace,exception);
@@ -1930,8 +1929,7 @@ static MagickBooleanType WriteMIFFImage(const ImageInfo *image_info,
     packet_size=(size_t) (quantum_info->depth/8);
     if (image->storage_class == DirectClass)
       packet_size=(size_t) (3*quantum_info->depth/8);
-    if ((image->colorspace != sRGBColorspace) &&
-        (IsImageGray(image,exception) != MagickFalse))
+    if (IsImageGray(image,exception) != MagickFalse)
       packet_size=(size_t) (quantum_info->depth/8);
     if (image->matte != MagickFalse)
       packet_size+=quantum_info->depth/8;