(no commit message)

diff --git a/ChangeLog b/ChangeLog
index a68a29faeaa164c640a52a0e9f5b434792da8539..9fc324eb6c4e220a8963c1239670b635e0617600 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@
 2009-09-22  6.5.6-4 Cristy  <quetzlzacatenango@image...>
   * Don't compile Huffman2DEncodeImage() unless the TIFF delegate library
     is enabled.
+  * Hue in hsl() format is 0-359 and does not use %.
 
 2009-09-21  6.5.6-3 Cristy  <quetzlzacatenango@image...>
   * Deprecate LevelImageColors(), replace with LevelColorsImage().

diff --git a/magick/color.c b/magick/color.c
index e3090994a8e476f094176b01856efdc86b29cbfd..be3afc93bbc4b9a59f4f626610cdd7e8c585bf18 100644 (file)
--- a/magick/color.c
+++ b/magick/color.c
@@ -681,6 +681,13 @@ MagickExport void ConcatenateColorComponent(const MagickPixelPacket *pixel,
       (void) ConcatenateMagickString(tuple,component,MaxTextExtent);
       return;
     }
+  if ((channel == RedChannel) && (pixel->colorspace == HSLColorspace))
+    {
+      (void) FormatMagickString(component,MaxTextExtent,"%g",
+        360.0*(QuantumScale*color));
+      (void) ConcatenateMagickString(tuple,component,MaxTextExtent);
+      return;
+    }
   if (pixel->depth > 8)
     {
       (void) FormatMagickString(component,MaxTextExtent,"%g%%",
@@ -3306,8 +3313,8 @@ MagickExport MagickBooleanType QueryMagickColor(const char *name,
           PixelPacket
             pixel;
 
-          geometry_info.rho=fmod(fmod(geometry_info.rho,360.0)+360.0,360.0)/
-            360.0;
+          geometry_info.rho=fmod(fmod(scale*geometry_info.rho,360.0)+360.0,
+            360.0)/360.0;
           geometry_info.sigma/=100.0;
           geometry_info.xi/=100.0;
           ConvertHSLToRGB(geometry_info.rho,geometry_info.sigma,