(no commit message)

diff --git a/MagickCore/composite.c b/MagickCore/composite.c
index 66644ae4882626d1643643d5df7b7e4ca9a118b7..3893a0969bedc18ce1812577787bfb7285abce66 100644 (file)
--- 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 aa6bb9786df3344456259247d75887488eb4ee21..f986eb95a9e7dd46c383d81abb93587564c638d3 100644 (file)
--- 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;
       }