(no commit message)

diff --git a/MagickCore/fx.c b/MagickCore/fx.c
index eeffe59c2e8933d48909282ba4ace3026872559f..600c28ba5f211d66a28d4ec9480e8172e0c3107b 100644 (file)
--- a/MagickCore/fx.c
+++ b/MagickCore/fx.c
@@ -688,6 +688,9 @@ MagickExport Image *ColorizeImage(const Image *image,const char *blend,
       colorize_image=DestroyImage(colorize_image);
       return((Image *) NULL);
     }
+  if ((colorize->matte != MagickFalse) &&
+      (colorize_image->matte == MagickFalse))
+    (void) SetImageAlpha(colorize_image,OpaqueAlpha,exception);
   if (blend == (const char *) NULL)
     return(colorize_image);
   /*

diff --git a/MagickCore/paint.c b/MagickCore/paint.c
index 09fdcae8cf4d2b44ad399246b01203c11b3f58c7..531cb270d9ff6cd4521de7aac5c432ef2d95470b 100644 (file)
--- a/MagickCore/paint.c
+++ b/MagickCore/paint.c
@@ -171,8 +171,11 @@ 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)
-    (void) SetImageAlphaChannel(image,OpaqueAlphaChannel,exception);
+    (void) SetImageAlpha(image,OpaqueAlpha,exception);
   /*
     Set floodfill state.
   */