(no commit message)

diff --git a/Magick++/lib/Color.cpp b/Magick++/lib/Color.cpp
index a76b7fc06e6ce823228e92afda285beba9613402..555d0a4a90ce13d704fef3d8e8bce347a307bb3b 100644 (file)
--- a/Magick++/lib/Color.cpp
+++ b/Magick++/lib/Color.cpp
@@ -303,7 +303,7 @@ Magick::ColorHSL::ColorHSL ( double hue_,
 {
   double red, green, blue;
 
-  ConvertHSLToRGB ( hue_,
+  ConvertHSLTosRGB ( hue_,
                 saturation_,
                 luminosity_,
                 &red,
@@ -337,7 +337,7 @@ Magick::ColorHSL::~ColorHSL ( )
 void Magick::ColorHSL::hue ( double hue_ )
 {
   double hue_val, saturation_val, luminosity_val;
-  ConvertRGBToHSL ( redQuantum(),
+  ConvertsRGBToHSL ( redQuantum(),
                 greenQuantum(),
                 blueQuantum(),
                 &hue_val,
@@ -347,7 +347,7 @@ void Magick::ColorHSL::hue ( double hue_ )
   hue_val = hue_;
 
   double red, green, blue;
-  ConvertHSLToRGB ( hue_val,
+  ConvertHSLTosRGB ( hue_val,
                 saturation_val,
                 luminosity_val,
                 &red,
@@ -363,7 +363,7 @@ void Magick::ColorHSL::hue ( double hue_ )
 double Magick::ColorHSL::hue ( void ) const
 {
   double hue_val, saturation_val, luminosity_val;
-  ConvertRGBToHSL ( redQuantum(),
+  ConvertsRGBToHSL ( redQuantum(),
                 greenQuantum(),
                 blueQuantum(),
                 &hue_val,
@@ -375,7 +375,7 @@ double Magick::ColorHSL::hue ( void ) const
 void Magick::ColorHSL::saturation ( double saturation_ )
 {
   double hue_val, saturation_val, luminosity_val;
-  ConvertRGBToHSL ( redQuantum(),
+  ConvertsRGBToHSL ( redQuantum(),
                 greenQuantum(),
                 blueQuantum(),
                 &hue_val,
@@ -385,7 +385,7 @@ void Magick::ColorHSL::saturation ( double saturation_ )
   saturation_val = saturation_;
   
   double red, green, blue;
-  ConvertHSLToRGB ( hue_val,
+  ConvertHSLTosRGB ( hue_val,
                 saturation_val,
                 luminosity_val,
                 &red,
@@ -401,7 +401,7 @@ void Magick::ColorHSL::saturation ( double saturation_ )
 double Magick::ColorHSL::saturation ( void ) const
 {
   double hue_val, saturation_val, luminosity_val;
-  ConvertRGBToHSL ( redQuantum(),
+  ConvertsRGBToHSL ( redQuantum(),
                 greenQuantum(),
                 blueQuantum(),
                 &hue_val,
@@ -413,7 +413,7 @@ double Magick::ColorHSL::saturation ( void ) const
 void Magick::ColorHSL::luminosity ( double luminosity_ )
 {
   double hue_val, saturation_val, luminosity_val;
-  ConvertRGBToHSL ( redQuantum(),
+  ConvertsRGBToHSL ( redQuantum(),
                 greenQuantum(),
                 blueQuantum(),
                 &hue_val,
@@ -423,7 +423,7 @@ void Magick::ColorHSL::luminosity ( double luminosity_ )
   luminosity_val = luminosity_;
   
   double red, green, blue;
-  ConvertHSLToRGB ( hue_val,
+  ConvertHSLTosRGB ( hue_val,
                 saturation_val,
                 luminosity_val,
                 &red,
@@ -439,7 +439,7 @@ void Magick::ColorHSL::luminosity ( double luminosity_ )
 double Magick::ColorHSL::luminosity ( void ) const
 {
   double hue_val, saturation_val, luminosity_val;
-  ConvertRGBToHSL ( redQuantum(),
+  ConvertsRGBToHSL ( redQuantum(),
                 greenQuantum(),
                 blueQuantum(),
                 &hue_val,

diff --git a/Magick++/lib/Magick++/Include.h b/Magick++/lib/Magick++/Include.h
index 79eb70febdcea0c9507a77429104dbb1a0e4864d..806dad54dbfbbd3cf1e4ece029b937c0ac45f7d3 100644 (file)
--- a/Magick++/lib/Magick++/Include.h
+++ b/Magick++/lib/Magick++/Include.h
@@ -606,8 +606,8 @@ namespace Magick
   using MagickCore::ConfigureWarning;
   using MagickCore::ConstituteImage;
   using MagickCore::ContrastImage;
-  using MagickCore::ConvertHSLToRGB;
-  using MagickCore::ConvertRGBToHSL;
+  using MagickCore::ConvertHSLTosRGB;
+  using MagickCore::ConvertsRGBToHSL;
   using MagickCore::ConvolveImage;
   using MagickCore::CopyMagickString;
   using MagickCore::CorruptImageError;