...

diff --git a/MagickCore/enhance.c b/MagickCore/enhance.c
index 9b9ee77632449e6f560194a5f509723575a688e4..713874ad2aaba5c2f776d3f418e0efa66dd66f46 100644 (file)
--- 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 a07524dc6c5e5c1b3ebea2c891a214180a26e94c..975ca2fbccf54eba6f06b62683a7a5e5f7d8c1fe 100644 (file)
--- 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);