From 6d897c70de36922ef314127ac8a202e0605bbead Mon Sep 17 00:00:00 2001 From: cristy Date: Wed, 19 Jun 2013 19:20:40 +0000 Subject: [PATCH] --- MagickCore/gem.c | 8 ++++---- tests/validate.c | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/MagickCore/gem.c b/MagickCore/gem.c index 440e2b149..b03cf9d43 100644 --- a/MagickCore/gem.c +++ b/MagickCore/gem.c @@ -762,7 +762,7 @@ MagickPrivate void ConvertLCHabToRGB(const double luma,const double chroma, assert(red != (double *) NULL); assert(green != (double *) NULL); assert(blue != (double *) NULL); - ConvertLCHabToXYZ(100.0*luma,255.0*(chroma-0.5),360.0*(hue-0.5),&X,&Y,&Z); + ConvertLCHabToXYZ(100.0*luma,255.0*(chroma-0.5),360.0*hue,&X,&Y,&Z); ConvertXYZToRGB(X,Y,Z,red,green,blue); } @@ -815,7 +815,7 @@ MagickPrivate void ConvertLCHuvToRGB(const double luma,const double chroma, assert(red != (double *) NULL); assert(green != (double *) NULL); assert(blue != (double *) NULL); - ConvertLCHuvToXYZ(100.0*luma,255.0*(chroma-0.5),360.0*(hue-0.5),&X,&Y,&Z) + ConvertLCHuvToXYZ(100.0*luma,255.0*(chroma-0.5),360.0*hue,&X,&Y,&Z) ConvertXYZToRGB(X,Y,Z,red,green,blue); } @@ -1343,7 +1343,7 @@ static inline void ConvertXYZToLCHab(const double X,const double Y, ConvertXYZToLab(X,Y,Z,luma,&a,&b); *chroma=hypot(255.0*(a-0.5),255.0*(b-0.5))/255.0+0.5; - *hue=180.0*atan2(255.0*(b-0.5),255.0*(a-0.5))/MagickPI/360.0+0.5; + *hue=180.0*atan2(255.0*(b-0.5),255.0*(a-0.5))/MagickPI/360.0; if (*hue < 0.0) *hue+=1.0; } @@ -1404,7 +1404,7 @@ static inline void ConvertXYZToLCHuv(const double X,const double Y, ConvertXYZToLuv(X,Y,Z,luma,&u,&v); *chroma=hypot(354.0*u-134.0,262.0*v-140.0)/255.0+0.5; - *hue=180.0*atan2(262.0*v-140.0,354.0*u-134.0)/MagickPI/360.0+0.5; + *hue=180.0*atan2(262.0*v-140.0,354.0*u-134.0)/MagickPI/360.0; if (*hue < 0.0) *hue+=1.0; } diff --git a/tests/validate.c b/tests/validate.c index 9640d5d0a..4a9d68c50 100644 --- a/tests/validate.c +++ b/tests/validate.c @@ -497,7 +497,7 @@ static void ConvertLCHabToRGB(const double luma,const double chroma, Y, Z; - ConvertLCHabToXYZ(luma*100.0,255.0*(chroma-0.5),360.0*(hue-0.5),&X,&Y,&Z); + ConvertLCHabToXYZ(luma*100.0,255.0*(chroma-0.5),360.0*hue,&X,&Y,&Z); ConvertXYZToRGB(X,Y,Z,red,green,blue); } @@ -545,7 +545,7 @@ static inline void ConvertXYZToLCHab(const double X,const double Y, ConvertXYZToLab(X,Y,Z,luma,&a,&b); *chroma=hypot(255.0*(a-0.5),255.0*(b-0.5))/255.0+0.5; - *hue=180.0*atan2(255.0*(b-0.5),255.0*(a-0.5))/MagickPI/360.0+0.5; + *hue=180.0*atan2(255.0*(b-0.5),255.0*(a-0.5))/MagickPI/360.0; if (*hue < 0.0) *hue+=1.0; } -- 2.40.0