From: cristy <urban-warrior@git.imagemagick.org>
Date: Tue, 14 Aug 2012 23:22:31 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~5135
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f2c5f4a854ad549e5067a82856b3d0c975692465;p=imagemagick

---

diff --git a/MagickCore/composite.c b/MagickCore/composite.c
index 47ef967ce..909384473 100644
--- 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 a4e8df1e2..266260a67 100644
--- 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;