From: cristy <urban-warrior@git.imagemagick.org>
Date: Tue, 13 Dec 2011 19:34:45 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~6545
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0bbd87c90725154145a972d3efbc4c5124455fe3;p=imagemagick

---

diff --git a/MagickCore/pixel.c b/MagickCore/pixel.c
index 6e20e1045..c0e315528 100644
--- a/MagickCore/pixel.c
+++ b/MagickCore/pixel.c
@@ -5419,8 +5419,8 @@ MagickExport void SetPixelChannelMapMask(Image *image,
     channel=GetPixelChannelMapChannel(image,i);
     SetPixelChannelMapTraits(image,channel,
       GetChannelBit(channel_mask,channel) == 0 ? CopyPixelTrait :
-      channel == AlphaPixelChannel ? UpdatePixelTrait : (PixelTrait)
-      (UpdatePixelTrait | BlendPixelTrait));
+      image->matte == MagickFalse || (channel == AlphaPixelChannel) ?
+      UpdatePixelTrait : (PixelTrait) (UpdatePixelTrait | BlendPixelTrait));
   }
   if (image->storage_class == PseudoClass)
     SetPixelChannelMapTraits(image,IndexPixelChannel,CopyPixelTrait);