From 8fff0088a9cd3575fc189bf7b13bfbefb7ba178c Mon Sep 17 00:00:00 2001 From: Cristy Date: Wed, 7 Jun 2017 14:56:25 -0400 Subject: [PATCH] ... --- MagickCore/enhance.c | 4 ++-- MagickCore/paint.c | 22 +++++++++++++--------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/MagickCore/enhance.c b/MagickCore/enhance.c index 9b9ee7763..713874ad2 100644 --- a/MagickCore/enhance.c +++ b/MagickCore/enhance.c @@ -325,9 +325,9 @@ MagickExport MagickBooleanType ClutImage(Image *image,const Image *clut_image, (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(clut_image != (Image *) NULL); assert(clut_image->signature == MagickCoreSignature); - if( SetImageStorageClass(image,DirectClass,exception) == MagickFalse) + if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse) return(MagickFalse); - if( (IsGrayColorspace(image->colorspace) != MagickFalse) && + if ((IsGrayColorspace(image->colorspace) != MagickFalse) && (IsGrayColorspace(clut_image->colorspace) == MagickFalse)) (void) SetImageColorspace(image,sRGBColorspace,exception); clut_map=(PixelInfo *) AcquireQuantumMemory(MaxMap+1UL,sizeof(*clut_map)); diff --git a/MagickCore/paint.c b/MagickCore/paint.c index a07524dc6..975ca2fbc 100644 --- a/MagickCore/paint.c +++ b/MagickCore/paint.c @@ -916,9 +916,6 @@ MagickExport MagickBooleanType OpaquePaintImage(Image *image, MagickOffsetType progress; - PixelChannelMap - *channel_map; - PixelInfo conform_fill, conform_target, @@ -978,16 +975,23 @@ MagickExport MagickBooleanType OpaquePaintImage(Image *image, GetPixelInfoPixel(image,q,&pixel); if (IsFuzzyEquivalencePixelInfo(&pixel,&conform_target) != invert) { - channel_map=image->channel_map; - if ((channel_map[RedPixelChannel].traits & UpdatePixelTrait) != 0) + PixelTrait + traits; + + traits=GetPixelChannelTraits(image,RedPixelChannel); + if ((traits & UpdatePixelTrait) != 0) SetPixelRed(image,conform_fill.red,q); - if ((channel_map[GreenPixelChannel].traits & UpdatePixelTrait) != 0) + traits=GetPixelChannelTraits(image,GreenPixelChannel); + if ((traits & UpdatePixelTrait) != 0) SetPixelGreen(image,conform_fill.green,q); - if ((channel_map[BluePixelChannel].traits & UpdatePixelTrait) != 0) + traits=GetPixelChannelTraits(image,BluePixelChannel); + if ((traits & UpdatePixelTrait) != 0) SetPixelBlue(image,conform_fill.blue,q); - if ((channel_map[BlackPixelChannel].traits & UpdatePixelTrait) != 0) + traits=GetPixelChannelTraits(image,BlackPixelChannel); + if ((traits & UpdatePixelTrait) != 0) SetPixelBlack(image,conform_fill.black,q); - if ((channel_map[AlphaPixelChannel].traits & UpdatePixelTrait) != 0) + traits=GetPixelChannelTraits(image,AlphaPixelChannel); + if ((traits & UpdatePixelTrait) != 0) SetPixelAlpha(image,conform_fill.alpha,q); } q+=GetPixelChannels(image); -- 2.50.1