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

index 2c31201c829aa6c0947e0ca872ffbe76a0a18846..ac340e9393eca7d75e6b598c97d27a90aa4f6575 100644 (file)
@@ -3668,15 +3668,16 @@ MagickExport void InitializePixelChannelMap(Image *image)
   if (image->matte != MagickFalse)
     trait=(PixelTrait) (trait | BlendPixelTrait);
   n=0;
-  SetPixelChannelMap(image,RedPixelChannel,trait,n++);
-  SetPixelChannelMap(image,GreenPixelChannel,trait,n++);
-  SetPixelChannelMap(image,BluePixelChannel,trait,n++);
-if (0)
-  if (image->colorspace == GRAYColorspace)
+  if (0 && image->colorspace == GRAYColorspace)
     {
-      n=0;
-      SetPixelChannelMap(image,RedPixelChannel,trait,n);
+      SetPixelChannelMap(image,BluePixelChannel,trait,n);
       SetPixelChannelMap(image,GreenPixelChannel,trait,n);
+      SetPixelChannelMap(image,RedPixelChannel,trait,n++);
+    }
+  else
+    {
+      SetPixelChannelMap(image,RedPixelChannel,trait,n++);
+      SetPixelChannelMap(image,GreenPixelChannel,trait,n++);
       SetPixelChannelMap(image,BluePixelChannel,trait,n++);
     }
   if (image->colorspace == CMYKColorspace)