From 1539afd8af6576f16f4e1d6c68f5b718b4681211 Mon Sep 17 00:00:00 2001 From: cristy Date: Mon, 30 Jan 2012 01:32:59 +0000 Subject: [PATCH] --- MagickWand/mogrify.c | 1 - MagickWand/operation.c | 12 ++++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c index 6744c3ff2..95b85ec1f 100644 --- a/MagickWand/mogrify.c +++ b/MagickWand/mogrify.c @@ -7424,7 +7424,6 @@ WandExport MagickBooleanType MogrifyImageList(ImageInfo *image_info, { /* 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); diff --git a/MagickWand/operation.c b/MagickWand/operation.c index 40e6efd21..bf136e0b0 100644 --- a/MagickWand/operation.c +++ b/MagickWand/operation.c @@ -3628,19 +3628,15 @@ WandExport MagickBooleanType SequenceOperationImages(ImageInfo *image_info, { /* 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; -- 2.50.1