From: Cristy <urban-warrior@imagemagick.org>
Date: Sun, 23 Jun 2019 19:26:14 +0000 (-0400)
Subject: Revert CopyCompositeOp composite patch
X-Git-Tag: 7.0.8-50~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4a60519527fc1cf925d37f93aac021655ee43314;p=imagemagick

Revert CopyCompositeOp composite patch
---

diff --git a/MagickCore/composite.c b/MagickCore/composite.c
index 99e91d147..78d6dff92 100644
--- a/MagickCore/composite.c
+++ b/MagickCore/composite.c
@@ -654,19 +654,18 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
               q+=GetPixelChannels(image);
               continue;
             }
-          for (i=0; i < (ssize_t) GetPixelChannels(source_image); i++)
+          for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
           {
-            PixelChannel channel = GetPixelChannelChannel(source_image,i);
-            PixelTrait source_traits = GetPixelChannelTraits(source_image,
-              channel);
+            PixelChannel channel = GetPixelChannelChannel(image,i);
             PixelTrait traits = GetPixelChannelTraits(image,channel);
-            if (source_traits == UndefinedPixelTrait)
+            PixelTrait source_traits=GetPixelChannelTraits(source_image,
+              channel);
+            if (traits == UndefinedPixelTrait)
               continue;
-            if (traits != UndefinedPixelTrait)
+            if (source_traits != UndefinedPixelTrait)
               SetPixelChannel(image,channel,p[i],q);
-            else
-              if (channel == AlphaPixelChannel)
-                SetPixelChannel(image,channel,OpaqueAlpha,q);
+            else if (channel == AlphaPixelChannel)
+              SetPixelChannel(image,channel,OpaqueAlpha,q);
           }
           p+=GetPixelChannels(source_image);
           q+=GetPixelChannels(image);