From: cristy <urban-warrior@git.imagemagick.org>
Date: Thu, 10 Mar 2011 17:55:52 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~8001
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b3e3ad01f4f400dd56e6d4e241f9a7b12fb93305;p=imagemagick

---

diff --git a/ChangeLog b/ChangeLog
index 7dd9af8d2..acdc692b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-10  6.6.8-3 Cristy  <quetzlzacatenango@image...>
+  * Boost causes an ambiguity with ssize_t when building PythonMagick.  Add
+    patch from Arfrever@gento... to fix the build exception.
+
 2011-03-09  6.6.8-2 Cristy  <quetzlzacatenango@image...>
   * Support the Radiance HDR image format.
   * Update the offset in the black channel when sharpening to avoid incorrect
diff --git a/Magick++/lib/Magick++/BlobRef.h b/Magick++/lib/Magick++/BlobRef.h
index f39d850a0..747ff002a 100644
--- a/Magick++/lib/Magick++/BlobRef.h
+++ b/Magick++/lib/Magick++/BlobRef.h
@@ -37,7 +37,7 @@ namespace Magick
     void *          _data;      // Blob data
     size_t          _length;    // Blob length
     Blob::Allocator _allocator; // Memory allocation system in use
-    ssize_t             _refCount;  // Reference count
+    ::ssize_t       _refCount;  // Reference count
     MutexLock       _mutexLock; // Mutex lock
   };
 
diff --git a/Magick++/lib/Magick++/Drawable.h b/Magick++/lib/Magick++/Drawable.h
index 768e0bc8b..272a54a23 100644
--- a/Magick++/lib/Magick++/Drawable.h
+++ b/Magick++/lib/Magick++/Drawable.h
@@ -475,7 +475,7 @@ public:
   /*virtual*/ DrawableBase* copy() const;
 
 private:
-  ssize_t   _dummy;
+  ::ssize_t   _dummy;
 };
 
 // Push (create) Clip path definition
@@ -1255,7 +1255,7 @@ public:
   /*virtual*/ DrawableBase* copy() const;
 
 private:
-  ssize_t   _dummy;
+  ::ssize_t   _dummy;
 };
 
 // Push Graphic Context
@@ -1276,7 +1276,7 @@ public:
   /*virtual*/ DrawableBase* copy() const;
 
 private:
-  ssize_t   _dummy;
+  ::ssize_t   _dummy;
 };
 
 // Pop (terminate) Pattern definition
@@ -1297,14 +1297,14 @@ public:
   /*virtual*/ DrawableBase* copy() const;
 
 private:
