From: cristy <urban-warrior@git.imagemagick.org>
Date: Wed, 11 Jan 2012 20:01:32 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~6401
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a7b079186ad7e0943fa65611a8978531bb612eec;p=imagemagick

---

diff --git a/MagickCore/composite.c b/MagickCore/composite.c
index 6ecf162b4..43fde4f64 100644
--- a/MagickCore/composite.c
+++ b/MagickCore/composite.c
@@ -1423,8 +1423,7 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
         composite_traits=GetPixelChannelMapTraits(composite_image,channel);
         if (traits == UndefinedPixelTrait)
           continue;
-        if ((compose != AlphaCompositeOp) &&
-            (compose != IntensityCompositeOp) &&
+        if ((compose != IntensityCompositeOp) &&
             (composite_traits == UndefinedPixelTrait))
           continue;
         /*
@@ -1450,7 +1449,7 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
             {
               case AlphaCompositeOp:
               {
-                pixel=Sa;
+                pixel=QuantumRange*Sa;
                 break;
               }
               case AtopCompositeOp:
@@ -1584,6 +1583,11 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
         gamma=1.0/(fabs(alpha) <= MagickEpsilon ? 1.0 : alpha);
         switch (compose)
         {
+          case AlphaCompositeOp:
+          {
+            pixel=QuantumRange*Sa;
+            break;
+          }
           case AtopCompositeOp:
           case SrcAtopCompositeOp:
           {