From 707f063768cf47f767b9bf194aa96d2553ac0460 Mon Sep 17 00:00:00 2001 From: cristy Date: Wed, 15 Feb 2012 23:40:22 +0000 Subject: [PATCH] --- MagickCore/animate.c | 1 + MagickCore/layer.c | 1 - MagickCore/paint.c | 5 +---- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/MagickCore/animate.c b/MagickCore/animate.c index 47336e4b8..269ea0baa 100644 --- a/MagickCore/animate.c +++ b/MagickCore/animate.c @@ -46,6 +46,7 @@ #include "MagickCore/color.h" #include "MagickCore/color-private.h" #include "MagickCore/colorspace.h" +#include "MagickCore/colorspace-private.h" #include "MagickCore/constitute.h" #include "MagickCore/delegate.h" #include "MagickCore/exception.h" diff --git a/MagickCore/layer.c b/MagickCore/layer.c index c7750c170..946309ffe 100644 --- a/MagickCore/layer.c +++ b/MagickCore/layer.c @@ -327,7 +327,6 @@ MagickExport Image *CoalesceImages(const Image *image,ExceptionInfo *exception) coalesce_image->next->previous=coalesce_image; previous=coalesce_image; coalesce_image=GetNextImageInList(coalesce_image); - coalesce_image->matte=MagickTrue; (void) CompositeImage(coalesce_image,next->matte != MagickFalse ? OverCompositeOp : CopyCompositeOp,next,next->page.x,next->page.y, exception); diff --git a/MagickCore/paint.c b/MagickCore/paint.c index 531cb270d..1b6c56199 100644 --- a/MagickCore/paint.c +++ b/MagickCore/paint.c @@ -171,10 +171,7 @@ MagickExport MagickBooleanType FloodfillPaintImage(Image *image, return(MagickFalse); if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse) return(MagickFalse); - if ((target->matte != MagickFalse) && - (image->matte == MagickFalse)) - (void) SetImageAlpha(image,OpaqueAlpha,exception); - if (image->matte == MagickFalse) + if ((target->matte != MagickFalse) && (image->matte == MagickFalse)) (void) SetImageAlpha(image,OpaqueAlpha,exception); /* Set floodfill state. -- 2.40.0