(no commit message)

diff --git a/MagickCore/composite.c b/MagickCore/composite.c
index 04b5020a3f11e30270e87c446a5fb85a6d31f71e..2102e91d114c2e42f3a4576646f63377e6898569 100644 (file)
--- a/MagickCore/composite.c
+++ b/MagickCore/composite.c
@@ -568,8 +568,9 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
   if (IsGrayColorspace(image->colorspace) != MagickFalse)
     (void) SetImageColorspace(image,sRGBColorspace,exception);
   (void) SetImageColorspace(composite_image,image->colorspace,exception);
-  if ((image->alpha_trait == BlendPixelTrait) &&
-      (composite_image->alpha_trait != BlendPixelTrait))
+  if (image->alpha_trait == UndefinedPixelTrait)
+    (void) SetImageAlphaChannel(image,SetAlphaChannel,exception);
+  if (composite_image->alpha_trait == UndefinedPixelTrait)
     (void) SetImageAlphaChannel(composite_image,SetAlphaChannel,exception);
   if ((compose == OverCompositeOp) || (compose == SrcOverCompositeOp))
     {