From 9b61be951af6b15660d6db1dd206a058c33876fa Mon Sep 17 00:00:00 2001 From: cristy Date: Sat, 12 Oct 2013 00:12:52 +0000 Subject: [PATCH] --- MagickCore/attribute.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/MagickCore/attribute.c b/MagickCore/attribute.c index eb349b779..02e7c8c9a 100644 --- a/MagickCore/attribute.c +++ b/MagickCore/attribute.c @@ -672,9 +672,6 @@ MagickExport MagickBooleanType IsImageGray(const Image *image, ImageType type; - MagickBooleanType - status; - register const Quantum *p; @@ -720,11 +717,12 @@ MagickExport MagickBooleanType IsImageGray(const Image *image, if (type == UndefinedType) return(MagickFalse); ((Image *) image)->colorspace=GRAYColorspace; - status=SyncImagePixelCache((Image *) image,exception); + if (SyncImagePixelCache((Image *) image,exception) == MagickFalse) + return(MagickFalse); ((Image *) image)->type=type; if ((type == GrayscaleType) && (image->alpha_trait == BlendPixelTrait)) ((Image *) image)->type=GrayscaleMatteType; - return(status); + return(MagickTrue); } /* @@ -763,9 +761,6 @@ MagickExport MagickBooleanType IsImageMonochrome(const Image *image, ImageType type; - MagickBooleanType - status; - register ssize_t x; @@ -807,9 +802,10 @@ MagickExport MagickBooleanType IsImageMonochrome(const Image *image, if (type == UndefinedType) return(MagickFalse); ((Image *) image)->colorspace=GRAYColorspace; - status=SyncImagePixelCache((Image *) image,exception); + if (SyncImagePixelCache((Image *) image,exception) == MagickFalse) + return(MagickFalse); ((Image *) image)->type=type; - return(status); + return(MagickTrue); } /* -- 2.40.0