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

---

diff --git a/MagickCore/attribute.c b/MagickCore/attribute.c
index 1650fc243..3425fff27 100644
--- a/MagickCore/attribute.c
+++ b/MagickCore/attribute.c
@@ -52,6 +52,7 @@
 #include "MagickCore/colormap.h"
 #include "MagickCore/colormap-private.h"
 #include "MagickCore/colorspace.h"
+#include "MagickCore/colorspace-private.h"
 #include "MagickCore/composite.h"
 #include "MagickCore/composite-private.h"
 #include "MagickCore/constitute.h"
@@ -589,8 +590,7 @@ MagickExport MagickBooleanType IsImageGray(const Image *image,
   if ((image->type == BilevelType) || (image->type == GrayscaleType) ||
       (image->type == GrayscaleMatteType))
     return(MagickTrue);
-  if ((image->colorspace != RGBColorspace) &&
-      (image->colorspace != GRAYColorspace))
+  if (IsRGBColorspace(image->colorspace) == MagickFalse)
     return(MagickFalse);
   type=BilevelType;
   image_view=AcquireCacheView(image);
@@ -674,8 +674,7 @@ MagickExport MagickBooleanType IsImageMonochrome(const Image *image,
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
   if (image->type == BilevelType)
     return(MagickTrue);
-  if ((image->colorspace != RGBColorspace) &&
-      (image->colorspace != GRAYColorspace))
+  if (IsRGBColorspace(image->colorspace) == MagickFalse)
     return(MagickFalse);
   type=BilevelType;
   image_view=AcquireCacheView(image);
diff --git a/MagickCore/colorspace-private.h b/MagickCore/colorspace-private.h
index ac58a0eff..479d7eeb3 100644
--- a/MagickCore/colorspace-private.h
+++ b/MagickCore/colorspace-private.h
@@ -69,7 +69,8 @@ static inline MagickBooleanType IsGrayColorspace(
 static inline MagickBooleanType IsRGBColorspace(const ColorspaceType colorspace)
 {
   if ((IsGrayColorspace(colorspace) != MagickFalse) ||
-      (colorspace == RGBColorspace) || (colorspace == TransparentColorspace))
+      (colorspace == RGBColorspace) || (colorspace == sRGBColorspace) ||
+      (colorspace == TransparentColorspace))
     return(MagickTrue);
   return(MagickFalse);
 }
diff --git a/coders/miff.c b/coders/miff.c
index b50db22c1..fcfa21f7a 100644
--- a/coders/miff.c
+++ b/coders/miff.c
@@ -1209,7 +1209,7 @@ static Image *ReadMIFFImage(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 == GRAYColorspace)
+    if (image->type == GrayscaleType)
       packet_size=quantum_info->depth/8;
     if (image->matte != MagickFalse)
       packet_size+=quantum_info->depth/8;
@@ -1243,7 +1243,7 @@ static Image *ReadMIFFImage(const ImageInfo *image_info,
         if (image->matte != MagickFalse)
           quantum_type=IndexAlphaQuantum;
       }
-    if (image->colorspace == GRAYColorspace)
+    if (image->type == GrayscaleType)
       {
         quantum_type=GrayQuantum;
         if (image->matte != MagickFalse)