From: Cristy Date: Sun, 8 Nov 2015 23:00:49 +0000 (-0500) Subject: Revert color patch X-Git-Tag: 7.0.1-0~505 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=db5a957ef878e77725654a4c0da6f09bc4182a84;p=imagemagick Revert color patch --- diff --git a/MagickCore/color.c b/MagickCore/color.c index df5b35f42..3fb0e1e44 100644 --- a/MagickCore/color.c +++ b/MagickCore/color.c @@ -2399,19 +2399,19 @@ MagickExport MagickBooleanType QueryColorCompliance(const char *name, if ((flags & PercentValue) != 0) scale=(double) (QuantumRange/100.0); if ((flags & RhoValue) != 0) - color->red=(double) ClampToQuantum((MagickRealType) floor(scale* + color->red=(double) ClampToQuantum((MagickRealType) (scale* geometry_info.rho)); if ((flags & SigmaValue) != 0) - color->green=(double) ClampToQuantum((MagickRealType) floor(scale* + color->green=(double) ClampToQuantum((MagickRealType) (scale* geometry_info.sigma)); if ((flags & XiValue) != 0) - color->blue=(double) ClampToQuantum((MagickRealType) floor(scale* + color->blue=(double) ClampToQuantum((MagickRealType) (scale* geometry_info.xi)); color->alpha=(double) OpaqueAlpha; if ((flags & PsiValue) != 0) { if (color->colorspace == CMYKColorspace) - color->black=(double) ClampToQuantum((MagickRealType) floor( + color->black=(double) ClampToQuantum((MagickRealType) ( scale*geometry_info.psi)); else if (color->alpha_trait != UndefinedPixelTrait) @@ -2426,10 +2426,10 @@ MagickExport MagickBooleanType QueryColorCompliance(const char *name, { if ((flags & SigmaValue) != 0) color->green=(MagickRealType) ClampToQuantum((MagickRealType) - floor(scale*geometry_info.sigma+(QuantumRange+1)/2.0)); + (scale*geometry_info.sigma+(QuantumRange+1)/2.0)); if ((flags & XiValue) != 0) color->blue=(MagickRealType) ClampToQuantum((MagickRealType) - floor(scale*geometry_info.xi+(QuantumRange+1)/2.0)); + (scale*geometry_info.xi+(QuantumRange+1)/2.0)); } if (LocaleCompare(colorspace,"gray") == 0) {