From: cristy <urban-warrior@git.imagemagick.org>
Date: Thu, 17 Nov 2011 13:55:44 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~6635
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6874abc37eb748576f57271289670ecaf61216f3;p=imagemagick

---

diff --git a/MagickCore/pixel-accessor.h b/MagickCore/pixel-accessor.h
index ab71d0f40..e4c020317 100644
--- a/MagickCore/pixel-accessor.h
+++ b/MagickCore/pixel-accessor.h
@@ -565,11 +565,14 @@ static inline void SetPixelInfoPixel(const Image *restrict image,
     ClampToQuantum(pixel_info->green);
   pixel[image->channel_map[BluePixelChannel].channel]=
     ClampToQuantum(pixel_info->blue);
-  if (image->colorspace == CMYKColorspace)
+  if ((image->channel_map[BlackPixelChannel].traits != UndefinedPixelTrait) &&
+      (image->colorspace == CMYKColorspace) &&
+      (pixel_info->colorspace == CMYKColorspace))
     pixel[image->channel_map[BlackPixelChannel].channel]=
       ClampToQuantum(pixel_info->black);
   if (image->channel_map[AlphaPixelChannel].traits != UndefinedPixelTrait)
     pixel[image->channel_map[AlphaPixelChannel].channel]=
+      pixel_info->matte == MagickFalse ? OpaqueAlpha :
       ClampToQuantum(pixel_info->alpha);
 }