From: cristy <urban-warrior@git.imagemagick.org>
Date: Mon, 25 Aug 2014 12:46:17 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~2069
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=431cf8df0182d22493b3947d3872276107e8f2e8;p=imagemagick

---

diff --git a/MagickCore/composite.c b/MagickCore/composite.c
index e40500686..cc8bd84bf 100644
--- a/MagickCore/composite.c
+++ b/MagickCore/composite.c
@@ -1066,14 +1066,6 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
             destination_dissolve=geometry_info.sigma/100.0;
           if ((destination_dissolve-MagickEpsilon) < 0.0)
             destination_dissolve=0.0;
-       /* posible speed up?  -- from IMv6 update
-          clip_to_self=MagickFalse;
-          if ((destination_dissolve+MagickEpsilon) > 1.0 )
-            {
-              destination_dissolve=1.0;
-              clip_to_self=MagickTrue;
-            }
-        */
         }
       break;
     }
@@ -1566,7 +1558,7 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
               case CopyAlphaCompositeOp:
               {
                 pixel=QuantumRange*Sa;
-                if (composite_image->alpha_trait == BlendPixelTrait)
+                if (composite_image->alpha_trait != BlendPixelTrait)
                   pixel=GetPixelIntensity(composite_image,p);
                 break;
               }