From: cristy Date: Mon, 29 Apr 2013 00:07:58 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~3785 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=faa663d523d7b305a5d765543baba0641c125058;p=imagemagick --- diff --git a/MagickCore/colorspace.c b/MagickCore/colorspace.c index 44d25206f..3585f5dbc 100644 --- a/MagickCore/colorspace.c +++ b/MagickCore/colorspace.c @@ -130,7 +130,7 @@ static inline void ConvertXYZToLMS(const double x,const double y, assert(M != (double *) NULL); assert(S != (double *) NULL); l=0.7328f*x+0.4296f*y-0.1624f*z; - m=(-0.7036f*x+1.6975f*y+0.0415f*z); + m=(-0.7036f*x+1.6975f*y+0.0.0061f*z); s=0.0030f*x+0.0136f*y+0.9834f*z; *L=QuantumRange*l; *M=QuantumRange*m; diff --git a/MagickCore/enhance.c b/MagickCore/enhance.c index d2cb026b6..093c40d4f 100644 --- a/MagickCore/enhance.c +++ b/MagickCore/enhance.c @@ -1800,17 +1800,17 @@ MagickExport MagickBooleanType GammaImage(Image *image,const double gamma, */ #if !defined(MAGICKCORE_HDRI_SUPPORT) if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0) - image->colormap[i].red=(double) gamma_map[ - ScaleQuantumToMap(ClampToQuantum(image->colormap[i].red))]; + image->colormap[i].red=(double) gamma_map[ScaleQuantumToMap( + ClampToQuantum(image->colormap[i].red))]; if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0) - image->colormap[i].green=(double) gamma_map[ - ScaleQuantumToMap(ClampToQuantum(image->colormap[i].green))]; + image->colormap[i].green=(double) gamma_map[ScaleQuantumToMap( + ClampToQuantum(image->colormap[i].green))]; if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0) - image->colormap[i].blue=(double) gamma_map[ - ScaleQuantumToMap(ClampToQuantum(image->colormap[i].blue))]; + image->colormap[i].blue=(double) gamma_map[ScaleQuantumToMap( + ClampToQuantum(image->colormap[i].blue))]; if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) - image->colormap[i].alpha=(double) gamma_map[ - ScaleQuantumToMap(ClampToQuantum(image->colormap[i].alpha))]; + image->colormap[i].alpha=(double) gamma_map[ScaleQuantumToMap( + ClampToQuantum(image->colormap[i].alpha))]; #else if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0) image->colormap[i].red=gamma_pow(image->colormap[i].red,1.0/gamma);