+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
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
};
/*virtual*/ DrawableBase* copy() const;
private:
- ssize_t _dummy;
+ ::ssize_t _dummy;
};
// Push (create) Clip path definition
/*virtual*/ DrawableBase* copy() const;
private:
- ssize_t _dummy;
+ ::ssize_t _dummy;
};
// Push Graphic Context
/*virtual*/ DrawableBase* copy() const;
private:
- ssize_t _dummy;
+ ::ssize_t _dummy;
};
// Pop (terminate) Pattern definition
/*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_ );
private:
std::string _id;
- ssize_t _x;
- ssize_t _y;
+ ::ssize_t _x;
+ ::ssize_t _y;
size_t _width;
size_t _height;
};
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_),
/*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;
};
//
/*virtual*/ VPathBase* copy() const;
private:
- ssize_t _dummy;
+ ::ssize_t _dummy;
};
//
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_ );
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_ );
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;
}
// 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;
}
// 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_ );
// 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_,
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 );
// 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_ );
// 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_,
// 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_ );
// 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_,
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 );
// 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
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_,
// 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
// 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_,
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
// 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;
// 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_ );
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) ;
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
};
}
// Retrieve registration id from reference
-inline ssize_t Magick::ImageRef::id ( void ) const
+inline ::ssize_t Magick::ImageRef::id ( void ) const
{
return _id;
}
// 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_ );
// 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;
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
//
// 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;
}
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
{
public:
compositeImage( const Image &compositeImage_,
- ssize_t xOffset_,
- ssize_t yOffset_,
+ ::ssize_t xOffset_,
+ ::ssize_t yOffset_,
CompositeOperator compose_ = InCompositeOp );
compositeImage( const Image &compositeImage_,
private:
Image _compositeImage;
- ssize_t _xOffset;
- ssize_t _yOffset;
+ ::ssize_t _xOffset;
+ ::ssize_t _yOffset;
CompositeOperator _compose;
};
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)
// 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_,
// 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_ );
void operator()( Image &image_ ) const;
private:
- ssize_t _x;
- ssize_t _y;
+ ::ssize_t _x;
+ ::ssize_t _y;
Color _fillColor;
Color _borderColor;
};
// 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_,
// 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_ );
void operator()( Image &image_ ) const;
private:
- ssize_t _x;
- ssize_t _y;
+ ::ssize_t _x;
+ ::ssize_t _y;
Image _texture;
Color _borderColor;
};
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
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;
private:
Color _target;
unsigned int _matte;
- ssize_t _x;
- ssize_t _y;
+ ::ssize_t _x;
+ ::ssize_t _y;
PaintMethod _method;
};
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;
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;
};
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
// 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 );
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 );
projects / imagemagick / commitdiff