(no commit message)

diff --git a/Magick++/lib/Color.cpp b/Magick++/lib/Color.cpp
index 364bfaff7af1ef9ea2e47388d98ada9e9dbb18b2..a76b7fc06e6ce823228e92afda285beba9613402 100644 (file)
--- a/Magick++/lib/Color.cpp
+++ b/Magick++/lib/Color.cpp
@@ -198,10 +198,10 @@ const Magick::Color& Magick::Color::operator = ( const std::string &x11color_ )
   GetExceptionInfo( &exception );
   if ( QueryColorCompliance( x11color_.c_str(), AllCompliance, &target_color, &exception ) )
     {
-      redQuantum( target_color.red );
-      greenQuantum( target_color.green );
-      blueQuantum( target_color.blue );
-      alphaQuantum( target_color.alpha );
+      redQuantum( ClampToQuantum( target_color.red ) );
+      greenQuantum( ClampToQuantum( target_color.green ) );
+      blueQuantum( ClampToQuantum( target_color.blue ) );
+      alphaQuantum( ClampToQuantum( target_color.alpha ) );
 
       if ( target_color.alpha != OpaqueAlpha )
        _pixelType = RGBAPixel;
@@ -310,9 +310,9 @@ Magick::ColorHSL::ColorHSL ( double hue_,
                 &green,
                 &blue );
 
-  redQuantum   ( red );
-  greenQuantum ( green );
-  blueQuantum  ( blue );
+  redQuantum   ( ClampToQuantum( red ) );
+  greenQuantum ( ClampToQuantum( green ) );
+  blueQuantum  ( ClampToQuantum( blue ) );
   alphaQuantum ( OpaqueAlpha );
 }
 
@@ -355,9 +355,9 @@ void Magick::ColorHSL::hue ( double hue_ )
                 &blue
                 );
 
-  redQuantum   ( red );
-  greenQuantum ( green );
-  blueQuantum  ( blue );
+  redQuantum   ( ClampToQuantum( red ) );
+  greenQuantum ( ClampToQuantum( green ) );
+  blueQuantum  ( ClampToQuantum( blue ) );
 }
 
 double Magick::ColorHSL::hue ( void ) const
@@ -393,9 +393,9 @@ void Magick::ColorHSL::saturation ( double saturation_ )
                 &blue
                 );
 
-  redQuantum   ( red );
-  greenQuantum ( green );
-  blueQuantum  ( blue );
+  redQuantum   ( ClampToQuantum( red ) );
+  greenQuantum ( ClampToQuantum( green ) );
+  blueQuantum  ( ClampToQuantum( blue ) );
 }
 
 double Magick::ColorHSL::saturation ( void ) const
@@ -431,9 +431,9 @@ void Magick::ColorHSL::luminosity ( double luminosity_ )
                 &blue
                 );
   
-  redQuantum   ( red );
-  greenQuantum ( green );
-  blueQuantum  ( blue );
+  redQuantum   ( ClampToQuantum( red ) );
+  greenQuantum ( ClampToQuantum( green ) );
+  blueQuantum  ( ClampToQuantum( blue ) );
 }
 
 double Magick::ColorHSL::luminosity ( void ) const

diff --git a/Magick++/lib/Image.cpp b/Magick++/lib/Image.cpp
index 8f2296adf4caa35b1314d6c020dc393b8cacc634..5b69b4e74b6d02816cace21fc7794138cc47672b 100644 (file)
--- a/Magick++/lib/Image.cpp
+++ b/Magick++/lib/Image.cpp
@@ -3416,9 +3416,9 @@ void Magick::Image::matteColor ( const Color &matteColor_ )
 }
 Magick::Color Magick::Image::matteColor ( void ) const
 {
-  return Color( constImage()->matte_color.red,
-               constImage()->matte_color.green,
-               constImage()->matte_color.blue );
+  return Color( ClampToQuantum( constImage()->matte_color.red ),
+               ClampToQuantum( constImage()->matte_color.green ),
+               ClampToQuantum( constImage()->matte_color.blue ) );
 }
 
 double Magick::Image::meanErrorPerPixel ( void ) const

diff --git a/Magick++/lib/Magick++/Color.h b/Magick++/lib/Magick++/Color.h
index fff0f8e0b83052f633d998bcd2582a2d7b5e2a3e..2c3c9a7d38cd6e66a7ada59c46b641e94230353d 100644 (file)
--- a/Magick++/lib/Magick++/Color.h
+++ b/Magick++/lib/Magick++/Color.h
@@ -333,7 +333,7 @@ inline void Magick::Color::redQuantum ( Magick::Quantum red_ )
 
 inline Magick::Quantum Magick::Color::redQuantum ( void ) const
 {
-  return ClampToQuantum(_pixel->red);
+  return MagickCore::ClampToQuantum(_pixel->red);
 }
 
 inline void Magick::Color::greenQuantum ( Magick::Quantum green_ )
@@ -344,7 +344,7 @@ inline void Magick::Color::greenQuantum ( Magick::Quantum green_ )
 
 inline Magick::Quantum  Magick::Color::greenQuantum ( void ) const
 {
-  return ClampToQuantum(_pixel->green);
+  return MagickCore::ClampToQuantum(_pixel->green);
 }
 
 inline void  Magick::Color::blueQuantum ( Magick::Quantum blue_ )
@@ -355,7 +355,7 @@ inline void  Magick::Color::blueQuantum ( Magick::Quantum blue_ )
 
 inline Magick::Quantum Magick::Color::blueQuantum ( void ) const
 {
-  return ClampToQuantum(_pixel->blue);
+  return MagickCore::ClampToQuantum(_pixel->blue);
 }
 
 inline void  Magick::Color::alphaQuantum ( Magick::Quantum alpha_ )