(no commit message)

diff --git a/Magick++/lib/Magick++/Color.h b/Magick++/lib/Magick++/Color.h
index 6c53fd916c8d2918565d50d1e9f5bd950ba08da7..fff0f8e0b83052f633d998bcd2582a2d7b5e2a3e 100644 (file)
--- a/Magick++/lib/Magick++/Color.h
+++ b/Magick++/lib/Magick++/Color.h
@@ -327,35 +327,35 @@ inline void Magick::Color::initPixel()
 
 inline void Magick::Color::redQuantum ( Magick::Quantum red_ )
 {
-  _pixel->red = red_;
+  _pixel->red = (double) red_;
   _isValid = true;
 }
 
 inline Magick::Quantum Magick::Color::redQuantum ( void ) const
 {
-  return _pixel->red;
+  return ClampToQuantum(_pixel->red);
 }
 
 inline void Magick::Color::greenQuantum ( Magick::Quantum green_ )
 {
-  _pixel->green = green_;
+  _pixel->green = (double) green_;
   _isValid = true;
 }
 
 inline Magick::Quantum  Magick::Color::greenQuantum ( void ) const
 {
-  return _pixel->green;
+  return ClampToQuantum(_pixel->green);
 }
 
 inline void  Magick::Color::blueQuantum ( Magick::Quantum blue_ )
 {
-  _pixel->blue = blue_;
+  _pixel->blue = (double) blue_;
   _isValid = true;
 }
 
 inline Magick::Quantum Magick::Color::blueQuantum ( void ) const
 {
-  return _pixel->blue;
+  return ClampToQuantum(_pixel->blue);
 }
 
 inline void  Magick::Color::alphaQuantum ( Magick::Quantum alpha_ )
@@ -366,7 +366,7 @@ inline void  Magick::Color::alphaQuantum ( Magick::Quantum alpha_ )
 
 inline Magick::Quantum Magick::Color::alphaQuantum ( void ) const
 {
-  return _pixel->alpha;
+  return MagickCore::ClampToQuantum(_pixel->alpha);
 }
 
 // Return ImageMagick PixelInfo struct based on color.

diff --git a/Magick++/lib/Magick++/Include.h b/Magick++/lib/Magick++/Include.h
index 6b6b8aa8c4bcb2202f88e0a2b2ca612009e4850c..9085474991015d682a012b5a9eea24a383e43739 100644 (file)
--- a/Magick++/lib/Magick++/Include.h
+++ b/Magick++/lib/Magick++/Include.h
@@ -571,6 +571,7 @@ namespace Magick
   using MagickCore::CharcoalImage;
   using MagickCore::ChopImage;
   using MagickCore::ClearMagickException;
+  using MagickCore::ClampToQuantum;
   using MagickCore::CloneDrawInfo;
   using MagickCore::CloneImage;
   using MagickCore::CloneImageInfo;