(no commit message)

diff --git a/MagickCore/enhance.c b/MagickCore/enhance.c
index 2f28e4cc6af18e7f6b7a8c2db34bc49bc5116d94..4c873f40b192cb4a741195520ee5094effd514e9 100644 (file)
--- a/MagickCore/enhance.c
+++ b/MagickCore/enhance.c
@@ -2924,7 +2924,7 @@ static inline void ModulateHSL(const double percent_hue,
   hue+=0.5*(0.01*percent_hue-1.0);
   while (hue < 0.0)
     hue+=1.0;
-  while (hue > 1.0)
+  while (hue >= 1.0)
     hue-=1.0;
   saturation*=0.01*percent_saturation;
   lightness*=0.01*percent_lightness;
@@ -2947,7 +2947,7 @@ static inline void ModulateHWB(const double percent_hue,
   hue+=0.5*(0.01*percent_hue-1.0);
   while (hue < 0.0)
     hue+=1.0;
-  while (hue > 1.0)
+  while (hue >= 1.0)
     hue-=1.0;
   blackness*=0.01*percent_blackness;
   whiteness*=0.01*percent_whiteness;
@@ -2972,9 +2972,9 @@ static inline void ModulateLCH(const double percent_luma,
   hue+=0.5*(0.01*percent_hue-1.0);
   while (hue < 0.0)
     hue+=1.0;
-  while (hue > 1.0)
+  while (hue >= 1.0)
     hue-=1.0;
-  ConvertHCLToRGB(luma,chroma,hue,red,green,blue);
+  ConvertLCHToRGB(luma,chroma,hue,red,green,blue);
 }
 
 MagickExport MagickBooleanType ModulateImage(Image *image,const char *modulate,

diff --git a/MagickCore/gem.c b/MagickCore/gem.c
index c01f8da77d09018150a2c512444b2b31d52cdb6c..821cd17c0be6308a1bbb190aaeb14b431a8a6197 100644 (file)
--- a/MagickCore/gem.c
+++ b/MagickCore/gem.c
@@ -285,7 +285,7 @@ static inline double ConvertHueToRGB(double m1,double m2,double hue)
 {
   if (hue < 0.0)
     hue+=1.0;
-  if (hue > 1.0)
+  if (hue >= 1.0)
     hue-=1.0;
   if ((6.0*hue) < 1.0)
     return(m1+6.0*(m2-m1)*hue);
@@ -695,7 +695,7 @@ MagickExport void ConvertRGBToHSL(const double red,const double green,
           (delta/2.0)))/delta;
   if (*hue < 0.0)
     *hue+=1.0;
-  if (*hue > 1.0)
+  if (*hue >= 1.0)
     *hue-=1.0;
 }
 \f
@@ -812,14 +812,14 @@ MagickPrivate void ConvertRGBToLCH(const double red,const double green,
   ConvertRGBToXYZ(red,green,blue,&X,&Y,&Z);
   ConvertXYZToLab(X,Y,Z,&L,&a,&b);
   C=hypot(a-0.5,b-0.5);
-  H=180.0*atan2(b-0.5,a-0.5)/MagickPI;
+  H=180.0*atan2(b-0.5,a-0.5)/MagickPI/360.0;
   if (H < 0.0)
-    H+=360.0;
-  if (H >= 360.0)
-    H-=360.0;
+    H+=1.0;
+  if (H >= 1.0)
+    H-=1.0;
   *luma=L;
   *chroma=C;
-  *hue=H/360.0;
+  *hue=H;
 }
 \f
 /*