commit 1539afd8af6576f16f4e1d6c68f5b718b4681211
author cristy <urban-warrior@git.imagemagick.org> Mon Jan 30 01:32:59 2012 +0000
committer cristy <urban-warrior@git.imagemagick.org> Mon Jan 30 01:32:59 2012 +0000
tree 0976c2e11a8f3df483b32bc73f2843b89e90ca8c
parent 6180838cb97473afec7c383da0a4df02f2a29f40

MagickWand/mogrify.c

diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c
index 6744c3f..95b85ec 100644
--- a/MagickWand/mogrify.c
+++ b/MagickWand/mogrify.c
@@ -7424,7 +7424,6 @@
                   {
                     /*
                       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);

MagickWand/operation.c

diff --git a/MagickWand/operation.c b/MagickWand/operation.c
index 40e6efd..bf136e0 100644
--- a/MagickWand/operation.c
+++ b/MagickWand/operation.c
@@ -3628,19 +3628,15 @@
                 {
                   /*
                     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;