(no commit message)

diff --git a/MagickCore/composite.c b/MagickCore/composite.c
index 2a7c727fc2465e4e2d27f5376b5aea2c0a4a3c76..40dc59c2d2268d96bbce0647910b6d673cd65503 100644 (file)
--- 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 6b0cc36fc9fb01cd22e504e835796d02061f7a80..2d71df202f399c3e4c613f98538f41357a4f8ade 100644 (file)
--- 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;
               }