From: cristy Date: Sun, 8 Apr 2012 22:26:56 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~5868 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9b7a4fc3eac8ad469e30faaf58be3a0f8638e870;p=imagemagick --- diff --git a/MagickCore/draw.c b/MagickCore/draw.c index ce1a91f56..fd95e3b82 100644 --- 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 99e509fde..3ac1c15e4 100644 --- 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; /*