From: Cristy <urban-warrior@imagemagick.org>
Date: Sun, 10 Dec 2017 01:27:01 +0000 (-0500)
Subject: ...
X-Git-Tag: 7.0.7-15~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d60778438c241c445ea589a59474750de7bb9a2e;p=imagemagick

...
---

diff --git a/MagickCore/colorspace.c b/MagickCore/colorspace.c
index c281918a2..5a1002f17 100644
--- a/MagickCore/colorspace.c
+++ b/MagickCore/colorspace.c
@@ -1094,14 +1094,14 @@ MagickExport MagickBooleanType SetImageColorspace(Image *image,
   assert(exception->signature == MagickCoreSignature);
   if (image->colorspace == colorspace)
     return(MagickTrue);
+  image->colorspace=colorspace;
   image->rendering_intent=UndefinedIntent;
   image->gamma=1.000/2.200;
   (void) ResetMagickMemory(&image->chromaticity,0,sizeof(image->chromaticity));
   type=image->type;
   if (IsGrayColorspace(colorspace) != MagickFalse)
     {
-      if ((IsRGBColorspace(image->colorspace) != MagickFalse) ||
-          (image->intensity == Rec601LuminancePixelIntensityMethod) ||
+      if ((image->intensity == Rec601LuminancePixelIntensityMethod) ||
           (image->intensity == Rec709LuminancePixelIntensityMethod))
         image->gamma=1.000;
       type=GrayscaleType;
@@ -1126,7 +1126,6 @@ MagickExport MagickBooleanType SetImageColorspace(Image *image,
         image->chromaticity.white_point.y=0.3290;
         image->chromaticity.white_point.z=0.3583;
       }
-  image->colorspace=colorspace;
   status=SyncImagePixelCache(image,exception);
   image->type=type;
   return(status);
@@ -1288,9 +1287,6 @@ MagickExport MagickBooleanType TransformImageColorspace(Image *image,
   if ((image->colorspace == RGBColorspace) && (image->gamma != 1.0) &&
       (colorspace == RGBColorspace))
     return(SetImageColorspace(image,colorspace,exception));
-  if ((image->colorspace == RGBColorspace) && (image->gamma == 1.0) &&
-      (colorspace == GRAYColorspace))
-    return(SetImageColorspace(image,colorspace,exception));
   if (colorspace == UndefinedColorspace)
     return(SetImageColorspace(image,colorspace,exception));
   /*