From d60778438c241c445ea589a59474750de7bb9a2e Mon Sep 17 00:00:00 2001 From: Cristy Date: Sat, 9 Dec 2017 20:27:01 -0500 Subject: [PATCH] ... --- MagickCore/colorspace.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) 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)); /* -- 2.40.0