From: cristy <urban-warrior@git.imagemagick.org>
Date: Thu, 14 Jun 2012 11:49:49 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~5439
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e460acc48539a1b8dfe36755853def2bf435d8d8;p=imagemagick

---

diff --git a/Magick++/lib/Color.cpp b/Magick++/lib/Color.cpp
index a76b7fc06..555d0a4a9 100644
--- 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 79eb70feb..806dad54d 100644
--- 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;