From: cristy <urban-warrior@git.imagemagick.org>
Date: Sun, 4 Jan 2015 18:56:43 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~1499
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dd9344f327bb53a310a9776cec4f34c82123dc18;p=imagemagick

---

diff --git a/MagickCore/composite.c b/MagickCore/composite.c
index 66644ae48..3893a0969 100644
--- a/MagickCore/composite.c
+++ b/MagickCore/composite.c
@@ -699,18 +699,14 @@ if (0)
           }
         for (x=0; x < (ssize_t) composite_image->columns; x++)
         {
-          register ssize_t
-            i;
-
           if (GetPixelReadMask(composite_image,p) == 0)
             {
               p+=GetPixelChannels(composite_image);
               q+=GetPixelChannels(image);
               continue;
             }
-          for (i=0; i < (ssize_t) GetPixelChannels(composite_image); i++)
-            SetPixelAlpha(image,ClampToQuantum(GetPixelIntensity(
-              composite_image,p)),q);
+          SetPixelAlpha(image,ClampToQuantum(GetPixelIntensity(composite_image,
+            p)),q);
           p+=GetPixelChannels(composite_image);
           q+=GetPixelChannels(image);
         }
diff --git a/MagickWand/composite.c b/MagickWand/composite.c
index aa6bb9786..f986eb95a 100644
--- a/MagickWand/composite.c
+++ b/MagickWand/composite.c
@@ -139,9 +139,11 @@ static MagickBooleanType CompositeImageList(ImageInfo *image_info,Image **image,
         case DissolveCompositeOp:
         case ModulateCompositeOp:
         case ThresholdCompositeOp:
+        {
           (void) SetImageArtifact(composite_image,"compose:args",
             composite_options->compose_args);
           break;
+        }
         default:
           break;
       }