From: cristy Date: Sun, 17 Jun 2012 22:28:50 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~5411 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1c9986e46caed422e7a5bbd550ea0c9a8487acbd;p=imagemagick --- diff --git a/MagickCore/color.c b/MagickCore/color.c index 06870d170..31dfb13b3 100644 --- a/MagickCore/color.c +++ b/MagickCore/color.c @@ -2255,7 +2255,7 @@ MagickExport MagickBooleanType QueryColorCompliance(const char *name, } while (isxdigit((int) ((unsigned char) *name)) != MagickFalse); depth=4*(n/4); } - color->colorspace=UndefinedColorspace; + color->colorspace=sRGBColorspace; color->matte=MagickFalse; range=GetQuantumRange(depth); color->red=(MagickRealType) ScaleAnyToQuantum(pixel.red,range); diff --git a/MagickCore/colorspace.c b/MagickCore/colorspace.c index 6faad9e91..f5cd6581e 100644 --- a/MagickCore/colorspace.c +++ b/MagickCore/colorspace.c @@ -1305,6 +1305,8 @@ MagickExport MagickBooleanType SetImageColorspace(Image *image, image->chromaticity.white_point.y=0.3290; image->chromaticity.white_point.z=0.3583f; } + if (IsGrayColorspace(colorspace) != MagickFalse) + image->type=GrayscaleType; return(SyncImagePixelCache(image,exception)); } diff --git a/MagickCore/paint.c b/MagickCore/paint.c index 547f8cfbe..687b08f0d 100644 --- a/MagickCore/paint.c +++ b/MagickCore/paint.c @@ -461,7 +461,7 @@ MagickExport MagickBooleanType GradientImage(Image *image, image->matte=MagickFalse; if ((IsPixelInfoGray(start_color) != MagickFalse) && (IsPixelInfoGray(stop_color) != MagickFalse)) - image->type=GrayscaleType; + SetImageColorspace(image,GRAYColorspace,exception); return(status); }