From: cristy <urban-warrior@git.imagemagick.org>
Date: Wed, 3 Aug 2011 16:14:06 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~7239
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c78d6ab977f970fa53372ce5d3f9e1dcacfecda0;p=imagemagick

---

diff --git a/MagickCore/effect.c b/MagickCore/effect.c
index b9f296df8..ab794b4f4 100644
--- a/MagickCore/effect.c
+++ b/MagickCore/effect.c
@@ -1362,9 +1362,7 @@ MagickExport Image *ConvolveImage(const Image *image,
         k=kernel_info->values;
         pixels=p;
         pixel=kernel_info->bias;
-        if (((convolve_traits & BlendPixelTrait) == 0) ||
-            (GetPixelAlphaTraits(image) == UndefinedPixelTrait) ||
-            (image->matte == MagickFalse))
+        if ((convolve_traits & BlendPixelTrait) == 0)
           {
             /*
               No alpha blending.
diff --git a/MagickCore/resize.c b/MagickCore/resize.c
index 4ef380c44..962ac3ab4 100644
--- a/MagickCore/resize.c
+++ b/MagickCore/resize.c
@@ -2254,9 +2254,7 @@ static MagickBooleanType HorizontalFilter(const ResizeFilter *resize_filter,
             continue;
           }
         pixel=0.0;
-        if (((resize_traits & BlendPixelTrait) == 0) ||
-            (GetPixelAlphaTraits(resize_image) == UndefinedPixelTrait) ||
-            (resize_image->matte == MagickFalse))
+        if ((resize_traits & BlendPixelTrait) == 0)
           {
             /*
               No alpha blending.
@@ -2472,9 +2470,7 @@ static MagickBooleanType VerticalFilter(const ResizeFilter *resize_filter,
             continue;
           }
         pixel=0.0;
-        if (((resize_traits & BlendPixelTrait) == 0) ||
-            (GetPixelAlphaTraits(resize_image) == UndefinedPixelTrait) ||
-            (resize_image->matte == MagickFalse))
+        if ((resize_traits & BlendPixelTrait) == 0)
           {
             /*
               No alpha blending.
@@ -2960,9 +2956,7 @@ MagickExport Image *ScaleImage(const Image *image,const size_t columns,
           for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
           {
             traits=GetPixelChannelMapTraits(image,(PixelChannel) i);
-            if (((traits & BlendPixelTrait) == 0) ||
-                (GetPixelAlphaTraits(image) == UndefinedPixelTrait) ||
-                (image->matte == MagickFalse))
+            if ((traits & BlendPixelTrait) == 0)
               {
                 x_vector[x*GetPixelChannels(image)+i]=(MagickRealType) p[i];
                 continue;
@@ -2995,9 +2989,7 @@ MagickExport Image *ScaleImage(const Image *image,const size_t columns,
                 for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
                 {
                   traits=GetPixelChannelMapTraits(image,(PixelChannel) i);
-                  if (((traits & BlendPixelTrait) == 0) ||
-                      (GetPixelAlphaTraits(image) == UndefinedPixelTrait) ||
-                      (image->matte == MagickFalse))
+                  if ((traits & BlendPixelTrait) == 0)
                     {
                       x_vector[x*GetPixelChannels(image)+i]=(MagickRealType)
                         p[i];
@@ -3032,9 +3024,7 @@ MagickExport Image *ScaleImage(const Image *image,const size_t columns,
               for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
               {
                 traits=GetPixelChannelMapTraits(image,(PixelChannel) i);
-                if (((traits & BlendPixelTrait) == 0) ||
-                    (GetPixelAlphaTraits(image) == UndefinedPixelTrait) ||
-                    (image->matte == MagickFalse))
+                if ((traits & BlendPixelTrait) == 0)
                   {
                     x_vector[x*GetPixelChannels(image)+i]=(MagickRealType) p[i];
                     continue;
@@ -3086,9 +3076,7 @@ MagickExport Image *ScaleImage(const Image *image,const size_t columns,
             scale_traits=GetPixelChannelMapTraits(scale_image,channel);
             if (scale_traits == UndefinedPixelTrait)
               continue;
-            if (((traits & BlendPixelTrait) == 0) ||
-                (GetPixelAlphaTraits(image) == UndefinedPixelTrait) ||
-                (scale_image->matte == MagickFalse))
+            if ((traits & BlendPixelTrait) == 0)
               q[channel]=ClampToQuantum(s[i]);
             else
               q[channel]=ClampToQuantum(gamma*s[i]);
@@ -3173,9 +3161,7 @@ MagickExport Image *ScaleImage(const Image *image,const size_t columns,
           scale_traits=GetPixelChannelMapTraits(scale_image,channel);
           if (scale_traits == UndefinedPixelTrait)
             continue;
-          if (((scale_traits & BlendPixelTrait) == 0) ||
-              (GetPixelAlphaTraits(scale_image) == UndefinedPixelTrait) ||
-              (scale_image->matte == MagickFalse))
+          if ((scale_traits & BlendPixelTrait) == 0)
             q[channel]=ClampToQuantum(t[i]);
           else
             q[channel]=ClampToQuantum(gamma*t[i]);
diff --git a/PerlMagick/t/reference/filter/Scale.miff b/PerlMagick/t/reference/filter/Scale.miff
index b78b966a0..cec73c552 100644
Binary files a/PerlMagick/t/reference/filter/Scale.miff and b/PerlMagick/t/reference/filter/Scale.miff differ