From f465715c0c70b2f9f523957bef27a110c0a8e386 Mon Sep 17 00:00:00 2001 From: cristy Date: Fri, 16 Apr 2010 18:44:09 +0000 Subject: [PATCH] --- ChangeLog | 2 ++ magick/colorspace.c | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 05cbaded7..674f861b1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ 2010-04-15 6.6.1-4 Cristy * Do not set the resample virtual pixel method when undefined. * Support writing grayscale PSD images. + * Revert Lab-to-XYZ colorspace transform patch. + * Clamp HDRI values for LevelImageChannel() method. 2010-04-12 6.6.1-3 Cristy * For HSL to RGB, if color temperature is less than 0, set RGB to lightness. diff --git a/magick/colorspace.c b/magick/colorspace.c index 6eeae0df8..814b22423 100644 --- a/magick/colorspace.c +++ b/magick/colorspace.c @@ -1300,9 +1300,9 @@ static inline void ConvertXYZToRGB(const double x,const double y,const double z, assert(red != (Quantum *) NULL); assert(green != (Quantum *) NULL); assert(blue != (Quantum *) NULL); - r=3.2407100*x-1.5372600*y-0.4985710*z; - g=(-0.9692580*x+1.8759900*y+0.0415557*z); - b=0.0556352*x-0.2039960*y+1.0570700*z; + r=3.2404542*x-1.5371385*y-0.4985314*z; + g=(-0.9692660*x+1.8760108*y+0.0415560*z); + b=0.0556434*x-0.2040259*y+1.0572252*z; if (r > 0.0031308) r=1.055*pow(r,1.0/2.4)-0.055; else @@ -1315,9 +1315,9 @@ static inline void ConvertXYZToRGB(const double x,const double y,const double z, b=1.055*pow(b,1.0/2.4)-0.055; else b*=12.92; - *red=ClampToQuantum((MagickRealType) QuantumRange*r); - *green=ClampToQuantum((MagickRealType) QuantumRange*g); - *blue=ClampToQuantum((MagickRealType) QuantumRange*b); + *red=RoundToQuantum((MagickRealType) QuantumRange*r); + *green=RoundToQuantum((MagickRealType) QuantumRange*g); + *blue=RoundToQuantum((MagickRealType) QuantumRange*b); } static inline void ConvertCMYKToRGB(MagickPixelPacket *pixel) -- 2.40.0