From cfc71b1f9ffb73f906c5b9c10b2d9b89f1c51fa9 Mon Sep 17 00:00:00 2001
From: cristy <urban-warrior@git.imagemagick.org>
Date: Sun, 30 Nov 2014 15:23:52 +0000
Subject: [PATCH]

---
 MagickCore/pixel.c | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/MagickCore/pixel.c b/MagickCore/pixel.c
index dc21d7176..f02b01642 100644
--- a/MagickCore/pixel.c
+++ b/MagickCore/pixel.c
@@ -214,7 +214,6 @@ MagickExport void ConformPixelInfo(Image *image,const PixelInfo *source,
   assert(image != (Image *) NULL);
   assert(image->signature == MagickSignature);
   assert(destination != (const PixelInfo *) NULL);
-
   *destination=(*source);
   if (image->colorspace == CMYKColorspace)
     {
@@ -227,16 +226,9 @@ MagickExport void ConformPixelInfo(Image *image,const PixelInfo *source,
         if (IssRGBCompatibleColorspace(image->colorspace))
           ConvertCMYKToRGB(destination);
       }
-#if 0
-  if ((IsGrayColorspace(image->colorspace) != MagickFalse) &&
-      (IsPixelInfoGray(destination) == MagickFalse))
-    /* TODO: Add this method. */
-    SetPixelInfoGray(destination);
-#else
   if ((IsPixelInfoGray(&image->background_color) == MagickFalse) &&
       (IsGrayColorspace(image->colorspace) != MagickFalse))
     (void) TransformImageColorspace(image,sRGBColorspace,exception);
-#endif
   if ((destination->alpha_trait == BlendPixelTrait) &&
       (image->alpha_trait != BlendPixelTrait))
     (void) SetImageAlpha(image,OpaqueAlpha,exception);
@@ -4492,9 +4484,9 @@ MagickExport MagickBooleanType InterpolatePixelChannel(const Image *image,
   traits=GetPixelChannelTraits(image,channel);
   x_offset=(ssize_t) floor(x);
   y_offset=(ssize_t) floor(y);
-  interpolate = method;
-  if ( interpolate == UndefinedInterpolatePixel )
-    interpolate = image->interpolate;
+  interpolate=method;
+  if (interpolate == UndefinedInterpolatePixel)
+    interpolate=image->interpolate;
   switch (interpolate)
   {
     case AverageInterpolatePixel:  /* nearest 4 neighbours */
@@ -4911,9 +4903,9 @@ MagickExport MagickBooleanType InterpolatePixelChannels(const Image *source,
   status=MagickTrue;
   x_offset=(ssize_t) floor(x);
   y_offset=(ssize_t) floor(y);
-  interpolate = method;
-  if ( interpolate == UndefinedInterpolatePixel )
-    interpolate = source->interpolate;
+  interpolate=method;
+  if (interpolate == UndefinedInterpolatePixel)
+    interpolate=source->interpolate;
   switch (interpolate)
   {
     case AverageInterpolatePixel:  /* nearest 4 neighbours */
@@ -5476,9 +5468,9 @@ MagickExport MagickBooleanType InterpolatePixelInfo(const Image *image,
   status=MagickTrue;
   x_offset=(ssize_t) floor(x);
   y_offset=(ssize_t) floor(y);
-  interpolate = method;
-  if ( interpolate == UndefinedInterpolatePixel )
-    interpolate = image->interpolate;
+  interpolate=method;
+  if (interpolate == UndefinedInterpolatePixel)
+    interpolate=image->interpolate;
   switch (interpolate)
   {
     case AverageInterpolatePixel:  /* nearest 4 neighbours */
@@ -6161,7 +6153,9 @@ MagickExport void SetPixelChannelMask(Image *image,
       (channel != AlphaPixelChannel) ? (PixelTrait)
       (UpdatePixelTrait | BlendPixelTrait) : UpdatePixelTrait);
   }
-  SetPixelChannelTraits(image,AlphaPixelChannel,image->alpha_trait);
+  SetPixelChannelTraits(image,AlphaPixelChannel,
+    GetChannelBit(channel_mask,channel) == 0 ? CopyPixelTrait :
+    image->alpha_trait);
   if (image->storage_class == PseudoClass)
     SetPixelChannelTraits(image,IndexPixelChannel,CopyPixelTrait);
   if (image->read_mask != MagickFalse)
-- 
2.40.0