(no commit message)

diff --git a/ChangeLog b/ChangeLog
index 100d0a24eb0cf7edbc455dd12b2b67d77383bb41..df877c8af473b5d2aeff30d7282a7deeec26ec1b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,7 +10,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 %.
+  * Hue in hsl() format is 0-360 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 1b86e6f4b90010232df5e10a3f7257ef548d09ea..65e3ee5d005fc9b4ad957da2b788a0928c640aa9 100644 (file)
--- a/magick/color.c
+++ b/magick/color.c
@@ -681,16 +681,6 @@ MagickExport void ConcatenateColorComponent(const MagickPixelPacket *pixel,
       (void) ConcatenateMagickString(tuple,component,MaxTextExtent);
       return;
     }
-  if ((channel == RedChannel) &&
-      ((pixel->colorspace == HSBColorspace) ||
-       (pixel->colorspace == HSLColorspace) ||
-       (pixel->colorspace == HWBColorspace)))
-    {
-      (void) FormatMagickString(component,MaxTextExtent,"%g",
-        360.0*(QuantumScale*color));
-      (void) ConcatenateMagickString(tuple,component,MaxTextExtent);
-      return;
-    }
   if (pixel->depth > 8)
     {
       (void) FormatMagickString(component,MaxTextExtent,"%g%%",
@@ -3311,58 +3301,35 @@ MagickExport MagickBooleanType QueryMagickColor(const char *name,
             color->opacity=(MagickRealType) RoundToQuantum((MagickRealType)
               (QuantumRange-QuantumRange*geometry_info.sigma));
         }
-      if (LocaleCompare(colorspace,"HSB") == 0)
-        {
-          PixelPacket
-            pixel;
-
-          geometry_info.rho=fmod(fmod(geometry_info.rho,360.0)+360.0,360.0)/
-            360.0;
-          scale=1.0/255.0;
-          if ((flags & PercentValue) != 0)
-            scale=1.0/100.0;
-          geometry_info.sigma*=scale;
-          geometry_info.xi*=scale;
-          ConvertHSBToRGB(geometry_info.rho,geometry_info.sigma,
-            geometry_info.xi,&pixel.red,&pixel.green,&pixel.blue);
-          color->colorspace=RGBColorspace;
-          color->red=(MagickRealType) pixel.red;
-          color->green=(MagickRealType) pixel.green;
-          color->blue=(MagickRealType) pixel.blue;
-        }
-      if (LocaleCompare(colorspace,"HSL") == 0)
+      if ((LocaleCompare(colorspace,"HSB") == 0) ||
+          (LocaleCompare(colorspace,"HSL") == 0) ||
+          (LocaleCompare(colorspace,"HWB") == 0))
         {
           PixelPacket
             pixel;
 
-          geometry_info.rho=fmod(fmod(geometry_info.rho,360.0)+360.0,360.0)/
-            360.0;
-          scale=1.0/255.0;
+          scale=1.0/360.0;
           if ((flags & PercentValue) != 0)
             scale=1.0/100.0;
-          geometry_info.sigma*=scale;
-          geometry_info.xi*=scale;
-          ConvertHSLToRGB(geometry_info.rho,geometry_info.sigma,
-            geometry_info.xi,&pixel.red,&pixel.green,&pixel.blue);
-          color->colorspace=RGBColorspace;
-          color->red=(MagickRealType) pixel.red;
-          color->green=(MagickRealType) pixel.green;
-          color->blue=(MagickRealType) pixel.blue;
-        }
-      if (LocaleCompare(colorspace,"HWB") == 0)
-        {
-          PixelPacket
-            pixel;
-
-          geometry_info.rho=fmod(fmod(geometry_info.rho,360.0)+360.0,360.0)/
-            360.0;
+          geometry_info.rho*=360.0*scale;
           scale=1.0/255.0;
           if ((flags & PercentValue) != 0)
             scale=1.0/100.0;
           geometry_info.sigma*=scale;
           geometry_info.xi*=scale;
-          ConvertHWBToRGB(geometry_info.rho,geometry_info.sigma,
-            geometry_info.xi,&pixel.red,&pixel.green,&pixel.blue);
+          if (LocaleCompare(colorspace,"HSB") == 0)
+            ConvertHSBToRGB(fmod(fmod(geometry_info.rho,360.0)+360.0,360.0)/
+              360.0,geometry_info.sigma,geometry_info.xi,&pixel.red,
+              &pixel.green,&pixel.blue);
+          else
+            if (LocaleCompare(colorspace,"HSL") == 0)
+              ConvertHSLToRGB(fmod(fmod(geometry_info.rho,360.0)+360.0,360.0)/
+                360.0,geometry_info.sigma,geometry_info.xi,&pixel.red,
+                &pixel.green,&pixel.blue);
+            else
+              ConvertHWBToRGB(fmod(fmod(geometry_info.rho,360.0)+360.0,360.0)/
+                360.0,geometry_info.sigma,geometry_info.xi,&pixel.red,
+                &pixel.green,&pixel.blue);
           color->colorspace=RGBColorspace;
           color->red=(MagickRealType) pixel.red;
           color->green=(MagickRealType) pixel.green;