-  ssize_t   _dummy;
+  ::ssize_t   _dummy;
 };
 
 // Push (create) Pattern definition
 class MagickDLLDecl DrawablePushPattern : public DrawableBase
 {
 public:
-  DrawablePushPattern ( const std::string &id_, ssize_t x_, ssize_t y_,
+  DrawablePushPattern ( const std::string &id_, ::ssize_t x_, ::ssize_t y_,
                         size_t width_, size_t height_ );
 
   DrawablePushPattern ( const DrawablePushPattern& original_ );
@@ -1319,8 +1319,8 @@ public:
 
 private:
   std::string         _id;
-  ssize_t		_x;
-  ssize_t		_y;
+  ::ssize_t		_x;
+  ::ssize_t		_y;
   size_t		_width;
   size_t		_height;
 };
@@ -2055,8 +2055,8 @@ private:
 class MagickDLLDecl DrawableViewbox : public DrawableBase
 {
 public:
-  DrawableViewbox(ssize_t x1_, ssize_t y1_,
-                  ssize_t x2_, ssize_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( ssize_t x1_ )
+  void x1( ::ssize_t x1_ )
     {
       _x1 = x1_;
     }
-  ssize_t x1( void ) const
+  ::ssize_t x1( void ) const
     {
       return _x1;
     }
 
-  void y1( ssize_t y1_ )
+  void y1( ::ssize_t y1_ )
     {
       _y1 = y1_;
     }
-  ssize_t y1( void ) const
+  ::ssize_t y1( void ) const
     {
       return _y1;
     }
 
-  void x2( ssize_t x2_ )
+  void x2( ::ssize_t x2_ )
     {
       _x2 = x2_;
     }
-  ssize_t x2( void ) const
+  ::ssize_t x2( void ) const
     {
       return _x2;
     }
 
-  void y2( ssize_t y2_ )
+  void y2( ::ssize_t y2_ )
     {
       _y2 = y2_;
     }
-  ssize_t y2( void ) const
+  ::ssize_t y2( void ) const
     {
       return _y2;
     }
 
 private:
-  ssize_t _x1;
-  ssize_t _y1;
-  ssize_t _x2;
-  ssize_t _y2;
+  ::ssize_t _x1;
+  ::ssize_t _y1;
+  ::ssize_t _x2;
+  ::ssize_t _y2;
 };
 
 //
@@ -2295,7 +2295,7 @@ public:
   /*virtual*/ VPathBase* copy() const;
 
 private:
-  ssize_t   _dummy;
+  ::ssize_t   _dummy;
 };
 
 //
diff --git a/Magick++/lib/Magick++/Geometry.h b/Magick++/lib/Magick++/Geometry.h
index 817f322e6..a84e5644f 100644
--- a/Magick++/lib/Magick++/Geometry.h
+++ b/Magick++/lib/Magick++/Geometry.h
@@ -32,8 +32,8 @@ namespace Magick
     
     Geometry ( size_t width_,
 	       size_t height_,
-	       ssize_t xOff_ = 0,
-	       ssize_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 ( ssize_t xOff_ );
-    ssize_t  xOff ( void ) const;
+    void          xOff ( ::ssize_t xOff_ );
+    ::ssize_t     xOff ( void ) const;
     
     // Y offset from origin
-    void          yOff ( ssize_t yOff_ );
-    ssize_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_ );
@@ -109,8 +109,8 @@ namespace Magick
   private:
     size_t  _width;
     size_t  _height;
-    ssize_t  _xOff;
-    ssize_t  _yOff;
+    ::ssize_t     _xOff;
+    ::ssize_t     _yOff;
     bool          _xNegative;
     bool          _yNegative;
     bool          _isValid;
@@ -158,21 +158,21 @@ inline size_t Magick::Geometry::height ( void ) const
 }
 
 // X offset from origin
-inline void Magick::Geometry::xOff ( ssize_t xOff_ )
+inline void Magick::Geometry::xOff ( ::ssize_t xOff_ )
 {
   _xOff = xOff_;
 }
-inline ssize_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 ( ssize_t yOff_ )
+inline void Magick::Geometry::yOff ( ::ssize_t yOff_ )
 {
   _yOff = yOff_;
 }
-inline ssize_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 1dcc44a89..5dfc8aa9a 100644
--- a/Magick++/lib/Magick++/Image.h
+++ b/Magick++/lib/Magick++/Image.h
@@ -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 ssize_t offset = 0 );
+                                        const ::ssize_t offset = 0 );
 
     // Add noise to image with specified noise type
     void            addNoise ( const NoiseType noiseType_ );
