commit f3023754a3d15f77209e54f59d8f45d063adffcb
author cristy <urban-warrior@git.imagemagick.org> Tue Jul 28 17:13:22 2015 +0000
committer cristy <urban-warrior@git.imagemagick.org> Tue Jul 28 17:13:22 2015 +0000
tree 6e0bb80c19cbe33836fee8193c7e0105aeb4311b
parent e1319bc80e8035ab0cb428c6e2e716466abb1a06

PerlMagick/Magick.xs

diff --git a/PerlMagick/Magick.xs b/PerlMagick/Magick.xs
index f073bf7..8d23f34 100644
--- a/PerlMagick/Magick.xs
+++ b/PerlMagick/Magick.xs
@@ -1245,7 +1245,7 @@
           if (SvPOK(sval))
             clip_mask=SetupList(aTHX_ SvRV(sval),&info,(SV ***) NULL,exception);
           for ( ; image; image=image->next)
-            SetImageMask(image,clip_mask,exception);
+            SetImageMask(image,clip_mask,ReadPixelMask,exception);
           break;
         }
       if (LocaleNCompare(attribute,"colormap",8) == 0)
@@ -8772,7 +8772,8 @@
                   */
                   mask_image=CloneImage(argument_list[10].image_reference,0,0,
                     MagickTrue,exception);
-                  (void) SetImageMask(composite_image,mask_image,exception);
+                  (void) SetImageMask(composite_image,mask_image,ReadPixelMask,
+                    exception);
                   mask_image=DestroyImage(mask_image);
                 }
             }
@@ -8810,7 +8811,8 @@
                   (image->compose == DistortCompositeOp))
                 composite_image=DestroyImage(composite_image);
               else
-                (void) SetImageMask(image,(Image *) NULL,exception);
+                (void) SetImageMask(image,(Image *) NULL,ReadPixelMask,
+                  exception);
             }
           (void) SetImageChannelMask(image,channel_mask);
           break;
@@ -10442,7 +10444,7 @@
             }
           mask_image=CloneImage(argument_list[0].image_reference,0,0,MagickTrue,
             exception);
-          (void) SetImageMask(image,mask_image,exception);
+          (void) SetImageMask(image,mask_image,ReadPixelMask,exception);
           mask_image=DestroyImage(mask_image);
           break;
         }
@@ -10535,7 +10537,7 @@
             }
           mask_image=CloneImage(argument_list[0].image_reference,0,0,
             MagickTrue,exception);
-          (void) SetImageMask(image,mask_image,exception);
+          (void) SetImageMask(image,mask_image,ReadPixelMask,exception);
           mask_image=DestroyImage(mask_image);
           break;
         }

PerlMagick/quantum/quantum.xs.in

diff --git a/PerlMagick/quantum/quantum.xs.in b/PerlMagick/quantum/quantum.xs.in
index 76a20be..16aa3e9 100644
--- a/PerlMagick/quantum/quantum.xs.in
+++ b/PerlMagick/quantum/quantum.xs.in
@@ -8772,7 +8772,8 @@
                   */
                   mask_image=CloneImage(argument_list[10].image_reference,0,0,
                     MagickTrue,exception);
-                  (void) SetImageMask(composite_image,mask_image,exception);
+                  (void) SetImageMask(composite_image,mask_image,ReadPixelMask,
+                    exception);
                   mask_image=DestroyImage(mask_image);
                 }
             }
@@ -8810,7 +8811,8 @@
                   (image->compose == DistortCompositeOp))
                 composite_image=DestroyImage(composite_image);
               else
-                (void) SetImageMask(image,(Image *) NULL,exception);
+                (void) SetImageMask(image,(Image *) NULL,ReadPixelMask,
+                  exception);
             }
           (void) SetImageChannelMask(image,channel_mask);
           break;
@@ -10442,7 +10444,7 @@
             }
           mask_image=CloneImage(argument_list[0].image_reference,0,0,MagickTrue,
             exception);
-          (void) SetImageMask(image,mask_image,exception);
+          (void) SetImageMask(image,mask_image,ReadPixelMask,exception);
           mask_image=DestroyImage(mask_image);
           break;
         }
@@ -10535,7 +10537,7 @@
             }
           mask_image=CloneImage(argument_list[0].image_reference,0,0,
             MagickTrue,exception);
-          (void) SetImageMask(image,mask_image,exception);
+          (void) SetImageMask(image,mask_image,ReadPixelMask,exception);
           mask_image=DestroyImage(mask_image);
           break;
         }