From: Cristy <urban-warrior@imagemagick.org>
Date: Sun, 24 Dec 2017 19:26:15 +0000 (-0500)
Subject: -colorspace gray is linear gray
X-Git-Tag: 7.0.7-16~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=817295ff34de3efbea09ff9b993247ab91ba4ea8;p=imagemagick

-colorspace gray is linear gray
---

diff --git a/MagickCore/colorspace.c b/MagickCore/colorspace.c
index 8ee7c7076..77e508a5f 100644
--- a/MagickCore/colorspace.c
+++ b/MagickCore/colorspace.c
@@ -1334,16 +1334,17 @@ MagickExport MagickBooleanType TransformImageColorspace(Image *image,
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
   if (image->colorspace == colorspace)
     return(SetImageColorspace(image,colorspace,exception));
-  if ((image->colorspace == RGBColorspace) &&
-      ((colorspace == GRAYColorspace) || (colorspace == sGRAYColorspace)))
+  (void) DeleteImageProfile(image,"icc");
+  (void) DeleteImageProfile(image,"icm");
+  if (colorspace == GRAYColorspace)
     return(GrayscaleImage(image,Rec709LuminancePixelIntensityMethod,exception));
+  if (colorspace == sGRAYColorspace)
+    return(GrayscaleImage(image,Rec709LumaPixelIntensityMethod,exception));
   if (colorspace == UndefinedColorspace)
     return(SetImageColorspace(image,colorspace,exception));
   /*
     Convert the reference image from an alternate colorspace to sRGB.
   */
-  (void) DeleteImageProfile(image,"icc");
-  (void) DeleteImageProfile(image,"icm");
   if (IssRGBColorspace(colorspace) != MagickFalse)
     return(TransformsRGBImage(image,exception));
   status=MagickTrue;