From: cristy <urban-warrior@git.imagemagick.org>
Date: Tue, 7 Feb 2012 19:43:53 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~6226
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5b67d4ea6079617babbc0142af28ed2d23040239;p=imagemagick

---

diff --git a/MagickCore/fx.c b/MagickCore/fx.c
index eeffe59c2..600c28ba5 100644
--- 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 09fdcae8c..531cb270d 100644
--- 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.
   */