From 24aed68d3a2f515a1dead133d95a0e51a5ee16ff Mon Sep 17 00:00:00 2001 From: Cristy Date: Sun, 12 Jun 2016 19:42:43 -0400 Subject: [PATCH] https://www.imagemagick.org/discourse-server/viewtopic.php?f=1&t=29895 --- ChangeLog | 4 ++++ MagickCore/pixel-accessor.h | 6 ------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5c440a19b..a89900f1b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2016-06-12 7.0.2-1 Cristy + * Distort no longer converts grayscale image to sRGB (reference + https://www.imagemagick.org/discourse-server/viewtopic.php?f=1&t=29895). + 2016-06-12 7.0.2-0 Cristy * Release ImageMagick version 7.0.2-0, GIT revision 10884:f0e15e8:20160612. diff --git a/MagickCore/pixel-accessor.h b/MagickCore/pixel-accessor.h index a50ad69e1..5cb84490f 100644 --- a/MagickCore/pixel-accessor.h +++ b/MagickCore/pixel-accessor.h @@ -572,9 +572,6 @@ static inline MagickBooleanType IsPixelMonochrome( static inline MagickBooleanType IsPixelInfoGray( const PixelInfo *magick_restrict pixel) { - if ((pixel->colorspace != GRAYColorspace) && - (pixel->colorspace != RGBColorspace)) - return(MagickFalse); if ((AbsolutePixelValue(pixel->red-pixel->green) < MagickEpsilon) && (AbsolutePixelValue(pixel->green-pixel->blue) < MagickEpsilon)) return(MagickTrue); @@ -588,9 +585,6 @@ static inline MagickBooleanType IsPixelInfoMonochrome( green_blue, red_green; - if ((pixel_info->colorspace != GRAYColorspace) && - (pixel_info->colorspace != RGBColorspace)) - return(MagickFalse); if ((AbsolutePixelValue(pixel_info->red) >= MagickEpsilon) || (AbsolutePixelValue(pixel_info->red-QuantumRange) >= MagickEpsilon)) return(MagickFalse); -- 2.40.0