From 0257d3822dae3829690a64b809dbda8adc0214f9 Mon Sep 17 00:00:00 2001 From: cristy Date: Sun, 15 Apr 2012 00:37:39 +0000 Subject: [PATCH] --- MagickCore/color.c | 6 +++--- MagickCore/colorspace.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/MagickCore/color.c b/MagickCore/color.c index 44464b048..3c33287f6 100644 --- a/MagickCore/color.c +++ b/MagickCore/color.c @@ -2252,7 +2252,7 @@ MagickExport MagickBooleanType QueryColorCompliance(const char *name, } while (isxdigit((int) ((unsigned char) *name)) != MagickFalse); depth=4*(n/4); } - color->colorspace=RGBColorspace; + color->colorspace=sRGBColorspace; color->matte=MagickFalse; range=GetQuantumRange(depth); color->red=(MagickRealType) ScaleAnyToQuantum(pixel.red,range); @@ -2357,7 +2357,7 @@ MagickExport MagickBooleanType QueryColorCompliance(const char *name, ConvertHWBToRGB(fmod(fmod(geometry_info.rho,360.0)+360.0,360.0)/ 360.0,geometry_info.sigma,geometry_info.xi,&pixel.red, &pixel.green,&pixel.blue); - color->colorspace=RGBColorspace; + color->colorspace=sRGBColorspace; color->red=(MagickRealType) pixel.red; color->green=(MagickRealType) pixel.green; color->blue=(MagickRealType) pixel.blue; @@ -2370,7 +2370,7 @@ MagickExport MagickBooleanType QueryColorCompliance(const char *name, p=GetColorCompliance(name,compliance,exception); if (p == (const ColorInfo *) NULL) return(MagickFalse); - color->colorspace=RGBColorspace; + color->colorspace=sRGBColorspace; color->matte=p->color.alpha != OpaqueAlpha ? MagickTrue : MagickFalse; color->red=(MagickRealType) p->color.red; color->green=(MagickRealType) p->color.green; diff --git a/MagickCore/colorspace.c b/MagickCore/colorspace.c index b07cb119d..e7410737b 100644 --- a/MagickCore/colorspace.c +++ b/MagickCore/colorspace.c @@ -211,7 +211,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, assert(image->signature == MagickSignature); if (image->debug != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); - assert(colorspace != RGBColorspace); + assert(colorspace != sRGBColorspace); assert(colorspace != TransparentColorspace); assert(colorspace != UndefinedColorspace); if (SetImageColorspace(image,colorspace,exception) == MagickFalse) @@ -1250,7 +1250,7 @@ MagickExport MagickBooleanType TransformImageColorspace(Image *image, /* Convert the reference image from an alternate colorspace to RGB. */ - if ((colorspace == RGBColorspace) || (colorspace == TransparentColorspace)) + if ((colorspace == sRGBColorspace) || (colorspace == TransparentColorspace)) return(TransformRGBImage(image,colorspace,exception)); status=MagickTrue; if (IsRGBColorspace(image->colorspace) == MagickFalse) -- 2.40.0