(no commit message)

diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c
index f73676d04f2e4468882aa95e965260da6fca6928..cd368241661c003e09630ecaf67836b70200742c 100644 (file)
--- a/MagickWand/mogrify.c
+++ b/MagickWand/mogrify.c
@@ -7786,34 +7786,12 @@ WandExport MagickBooleanType MogrifyImageList(ImageInfo *image_info,
             mask_image=RemoveFirstImageFromList(images);
             if (mask_image != (Image *) NULL)
               {
-                if ((image->compose == DisplaceCompositeOp) ||
-                    (image->compose == DistortCompositeOp))
+                if ((image->compose != DisplaceCompositeOp) &&
+                    (image->compose != DistortCompositeOp))
+                  status&=SetImageMask(composite_image,mask_image,exception);
+                else
                   status&=CompositeImage(composite_image,mask_image,
                     CopyGreenCompositeOp,MagickTrue,0,0,exception);
-                else
-                  {
-                    Image
-                      *image;
-
-                    RectangleInfo
-                      composite_geometry;
-
-                    composite_geometry.width=mask_image->columns;
-                    composite_geometry.height=mask_image->rows;
-                    composite_geometry.x=(-geometry.x);
-                    composite_geometry.y=(-geometry.y);
-                    geometry.x=0;
-                    geometry.y=0;
-                    image=ExtentImage(composite_image,&composite_geometry,
-                     exception);
-                    if (image != (Image *) NULL)
-                      {
-                        composite_image=DestroyImage(composite_image);
-                        composite_image=image;
-                      }
-                    status&=CompositeImage(composite_image,mask_image,
-                      IntensityCompositeOp,MagickTrue,0,0,exception);
-                  }
                 mask_image=DestroyImage(mask_image);
               }
             (void) CompositeImage(image,composite_image,image->compose,

diff --git a/MagickWand/operation.c b/MagickWand/operation.c
index bf07c82889d9f478241ef6c0a378cb3a31caf732..3db795fade2953e9c5b1fd6db58d89d46b67d768 100644 (file)
--- a/MagickWand/operation.c
+++ b/MagickWand/operation.c
@@ -3825,33 +3825,12 @@ WandPrivate MagickBooleanType CLIListOperatorImages(MagickCLI *cli_wand,
           mask_image=RemoveFirstImageFromList(&_images);
           if (mask_image != (Image *) NULL)
             {
-              if ((compose == DisplaceCompositeOp) ||
-                  (compose == DistortCompositeOp))
+              if ((compose != DisplaceCompositeOp) &&
+                  (compose != DistortCompositeOp))
+                status&=SetImageMask(source_image,mask_image,_exception);
+              else
                 status&=CompositeImage(source_image,mask_image,
                   CopyGreenCompositeOp,MagickTrue,0,0,_exception);
-              else
-                {
-                  Image
-                    *image;
-
-                  RectangleInfo
-                    source_geometry;
-
-                  source_geometry.width=mask_image->columns;
-                  source_geometry.height=mask_image->rows;
-                  source_geometry.x=(-geometry.x);
-                  source_geometry.y=(-geometry.y);
-                  geometry.x=0;
-                  geometry.y=0;
-                  image=ExtentImage(source_image,&source_geometry,_exception);
-                  if (image != (Image *) NULL)
-                    {
-                      source_image=DestroyImage(source_image);
-                      source_image=image;
-                    }
-                  status&=CompositeImage(source_image,mask_image,
-                    IntensityCompositeOp,MagickTrue,0,0,_exception);
-                }
               mask_image=DestroyImage(mask_image);
             }
           status&=CompositeImage(new_images,source_image,compose,clip_to_self,