commit 9c0b6f7a9b41c104325568c92147ce4506f79623
author cristy <urban-warrior@git.imagemagick.org> Sun Jan 01 23:14:31 2012 +0000
committer cristy <urban-warrior@git.imagemagick.org> Sun Jan 01 23:14:31 2012 +0000
tree cdb51c9d4bebaa01db2918d8f74d5e90bbe555d3
parent f69b0ef3720234674ff1b9c9417eba4d9e45cc09

Magick++/lib/Color.cpp

diff --git a/Magick++/lib/Color.cpp b/Magick++/lib/Color.cpp
index 364bfaf..a76b7fc 100644
--- a/Magick++/lib/Color.cpp
+++ b/Magick++/lib/Color.cpp
@@ -198,10 +198,10 @@
   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 @@
 		 &green,
 		 &blue );
 
-  redQuantum   ( red );
-  greenQuantum ( green );
-  blueQuantum  ( blue );
+  redQuantum   ( ClampToQuantum( red ) );
+  greenQuantum ( ClampToQuantum( green ) );
+  blueQuantum  ( ClampToQuantum( blue ) );
   alphaQuantum ( OpaqueAlpha );
 }
 
@@ -355,9 +355,9 @@
 		 &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 @@
 		 &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 @@
 		 &blue
 		 );
   
-  redQuantum   ( red );
-  greenQuantum ( green );
-  blueQuantum  ( blue );
+  redQuantum   ( ClampToQuantum( red ) );
+  greenQuantum ( ClampToQuantum( green ) );
+  blueQuantum  ( ClampToQuantum( blue ) );
 }
 
 double Magick::ColorHSL::luminosity ( void ) const

Magick++/lib/Image.cpp

diff --git a/Magick++/lib/Image.cpp b/Magick++/lib/Image.cpp
index 8f2296a..5b69b4e 100644
--- a/Magick++/lib/Image.cpp
+++ b/Magick++/lib/Image.cpp
@@ -3416,9 +3416,9 @@
 }
 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

Magick++/lib/Magick++/Color.h

diff --git a/Magick++/lib/Magick++/Color.h b/Magick++/lib/Magick++/Color.h
index fff0f8e..2c3c9a7 100644
--- a/Magick++/lib/Magick++/Color.h
+++ b/Magick++/lib/Magick++/Color.h
@@ -333,7 +333,7 @@
 
 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 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 Magick::Quantum Magick::Color::blueQuantum ( void ) const
 {
-  return ClampToQuantum(_pixel->blue);
+  return MagickCore::ClampToQuantum(_pixel->blue);
 }
 
 inline void  Magick::Color::alphaQuantum ( Magick::Quantum alpha_ )