From: cristy Date: Fri, 18 May 2012 22:00:53 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~5572 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e9f9aad15d8c5308e27b27a4319dc3b4f87bc196;p=imagemagick --- diff --git a/MagickCore/attribute.c b/MagickCore/attribute.c index 40402149f..aca5e2912 100644 --- a/MagickCore/attribute.c +++ b/MagickCore/attribute.c @@ -690,7 +690,9 @@ MagickExport MagickBooleanType IsImageGray(const Image *image, if ((image->type == BilevelType) || (image->type == GrayscaleType) || (image->type == GrayscaleMatteType)) return(MagickTrue); - if (image->colorspace == CMYKColorspace) + if (IsGrayColorspace(image->colorspace) != MagickFalse) + return(MagickTrue); + if (IssRGBColorspace(image->colorspace) == MagickFalse) return(MagickFalse); type=BilevelType; image_view=AcquireVirtualCacheView(image,exception); @@ -774,7 +776,9 @@ MagickExport MagickBooleanType IsImageMonochrome(const Image *image, (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (image->type == BilevelType) return(MagickTrue); - if (image->colorspace == CMYKColorspace) + if (IsGrayColorspace(image->colorspace) != MagickFalse) + return(MagickTrue); + if (IssRGBColorspace(image->colorspace) == MagickFalse) return(MagickFalse); type=BilevelType; image_view=AcquireVirtualCacheView(image,exception);