commit a129f7011d510abb0189eda5ba9ef91f351d3bc0
author anthony <anthony@git.imagemagick.org> Thu Apr 14 01:08:48 2011 +0000
committer anthony <anthony@git.imagemagick.org> Thu Apr 14 01:08:48 2011 +0000
tree 61a351a6bb8970675d401076e33a402a22a90d52
parent d8d259407476dafbf76034bdece0f689b0204b59

minor note

wand/mogrify.c

diff --git a/wand/mogrify.c b/wand/mogrify.c
index a0ddab3..2cf42d8 100644
--- a/wand/mogrify.c
+++ b/wand/mogrify.c
@@ -2444,8 +2444,9 @@
                 /*
                   Composite region.
                 */
-                (void) CompositeImage(region_image, CopyCompositeOp,*image,
-                  region_geometry.x,region_geometry.y);
+                (void) CompositeImage(region_image,region_image->matte !=
+                     MagickFalse ? CopyCompositeOp : OverCompositeOp,*image,
+                     region_geometry.x,region_geometry.y);
                 InheritException(exception,&region_image->exception);
                 *image=DestroyImage(*image);
                 *image=region_image;
@@ -3186,7 +3187,8 @@
         Composite transformed region onto image.
       */
       (void) SyncImageSettings(mogrify_info,*image);
-      (void) CompositeImage(region_image,CopyCompositeOp,*image,
+      (void) CompositeImage(region_image,region_image->matte !=
+           MagickFalse ? CopyCompositeOp : OverCompositeOp,*image,
            region_geometry.x,region_geometry.y);
       InheritException(exception,&region_image->exception);
       *image=DestroyImage(*image);
@@ -7473,14 +7475,15 @@
                     /*
                       Set a blending mask for the composition.
                     */
+                    /* POSIBLE ERROR; what if image->mask already set */
                     image->mask=mask_image;
                     (void) NegateImage(image->mask,MagickFalse);
                   }
               }
             (void) CompositeImageChannel(image,channel,image->compose,
               composite_image,geometry.x,geometry.y);
-            if (image->mask != (Image *) NULL)
-              image->mask=DestroyImage(image->mask);
+            if (mask_image != (Image *) NULL)
+              mask_image=image->mask=DestroyImage(image->mask);
             composite_image=DestroyImage(composite_image);
             InheritException(exception,&image->exception);
             *images=DestroyImageList(*images);