@@ -234,8 +234,8 @@ namespace Magick
     // Compose an image onto another at specified offset and using
     // specified algorithm
     void            composite ( const Image &compositeImage_,
-        const ssize_t xOffset_,
-        const ssize_t yOffset_,
+        const ::ssize_t xOffset_,
+        const ::ssize_t yOffset_,
         const CompositeOperator compose_
                                 = InCompositeOp );
     void            composite ( const Image &compositeImage_,
@@ -260,7 +260,7 @@ namespace Magick
     void            crop ( const Geometry &geometry_ );
     
     // Cycle image colormap
-    void            cycleColormap ( const ssize_t amount_ );
+    void            cycleColormap ( const ::ssize_t amount_ );
     
     // Despeckle image (reduce speckle noise)
     void            despeckle ( void );
@@ -314,8 +314,8 @@ namespace Magick
     // Flood-fill color 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.
-    void            floodFillColor( const ssize_t x_,
-                                    const ssize_t y_,
+    void            floodFillColor( const ::ssize_t x_,
+                                    const ::ssize_t y_,
             const Color &fillColor_ );
     void            floodFillColor( const Geometry &point_,
             const Color &fillColor_ );
@@ -323,8 +323,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.
-    void            floodFillColor( const ssize_t x_,
-                                    const ssize_t y_,
+    void            floodFillColor( const ::ssize_t x_,
+                                    const ::ssize_t y_,
             const Color &fillColor_,
             const Color &borderColor_ );
     void            floodFillColor( const Geometry &point_,
@@ -333,16 +333,16 @@ namespace Magick
 
     // Floodfill pixels matching color (within fuzz factor) of target
     // pixel(x,y) with replacement opacity value using method.
-    void            floodFillOpacity ( const ssize_t x_,
-                                       const ssize_t y_,
+    void            floodFillOpacity ( const ::ssize_t x_,
+                                       const ::ssize_t y_,
                                        const unsigned int opacity_,
                                        const PaintMethod method_ );
 
     // 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.
-    void            floodFillTexture( const ssize_t x_,
-                                      const ssize_t y_,
+    void            floodFillTexture( const ::ssize_t x_,
+                                      const ::ssize_t y_,
               const Image &texture_ );
     void            floodFillTexture( const Geometry &point_,
               const Image &texture_ );
@@ -350,8 +350,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.
-    void            floodFillTexture( const ssize_t x_,
-                                      const ssize_t y_,
+    void            floodFillTexture( const ::ssize_t x_,
+                                      const ::ssize_t y_,
               const Image &texture_,
               const Color &borderColor_ );
     void            floodFillTexture( const Geometry &point_,
@@ -365,8 +365,8 @@ namespace Magick
     void            frame ( const Geometry &geometry_ = frameGeometryDefault );
     void            frame ( const size_t width_,
                             const size_t height_,
-                            const ssize_t innerBevel_ = 6,
-                            const ssize_t outerBevel_ = 6 );
+                            const ::ssize_t innerBevel_ = 6,
+                            const ::ssize_t outerBevel_ = 6 );
 
     // Applies a mathematical expression to the image.
     void            fx ( const std::string expression );
@@ -445,7 +445,7 @@ namespace Magick
     // Floodfill designated area with replacement opacity value
     void            matteFloodfill ( const Color &target_ ,
              const unsigned int opacity_,
-             const ssize_t x_, const ssize_t y_,
+             const ::ssize_t x_, const ::ssize_t y_,
              const PaintMethod method_ );
 
     // Filter image by replacing each pixel component with the median
@@ -513,7 +513,7 @@ namespace Magick
                                       const MagickEvaluateOperator operator_,
                                       double rvalue_);
 
-    void            quantumOperator ( const ssize_t x_,const ssize_t y_,
+    void            quantumOperator ( const ::ssize_t x_,const ::ssize_t y_,
                                       const size_t columns_,
                                       const size_t rows_,
                                       const ChannelType channel_,
@@ -525,7 +525,7 @@ namespace Magick
     // requested process module doesn't exist, fails to load, or fails during
     // execution.
     void            process ( std::string name_,
-                              const ssize_t argc_,
+                              const ::ssize_t argc_,
                               const char **argv_ );
 
     // Raise image (lighten or darken the edges of an image to give a
@@ -745,8 +745,8 @@ namespace Magick
     // Write single image frame to an array of pixels with storage
     // type specified by user (DispatchImage), e.g.
     //   image.write( 0, 0, 640, 1, "RGB", 0, pixels );
-    void            write ( const ssize_t x_,
-                            const ssize_t y_,
+    void            write ( const ::ssize_t x_,
+                            const ::ssize_t y_,
                             const size_t columns_,
                             const size_t rows_,
                             const std::string& map_,
@@ -1083,11 +1083,11 @@ typedef struct _ImageStatistics
     Image           penTexture ( void  ) const;
 
     // Get/set pixel color at location x & y.
-    void            pixelColor ( const ssize_t x_,
-                                 const ssize_t y_,
+    void            pixelColor ( const ::ssize_t x_,
+                                 const ::ssize_t y_,
          const Color &color_ );
-    Color           pixelColor ( const ssize_t x_,
-                                 const ssize_t y_ ) const;
+    Color           pixelColor ( const ::ssize_t x_,
+                                 const ::ssize_t y_ ) const;
 
     // Add or remove a named profile to/from the image. Remove the
     // profile by passing an empty Blob (e.g. Blob()). Valid names are
@@ -1276,7 +1276,7 @@ typedef struct _ImageStatistics
 
     // Transfers read-only pixels from the image to the pixel cache as
     // defined by the specified region
-    const PixelPacket* getConstPixels ( const ssize_t x_, const ssize_t y_,
+    const PixelPacket* getConstPixels ( const ::ssize_t x_, const ::ssize_t y_,
                                         const size_t columns_,
                                         const size_t rows_ ) const;
 
@@ -1290,14 +1290,14 @@ typedef struct _ImageStatistics
     // by the specified region. Modified pixels may be subsequently
     // transferred back to the image via syncPixels.  This method is
     // valid for DirectClass images.
-    PixelPacket* getPixels ( const ssize_t x_, const ssize_t y_,
+    PixelPacket* getPixels ( const ::ssize_t x_, const ::ssize_t y_,
            const size_t columns_,
                              const size_t rows_ );
 
     // Allocates a pixel cache region to store image pixels as defined
     // by the region rectangle.  This area is subsequently transferred
     // from the pixel cache to the image via syncPixels.
-    PixelPacket* setPixels ( const ssize_t x_, const ssize_t y_,
+    PixelPacket* setPixels ( const ::ssize_t x_, const ::ssize_t y_,
            const size_t columns_,
                              const size_t rows_ );
 
@@ -1352,7 +1352,7 @@ typedef struct _ImageStatistics
     void            throwImageException( void ) const;
 
     // Register image with image registry or obtain registration id
-    ssize_t            registerId( void );
+    ::ssize_t       registerId( void );
 
     // Unregister image from image registry
     void            unregisterId( void) ;
diff --git a/Magick++/lib/Magick++/ImageRef.h b/Magick++/lib/Magick++/ImageRef.h
index 0ba074616..d31078fed 100644
--- a/Magick++/lib/Magick++/ImageRef.h
+++ b/Magick++/lib/Magick++/ImageRef.h
@@ -43,13 +43,13 @@ namespace Magick
     void                 options ( Options * options_ );
     Options *            options ( void );
 
-    void                 id ( const ssize_t id_ );
-    ssize_t                 id ( void ) const;
+    void                 id ( const ::ssize_t id_ );
+    ::ssize_t            id ( void ) const;
     
-    MagickCore::Image *   _image;    // ImageMagick Image
+    MagickCore::Image *  _image;    // ImageMagick Image
     Options *            _options;  // User-specified options
-    ssize_t                 _id;       // Registry ID (-1 if not registered)
-    ssize_t                  _refCount; // Reference count
+    ::ssize_t            _id;       // Registry ID (-1 if not registered)
+    ::ssize_t            _refCount; // Reference count
     MutexLock            _mutexLock;// Mutex lock
   };
 
@@ -72,7 +72,7 @@ inline Magick::Options * Magick::ImageRef::options ( void )
 }
 
 // Retrieve registration id from reference
-inline ssize_t Magick::ImageRef::id ( void ) const
+inline ::ssize_t Magick::ImageRef::id ( void ) const
 {
   return _id;
 }
diff --git a/Magick++/lib/Magick++/Pixels.h b/Magick++/lib/Magick++/Pixels.h
index 27e0f36ae..3c5f52868 100644
--- a/Magick++/lib/Magick++/Pixels.h
+++ b/Magick++/lib/Magick++/Pixels.h
@@ -27,12 +27,12 @@ namespace Magick
     // Transfer pixels from the image to the pixel view as defined by
     // the specified region. Modified pixels may be subsequently
     // transferred back to the image via sync.
-    PixelPacket* get ( const ssize_t x_, const ssize_t y_,
+    PixelPacket* get ( const ::ssize_t x_, const ::ssize_t y_,
 		       const size_t columns_,const  size_t rows_ );
 
     // Transfer read-only pixels from the image to the pixel view as
     // defined by the specified region.
-    const PixelPacket* getConst ( const ssize_t x_, const ssize_t y_,
+    const PixelPacket* getConst ( const ::ssize_t x_, const ::ssize_t y_,
                                   const size_t columns_,
                                   const size_t rows_ );
     
@@ -42,17 +42,17 @@ namespace Magick
     // Allocate a pixel view region to store image pixels as defined
     // by the region rectangle.  This area is subsequently transferred
     // from the pixel view to the image via sync.
-    PixelPacket* set ( const ssize_t x_, const ssize_t y_,
+    PixelPacket* set ( const ::ssize_t x_, const ::ssize_t y_,
 		       const size_t columns_, const size_t rows_ );
 
     // Return pixel colormap index array
     IndexPacket* indexes ( void );
 
     // Left ordinate of view
-    ssize_t x ( void ) const;
+    ::ssize_t x ( void ) const;
 
     // Top ordinate of view
-    ssize_t y ( void ) const;
+    ::ssize_t y ( void ) const;
 
     // Width of view
     size_t columns ( void ) const;
@@ -86,8 +86,8 @@ namespace Magick
 
     Magick::Image          _image;   // Image reference
     MagickCore::CacheView*   _view;    // Image view handle
-    ssize_t                    _x;       // Left ordinate of view
-    ssize_t                    _y;       // Top ordinate of view
+    ::ssize_t                  _x;       // Left ordinate of view
+    ::ssize_t                  _y;       // Top ordinate of view
     size_t           _columns; // Width of view
     size_t           _rows;    // Height of view
     MagickCore:: ExceptionInfo _exception; // Any thrown exception
@@ -101,13 +101,13 @@ namespace Magick
 //
 
 // Left ordinate of view
-inline ssize_t Magick::Pixels::x ( void ) const
+inline ::ssize_t Magick::Pixels::x ( void ) const
 {
   return _x;
 }
 
 // Top ordinate of view
-inline ssize_t Magick::Pixels::y ( void ) const
+inline ::ssize_t Magick::Pixels::y ( void ) const
 {
   return _y;
 }
diff --git a/Magick++/lib/Magick++/STL.h b/Magick++/lib/Magick++/STL.h
index f2d80fdbd..05cd3b8c0 100644
--- a/Magick++/lib/Magick++/STL.h
+++ b/Magick++/lib/Magick++/STL.h
@@ -64,14 +64,14 @@ namespace Magick
   public:
     adaptiveThresholdImage( const size_t width_,
                             const size_t height_,
-                            const ssize_t offset_ = 0  );
+                            const ::ssize_t offset_ = 0  );
 
     void operator()( Image &image_ ) const;
 
   private:
     size_t _width;
     size_t _height;
-    ssize_t _offset;
+    ::ssize_t _offset;
   };
   
   // Add noise to image with specified noise type
@@ -279,8 +279,8 @@ namespace Magick
   {
   public:
     compositeImage( const Image &compositeImage_,
-        ssize_t xOffset_,
-        ssize_t yOffset_,
+        ::ssize_t xOffset_,
+        ::ssize_t yOffset_,
         CompositeOperator compose_ = InCompositeOp );
 
     compositeImage( const Image &compositeImage_,
@@ -291,8 +291,8 @@ namespace Magick
 
   private:
     Image             _compositeImage;
-    ssize_t               _xOffset;
-    ssize_t               _yOffset;
+    ::ssize_t         _xOffset;
+    ::ssize_t         _yOffset;
     CompositeOperator _compose;
   };
 
@@ -324,12 +324,12 @@ namespace Magick
   class MagickDLLDecl cycleColormapImage : public std::unary_function<Image&,void>
   {
   public:
-    cycleColormapImage( const ssize_t amount_ );
+    cycleColormapImage( const ::ssize_t amount_ );
 
     void operator()( Image &image_ ) const;
 
   private:
-    ssize_t _amount;
+    ::ssize_t _amount;
   };
 
   // Despeckle image (reduce speckle noise)
@@ -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 ssize_t x_,
-                         const ssize_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 ssize_t x_,
-                         const ssize_t y_,
+    floodFillColorImage( const ::ssize_t x_,
+                         const ::ssize_t y_,
        const Color &fillColor_,
        const Color &borderColor_ );
 
@@ -485,8 +485,8 @@ namespace Magick
     void operator()( Image &image_ ) const;
 
   private:
-    ssize_t   _x;
-    ssize_t   _y;
+    ::ssize_t   _x;
+    ::ssize_t   _y;
     Color          _fillColor;
     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 ssize_t x_,
-                           const ssize_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 ssize_t x_,
-                           const ssize_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:
-    ssize_t  _x;
-    ssize_t  _y;
+    ::ssize_t  _x;
+    ::ssize_t  _y;
     Image         _texture;
     Color         _borderColor;
   };
@@ -544,15 +544,15 @@ namespace Magick
     frameImage( const Geometry &geometry_ = frameGeometryDefault );
 
     frameImage( const size_t width_, const size_t height_,
-    const ssize_t innerBevel_ = 6, const ssize_t outerBevel_ = 6 );
+    const ::ssize_t innerBevel_ = 6, const ::ssize_t outerBevel_ = 6 );
 
     void operator()( Image &image_ ) const;
 
   private:
     size_t _width;
     size_t _height;
-    ssize_t          _outerBevel;
-    ssize_t          _innerBevel;
+    ::ssize_t        _outerBevel;
+    ::ssize_t        _innerBevel;
   };
 
   // Gamma correct image
@@ -717,7 +717,7 @@ namespace Magick
   public:
     matteFloodfillImage( const Color &target_ ,
        const unsigned int matte_,
-       const ssize_t x_, const ssize_t y_,
+       const ::ssize_t x_, const ::ssize_t y_,
        const PaintMethod method_ );
 
     void operator()( Image &image_ ) const;
@@ -725,8 +725,8 @@ namespace Magick
   private:
     Color         _target;
     unsigned int  _matte;
-    ssize_t           _x;
-    ssize_t           _y;
+    ::ssize_t     _x;
+    ::ssize_t     _y;
     PaintMethod   _method;
   };
 
@@ -899,7 +899,7 @@ namespace Magick
   public:
     rollImage( const Geometry &roll_ );
 
-    rollImage( const ssize_t columns_, const ssize_t rows_ );
+    rollImage( const ::ssize_t columns_, const ::ssize_t rows_ );
 
     void operator()( Image &image_ ) const;
 
@@ -1593,15 +1593,15 @@ namespace Magick
   class MagickDLLDecl pixelColorImage : public std::unary_function<Image&,void>
   {
   public:
-    pixelColorImage( const ssize_t x_,
-                     const ssize_t y_,
+    pixelColorImage( const ::ssize_t x_,
+                     const ::ssize_t y_,
          const Color &color_);
 
     void operator()( Image &image_ ) const;
 
   private:
-    ssize_t _x;
-    ssize_t _y;
+    ::ssize_t    _x;
+    ::ssize_t    _y;
     Color        _color;
   };
 
@@ -1857,7 +1857,7 @@ namespace Magick
        InputIterator last_ ) {
 
     MagickCore::Image* previous = 0;
-    ssize_t scene = 0;
+    ::ssize_t scene = 0;
     for ( InputIterator iter = first_; iter != last_; ++iter )
       {
   // Unless we reduce the reference count to one, the same image
@@ -2036,7 +2036,7 @@ namespace Magick
     // Clear out container
     container_->clear();
 
-    for ( ssize_t i=0; i < (ssize_t) number_formats; i++)
+    for ( ::ssize_t i=0; i < (::ssize_t) number_formats; i++)
       {
         const MagickCore::MagickInfo *magick_info =
           MagickCore::GetMagickInfo( coder_list[i], &exceptionInfo );
@@ -2493,7 +2493,7 @@ namespace Magick
     MagickCore::GetExceptionInfo( &exceptionInfo );
 
     linkImages( first_, last_ );
-    ssize_t errorStat = MagickCore::WriteImages( first_->constImageInfo(),
+    ::ssize_t errorStat = MagickCore::WriteImages( first_->constImageInfo(),
                                             first_->image(),
                                             imageSpec_.c_str(),
                                             &exceptionInfo );