From: cristy <urban-warrior@git.imagemagick.org>
Date: Wed, 15 Feb 2012 23:40:22 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~6174
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=707f063768cf47f767b9bf194aa96d2553ac0460;p=imagemagick

---

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.