From: cristy <urban-warrior@git.imagemagick.org>
Date: Fri, 26 Aug 2011 13:25:03 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~7143
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=07a6785ad974f0631a83731fe5d7fb85751ca235;p=imagemagick

---

diff --git a/MagickCore/pixel.c b/MagickCore/pixel.c
index 6588568d0..7548660ec 100644
--- a/MagickCore/pixel.c
+++ b/MagickCore/pixel.c
@@ -4904,7 +4904,7 @@ MagickExport MagickBooleanType IsFuzzyEquivalencePixelPacket(const Image *image,
 %
 %  The format of the SetPixelChannelMap method is:
 %
-%      void SetPixelChannelMap(Image *image,const ChannelType mask)
+%      void SetPixelChannelMap(Image *image,const ChannelType channel_mask)
 %
 %  A description of each parameter follows:
 %
@@ -4913,17 +4913,18 @@ MagickExport MagickBooleanType IsFuzzyEquivalencePixelPacket(const Image *image,
 %    o mask: the channel mask.
 %
 */
-MagickExport void SetPixelChannelMap(Image *image,const ChannelType mask)
+MagickExport void SetPixelChannelMap(Image *image,
+  const ChannelType channel_mask)
 {
 #define GetChannelBit(mask,bit)  (((size_t) (mask) >> (size_t) (bit)) & 0x01)
 
   register ssize_t
     i;
 
-  image->sync=mask == DefaultChannels ? MagickTrue : MagickFalse;
+  image->sync=channel_mask == DefaultChannels ? MagickTrue : MagickFalse;
   for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
-    SetPixelChannelMapTraits(image,(PixelChannel) i,GetChannelBit(mask,i) != 0 ?
-      UpdatePixelTrait : CopyPixelTrait);
+    SetPixelChannelMapTraits(image,(PixelChannel) i,
+      GetChannelBit(channel_mask,i) != 0 ? UpdatePixelTrait : CopyPixelTrait);
   for ( ; i < MaxPixelChannels; i++)
     SetPixelChannelMapTraits(image,(PixelChannel) i,UndefinedPixelTrait);
   SetPixelChannelMapTraits(image,IndexPixelChannel,CopyPixelTrait);