]> granicus.if.org Git - imagemagick/commitdiff
(no commit message)
authorcristy <urban-warrior@git.imagemagick.org>
Thu, 15 Dec 2011 15:57:10 +0000 (15:57 +0000)
committercristy <urban-warrior@git.imagemagick.org>
Thu, 15 Dec 2011 15:57:10 +0000 (15:57 +0000)
MagickCore/pixel-accessor.h

index 4978cd14f99987990bfd1eea0a4aa21b0d11fa61..ed53ba5bbcefce3de05961ebc4f7376a695fa9bd 100644 (file)
@@ -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,