From 60dc90cdf6f68661b2f095063867d06babaafc9c Mon Sep 17 00:00:00 2001 From: cristy Date: Sat, 9 Feb 2013 18:33:21 +0000 Subject: [PATCH] --- MagickCore/composite.c | 3 +++ MagickCore/effect.c | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/MagickCore/composite.c b/MagickCore/composite.c index 2a7c727fc..40dc59c2d 100644 --- a/MagickCore/composite.c +++ b/MagickCore/composite.c @@ -612,6 +612,9 @@ MagickExport MagickBooleanType CompositeImage(Image *image, if (IsGrayColorspace(image->colorspace) != MagickFalse) (void) SetImageColorspace(image,RGBColorspace,exception); (void) SetImageColorspace(composite_image,image->colorspace,exception); + if ((image->alpha_trait == BlendPixelTrait) && + (composite_image->alpha_trait != BlendPixelTrait)) + SetImageAlphaChannel(composite_image,SetAlphaChannel,exception); if ((compose == OverCompositeOp) || (compose == SrcOverCompositeOp)) { status=CompositeOverImage(image,composite_image,clip_to_self,x_offset, diff --git a/MagickCore/effect.c b/MagickCore/effect.c index 6b0cc36fc..2d71df202 100644 --- a/MagickCore/effect.c +++ b/MagickCore/effect.c @@ -3165,8 +3165,7 @@ MagickExport Image *SelectiveBlurImage(const Image *image,const double radius, contrast=GetPixelIntensity(image,pixels)-intensity; if (fabs(contrast) < threshold) { - alpha=(double) (QuantumScale* - GetPixelAlpha(image,pixels)); + alpha=(double) (QuantumScale*GetPixelAlpha(image,pixels)); pixel+=(*k)*alpha*pixels[i]; gamma+=(*k)*alpha; } -- 2.50.1