From: cristy <urban-warrior@git.imagemagick.org>
Date: Tue, 16 Dec 2014 01:24:45 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~1631
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=797b513010d10aa2c206ccf9f27971e3040254fa;p=imagemagick

---

diff --git a/MagickCore/pixel.c b/MagickCore/pixel.c
index 79d9c691f..348757434 100644
--- a/MagickCore/pixel.c
+++ b/MagickCore/pixel.c
@@ -6155,7 +6155,7 @@ MagickExport void SetPixelChannelMask(Image *image,
   }
   SetPixelChannelTraits(image,AlphaPixelChannel,
     GetChannelBit(channel_mask,AlphaPixelChannel) == 0 ? CopyPixelTrait :
-    image->alpha_trait);
+    image->alpha_trait &~ BlendPixelTrait);
   if (image->storage_class == PseudoClass)
     SetPixelChannelTraits(image,IndexPixelChannel,CopyPixelTrait);
   if (image->read_mask != MagickFalse)
diff --git a/MagickCore/resize.c b/MagickCore/resize.c
index 86b89faad..d66853666 100644
--- a/MagickCore/resize.c
+++ b/MagickCore/resize.c
@@ -3309,14 +3309,8 @@ MagickExport Image *ScaleImage(const Image *image,const size_t columns,
             }
           for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
           {
-            PixelChannel
-              channel;
-
-            PixelTrait
-              traits;
-
-            channel=GetPixelChannelChannel(image,i);
-            traits=GetPixelChannelTraits(image,channel);
+            PixelChannel channel=GetPixelChannelChannel(image,i);
+            PixelTrait traits=GetPixelChannelTraits(image,channel);
             if ((traits & BlendPixelTrait) == 0)
               {
                 x_vector[x*GetPixelChannels(image)+i]=(double) p[i];
@@ -3357,18 +3351,11 @@ MagickExport Image *ScaleImage(const Image *image,const size_t columns,
                   }
                 for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
                 {
-                  PixelChannel
-                    channel;
-
-                  PixelTrait
-                    traits;
-
-                  channel=GetPixelChannelChannel(image,i);
-                  traits=GetPixelChannelTraits(image,channel);
+                  PixelChannel channel=GetPixelChannelChannel(image,i);
+                  PixelTrait traits=GetPixelChannelTraits(image,channel);
                   if ((traits & BlendPixelTrait) == 0)
                     {
-                      x_vector[x*GetPixelChannels(image)+i]=(double)
-                        p[i];
+                      x_vector[x*GetPixelChannels(image)+i]=(double) p[i];
                       continue;
                     }
                   alpha=QuantumScale*GetPixelAlpha(image,p);
@@ -3407,14 +3394,8 @@ MagickExport Image *ScaleImage(const Image *image,const size_t columns,
                 }
               for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
               {
-                PixelChannel
-                  channel;
-
-                PixelTrait
-                  traits;
-
-                channel=GetPixelChannelChannel(image,i);
-                traits=GetPixelChannelTraits(image,channel);
+                PixelChannel channel=GetPixelChannelChannel(image,i);
+                PixelTrait traits=GetPixelChannelTraits(image,channel);
                 if ((traits & BlendPixelTrait) == 0)
                   {
                     x_vector[x*GetPixelChannels(image)+i]=(double) p[i];
@@ -3511,14 +3492,8 @@ MagickExport Image *ScaleImage(const Image *image,const size_t columns,
               }
             for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
             {
-              PixelChannel
-                channel;
-
-              PixelTrait
-                traits;
-
-              channel=GetPixelChannelChannel(image,i);
-              traits=GetPixelChannelTraits(image,channel);
+              PixelChannel channel=GetPixelChannelChannel(image,i);
+              PixelTrait traits=GetPixelChannelTraits(image,channel);
               if (traits == UndefinedPixelTrait)
                 continue;
               pixel[i]+=span.x*scanline[x*GetPixelChannels(image)+i];
@@ -3566,8 +3541,8 @@ MagickExport Image *ScaleImage(const Image *image,const size_t columns,
           }
         for (i=0; i < (ssize_t) GetPixelChannels(scale_image); i++)
         {
-          channel=GetPixelChannelChannel(scale_image,i);
-          traits=GetPixelChannelTraits(image,channel);
+          PixelChannel channel=GetPixelChannelChannel(scale_image,i);
+          PixelTrait traits=GetPixelChannelTraits(image,channel);
           scale_traits=GetPixelChannelTraits(scale_image,channel);
           if ((traits == UndefinedPixelTrait) ||
               (scale_traits == UndefinedPixelTrait))