From: cristy <urban-warrior@git.imagemagick.org>
Date: Sun, 16 Nov 2014 00:20:47 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~1734
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=47eb714166cbd26f06424b166f2fcb4a48953a38;p=imagemagick

---

diff --git a/MagickCore/annotate.c b/MagickCore/annotate.c
index 1316c8cd1..13a813c88 100644
--- a/MagickCore/annotate.c
+++ b/MagickCore/annotate.c
@@ -1293,7 +1293,13 @@ static MagickBooleanType RenderFreetype(Image *image,const DrawInfo *draw_info,
       if (image->storage_class != DirectClass)
         (void) SetImageStorageClass(image,DirectClass,exception);
       if (image->alpha_trait == UndefinedPixelTrait)
-        (void) SetImageAlphaChannel(image,OpaqueAlphaChannel,exception);
+        if ((draw_info->fill.alpha != OpaqueAlpha) ||
+            ((draw_info->fill_pattern != (Image *) NULL) &&
+             (draw_info->fill_pattern->alpha_trait != UndefinedPixelTrait)) ||
+            (draw_info->stroke.alpha != TransparentAlpha) ||
+            ((draw_info->stroke_pattern != (Image *) NULL) &&
+             (draw_info->stroke_pattern->alpha_trait != UndefinedPixelTrait)))
+         (void) SetImageAlphaChannel(image,OpaqueAlphaChannel,exception);
     }
   direction=1.0;
   if (draw_info->direction == RightToLeftDirection)