From: cristy <urban-warrior@git.imagemagick.org>
Date: Sun, 26 Aug 2012 21:27:29 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~5058
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=297e3a450d4b95328fa0667d4910881e9787e608;p=imagemagick

---

diff --git a/MagickCore/pixel-accessor.h b/MagickCore/pixel-accessor.h
index 2137af335..f2d959bd6 100644
--- a/MagickCore/pixel-accessor.h
+++ b/MagickCore/pixel-accessor.h
@@ -600,12 +600,6 @@ static inline void SetPixelChannelTraits(Image *image,
   image->channel_map[channel].traits=traits;
 }
 
-static inline void SetPixelChannelMapTraits(Image *image,
-  const PixelChannel channel,const PixelTrait traits)
-{
-  image->channel_map[channel].traits=traits;
-}
-
 static inline void SetPixelCr(const Image *restrict image,const Quantum cr,
   Quantum *restrict pixel)
 {
diff --git a/MagickCore/pixel.c b/MagickCore/pixel.c
index 95bc8a73f..10f2ed84b 100644
--- a/MagickCore/pixel.c
+++ b/MagickCore/pixel.c
@@ -5771,15 +5771,15 @@ MagickExport void SetPixelChannelMapMask(Image *image,
       channel;
 
     channel=GetPixelChannelMapChannel(image,i);
-    SetPixelChannelMapTraits(image,channel,
+    SetPixelChannelTraits(image,channel,
       GetChannelBit(channel_mask,channel) == 0 ? CopyPixelTrait :
       image->matte == MagickFalse || (channel == AlphaPixelChannel) ?
       UpdatePixelTrait : (PixelTrait) (UpdatePixelTrait | BlendPixelTrait));
   }
   if (image->storage_class == PseudoClass)
-    SetPixelChannelMapTraits(image,IndexPixelChannel,CopyPixelTrait);
+    SetPixelChannelTraits(image,IndexPixelChannel,CopyPixelTrait);
   if (image->mask != MagickFalse)
-    SetPixelChannelMapTraits(image,MaskPixelChannel,CopyPixelTrait);
+    SetPixelChannelTraits(image,MaskPixelChannel,CopyPixelTrait);
   if (image->debug != MagickFalse)
     LogPixelChannels(image);
 }