]> granicus.if.org Git - imagemagick/commitdiff
(no commit message)
authorcristy <urban-warrior@git.imagemagick.org>
Thu, 17 May 2012 12:39:54 +0000 (12:39 +0000)
committercristy <urban-warrior@git.imagemagick.org>
Thu, 17 May 2012 12:39:54 +0000 (12:39 +0000)
MagickCore/composite.c
MagickWand/mogrify.c
MagickWand/operation.c

index f3137f9408fd9e84cd9644734719f4de52b725df..ff57d967aa598471366a3401b982937d4fbb2ba8 100644 (file)
@@ -641,7 +641,7 @@ MagickExport MagickBooleanType CompositeImage(Image *image,
           register ssize_t
             i;
 
-          if (GetPixelMask(image,p) != 0)
+          if (GetPixelMask(composite_image,p) != 0)
             {
               p+=GetPixelChannels(composite_image);
               q+=GetPixelChannels(image);
index fa62dae972778bd3f279730cf236874f1fb60fb9..ea8ae852b48115b134cdcf77e61f39faeecd4843 100644 (file)
@@ -7466,7 +7466,7 @@ WandExport MagickBooleanType MogrifyImageList(ImageInfo *image_info,
                       Set a blending mask for the composition.
                     */
                     (void) NegateImage(mask_image,MagickFalse,exception);
-                    (void) SetImageMask(image,mask_image,exception);
+                    (void) SetImageMask(composite_image,mask_image,exception);
                     mask_image=DestroyImage(mask_image);
                   }
               }
index e4cf41f8b18777daddd5205f64218bba416f3df1..8c5cc49fbc77db47e72e478534ce1abec098e4eb 100644 (file)
@@ -3636,7 +3636,7 @@ WandExport void CLIListOperatorImages(MagickCLI *cli_wand,
               else {
                 /* Set a blending mask for the composition.  */
                 (void) NegateImage(mask_image,MagickFalse,_exception);
-                (void) SetImageMask(new_images,mask_image,_exception);
+                (void) SetImageMask(source_image,mask_image,_exception);
                 mask_image=DestroyImage(mask_image);
               }
             }