From c78d6ab977f970fa53372ce5d3f9e1dcacfecda0 Mon Sep 17 00:00:00 2001 From: cristy Date: Wed, 3 Aug 2011 16:14:06 +0000 Subject: [PATCH] --- MagickCore/effect.c | 4 +--- MagickCore/resize.c | 28 ++++++----------------- PerlMagick/t/reference/filter/Scale.miff | Bin 3800 -> 3785 bytes 3 files changed, 8 insertions(+), 24 deletions(-) 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 b78b966a020eb7f30622c9ea0ab145cfbb33ea16..cec73c552251243f18a975b860dfc18c311824ac 100644 GIT binary patch literal 3785 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 -- 2.40.0