(no commit message)

diff --git a/MagickCore/draw.c b/MagickCore/draw.c
index ce1a91f5610325bd0d34e3f4488846b1d6b832e0..fd95e3b822aa7c8ecd14643013d08f6694da926c 100644 (file)
--- a/MagickCore/draw.c
+++ b/MagickCore/draw.c
@@ -52,6 +52,7 @@
 #include "MagickCore/cache.h"
 #include "MagickCore/cache-view.h"
 #include "MagickCore/color.h"
+#include "MagickCore/colorspace-private.h"
 #include "MagickCore/composite.h"
 #include "MagickCore/composite-private.h"
 #include "MagickCore/constitute.h"
@@ -1788,6 +1789,8 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info,
     exception);
   if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
     return(MagickFalse);
+  if (IsGrayColorspace(image->colorspace) != MagickFalse)
+    (void) TransformImageColorspace(image,sRGBColorspace,exception);
   status=MagickTrue;
   for (q=primitive; *q != '\0'; )
   {

diff --git a/MagickCore/fx.c b/MagickCore/fx.c
index 99e509fdee23161a4acb4c5cbf0bb68b4c414f4a..3ac1c15e4be825acfca62ef27c8ec894c47e150d 100644 (file)
--- a/MagickCore/fx.c
+++ b/MagickCore/fx.c
@@ -48,6 +48,7 @@
 #include "MagickCore/cache-view.h"
 #include "MagickCore/color.h"
 #include "MagickCore/color-private.h"
+#include "MagickCore/colorspace-private.h"
 #include "MagickCore/composite.h"
 #include "MagickCore/decorate.h"
 #include "MagickCore/distort.h"
@@ -716,7 +717,7 @@ MagickExport Image *ColorizeImage(const Image *image,const char *blend,
       if ((flags & ChiValue) != 0)
         fill_color.alpha=geometry_info.chi;
     }
-  if ((image->colorspace == GRAYColorspace) &&
+  if ((IsGrayColorspace(image->colorspace) != MagickFalse) &&
       (IsPixelInfoGray(&fill_color) != MagickFalse))
     colorize_image->colorspace=sRGBColorspace;
   /*