Changeset 431

Timestamp:

10/22/09 16:59:52 (5 months ago)

Author:

cristy

Message:

 

Location:

ImageMagick/trunk

Files:

• ChangeLog (modified) (1 diff)
• magick/gem.c (modified) (1 diff)

ImageMagick/trunk/ChangeLog

@@ -5 +5 @@
   * Alpha blending is not required for ScaleImage().
   * Guassian noise operator is not longer discontinuous.
+  * Correct hue computation for the HSB colorspace.
 
 2009-10-14  6.5.7-0 Pino Toscano  <pino@kde...>

ImageMagick/trunk/magick/gem.c

@@ -373 +373 @@
   if (delta == 0.0)
     return;
-  if ((MagickRealType) red == max)
-    *hue=(double) ((green-(MagickRealType) blue)/delta);
+  if (red == max)
+    *hue=((((max-blue)/6.0)+(delta/2.0))-(((max-green)/6.0)+(delta/2.0)))/delta;
   else
-    if ((MagickRealType) green == max)
-      *hue=(double) (2.0+(blue-(MagickRealType) red)/delta);
+    if (green == max)
+      *hue=(1.0/3.0)+((((max-red)/6.0)+(delta/2.0))-(((max-blue)/6.0)+
+        (delta/2.0)))/delta;
     else
-      *hue=(double) (4.0+(red-(MagickRealType) green)/delta);
-  *hue/=6.0;
+      if (blue == max)
+        *hue=(2.0/3.0)+((((max-green)/6.0)+(delta/2.0))-(((max-red)/6.0)+
+          (delta/2.0)))/delta;
   if (*hue < 0.0)
     *hue+=1.0;
+  if (*hue > 1.0)
+    *hue-=1.0;
 }