From: cristy <urban-warrior@git.imagemagick.org>
Date: Thu, 25 Apr 2013 19:02:42 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~3809
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=95bbc4f227c27c227551d6026f7ecd8d7385b187;p=imagemagick

---

diff --git a/MagickCore/enhance.c b/MagickCore/enhance.c
index 6ede7b5d2..96628b6f8 100644
--- a/MagickCore/enhance.c
+++ b/MagickCore/enhance.c
@@ -1940,7 +1940,7 @@ static inline MagickRealType MagickMin(const MagickRealType x,
 }
 
 MagickExport MagickBooleanType GrayscaleImage(Image *image,
-  const PixelIntensityMethod grayscale,ExceptionInfo *exception)
+  const PixelIntensityMethod method,ExceptionInfo *exception)
 {
 #define GrayscaleImageTag  "Grayscale/Image"
 
@@ -2028,7 +2028,7 @@ MagickExport MagickBooleanType GrayscaleImage(Image *image,
       green=(MagickRealType) GetPixelGreen(image,q);
       blue=(MagickRealType) GetPixelBlue(image,q);
       intensity=0.0;
-      switch (image->intensity)
+      switch (method)
       {
         case AveragePixelIntensityMethod:
         {
@@ -2101,10 +2101,9 @@ MagickExport MagickBooleanType GrayscaleImage(Image *image,
       }
   }
   image_view=DestroyCacheView(image_view);
-  if (SetImageColorspace(image,GRAYColorspace,exception) == MagickFalse)
-    return(MagickFalse);
+  image->intensity=method;
   image->type=GrayscaleType;
-  return(status);
+  return(SetImageColorspace(image,GRAYColorspace,exception));
 }
 
 /*