(no commit message)

diff --git a/MagickCore/composite.c b/MagickCore/composite.c
index 47ef967ce73c176c65463760ee05c30116f209ca..9093844733db8c55540c9f31bbb1de07020d3877 100644 (file)
--- a/MagickCore/composite.c
+++ b/MagickCore/composite.c
@@ -266,7 +266,7 @@ static void HCLComposite(const double hue,const double chroma,const double luma,
                 r=c;      
                 b=x;      
               }
-  m=luma-0.298839*r+0.586811*g+0.114350*b;
+  m=luma-(0.298839*r+0.586811*g+0.114350*b);
   *red=QuantumRange*(r+m);
   *green=QuantumRange*(g+m);
   *blue=QuantumRange*(b+m);
@@ -299,7 +299,7 @@ static void CompositeHCL(const double red,const double green,const double blue,
     h=0.0;
   else
     if (red == max)
-      h=fmod((g-b)/c,6.0);
+      h=fmod(6.0+(g-b)/c,6.0);
     else
       if (green == max)
         h=((b-r)/c)+2.0;

diff --git a/MagickCore/gem.c b/MagickCore/gem.c
index a4e8df1e206c0c877ab7d4f7b5ed3fb01a59c74f..266260a67e95f52e2723703ea87b1618a69d44e2 100644 (file)
--- a/MagickCore/gem.c
+++ b/MagickCore/gem.c
@@ -144,7 +144,7 @@ MagickPrivate void ConvertHCLToRGB(const double hue,const double chroma,
                 r=c;      
                 b=x;      
               }
-  m=luma-0.298839*r+0.586811*g+0.114350*b;
+  m=luma-(0.298839*r+0.586811*g+0.114350*b);
   *red=QuantumRange*(r+m);
   *green=QuantumRange*(g+m);
   *blue=QuantumRange*(b+m);
@@ -478,7 +478,7 @@ MagickPrivate void ConvertRGBToHCL(const double red,const double green,
     h=0.0;
   else
     if (red == max)
-      h=fmod((g-b)/c,6.0);
+      h=fmod(6.0+(g-b)/c,6.0);
     else
       if (green == max)
         h=((b-r)/c)+2.0;