commit c41e5fa39a01f3b6e5d26cc7b32afe5556038f21
author cristy <urban-warrior@git.imagemagick.org> Wed May 01 01:24:25 2013 +0000
committer cristy <urban-warrior@git.imagemagick.org> Wed May 01 01:24:25 2013 +0000
tree 9d1b7ccca68bc8594bd3ea6c946ff1125bb32443
parent f69bbdf5ea4897b1c8d9349190c439041246c4ec

MagickCore/gem.c

diff --git a/MagickCore/gem.c b/MagickCore/gem.c
index b844bbb..c6eb401 100644
--- a/MagickCore/gem.c
+++ b/MagickCore/gem.c
@@ -95,7 +95,8 @@
     h,
     m,
     r,
-    x;
+    x,
+    z;
 
   /*
     Convert HCL to RGB colorspace.
@@ -145,9 +146,21 @@
                 b=x;
               }
   m=luma-(0.298839f*r+0.586811f*g+0.114350f*b);
-  *red=QuantumRange*(r+m);
-  *green=QuantumRange*(g+m);
-  *blue=QuantumRange*(b+m);
+  z=1.0;
+  if (m < 0.0)
+    {
+      z=luma/(luma-m);
+      m=0.0;
+    }
+  else
+    if (m+c > 1.0)
+      {
+        z=(1.0-luma)/(m+c-luma);
+        m=1.0-z*c;
+      }
+  *red=ClampToQuantum(QuantumRange*(z*r+m));
+  *green=ClampToQuantum(QuantumRange*(z*g+m));
+  *blue=ClampToQuantum(QuantumRange*(z*b+m));
 }
 
 /*