(no commit message)

diff --git a/MagickCore/animate.c b/MagickCore/animate.c
index 47336e4b801a2de355c925a0d61baf8d170848ce..269ea0baaefccbca19de1353c8adb73ebde3965f 100644 (file)
--- 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 c7750c170eb0eb8e21bd74b32df30c9285982356..946309ffee953a14dcc3293e9602f77bbe50b2b4 100644 (file)
--- 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 531cb270d9ff6cd4521de7aac5c432ef2d95470b..1b6c56199d0662dbe7fd97d9c6ff5a5200e099ee 100644 (file)
--- 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.