From: cristy <urban-warrior@git.imagemagick.org>
Date: Thu, 15 Dec 2011 15:57:10 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~6533
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=346eef20a70d3126862b6334734e48eb1f6ee7f5;p=imagemagick

---

diff --git a/MagickCore/pixel-accessor.h b/MagickCore/pixel-accessor.h
index 4978cd14f..ed53ba5bb 100644
--- a/MagickCore/pixel-accessor.h
+++ b/MagickCore/pixel-accessor.h
@@ -578,15 +578,12 @@ static inline void SetPixelInfoPixel(const Image *restrict image,
     ClampToQuantum(pixel_info->green);
   pixel[image->channel_map[BluePixelChannel].offset]=
     ClampToQuantum(pixel_info->blue);
-  if ((image->channel_map[BlackPixelChannel].traits != UndefinedPixelTrait) &&
-      (image->colorspace == CMYKColorspace) &&
-      (pixel_info->colorspace == CMYKColorspace))
+  if (image->channel_map[BlackPixelChannel].traits != UndefinedPixelTrait)
     pixel[image->channel_map[BlackPixelChannel].offset]=
       ClampToQuantum(pixel_info->black);
   if (image->channel_map[AlphaPixelChannel].traits != UndefinedPixelTrait)
-    pixel[image->channel_map[AlphaPixelChannel].offset]=
-      pixel_info->matte == MagickFalse ? OpaqueAlpha :
-      ClampToQuantum(pixel_info->alpha);
+    pixel[image->channel_map[AlphaPixelChannel].offset]=pixel_info->matte ==
+      MagickFalse ? OpaqueAlpha : ClampToQuantum(pixel_info->alpha);
 }
 
 static inline void SetPixelMagenta(const Image *restrict image,