(no commit message)

diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c
index 6744c3ff28ac1abe0f8e449dc634b0741f8c06ac..95b85ec1f74039ab49fe2f7ba866d077fe8bb115 100644 (file)
--- a/MagickWand/mogrify.c
+++ b/MagickWand/mogrify.c
@@ -7424,7 +7424,6 @@ WandExport MagickBooleanType MogrifyImageList(ImageInfo *image_info,
                   {
                     /*
                       Set a blending mask for the composition.
-                      Possible problem, what if image->mask already set.
                     */
                     (void) NegateImage(mask_image,MagickFalse,exception);
                     (void) SetImageMask(image,mask_image,exception);

diff --git a/MagickWand/operation.c b/MagickWand/operation.c
index 40e6efd21f5092600e5021034eed613128f6f737..bf136e0b0ebac7d6afbbac9d61f756de1b8dd59a 100644 (file)
--- a/MagickWand/operation.c
+++ b/MagickWand/operation.c
@@ -3628,19 +3628,15 @@ WandExport MagickBooleanType SequenceOperationImages(ImageInfo *image_info,
                 {
                   /*
                     Set a blending mask for the composition.
-                    Possible problem, what if image->mask already set.
                   */
-                  image->mask=mask_image;
-                  (void) NegateImage(image->mask,MagickFalse,exception);
+                  (void) NegateImage(mask_image,MagickFalse,exception);
+                  (void) SetImageMask(image,mask_image,exception);
+                  mask_image=DestroyImage(mask_image);
                 }
             }
           (void) CompositeImage(image,compose,composite_image,
             geometry.x,geometry.y,exception);
-          if (mask_image != (Image *) NULL)
-            {
-              image->mask=DestroyImage(image->mask);
-              mask_image=(Image *) NULL;
-            }
+          (void) SetImageMask(image,(Image *) NULL,exception);
           composite_image=DestroyImage(composite_image);
           *images=DestroyImageList(*images);
           *images=image;