From 1ce96d02df5611026c7e485c5c8e4a8456de713f Mon Sep 17 00:00:00 2001 From: cristy Date: Thu, 14 Jul 2011 17:57:24 +0000 Subject: [PATCH] --- MagickCore/effect.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/MagickCore/effect.c b/MagickCore/effect.c index 20f65f176..59f7deee7 100644 --- a/MagickCore/effect.c +++ b/MagickCore/effect.c @@ -1395,7 +1395,8 @@ MagickExport Image *ConvolveImage(const Image *image,const size_t order, k=normal_kernel; kernel_pixels=p; pixel=image->bias; - if ((GetPixelAlphaTraits(image) == UndefinedPixelTrait) || + if (((convolve_traits & BlendPixelTrait) == 0) || + (GetPixelAlphaTraits(image) == UndefinedPixelTrait) || (image->matte == MagickFalse)) { /* @@ -1423,23 +1424,14 @@ MagickExport Image *ConvolveImage(const Image *image,const size_t order, { alpha=(MagickRealType) (QuantumScale*GetPixelAlpha(image, kernel_pixels+u*channels)); - if ((traits & BlendPixelTrait) == 0) - pixel+=(*k)*kernel_pixels[u*channels+i]; - else - pixel+=(*k)*alpha*kernel_pixels[u*channels+i]; + pixel+=(*k)*alpha*kernel_pixels[u*channels+i]; gamma+=(*k)*alpha; k++; } kernel_pixels+=(image->columns+width)*channels; } - if ((convolve_traits & BlendPixelTrait) == 0) - SetPixelChannel(convolve_image,channel,ClampToQuantum(pixel),q); - else - { - gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma); - SetPixelChannel(convolve_image,channel,ClampToQuantum(gamma*pixel), - q); - } + gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma); + SetPixelChannel(convolve_image,channel,ClampToQuantum(gamma*pixel),q); } p+=channels; q+=convolve_channels; -- 2.40.0