From: Cristy Date: Wed, 13 Dec 2017 02:58:31 +0000 (-0500) Subject: ... X-Git-Tag: 7.0.7-15~15 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=15386a0afd008b63c0e189b87bf700d7b2c41d9c;p=imagemagick ... --- diff --git a/MagickCore/color.c b/MagickCore/color.c index 70b553efd..c9f7578ba 100644 --- a/MagickCore/color.c +++ b/MagickCore/color.c @@ -2456,7 +2456,6 @@ MagickExport MagickBooleanType QueryColorCompliance(const char *name, if (LocaleCompare(colorspace,"gray") == 0) { color->colorspace=GRAYColorspace; - color->gamma=1.0; color->green=color->red; color->blue=color->red; if (((flags & SigmaValue) != 0) && diff --git a/MagickCore/pixel.c b/MagickCore/pixel.c index cbea7e582..bb5fc4546 100644 --- a/MagickCore/pixel.c +++ b/MagickCore/pixel.c @@ -2165,7 +2165,6 @@ MagickExport void GetPixelInfo(const Image *image,PixelInfo *pixel) pixel->alpha_trait=UndefinedPixelTrait; pixel->fuzz=0.0; pixel->depth=MAGICKCORE_QUANTUM_DEPTH; - pixel->gamma=1.000/2.200; pixel->red=0.0; pixel->green=0.0; pixel->blue=0.0; @@ -2180,7 +2179,6 @@ MagickExport void GetPixelInfo(const Image *image,PixelInfo *pixel) pixel->alpha_trait=image->alpha_trait; pixel->depth=image->depth; pixel->fuzz=image->fuzz; - pixel->gamma=image->gamma; } /* diff --git a/MagickCore/pixel.h b/MagickCore/pixel.h index 844195b8c..e92d56243 100644 --- a/MagickCore/pixel.h +++ b/MagickCore/pixel.h @@ -191,9 +191,6 @@ typedef struct _PixelInfo black, alpha, index; - - double - gamma; } PixelInfo; typedef struct _PixelPacket diff --git a/coders/gradient.c b/coders/gradient.c index 337b02bb9..9901067b5 100644 --- a/coders/gradient.c +++ b/coders/gradient.c @@ -173,7 +173,6 @@ static Image *ReadGRADIENTImage(const ImageInfo *image_info, image->alpha_trait=stops[0].color.alpha_trait; if (stops[1].color.alpha_trait != UndefinedPixelTrait) image->alpha_trait=stops[1].color.alpha_trait; - image->gamma=MagickMax(stops[0].color.gamma,stops[1].color.gamma); status=GradientImage(image,LocaleCompare(image_info->magick,"GRADIENT") == 0 ? LinearGradient : RadialGradient,PadSpread,stops,2,exception); stops=(StopInfo *) RelinquishMagickMemory(stops);