From: cristy <urban-warrior@git.imagemagick.org>
Date: Fri, 28 Nov 2014 23:23:39 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~1699
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0197c3c012fd521604985a0de817334f0865fba3;p=imagemagick

---

diff --git a/MagickCore/composite.c b/MagickCore/composite.c
index 04b5020a3..2102e91d1 100644
--- 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))
     {