(no commit message)

diff --git a/Magick++/lib/Color.cpp b/Magick++/lib/Color.cpp
index 1260a72e30a60bf665237c708cb3badf711703e9..640212c18f1547ecaeda94aaeb9f1362fcf1249e 100644 (file)
--- a/Magick++/lib/Color.cpp
+++ b/Magick++/lib/Color.cpp
@@ -19,7 +19,7 @@ using namespace std;
 //
 // Color operator fuctions
 //
-ssize_t Magick::operator == ( const Magick::Color& left_,
+int Magick::operator == ( const Magick::Color& left_,
                          const Magick::Color& right_ )
 {
   return ( ( left_.isValid()      == right_.isValid() ) && 
@@ -28,17 +28,17 @@ ssize_t Magick::operator == ( const Magick::Color& left_,
           ( left_.blueQuantum()  == right_.blueQuantum() )
          );
 }
-ssize_t Magick::operator != ( const Magick::Color& left_,
+int Magick::operator != ( const Magick::Color& left_,
                          const Magick::Color& right_ )
 {
   return ( ! (left_ == right_) );
 }
-ssize_t Magick::operator >  ( const Magick::Color& left_,
+int Magick::operator >  ( const Magick::Color& left_,
                          const Magick::Color& right_ )
 {
   return ( !( left_ < right_ ) && ( left_ != right_ ) );
 }
-ssize_t Magick::operator <  ( const Magick::Color& left_,
+int Magick::operator <  ( const Magick::Color& left_,
                          const Magick::Color& right_ )
 {
     if(left_.redQuantum() < right_.redQuantum()) return true;
@@ -48,12 +48,12 @@ ssize_t Magick::operator <  ( const Magick::Color& left_,
     if(left_.blueQuantum() < right_.blueQuantum()) return true;
     return false;
 }
-ssize_t Magick::operator >= ( const Magick::Color& left_,
+int Magick::operator >= ( const Magick::Color& left_,
                          const Magick::Color& right_ )
 {
   return ( ( left_ > right_ ) || ( left_ == right_ ) );
 }
-ssize_t Magick::operator <= ( const Magick::Color& left_,
+int Magick::operator <= ( const Magick::Color& left_,
                          const Magick::Color& right_ )
 {
   return ( ( left_ < right_ ) || ( left_ == right_ ) );

diff --git a/Magick++/lib/Drawable.cpp b/Magick++/lib/Drawable.cpp
index 229e520adb27e27df1f94b92097615f42390172c..a081663b539894af10a82dbdb03849eb0c0fb5a9 100644 (file)
--- a/Magick++/lib/Drawable.cpp
+++ b/Magick++/lib/Drawable.cpp
@@ -18,34 +18,34 @@
 
 using namespace std;
 
-MagickDLLDecl ssize_t Magick::operator == ( const Magick::Coordinate& left_,
+MagickDLLDecl int Magick::operator == ( const Magick::Coordinate& left_,
                                         const Magick::Coordinate& right_ )
 {
   return ( ( left_.x() == right_.x() ) && ( left_.y() == right_.y() ) );
 }
-MagickDLLDecl ssize_t Magick::operator != ( const Magick::Coordinate& left_,
+MagickDLLDecl int Magick::operator != ( const Magick::Coordinate& left_,
                                         const Magick::Coordinate& right_ )
 {
   return ( ! (left_ == right_) );
 }
-MagickDLLDecl ssize_t Magick::operator >  ( const Magick::Coordinate& left_,
+MagickDLLDecl int Magick::operator >  ( const Magick::Coordinate& left_,
                                         const Magick::Coordinate& right_ )
 {
   return ( !( left_ < right_ ) && ( left_ != right_ ) );
 }
-MagickDLLDecl ssize_t Magick::operator <  ( const Magick::Coordinate& left_,
+MagickDLLDecl int Magick::operator <  ( const Magick::Coordinate& left_,
                                         const Magick::Coordinate& right_ )
 {
   // Based on distance from origin
   return  ( (sqrt(left_.x()*left_.x() + left_.y()*left_.y())) <
             (sqrt(right_.x()*right_.x() + right_.y()*right_.y())) );
 }
-MagickDLLDecl ssize_t Magick::operator >= ( const Magick::Coordinate& left_,
+MagickDLLDecl int Magick::operator >= ( const Magick::Coordinate& left_,
                                         const Magick::Coordinate& right_ )
 {
   return ( ( left_ > right_ ) || ( left_ == right_ ) );
 }
-MagickDLLDecl ssize_t Magick::operator <= ( const Magick::Coordinate& left_,
+MagickDLLDecl int Magick::operator <= ( const Magick::Coordinate& left_,
                                         const Magick::Coordinate& right_ )
 {
   return ( ( left_ < right_ ) || ( left_ == right_ ) );
@@ -100,32 +100,32 @@ void Magick::Drawable::operator()( MagickCore::DrawingWand * context_ ) const
     dp->operator()( context_ );
 }
 
-MagickDLLDecl ssize_t Magick::operator == ( const Magick::Drawable& /*left_*/,
+MagickDLLDecl int Magick::operator == ( const Magick::Drawable& /*left_*/,
                                         const Magick::Drawable& /*right_*/ )
 {
   return ( 1 );
 }
-MagickDLLDecl ssize_t Magick::operator != ( const Magick::Drawable& /*left_*/,
+MagickDLLDecl int Magick::operator != ( const Magick::Drawable& /*left_*/,
                                         const Magick::Drawable& /*right_*/ )
 {
   return ( 0 );
 }
-MagickDLLDecl ssize_t Magick::operator > ( const Magick::Drawable& /*left_*/,
+MagickDLLDecl int Magick::operator > ( const Magick::Drawable& /*left_*/,
                                        const Magick::Drawable& /*right_*/ )
 {
   return ( 0 );
 }
-MagickDLLDecl ssize_t Magick::operator <  ( const Magick::Drawable& /*left_*/,
+MagickDLLDecl int Magick::operator <  ( const Magick::Drawable& /*left_*/,
                                         const Magick::Drawable& /*right_*/ )
 {
   return  ( 0 );
 }
-MagickDLLDecl ssize_t Magick::operator >= ( const Magick::Drawable& left_,
+MagickDLLDecl int Magick::operator >= ( const Magick::Drawable& left_,
                                         const Magick::Drawable& right_ )
 {
   return ( ( left_ > right_ ) || ( left_ == right_ ) );
 }
-MagickDLLDecl ssize_t Magick::operator <= ( const Magick::Drawable& left_,
+MagickDLLDecl int Magick::operator <= ( const Magick::Drawable& left_,
                                         const Magick::Drawable& right_ )
 {
   return ( ( left_ < right_ ) || ( left_ == right_ ) );
@@ -180,32 +180,32 @@ void Magick::VPath::operator()( MagickCore::DrawingWand * context_ ) const
     dp->operator()( context_ );
 }
 
-MagickDLLDecl ssize_t Magick::operator == ( const Magick::VPath& /*left_*/,
+MagickDLLDecl int Magick::operator == ( const Magick::VPath& /*left_*/,
                                         const Magick::VPath& /*right_*/ )
 {
   return ( 1 );
 }
-MagickDLLDecl ssize_t Magick::operator != ( const Magick::VPath& /*left_*/,
+MagickDLLDecl int Magick::operator != ( const Magick::VPath& /*left_*/,
                                         const Magick::VPath& /*right_*/ )
 {
   return ( 0 );
 }
-MagickDLLDecl ssize_t Magick::operator > ( const Magick::VPath& /*left_*/,
+MagickDLLDecl int Magick::operator > ( const Magick::VPath& /*left_*/,
                                        const Magick::VPath& /*right_*/ )
 {
   return ( 0 );
 }
-MagickDLLDecl ssize_t Magick::operator <  ( const Magick::VPath& /*left_*/,
+MagickDLLDecl int Magick::operator <  ( const Magick::VPath& /*left_*/,
                                         const Magick::VPath& /*right_*/ )
 {
   return  ( 0 );
 }
-MagickDLLDecl ssize_t Magick::operator >= ( const Magick::VPath& left_,
+MagickDLLDecl int Magick::operator >= ( const Magick::VPath& left_,
                                         const Magick::VPath& right_ )
 {
   return ( ( left_ > right_ ) || ( left_ == right_ ) );
 }
-MagickDLLDecl ssize_t Magick::operator <= ( const Magick::VPath& left_,
+MagickDLLDecl int Magick::operator <= ( const Magick::VPath& left_,
                                         const Magick::VPath& right_ )
 {
   return ( ( left_ < right_ ) || ( left_ == right_ ) );
@@ -901,7 +901,7 @@ Magick::DrawableBase* Magick::DrawablePopPattern::copy() const
 // Push Pattern definition
 Magick::DrawablePushPattern::DrawablePushPattern
 ( const std::string &id_, ssize_t x_, ssize_t y_,
-  ssize_t width_, ssize_t height_ )
+  size_t width_, size_t height_ )
   : _id(id_),
     _x(x_),
     _y(y_),
@@ -1402,32 +1402,32 @@ Magick::DrawableBase* Magick::DrawableViewbox::copy() const
 //
 // PathArcArgs
 //
-MagickDLLDecl ssize_t Magick::operator == ( const Magick::PathArcArgs& /*left_*/,
+MagickDLLDecl int Magick::operator == ( const Magick::PathArcArgs& /*left_*/,
                                         const Magick::PathArcArgs& /*right_*/ )
 {
   return ( 1 );
 }
-MagickDLLDecl ssize_t Magick::operator != ( const Magick::PathArcArgs& /*left_*/,
+MagickDLLDecl int Magick::operator != ( const Magick::PathArcArgs& /*left_*/,
                                         const Magick::PathArcArgs& /*right_*/ )
 {
   return ( 0 );
 }
-MagickDLLDecl ssize_t Magick::operator > ( const Magick::PathArcArgs& /*left_*/,
+MagickDLLDecl int Magick::operator > ( const Magick::PathArcArgs& /*left_*/,
                                        const Magick::PathArcArgs& /*right_*/ )
 {
   return ( 0 );
 }
-MagickDLLDecl ssize_t Magick::operator <  ( const Magick::PathArcArgs& /*left_*/,
+MagickDLLDecl int Magick::operator <  ( const Magick::PathArcArgs& /*left_*/,
                                         const Magick::PathArcArgs& /*right_*/ )
 {
   return  ( false );
 }
-MagickDLLDecl ssize_t Magick::operator >= ( const Magick::PathArcArgs& left_,
+MagickDLLDecl int Magick::operator >= ( const Magick::PathArcArgs& left_,
                                         const Magick::PathArcArgs& right_ )
 {
   return ( ( left_ > right_ ) || ( left_ == right_ ) );
 }
-MagickDLLDecl ssize_t Magick::operator <= ( const Magick::PathArcArgs& left_,
+MagickDLLDecl int Magick::operator <= ( const Magick::PathArcArgs& left_,
                                         const Magick::PathArcArgs& right_ )
 {
   return ( ( left_ < right_ ) || ( left_ == right_ ) );
@@ -1553,32 +1553,32 @@ Magick::VPathBase* Magick::PathClosePath::copy() const
 //
 // Path Curveto (Cubic Bezier)
 //
-MagickDLLDecl ssize_t Magick::operator == ( const Magick::PathCurvetoArgs& /*left_*/,
+MagickDLLDecl int Magick::operator == ( const Magick::PathCurvetoArgs& /*left_*/,
                                         const Magick::PathCurvetoArgs& /*right_*/ )
 {
   return ( 1 );
 }
-MagickDLLDecl ssize_t Magick::operator != ( const Magick::PathCurvetoArgs& /*left_*/,
+MagickDLLDecl int Magick::operator != ( const Magick::PathCurvetoArgs& /*left_*/,
                                         const Magick::PathCurvetoArgs& /*right_*/ )
 {
   return ( 0 );
 }
-MagickDLLDecl ssize_t Magick::operator > ( const Magick::PathCurvetoArgs& /*left_*/,
+MagickDLLDecl int Magick::operator > ( const Magick::PathCurvetoArgs& /*left_*/,
                                        const Magick::PathCurvetoArgs& /*right_*/ )
 {
   return ( 0 );
 }
-MagickDLLDecl ssize_t Magick::operator <  ( const Magick::PathCurvetoArgs& /*left_*/,
+MagickDLLDecl int Magick::operator <  ( const Magick::PathCurvetoArgs& /*left_*/,
                                         const Magick::PathCurvetoArgs& /*right_*/ )
 {
   return  ( false );
 }
-MagickDLLDecl ssize_t Magick::operator >= ( const Magick::PathCurvetoArgs& left_,
+MagickDLLDecl int Magick::operator >= ( const Magick::PathCurvetoArgs& left_,
                                         const Magick::PathCurvetoArgs& right_ )
 {
   return ( ( left_ > right_ ) || ( left_ == right_ ) );
 }
-MagickDLLDecl ssize_t Magick::operator <= ( const Magick::PathCurvetoArgs& left_,
+MagickDLLDecl int Magick::operator <= ( const Magick::PathCurvetoArgs& left_,
                                         const Magick::PathCurvetoArgs& right_ )
 {
   return ( ( left_ < right_ ) || ( left_ == right_ ) );
@@ -1758,37 +1758,37 @@ Magick::VPathBase* Magick::PathSmoothCurvetoRel::copy() const
 //
 // Quadratic Curveto (Quadratic Bezier)
 //
-MagickDLLDecl ssize_t Magick::operator ==
+MagickDLLDecl int Magick::operator ==
 ( const Magick::PathQuadraticCurvetoArgs& /*left_*/,
   const Magick::PathQuadraticCurvetoArgs& /*right_*/ )
 {
   return ( 1 );
 }
-MagickDLLDecl ssize_t Magick::operator !=
+MagickDLLDecl int Magick::operator !=
 ( const Magick::PathQuadraticCurvetoArgs& /*left_*/,
   const Magick::PathQuadraticCurvetoArgs& /*right_*/ )
 {
   return ( 0 );
 }
-MagickDLLDecl ssize_t Magick::operator >
+MagickDLLDecl int Magick::operator >
 ( const Magick::PathQuadraticCurvetoArgs& /*left_*/,
   const Magick::PathQuadraticCurvetoArgs& /*right_*/ )
 {
   return ( 0 );
 }
-MagickDLLDecl ssize_t Magick::operator < 
+MagickDLLDecl int Magick::operator < 
 ( const Magick::PathQuadraticCurvetoArgs& /*left_*/,
   const Magick::PathQuadraticCurvetoArgs& /*right_*/ )
 {
   return  ( 0 );
 }
-MagickDLLDecl ssize_t Magick::operator >=
+MagickDLLDecl int Magick::operator >=
 ( const Magick::PathQuadraticCurvetoArgs& left_,
   const Magick::PathQuadraticCurvetoArgs& right_ )
 {
   return ( ( left_ > right_ ) || ( left_ == right_ ) );
 }
-MagickDLLDecl ssize_t Magick::operator <=
+MagickDLLDecl int Magick::operator <=
 ( const Magick::PathQuadraticCurvetoArgs& left_,
   const Magick::PathQuadraticCurvetoArgs& right_ )
 {

diff --git a/Magick++/lib/Geometry.cpp b/Magick++/lib/Geometry.cpp
index 0cecc974d975a8aabde1b7d7f2cd5e6e2225c248..04842d3200c02a9843fd1638e2c20a2115e127c3 100644 (file)
--- a/Magick++/lib/Geometry.cpp
+++ b/Magick++/lib/Geometry.cpp
@@ -22,7 +22,7 @@ using namespace std;
 
 #define AbsoluteValue(x)  ((x) < 0 ? -(x) : (x))
 
-ssize_t Magick::operator == ( const Magick::Geometry& left_,
+int Magick::operator == ( const Magick::Geometry& left_,
                          const Magick::Geometry& right_ )
 {
   return (
@@ -39,17 +39,17 @@ ssize_t Magick::operator == ( const Magick::Geometry& left_,
          ( left_.less()      == right_.less() )
          );
 }
-ssize_t Magick::operator != ( const Magick::Geometry& left_,
+int Magick::operator != ( const Magick::Geometry& left_,
                          const Magick::Geometry& right_ )
 {
   return ( ! (left_ == right_) );
 }
-ssize_t Magick::operator >  ( const Magick::Geometry& left_,
+int Magick::operator >  ( const Magick::Geometry& left_,
                          const Magick::Geometry& right_ )
 {
   return ( !( left_ < right_ ) && ( left_ != right_ ) );
 }
-ssize_t Magick::operator <  ( const Magick::Geometry& left_,
+int Magick::operator <  ( const Magick::Geometry& left_,
                          const Magick::Geometry& right_ )
 {
   return (
@@ -58,12 +58,12 @@ ssize_t Magick::operator <  ( const Magick::Geometry& left_,
          ( right_.width() * right_.height() )
          );
 }
-ssize_t Magick::operator >= ( const Magick::Geometry& left_,
+int Magick::operator >= ( const Magick::Geometry& left_,
                          const Magick::Geometry& right_ )
 {
   return ( ( left_ > right_ ) || ( left_ == right_ ) );
 }
-ssize_t Magick::operator <= ( const Magick::Geometry& left_,
+int Magick::operator <= ( const Magick::Geometry& left_,
                          const Magick::Geometry& right_ )
 {
   return ( ( left_ < right_ ) || ( left_ == right_ ) );
@@ -72,8 +72,8 @@ ssize_t Magick::operator <= ( const Magick::Geometry& left_,
 // Construct using parameterized arguments
 Magick::Geometry::Geometry ( size_t width_,
                             size_t height_,
-                            size_t xOff_,
-                            size_t yOff_,
+                            ssize_t xOff_,
+                            ssize_t yOff_,
                             bool xNegative_,
                             bool yNegative_ )
   : _width( width_ ),
@@ -234,13 +234,13 @@ Magick::Geometry::operator = ( const std::string &geometry_ )
 
   if ( ( flags & XValue ) != 0 )
     {
-      _xOff = static_cast<size_t>(AbsoluteValue(x));
+      _xOff = static_cast<ssize_t>(x);
       isValid( true );
     }
 
   if ( ( flags & YValue ) != 0 )
     {
-      _yOff = static_cast<size_t>(AbsoluteValue(y));
+      _yOff = static_cast<ssize_t>(y);
       isValid( true );
     }
 
@@ -335,8 +335,8 @@ Magick::Geometry::operator std::string() const
 Magick::Geometry::Geometry ( const MagickCore::RectangleInfo &rectangle_ )
   : _width(static_cast<size_t>(rectangle_.width)),
     _height(static_cast<size_t>(rectangle_.height)),
-    _xOff(static_cast<size_t>(AbsoluteValue(rectangle_.x))),
-    _yOff(static_cast<size_t>(AbsoluteValue(rectangle_.y))),
+    _xOff(static_cast<ssize_t>(rectangle_.x)),
+    _yOff(static_cast<ssize_t>(rectangle_.y)),
     _xNegative(rectangle_.x < 0 ? true : false),
     _yNegative(rectangle_.y < 0 ? true : false),
     _isValid(true),

diff --git a/Magick++/lib/Image.cpp b/Magick++/lib/Image.cpp
index 0474604bfe5977400540eead2889bd84d9ad4886..83001dae880c4621cd4341e5c502b9a33848469f 100644 (file)
--- a/Magick++/lib/Image.cpp
+++ b/Magick++/lib/Image.cpp
@@ -44,7 +44,7 @@ static bool magick_initialized=false;
 // Friend functions to compare Image objects
 //
 
-MagickDLLDecl ssize_t Magick::operator == ( const Magick::Image& left_,
+MagickDLLDecl int Magick::operator == ( const Magick::Image& left_,
                                         const Magick::Image& right_ )
 {
   // If image pixels and signature are the same, then the image is identical
@@ -53,17 +53,17 @@ MagickDLLDecl ssize_t Magick::operator == ( const Magick::Image& left_,
           ( left_.signature() == right_.signature() )
           );
 }
-MagickDLLDecl ssize_t Magick::operator != ( const Magick::Image& left_,
+MagickDLLDecl int Magick::operator != ( const Magick::Image& left_,
                                         const Magick::Image& right_ )
 {
   return ( ! (left_ == right_) );
 }
-MagickDLLDecl ssize_t Magick::operator >  ( const Magick::Image& left_,
+MagickDLLDecl int Magick::operator >  ( const Magick::Image& left_,
                                         const Magick::Image& right_ )
 {
   return ( !( left_ < right_ ) && ( left_ != right_ ) );
 }
-MagickDLLDecl ssize_t Magick::operator <  ( const Magick::Image& left_,
+MagickDLLDecl int Magick::operator <  ( const Magick::Image& left_,
                                         const Magick::Image& right_ )
 {
   // If image pixels are less, then image is smaller
@@ -71,12 +71,12 @@ MagickDLLDecl ssize_t Magick::operator <  ( const Magick::Image& left_,
           ( right_.rows() * right_.columns() )
           );
 }
-MagickDLLDecl ssize_t Magick::operator >= ( const Magick::Image& left_,
+MagickDLLDecl int Magick::operator >= ( const Magick::Image& left_,
                                         const Magick::Image& right_ )
 {
   return ( ( left_ > right_ ) || ( left_ == right_ ) );
 }
-MagickDLLDecl ssize_t Magick::operator <= ( const Magick::Image& left_,
+MagickDLLDecl int Magick::operator <= ( const Magick::Image& left_,
                                         const Magick::Image& right_ )
 {
   return ( ( left_ < right_ ) || ( left_ == right_ ) );
@@ -316,7 +316,7 @@ void Magick::Image::adaptiveBlur( const double radius_, const double sigma_ )
 // offset = constant to subtract from pixel neighborhood mean
 void Magick::Image::adaptiveThreshold ( const size_t width_,
                                         const size_t height_,
-                                        const size_t offset_ )
+                                        const ssize_t offset_ )
 {
   ExceptionInfo exceptionInfo;
   GetExceptionInfo( &exceptionInfo );
@@ -581,9 +581,9 @@ void Magick::Image::cdl ( const std::string &cdl_ )
 }
 
 // Colorize
-void Magick::Image::colorize ( const size_t opacityRed_,
-                               const size_t opacityGreen_,
-                               const size_t opacityBlue_,
+void Magick::Image::colorize ( const unsigned int opacityRed_,
+                               const unsigned int opacityGreen_,
+                               const unsigned int opacityBlue_,
                               const Color &penColor_ )
 {
   if ( !penColor_.isValid() )
@@ -604,7 +604,7 @@ void Magick::Image::colorize ( const size_t opacityRed_,
   throwException( exceptionInfo );
   (void) DestroyExceptionInfo( &exceptionInfo );
 }
-void Magick::Image::colorize ( const size_t opacity_,
+void Magick::Image::colorize ( const unsigned int opacity_,
                               const Color &penColor_ )
 {
   colorize( opacity_, opacity_, opacity_, penColor_ );

diff --git a/Magick++/lib/Magick++/Color.h b/Magick++/lib/Magick++/Color.h
index 5adb2a5849152e7cbd054c8d6a65bf9873f8f7af..ccf39aa4f4a043a34c2b62d8bedb67515e124d76 100644 (file)
--- a/Magick++/lib/Magick++/Color.h
+++ b/Magick++/lib/Magick++/Color.h
@@ -16,12 +16,12 @@ namespace Magick
   class MagickDLLDecl Color;
 
   // Compare two Color objects regardless of LHS/RHS
-  ssize_t MagickDLLDecl operator == ( const Magick::Color& left_, const Magick::Color& right_ );
-  ssize_t MagickDLLDecl operator != ( const Magick::Color& left_, const Magick::Color& right_ );
-  ssize_t MagickDLLDecl operator >  ( const Magick::Color& left_, const Magick::Color& right_ );
-  ssize_t MagickDLLDecl operator <  ( const Magick::Color& left_, const Magick::Color& right_ );
-  ssize_t MagickDLLDecl operator >= ( const Magick::Color& left_, const Magick::Color& right_ );
-  ssize_t MagickDLLDecl operator <= ( const Magick::Color& left_, const Magick::Color& right_ );
+  int MagickDLLDecl operator == ( const Magick::Color& left_, const Magick::Color& right_ );
+  int MagickDLLDecl operator != ( const Magick::Color& left_, const Magick::Color& right_ );
+  int MagickDLLDecl operator >  ( const Magick::Color& left_, const Magick::Color& right_ );
+  int MagickDLLDecl operator <  ( const Magick::Color& left_, const Magick::Color& right_ );
+  int MagickDLLDecl operator >= ( const Magick::Color& left_, const Magick::Color& right_ );
+  int MagickDLLDecl operator <= ( const Magick::Color& left_, const Magick::Color& right_ );
 
   // Base color class stores RGB components scaled to fit Quantum
   class MagickDLLDecl Color

diff --git a/Magick++/lib/Magick++/Drawable.h b/Magick++/lib/Magick++/Drawable.h
index 05f4a34a48ac18ebe2fd17dc11dfbb43a43b4c1c..3fdc1d5fda85eb8a41ca4fc5996bbd305ef90179 100644 (file)
--- a/Magick++/lib/Magick++/Drawable.h
+++ b/Magick++/lib/Magick++/Drawable.h
@@ -93,17 +93,17 @@ namespace Magick
 #endif // MagickDLLBuild
 
   // Compare two Coordinate objects regardless of LHS/RHS
-  MagickDLLDeclExtern ssize_t operator == ( const Coordinate& left_,
+  MagickDLLDeclExtern int operator == ( const Coordinate& left_,
                                         const Coordinate& right_ );
-  MagickDLLDeclExtern ssize_t operator != ( const Coordinate& left_,
+  MagickDLLDeclExtern int operator != ( const Coordinate& left_,
                                         const Coordinate& right_ );
-  MagickDLLDeclExtern ssize_t operator >  ( const Coordinate& left_,
+  MagickDLLDeclExtern int operator >  ( const Coordinate& left_,
                                         const Coordinate& right_ );
-  MagickDLLDeclExtern ssize_t operator <  ( const Coordinate& left_,
+  MagickDLLDeclExtern int operator <  ( const Coordinate& left_,
                                         const Coordinate& right_ );
-  MagickDLLDeclExtern ssize_t operator >= ( const Coordinate& left_,
+  MagickDLLDeclExtern int operator >= ( const Coordinate& left_,
                                         const Coordinate& right_ );
-  MagickDLLDeclExtern ssize_t operator <= ( const Coordinate& left_,
+  MagickDLLDeclExtern int operator <= ( const Coordinate& left_,
                                         const Coordinate& right_ );
 
   //
@@ -161,17 +161,17 @@ namespace Magick
   };
 
   // Compare two Drawable objects regardless of LHS/RHS
-  MagickDLLDeclExtern ssize_t operator == ( const Drawable& left_,
+  MagickDLLDeclExtern int operator == ( const Drawable& left_,
                                         const Drawable& right_ );
-  MagickDLLDeclExtern ssize_t operator != ( const Drawable& left_,
+  MagickDLLDeclExtern int operator != ( const Drawable& left_,
                                         const Drawable& right_ );
-  MagickDLLDeclExtern ssize_t operator >  ( const Drawable& left_,
+  MagickDLLDeclExtern int operator >  ( const Drawable& left_,
                                         const Drawable& right_ );
-  MagickDLLDeclExtern ssize_t operator <  ( const Drawable& left_,
+  MagickDLLDeclExtern int operator <  ( const Drawable& left_,
                                         const Drawable& right_ );
-  MagickDLLDeclExtern ssize_t operator >= ( const Drawable& left_,
+  MagickDLLDeclExtern int operator >= ( const Drawable& left_,
                                         const Drawable& right_ );
-  MagickDLLDeclExtern ssize_t operator <= ( const Drawable& left_,
+  MagickDLLDeclExtern int operator <= ( const Drawable& left_,
                                         const Drawable& right_ );
 
   typedef std::list<Magick::Drawable> DrawableList;
@@ -241,17 +241,17 @@ private:
 };
 
 // Compare two VPath objects regardless of LHS/RHS
-MagickDLLDeclExtern ssize_t operator == ( const VPath& left_,
+MagickDLLDeclExtern int operator == ( const VPath& left_,
                                       const VPath& right_ );
-MagickDLLDeclExtern ssize_t operator != ( const VPath& left_,
+MagickDLLDeclExtern int operator != ( const VPath& left_,
                                       const VPath& right_ );
-MagickDLLDeclExtern ssize_t operator >  ( const VPath& left_,
+MagickDLLDeclExtern int operator >  ( const VPath& left_,
                                       const VPath& right_ );
-MagickDLLDeclExtern ssize_t operator <  ( const VPath& left_,
+MagickDLLDeclExtern int operator <  ( const VPath& left_,
                                       const VPath& right_ );
-MagickDLLDeclExtern ssize_t operator >= ( const VPath& left_,
+MagickDLLDeclExtern int operator >= ( const VPath& left_,
                                       const VPath& right_ );
-MagickDLLDeclExtern ssize_t operator <= ( const VPath& left_,
+MagickDLLDeclExtern int operator <= ( const VPath& left_,
                                       const VPath& right_ );
 
 typedef std::list<Magick::VPath> VPathList;
@@ -959,7 +959,7 @@ private:
   std::string   _font;
   std::string   _family;
   StyleType     _style;
-  size_t _weight;
+  unsigned int _weight;
   StretchType   _stretch;
 };
 
@@ -1305,7 +1305,7 @@ class MagickDLLDecl DrawablePushPattern : public DrawableBase
 {
 public:
   DrawablePushPattern ( const std::string &id_, ssize_t x_, ssize_t y_,
-                        ssize_t width_, ssize_t height_ );
+                        size_t width_, size_t height_ );
 
   DrawablePushPattern ( const DrawablePushPattern& original_ );
 
@@ -1321,8 +1321,8 @@ private:
   std::string         _id;
   ssize_t              _x;
   ssize_t              _y;
-  ssize_t              _width;
-  ssize_t              _height;
+  size_t               _width;
+  size_t               _height;
 };
 
 // Rectangle
@@ -2055,8 +2055,8 @@ private:
 class MagickDLLDecl DrawableViewbox : public DrawableBase
 {
 public:
-  DrawableViewbox(size_t x1_, size_t y1_,
-                  size_t x2_, size_t y2_)
+  DrawableViewbox(ssize_t x1_, ssize_t y1_,
+                  ssize_t x2_, ssize_t y2_)
     : _x1(x1_),
       _y1(y1_),
       _x2(x2_),
@@ -2071,47 +2071,47 @@ public:
   /*virtual*/
   DrawableBase* copy() const;
 
-  void x1( size_t x1_ )
+  void x1( ssize_t x1_ )
     {
       _x1 = x1_;
     }
-  size_t x1( void ) const
+  ssize_t x1( void ) const
     {
       return _x1;
     }
 
-  void y1( size_t y1_ )
+  void y1( ssize_t y1_ )
     {
       _y1 = y1_;
     }
-  size_t y1( void ) const
+  ssize_t y1( void ) const
     {
       return _y1;
     }
 
-  void x2( size_t x2_ )
+  void x2( ssize_t x2_ )
     {
       _x2 = x2_;
     }
-  size_t x2( void ) const
+  ssize_t x2( void ) const
     {
       return _x2;
     }
 
-  void y2( size_t y2_ )
+  void y2( ssize_t y2_ )
     {
       _y2 = y2_;
     }
-  size_t y2( void ) const
+  ssize_t y2( void ) const
     {
       return _y2;
     }
 
 private:
-  size_t _x1;
-  size_t _y1;
-  size_t _x2;
-  size_t _y2;
+  ssize_t _x1;
+  ssize_t _y1;
+  ssize_t _x2;
+  ssize_t _y2;
 };
 
 //
@@ -2197,24 +2197,24 @@ private:
   double       _radiusX;       // X radius
   double       _radiusY;       // Y radius
   double       _xAxisRotation; // Rotation relative to X axis
-  bool        _largeArcFlag;   // Draw ssize_ter of the two matching arcs
+  bool        _largeArcFlag;   // Draw longer of the two matching arcs
   bool        _sweepFlag;      // Draw arc matching clock-wise rotation
   double       _x;             // End-point X
   double       _y;             // End-point Y
 };
 
 // Compare two PathArcArgs objects regardless of LHS/RHS
-MagickDLLDeclExtern ssize_t operator == ( const PathArcArgs& left_,
+MagickDLLDeclExtern int operator == ( const PathArcArgs& left_,
                                       const PathArcArgs& right_ );
-MagickDLLDeclExtern ssize_t operator != ( const PathArcArgs& left_,
+MagickDLLDeclExtern int operator != ( const PathArcArgs& left_,
                                       const PathArcArgs& right_ );
-MagickDLLDeclExtern ssize_t operator >  ( const PathArcArgs& left_,
+MagickDLLDeclExtern int operator >  ( const PathArcArgs& left_,
                                       const PathArcArgs& right_ );
-MagickDLLDeclExtern ssize_t operator <  ( const PathArcArgs& left_,
+MagickDLLDeclExtern int operator <  ( const PathArcArgs& left_,
                                       const PathArcArgs& right_ );
-MagickDLLDeclExtern ssize_t operator >= ( const PathArcArgs& left_,
+MagickDLLDeclExtern int operator >= ( const PathArcArgs& left_,
                                       const PathArcArgs& right_ );
-MagickDLLDeclExtern ssize_t operator <= ( const PathArcArgs& left_,
+MagickDLLDeclExtern int operator <= ( const PathArcArgs& left_,
                                       const PathArcArgs& right_ );
 
 typedef std::list<Magick::PathArcArgs> PathArcArgsList;
@@ -2378,17 +2378,17 @@ double _y;
 };
 
 // Compare two PathCurvetoArgs objects regardless of LHS/RHS
-MagickDLLDeclExtern ssize_t operator == ( const PathCurvetoArgs& left_,
+MagickDLLDeclExtern int operator == ( const PathCurvetoArgs& left_,
                                       const PathCurvetoArgs& right_ );
-MagickDLLDeclExtern ssize_t operator != ( const PathCurvetoArgs& left_,
+MagickDLLDeclExtern int operator != ( const PathCurvetoArgs& left_,
                                       const PathCurvetoArgs& right_ );
-MagickDLLDeclExtern ssize_t operator >  ( const PathCurvetoArgs& left_,
+MagickDLLDeclExtern int operator >  ( const PathCurvetoArgs& left_,
                                       const PathCurvetoArgs& right_ );
-MagickDLLDeclExtern ssize_t operator <  ( const PathCurvetoArgs& left_,
+MagickDLLDeclExtern int operator <  ( const PathCurvetoArgs& left_,
                                       const PathCurvetoArgs& right_ );
-MagickDLLDeclExtern ssize_t operator >= ( const PathCurvetoArgs& left_,
+MagickDLLDeclExtern int operator >= ( const PathCurvetoArgs& left_,
                                       const PathCurvetoArgs& right_ );
-MagickDLLDeclExtern ssize_t operator <= ( const PathCurvetoArgs& left_,
+MagickDLLDeclExtern int operator <= ( const PathCurvetoArgs& left_,
                                       const PathCurvetoArgs& right_ );
 
 typedef std::list<Magick::PathCurvetoArgs> PathCurveToArgsList;
@@ -2559,17 +2559,17 @@ private:
 };
 
 // Compare two PathQuadraticCurvetoArgs objects regardless of LHS/RHS
-MagickDLLDeclExtern ssize_t operator == ( const PathQuadraticCurvetoArgs& left_,
+MagickDLLDeclExtern int operator == ( const PathQuadraticCurvetoArgs& left_,
                                       const PathQuadraticCurvetoArgs& right_ );
-MagickDLLDeclExtern ssize_t operator != ( const PathQuadraticCurvetoArgs& left_,
+MagickDLLDeclExtern int operator != ( const PathQuadraticCurvetoArgs& left_,
                                       const PathQuadraticCurvetoArgs& right_);
-MagickDLLDeclExtern ssize_t operator >  ( const PathQuadraticCurvetoArgs& left_,
+MagickDLLDeclExtern int operator >  ( const PathQuadraticCurvetoArgs& left_,
                                       const PathQuadraticCurvetoArgs& right_);
-MagickDLLDeclExtern ssize_t operator <  ( const PathQuadraticCurvetoArgs& left_,
+MagickDLLDeclExtern int operator <  ( const PathQuadraticCurvetoArgs& left_,
                                       const PathQuadraticCurvetoArgs& right_);
-MagickDLLDeclExtern ssize_t operator >= ( const PathQuadraticCurvetoArgs& left_,
+MagickDLLDeclExtern int operator >= ( const PathQuadraticCurvetoArgs& left_,
                                       const PathQuadraticCurvetoArgs& right_ );
-MagickDLLDeclExtern ssize_t operator <= ( const PathQuadraticCurvetoArgs& left_,
+MagickDLLDeclExtern int operator <= ( const PathQuadraticCurvetoArgs& left_,
                                       const PathQuadraticCurvetoArgs& right_ );
 
 typedef std::list<Magick::PathQuadraticCurvetoArgs> PathQuadraticCurvetoArgsList;

diff --git a/Magick++/lib/Magick++/Geometry.h b/Magick++/lib/Magick++/Geometry.h
index b8370322ddc26d39d2d7e6e21084129cbc52ca99..f8d0015a37e5a907c7410db8590a733e16d674dd 100644 (file)
--- a/Magick++/lib/Magick++/Geometry.h
+++ b/Magick++/lib/Magick++/Geometry.h
@@ -19,12 +19,12 @@ namespace Magick
   class MagickDLLDecl Geometry;
 
   // Compare two Geometry objects regardless of LHS/RHS
-  ssize_t MagickDLLDecl operator == ( const Magick::Geometry& left_, const Magick::Geometry& right_ );
-  ssize_t MagickDLLDecl operator != ( const Magick::Geometry& left_, const Magick::Geometry& right_ );
-  ssize_t MagickDLLDecl operator >  ( const Magick::Geometry& left_, const Magick::Geometry& right_ );
-  ssize_t MagickDLLDecl operator <  ( const Magick::Geometry& left_, const Magick::Geometry& right_ );
-  ssize_t MagickDLLDecl operator >= ( const Magick::Geometry& left_, const Magick::Geometry& right_ );
-  ssize_t MagickDLLDecl operator <= ( const Magick::Geometry& left_, const Magick::Geometry& right_ );
+  int MagickDLLDecl operator == ( const Magick::Geometry& left_, const Magick::Geometry& right_ );
+  int MagickDLLDecl operator != ( const Magick::Geometry& left_, const Magick::Geometry& right_ );
+  int MagickDLLDecl operator >  ( const Magick::Geometry& left_, const Magick::Geometry& right_ );
+  int MagickDLLDecl operator <  ( const Magick::Geometry& left_, const Magick::Geometry& right_ );
+  int MagickDLLDecl operator >= ( const Magick::Geometry& left_, const Magick::Geometry& right_ );
+  int MagickDLLDecl operator <= ( const Magick::Geometry& left_, const Magick::Geometry& right_ );
 
   class MagickDLLDecl Geometry
   {
@@ -32,8 +32,8 @@ namespace Magick
     
     Geometry ( size_t width_,
               size_t height_,
-              size_t xOff_ = 0,
-              size_t yOff_ = 0,
+              ssize_t xOff_ = 0,
+              ssize_t yOff_ = 0,
               bool xNegative_ = false,
               bool yNegative_ = false );
     Geometry ( const std::string &geometry_ );
@@ -51,12 +51,12 @@ namespace Magick
     size_t  height ( void ) const;
     
     // X offset from origin
-    void          xOff ( size_t xOff_ );
-    size_t  xOff ( void ) const;
+    void          xOff ( ssize_t xOff_ );
+    ssize_t  xOff ( void ) const;
     
     // Y offset from origin
-    void          yOff ( size_t yOff_ );
-    size_t  yOff ( void ) const;
+    void          yOff ( ssize_t yOff_ );
+    ssize_t  yOff ( void ) const;
     
     // Sign of X offset negative? (X origin at right)
     void          xNegative ( bool xNegative_ );
@@ -158,21 +158,21 @@ inline size_t Magick::Geometry::height ( void ) const
 }
 
 // X offset from origin
-inline void Magick::Geometry::xOff ( size_t xOff_ )
+inline void Magick::Geometry::xOff ( ssize_t xOff_ )
 {
   _xOff = xOff_;
 }
-inline size_t Magick::Geometry::xOff ( void ) const
+inline ssize_t Magick::Geometry::xOff ( void ) const
 {
   return _xOff;
 }
 
 // Y offset from origin
-inline void Magick::Geometry::yOff ( size_t yOff_ )
+inline void Magick::Geometry::yOff ( ssize_t yOff_ )
 {
   _yOff = yOff_;
 }
-inline size_t Magick::Geometry::yOff ( void ) const
+inline ssize_t Magick::Geometry::yOff ( void ) const
 {
   return _yOff;
 }

diff --git a/Magick++/lib/Magick++/Image.h b/Magick++/lib/Magick++/Image.h
index 2d6f19cd128bfcf4ff2df44961b33470d4b1ed1f..3dd5d2dbf9732bd2f94ea81539cc7a861fd7ce4b 100644 (file)
--- a/Magick++/lib/Magick++/Image.h
+++ b/Magick++/lib/Magick++/Image.h
@@ -30,17 +30,17 @@ namespace Magick
 
   // Compare two Image objects regardless of LHS/RHS
   // Image sizes and signatures are used as basis of comparison
-  ssize_t MagickDLLDecl operator == ( const Magick::Image& left_,
+  int MagickDLLDecl operator == ( const Magick::Image& left_,
                                   const Magick::Image& right_ );
-  ssize_t MagickDLLDecl operator != ( const Magick::Image& left_,
+  int MagickDLLDecl operator != ( const Magick::Image& left_,
                                   const Magick::Image& right_ );
-  ssize_t MagickDLLDecl operator >  ( const Magick::Image& left_,
+  int MagickDLLDecl operator >  ( const Magick::Image& left_,
                                   const Magick::Image& right_ );
-  ssize_t MagickDLLDecl operator <  ( const Magick::Image& left_,
+  int MagickDLLDecl operator <  ( const Magick::Image& left_,
                                   const Magick::Image& right_ );
-  ssize_t MagickDLLDecl operator >= ( const Magick::Image& left_,
+  int MagickDLLDecl operator >= ( const Magick::Image& left_,
                                   const Magick::Image& right_ );
-  ssize_t MagickDLLDecl operator <= ( const Magick::Image& left_,
+  int MagickDLLDecl operator <= ( const Magick::Image& left_,
                                   const Magick::Image& right_ );
 
   // C library initialization routine
@@ -119,7 +119,7 @@ namespace Magick
     // offset = constant to subtract from pixel neighborhood mean
     void            adaptiveThreshold ( const size_t width,
                                         const size_t height,
-                                        const size_t offset = 0 );
+                                        const ssize_t offset = 0 );
 
     // Add noise to image with specified noise type
     void            addNoise ( const NoiseType noiseType_ );
@@ -205,12 +205,12 @@ namespace Magick
     
     // Colorize image with pen color, using specified percent opacity
     // for red, green, and blue quantums
-    void            colorize ( const size_t opacityRed_,
-                               const size_t opacityGreen_,
-                               const size_t opacityBlue_,
+    void            colorize ( const unsigned int opacityRed_,
+                               const unsigned int opacityGreen_,
+                               const unsigned int opacityBlue_,
              const Color &penColor_ );
     // Colorize image with pen color, using specified percent opacity.
-    void            colorize ( const size_t opacity_,
+    void            colorize ( const unsigned int opacity_,
              const Color &penColor_ );
     
     // Apply a color matrix to the image channels.  The user supplied

diff --git a/Magick++/lib/Magick++/STL.h b/Magick++/lib/Magick++/STL.h
index fd206fa1750d42ca30581a97d8444c491b8cabbf..ca385c57d803cf3cb5b601994d944fb7962849cf 100644 (file)
--- a/Magick++/lib/Magick++/STL.h
+++ b/Magick++/lib/Magick++/STL.h
@@ -64,7 +64,7 @@ namespace Magick
   public:
     adaptiveThresholdImage( const size_t width_,
                             const size_t height_,
-                            const size_t offset_ = 0  );
+                            const ssize_t offset_ = 0  );
 
     void operator()( Image &image_ ) const;
 
@@ -217,12 +217,12 @@ namespace Magick
   class MagickDLLDecl colorizeImage : public std::unary_function<Image&,void>
   {
   public:
-    colorizeImage( const size_t opacityRed_,
-                   const size_t opacityGreen_,
-                   const size_t opacityBlue_,
+    colorizeImage( const unsigned int opacityRed_,
+                   const unsigned int opacityGreen_,
+                   const unsigned int opacityBlue_,
        const Color &penColor_ );
 
-    colorizeImage( const size_t opacity_,
+    colorizeImage( const unsigned int opacity_,
                    const Color &penColor_ );
 
     void operator()( Image &image_ ) const;
@@ -463,8 +463,8 @@ namespace Magick
     // Flood-fill color across pixels starting at target-pixel and
     // stopping at pixels matching specified border color.
     // Uses current fuzz setting when determining color match.
-    floodFillColorImage( const size_t x_,
-                         const size_t y_,
+    floodFillColorImage( const ssize_t x_,
+                         const ssize_t y_,
        const Color &fillColor_ );
 
     floodFillColorImage( const Geometry &point_,
@@ -473,8 +473,8 @@ namespace Magick
     // Flood-fill color across pixels starting at target-pixel and
     // stopping at pixels matching specified border color.
     // Uses current fuzz setting when determining color match.
-    floodFillColorImage( const size_t x_,
-                         const size_t y_,
+    floodFillColorImage( const ssize_t x_,
+                         const ssize_t y_,
        const Color &fillColor_,
        const Color &borderColor_ );
 
@@ -498,8 +498,8 @@ namespace Magick
     // Flood-fill texture across pixels that match the color of the
     // target pixel and are neighbors of the target pixel.
     // Uses current fuzz setting when determining color match.
-    floodFillTextureImage( const size_t x_,
-                           const size_t y_,
+    floodFillTextureImage( const ssize_t x_,
+                           const ssize_t y_,
          const Image &texture_ );
 
     floodFillTextureImage( const Geometry &point_,
@@ -508,8 +508,8 @@ namespace Magick
     // Flood-fill texture across pixels starting at target-pixel and
     // stopping at pixels matching specified border color.
     // Uses current fuzz setting when determining color match.
-    floodFillTextureImage( const size_t x_,
-                           const size_t y_,
+    floodFillTextureImage( const ssize_t x_,
+                           const ssize_t y_,
          const Image &texture_,
          const Color &borderColor_ );
 
@@ -520,8 +520,8 @@ namespace Magick
     void operator()( Image &image_ ) const;
 
   private:
-    size_t  _x;
-    size_t  _y;
+    ssize_t  _x;
+    ssize_t  _y;
     Image         _texture;
     Color         _borderColor;
   };
@@ -817,7 +817,7 @@ namespace Magick
   class MagickDLLDecl opacityImage : public std::unary_function<Image&,void>
   {
   public:
-    opacityImage( const size_t opacity_ );
+    opacityImage( const unsigned int opacity_ );
 
     void operator()( Image &image_ ) const;
 
@@ -1593,15 +1593,15 @@ namespace Magick
   class MagickDLLDecl pixelColorImage : public std::unary_function<Image&,void>
   {
   public:
-    pixelColorImage( const size_t x_,
-                     const size_t y_,
+    pixelColorImage( const ssize_t x_,
+                     const ssize_t y_,
          const Color &color_);
 
     void operator()( Image &image_ ) const;
 
   private:
-    size_t _x;
-    size_t _y;
+    ssize_t _x;
+    ssize_t _y;
     Color        _color;
   };
 

diff --git a/Magick++/lib/Pixels.cpp b/Magick++/lib/Pixels.cpp
index 16e96378d5fa84253398ed5131f9dfdcb2d8b8fb..b2335362230d0de7927274714c14d3b6db129336 100644 (file)
--- a/Magick++/lib/Pixels.cpp
+++ b/Magick++/lib/Pixels.cpp
@@ -105,7 +105,7 @@ Magick::PixelPacket* Magick::Pixels::set ( const ssize_t x_,
   _columns = columns_;
   _rows = rows_;
 
-  PixelPacket* pixels = QueueCacheViewAuthenticPixels( _view, static_cast<ssize_t>(x_), static_cast<ssize_t>(y_),
+  PixelPacket* pixels = QueueCacheViewAuthenticPixels( _view, x_, y_,
                                       columns_, rows_,  &_exception );
   if ( !pixels )
     throwException( _exception );

diff --git a/Magick++/lib/STL.cpp b/Magick++/lib/STL.cpp
index 01b723c289b7547317a9e8da71585c6749d25d59..e6fe6fc8d4a93576cc4dc6ebafc49f267fb6f667 100644 (file)
--- a/Magick++/lib/STL.cpp
+++ b/Magick++/lib/STL.cpp
@@ -26,7 +26,7 @@ void Magick::adaptiveBlurImage::operator()( Magick::Image &image_ ) const
 // Local adaptive threshold image
 Magick::adaptiveThresholdImage::adaptiveThresholdImage( const size_t width_,
                                                         const size_t height_,
-                                                        const size_t offset_ )
+                                                        const ssize_t offset_ )
       : _width(width_),
         _height(height_),
         _offset(offset_)
@@ -170,9 +170,9 @@ void Magick::cdlImage::operator()( Image &image_ ) const
 }
 
 // Colorize image using pen color at specified percent opacity
-Magick::colorizeImage::colorizeImage( const size_t opacityRed_,
-                                      const size_t opacityGreen_,
-                                      const size_t opacityBlue_,
+Magick::colorizeImage::colorizeImage( const unsigned int opacityRed_,
+                                      const unsigned int opacityGreen_,
+                                      const unsigned int opacityBlue_,
                                       const Magick::Color &penColor_ )
   : _opacityRed ( opacityRed_ ),
     _opacityGreen ( opacityGreen_ ),
@@ -180,7 +180,7 @@ Magick::colorizeImage::colorizeImage( const size_t opacityRed_,
     _penColor( penColor_ )
 {
 }
-Magick::colorizeImage::colorizeImage( const size_t opacity_,
+Magick::colorizeImage::colorizeImage( const unsigned int opacity_,
                                       const Magick::Color &penColor_ )
   : _opacityRed ( opacity_ ),
     _opacityGreen ( opacity_ ),
@@ -401,8 +401,8 @@ void Magick::flipImage::operator()( Magick::Image &image_ ) const
 // Flood-fill color across pixels starting at target-pixel and
 // stopping at pixels matching specified border color.  Uses current
 // fuzz setting when determining color match.
-Magick::floodFillColorImage::floodFillColorImage( const size_t x_,
-                                                  const size_t y_,
+Magick::floodFillColorImage::floodFillColorImage( const ssize_t x_,
+                                                  const ssize_t y_,
                                                   const Magick::Color &fillColor_ )
   : _x(x_),
     _y(y_),
@@ -421,8 +421,8 @@ Magick::floodFillColorImage::floodFillColorImage( const Magick::Geometry &point_
 // Flood-fill color across pixels starting at target-pixel and
 // stopping at pixels matching specified border color.  Uses current
 // fuzz setting when determining color match.
-Magick::floodFillColorImage::floodFillColorImage( const size_t x_,
-                                                  const size_t y_,
+Magick::floodFillColorImage::floodFillColorImage( const ssize_t x_,
+                                                  const ssize_t y_,
                                                   const Magick::Color &fillColor_,
                                                   const Magick::Color &borderColor_ )
   : _x(x_),
@@ -457,8 +457,8 @@ void Magick::floodFillColorImage::operator()( Magick::Image &image_ ) const
 // Flood-fill texture across pixels that match the color of the target
 // pixel and are neighbors of the target pixel.  Uses current fuzz
 // setting when determining color match.
-Magick::floodFillTextureImage::floodFillTextureImage( const size_t x_,
-                                                      const size_t y_,
+Magick::floodFillTextureImage::floodFillTextureImage( const ssize_t x_,
+                                                      const ssize_t y_,
                                                       const Magick::Image &texture_ )
   : _x(x_),
     _y(y_),
@@ -477,8 +477,8 @@ Magick::floodFillTextureImage::floodFillTextureImage( const Magick::Geometry &po
 // Flood-fill texture across pixels starting at target-pixel and
 // stopping at pixels matching specified border color.  Uses current
 // fuzz setting when determining color match.
-Magick::floodFillTextureImage::floodFillTextureImage( const size_t x_,
-                                                      const size_t y_,
+Magick::floodFillTextureImage::floodFillTextureImage( const ssize_t x_,
+                                                      const ssize_t y_,
                                                       const Magick::Image &texture_,
                                                       const Magick::Color &borderColor_ )
   : _x(x_),
@@ -764,7 +764,7 @@ void Magick::oilPaintImage::operator()( Magick::Image &image_ ) const
 // opacity_ ranges from 0 (completely opaque) to QuantumRange. The defines
 // OpaqueOpacity and TransparentOpacity are available to specify
 // completely opaque or completely transparent, respectively.
-Magick::opacityImage::opacityImage( const size_t opacity_ )
+Magick::opacityImage::opacityImage( const unsigned int opacity_ )
   : _opacity( opacity_ )
 {
 }
@@ -1423,8 +1423,8 @@ void Magick::penTextureImage::operator()( Magick::Image &image_ ) const
 }
 
 // Set pixel color at location x & y.
-Magick::pixelColorImage::pixelColorImage( const size_t x_,
-                                          const size_t y_,
+Magick::pixelColorImage::pixelColorImage( const ssize_t x_,
+                                          const ssize_t y_,
                                           const Color &color_)
   : _x( x_ ),
     _y( y_ ),

diff --git a/Magick++/lib/Thread.cpp b/Magick++/lib/Thread.cpp
index aef226066ee3e9b0ec6c2a04ec573cb37928a410..55a4d8fb66c8e704f420c996020ab9300b9be010 100644 (file)
--- a/Magick++/lib/Thread.cpp
+++ b/Magick++/lib/Thread.cpp
@@ -20,7 +20,7 @@ Magick::MutexLock::MutexLock(void)
   : _mutex()
 {
   ::pthread_mutexattr_t attr;
-  ssize_t sysError;
+  int sysError;
   if ( (sysError = ::pthread_mutexattr_init( &attr )) == 0 )
     if ( (sysError = ::pthread_mutex_init( &_mutex, &attr )) == 0 )
       {
@@ -59,7 +59,7 @@ Magick::MutexLock::MutexLock(void)
 Magick::MutexLock::~MutexLock(void)
 {
 #if defined(MAGICKCORE_HAVE_PTHREAD)
-  ssize_t sysError;
+  int sysError;
   if ( (sysError = ::pthread_mutex_destroy( &_mutex )) == 0 )
     return;
   throwExceptionExplicit( OptionError, "mutex destruction failed",
@@ -76,7 +76,7 @@ Magick::MutexLock::~MutexLock(void)
 void Magick::MutexLock::lock(void)
 {
 #if defined(MAGICKCORE_HAVE_PTHREAD)
-  ssize_t sysError;
+  int sysError;
   if ( (sysError = ::pthread_mutex_lock( &_mutex )) == 0)
     return;
   throwExceptionExplicit( OptionError, "mutex lock failed",
@@ -93,7 +93,7 @@ void Magick::MutexLock::lock(void)
 void Magick::MutexLock::unlock(void)
 {
 #if defined(MAGICKCORE_HAVE_PTHREAD)
-  ssize_t sysError;
+  int sysError;
   if ( (sysError = ::pthread_mutex_unlock( &_mutex )) == 0)
     return;
   throwExceptionExplicit( OptionError, "mutex unlock failed",