From: cristy Date: Sat, 29 May 2010 22:36:02 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~9363 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eaedf06777741da32408da72c1e512975c600c48;p=imagemagick --- diff --git a/Magick++/lib/Drawable.cpp b/Magick++/lib/Drawable.cpp index 56552a66a..3c244e6f6 100644 --- a/Magick++/lib/Drawable.cpp +++ b/Magick++/lib/Drawable.cpp @@ -1026,7 +1026,7 @@ Magick::DrawableDashArray::DrawableDashArray( const double* dasharray_ ) } // Deprecated, do not use for new code, and migrate existing code to // using double* -Magick::DrawableDashArray::DrawableDashArray( const unsigned int* dasharray_ ) +Magick::DrawableDashArray::DrawableDashArray( const size_t* dasharray_ ) : _size(0), _dasharray(0) { @@ -1071,7 +1071,7 @@ void Magick::DrawableDashArray::dasharray ( const double* dasharray_ ) if(dasharray_) { // Count elements in dash array - unsigned int n = 0; + size_t n = 0; { const double *p = dasharray_; while(*p++ != 0) @@ -1093,16 +1093,16 @@ void Magick::DrawableDashArray::dasharray ( const double* dasharray_ ) } // This method is deprecated. Don't use for new code, and migrate existing // code to the const double* version. -void Magick::DrawableDashArray::dasharray( const unsigned int* dasharray_ ) +void Magick::DrawableDashArray::dasharray( const size_t* dasharray_ ) { _dasharray=(double *) RelinquishMagickMemory(_dasharray); if(dasharray_) { // Count elements in dash array - unsigned int n = 0; + size_t n = 0; { - const unsigned int *p = dasharray_; + const size_t *p = dasharray_; while(*p++ != 0) n++; } @@ -1113,7 +1113,7 @@ void Magick::DrawableDashArray::dasharray( const unsigned int* dasharray_ ) // Copy elements { double *q = _dasharray; - const unsigned int *p = dasharray_; + const size_t *p = dasharray_; while( *p ) *q++=static_cast(*p++); *q=0; diff --git a/Magick++/lib/Geometry.cpp b/Magick++/lib/Geometry.cpp index dc104fb74..82c98e3bf 100644 --- a/Magick++/lib/Geometry.cpp +++ b/Magick++/lib/Geometry.cpp @@ -70,10 +70,10 @@ int Magick::operator <= ( const Magick::Geometry& left_, } // Construct using parameterized arguments -Magick::Geometry::Geometry ( unsigned int width_, - unsigned int height_, - unsigned int xOff_, - unsigned int yOff_, +Magick::Geometry::Geometry ( size_t width_, + size_t height_, + size_t xOff_, + size_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(AbsoluteValue(x)); + _xOff = static_cast(AbsoluteValue(x)); isValid( true ); } if ( ( flags & YValue ) != 0 ) { - _yOff = static_cast(AbsoluteValue(y)); + _yOff = static_cast(AbsoluteValue(y)); isValid( true ); } @@ -333,10 +333,10 @@ Magick::Geometry::operator std::string() const // Construct from RectangleInfo Magick::Geometry::Geometry ( const MagickCore::RectangleInfo &rectangle_ ) - : _width(static_cast(rectangle_.width)), - _height(static_cast(rectangle_.height)), - _xOff(static_cast(AbsoluteValue(rectangle_.x))), - _yOff(static_cast(AbsoluteValue(rectangle_.y))), + : _width(static_cast(rectangle_.width)), + _height(static_cast(rectangle_.height)), + _xOff(static_cast(AbsoluteValue(rectangle_.x))), + _yOff(static_cast(AbsoluteValue(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 f9d3315f6..34f10a6a3 100644 --- a/Magick++/lib/Image.cpp +++ b/Magick++/lib/Image.cpp @@ -182,7 +182,7 @@ Magick::Image::Image ( const Blob &blob_, // Construct Image of specified size and depth from in-memory BLOB Magick::Image::Image ( const Blob &blob_, const Geometry &size_, - const unsigned int depth_ ) + const size_t depth_ ) : _imgRef(new ImageRef) { try @@ -205,7 +205,7 @@ Magick::Image::Image ( const Blob &blob_, // Construct Image of specified size, depth, and format from in-memory BLOB Magick::Image::Image ( const Blob &blob_, const Geometry &size_, - const unsigned int depth_, + const size_t depth_, const std::string &magick_ ) : _imgRef(new ImageRef) { @@ -251,8 +251,8 @@ Magick::Image::Image ( const Blob &blob_, // Construct an image based on an array of raw pixels, of specified // type and mapping, in memory -Magick::Image::Image ( const unsigned int width_, - const unsigned int height_, +Magick::Image::Image ( const size_t width_, + const size_t height_, const std::string &map_, const StorageType type_, const void *pixels_ ) @@ -314,9 +314,9 @@ void Magick::Image::adaptiveBlur( const double radius_, const double sigma_ ) // http://www.dai.ed.ac.uk/HIPR2/adpthrsh.htm // Width x height define the size of the pixel neighborhood // offset = constant to subtract from pixel neighborhood mean -void Magick::Image::adaptiveThreshold ( const unsigned int width_, - const unsigned int height_, - const unsigned int offset_ ) +void Magick::Image::adaptiveThreshold ( const size_t width_, + const size_t height_, + const size_t offset_ ) { ExceptionInfo exceptionInfo; GetExceptionInfo( &exceptionInfo ); @@ -526,15 +526,15 @@ void Magick::Image::channel ( const ChannelType channel_ ) // Set or obtain modulus channel depth void Magick::Image::channelDepth ( const ChannelType channel_, - const unsigned int depth_) + const size_t depth_) { modifyImage(); SetImageChannelDepth( image(), channel_, depth_); throwImageException(); } -unsigned int Magick::Image::channelDepth ( const ChannelType channel_ ) +size_t Magick::Image::channelDepth ( const ChannelType channel_ ) { - unsigned int channel_depth; + size_t channel_depth; ExceptionInfo exceptionInfo; GetExceptionInfo( &exceptionInfo ); @@ -581,9 +581,9 @@ void Magick::Image::cdl ( const std::string &cdl_ ) } // Colorize -void Magick::Image::colorize ( const unsigned int opacityRed_, - const unsigned int opacityGreen_, - const unsigned int opacityBlue_, +void Magick::Image::colorize ( const size_t opacityRed_, + const size_t opacityGreen_, + const size_t opacityBlue_, const Color &penColor_ ) { if ( !penColor_.isValid() ) @@ -604,7 +604,7 @@ void Magick::Image::colorize ( const unsigned int opacityRed_, throwException( exceptionInfo ); (void) DestroyExceptionInfo( &exceptionInfo ); } -void Magick::Image::colorize ( const unsigned int opacity_, +void Magick::Image::colorize ( const size_t opacity_, const Color &penColor_ ) { colorize( opacity_, opacity_, opacity_, penColor_ ); @@ -612,7 +612,7 @@ void Magick::Image::colorize ( const unsigned int opacity_, // Apply a color matrix to the image channels. The user supplied // matrix may be of order 1 to 6 (1x1 through 6x6). -void Magick::Image::colorMatrix (const unsigned int order_, +void Magick::Image::colorMatrix (const size_t order_, const double *color_matrix_) { KernelInfo @@ -701,7 +701,7 @@ void Magick::Image::composite ( const Image &compositeImage_, } // Contrast image -void Magick::Image::contrast ( const unsigned int sharpen_ ) +void Magick::Image::contrast ( const size_t sharpen_ ) { modifyImage(); ContrastImage ( image(), (MagickBooleanType) sharpen_ ); @@ -711,7 +711,7 @@ void Magick::Image::contrast ( const unsigned int sharpen_ ) // Convolve image. Applies a general image convolution kernel to the image. // order_ represents the number of columns and rows in the filter kernel. // kernel_ is an array of doubles representing the convolution kernel. -void Magick::Image::convolve ( const unsigned int order_, +void Magick::Image::convolve ( const size_t order_, const double *kernel_ ) { ExceptionInfo exceptionInfo; @@ -928,8 +928,8 @@ void Magick::Image::flip ( 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 Magick::Image::floodFillColor( const unsigned int x_, - const unsigned int y_, +void Magick::Image::floodFillColor( const size_t x_, + const size_t y_, const Magick::Color &fillColor_ ) { floodFillTexture( x_, y_, Image( Geometry( 1, 1), fillColor_ ) ); @@ -943,8 +943,8 @@ void Magick::Image::floodFillColor( 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. -void Magick::Image::floodFillColor( const unsigned int x_, - const unsigned int y_, +void Magick::Image::floodFillColor( const size_t x_, + const size_t y_, const Magick::Color &fillColor_, const Magick::Color &borderColor_ ) { @@ -961,9 +961,9 @@ void Magick::Image::floodFillColor( const Geometry &point_, // Floodfill pixels matching color (within fuzz factor) of target // pixel(x,y) with replacement opacity value using method. -void Magick::Image::floodFillOpacity( const unsigned int x_, - const unsigned int y_, - const unsigned int opacity_, +void Magick::Image::floodFillOpacity( const size_t x_, + const size_t y_, + const size_t opacity_, const PaintMethod method_ ) { modifyImage(); @@ -986,8 +986,8 @@ void Magick::Image::floodFillOpacity( const unsigned int x_, // 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 Magick::Image::floodFillTexture( const unsigned int x_, - const unsigned int y_, +void Magick::Image::floodFillTexture( const size_t x_, + const size_t y_, const Magick::Image &texture_ ) { modifyImage(); @@ -1025,8 +1025,8 @@ void Magick::Image::floodFillTexture( const Magick::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. -void Magick::Image::floodFillTexture( const unsigned int x_, - const unsigned int y_, +void Magick::Image::floodFillTexture( const size_t x_, + const size_t y_, const Magick::Image &texture_, const Magick::Color &borderColor_ ) { @@ -1112,8 +1112,8 @@ void Magick::Image::frame ( const Geometry &geometry_ ) throwException( exceptionInfo ); (void) DestroyExceptionInfo( &exceptionInfo ); } -void Magick::Image::frame ( const unsigned int width_, - const unsigned int height_, +void Magick::Image::frame ( const size_t width_, + const size_t height_, const int outerBevel_, const int innerBevel_ ) { FrameInfo info; @@ -1318,7 +1318,7 @@ void Magick::Image::map ( const Image &mapImage_ , const bool dither_ ) } // Floodfill designated area with replacement opacity value void Magick::Image::matteFloodfill ( const Color &target_ , - const unsigned int opacity_, + const size_t opacity_, const int x_, const int y_, const Magick::PaintMethod method_ ) { @@ -1427,7 +1427,7 @@ void Magick::Image::oilPaint ( const double radius_ ) // opacity_ ranges from 0 (completely opaque) to QuantumRange. The defines // OpaqueOpacity and TransparentOpacity are available to specify // completely opaque or completely transparent, respectively. -void Magick::Image::opacity ( const unsigned int opacity_ ) +void Magick::Image::opacity ( const size_t opacity_ ) { modifyImage(); SetImageOpacity( image(), opacity_ ); @@ -1499,7 +1499,7 @@ void Magick::Image::process( std::string name_, const int argc, const char **arg { modifyImage(); - unsigned int status = + size_t status = InvokeDynamicImageFilter( name_.c_str(), &image(), argc, argv, &image()->exception ); @@ -1536,8 +1536,8 @@ void Magick::Image::quantumOperator ( const ChannelType channel_, } void Magick::Image::quantumOperator ( const int x_,const int y_, - const unsigned int columns_, - const unsigned int rows_, + const size_t columns_, + const size_t rows_, const ChannelType channel_, const MagickEvaluateOperator operator_, const double rvalue_) @@ -1664,7 +1664,7 @@ void Magick::Image::read ( const Blob &blob_, // Read image of specified size and depth from in-memory BLOB void Magick::Image::read ( const Blob &blob_, const Geometry &size_, - const unsigned int depth_ ) + const size_t depth_ ) { // Set image size size( size_ ); @@ -1677,7 +1677,7 @@ void Magick::Image::read ( const Blob &blob_, // Read image of specified size, depth, and format from in-memory BLOB void Magick::Image::read ( const Blob &blob_, const Geometry &size_, - const unsigned int depth_, + const size_t depth_, const std::string &magick_ ) { // Set image size @@ -1708,8 +1708,8 @@ void Magick::Image::read ( const Blob &blob_, } // Read image based on raw pixels in memory (ConstituteImage) -void Magick::Image::read ( const unsigned int width_, - const unsigned int height_, +void Magick::Image::read ( const size_t width_, + const size_t height_, const std::string &map_, const StorageType type_, const void *pixels_ ) @@ -1784,8 +1784,8 @@ void Magick::Image::roll ( const Geometry &roll_ ) throwException( exceptionInfo ); (void) DestroyExceptionInfo( &exceptionInfo ); } -void Magick::Image::roll ( const unsigned int columns_, - const unsigned int rows_ ) +void Magick::Image::roll ( const size_t columns_, + const size_t rows_ ) { ExceptionInfo exceptionInfo; GetExceptionInfo( &exceptionInfo ); @@ -1950,7 +1950,7 @@ void Magick::Image::shear ( const double xShearAngle_, } // Contrast image -void Magick::Image::sigmoidalContrast ( const unsigned int sharpen_, const double contrast, const double midpoint ) +void Magick::Image::sigmoidalContrast ( const size_t sharpen_, const double contrast, const double midpoint ) { modifyImage(); (void) SigmoidalContrastImageChannel( image(), DefaultChannels, (MagickBooleanType) sharpen_, contrast, midpoint ); @@ -1984,7 +1984,7 @@ void Magick::Image::sparseColor ( const ChannelType channel, } // Spread pixels randomly within image by specified ammount -void Magick::Image::spread ( const unsigned int amount_ ) +void Magick::Image::spread ( const size_t amount_ ) { ExceptionInfo exceptionInfo; GetExceptionInfo( &exceptionInfo ); @@ -2239,7 +2239,7 @@ void Magick::Image::write ( Blob *blob_, } void Magick::Image::write ( Blob *blob_, const std::string &magick_, - const unsigned int depth_ ) + const size_t depth_ ) { modifyImage(); magick(magick_); @@ -2262,8 +2262,8 @@ void Magick::Image::write ( Blob *blob_, // image.write( 0, 0, 640, 1, "RGB", 0, pixels ); void Magick::Image::write ( const int x_, const int y_, - const unsigned int columns_, - const unsigned int rows_, + const size_t columns_, + const size_t rows_, const std::string &map_, const StorageType type_, void *pixels_ ) @@ -2323,7 +2323,7 @@ bool Magick::Image::adjoin ( void ) const void Magick::Image::antiAlias( const bool flag_ ) { modifyImage(); - options()->antiAlias( static_cast(flag_) ); + options()->antiAlias( static_cast(flag_) ); } bool Magick::Image::antiAlias( void ) { @@ -2331,23 +2331,23 @@ bool Magick::Image::antiAlias( void ) } // Animation inter-frame delay -void Magick::Image::animationDelay ( const unsigned int delay_ ) +void Magick::Image::animationDelay ( const size_t delay_ ) { modifyImage(); image()->delay = delay_; } -unsigned int Magick::Image::animationDelay ( void ) const +size_t Magick::Image::animationDelay ( void ) const { return constImage()->delay; } // Number of iterations to play animation -void Magick::Image::animationIterations ( const unsigned int iterations_ ) +void Magick::Image::animationIterations ( const size_t iterations_ ) { modifyImage(); image()->iterations = iterations_; } -unsigned int Magick::Image::animationIterations ( void ) const +size_t Magick::Image::animationIterations ( void ) const { return constImage()->iterations; } @@ -2408,7 +2408,7 @@ std::string Magick::Image::backgroundTexture ( void ) const } // Original image columns -unsigned int Magick::Image::baseColumns ( void ) const +size_t Magick::Image::baseColumns ( void ) const { return constImage()->magick_columns; } @@ -2420,7 +2420,7 @@ std::string Magick::Image::baseFilename ( void ) const } // Original image rows -unsigned int Magick::Image::baseRows ( void ) const +size_t Magick::Image::baseRows ( void ) const { return constImage()->magick_rows; } @@ -2480,7 +2480,7 @@ Magick::Color Magick::Image::boxColor ( void ) const // subsequent pixels cache operations are to/from disk. // This setting is shared by all Image objects. /* static */ -void Magick::Image::cacheThreshold ( const unsigned int threshold_ ) +void Magick::Image::cacheThreshold ( const size_t threshold_ ) { SetMagickResourceLimit( MemoryResource, threshold_ ); } @@ -2599,7 +2599,7 @@ double Magick::Image::colorFuzz ( void ) const } // Set color in colormap at index -void Magick::Image::colorMap ( const unsigned int index_, +void Magick::Image::colorMap ( const size_t index_, const Color &color_ ) { MagickCore::Image* imageptr = image(); @@ -2621,7 +2621,7 @@ void Magick::Image::colorMap ( const unsigned int index_, (imageptr->colormap)[index_] = color_; } // Return color in colormap at index -Magick::Color Magick::Image::colorMap ( const unsigned int index_ ) const +Magick::Color Magick::Image::colorMap ( const size_t index_ ) const { const MagickCore::Image* imageptr = constImage(); @@ -2637,7 +2637,7 @@ Magick::Color Magick::Image::colorMap ( const unsigned int index_ ) const } // Colormap size (number of colormap entries) -void Magick::Image::colorMapSize ( const unsigned int entries_ ) +void Magick::Image::colorMapSize ( const size_t entries_ ) { if (entries_ >MaxColormapSize ) throwExceptionExplicit( OptionError, @@ -2663,12 +2663,12 @@ void Magick::Image::colorMapSize ( const unsigned int entries_ ) // Initialize any new colormap entries as all black Color black(0,0,0); - for( unsigned int i=imageptr->colors; i<(entries_-1); i++ ) + for( size_t i=imageptr->colors; i<(entries_-1); i++ ) (imageptr->colormap)[i] = black; imageptr->colors = entries_; } -unsigned int Magick::Image::colorMapSize ( void ) +size_t Magick::Image::colorMapSize ( void ) { const MagickCore::Image* imageptr = constImage(); @@ -2871,14 +2871,14 @@ Magick::Geometry Magick::Image::density ( void ) const { if (isValid()) { - unsigned int x_resolution=72; - unsigned int y_resolution=72; + size_t x_resolution=72; + size_t y_resolution=72; if (constImage()->x_resolution > 0.0) - x_resolution=static_cast(constImage()->x_resolution + 0.5); + x_resolution=static_cast(constImage()->x_resolution + 0.5); if (constImage()->y_resolution > 0.0) - y_resolution=static_cast(constImage()->y_resolution + 0.5); + y_resolution=static_cast(constImage()->y_resolution + 0.5); return Geometry(x_resolution,y_resolution); } @@ -2887,9 +2887,9 @@ Magick::Geometry Magick::Image::density ( void ) const } // Image depth (bits allocated to red/green/blue components) -void Magick::Image::depth ( const unsigned int depth_ ) +void Magick::Image::depth ( const size_t depth_ ) { - unsigned int depth = depth_; + size_t depth = depth_; if (depth > MAGICKCORE_QUANTUM_DEPTH) depth=MAGICKCORE_QUANTUM_DEPTH; @@ -2898,7 +2898,7 @@ void Magick::Image::depth ( const unsigned int depth_ ) image()->depth=depth; options()->depth( depth ); } -unsigned int Magick::Image::depth ( void ) const +size_t Magick::Image::depth ( void ) const { return constImage()->depth; } @@ -3106,12 +3106,12 @@ Magick::Geometry Magick::Image::geometry ( void ) const return Geometry(); } -void Magick::Image::gifDisposeMethod ( const unsigned int disposeMethod_ ) +void Magick::Image::gifDisposeMethod ( const size_t disposeMethod_ ) { modifyImage(); image()->dispose = (DisposeType) disposeMethod_; } -unsigned int Magick::Image::gifDisposeMethod ( void ) const +size_t Magick::Image::gifDisposeMethod ( void ) const { // FIXME: It would be better to return an enumeration return constImage()->dispose; @@ -3285,17 +3285,17 @@ double Magick::Image::meanErrorPerPixel ( void ) const // Image modulus depth (minimum number of bits required to support // red/green/blue components without loss of accuracy) -void Magick::Image::modulusDepth ( const unsigned int depth_ ) +void Magick::Image::modulusDepth ( const size_t depth_ ) { modifyImage(); SetImageDepth( image(), depth_ ); options()->depth( depth_ ); } -unsigned int Magick::Image::modulusDepth ( void ) const +size_t Magick::Image::modulusDepth ( void ) const { ExceptionInfo exceptionInfo; GetExceptionInfo( &exceptionInfo ); - unsigned int depth=GetImageDepth( constImage(), &exceptionInfo ); + size_t depth=GetImageDepth( constImage(), &exceptionInfo ); throwException( exceptionInfo ); (void) DestroyExceptionInfo( &exceptionInfo ); return depth; @@ -3388,7 +3388,7 @@ Magick::Image Magick::Image::penTexture ( void ) const } // Set the color of a pixel. -void Magick::Image::pixelColor ( const unsigned int x_, const unsigned int y_, +void Magick::Image::pixelColor ( const size_t x_, const size_t y_, const Color &color_ ) { // Test arguments to ensure they are within the image. @@ -3412,8 +3412,8 @@ void Magick::Image::pixelColor ( const unsigned int x_, const unsigned int y_, } // Get the color of a pixel -Magick::Color Magick::Image::pixelColor ( const unsigned int x_, - const unsigned int y_ ) const +Magick::Color Magick::Image::pixelColor ( const size_t x_, + const size_t y_ ) const { ClassType storage_class; storage_class = classType(); @@ -3488,23 +3488,23 @@ Magick::Blob Magick::Image::profile( const std::string name_ ) const return blob; } -void Magick::Image::quality ( const unsigned int quality_ ) +void Magick::Image::quality ( const size_t quality_ ) { modifyImage(); image()->quality = quality_; options()->quality( quality_ ); } -unsigned int Magick::Image::quality ( void ) const +size_t Magick::Image::quality ( void ) const { return constImage()->quality; } -void Magick::Image::quantizeColors ( const unsigned int colors_ ) +void Magick::Image::quantizeColors ( const size_t colors_ ) { modifyImage(); options()->quantizeColors( colors_ ); } -unsigned int Magick::Image::quantizeColors ( void ) const +size_t Magick::Image::quantizeColors ( void ) const { return constOptions()->quantizeColors( ); } @@ -3530,12 +3530,12 @@ bool Magick::Image::quantizeDither ( void ) const return constOptions()->quantizeDither( ); } -void Magick::Image::quantizeTreeDepth ( const unsigned int treeDepth_ ) +void Magick::Image::quantizeTreeDepth ( const size_t treeDepth_ ) { modifyImage(); options()->quantizeTreeDepth( treeDepth_ ); } -unsigned int Magick::Image::quantizeTreeDepth ( void ) const +size_t Magick::Image::quantizeTreeDepth ( void ) const { return constOptions()->quantizeTreeDepth( ); } @@ -3563,12 +3563,12 @@ Magick::ResolutionType Magick::Image::resolutionUnits ( void ) const return constOptions()->resolutionUnits( ); } -void Magick::Image::scene ( const unsigned int scene_ ) +void Magick::Image::scene ( const size_t scene_ ) { modifyImage(); image()->scene = scene_; } -unsigned int Magick::Image::scene ( void ) const +size_t Magick::Image::scene ( void ) const { return constImage()->scene; } @@ -3742,12 +3742,12 @@ Magick::LineJoin Magick::Image::strokeLineJoin ( void ) const // stroking the path. The miterLimit' imposes a limit on the ratio of // the miter length to the 'lineWidth'. The default value of this // parameter is 4. -void Magick::Image::strokeMiterLimit ( const unsigned int strokeMiterLimit_ ) +void Magick::Image::strokeMiterLimit ( const size_t strokeMiterLimit_ ) { modifyImage(); options()->strokeMiterLimit( strokeMiterLimit_ ); } -unsigned int Magick::Image::strokeMiterLimit ( void ) const +size_t Magick::Image::strokeMiterLimit ( void ) const { return constOptions()->strokeMiterLimit( ); } @@ -3796,22 +3796,22 @@ double Magick::Image::strokeWidth ( void ) const return constOptions()->strokeWidth( ); } -void Magick::Image::subImage ( const unsigned int subImage_ ) +void Magick::Image::subImage ( const size_t subImage_ ) { modifyImage(); options()->subImage( subImage_ ); } -unsigned int Magick::Image::subImage ( void ) const +size_t Magick::Image::subImage ( void ) const { return constOptions()->subImage( ); } -void Magick::Image::subRange ( const unsigned int subRange_ ) +void Magick::Image::subRange ( const size_t subRange_ ) { modifyImage(); options()->subRange( subRange_ ); } -unsigned int Magick::Image::subRange ( void ) const +size_t Magick::Image::subRange ( void ) const { return constOptions()->subRange( ); } @@ -4014,8 +4014,8 @@ Magick::Image& Magick::Image::operator=( const Magick::Image &image_ ) // defined by the specified region const Magick::PixelPacket* Magick::Image::getConstPixels ( const int x_, const int y_, - const unsigned int columns_, - const unsigned int rows_ ) const + const size_t columns_, + const size_t rows_ ) const { ExceptionInfo exceptionInfo; GetExceptionInfo( &exceptionInfo ); @@ -4054,8 +4054,8 @@ Magick::IndexPacket* Magick::Image::getIndexes ( void ) // by the specified region. Modified pixels may be subsequently // transferred back to the image via syncPixels. Magick::PixelPacket* Magick::Image::getPixels ( const int x_, const int y_, - const unsigned int columns_, - const unsigned int rows_ ) + const size_t columns_, + const size_t rows_ ) { modifyImage(); ExceptionInfo exceptionInfo; @@ -4073,8 +4073,8 @@ Magick::PixelPacket* Magick::Image::getPixels ( const int x_, const int y_, // by the region rectangle. This area is subsequently transferred // from the pixel cache to the image via syncPixels. Magick::PixelPacket* Magick::Image::setPixels ( const int x_, const int y_, - const unsigned int columns_, - const unsigned int rows_ ) + const size_t columns_, + const size_t rows_ ) { modifyImage(); ExceptionInfo exceptionInfo; diff --git a/Magick++/lib/Magick++/Drawable.h b/Magick++/lib/Magick++/Drawable.h index acebf3e61..18ff66ec5 100644 --- a/Magick++/lib/Magick++/Drawable.h +++ b/Magick++/lib/Magick++/Drawable.h @@ -1606,7 +1606,7 @@ class MagickDLLDecl DrawableDashArray : public DrawableBase { public: DrawableDashArray( const double* dasharray_ ); - DrawableDashArray( const unsigned int* dasharray_ ); // Deprecated + DrawableDashArray( const size_t* dasharray_ ); // Deprecated DrawableDashArray( const Magick::DrawableDashArray &original_ ); /*virtual*/ ~DrawableDashArray( void ); @@ -1618,7 +1618,7 @@ public: /*virtual*/ DrawableBase* copy() const; void dasharray( const double* dasharray_ ); - void dasharray( const unsigned int* dasharray_ ); // Deprecated + void dasharray( const size_t* dasharray_ ); // Deprecated const double* dasharray( void ) const { @@ -1723,7 +1723,7 @@ private: class MagickDLLDecl DrawableMiterLimit : public DrawableBase { public: - DrawableMiterLimit ( unsigned int miterlimit_ ) + DrawableMiterLimit ( size_t miterlimit_ ) : _miterlimit(miterlimit_) { } @@ -1735,17 +1735,17 @@ public: // Return polymorphic copy of object /*virtual*/ DrawableBase* copy() const; - void miterlimit( unsigned int miterlimit_ ) + void miterlimit( size_t miterlimit_ ) { _miterlimit = miterlimit_; } - unsigned int miterlimit( void ) const + size_t miterlimit( void ) const { return _miterlimit; } private: - unsigned int _miterlimit; + size_t _miterlimit; }; diff --git a/Magick++/lib/Magick++/Geometry.h b/Magick++/lib/Magick++/Geometry.h index 8b89b0437..0ba744fc3 100644 --- a/Magick++/lib/Magick++/Geometry.h +++ b/Magick++/lib/Magick++/Geometry.h @@ -30,10 +30,10 @@ namespace Magick { public: - Geometry ( unsigned int width_, - unsigned int height_, - unsigned int xOff_ = 0, - unsigned int yOff_ = 0, + Geometry ( size_t width_, + size_t height_, + size_t xOff_ = 0, + size_t yOff_ = 0, bool xNegative_ = false, bool yNegative_ = false ); Geometry ( const std::string &geometry_ ); @@ -43,20 +43,20 @@ namespace Magick ~Geometry ( void ); // Width - void width ( unsigned int width_ ); - unsigned int width ( void ) const; + void width ( size_t width_ ); + size_t width ( void ) const; // Height - void height ( unsigned int height_ ); - unsigned int height ( void ) const; + void height ( size_t height_ ); + size_t height ( void ) const; // X offset from origin - void xOff ( unsigned int xOff_ ); - unsigned int xOff ( void ) const; + void xOff ( size_t xOff_ ); + size_t xOff ( void ) const; // Y offset from origin - void yOff ( unsigned int yOff_ ); - unsigned int yOff ( void ) const; + void yOff ( size_t yOff_ ); + size_t yOff ( void ) const; // Sign of X offset negative? (X origin at right) void xNegative ( bool xNegative_ ); @@ -107,10 +107,10 @@ namespace Magick operator MagickCore::RectangleInfo() const; private: - unsigned int _width; - unsigned int _height; - unsigned int _xOff; - unsigned int _yOff; + size_t _width; + size_t _height; + size_t _xOff; + size_t _yOff; bool _xNegative; bool _yNegative; bool _isValid; @@ -137,42 +137,42 @@ inline bool Magick::Geometry::isValid ( void ) const } // Width -inline void Magick::Geometry::width ( unsigned int width_ ) +inline void Magick::Geometry::width ( size_t width_ ) { _width = width_; isValid( true ); } -inline unsigned int Magick::Geometry::width ( void ) const +inline size_t Magick::Geometry::width ( void ) const { return _width; } // Height -inline void Magick::Geometry::height ( unsigned int height_ ) +inline void Magick::Geometry::height ( size_t height_ ) { _height = height_; } -inline unsigned int Magick::Geometry::height ( void ) const +inline size_t Magick::Geometry::height ( void ) const { return _height; } // X offset from origin -inline void Magick::Geometry::xOff ( unsigned int xOff_ ) +inline void Magick::Geometry::xOff ( size_t xOff_ ) { _xOff = xOff_; } -inline unsigned int Magick::Geometry::xOff ( void ) const +inline size_t Magick::Geometry::xOff ( void ) const { return _xOff; } // Y offset from origin -inline void Magick::Geometry::yOff ( unsigned int yOff_ ) +inline void Magick::Geometry::yOff ( size_t yOff_ ) { _yOff = yOff_; } -inline unsigned int Magick::Geometry::yOff ( void ) const +inline size_t Magick::Geometry::yOff ( void ) const { return _yOff; } diff --git a/Magick++/lib/Magick++/Image.h b/Magick++/lib/Magick++/Image.h index 3151d2761..0d5001ecd 100644 --- a/Magick++/lib/Magick++/Image.h +++ b/Magick++/lib/Magick++/Image.h @@ -68,12 +68,12 @@ namespace Magick // Construct Image of specified size and depth from in-memory BLOB Image ( const Blob &blob_, const Geometry &size, - const unsigned int depth ); + const size_t depth ); // Construct Image of specified size, depth, and format from // in-memory BLOB Image ( const Blob &blob_, const Geometry &size, - const unsigned int depth_, + const size_t depth_, const std::string &magick_ ); // Construct Image of specified size, and format from in-memory // BLOB @@ -82,8 +82,8 @@ namespace Magick // Construct an image based on an array of raw pixels, of // specified type and mapping, in memory - Image ( const unsigned int width_, - const unsigned int height_, + Image ( const size_t width_, + const size_t height_, const std::string &map_, const StorageType type_, const void *pixels_ ); @@ -117,9 +117,9 @@ namespace Magick // http://www.dai.ed.ac.uk/HIPR2/adpthrsh.htm // Width x height define the size of the pixel neighborhood // offset = constant to subtract from pixel neighborhood mean - void adaptiveThreshold ( const unsigned int width, - const unsigned int height, - const unsigned offset = 0 ); + void adaptiveThreshold ( const size_t width, + const size_t height, + const size_t offset = 0 ); // Add noise to image with specified noise type void addNoise ( const NoiseType noiseType_ ); @@ -182,8 +182,8 @@ namespace Magick // Set or obtain modulus channel depth void channelDepth ( const ChannelType channel_, - const unsigned int depth_ ); - unsigned int channelDepth ( const ChannelType channel_ ); + const size_t depth_ ); + size_t channelDepth ( const ChannelType channel_ ); // Charcoal effect image (looks like charcoal sketch) // The radius_ parameter specifies the radius of the Gaussian, in @@ -205,17 +205,17 @@ namespace Magick // Colorize image with pen color, using specified percent opacity // for red, green, and blue quantums - void colorize ( const unsigned int opacityRed_, - const unsigned int opacityGreen_, - const unsigned int opacityBlue_, + void colorize ( const size_t opacityRed_, + const size_t opacityGreen_, + const size_t opacityBlue_, const Color &penColor_ ); // Colorize image with pen color, using specified percent opacity. - void colorize ( const unsigned int opacity_, + void colorize ( const size_t opacity_, const Color &penColor_ ); // Apply a color matrix to the image channels. The user supplied // matrix may be of order 1 to 5 (1x1 through 5x5). - void colorMatrix (const unsigned int order_, + void colorMatrix (const size_t order_, const double *color_matrix_); // Comment image (add comment string to image) @@ -248,12 +248,12 @@ namespace Magick = InCompositeOp ); // Contrast image (enhance intensity differences in image) - void contrast ( const unsigned int sharpen_ ); + void contrast ( const size_t sharpen_ ); // Convolve image. Applies a user-specified convolution to the image. // order_ represents the number of columns and rows in the filter kernel. // kernel_ is an array of doubles representing the convolution kernel. - void convolve ( const unsigned int order_, + void convolve ( const size_t order_, const double *kernel_ ); // Crop image (subregion of original image) @@ -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 unsigned int x_, - const unsigned int y_, + void floodFillColor( const size_t x_, + const size_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 unsigned int x_, - const unsigned int y_, + void floodFillColor( const size_t x_, + const size_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 unsigned int x_, - const unsigned int y_, - const unsigned int opacity_, + void floodFillOpacity ( const size_t x_, + const size_t y_, + const size_t 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 unsigned int x_, - const unsigned int y_, + void floodFillTexture( const size_t x_, + const size_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 unsigned int x_, - const unsigned int y_, + void floodFillTexture( const size_t x_, + const size_t y_, const Image &texture_, const Color &borderColor_ ); void floodFillTexture( const Geometry &point_, @@ -368,8 +368,8 @@ namespace Magick // Frame image void frame ( const Geometry &geometry_ = frameGeometryDefault ); - void frame ( const unsigned int width_, - const unsigned int height_, + void frame ( const size_t width_, + const size_t height_, const int innerBevel_ = 6, const int outerBevel_ = 6 ); @@ -449,7 +449,7 @@ namespace Magick // Floodfill designated area with replacement opacity value void matteFloodfill ( const Color &target_ , - const unsigned int opacity_, + const size_t opacity_, const int x_, const int y_, const PaintMethod method_ ); @@ -493,7 +493,7 @@ namespace Magick // to QuantumRange. The defines OpaqueOpacity and TransparentOpacity are // available to specify completely opaque or completely // transparent, respectively. - void opacity ( const unsigned int opacity_ ); + void opacity ( const size_t opacity_ ); // Change color of opaque pixel to specified pen color. void opaque ( const Color &opaqueColor_, @@ -519,8 +519,8 @@ namespace Magick double rvalue_); void quantumOperator ( const int x_,const int y_, - const unsigned int columns_, - const unsigned int rows_, + const size_t columns_, + const size_t rows_, const ChannelType channel_, const MagickEvaluateOperator operator_, const double rvalue_); @@ -570,13 +570,13 @@ namespace Magick // in-memory BLOB void read ( const Blob &blob_, const Geometry &size_, - const unsigned int depth_ ); + const size_t depth_ ); // Read single image frame of specified size, depth, and format // from in-memory BLOB void read ( const Blob &blob_, const Geometry &size_, - const unsigned int depth_, + const size_t depth_, const std::string &magick_ ); // Read single image frame of specified size, and format from @@ -588,8 +588,8 @@ namespace Magick // Read single image frame from an array of raw pixels, with // specified storage type (ConstituteImage), e.g. // image.read( 640, 480, "RGB", 0, pixels ); - void read ( const unsigned int width_, - const unsigned int height_, + void read ( const size_t width_, + const size_t height_, const std::string &map_, const StorageType type_, const void *pixels_ ); @@ -604,8 +604,8 @@ namespace Magick // Roll image (rolls image vertically and horizontally) by specified // number of columnms and rows) void roll ( const Geometry &roll_ ); - void roll ( const unsigned int columns_, - const unsigned int rows_ ); + void roll ( const size_t columns_, + const size_t rows_ ); // Rotate image counter-clockwise by specified number of degrees. void rotate ( const double degrees_ ); @@ -646,7 +646,7 @@ namespace Magick const double yShearAngle_ ); // adjust the image contrast with a non-linear sigmoidal contrast algorithm - void sigmoidalContrast ( const unsigned int sharpen_, const double contrast, const double midpoint = QuantumRange / 2.0 ); + void sigmoidalContrast ( const size_t sharpen_, const double contrast, const double midpoint = QuantumRange / 2.0 ); // Solarize image (similar to effect seen when exposing a // photographic film to light during the development process) @@ -656,7 +656,7 @@ namespace Magick void splice ( const Geometry &geometry_ ); // Spread pixels randomly within image by specified ammount - void spread ( const unsigned int amount_ = 3 ); + void spread ( const size_t amount_ = 3 ); // Sparse color image, given a set of coordinates, interpolates the colors // found at those coordinates, across the whole image, using various @@ -742,15 +742,15 @@ namespace Magick const std::string &magick_ ); void write ( Blob *blob_, const std::string &magick_, - const unsigned int depth_ ); + const size_t depth_ ); // 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 int x_, const int y_, - const unsigned int columns_, - const unsigned int rows_, + const size_t columns_, + const size_t rows_, const std::string& map_, const StorageType type_, void *pixels_ ); @@ -774,13 +774,13 @@ namespace Magick // Time in 1/100ths of a second which must expire before // displaying the next image in an animated sequence. - void animationDelay ( const unsigned int delay_ ); - unsigned int animationDelay ( void ) const; + void animationDelay ( const size_t delay_ ); + size_t animationDelay ( void ) const; // Number of iterations to loop an animation (e.g. Netscape loop // extension) for. - void animationIterations ( const unsigned int iterations_ ); - unsigned int animationIterations ( void ) const; + void animationIterations ( const size_t iterations_ ); + size_t animationIterations ( void ) const; // Access/Update a named image attribute void attribute ( const std::string name_, @@ -796,13 +796,13 @@ namespace Magick std::string backgroundTexture ( void ) const; // Base image width (before transformations) - unsigned int baseColumns ( void ) const; + size_t baseColumns ( void ) const; // Base image filename (before transformations) std::string baseFilename ( void ) const; // Base image height (before transformations) - unsigned int baseRows ( void ) const; + size_t baseRows ( void ) const; // Image border color void borderColor ( const Color &color_ ); @@ -820,7 +820,7 @@ namespace Magick // Pixel cache threshold in megabytes. Once this memory threshold // is exceeded, all subsequent pixels cache operations are to/from // disk. This setting is shared by all Image objects. - static void cacheThreshold ( const unsigned int threshold_ ); + static void cacheThreshold ( const size_t threshold_ ); // Chromaticity blue primary point (e.g. x=0.15, y=0.06) void chromaBluePrimary ( const double x_, const double y_ ); @@ -858,13 +858,13 @@ namespace Magick double colorFuzz ( void ) const; // Color at colormap position index_ - void colorMap ( const unsigned int index_, + void colorMap ( const size_t index_, const Color &color_ ); - Color colorMap ( const unsigned int index_ ) const; + Color colorMap ( const size_t index_ ) const; // Colormap size (number of colormap entries) - void colorMapSize ( const unsigned int entries_ ); - unsigned int colorMapSize ( void ); + void colorMapSize ( const size_t entries_ ); + size_t colorMapSize ( void ); // Image Color Space void colorSpace ( const ColorspaceType colorSpace_ ); @@ -874,7 +874,7 @@ namespace Magick ColorspaceType colorspaceType ( void ) const; // Image width - unsigned int columns ( void ) const; + size_t columns ( void ) const; // Image comment std::string comment ( void ) const; @@ -914,8 +914,8 @@ namespace Magick Geometry density ( void ) const; // Image depth (bits allocated to red/green/blue components) - void depth ( const unsigned int depth_ ); - unsigned int depth ( void ) const; + void depth ( const size_t depth_ ); + size_t depth ( void ) const; // Tile names from within an image montage std::string directory ( void ) const; @@ -975,8 +975,8 @@ namespace Magick Geometry geometry ( void ) const; // GIF disposal method - void gifDisposeMethod ( const unsigned int disposeMethod_ ); - unsigned int gifDisposeMethod ( void ) const; + void gifDisposeMethod ( const size_t disposeMethod_ ); + size_t gifDisposeMethod ( void ) const; // ICC color profile (BLOB) void iccColorProfile( const Blob &colorProfile_ ); @@ -1050,8 +1050,8 @@ typedef struct _ImageStatistics // Image modulus depth (minimum number of bits required to support // red/green/blue components without loss of accuracy) - void modulusDepth ( const unsigned int modulusDepth_ ); - unsigned int modulusDepth ( void ) const; + void modulusDepth ( const size_t modulusDepth_ ); + size_t modulusDepth ( void ) const; // Tile size and offset within an image montage Geometry montageGeometry ( void ) const; @@ -1085,11 +1085,11 @@ typedef struct _ImageStatistics Image penTexture ( void ) const; // Get/set pixel color at location x & y. - void pixelColor ( const unsigned int x_, - const unsigned int y_, + void pixelColor ( const size_t x_, + const size_t y_, const Color &color_ ); - Color pixelColor ( const unsigned int x_, - const unsigned int y_ ) const; + Color pixelColor ( const size_t x_, + const size_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 @@ -1103,12 +1103,12 @@ typedef struct _ImageStatistics Blob profile( const std::string name_ ) const; // JPEG/MIFF/PNG compression level (default 75). - void quality ( const unsigned int quality_ ); - unsigned int quality ( void ) const; + void quality ( const size_t quality_ ); + size_t quality ( void ) const; // Maximum number of colors to quantize to - void quantizeColors ( const unsigned int colors_ ); - unsigned int quantizeColors ( void ) const; + void quantizeColors ( const size_t colors_ ); + size_t quantizeColors ( void ) const; // Colorspace to quantize in. void quantizeColorSpace ( const ColorspaceType colorSpace_ ); @@ -1119,8 +1119,8 @@ typedef struct _ImageStatistics bool quantizeDither ( void ) const; // Quantization tree-depth - void quantizeTreeDepth ( const unsigned int treeDepth_ ); - unsigned int quantizeTreeDepth ( void ) const; + void quantizeTreeDepth ( const size_t treeDepth_ ); + size_t quantizeTreeDepth ( void ) const; // The type of rendering intent void renderingIntent ( const RenderingIntent renderingIntent_ ); @@ -1131,11 +1131,11 @@ typedef struct _ImageStatistics ResolutionType resolutionUnits ( void ) const; // The number of pixel rows in the image - unsigned int rows ( void ) const; + size_t rows ( void ) const; // Image scene number - void scene ( const unsigned int scene_ ); - unsigned int scene ( void ) const; + void scene ( const size_t scene_ ); + size_t scene ( void ) const; // Image signature. Set force_ to true in order to re-calculate // the signature regardless of whether the image data has been @@ -1188,8 +1188,8 @@ typedef struct _ImageStatistics // the line stroking the path. The miterLimit' imposes a limit on // the ratio of the miter length to the 'lineWidth'. The default // value of this parameter is 4. - void strokeMiterLimit ( const unsigned int miterLimit_ ); - unsigned int strokeMiterLimit ( void ) const; + void strokeMiterLimit ( const size_t miterLimit_ ); + size_t strokeMiterLimit ( void ) const; // Pattern image to use while stroking object outlines. void strokePattern ( const Image &strokePattern_ ); @@ -1200,12 +1200,12 @@ typedef struct _ImageStatistics double strokeWidth ( void ) const; // Subimage of an image sequence - void subImage ( const unsigned int subImage_ ); - unsigned int subImage ( void ) const; + void subImage ( const size_t subImage_ ); + size_t subImage ( void ) const; // Number of images relative to the base image - void subRange ( const unsigned int subRange_ ); - unsigned int subRange ( void ) const; + void subRange ( const size_t subRange_ ); + size_t subRange ( void ) const; // Annotation text encoding (e.g. "UTF-16") void textEncoding ( const std::string &encoding_ ); @@ -1279,8 +1279,8 @@ typedef struct _ImageStatistics // Transfers read-only pixels from the image to the pixel cache as // defined by the specified region const PixelPacket* getConstPixels ( const int x_, const int y_, - const unsigned int columns_, - const unsigned int rows_ ) const; + const size_t columns_, + const size_t rows_ ) const; // Obtain mutable image pixel indexes (valid for PseudoClass images) IndexPacket* getIndexes ( void ); @@ -1293,15 +1293,15 @@ typedef struct _ImageStatistics // transferred back to the image via syncPixels. This method is // valid for DirectClass images. PixelPacket* getPixels ( const int x_, const int y_, - const unsigned int columns_, - const unsigned int rows_ ); + 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 int x_, const int y_, - const unsigned int columns_, - const unsigned int rows_ ); + const size_t columns_, + const size_t rows_ ); // Transfers the image cache pixels to the image. void syncPixels ( void ); @@ -1398,13 +1398,13 @@ inline Magick::ClassType Magick::Image::classType ( void ) const } // Get number of image columns -inline unsigned int Magick::Image::columns ( void ) const +inline size_t Magick::Image::columns ( void ) const { return constImage()->columns; } // Get number of image rows -inline unsigned int Magick::Image::rows ( void ) const +inline size_t Magick::Image::rows ( void ) const { return constImage()->rows; } diff --git a/Magick++/lib/Magick++/Montage.h b/Magick++/lib/Magick++/Montage.h index a72c56827..e54696e8e 100644 --- a/Magick++/lib/Magick++/Montage.h +++ b/Magick++/lib/Magick++/Montage.h @@ -53,8 +53,8 @@ namespace Magick void penColor ( const Color &pen_ ); Color penColor ( void ) const; - void pointSize ( unsigned int pointSize_ ); - unsigned int pointSize ( void ) const; + void pointSize ( size_t pointSize_ ); + size_t pointSize ( void ) const; void shadow ( bool shadow_ ); bool shadow ( void ) const; @@ -93,7 +93,7 @@ namespace Magick Geometry _geometry; // Thumbnail width & height plus border width & height GravityType _gravity; // Thumbnail position (e.g. SouthWestGravity) std::string _label; // Thumbnail label (applied to image prior to montage) - unsigned int _pointSize; // Font point size + size_t _pointSize; // Font point size bool _shadow; // Enable drop-shadows on thumbnails Color _stroke; // Outline color std::string _texture; // Background texture image @@ -114,8 +114,8 @@ namespace Magick void borderColor ( const Color &borderColor_ ); Color borderColor ( void ) const; - void borderWidth ( unsigned int borderWidth_ ); - unsigned int borderWidth ( void ) const; + void borderWidth ( size_t borderWidth_ ); + size_t borderWidth ( void ) const; void frameGeometry ( const Geometry &frame_ ); Geometry frameGeometry ( void ) const; @@ -135,7 +135,7 @@ namespace Magick private: Color _borderColor; // Frame border color - unsigned int _borderWidth; // Pixels between thumbnail and surrounding frame + size_t _borderWidth; // Pixels between thumbnail and surrounding frame Geometry _frame; // Frame geometry (width & height frame thickness) Color _matteColor; // Frame foreground color }; @@ -232,11 +232,11 @@ inline Magick::Color Magick::Montage::penColor ( void ) const return _fill; } -inline void Magick::Montage::pointSize ( unsigned int pointSize_ ) +inline void Magick::Montage::pointSize ( size_t pointSize_ ) { _pointSize = pointSize_; } -inline unsigned int Magick::Montage::pointSize ( void ) const +inline size_t Magick::Montage::pointSize ( void ) const { return _pointSize; } @@ -309,11 +309,11 @@ inline Magick::Color Magick::MontageFramed::borderColor ( void ) const return _borderColor; } -inline void Magick::MontageFramed::borderWidth ( unsigned int borderWidth_ ) +inline void Magick::MontageFramed::borderWidth ( size_t borderWidth_ ) { _borderWidth = borderWidth_; } -inline unsigned int Magick::MontageFramed::borderWidth ( void ) const +inline size_t Magick::MontageFramed::borderWidth ( void ) const { return _borderWidth; } diff --git a/Magick++/lib/Magick++/Options.h b/Magick++/lib/Magick++/Options.h index 47136f467..d646b8cd4 100644 --- a/Magick++/lib/Magick++/Options.h +++ b/Magick++/lib/Magick++/Options.h @@ -79,8 +79,8 @@ namespace Magick Geometry density ( void ) const; // Image depth (8 or 16) - void depth ( unsigned int depth_ ); - unsigned int depth ( void ) const; + void depth ( size_t depth_ ); + size_t depth ( void ) const; // Endianness (little like Intel or big like SPARC) for image // formats which support endian-specific options. @@ -138,12 +138,12 @@ namespace Magick Geometry page ( void ) const; // Desired image quality factor - void quality ( unsigned int quality_ ); - unsigned int quality ( void ) const; + void quality ( size_t quality_ ); + size_t quality ( void ) const; // Maximum number of colors to quantize to - void quantizeColors ( unsigned int colors_ ); - unsigned int quantizeColors ( void ) const; + void quantizeColors ( size_t colors_ ); + size_t quantizeColors ( void ) const; // Colorspace to quantize in. void quantizeColorSpace ( ColorspaceType colorSpace_ ); @@ -154,8 +154,8 @@ namespace Magick bool quantizeDither ( void ) const; // Quantization tree-depth - void quantizeTreeDepth ( unsigned int treeDepth_ ); - unsigned int quantizeTreeDepth ( void ) const; + void quantizeTreeDepth ( size_t treeDepth_ ); + size_t quantizeTreeDepth ( void ) const; // Units of resolution to interpret density void resolutionUnits ( ResolutionType resolutionUnits_ ); @@ -208,8 +208,8 @@ namespace Magick // the line stroking the path. The miterLimit' imposes a limit on // the ratio of the miter length to the 'stroke_width'. The default // value of this parameter is 4. - void strokeMiterLimit ( unsigned int miterLimit_ ); - unsigned int strokeMiterLimit ( void ) const; + void strokeMiterLimit ( size_t miterLimit_ ); + size_t strokeMiterLimit ( void ) const; // Pattern image to use for stroked outlines void strokePattern ( const MagickCore::Image *strokePattern_ ); @@ -219,12 +219,12 @@ namespace Magick void strokeWidth ( double strokeWidth_ ); double strokeWidth ( void ) const; - void subImage ( unsigned int subImage_ ); - unsigned int subImage ( void ) const; + void subImage ( size_t subImage_ ); + size_t subImage ( void ) const; // Sub-frame number to return - void subRange ( unsigned int subRange_ ); - unsigned int subRange ( void ) const; + void subRange ( size_t subRange_ ); + size_t subRange ( void ) const; // Annotation text encoding (e.g. "UTF-16") void textEncoding ( const std::string &encoding_ ); diff --git a/Magick++/lib/Magick++/Pixels.h b/Magick++/lib/Magick++/Pixels.h index d451d6e02..372bcb6fb 100644 --- a/Magick++/lib/Magick++/Pixels.h +++ b/Magick++/lib/Magick++/Pixels.h @@ -28,13 +28,13 @@ namespace Magick // the specified region. Modified pixels may be subsequently // transferred back to the image via sync. PixelPacket* get ( const int x_, const int y_, - const unsigned int columns_,const unsigned int rows_ ); + 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 int x_, const int y_, - const unsigned int columns_, - const unsigned int rows_ ); + const size_t columns_, + const size_t rows_ ); // Transfers the image view pixels to the image. void sync ( void ); @@ -43,7 +43,7 @@ namespace Magick // by the region rectangle. This area is subsequently transferred // from the pixel view to the image via sync. PixelPacket* set ( const int x_, const int y_, - const unsigned int columns_, const unsigned int rows_ ); + const size_t columns_, const size_t rows_ ); // Return pixel colormap index array IndexPacket* indexes ( void ); @@ -55,10 +55,10 @@ namespace Magick int y ( void ) const; // Width of view - unsigned int columns ( void ) const; + size_t columns ( void ) const; // Height of view - unsigned int rows ( void ) const; + size_t rows ( void ) const; #if 0 // Transfer one or more pixel components from a buffer or file @@ -88,8 +88,8 @@ namespace Magick MagickCore::CacheView* _view; // Image view handle int _x; // Left ordinate of view int _y; // Top ordinate of view - unsigned int _columns; // Width of view - unsigned int _rows; // Height of view + size_t _columns; // Width of view + size_t _rows; // Height of view MagickCore:: ExceptionInfo _exception; // Any thrown exception }; // class Pixels @@ -113,13 +113,13 @@ inline int Magick::Pixels::y ( void ) const } // Width of view -inline unsigned int Magick::Pixels::columns ( void ) const +inline size_t Magick::Pixels::columns ( void ) const { return _columns; } // Height of view -inline unsigned int Magick::Pixels::rows ( void ) const +inline size_t Magick::Pixels::rows ( void ) const { return _rows; } diff --git a/Magick++/lib/Magick++/STL.h b/Magick++/lib/Magick++/STL.h index 237444207..7f86f82cf 100644 --- a/Magick++/lib/Magick++/STL.h +++ b/Magick++/lib/Magick++/STL.h @@ -62,16 +62,16 @@ namespace Magick class MagickDLLDecl adaptiveThresholdImage : public std::unary_function { public: - adaptiveThresholdImage( const unsigned int width_, - const unsigned int height_, - const unsigned int offset_ = 0 ); + adaptiveThresholdImage( const size_t width_, + const size_t height_, + const size_t offset_ = 0 ); void operator()( Image &image_ ) const; private: - unsigned int _width; - unsigned int _height; - unsigned int _offset; + size_t _width; + size_t _height; + size_t _offset; }; // Add noise to image with specified noise type @@ -217,20 +217,20 @@ namespace Magick class MagickDLLDecl colorizeImage : public std::unary_function { public: - colorizeImage( const unsigned int opacityRed_, - const unsigned int opacityGreen_, - const unsigned int opacityBlue_, + colorizeImage( const size_t opacityRed_, + const size_t opacityGreen_, + const size_t opacityBlue_, const Color &penColor_ ); - colorizeImage( const unsigned int opacity_, + colorizeImage( const size_t opacity_, const Color &penColor_ ); void operator()( Image &image_ ) const; private: - unsigned int _opacityRed; - unsigned int _opacityGreen; - unsigned int _opacityBlue; + size_t _opacityRed; + size_t _opacityGreen; + size_t _opacityBlue; Color _penColor; }; @@ -239,13 +239,13 @@ namespace Magick class MagickDLLDecl colorMatrixImage : public std::unary_function { public: - colorMatrixImage( const unsigned int order_, + colorMatrixImage( const size_t order_, const double *color_matrix_ ); void operator()( Image &image_ ) const; private: - unsigned int _order; + size_t _order; const double *_color_matrix; }; @@ -300,12 +300,12 @@ namespace Magick class MagickDLLDecl contrastImage : public std::unary_function { public: - contrastImage( const unsigned int sharpen_ ); + contrastImage( const size_t sharpen_ ); void operator()( Image &image_ ) const; private: - unsigned int _sharpen; + size_t _sharpen; }; // Crop image (subregion of original image) @@ -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 unsigned int x_, - const unsigned int y_, + floodFillColorImage( const size_t x_, + const size_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 unsigned int x_, - const unsigned int y_, + floodFillColorImage( const size_t x_, + const size_t y_, const Color &fillColor_, const Color &borderColor_ ); @@ -485,8 +485,8 @@ namespace Magick void operator()( Image &image_ ) const; private: - unsigned int _x; - unsigned int _y; + size_t _x; + size_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 unsigned int x_, - const unsigned int y_, + floodFillTextureImage( const size_t x_, + const size_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 unsigned int x_, - const unsigned int y_, + floodFillTextureImage( const size_t x_, + const size_t y_, const Image &texture_, const Color &borderColor_ ); @@ -520,8 +520,8 @@ namespace Magick void operator()( Image &image_ ) const; private: - unsigned int _x; - unsigned int _y; + size_t _x; + size_t _y; Image _texture; Color _borderColor; }; @@ -543,14 +543,14 @@ namespace Magick public: frameImage( const Geometry &geometry_ = frameGeometryDefault ); - frameImage( const unsigned int width_, const unsigned int height_, + frameImage( const size_t width_, const size_t height_, const int innerBevel_ = 6, const int outerBevel_ = 6 ); void operator()( Image &image_ ) const; private: - unsigned int _width; - unsigned int _height; + size_t _width; + size_t _height; int _outerBevel; int _innerBevel; }; @@ -716,7 +716,7 @@ namespace Magick { public: matteFloodfillImage( const Color &target_ , - const unsigned int matte_, + const size_t matte_, const int x_, const int y_, const PaintMethod method_ ); @@ -724,7 +724,7 @@ namespace Magick private: Color _target; - unsigned int _matte; + size_t _matte; int _x; int _y; PaintMethod _method; @@ -817,12 +817,12 @@ namespace Magick class MagickDLLDecl opacityImage : public std::unary_function { public: - opacityImage( const unsigned int opacity_ ); + opacityImage( const size_t opacity_ ); void operator()( Image &image_ ) const; private: - unsigned int _opacity; + size_t _opacity; }; // Change color of opaque pixel to specified pen color. @@ -872,12 +872,12 @@ namespace Magick public: reduceNoiseImage( void ); - reduceNoiseImage (const unsigned int order_ ); + reduceNoiseImage (const size_t order_ ); void operator()( Image &image_ ) const; private: - unsigned int _order; + size_t _order; }; // Resize image to specified size. @@ -1046,12 +1046,12 @@ namespace Magick class MagickDLLDecl spreadImage : public std::unary_function { public: - spreadImage( const unsigned int amount_ = 3 ); + spreadImage( const size_t amount_ = 3 ); void operator()( Image &image_ ) const; private: - unsigned int _amount; + size_t _amount; }; // Add a digital watermark to the image (based on second image) @@ -1225,12 +1225,12 @@ namespace Magick class MagickDLLDecl animationDelayImage : public std::unary_function { public: - animationDelayImage( const unsigned int delay_ ); + animationDelayImage( const size_t delay_ ); void operator()( Image &image_ ) const; private: - unsigned int _delay; + size_t _delay; }; // Number of iterations to loop an animation (e.g. Netscape loop @@ -1238,12 +1238,12 @@ namespace Magick class MagickDLLDecl animationIterationsImage : public std::unary_function { public: - animationIterationsImage( const unsigned int iterations_ ); + animationIterationsImage( const size_t iterations_ ); void operator()( Image &image_ ) const; private: - unsigned int _iterations; + size_t _iterations; }; // Image background color @@ -1362,12 +1362,12 @@ namespace Magick class MagickDLLDecl colorMapImage : public std::unary_function { public: - colorMapImage( const unsigned int index_, const Color &color_ ); + colorMapImage( const size_t index_, const Color &color_ ); void operator()( Image &image_ ) const; private: - unsigned int _index; + size_t _index; Color _color; }; @@ -1412,12 +1412,12 @@ namespace Magick class MagickDLLDecl depthImage : public std::unary_function { public: - depthImage( const unsigned int depth_ ); + depthImage( const size_t depth_ ); void operator()( Image &image_ ) const; private: - unsigned int _depth; + size_t _depth; }; // Endianness (LSBEndian like Intel or MSBEndian like SPARC) for image @@ -1473,24 +1473,24 @@ namespace Magick class MagickDLLDecl fontPointsizeImage : public std::unary_function { public: - fontPointsizeImage( const unsigned int pointsize_ ); + fontPointsizeImage( const size_t pointsize_ ); void operator()( Image &image_ ) const; private: - unsigned int _pointsize; + size_t _pointsize; }; // GIF disposal method class MagickDLLDecl gifDisposeMethodImage : public std::unary_function { public: - gifDisposeMethodImage( const unsigned int disposeMethod_ ); + gifDisposeMethodImage( const size_t disposeMethod_ ); void operator()( Image &image_ ) const; private: - unsigned int _disposeMethod; + size_t _disposeMethod; }; // Type of interlacing to use @@ -1593,15 +1593,15 @@ namespace Magick class MagickDLLDecl pixelColorImage : public std::unary_function { public: - pixelColorImage( const unsigned int x_, - const unsigned int y_, + pixelColorImage( const size_t x_, + const size_t y_, const Color &color_); void operator()( Image &image_ ) const; private: - unsigned int _x; - unsigned int _y; + size_t _x; + size_t _y; Color _color; }; @@ -1621,24 +1621,24 @@ namespace Magick class MagickDLLDecl qualityImage : public std::unary_function { public: - qualityImage( const unsigned int quality_ ); + qualityImage( const size_t quality_ ); void operator()( Image &image_ ) const; private: - unsigned int _quality; + size_t _quality; }; // Maximum number of colors to quantize to class MagickDLLDecl quantizeColorsImage : public std::unary_function { public: - quantizeColorsImage( const unsigned int colors_ ); + quantizeColorsImage( const size_t colors_ ); void operator()( Image &image_ ) const; private: - unsigned int _colors; + size_t _colors; }; // Colorspace to quantize in. @@ -1669,12 +1669,12 @@ namespace Magick class MagickDLLDecl quantizeTreeDepthImage : public std::unary_function { public: - quantizeTreeDepthImage( const unsigned int treeDepth_ ); + quantizeTreeDepthImage( const size_t treeDepth_ ); void operator()( Image &image_ ) const; private: - unsigned int _treeDepth; + size_t _treeDepth; }; // The type of rendering intent @@ -1705,26 +1705,26 @@ namespace Magick class MagickDLLDecl sceneImage : public std::unary_function { public: - sceneImage( const unsigned int scene_ ); + sceneImage( const size_t scene_ ); void operator()( Image &image_ ) const; private: - unsigned int _scene; + size_t _scene; }; // adjust the image contrast with a non-linear sigmoidal contrast algorithm class MagickDLLDecl sigmoidalContrastImage : public std::unary_function { public: - sigmoidalContrastImage( const unsigned int sharpen_, + sigmoidalContrastImage( const size_t sharpen_, const double contrast, const double midpoint = QuantumRange / 2.0 ); void operator()( Image &image_ ) const; private: - unsigned int _sharpen; + size_t _sharpen; double contrast; double midpoint; }; @@ -1745,24 +1745,24 @@ namespace Magick class MagickDLLDecl subImageImage : public std::unary_function { public: - subImageImage( const unsigned int subImage_ ); + subImageImage( const size_t subImage_ ); void operator()( Image &image_ ) const; private: - unsigned int _subImage; + size_t _subImage; }; // Number of images relative to the base image class MagickDLLDecl subRangeImage : public std::unary_function { public: - subRangeImage( const unsigned int subRange_ ); + subRangeImage( const size_t subRange_ ); void operator()( Image &image_ ) const; private: - unsigned int _subRange; + size_t _subRange; }; // Tile name @@ -2318,7 +2318,7 @@ namespace Magick void morphImages( Container *morphedImages_, InputIterator first_, InputIterator last_, - unsigned int frames_ ) { + size_t frames_ ) { MagickCore::ExceptionInfo exceptionInfo; MagickCore::GetExceptionInfo( &exceptionInfo ); diff --git a/Magick++/lib/Options.cpp b/Magick++/lib/Options.cpp index 96c02392d..1d4407274 100644 --- a/Magick++/lib/Options.cpp +++ b/Magick++/lib/Options.cpp @@ -208,11 +208,11 @@ Magick::Geometry Magick::Options::density ( void ) const return Geometry(); } -void Magick::Options::depth ( unsigned int depth_ ) +void Magick::Options::depth ( size_t depth_ ) { _imageInfo->depth = depth_; } -unsigned int Magick::Options::depth ( void ) const +size_t Magick::Options::depth ( void ) const { return _imageInfo->depth; } @@ -406,20 +406,20 @@ Magick::Geometry Magick::Options::page ( void ) const return Geometry(); } -void Magick::Options::quality ( unsigned int quality_ ) +void Magick::Options::quality ( size_t quality_ ) { _imageInfo->quality = quality_; } -unsigned int Magick::Options::quality ( void ) const +size_t Magick::Options::quality ( void ) const { return _imageInfo->quality; } -void Magick::Options::quantizeColors ( unsigned int colors_ ) +void Magick::Options::quantizeColors ( size_t colors_ ) { _quantizeInfo->number_colors = colors_; } -unsigned int Magick::Options::quantizeColors ( void ) const +size_t Magick::Options::quantizeColors ( void ) const { return _quantizeInfo->number_colors; } @@ -443,11 +443,11 @@ bool Magick::Options::quantizeDither ( void ) const return static_cast(_imageInfo->dither); } -void Magick::Options::quantizeTreeDepth ( unsigned int treeDepth_ ) +void Magick::Options::quantizeTreeDepth ( size_t treeDepth_ ) { _quantizeInfo->tree_depth = treeDepth_; } -unsigned int Magick::Options::quantizeTreeDepth ( void ) const +size_t Magick::Options::quantizeTreeDepth ( void ) const { return _quantizeInfo->tree_depth; } @@ -518,7 +518,7 @@ void Magick::Options::strokeDashArray ( const double* strokeDashArray_ ) if(strokeDashArray_) { // Count elements in dash array - unsigned int x; + size_t x; for (x=0; strokeDashArray_[x]; x++) ; // Allocate elements _drawInfo->dash_pattern = @@ -566,11 +566,11 @@ Magick::LineJoin Magick::Options::strokeLineJoin ( void ) const } // miterLimit for drawing lines, circles, ellipses, etc. -void Magick::Options::strokeMiterLimit ( unsigned int miterLimit_ ) +void Magick::Options::strokeMiterLimit ( size_t miterLimit_ ) { _drawInfo->miterlimit = miterLimit_; } -unsigned int Magick::Options::strokeMiterLimit ( void ) const +size_t Magick::Options::strokeMiterLimit ( void ) const { return _drawInfo->miterlimit; } @@ -613,20 +613,20 @@ double Magick::Options::strokeWidth ( void ) const return _drawInfo->stroke_width; } -void Magick::Options::subImage ( unsigned int subImage_ ) +void Magick::Options::subImage ( size_t subImage_ ) { _imageInfo->scene = subImage_; } -unsigned int Magick::Options::subImage ( void ) const +size_t Magick::Options::subImage ( void ) const { return _imageInfo->scene; } -void Magick::Options::subRange ( unsigned int subRange_ ) +void Magick::Options::subRange ( size_t subRange_ ) { _imageInfo->number_scenes = subRange_; } -unsigned int Magick::Options::subRange ( void ) const +size_t Magick::Options::subRange ( void ) const { return _imageInfo->number_scenes; } diff --git a/Magick++/lib/Pixels.cpp b/Magick++/lib/Pixels.cpp index a88433f65..400767017 100644 --- a/Magick++/lib/Pixels.cpp +++ b/Magick++/lib/Pixels.cpp @@ -49,8 +49,8 @@ Magick::Pixels::~Pixels( void ) // transferred back to the image via sync. Magick::PixelPacket* Magick::Pixels::get ( const int x_, const int y_, - const unsigned int columns_, - const unsigned int rows_ ) + const size_t columns_, + const size_t rows_ ) { _x = x_; _y = y_; @@ -68,8 +68,8 @@ Magick::PixelPacket* Magick::Pixels::get ( const int x_, // Transfer read-only pixels from the image to the pixel view as // defined by the specified region. const Magick::PixelPacket* Magick::Pixels::getConst ( const int x_, const int y_, - const unsigned int columns_, - const unsigned int rows_ ) + const size_t columns_, + const size_t rows_ ) { _x = x_; _y = y_; @@ -97,8 +97,8 @@ void Magick::Pixels::sync ( void ) // from the pixel view to the image via 'sync'. Magick::PixelPacket* Magick::Pixels::set ( const int x_, const int y_, - const unsigned int columns_, - const unsigned int rows_ ) + const size_t columns_, + const size_t rows_ ) { _x = x_; _y = y_; diff --git a/Magick++/lib/STL.cpp b/Magick++/lib/STL.cpp index 5f416c1e7..684c702ed 100644 --- a/Magick++/lib/STL.cpp +++ b/Magick++/lib/STL.cpp @@ -24,9 +24,9 @@ void Magick::adaptiveBlurImage::operator()( Magick::Image &image_ ) const } // Local adaptive threshold image -Magick::adaptiveThresholdImage::adaptiveThresholdImage( const unsigned int width_, - const unsigned int height_, - const unsigned int offset_ ) +Magick::adaptiveThresholdImage::adaptiveThresholdImage( const size_t width_, + const size_t height_, + const size_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 unsigned int opacityRed_, - const unsigned int opacityGreen_, - const unsigned int opacityBlue_, +Magick::colorizeImage::colorizeImage( const size_t opacityRed_, + const size_t opacityGreen_, + const size_t opacityBlue_, const Magick::Color &penColor_ ) : _opacityRed ( opacityRed_ ), _opacityGreen ( opacityGreen_ ), @@ -180,7 +180,7 @@ Magick::colorizeImage::colorizeImage( const unsigned int opacityRed_, _penColor( penColor_ ) { } -Magick::colorizeImage::colorizeImage( const unsigned int opacity_, +Magick::colorizeImage::colorizeImage( const size_t opacity_, const Magick::Color &penColor_ ) : _opacityRed ( opacity_ ), _opacityGreen ( opacity_ ), @@ -195,7 +195,7 @@ void Magick::colorizeImage::operator()( Magick::Image &image_ ) const // Apply a color matrix to the image channels. The user supplied // matrix may be of order 1 to 5 (1x1 through 5x5). -Magick::colorMatrixImage::colorMatrixImage( const unsigned int order_, +Magick::colorMatrixImage::colorMatrixImage( const size_t order_, const double *color_matrix_ ) : _order( order_ ), _color_matrix( color_matrix_ ) @@ -253,7 +253,7 @@ void Magick::compositeImage::operator()( Image &image_ ) const } // Contrast image (enhance intensity differences in image) -Magick::contrastImage::contrastImage( const unsigned int sharpen_ ) +Magick::contrastImage::contrastImage( const size_t sharpen_ ) : _sharpen( sharpen_ ) { } @@ -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 unsigned int x_, - const unsigned int y_, +Magick::floodFillColorImage::floodFillColorImage( const size_t x_, + const size_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 unsigned int x_, - const unsigned int y_, +Magick::floodFillColorImage::floodFillColorImage( const size_t x_, + const size_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 unsigned int x_, - const unsigned int y_, +Magick::floodFillTextureImage::floodFillTextureImage( const size_t x_, + const size_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 unsigned int x_, - const unsigned int y_, +Magick::floodFillTextureImage::floodFillTextureImage( const size_t x_, + const size_t y_, const Magick::Image &texture_, const Magick::Color &borderColor_ ) : _x(x_), @@ -525,7 +525,7 @@ Magick::frameImage::frameImage( const Magick::Geometry &geometry_ ) _innerBevel( geometry_.yOff() ) { } -Magick::frameImage::frameImage( const unsigned int width_, const unsigned int height_, +Magick::frameImage::frameImage( const size_t width_, const size_t height_, const int innerBevel_, const int outerBevel_ ) : _width( width_ ), _height( height_ ), @@ -678,7 +678,7 @@ void Magick::mapImage::operator()( Magick::Image &image_ ) const // Floodfill designated area with a matte value Magick::matteFloodfillImage::matteFloodfillImage( const Color &target_ , - const unsigned int matte_, + const size_t matte_, const int x_, const int y_, const PaintMethod method_ ) : _target( target_ ), @@ -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 unsigned int opacity_ ) +Magick::opacityImage::opacityImage( const size_t opacity_ ) : _opacity( opacity_ ) { } @@ -813,7 +813,7 @@ Magick::reduceNoiseImage::reduceNoiseImage( void ) : _order(3) { } -Magick::reduceNoiseImage::reduceNoiseImage ( const unsigned int order_ ) +Magick::reduceNoiseImage::reduceNoiseImage ( const size_t order_ ) : _order(order_) { } @@ -944,7 +944,7 @@ void Magick::solarizeImage::operator()( Magick::Image &image_ ) const } // Spread pixels randomly within image by specified ammount -Magick::spreadImage::spreadImage( const unsigned int amount_ ) +Magick::spreadImage::spreadImage( const size_t amount_ ) : _amount( amount_ ) { } @@ -1111,7 +1111,7 @@ void Magick::adjoinImage::operator()( Magick::Image &image_ ) const // Time in 1/100ths of a second which must expire before displaying // the next image in an animated sequence. -Magick::animationDelayImage::animationDelayImage( const unsigned int delay_ ) +Magick::animationDelayImage::animationDelayImage( const size_t delay_ ) : _delay( delay_ ) { } @@ -1122,7 +1122,7 @@ void Magick::animationDelayImage::operator()( Magick::Image &image_ ) const // Number of iterations to loop an animation (e.g. Netscape loop // extension) for. -Magick::animationIterationsImage::animationIterationsImage( const unsigned int iterations_ ) +Magick::animationIterationsImage::animationIterationsImage( const size_t iterations_ ) : _iterations( iterations_ ) { } @@ -1229,7 +1229,7 @@ void Magick::colorFuzzImage::operator()( Magick::Image &image_ ) const } // Color at colormap position index_ -Magick::colorMapImage::colorMapImage( const unsigned int index_, +Magick::colorMapImage::colorMapImage( const size_t index_, const Color &color_ ) : _index( index_ ), _color( color_ ) @@ -1272,7 +1272,7 @@ void Magick::densityImage::operator()( Magick::Image &image_ ) const } // Image depth (bits allocated to red/green/blue components) -Magick::depthImage::depthImage( const unsigned int depth_ ) +Magick::depthImage::depthImage( const size_t depth_ ) : _depth( depth_ ) { } @@ -1323,7 +1323,7 @@ void Magick::fontImage::operator()( Magick::Image &image_ ) const } // Font point size -Magick::fontPointsizeImage::fontPointsizeImage( const unsigned int pointsize_ ) +Magick::fontPointsizeImage::fontPointsizeImage( const size_t pointsize_ ) : _pointsize( pointsize_ ) { } @@ -1333,7 +1333,7 @@ void Magick::fontPointsizeImage::operator()( Magick::Image &image_ ) const } // GIF disposal method -Magick::gifDisposeMethodImage::gifDisposeMethodImage( const unsigned int disposeMethod_ ) +Magick::gifDisposeMethodImage::gifDisposeMethodImage( const size_t disposeMethod_ ) : _disposeMethod( disposeMethod_ ) { } @@ -1423,8 +1423,8 @@ void Magick::penTextureImage::operator()( Magick::Image &image_ ) const } // Set pixel color at location x & y. -Magick::pixelColorImage::pixelColorImage( const unsigned int x_, - const unsigned int y_, +Magick::pixelColorImage::pixelColorImage( const size_t x_, + const size_t y_, const Color &color_) : _x( x_ ), _y( y_ ), @@ -1446,7 +1446,7 @@ void Magick::pageImage::operator()( Magick::Image &image_ ) const } // JPEG/MIFF/PNG compression level (default 75). -Magick::qualityImage::qualityImage( const unsigned int quality_ ) +Magick::qualityImage::qualityImage( const size_t quality_ ) : _quality( quality_ ) { } @@ -1456,7 +1456,7 @@ void Magick::qualityImage::operator()( Magick::Image &image_ ) const } // Maximum number of colors to quantize to -Magick::quantizeColorsImage::quantizeColorsImage( const unsigned int colors_ ) +Magick::quantizeColorsImage::quantizeColorsImage( const size_t colors_ ) : _colors( colors_ ) { } @@ -1486,7 +1486,7 @@ void Magick::quantizeDitherImage::operator()( Magick::Image &image_ ) const } // Quantization tree-depth -Magick::quantizeTreeDepthImage::quantizeTreeDepthImage( const unsigned int treeDepth_ ) +Magick::quantizeTreeDepthImage::quantizeTreeDepthImage( const size_t treeDepth_ ) : _treeDepth( treeDepth_ ) { } void Magick::quantizeTreeDepthImage::operator()( Magick::Image &image_ ) const @@ -1515,7 +1515,7 @@ void Magick::resolutionUnitsImage::operator()( Magick::Image &image_ ) const } // Image scene number -Magick::sceneImage::sceneImage( const unsigned int scene_ ) +Magick::sceneImage::sceneImage( const size_t scene_ ) : _scene( scene_ ) { } @@ -1545,7 +1545,7 @@ void Magick::spliceImage::operator()( Magick::Image &image_ ) const } // Subimage of an image sequence -Magick::subImageImage::subImageImage( const unsigned int subImage_ ) +Magick::subImageImage::subImageImage( const size_t subImage_ ) : _subImage( subImage_ ) { } @@ -1555,7 +1555,7 @@ void Magick::subImageImage::operator()( Magick::Image &image_ ) const } // Number of images relative to the base image -Magick::subRangeImage::subRangeImage( const unsigned int subRange_ ) +Magick::subRangeImage::subRangeImage( const size_t subRange_ ) : _subRange( subRange_ ) { } diff --git a/coders/cin.c b/coders/cin.c index 5b2ae4540..16e832c9d 100644 --- a/coders/cin.c +++ b/coders/cin.c @@ -81,7 +81,7 @@ typedef struct _CINDataFormatInfo sign, sense; - size_t + unsigned int line_pad, channel_pad; @@ -91,7 +91,7 @@ typedef struct _CINDataFormatInfo typedef struct _CINFileInfo { - size_t + unsigned int magic, image_offset, generic_length, @@ -115,14 +115,14 @@ typedef struct _CINFilmInfo offset, reserve1; - size_t + unsigned int prefix, count; char format[32]; - size_t + unsigned int frame_position; float @@ -141,7 +141,7 @@ typedef struct _CINImageChannel bits_per_pixel, reserve; - size_t + unsigned int pixels_per_line, lines_per_image; @@ -175,7 +175,7 @@ typedef struct _CINImageInfo typedef struct _CINOriginationInfo { - ssize_t + int x_offset, y_offset; diff --git a/coders/clipboard.c b/coders/clipboard.c index c0a0b51c8..47ac0da5c 100644 --- a/coders/clipboard.c +++ b/coders/clipboard.c @@ -164,8 +164,8 @@ static Image *ReadCLIPBOARDImage(const ImageInfo *image_info, */ (void) ResetMagickMemory(&DIBinfo,0,sizeof(BITMAPINFO)); DIBinfo.bmiHeader.biSize=sizeof(BITMAPINFOHEADER); - DIBinfo.bmiHeader.biWidth=image->columns; - DIBinfo.bmiHeader.biHeight=(-1)*image->rows; + DIBinfo.bmiHeader.biWidth=(LONG) image->columns; + DIBinfo.bmiHeader.biHeight=(-1)*(LONG) image->rows; DIBinfo.bmiHeader.biPlanes=1; DIBinfo.bmiHeader.biBitCount=32; DIBinfo.bmiHeader.biCompression=BI_RGB; @@ -198,7 +198,7 @@ static Image *ReadCLIPBOARDImage(const ImageInfo *image_info, RealizePalette(hDC); } /* bitblt from the memory to the DIB-based one */ - BitBlt(hDC,0,0,image->columns,image->rows,hMemDC,0,0,SRCCOPY); + BitBlt(hDC,0,0,(int) image->columns,(int) image->rows,hMemDC,0,0,SRCCOPY); /* finally copy the pixels! */ pBits=ppBits; for (y=0; y < (ssize_t) image->rows; y++) diff --git a/coders/dcm.c b/coders/dcm.c index 36926650d..f542dc07d 100644 --- a/coders/dcm.c +++ b/coders/dcm.c @@ -3273,7 +3273,7 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception) if (data == (unsigned char *) NULL) break; colors=(size_t) (length/bytes_per_pixel); - datum=colors; + datum=(int) colors; graymap=(int *) AcquireQuantumMemory((size_t) colors, sizeof(*graymap)); if (graymap == (int *) NULL) @@ -3296,7 +3296,7 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception) if (data == (unsigned char *) NULL) break; colors=(size_t) (length/2); - datum=colors; + datum=(int) colors; redmap=(int *) AcquireQuantumMemory((size_t) colors, sizeof(*redmap)); if (redmap == (int *) NULL) @@ -3324,7 +3324,7 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception) if (data == (unsigned char *) NULL) break; colors=(size_t) (length/2); - datum=colors; + datum=(int) colors; greenmap=(int *) AcquireQuantumMemory((size_t) colors, sizeof(*greenmap)); if (greenmap == (int *) NULL) @@ -3352,7 +3352,7 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception) if (data == (unsigned char *) NULL) break; colors=(size_t) (length/2); - datum=colors; + datum=(int) colors; bluemap=(int *) AcquireQuantumMemory((size_t) colors, sizeof(*bluemap)); if (bluemap == (int *) NULL) @@ -3654,8 +3654,12 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception) image->rows=(size_t) height; if ((image->colormap == (PixelPacket *) NULL) && (samples_per_pixel == 1)) { + size_t + one; + + one=1; if (colors == 0) - colors=1UL << image->depth; + colors=one << image->depth; if (AcquireImageColormap(image,colors) == MagickFalse) ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); if (redmap != (int *) NULL) diff --git a/coders/dib.c b/coders/dib.c index 9ae1748ee..8eabe2008 100644 --- a/coders/dib.c +++ b/coders/dib.c @@ -71,10 +71,10 @@ */ typedef struct _DIBInfo { - size_t + unsigned int size; - ssize_t + int width, height; @@ -82,7 +82,7 @@ typedef struct _DIBInfo planes, bits_per_pixel; - size_t + unsigned int compression, image_size, x_pixels, @@ -94,7 +94,7 @@ typedef struct _DIBInfo alpha_mask, colors_important; - ssize_t + int colorspace; PointInfo @@ -544,10 +544,14 @@ static Image *ReadDIBImage(const ImageInfo *image_info,ExceptionInfo *exception) image->depth=8; if ((dib_info.number_colors != 0) || (dib_info.bits_per_pixel < 16)) { + size_t + one; + image->storage_class=PseudoClass; image->colors=dib_info.number_colors; + one=1; if (image->colors == 0) - image->colors=1L << dib_info.bits_per_pixel; + image->colors=one << dib_info.bits_per_pixel; } if (image_info->size) { @@ -1226,7 +1230,7 @@ static MagickBooleanType WriteDIBImage(const ImageInfo *image_info,Image *image) Write DIB header. */ (void) WriteBlobLSBLong(image,dib_info.size); - (void) WriteBlobLSBLong(image,(size_t) dib_info.width); + (void) WriteBlobLSBLong(image,dib_info.width); (void) WriteBlobLSBLong(image,(unsigned short) dib_info.height); (void) WriteBlobLSBShort(image,(unsigned short) dib_info.planes); (void) WriteBlobLSBShort(image,dib_info.bits_per_pixel); diff --git a/coders/emf.c b/coders/emf.c index 53c7b8ef9..0c21718e8 100644 --- a/coders/emf.c +++ b/coders/emf.c @@ -557,8 +557,8 @@ static Image *ReadEMFImage(const ImageInfo *image_info, */ (void) ResetMagickMemory(&DIBinfo,0,sizeof(BITMAPINFO)); DIBinfo.bmiHeader.biSize=sizeof(BITMAPINFOHEADER); - DIBinfo.bmiHeader.biWidth=image->columns; - DIBinfo.bmiHeader.biHeight=(-1)*image->rows; + DIBinfo.bmiHeader.biWidth=(LONG) image->columns; + DIBinfo.bmiHeader.biHeight=(-1)*(LONG) image->rows; DIBinfo.bmiHeader.biPlanes=1; DIBinfo.bmiHeader.biBitCount=32; DIBinfo.bmiHeader.biCompression=BI_RGB; @@ -601,8 +601,8 @@ static Image *ReadEMFImage(const ImageInfo *image_info, } rect.top=0; rect.left=0; - rect.right=image->columns; - rect.bottom=image->rows; + rect.right=(LONG) image->columns; + rect.bottom=(LONG) image->rows; /* Convert metafile pixels. */ diff --git a/coders/gif.c b/coders/gif.c index 786094e3d..4d2251ab9 100644 --- a/coders/gif.c +++ b/coders/gif.c @@ -181,8 +181,11 @@ static LZWInfo *RelinquishLZWInfo(LZWInfo *lzw_info) static inline void ResetLZWInfo(LZWInfo *lzw_info) { + size_t + one; + lzw_info->bits=lzw_info->data_size+1; - lzw_info->maximum_code=1UL << lzw_info->bits; + lzw_info->maximum_code=one << lzw_info->bits; lzw_info->slot=lzw_info->maximum_data_value+3; lzw_info->genesis=MagickTrue; } @@ -361,8 +364,12 @@ static int ReadBlobLZWByte(LZWInfo *lzw_info) if ((lzw_info->slot >= lzw_info->maximum_code) && (lzw_info->bits < MaximumLZWBits)) { + size_t + one; + lzw_info->bits++; - lzw_info->maximum_code=1UL << lzw_info->bits; + one=1; + lzw_info->maximum_code=one << lzw_info->bits; } } lzw_info->last_code=(size_t) code; @@ -988,7 +995,8 @@ static Image *ReadGIFImage(const ImageInfo *image_info,ExceptionInfo *exception) dispose, global_colors, image_count, - iterations; + iterations, + one; /* Open image file. @@ -1029,6 +1037,7 @@ static Image *ReadGIFImage(const ImageInfo *image_info,ExceptionInfo *exception) delay=0; dispose=0; iterations=1; + one=1; opacity=(-1); image_count=0; for ( ; ; ) @@ -1216,7 +1225,7 @@ static Image *ReadGIFImage(const ImageInfo *image_info,ExceptionInfo *exception) image->interlace=BitSet((int) flag,0x40) != 0 ? GIFInterlace : NoInterlace; image->colors=BitSet((int) flag,0x80) == 0 ? global_colors : - 1UL << ((size_t) (flag & 0x07)+1); + one << ((size_t) (flag & 0x07)+1); if (opacity >= (ssize_t) image->colors) opacity=(-1); image->page.width=page.width; diff --git a/coders/html.c b/coders/html.c index c2442bdb1..9fee4d573 100644 --- a/coders/html.c +++ b/coders/html.c @@ -362,11 +362,11 @@ static MagickBooleanType WriteHTMLImage(const ImageInfo *image_info, " = (ssize_t) image->columns) { geometry.x=0; - geometry.y+=geometry.height; + geometry.y+=(ssize_t) geometry.height; } } (void) WriteBlobString(image,"\n"); @@ -438,11 +438,11 @@ static MagickBooleanType WriteHTMLImage(const ImageInfo *image_info, " = (ssize_t) image->columns) { geometry.x=0; - geometry.y+=geometry.height; + geometry.y+=(ssize_t) geometry.height; } } (void) WriteBlobString(image,"\n"); diff --git a/coders/icon.c b/coders/icon.c index d8c27c876..ad0e87db1 100644 --- a/coders/icon.c +++ b/coders/icon.c @@ -205,10 +205,9 @@ static Image *ReadICONImage(const ImageInfo *image_info, size_t bit, - byte; - - size_t + byte, bytes_per_line, + one, scanline_pad; /* @@ -245,6 +244,7 @@ static Image *ReadICONImage(const ImageInfo *image_info, icon_file.directory[i].size=ReadBlobLSBLong(image); icon_file.directory[i].offset=ReadBlobLSBLong(image); } + one=1; for (i=0; i < icon_file.count; i++) { /* @@ -343,7 +343,7 @@ static Image *ReadICONImage(const ImageInfo *image_info, image->storage_class=PseudoClass; image->colors=icon_info.number_colors; if (image->colors == 0) - image->colors=1 << icon_info.bits_per_pixel; + image->colors=one << icon_info.bits_per_pixel; } if (image->storage_class == PseudoClass) { diff --git a/coders/ipl.c b/coders/ipl.c index ec18f5271..1e6f3a0b5 100644 --- a/coders/ipl.c +++ b/coders/ipl.c @@ -68,16 +68,16 @@ Tyedef declarations typedef struct _IPLInfo { - size_t - tag, - size, - time, - z, - width, - height, - colors, - depth, - byteType; + unsigned int + tag, + size, + time, + z, + width, + height, + colors, + depth, + byteType; } IPLInfo; static MagickBooleanType diff --git a/coders/mat.c b/coders/mat.c index 65b163b5d..67fe81b1b 100644 --- a/coders/mat.c +++ b/coders/mat.c @@ -602,6 +602,7 @@ static Image *ReadMATImage(const ImageInfo *image_info,ExceptionInfo *exception) int sample_size; MagickOffsetType filepos=0x80; BlobInfo *blob; + size_t one; unsigned int (*ReadBlobXXXLong)(Image *image); unsigned short (*ReadBlobXXXShort)(Image *image); @@ -814,7 +815,8 @@ MATLAB_KO: ThrowReaderException(CorruptImageError,"ImproperImageHeader"); quantum_info=AcquireQuantumInfo(clone_info,image); if (quantum_info == (QuantumInfo *) NULL) ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); - image->colors = 1l << image->depth; + one=1; + image->colors = one << image->depth; if (image->columns == 0 || image->rows == 0) goto MATLAB_KO; diff --git a/coders/mpc.c b/coders/mpc.c index 15d5eff36..6ea33c39a 100644 --- a/coders/mpc.c +++ b/coders/mpc.c @@ -1046,7 +1046,8 @@ static MagickBooleanType WriteMPCImage(const ImageInfo *image_info,Image *image) i; size_t - depth; + depth, + one; /* Open persistent cache. @@ -1064,6 +1065,7 @@ static MagickBooleanType WriteMPCImage(const ImageInfo *image_info,Image *image) AppendImageFormat("cache",cache_filename); scene=0; offset=0; + one=1; do { /* @@ -1071,7 +1073,7 @@ static MagickBooleanType WriteMPCImage(const ImageInfo *image_info,Image *image) */ depth=GetImageQuantumDepth(image,MagickTrue); if ((image->storage_class == PseudoClass) && - (image->colors > (1UL << depth))) + (image->colors > (one << depth))) image->storage_class=DirectClass; (void) WriteBlobString(image,"id=MagickCache\n"); (void) FormatMagickString(buffer,MaxTextExtent,"quantum-depth=%d\n", diff --git a/coders/msl.c b/coders/msl.c index 8694845c8..053d9e573 100644 --- a/coders/msl.c +++ b/coders/msl.c @@ -1984,8 +1984,8 @@ static void MSLStartElement(void *context,const xmlChar *tag, image=msl_info->image[n]; height=composite_image->rows; width=composite_image->columns; - for (y=0; y < (ssize_t) image->rows; y+=height) - for (x=0; x < (ssize_t) image->columns; x+=width) + for (y=0; y < (ssize_t) image->rows; y+=(ssize_t) height) + for (x=0; x < (ssize_t) image->columns; x+=(ssize_t) width) { if (rotate_image != (Image *) NULL) (void) CompositeImage(image,compose,rotate_image, diff --git a/coders/palm.c b/coders/palm.c index 4c1b04fba..55bdf8a5c 100644 --- a/coders/palm.c +++ b/coders/palm.c @@ -256,6 +256,10 @@ static Image *ReadPALMImage(const ImageInfo *image_info, MagickBooleanType status; + MagickOffsetType + totalOffset, + seekNextDepth; + MagickPixelPacket transpix; @@ -290,6 +294,7 @@ static Image *ReadPALMImage(const ImageInfo *image_info, redbits, greenbits, bluebits, + one, pad, size, bit; @@ -297,10 +302,6 @@ static Image *ReadPALMImage(const ImageInfo *image_info, unsigned short color16; - MagickOffsetType - totalOffset, - seekNextDepth; - /* Open image file. */ @@ -343,8 +344,9 @@ static Image *ReadPALMImage(const ImageInfo *image_info, /* Initialize image colormap. */ + one=1; if ((bits_per_pixel < 16) && - (AcquireImageColormap(image,1L << bits_per_pixel) == MagickFalse)) + (AcquireImageColormap(image,one << bits_per_pixel) == MagickFalse)) ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); GetMagickPixelPacket(image,&transpix); if (bits_per_pixel == 16) /* Direct Color */ @@ -694,7 +696,8 @@ static MagickBooleanType WritePALMImage(const ImageInfo *image_info, count, bits_per_pixel, bytes_per_row, - nextDepthOffset; + nextDepthOffset, + one; unsigned short color16, @@ -722,6 +725,7 @@ static MagickBooleanType WritePALMImage(const ImageInfo *image_info, transpix.green=0; transpix.blue=0; transpix.opacity=0; + one=1; version=0; scene=0; do @@ -871,7 +875,7 @@ static MagickBooleanType WritePALMImage(const ImageInfo *image_info, if (bits_per_pixel >= 8) color=(unsigned char) indexes[x]; else - color=(unsigned char) (indexes[x]*((1 << bits_per_pixel)-1)/ + color=(unsigned char) (indexes[x]*((one << bits_per_pixel)-1)/ MagickMax(1L*image->colors-1L,1L)); byte|=color << bit; if (bit != 0) diff --git a/coders/pcx.c b/coders/pcx.c index 20a27a2c1..64d4f5c22 100644 --- a/coders/pcx.c +++ b/coders/pcx.c @@ -267,6 +267,7 @@ static Image *ReadPCXImage(const ImageInfo *image_info,ExceptionInfo *exception) *scanline; size_t + one, pcx_packets; /* @@ -358,10 +359,11 @@ static Image *ReadPCXImage(const ImageInfo *image_info,ExceptionInfo *exception) count=ReadBlob(image,3*image->colors,pcx_colormap); pcx_info.reserved=(unsigned char) ReadBlobByte(image); pcx_info.planes=(unsigned char) ReadBlobByte(image); + one=1; if ((pcx_info.bits_per_pixel != 8) || (pcx_info.planes == 1)) if ((pcx_info.version == 3) || (pcx_info.version == 5) || ((pcx_info.bits_per_pixel*pcx_info.planes) == 1)) - image->colors=(size_t) MagickMin(1UL << (1UL* + image->colors=(size_t) MagickMin(one << (1UL* (pcx_info.bits_per_pixel*pcx_info.planes)),256UL); if (AcquireImageColormap(image,image->colors) == MagickFalse) ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); diff --git a/coders/pdb.c b/coders/pdb.c index 82801fb81..db569c2d9 100644 --- a/coders/pdb.c +++ b/coders/pdb.c @@ -304,8 +304,9 @@ static Image *ReadPDBImage(const ImageInfo *image_info,ExceptionInfo *exception) *pixels; size_t - num_pad_bytes, /* TS */ bits_per_pixel, + num_pad_bytes, /* TS */ + one, packets; /* @@ -390,7 +391,8 @@ static Image *ReadPDBImage(const ImageInfo *image_info,ExceptionInfo *exception) image->depth=8; image->storage_class=PseudoClass; bits_per_pixel=pdb_image.type == 0 ? 2UL : pdb_image.type == 2 ? 4UL : 1UL; - if (AcquireImageColormap(image,1 << bits_per_pixel) == MagickFalse) + one=1; + if (AcquireImageColormap(image,one << bits_per_pixel) == MagickFalse) ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); if (image_info->ping != MagickFalse) { @@ -774,16 +776,16 @@ static MagickBooleanType WritePDBImage(const ImageInfo *image_info,Image *image) (void) WriteBlob(image,32,(unsigned char *) pdb_info.name); (void) WriteBlobMSBShort(image,(unsigned short) pdb_info.attributes); (void) WriteBlobMSBShort(image,(unsigned short) pdb_info.version); - (void) WriteBlobMSBLong(image,pdb_info.create_time); - (void) WriteBlobMSBLong(image,pdb_info.modify_time); - (void) WriteBlobMSBLong(image,pdb_info.archive_time); - (void) WriteBlobMSBLong(image,pdb_info.modify_number); - (void) WriteBlobMSBLong(image,pdb_info.application_info); - (void) WriteBlobMSBLong(image,pdb_info.sort_info); + (void) WriteBlobMSBLong(image,(unsigned int) pdb_info.create_time); + (void) WriteBlobMSBLong(image,(unsigned int) pdb_info.modify_time); + (void) WriteBlobMSBLong(image,(unsigned int) pdb_info.archive_time); + (void) WriteBlobMSBLong(image,(unsigned int) pdb_info.modify_number); + (void) WriteBlobMSBLong(image,(unsigned int) pdb_info.application_info); + (void) WriteBlobMSBLong(image,(unsigned int) pdb_info.sort_info); (void) WriteBlob(image,4,(unsigned char *) pdb_info.type); (void) WriteBlob(image,4,(unsigned char *) pdb_info.id); - (void) WriteBlobMSBLong(image,(size_t) pdb_info.seed); - (void) WriteBlobMSBLong(image,(size_t) pdb_info.next_record); + (void) WriteBlobMSBLong(image,(unsigned int) pdb_info.seed); + (void) WriteBlobMSBLong(image,(unsigned int) pdb_info.next_record); (void) WriteBlobMSBShort(image,(unsigned short) pdb_info.number_records); (void) CopyMagickString(pdb_image.name,pdb_info.name,32); pdb_image.version=1; /* RLE Compressed */ @@ -920,11 +922,11 @@ static MagickBooleanType WritePDBImage(const ImageInfo *image_info,Image *image) (void) WriteBlob(image,32,(unsigned char *) pdb_image.name); (void) WriteBlobByte(image,(unsigned char) pdb_image.version); (void) WriteBlobByte(image,(unsigned char) pdb_image.type); - (void) WriteBlobMSBLong(image,pdb_image.reserved_1); - (void) WriteBlobMSBLong(image,pdb_image.note); + (void) WriteBlobMSBLong(image,(unsigned int) pdb_image.reserved_1); + (void) WriteBlobMSBLong(image,(unsigned int) pdb_image.note); (void) WriteBlobMSBShort(image,(unsigned short) pdb_image.x_last); (void) WriteBlobMSBShort(image,(unsigned short) pdb_image.y_last); - (void) WriteBlobMSBLong(image,pdb_image.reserved_2); + (void) WriteBlobMSBLong(image,(unsigned int) pdb_image.reserved_2); (void) WriteBlobMSBShort(image,(unsigned short) pdb_image.x_anchor); (void) WriteBlobMSBShort(image,(unsigned short) pdb_image.y_anchor); (void) WriteBlobMSBShort(image,(unsigned short) pdb_image.width); diff --git a/coders/pict.c b/coders/pict.c index 2b316cc41..a42b87c4d 100644 --- a/coders/pict.c +++ b/coders/pict.c @@ -551,7 +551,7 @@ static unsigned char *DecodeImage(Image *blob,Image *image, (void) CopyMagickMemory(q,p,(size_t) number_pixels); q+=number_pixels; } - j+=bytes_per_pixel+1; + j+=(ssize_t) bytes_per_pixel+1; } } scanline=(unsigned char *) RelinquishMagickMemory(scanline); @@ -1755,7 +1755,7 @@ static MagickBooleanType WritePICTImage(const ImageInfo *image_info, return(MagickFalse); jpeg_image=DestroyImage(jpeg_image); (void) WriteBlobMSBShort(image,PictJPEGOp); - (void) WriteBlobMSBLong(image,(size_t) length+154); + (void) WriteBlobMSBLong(image,(unsigned int) length+154); (void) WriteBlobMSBShort(image,0x0000); (void) WriteBlobMSBLong(image,0x00010000UL); (void) WriteBlobMSBLong(image,0x00000000UL); @@ -1826,7 +1826,7 @@ static MagickBooleanType WritePICTImage(const ImageInfo *image_info, */ (void) WriteBlobMSBShort(image,(unsigned short) pixmap.version); (void) WriteBlobMSBShort(image,(unsigned short) pixmap.pack_type); - (void) WriteBlobMSBLong(image,pixmap.pack_size); + (void) WriteBlobMSBLong(image,(unsigned int) pixmap.pack_size); (void) WriteBlobMSBShort(image,(unsigned short) (x_resolution+0.5)); (void) WriteBlobMSBShort(image,0x0000); (void) WriteBlobMSBShort(image,(unsigned short) (y_resolution+0.5)); @@ -1838,9 +1838,9 @@ static MagickBooleanType WritePICTImage(const ImageInfo *image_info, */ (void) WriteBlobMSBShort(image,(unsigned short) pixmap.component_count); (void) WriteBlobMSBShort(image,(unsigned short) pixmap.component_size); - (void) WriteBlobMSBLong(image,(size_t) pixmap.plane_bytes); - (void) WriteBlobMSBLong(image,(size_t) pixmap.table); - (void) WriteBlobMSBLong(image,(size_t) pixmap.reserved); + (void) WriteBlobMSBLong(image,(unsigned int) pixmap.plane_bytes); + (void) WriteBlobMSBLong(image,(unsigned int) pixmap.table); + (void) WriteBlobMSBLong(image,(unsigned int) pixmap.reserved); if (storage_class == PseudoClass) { /* diff --git a/coders/rle.c b/coders/rle.c index 4b97a683d..40f1d84ed 100644 --- a/coders/rle.c +++ b/coders/rle.c @@ -179,7 +179,8 @@ static Image *ReadRLEImage(const ImageInfo *image_info,ExceptionInfo *exception) bits_per_pixel, map_length, number_colormaps, - number_planes; + number_planes, + one; /* Open image file. @@ -218,7 +219,8 @@ static Image *ReadRLEImage(const ImageInfo *image_info,ExceptionInfo *exception) number_planes=1UL*ReadBlobByte(image); bits_per_pixel=1UL*ReadBlobByte(image); number_colormaps=1UL*ReadBlobByte(image); - map_length=1UL << ReadBlobByte(image); + one=1; + map_length=one << ReadBlobByte(image); if ((number_planes == 0) || (number_planes == 2) || (bits_per_pixel != 8) || (image->columns == 0)) ThrowReaderException(CorruptImageError,"ImproperImageHeader"); diff --git a/coders/sgi.c b/coders/sgi.c index 2cf4d4b0e..e56cd6d3c 100644 --- a/coders/sgi.c +++ b/coders/sgi.c @@ -486,7 +486,7 @@ static Image *ReadSGIImage(const ImageInfo *image_info,ExceptionInfo *exception) packets); if (EOFBlob(image) != MagickFalse) break; - offset+=runlength[y+z*iris_info.rows]; + offset+=(ssize_t) runlength[y+z*iris_info.rows]; status=SGIDecode(bytes_per_pixel,(ssize_t) (runlength[y+z*iris_info.rows]/bytes_per_pixel),packets, 1L*iris_info.columns,p+bytes_per_pixel*z); @@ -516,7 +516,7 @@ static Image *ReadSGIImage(const ImageInfo *image_info,ExceptionInfo *exception) packets); if (EOFBlob(image) != MagickFalse) break; - offset+=runlength[y+z*iris_info.rows]; + offset+=(ssize_t) runlength[y+z*iris_info.rows]; status=SGIDecode(bytes_per_pixel,(ssize_t) (runlength[y+z*iris_info.rows]/bytes_per_pixel),packets, 1L*iris_info.columns,p+bytes_per_pixel*z); @@ -951,9 +951,9 @@ static MagickBooleanType WriteSGIImage(const ImageInfo *image_info,Image *image) (void) WriteBlobMSBShort(image,iris_info.columns); (void) WriteBlobMSBShort(image,iris_info.rows); (void) WriteBlobMSBShort(image,iris_info.depth); - (void) WriteBlobMSBLong(image,iris_info.minimum_value); - (void) WriteBlobMSBLong(image,iris_info.maximum_value); - (void) WriteBlobMSBLong(image,iris_info.sans); + (void) WriteBlobMSBLong(image,(unsigned int) iris_info.minimum_value); + (void) WriteBlobMSBLong(image,(unsigned int) iris_info.maximum_value); + (void) WriteBlobMSBLong(image,(unsigned int) iris_info.sans); value=GetImageProperty(image,"label"); if (value != (const char *) NULL) (void) CopyMagickString(iris_info.name,value,sizeof(iris_info.name)); @@ -1099,7 +1099,7 @@ static MagickBooleanType WriteSGIImage(const ImageInfo *image_info,Image *image) for (i=0; i < (ssize_t) (iris_info.rows*iris_info.depth); i++) (void) WriteBlobMSBLong(image,(size_t) offsets[i]); for (i=0; i < (ssize_t) (iris_info.rows*iris_info.depth); i++) - (void) WriteBlobMSBLong(image,runlength[i]); + (void) WriteBlobMSBLong(image,(unsigned int) runlength[i]); (void) WriteBlob(image,number_packets,packets); /* Relinquish resources. diff --git a/coders/stegano.c b/coders/stegano.c index e87e53557..7873a19c1 100644 --- a/coders/stegano.c +++ b/coders/stegano.c @@ -101,8 +101,8 @@ static Image *ReadSTEGANOImage(const ImageInfo *image_info, #define GetBit(alpha,i) MagickMin((((size_t) (alpha) >> (size_t) \ (i)) & 0x01),16) #define SetBit(alpha,i,set) (alpha)=(IndexPacket) ((set) != 0 ? \ - (size_t) (alpha) | (1UL << (size_t) (i)) : (size_t) \ - (alpha) & ~(1UL << (size_t) (i))) + (size_t) (alpha) | (one << (size_t) (i)) : (size_t) \ + (alpha) & ~(one << (size_t) (i))) Image *image, @@ -134,7 +134,8 @@ static Image *ReadSTEGANOImage(const ImageInfo *image_info, *q; size_t - depth; + depth, + one; /* Initialize Image structure. @@ -146,6 +147,7 @@ static Image *ReadSTEGANOImage(const ImageInfo *image_info, image_info->filename); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickSignature); + one=1; image=AcquireImage(image_info); if ((image->columns == 0) || (image->rows == 0)) ThrowReaderException(OptionError,"MustSpecifyImageSize"); diff --git a/coders/sun.c b/coders/sun.c index 297a985f9..8dc3a32fa 100644 --- a/coders/sun.c +++ b/coders/sun.c @@ -316,10 +316,14 @@ static Image *ReadSUNImage(const ImageInfo *image_info,ExceptionInfo *exception) MAGICKCORE_QUANTUM_DEPTH; if (sun_info.depth < 24) { + size_t + one; + image->storage_class=PseudoClass; image->colors=sun_info.maplength; + one=1; if (sun_info.maptype == RMT_NONE) - image->colors=1 << sun_info.depth; + image->colors=one << sun_info.depth; if (sun_info.maptype == RMT_EQUAL_RGB) image->colors=sun_info.maplength/3; } @@ -770,9 +774,10 @@ static MagickBooleanType WriteSUNImage(const ImageInfo *image_info,Image *image) /* Full color SUN raster. */ - sun_info.depth=image->matte ? 32U : 24U; + sun_info.depth=(unsigned int) image->matte ? 32U : 24U; sun_info.length=(unsigned int) ((image->matte ? 4 : 3)*number_pixels); - sun_info.length+=sun_info.length & 0x01 ? image->rows : 0; + sun_info.length+=sun_info.length & 0x01 ? (unsigned int) image->rows : + 0; } else if (IsMonochromeImage(image,&image->exception)) diff --git a/coders/tiff.c b/coders/tiff.c index 7ccf30146..18a769d7e 100644 --- a/coders/tiff.c +++ b/coders/tiff.c @@ -263,7 +263,7 @@ static MagickBooleanType IsTIFF(const unsigned char *magick,const size_t length) % */ -static inline size_t WriteLSBLong(FILE *file,const unsigned int value) +static inline size_t WriteLSBLong(FILE *file,const size_t value) { unsigned char buffer[4]; @@ -1379,7 +1379,8 @@ static Image *ReadTIFFImage(const ImageInfo *image_info, { if (TIFFReadRGBAStrip(tiff,(tstrip_t) y,(uint32 *) pixels) == 0) break; - i=(ssize_t) MagickMin((ssize_t) rows_per_strip,(ssize_t) image->rows-y); + i=(ssize_t) MagickMin((ssize_t) rows_per_strip,(ssize_t) + image->rows-y); } i--; p=pixels+image->columns*i; @@ -2824,8 +2825,8 @@ static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info, ((bits_per_sample == 8) || (bits_per_sample == 16))) (void) TIFFSetField(tiff,TIFFTAG_PREDICTOR,2); (void) TIFFSetField(tiff,TIFFTAG_ZIPQUALITY,image_info->quality == - UndefinedCompressionQuality ? 7 : MagickMin(1L*image_info->quality/10, - 9)); + UndefinedCompressionQuality ? 7 : (long) MagickMin(1L* + image_info->quality/10,9)); break; } case COMPRESSION_CCITTFAX3: @@ -2833,13 +2834,13 @@ static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info, /* Byte-aligned EOL. */ - rows_per_strip=image->rows; + rows_per_strip=(uint32) image->rows; (void) TIFFSetField(tiff,TIFFTAG_GROUP3OPTIONS,4); break; } case COMPRESSION_CCITTFAX4: { - rows_per_strip=image->rows; + rows_per_strip=(uint32) image->rows; break; } case COMPRESSION_LZW: @@ -2918,7 +2919,7 @@ static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info, pages; page=(uint16) scene; - pages=GetImageListLength(image); + pages=(uint16) GetImageListLength(image); if ((image_info->adjoin != MagickFalse) && (pages > 1)) (void) TIFFSetField(tiff,TIFFTAG_SUBFILETYPE,FILETYPE_PAGE); (void) TIFFSetField(tiff,TIFFTAG_PAGENUMBER,page,pages); diff --git a/coders/ttf.c b/coders/ttf.c index 7f6544fa1..3b53dd836 100644 --- a/coders/ttf.c +++ b/coders/ttf.c @@ -260,7 +260,7 @@ static Image *ReadTTFImage(const ImageInfo *image_info,ExceptionInfo *exception) text=DestroyString(text); (void) FormatMagickString(buffer,MaxTextExtent,"'\n"); ConcatenateString(&draw_info->primitive,buffer); - y+=20*MultilineCensus((char *) Text)+20; + y+=20*(ssize_t) MultilineCensus((char *) Text)+20; for (i=12; i <= 72; i+=6) { y+=i+12; diff --git a/coders/viff.c b/coders/viff.c index dd6e461bd..5a9b0ba46 100644 --- a/coders/viff.c +++ b/coders/viff.c @@ -178,7 +178,7 @@ static Image *ReadVIFFImage(const ImageInfo *image_info, columns, subrows; - ssize_t + int x_offset, y_offset; @@ -186,7 +186,7 @@ static Image *ReadVIFFImage(const ImageInfo *image_info, x_bits_per_pixel, y_bits_per_pixel; - size_t + unsigned int location_type, location_dimension, number_of_images, diff --git a/coders/wmf.c b/coders/wmf.c index 6df1271d4..bc978c050 100644 --- a/coders/wmf.c +++ b/coders/wmf.c @@ -162,7 +162,7 @@ static Image *ReadWMFImage(const ImageInfo *image_info,ExceptionInfo *exception) flags|=WMF_OPT_IGNORE_NONFATAL; flags|=WMF_OPT_FUNCTION; options.function=wmf_eps_function; - wmf_status=wmf_api_create(&wmf_info,flags,&options); + wmf_status=wmf_api_create(&wmf_info,(unsigned long) flags,&options); if (wmf_status != wmf_E_None) { if (wmf_info != (wmfAPI *) NULL) diff --git a/coders/wpg.c b/coders/wpg.c index 29ebefe1b..593ef76a4 100644 --- a/coders/wpg.c +++ b/coders/wpg.c @@ -937,6 +937,9 @@ static Image *ReadWPGImage(const ImageInfo *image_info, ssize_t ldblk; + size_t + one; + unsigned char *BImgBuff; @@ -949,6 +952,7 @@ static Image *ReadWPGImage(const ImageInfo *image_info, assert(image_info->signature == MagickSignature); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickSignature); + one=1; image=AcquireImage(image_info); image->depth=8; status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception); @@ -1076,7 +1080,7 @@ static Image *ReadWPGImage(const ImageInfo *image_info, UnpackRaster: if ((image->colors == 0) && (bpp != 24)) { - image->colors=1 << bpp; + image->colors=one << bpp; if (!AcquireImageColormap(image,image->colors)) { NoMemory: @@ -1094,9 +1098,9 @@ static Image *ReadWPGImage(const ImageInfo *image_info, else { if (bpp < 24) - if ( (image->colors < (1UL<colors < (one << bpp)) && (bpp != 24) ) image->colormap=(PixelPacket *) ResizeQuantumMemory( - image->colormap,(size_t) (1UL << bpp), + image->colormap,(size_t) (one << bpp), sizeof(*image->colormap)); } @@ -1263,9 +1267,9 @@ static Image *ReadWPGImage(const ImageInfo *image_info, else { if(bpp < 24) - if( image->colors<(1UL<colors<(one << bpp) && bpp!=24 ) image->colormap=(PixelPacket *) ResizeQuantumMemory( - image->colormap,(size_t) (1UL << bpp), + image->colormap,(size_t) (one << bpp), sizeof(*image->colormap)); } diff --git a/coders/xcf.c b/coders/xcf.c index 8130e3c47..9b3525262 100644 --- a/coders/xcf.c +++ b/coders/xcf.c @@ -376,7 +376,8 @@ static MagickBooleanType load_tile(Image *image,Image *tile_image, q->red=ScaleCharToQuantum(*graydata); q->green=q->red; q->blue=q->red; - q->opacity=ScaleCharToQuantum(255-inLayerInfo->opacity); + q->opacity=ScaleCharToQuantum((unsigned char) (255- + inLayerInfo->opacity)); graydata++; q++; } @@ -390,7 +391,7 @@ static MagickBooleanType load_tile(Image *image,Image *tile_image, q->green=ScaleCharToQuantum(xcfdata->green); q->blue=ScaleCharToQuantum(xcfdata->blue); q->opacity=(Quantum) (xcfdata->opacity == 0U ? TransparentOpacity : - ScaleCharToQuantum(255-inLayerInfo->opacity)); + ScaleCharToQuantum((unsigned char) (255-inLayerInfo->opacity))); xcfdata++; q++; } @@ -478,13 +479,15 @@ static MagickBooleanType load_tile_rle(Image *image,Image *tile_image, { q->green=ScaleCharToQuantum(data); q->blue=ScaleCharToQuantum(data); - q->opacity=ScaleCharToQuantum(255-inLayerInfo->opacity); + q->opacity=ScaleCharToQuantum((unsigned char) (255- + inLayerInfo->opacity)); } else { q->green= q->red; q->blue= q->red; - q->opacity=ScaleCharToQuantum(255-inLayerInfo->opacity); + q->opacity=ScaleCharToQuantum((unsigned char) (255- + inLayerInfo->opacity)); } break; } @@ -501,7 +504,8 @@ static MagickBooleanType load_tile_rle(Image *image,Image *tile_image, case 3: { q->opacity=(Quantum) (data == 0 ? TransparentOpacity : - ScaleCharToQuantum(255-inLayerInfo->opacity)); + ScaleCharToQuantum((unsigned char) (255- + inLayerInfo->opacity))); break; } } @@ -536,13 +540,15 @@ static MagickBooleanType load_tile_rle(Image *image,Image *tile_image, { q->green=ScaleCharToQuantum(data); q->blue=ScaleCharToQuantum(data); - q->opacity=ScaleCharToQuantum(255-inLayerInfo->opacity); + q->opacity=ScaleCharToQuantum((unsigned char) (255- + inLayerInfo->opacity)); } else { q->green=q->red; q->blue=q->red; - q->opacity=ScaleCharToQuantum(255-inLayerInfo->opacity); + q->opacity=ScaleCharToQuantum((unsigned char) (255- + inLayerInfo->opacity)); } break; } @@ -559,7 +565,8 @@ static MagickBooleanType load_tile_rle(Image *image,Image *tile_image, case 3: { q->opacity=(Quantum) (data == 0 ? TransparentOpacity : - ScaleCharToQuantum(255-inLayerInfo->opacity)); + ScaleCharToQuantum((unsigned char) (255- + inLayerInfo->opacity))); break; } } diff --git a/index.html b/index.html index 0f1542d99..99fdd695f 100644 --- a/index.html +++ b/index.html @@ -223,7 +223,7 @@ Discourse Server • - Studio + Studio   diff --git a/magick/annotate.c b/magick/annotate.c index a1f1356db..0f8dc84d5 100644 --- a/magick/annotate.c +++ b/magick/annotate.c @@ -1048,7 +1048,7 @@ static MagickBooleanType RenderFreetype(Image *image,const DrawInfo *draw_info, else args.pathname=ConstantString(draw_info->font+1); face=(FT_Face) NULL; - status=FT_Open_Face(library,&args,draw_info->face,&face); + status=FT_Open_Face(library,&args,(long) draw_info->face,&face); args.pathname=DestroyString(args.pathname); if (status != 0) { diff --git a/magick/cache.c b/magick/cache.c index d1eb7b0f3..9d320d7f2 100644 --- a/magick/cache.c +++ b/magick/cache.c @@ -5059,8 +5059,8 @@ static PixelPacket *SetPixelCacheNexusPixels(const Image *image, x, y; - x=nexus_info->region.x+nexus_info->region.width-1; - y=nexus_info->region.y+nexus_info->region.height-1; + x=nexus_info->region.x+(ssize_t) nexus_info->region.width-1; + y=nexus_info->region.y+(ssize_t) nexus_info->region.height-1; if (((nexus_info->region.x >= 0) && (x < (ssize_t) cache_info->columns) && (nexus_info->region.y >= 0) && (y < (ssize_t) cache_info->rows)) && ((nexus_info->region.height == 1UL) || diff --git a/magick/colormap.c b/magick/colormap.c index a3d608248..047a60f3c 100644 --- a/magick/colormap.c +++ b/magick/colormap.c @@ -234,7 +234,7 @@ MagickExport MagickBooleanType CycleColormapImage(Image *image, { index=(ssize_t) (indexes[x]+displace) % image->colors; if (index < 0) - index+=image->colors; + index+=(ssize_t) image->colors; indexes[x]=(IndexPacket) index; q->red=image->colormap[index].red; q->green=image->colormap[index].green; diff --git a/magick/composite.c b/magick/composite.c index 244e24b8b..7335346cb 100644 --- a/magick/composite.c +++ b/magick/composite.c @@ -2755,14 +2755,14 @@ MagickExport MagickBooleanType TextureImage(Image *image,const Image *texture) #if defined(MAGICKCORE_OPENMP_SUPPORT) && defined(MAGICKCORE_FUTURE) #pragma omp parallel for schedule(dynamic,4) shared(status) #endif - for (y=0; y < (ssize_t) image->rows; y+=texture->rows) + for (y=0; y < (ssize_t) image->rows; y+=(ssize_t) texture->rows) { register ssize_t x; if (status == MagickFalse) continue; - for (x=0; x < (ssize_t) image->columns; x+=texture->columns) + for (x=0; x < (ssize_t) image->columns; x+=(ssize_t) texture->columns) { MagickBooleanType thread_status; @@ -2839,7 +2839,7 @@ MagickExport MagickBooleanType TextureImage(Image *image,const Image *texture) } texture_indexes=GetCacheViewVirtualIndexQueue(texture_view); indexes=GetCacheViewAuthenticIndexQueue(image_view); - for (x=0; x < (ssize_t) image->columns; x+=texture->columns) + for (x=0; x < (ssize_t) image->columns; x+=(ssize_t) texture->columns) { width=texture->columns; if ((x+(ssize_t) width) > (ssize_t) image->columns) diff --git a/magick/compress.c b/magick/compress.c index f913ca3c7..497ee2d78 100644 --- a/magick/compress.c +++ b/magick/compress.c @@ -593,7 +593,7 @@ MagickExport MagickBooleanType HuffmanDecodeImage(Image *image) case TWId: case TBId: { - count+=entry->count; + count+=(ssize_t) entry->count; if ((x+count) > (ssize_t) image->columns) count=(ssize_t) image->columns-x; if (count > 0) @@ -615,7 +615,7 @@ MagickExport MagickBooleanType HuffmanDecodeImage(Image *image) case MBId: case EXId: { - count+=entry->count; + count+=(ssize_t) entry->count; break; } default: @@ -688,7 +688,7 @@ MagickExport MagickBooleanType HuffmanEncodeImage(const ImageInfo *image_info, { #define HuffmanOutputCode(entry) \ { \ - mask=1 << (entry->length-1); \ + mask=one << (entry->length-1); \ while (mask != 0) \ { \ OutputBit(((entry->code & mask) != 0 ? 1 : 0)); \ @@ -749,6 +749,7 @@ MagickExport MagickBooleanType HuffmanEncodeImage(const ImageInfo *image_info, size_t mask, + one, width; /* @@ -762,6 +763,7 @@ MagickExport MagickBooleanType HuffmanEncodeImage(const ImageInfo *image_info, (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); assert(inject_image != (Image *) NULL); assert(inject_image->signature == MagickSignature); + one=1; width=inject_image->columns; if (LocaleCompare(image_info->magick,"FAX") == 0) width=(size_t) MagickMax(inject_image->columns,1728); @@ -827,7 +829,7 @@ MagickExport MagickBooleanType HuffmanEncodeImage(const ImageInfo *image_info, entry=MWTable+((runlength/64)-1); else entry=EXTable+(MagickMin((size_t) runlength,2560)-1792)/64; - runlength-=entry->count; + runlength-=(ssize_t) entry->count; HuffmanOutputCode(entry); } entry=TWTable+MagickMin((size_t) runlength,63); @@ -847,7 +849,7 @@ MagickExport MagickBooleanType HuffmanEncodeImage(const ImageInfo *image_info, entry=MBTable+((runlength/64)-1); if (runlength >= 1792) entry=EXTable+(MagickMin((size_t) runlength,2560)-1792)/64; - runlength-=entry->count; + runlength-=(ssize_t) entry->count; HuffmanOutputCode(entry); } entry=TBTable+MagickMin((size_t) runlength,63); diff --git a/magick/effect.c b/magick/effect.c index a2294c15b..77b89a78a 100644 --- a/magick/effect.c +++ b/magick/effect.c @@ -4049,12 +4049,12 @@ MagickExport Image *RadialBlurImageChannel(const Image *image, qixel=bias; if (((channel & OpacityChannel) == 0) || (image->matte == MagickFalse)) { - for (i=0; i < (ssize_t) n; i+=step) + for (i=0; i < (ssize_t) n; i+=(ssize_t) step) { - (void) GetOneCacheViewVirtualPixel(image_view,(ssize_t) (blur_center.x+ - center.x*cos_theta[i]-center.y*sin_theta[i]+0.5),(ssize_t) ( - blur_center.y+center.x*sin_theta[i]+center.y*cos_theta[i]+0.5), - &pixel,exception); + (void) GetOneCacheViewVirtualPixel(image_view,(ssize_t) + (blur_center.x+center.x*cos_theta[i]-center.y*sin_theta[i]+0.5), + (ssize_t) (blur_center.y+center.x*sin_theta[i]+center.y* + cos_theta[i]+0.5),&pixel,exception); qixel.red+=pixel.red; qixel.green+=pixel.green; qixel.blue+=pixel.blue; @@ -4088,12 +4088,12 @@ MagickExport Image *RadialBlurImageChannel(const Image *image, alpha=1.0; gamma=0.0; - for (i=0; i < (ssize_t) n; i+=step) + for (i=0; i < (ssize_t) n; i+=(ssize_t) step) { - (void) GetOneCacheViewVirtualPixel(image_view,(ssize_t) (blur_center.x+ - center.x*cos_theta[i]-center.y*sin_theta[i]+0.5),(ssize_t) ( - blur_center.y+center.x*sin_theta[i]+center.y*cos_theta[i]+0.5), - &pixel,exception); + (void) GetOneCacheViewVirtualPixel(image_view,(ssize_t) + (blur_center.x+center.x*cos_theta[i]-center.y*sin_theta[i]+0.5), + (ssize_t) (blur_center.y+center.x*sin_theta[i]+center.y* + cos_theta[i]+0.5),&pixel,exception); alpha=(MagickRealType) (QuantumScale* GetAlphaPixelComponent(&pixel)); qixel.red+=alpha*pixel.red; @@ -4652,7 +4652,7 @@ MagickExport Image *SelectiveBlurImageChannel(const Image *image, k++; } } - j+=image->columns+width; + j+=(ssize_t) (image->columns+width); } if (gamma != 0.0) { @@ -4678,7 +4678,7 @@ MagickExport Image *SelectiveBlurImageChannel(const Image *image, k++; } } - j+=image->columns+width; + j+=(ssize_t) (image->columns+width); } if (gamma != 0.0) { @@ -4710,7 +4710,7 @@ MagickExport Image *SelectiveBlurImageChannel(const Image *image, k++; } } - j+=image->columns+width; + j+=(ssize_t) (image->columns+width); } if (gamma != 0.0) { @@ -4737,7 +4737,7 @@ MagickExport Image *SelectiveBlurImageChannel(const Image *image, k++; } } - j+=image->columns+width; + j+=(ssize_t) (image->columns+width); } if (gamma != 0.0) { @@ -4765,7 +4765,7 @@ MagickExport Image *SelectiveBlurImageChannel(const Image *image, k++; } } - j+=image->columns+width; + j+=(ssize_t) (image->columns+width); } if (gamma != 0.0) { diff --git a/magick/fx.c b/magick/fx.c index 8aa9ba4a1..fa64cf127 100644 --- a/magick/fx.c +++ b/magick/fx.c @@ -4498,9 +4498,8 @@ MagickExport Image *SteganoImage(const Image *image,const Image *watermark, { #define GetBit(alpha,i) ((((size_t) (alpha) >> (size_t) \ (i)) & 0x01) != 0) -#define SetBit(alpha,i,set) (alpha)=(Quantum) ((set) ? (size_t) (alpha) \ - | (1UL << (size_t) (i)) : (size_t) (alpha) & \ - ~(1UL << (size_t) (i))) +#define SetBit(alpha,i,set) (alpha)=(Quantum) ((set) != 0 ? (size_t) (alpha) \ + | (one << (size_t) (i)) : (size_t) (alpha) & ~(one << (size_t) (i))) #define SteganoImageTag "Stegano/Image" Image @@ -4528,7 +4527,8 @@ MagickExport Image *SteganoImage(const Image *image,const Image *watermark, *q; size_t - depth; + depth, + one; /* Initialize steganographic image attributes. @@ -4541,6 +4541,7 @@ MagickExport Image *SteganoImage(const Image *image,const Image *watermark, assert(watermark->signature == MagickSignature); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickSignature); + one=1UL; stegano_image=CloneImage(image,0,0,MagickTrue,exception); if (stegano_image == (Image *) NULL) return((Image *) NULL); diff --git a/magick/image.c b/magick/image.c index 0f8e44d3a..138bb183e 100644 --- a/magick/image.c +++ b/magick/image.c @@ -528,13 +528,13 @@ MagickExport Image *AppendImages(const Image *image, break; if (stack == MagickFalse) { - x_offset+=image->columns; + x_offset+=(ssize_t) image->columns; y_offset=0; } else { x_offset=0; - y_offset+=image->rows; + y_offset+=(ssize_t) image->rows; } image=GetNextImageInList(image); } diff --git a/magick/montage.c b/magick/montage.c index 2fd3ccfa0..8d5d91476 100644 --- a/magick/montage.c +++ b/magick/montage.c @@ -609,7 +609,7 @@ MagickExport Image *MontageImageList(const ImageInfo *image_info, if (image_list[tile]->rows > max_height) max_height=image_list[tile]->rows; } - x_offset+=width+(extract_info.x+border_width)*2; + x_offset+=width+(extract_info.x+(ssize_t) border_width)*2; if (x_offset > (ssize_t) bounds.width) bounds.width=(size_t) x_offset; if (((tile+1) == (ssize_t) tiles_per_page) || @@ -620,7 +620,7 @@ MagickExport Image *MontageImageList(const ImageInfo *image_info, GetMontageGeometry(montage_info->tile,number_images,&x_offset,&y, &sans,&sans); height=concatenate != MagickFalse ? max_height : extract_info.height; - y_offset+=(size_t) (height+(extract_info.y+border_width)*2+ + y_offset+=(size_t) (height+(extract_info.y+(ssize_t) border_width)*2+ (metrics.ascent-metrics.descent+4)*number_lines+ (montage_info->shadow != MagickFalse ? 4 : 0)); if (y_offset > (ssize_t) bounds.height) @@ -846,12 +846,12 @@ MagickExport Image *MontageImageList(const ImageInfo *image_info, (void) AnnotateImage(montage,draw_info); } } - x_offset+=width+(extract_info.x+border_width)*2; + x_offset+=width+(extract_info.x+(ssize_t) border_width)*2; if (((tile+1) == (ssize_t) tiles_per_page) || (((tile+1) % tiles_per_row) == 0)) { x_offset=extract_info.x; - y_offset+=(size_t) (height+(extract_info.y+border_width)*2+ + y_offset+=(size_t) (height+(extract_info.y+(ssize_t) border_width)*2+ (metrics.ascent-metrics.descent+4)*number_lines+ (montage_info->shadow != MagickFalse ? 4 : 0)); max_height=0; diff --git a/magick/morphology.c b/magick/morphology.c index 49073042f..52edcb0de 100644 --- a/magick/morphology.c +++ b/magick/morphology.c @@ -1474,7 +1474,7 @@ MagickExport KernelInfo *AcquireKernelBuiltIn(const KernelInfoType type, return(DestroyKernelInfo(kernel)); /* set all kernel values to scale given */ - u=(ssize_t) kernel->width*kernel->height; + u=(ssize_t) (kernel->width*kernel->height); for ( i=0; i < u; i++) kernel->values[i] = scale; kernel->minimum = kernel->maximum = scale; /* a flat shape */ @@ -3396,10 +3396,10 @@ static void RotateKernelInfo(KernelInfo *kernel, double angle) } /* rotate the origin - relative to center of array */ { register ssize_t x,y; - x = (ssize_t) kernel->x*2-kernel->width+1; - y = (ssize_t) kernel->y*2-kernel->height+1; - kernel->x = (size_t) ( -y +kernel->width-1)/2; - kernel->y = (size_t) ( +x +kernel->height-1)/2; + x = (ssize_t) (kernel->x*2-kernel->width+1); + y = (ssize_t) (kernel->y*2-kernel->height+1); + kernel->x = (size_t) ( -y +(ssize_t) kernel->width-1)/2; + kernel->y = (size_t) ( +x +(ssize_t) kernel->height-1)/2; } angle = fmod(angle+270.0, 360.0); /* angle reduced 90 degrees */ kernel->angle = fmod(kernel->angle+90.0, 360.0); diff --git a/magick/nt-feature.c b/magick/nt-feature.c index 5eb55d5f6..e5dd5188f 100644 --- a/magick/nt-feature.c +++ b/magick/nt-feature.c @@ -161,8 +161,8 @@ MagickExport void *CropImageToHBITMAP(Image *image, Initialize crop image attributes. */ bitmap.bmType = 0; - bitmap.bmWidth = page.width; - bitmap.bmHeight = page.height; + bitmap.bmWidth = (LONG) page.width; + bitmap.bmHeight = (LONG) page.height; bitmap.bmWidthBytes = bitmap.bmWidth * 4; bitmap.bmPlanes = 1; bitmap.bmBitsPixel = 32; @@ -198,7 +198,7 @@ MagickExport void *CropImageToHBITMAP(Image *image, x; /* Transfer pixels, scaling to Quantum */ - for( x=page.width ; x> 0 ; x-- ) + for( x=(ssize_t) page.width ; x> 0 ; x-- ) { q->rgbRed = ScaleQuantumToChar(GetRedPixelComponent(p)); q->rgbGreen = ScaleQuantumToChar(GetGreenPixelComponent(p)); @@ -612,8 +612,8 @@ MagickExport void *ImageToHBITMAP(Image *image) (void) ResetMagickMemory(&bitmap,0,sizeof(bitmap)); bitmap.bmType=0; - bitmap.bmWidth=image->columns; - bitmap.bmHeight=image->rows; + bitmap.bmWidth=(LONG) image->columns; + bitmap.bmHeight=(LONG) image->rows; bitmap.bmWidthBytes=4*bitmap.bmWidth; bitmap.bmPlanes=1; bitmap.bmBitsPixel=32; diff --git a/magick/pixel.h b/magick/pixel.h index 6d13b10a4..593ba128f 100644 --- a/magick/pixel.h +++ b/magick/pixel.h @@ -80,7 +80,7 @@ typedef struct _DoublePixelPacket typedef struct _LongPixelPacket { - unsigned long + size_t red, green, blue, diff --git a/magick/property.c b/magick/property.c index d7366f90b..4edb7c900 100644 --- a/magick/property.c +++ b/magick/property.c @@ -1280,7 +1280,7 @@ static MagickBooleanType GetEXIFProperty(const Image *image, format; q=(unsigned char *) (directory+2+(12*entry)); - tag_value=(ssize_t) ReadPropertyShort(endian,q)+tag_offset; + tag_value=(ssize_t) (ReadPropertyShort(endian,q)+tag_offset); format=(size_t) ReadPropertyShort(endian,q+2); if (format >= (sizeof(tag_bytes)/sizeof(*tag_bytes))) break; diff --git a/magick/quantize.c b/magick/quantize.c index 3ea9a1158..45c7ab159 100644 --- a/magick/quantize.c +++ b/magick/quantize.c @@ -2180,6 +2180,7 @@ MagickExport MagickBooleanType PosterizeImage(Image *image, j, k, l, + length, n; MagickBooleanType @@ -2205,7 +2206,8 @@ MagickExport MagickBooleanType PosterizeImage(Image *image, if (posterize_image == (Image *) NULL) return(MagickFalse); l=1; - while ((l*l*l) < (ssize_t) MagickMin((ssize_t) levels*levels*levels,MaxColormapSize+1)) + length=levels*levels*levels; + while ((l*l*l) < (ssize_t) MagickMin((ssize_t) length,MaxColormapSize+1)) l++; status=SetImageExtent(posterize_image,(size_t) (l*l*l),1); if (status == MagickFalse) diff --git a/magick/quantum-export.c b/magick/quantum-export.c index 6d2fb6c79..9b2eacd92 100644 --- a/magick/quantum-export.c +++ b/magick/quantum-export.c @@ -188,7 +188,7 @@ static inline unsigned char *PopQuantumPixel(QuantumState *quantum_state, quantum_bits=(size_t) i; if (quantum_bits > quantum_state->bits) quantum_bits=quantum_state->bits; - i-=quantum_bits; + i-=(ssize_t) quantum_bits; if (quantum_state->bits == 8) *pixels='\0'; quantum_state->bits-=quantum_bits; @@ -221,7 +221,7 @@ static inline unsigned char *PopQuantumLongPixel(QuantumState *quantum_state, quantum_bits=quantum_state->bits; quantum_state->pixel|=(((pixel >> (depth-i)) & quantum_state->mask[quantum_bits]) << (32UL-quantum_state->bits)); - i-=quantum_bits; + i-=(ssize_t) quantum_bits; quantum_state->bits-=quantum_bits; if (quantum_state->bits == 0U) { diff --git a/magick/quantum-import.c b/magick/quantum-import.c index 06a0097b3..4722c422c 100644 --- a/magick/quantum-import.c +++ b/magick/quantum-import.c @@ -212,7 +212,7 @@ static inline const unsigned char *PushQuantumPixel( quantum_bits=(size_t) i; if (quantum_bits > quantum_state->bits) quantum_bits=quantum_state->bits; - i-=quantum_bits; + i-=(ssize_t) quantum_bits; quantum_state->bits-=quantum_bits; *quantum=(*quantum << quantum_bits) | ((quantum_state->pixel >> quantum_state->bits) &~ ((~0UL) << quantum_bits)); @@ -244,7 +244,7 @@ static inline const unsigned char *PushQuantumLongPixel( quantum_bits=quantum_state->bits; *quantum|=(((quantum_state->pixel >> (32UL-quantum_state->bits)) & quantum_state->mask[quantum_bits]) << (depth-i)); - i-=quantum_bits; + i-=(ssize_t) quantum_bits; quantum_state->bits-=quantum_bits; } return(pixels); diff --git a/magick/resample.c b/magick/resample.c index 14087417e..361bbe2ec 100644 --- a/magick/resample.c +++ b/magick/resample.c @@ -191,8 +191,8 @@ MagickExport ResampleFilter *AcquireResampleFilter(const Image *image, resample_filter->debug=IsEventLogging(); resample_filter->signature=MagickSignature; - resample_filter->image_area = (ssize_t) resample_filter->image->columns * - resample_filter->image->rows; + resample_filter->image_area=(ssize_t) (resample_filter->image->columns* + resample_filter->image->rows); resample_filter->average_defined = MagickFalse; /* initialise the resampling filter settings */ diff --git a/magick/shear.c b/magick/shear.c index 447cf3276..9d560e849 100644 --- a/magick/shear.c +++ b/magick/shear.c @@ -590,7 +590,7 @@ static void RadonProjection(RadonInfo *source_cells, q=destination_cells; for (step=1; step < p->width; step*=2) { - for (x=0; x < (ssize_t) p->width; x+=2*step) + for (x=0; x < (ssize_t) p->width; x+=2*(ssize_t) step) { ssize_t y; @@ -606,13 +606,16 @@ static void RadonProjection(RadonInfo *source_cells, for (y=0; y < (ssize_t) (p->height-i-1); y++) { cell=GetRadonCell(p,x+i,y); - (void) SetRadonCell(q,x+2*i,y,cell+GetRadonCell(p,x+i+step,y+i)); - (void) SetRadonCell(q,x+2*i+1,y,cell+GetRadonCell(p,x+i+step,y+i+1)); + (void) SetRadonCell(q,x+2*i,y,cell+GetRadonCell(p,x+i+(ssize_t) + step,y+i)); + (void) SetRadonCell(q,x+2*i+1,y,cell+GetRadonCell(p,x+i+(ssize_t) + step,y+i+1)); } for ( ; y < (ssize_t) (p->height-i); y++) { cell=GetRadonCell(p,x+i,y); - (void) SetRadonCell(q,x+2*i,y,cell+GetRadonCell(p,x+i+step,y+i)); + (void) SetRadonCell(q,x+2*i,y,cell+GetRadonCell(p,x+i+(ssize_t) step, + y+i)); (void) SetRadonCell(q,x+2*i+1,y,cell); } for ( ; y < (ssize_t) p->height; y++) @@ -1081,14 +1084,14 @@ static Image *IntegralRotateImage(const Image *image,size_t rotations, #if defined(MAGICKCORE_OPENMP_SUPPORT) && defined(MAGICKCORE_FUTURE) #pragma omp parallel for schedule(dynamic,4) shared(progress, status) #endif - for (tile_y=0; tile_y < (ssize_t) image->rows; tile_y+=tile_height) + for (tile_y=0; tile_y < (ssize_t) image->rows; tile_y+=(ssize_t) tile_height) { register ssize_t tile_x; if (status == MagickFalse) continue; - for (tile_x=0; tile_x < (ssize_t) image->columns; tile_x+=tile_width) + for (tile_x=0; tile_x < (ssize_t) image->columns; tile_x+=(ssize_t) tile_width) { MagickBooleanType sync; @@ -1137,7 +1140,7 @@ static Image *IntegralRotateImage(const Image *image,size_t rotations, x; q=QueueCacheViewAuthenticPixels(rotate_view,(ssize_t) - rotate_image->columns-(tile_y+height),y+tile_x,height, + (rotate_image->columns-(tile_y+height)),y+tile_x,height, 1,exception); if (q == (PixelPacket *) NULL) { @@ -1272,14 +1275,14 @@ static Image *IntegralRotateImage(const Image *image,size_t rotations, #if defined(MAGICKCORE_OPENMP_SUPPORT) && defined(MAGICKCORE_FUTURE) #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif - for (tile_y=0; tile_y < (ssize_t) image->rows; tile_y+=tile_height) + for (tile_y=0; tile_y < (ssize_t) image->rows; tile_y+=(ssize_t) tile_height) { register ssize_t tile_x; if (status == MagickFalse) continue; - for (tile_x=0; tile_x < (ssize_t) image->columns; tile_x+=tile_width) + for (tile_x=0; tile_x < (ssize_t) image->columns; tile_x+=(ssize_t) tile_width) { MagickBooleanType sync; @@ -1328,7 +1331,7 @@ static Image *IntegralRotateImage(const Image *image,size_t rotations, x; q=QueueCacheViewAuthenticPixels(rotate_view,tile_y,(ssize_t) - y+rotate_image->rows-(tile_x+width),height,1,exception); + (y+rotate_image->rows-(tile_x+width)),height,1,exception); if (q == (PixelPacket *) NULL) { status=MagickFalse; @@ -1958,22 +1961,22 @@ MagickExport Image *RotateImage(const Image *image,const double degrees, /* Rotate the image. */ - status=XShearImage(rotate_image,shear.x,width,height,x_offset,((ssize_t) - rotate_image->rows-height)/2,exception); + status=XShearImage(rotate_image,shear.x,width,height,x_offset,(ssize_t) + (rotate_image->rows-height)/2,exception); if (status == MagickFalse) { rotate_image=DestroyImage(rotate_image); return((Image *) NULL); } - status=YShearImage(rotate_image,shear.y,y_width,height,((ssize_t) - rotate_image->columns-y_width)/2,y_offset,exception); + status=YShearImage(rotate_image,shear.y,y_width,height,(ssize_t) + (rotate_image->columns-y_width)/2,y_offset,exception); if (status == MagickFalse) { rotate_image=DestroyImage(rotate_image); return((Image *) NULL); } - status=XShearImage(rotate_image,shear.x,y_width,rotate_image->rows,((ssize_t) - rotate_image->columns-y_width)/2,0,exception); + status=XShearImage(rotate_image,shear.x,y_width,rotate_image->rows,(ssize_t) + (rotate_image->columns-y_width)/2,0,exception); if (status == MagickFalse) { rotate_image=DestroyImage(rotate_image); @@ -2107,14 +2110,14 @@ MagickExport Image *ShearImage(const Image *image,const double x_shear, if (shear_image->matte == MagickFalse) (void) SetImageAlphaChannel(shear_image,OpaqueAlphaChannel); status=XShearImage(shear_image,shear.x,image->columns,image->rows,x_offset, - ((ssize_t) shear_image->rows-image->rows)/2,exception); + (ssize_t) (shear_image->rows-image->rows)/2,exception); if (status == MagickFalse) { shear_image=DestroyImage(shear_image); return((Image *) NULL); } - status=YShearImage(shear_image,shear.y,y_width,image->rows,((ssize_t) - shear_image->columns-y_width)/2,y_offset,exception); + status=YShearImage(shear_image,shear.y,y_width,image->rows,(ssize_t) + (shear_image->columns-y_width)/2,y_offset,exception); if (status == MagickFalse) { shear_image=DestroyImage(shear_image); diff --git a/magick/thread-private.h b/magick/thread-private.h index 4b4bff077..58be557e6 100644 --- a/magick/thread-private.h +++ b/magick/thread-private.h @@ -117,7 +117,7 @@ static inline ssize_t GetOpenMPThreadId(void) #endif } -static inline void SetOpenMPMaximumThreads(const size_t threads) +static inline void SetOpenMPMaximumThreads(const int threads) { #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) omp_set_num_threads(threads); diff --git a/magick/transform.c b/magick/transform.c index 86ec54276..33f80ef28 100644 --- a/magick/transform.c +++ b/magick/transform.c @@ -212,7 +212,7 @@ MagickExport Image *ChopImage(const Image *image,const RectangleInfo *chop_info, /* Extract chop image. */ - i+=extent.height; + i+=(ssize_t) extent.height; for (y=0; y < (ssize_t) (image->rows-(extent.y+extent.height)); y++) { register const PixelPacket @@ -1221,13 +1221,13 @@ MagickExport Image *RollImage(const Image *image,const ssize_t x_offset, offset.x=x_offset; offset.y=y_offset; while (offset.x < 0) - offset.x+=image->columns; + offset.x+=(ssize_t) image->columns; while (offset.x >= (ssize_t) image->columns) - offset.x-=image->columns; + offset.x-=(ssize_t) image->columns; while (offset.y < 0) - offset.y+=image->rows; + offset.y+=(ssize_t) image->rows; while (offset.y >= (ssize_t) image->rows) - offset.y-=image->rows; + offset.y-=(ssize_t) image->rows; /* Roll image. */ @@ -1311,8 +1311,8 @@ MagickExport Image *ShaveImage(const Image *image, return((Image *) NULL); shave_image->page.width-=2*shave_info->width; shave_image->page.height-=2*shave_info->height; - shave_image->page.x-=shave_info->width; - shave_image->page.y-=shave_info->height; + shave_image->page.x-=(ssize_t) shave_info->width; + shave_image->page.y-=(ssize_t) shave_info->height; return(shave_image); } @@ -1406,47 +1406,47 @@ MagickExport Image *SpliceImage(const Image *image, break; case NorthGravity: { - splice_geometry.x+=splice_geometry.width/2; + splice_geometry.x+=(ssize_t) splice_geometry.width/2; break; } case NorthEastGravity: { - splice_geometry.x+=splice_geometry.width; + splice_geometry.x+=(ssize_t) splice_geometry.width; break; } case WestGravity: { - splice_geometry.y+=splice_geometry.width/2; + splice_geometry.y+=(ssize_t) splice_geometry.width/2; break; } case StaticGravity: case CenterGravity: { - splice_geometry.x+=splice_geometry.width/2; - splice_geometry.y+=splice_geometry.height/2; + splice_geometry.x+=(ssize_t) splice_geometry.width/2; + splice_geometry.y+=(ssize_t) splice_geometry.height/2; break; } case EastGravity: { - splice_geometry.x+=splice_geometry.width; - splice_geometry.y+=splice_geometry.height/2; + splice_geometry.x+=(ssize_t) splice_geometry.width; + splice_geometry.y+=(ssize_t) splice_geometry.height/2; break; } case SouthWestGravity: { - splice_geometry.y+=splice_geometry.height; + splice_geometry.y+=(ssize_t) splice_geometry.height; break; } case SouthGravity: { - splice_geometry.x+=splice_geometry.width/2; - splice_geometry.y+=splice_geometry.height; + splice_geometry.x+=(ssize_t) splice_geometry.width/2; + splice_geometry.y+=(ssize_t) splice_geometry.height; break; } case SouthEastGravity: { - splice_geometry.x+=splice_geometry.width; - splice_geometry.y+=splice_geometry.height; + splice_geometry.x+=(ssize_t) splice_geometry.width; + splice_geometry.y+=(ssize_t) splice_geometry.height; break; } } @@ -1555,7 +1555,7 @@ MagickExport Image *SpliceImage(const Image *image, if (status == MagickFalse) continue; - p=GetCacheViewVirtualPixels(image_view,0,y-splice_geometry.height, + p=GetCacheViewVirtualPixels(image_view,0,y-(ssize_t) splice_geometry.height, image->columns,1,exception); q=QueueCacheViewAuthenticPixels(splice_view,0,y,splice_image->columns,1, exception); @@ -1830,12 +1830,12 @@ MagickExport MagickBooleanType TransformImage(Image **image, proceed=MagickTrue; i=0; number_images=0; - for (y=0; y < (ssize_t) transform_image->page.height; y+=height) - for (x=0; x < (ssize_t) transform_image->page.width; x+=width) + for (y=0; y < (ssize_t) transform_image->page.height; y+=(ssize_t) height) + for (x=0; x < (ssize_t) transform_image->page.width; x+=(ssize_t) width) number_images++; - for (y=0; y < (ssize_t) transform_image->page.height; y+=height) + for (y=0; y < (ssize_t) transform_image->page.height; y+=(ssize_t) height) { - for (x=0; x < (ssize_t) transform_image->page.width; x+=width) + for (x=0; x < (ssize_t) transform_image->page.width; x+=(ssize_t) width) { progress_monitor=SetImageProgressMonitor(transform_image, (MagickProgressMonitor) NULL,transform_image->client_data); diff --git a/magick/utility.c b/magick/utility.c index 80338c538..b83d45d7a 100644 --- a/magick/utility.c +++ b/magick/utility.c @@ -930,7 +930,7 @@ MagickExport MagickBooleanType GetExecutionPath(char *path,const size_t extent) *cwd; *path='\0'; - cwd=getcwd(path,(size_t) extent); + cwd=getcwd(path,(unsigned long) extent); #if defined(MAGICKCORE_HAVE_GETPID) && defined(MAGICKCORE_HAVE_READLINK) && defined(PATH_MAX) { char diff --git a/wand/composite.c b/wand/composite.c index 557c10ef3..f2644a41b 100644 --- a/wand/composite.c +++ b/wand/composite.c @@ -187,8 +187,8 @@ static MagickBooleanType CompositeImageList(ImageInfo *image_info,Image **image, (void) SetImageArtifact(composite_image,"compose:outside-overlay", "false"); columns=composite_image->columns; - for (y=0; y < (ssize_t) (*image)->rows; y+=composite_image->rows) - for (x=0; x < (ssize_t) (*image)->columns; x+=columns) + for (y=0; y < (ssize_t) (*image)->rows; y+=(ssize_t) composite_image->rows) + for (x=0; x < (ssize_t) (*image)->columns; x+=(ssize_t) columns) status&=CompositeImageChannel(*image, composite_options->channel,composite_options->compose, composite_image,x,y); diff --git a/www/ImageMagickObject.html b/www/ImageMagickObject.html index fa0321296..645b5f54c 100644 --- a/www/ImageMagickObject.html +++ b/www/ImageMagickObject.html @@ -143,7 +143,7 @@ Druckerei Online diff --git a/www/advanced-unix-installation.html b/www/advanced-unix-installation.html index 631caf73b..2c656e63f 100644 --- a/www/advanced-unix-installation.html +++ b/www/advanced-unix-installation.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/advanced-windows-installation.html b/www/advanced-windows-installation.html index 1f0c89684..8b0bbe301 100644 --- a/www/advanced-windows-installation.html +++ b/www/advanced-windows-installation.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/animate.html b/www/animate.html index d7b40bdac..e035f0619 100644 --- a/www/animate.html +++ b/www/animate.html @@ -143,7 +143,7 @@ Druckerei Online @@ -612,7 +612,7 @@ transparent, extract, background, or shape the alpha channel Discourse Server • - Studio + Studio   diff --git a/www/api.html b/www/api.html index e3c7186a5..cbed94ed9 100644 --- a/www/api.html +++ b/www/api.html @@ -141,6 +141,9 @@ + @@ -157,7 +160,7 @@

Ada

-

G2F implements an Ada 95 binding to a subset of the low-level MagickCore library.

+

G2F implements an Ada 95 binding to a subset of the low-level MagickCore library.

C

@@ -169,7 +172,7 @@

Ch

-

ChMagick is a Ch binding to the MagickCore and MagickWand API. Ch is an embeddable C/C++ interpreter for cross-platform scripting.

+

ChMagick is a Ch binding to the MagickCore and MagickWand API. Ch is an embeddable C/C++ interpreter for cross-platform scripting.

COM+

@@ -181,31 +184,31 @@

C++

-

Magick++ provides an object-oriented C++ interface to ImageMagick. See A Gentle Introduction to Magick++ for an introductory tutorial to Magick++. We include the source if you want to correct, enhance, or expand the tutorial.

+

Magick++ provides an object-oriented C++ interface to ImageMagick. See A Gentle Introduction to Magick++ for an introductory tutorial to Magick++. We include the source if you want to correct, enhance, or expand the tutorial.

Java

-

JMagick provides an object-oriented Java interface to ImageMagick. Im4java is a pure-java interface to the ImageMagick command-line.

+

JMagick provides an object-oriented Java interface to ImageMagick. Im4java is a pure-java interface to the ImageMagick command-line.

LabVIEW

-

LVOOP ImageMagick is an object-oriented LabVIEW interface to ImageMagick.

+

LVOOP ImageMagick is an object-oriented LabVIEW interface to ImageMagick.

Lisp

-

CL-Magick provides a Common Lisp interface to the ImageMagick library.

+

CL-Magick provides a Common Lisp interface to the ImageMagick library.

Neko

-

NMagick is a port of the ImageMagick library to the haXe and Neko platforms. It provides image manipulation capabilities to both web and desktop applications using Neko.

+

NMagick is a port of the ImageMagick library to the haXe and Neko platforms. It provides image manipulation capabilities to both web and desktop applications using Neko.

.NET

@@ -219,7 +222,7 @@

Pascal

-

PascalMagick a Pascal binding for the MagickWand API and also the low-level MagickCore library. It works with Free Pascal / Lazarus and Delphi.

+

PascalMagick a Pascal binding for the MagickWand API and also the low-level MagickCore library. It works with Free Pascal / Lazarus and Delphi.

Perl

@@ -231,50 +234,50 @@

PHP

-

MagickWand for PHP a native PHP-extension to the ImageMagick MagickWand API.

+

MagickWand for PHP a native PHP-extension to the ImageMagick MagickWand API.

-

IMagick is a native PHP extension to create and modify images using the ImageMagick API. Documentation for the extension is available here.

+

IMagick is a native PHP extension to create and modify images using the ImageMagick API. Documentation for the extension is available here.

-

phMagick is a wrapper class for ImageMagick, wrapping the most common web image manipulation actions in easy to use functions, but allowing full access to ImageMagick's power by issuing system calls to it's command-line programs.

+

phMagick is a wrapper class for ImageMagick, wrapping the most common web image manipulation actions in easy to use functions, but allowing full access to ImageMagick's power by issuing system calls to it's command-line programs.

Python

-

PythonMagickWand is an object-oriented Python interface to MagickWand based on ctypes.

+

PythonMagickWand is an object-oriented Python interface to MagickWand based on ctypes.

-

PythonMagick is an object-oriented Python interface to ImageMagick.

+

PythonMagick is an object-oriented Python interface to ImageMagick.

REALbasic

-

The MBS Realbasic ImageMagick is a plugin that utilizes the power of ImageMagick from within the RealBasic environment.

+

The MBS Realbasic ImageMagick is a plugin that utilizes the power of ImageMagick from within the RealBasic environment.

Ruby

-

RMagick is an interface between the Ruby programming language and the MagickCore image processing libraries. Get started with RMagick by perusing the documentation.

+

RMagick is an interface between the Ruby programming language and the MagickCore image processing libraries. Get started with RMagick by perusing the documentation.

-

MagickWand for Ruby is an interface between the Ruby programming language and the MagickWand image processing libraries. Get started with MagickWand for PHP by perusing the documentation.

+

MagickWand for Ruby is an interface between the Ruby programming language and the MagickWand image processing libraries. Get started with MagickWand for PHP by perusing the documentation.

-

MiniMagick is a Ruby wrapper for ImageMagick command line. MiniMagick gives you convenient access to all the command line options ImageMagick supports.

+

MiniMagick is a Ruby wrapper for ImageMagick command line. MiniMagick gives you convenient access to all the command line options ImageMagick supports.

-

QuickMagick is a gem for easily accessing ImageMagick command line tools from Ruby programs.

+

QuickMagick is a gem for easily accessing ImageMagick command line tools from Ruby programs.

Tcl/Tk

-

TclMagick a native Tcl-extension to the ImageMagick MagickWand API.

+

TclMagick a native Tcl-extension to the ImageMagick MagickWand API.

XML RPC

-

RemoteMagick is an XML-RPC web service that creates image thumbnails.

+

RemoteMagick is an XML-RPC web service that creates image thumbnails.

diff --git a/www/api/animate.html b/www/api/animate.html index 40a4eda58..6b4f0f293 100644 --- a/www/api/animate.html +++ b/www/api/animate.html @@ -142,7 +142,7 @@ Druckerei Online @@ -183,7 +183,7 @@ _8c.html" target="source" name="AnimateImages">AnimateImages Discourse Server • - Studio + Studio   diff --git a/www/api/annotate.html b/www/api/annotate.html index 7a3bcd4a1..9739aa9ba 100644 --- a/www/api/annotate.html +++ b/www/api/annotate.html @@ -142,7 +142,7 @@ Druckerei Online @@ -322,7 +322,7 @@ _8c.html" target="source" name="GetTypeMetrics">GetTypeMetrics Discourse Server • - Studio + Studio   diff --git a/www/api/attribute.html b/www/api/attribute.html index fff56ef99..f8b2f1cbb 100644 --- a/www/api/attribute.html +++ b/www/api/attribute.html @@ -142,7 +142,7 @@ Druckerei Online @@ -330,7 +330,7 @@ _8c.html" target="source" name="SetImageChannelDepth">SetImageChannelDepth  --> Discourse Server • - Studio + Studio   diff --git a/www/api/blob.html b/www/api/blob.html index 73e410c6f..a3d0b67ea 100644 --- a/www/api/blob.html +++ b/www/api/blob.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/cache-view.html b/www/api/cache-view.html index c781c02ea..3751e456c 100644 --- a/www/api/cache-view.html +++ b/www/api/cache-view.html @@ -142,7 +142,7 @@ Druckerei Online @@ -576,7 +576,7 @@ _8c.html" target="source" name="SyncCacheViewAuthenticPixels">SyncCacheViewAuthe Discourse Server • - Studio + Studio   diff --git a/www/api/cache.html b/www/api/cache.html index d8ce27e52..89a8d364e 100644 --- a/www/api/cache.html +++ b/www/api/cache.html @@ -142,7 +142,7 @@ Druckerei Online @@ -221,8 +221,8 @@ _8c.html" target="source" name="GetAuthenticPixels">GetAuthenticPixels

The format of the GetAuthenticPixels() method is:

-  PixelPacket *GetAuthenticPixels(Image *image,const ssize_t x,const ssize_t y,
-    const size_t columns,const size_t rows,
+  PixelPacket *GetAuthenticPixels(Image *image,const ssize_t x,
+    const ssize_t y,const size_t columns,const size_t rows,
     ExceptionInfo *exception)
@@ -444,8 +444,8 @@ _8c.html" target="source" name="QueueAuthenticPixels">QueueAuthenticPixelsThe format of the QueueAuthenticPixels() method is:

-  PixelPacket *QueueAuthenticPixels(Image *image,const ssize_t x,const ssize_t y,
-    const size_t columns,const size_t rows,
+  PixelPacket *QueueAuthenticPixels(Image *image,const ssize_t x,
+    const ssize_t y,const size_t columns,const size_t rows,
     ExceptionInfo *exception)
diff --git a/www/api/color.html b/www/api/color.html index 05ec67aab..c7ba41baa 100644 --- a/www/api/color.html +++ b/www/api/color.html @@ -142,7 +142,7 @@ Druckerei Online @@ -368,7 +368,7 @@ _8c.html" target="source" name="QueryMagickColorname">QueryMagickColorname  --> Discourse Server • - Studio + Studio   diff --git a/www/api/compare.html b/www/api/compare.html index 74cf34a8c..b075bed86 100644 --- a/www/api/compare.html +++ b/www/api/compare.html @@ -325,7 +325,7 @@ _8c.html" target="source" name="SimilarityImage">SimilarityImage Discourse Server • - Studio + Studio   diff --git a/www/api/composite.html b/www/api/composite.html index 4671038b5..cebad0b97 100644 --- a/www/api/composite.html +++ b/www/api/composite.html @@ -142,7 +142,7 @@ Druckerei Online @@ -232,7 +232,7 @@ _8c.html" target="source" name="TextureImage">TextureImage Discourse Server • - Studio + Studio   diff --git a/www/api/constitute.html b/www/api/constitute.html index be0917001..e3f22c3d7 100644 --- a/www/api/constitute.html +++ b/www/api/constitute.html @@ -142,7 +142,7 @@ Druckerei Online @@ -167,9 +167,9 @@ _8c.html" target="source" name="ConstituteImage">ConstituteImage

The format of the ConstituteImage method is:

-  Image *ConstituteImage(const size_t columns,
-    const size_t rows,const char *map,const StorageType storage,
-    const void *pixels,ExceptionInfo *exception)
+  Image *ConstituteImage(const size_t columns,const size_t rows,
+    const char *map,const StorageType storage,const void *pixels,
+    ExceptionInfo *exception)

A description of each parameter follows:

@@ -333,7 +333,7 @@ _8c.html" target="source" name="WriteImages">WriteImages Discourse Server • - Studio + Studio   diff --git a/www/api/decorate.html b/www/api/decorate.html index c44181226..479481981 100644 --- a/www/api/decorate.html +++ b/www/api/decorate.html @@ -142,7 +142,7 @@ Druckerei Online @@ -236,7 +236,7 @@ _8c.html" target="source" name="RaiseImage">RaiseImage Discourse Server • - Studio + Studio   diff --git a/www/api/deprecate.html b/www/api/deprecate.html index 980a6844f..de47494f8 100644 --- a/www/api/deprecate.html +++ b/www/api/deprecate.html @@ -142,7 +142,7 @@ Druckerei Online @@ -3144,7 +3144,7 @@ _8c.html" target="source" name="UnshiftImageList">UnshiftImageList Discourse Server • - Studio + Studio   diff --git a/www/api/distort.html b/www/api/distort.html index 3b1629866..1adca25aa 100644 --- a/www/api/distort.html +++ b/www/api/distort.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/draw.html b/www/api/draw.html index c94030225..a48f42ddb 100644 --- a/www/api/draw.html +++ b/www/api/draw.html @@ -378,7 +378,7 @@ _8c.html" target="source" name="GetAffineMatrix">GetAffineMatrix Discourse Server • - Studio + Studio   diff --git a/www/api/drawing-wand.html b/www/api/drawing-wand.html index 61e857610..1eae07d14 100644 --- a/www/api/drawing-wand.html +++ b/www/api/drawing-wand.html @@ -142,7 +142,7 @@ Druckerei Online @@ -3067,7 +3067,7 @@ _8c.html" target="source" name="PushDrawingWand">PushDrawingWand Discourse Server • - Studio + Studio   diff --git a/www/api/effect.html b/www/api/effect.html index 84839e99f..93669b2f3 100644 --- a/www/api/effect.html +++ b/www/api/effect.html @@ -142,7 +142,7 @@ Druckerei Online @@ -491,7 +491,7 @@ _8c.html" target="source" name="MotionBlurImage">MotionBlurImage

    the standard deviation of the Gaussian, in pixels.

angle
-

    Apply the effect assize_t this angle.

+

    Apply the effect along this angle.

exception

    return any errors or warnings in this structure.

@@ -752,7 +752,7 @@ _8c.html" target="source" name="UnsharpMaskImage">UnsharpMaskImage Discourse Server • - Studio + Studio   diff --git a/www/api/enhance.html b/www/api/enhance.html index 75af7a162..ed22ba226 100644 --- a/www/api/enhance.html +++ b/www/api/enhance.html @@ -271,7 +271,7 @@ _8c.html" target="source" name="ColorDecisionListImage">ColorDecisionListImageClutImage
-

ClutImage() replaces each color value in the given image, by using it as an index to lookup a replacement color value in a Color Look UP Table in the form of an image. The values are extracted assize_t a diagonal of the CLUT image so either a horizontal or vertial gradient image can be used.

+

ClutImage() replaces each color value in the given image, by using it as an index to lookup a replacement color value in a Color Look UP Table in the form of an image. The values are extracted along a diagonal of the CLUT image so either a horizontal or vertial gradient image can be used.

Typically this is used to either re-color a gray-scale image according to a color gradient in the CLUT image, or to perform a freeform histogram (level) adjustment according to the (typically gray-scale) gradient in the CLUT image.

diff --git a/www/api/exception.html b/www/api/exception.html index e17678f3d..a198306d5 100644 --- a/www/api/exception.html +++ b/www/api/exception.html @@ -142,7 +142,7 @@ Druckerei Online
diff --git a/www/api/feature.html b/www/api/feature.html index 93c58d23d..cc074a2e6 100644 --- a/www/api/feature.html +++ b/www/api/feature.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/fx.html b/www/api/fx.html index d4b5c3909..946cf3766 100644 --- a/www/api/fx.html +++ b/www/api/fx.html @@ -423,7 +423,7 @@ _8c.html" target="source" name="PolaroidImage">PolaroidImage

    the draw info.

angle
-

    Apply the effect assize_t this angle.

+

    Apply the effect along this angle.

exception

    return any errors or warnings in this structure.

@@ -514,7 +514,7 @@ _8c.html" target="source" name="SketchImage">SketchImage

    the standard deviation of the Gaussian, in pixels.

angle
-

    Apply the effect assize_t this angle.

+

    Apply the effect along this angle.

exception

    return any errors or warnings in this structure.

@@ -689,7 +689,7 @@ _8c.html" target="source" name="VignetteImage">VignetteImage _8c.html" target="source" name="WaveImage">WaveImage
-

WaveImage() creates a "ripple" effect in the image by shifting the pixels vertically assize_t a sine wave whose amplitude and wavelength is specified by the given parameters.

+

WaveImage() creates a "ripple" effect in the image by shifting the pixels vertically along a sine wave whose amplitude and wavelength is specified by the given parameters.

The format of the WaveImage method is:

@@ -717,7 +717,7 @@ _8c.html" target="source" name="WaveImage">WaveImage Discourse Server • - Studio + Studio  
diff --git a/www/api/histogram.html b/www/api/histogram.html index 228661a93..7c521182e 100644 --- a/www/api/histogram.html +++ b/www/api/histogram.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/image.html b/www/api/image.html index b12e86cf3..0ae38186c 100644 --- a/www/api/image.html +++ b/www/api/image.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/layer.html b/www/api/layer.html index 3b686e663..39d8e503e 100644 --- a/www/api/layer.html +++ b/www/api/layer.html @@ -142,7 +142,7 @@ Druckerei Online @@ -447,7 +447,7 @@ _8c.html" target="source" name="MergeImageLayers">MergeImageLayers Discourse Server • - Studio + Studio   diff --git a/www/api/list.html b/www/api/list.html index a47032943..c4f452aaf 100644 --- a/www/api/list.html +++ b/www/api/list.html @@ -142,7 +142,7 @@ Druckerei Online @@ -645,7 +645,7 @@ _8c.html" target="source" name="SplitImageList">SplitImageList Discourse Server • - Studio + Studio   diff --git a/www/api/magick-deprecate.html b/www/api/magick-deprecate.html index 596a98d34..483eac3c4 100644 --- a/www/api/magick-deprecate.html +++ b/www/api/magick-deprecate.html @@ -142,7 +142,7 @@ Druckerei Online @@ -176,7 +176,7 @@ _8c.html" target="source" name="MagickAverageImages">MagickAverageImagesMagickClipPathImage
-

MagickClipPathImage() clips assize_t the named paths from the 8BIM profile, if present. Later operations take effect inside the path. Id may be a number if preceded with #, to work on a numbered path, e.g., "#1" to use the first path.

+

MagickClipPathImage() clips along the named paths from the 8BIM profile, if present. Later operations take effect inside the path. Id may be a number if preceded with #, to work on a numbered path, e.g., "#1" to use the first path.

The format of the MagickClipPathImage method is:

diff --git a/www/api/magick-image.html b/www/api/magick-image.html index b271641be..b117da9ee 100644 --- a/www/api/magick-image.html +++ b/www/api/magick-image.html @@ -142,7 +142,7 @@ Druckerei Online
@@ -696,7 +696,7 @@ _8c.html" target="source" name="MagickClampImage">MagickClampImage _8c.html" target="source" name="MagickClipImage">MagickClipImage
-

MagickClipImage() clips assize_t the first path from the 8BIM profile, if present.

+

MagickClipImage() clips along the first path from the 8BIM profile, if present.

The format of the MagickClipImage method is:

@@ -714,7 +714,7 @@ _8c.html" target="source" name="MagickClipImage">MagickClipImage _8c.html" target="source" name="MagickClipImagePath">MagickClipImagePath
-

MagickClipImagePath() clips assize_t the named paths from the 8BIM profile, if present. Later operations take effect inside the path. Id may be a number if preceded with #, to work on a numbered path, e.g., "#1" to use the first path.

+

MagickClipImagePath() clips along the named paths from the 8BIM profile, if present. Later operations take effect inside the path. Id may be a number if preceded with #, to work on a numbered path, e.g., "#1" to use the first path.

The format of the MagickClipImagePath method is:

@@ -3630,7 +3630,7 @@ _8c.html" target="source" name="MagickMotionBlurImage">MagickMotionBlurImage

    the standard deviation of the Gaussian, in pixels.

angle
-

    Apply the effect assize_t this angle.

+

    Apply the effect along this angle.

MagickPolaroidImage

the draw wand.

angle
-

    Apply the effect assize_t this angle.

+

    Apply the effect along this angle.

MagickQuantizeImage

Normally, this integer value is zero or one. A zero or one tells Quantize to choose a optimal tree depth of Log4(number_colors). A tree of this depth generally allows the best representation of the reference image with the least amount of memory and the fastest computational speed. In some cases, such as an image with low color dispersion (a few number of colors), a value other than Log4(number_colors) is required. To expand the color tree completely, use a value of 8.

dither
-

    A value other than zero distributes the difference between an original image and the corresponding color reduced image to neighboring pixels assize_t a Hilbert curve.

+

    A value other than zero distributes the difference between an original image and the corresponding color reduced image to neighboring pixels along a Hilbert curve.

measure_error

    A value other than zero measures the difference between the original and quantized images. This difference is the total quantization error. The error is computed by summing over all pixels in an image the distance squared in RGB space between each reference pixel value and its quantized value.

@@ -4068,7 +4068,7 @@ _8c.html" target="source" name="MagickQuantizeImages">MagickQuantizeImages

Normally, this integer value is zero or one. A zero or one tells Quantize to choose a optimal tree depth of Log4(number_colors). A tree of this depth generally allows the best representation of the reference image with the least amount of memory and the fastest computational speed. In some cases, such as an image with low color dispersion (a few number of colors), a value other than Log4(number_colors) is required. To expand the color tree completely, use a value of 8.

dither
-

    A value other than zero distributes the difference between an original image and the corresponding color reduced algorithm to neighboring pixels assize_t a Hilbert curve.

+

    A value other than zero distributes the difference between an original image and the corresponding color reduced algorithm to neighboring pixels along a Hilbert curve.

measure_error

    A value other than zero measures the difference between the original and quantized images. This difference is the total quantization error. The error is computed by summing over all pixels in an image the distance squared in RGB space between each reference pixel value and its quantized value.

@@ -5690,7 +5690,7 @@ _8c.html" target="source" name="MagickShaveImage">MagickShaveImage _8c.html" target="source" name="MagickShearImage">MagickShearImage
-

MagickShearImage() slides one edge of an image assize_t the X or Y axis, creating a parallelogram. An X direction shear slides an edge assize_t the X axis, while a Y direction shear slides an edge assize_t the Y axis. The amount of the shear is controlled by a shear angle. For X direction shears, x_shear is measured relative to the Y axis, and similarly, for Y direction shears y_shear is measured relative to the X axis. Empty triangles left over from shearing the image are filled with the background color.

+

MagickShearImage() slides one edge of an image along the X or Y axis, creating a parallelogram. An X direction shear slides an edge along the X axis, while a Y direction shear slides an edge along the Y axis. The amount of the shear is controlled by a shear angle. For X direction shears, x_shear is measured relative to the Y axis, and similarly, for Y direction shears y_shear is measured relative to the X axis. Empty triangles left over from shearing the image are filled with the background color.

The format of the MagickShearImage method is:

@@ -5801,7 +5801,7 @@ _8c.html" target="source" name="MagickSketchImage">MagickSketchImage

    the standard deviation of the Gaussian, in pixels.

angle
-

    Apply the effect assize_t this angle.

+

    Apply the effect along this angle.

MagickVignetteImage

MagickWaveImage
-

MagickWaveImage() creates a "ripple" effect in the image by shifting the pixels vertically assize_t a sine wave whose amplitude and wavelength is specified by the given parameters.

+

MagickWaveImage() creates a "ripple" effect in the image by shifting the pixels vertically along a sine wave whose amplitude and wavelength is specified by the given parameters.

The format of the MagickWaveImage method is:

diff --git a/www/api/magick-property.html b/www/api/magick-property.html index 2908385f2..19ce98fbd 100644 --- a/www/api/magick-property.html +++ b/www/api/magick-property.html @@ -142,7 +142,7 @@ Druckerei Online
@@ -1627,7 +1627,7 @@ _8c.html" target="source" name="MagickSetType">MagickSetType Discourse Server • - Studio + Studio   diff --git a/www/api/magick.html b/www/api/magick.html index 92e575e9d..b3e2c4256 100644 --- a/www/api/magick.html +++ b/www/api/magick.html @@ -141,6 +141,9 @@ + diff --git a/www/api/memory.html b/www/api/memory.html index 28a934b82..9f8ceb4a6 100644 --- a/www/api/memory.html +++ b/www/api/memory.html @@ -142,7 +142,7 @@ Druckerei Online @@ -404,7 +404,7 @@ _8c.html" target="source" name="SetMagickMemoryMethods">SetMagickMemoryMethods  --> Discourse Server • - Studio + Studio   diff --git a/www/api/module.html b/www/api/module.html index 3a6b3ab77..32f91a039 100644 --- a/www/api/module.html +++ b/www/api/module.html @@ -142,7 +142,7 @@ Druckerei Online @@ -516,7 +516,7 @@ _8c.html" target="source" name="UnregisterModule">UnregisterModule Discourse Server • - Studio + Studio   diff --git a/www/api/monitor.html b/www/api/monitor.html index eae0f81f4..ccd302c3b 100644 --- a/www/api/monitor.html +++ b/www/api/monitor.html @@ -142,7 +142,7 @@ Druckerei Online @@ -227,7 +227,7 @@ _8c.html" target="source" name="SetImageInfoProgressMonitor">SetImageInfoProgres Discourse Server • - Studio + Studio   diff --git a/www/api/montage.html b/www/api/montage.html index 0ea720baa..0678b37dc 100644 --- a/www/api/montage.html +++ b/www/api/montage.html @@ -142,7 +142,7 @@ Druckerei Online @@ -253,7 +253,7 @@ _8c.html" target="source" name="MontageImageList">MontageImageList Discourse Server • - Studio + Studio   diff --git a/www/api/paint.html b/www/api/paint.html index d42a12f4d..eaf5a93cb 100644 --- a/www/api/paint.html +++ b/www/api/paint.html @@ -326,7 +326,7 @@ _8c.html" target="source" name="TransparentPaintImageChroma">TransparentPaintIma Discourse Server • - Studio + Studio   diff --git a/www/api/pixel-iterator.html b/www/api/pixel-iterator.html index 02a2e3f06..72c4a35e2 100644 --- a/www/api/pixel-iterator.html +++ b/www/api/pixel-iterator.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/pixel-view.html b/www/api/pixel-view.html index f7d65efeb..dcc2d7eb6 100644 --- a/www/api/pixel-view.html +++ b/www/api/pixel-view.html @@ -141,6 +141,9 @@ + diff --git a/www/api/profile.html b/www/api/profile.html index d44b7f7a5..dc3d523da 100644 --- a/www/api/profile.html +++ b/www/api/profile.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/quantize.html b/www/api/quantize.html index 16f1e2330..8eab90ad3 100644 --- a/www/api/quantize.html +++ b/www/api/quantize.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/registry.html b/www/api/registry.html index 77c157235..fe72b14c6 100644 --- a/www/api/registry.html +++ b/www/api/registry.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/resize.html b/www/api/resize.html index 1c9b55514..5a3ed8ae7 100644 --- a/www/api/resize.html +++ b/www/api/resize.html @@ -142,7 +142,7 @@ Druckerei Online @@ -452,7 +452,7 @@ _8c.html" target="source" name="ZoomImage">ZoomImage Discourse Server • - Studio + Studio   diff --git a/www/api/resource.html b/www/api/resource.html index 04ca9b427..18d92ba74 100644 --- a/www/api/resource.html +++ b/www/api/resource.html @@ -142,7 +142,7 @@ Druckerei Online @@ -321,7 +321,7 @@ _8c.html" target="source" name="SetMagickResourceLimit">SetMagickResourceLimit  --> Discourse Server • - Studio + Studio   diff --git a/www/api/segment.html b/www/api/segment.html index 857c257b8..72fa8e60d 100644 --- a/www/api/segment.html +++ b/www/api/segment.html @@ -141,6 +141,9 @@ + diff --git a/www/api/shear.html b/www/api/shear.html index 33eb8d287..35b0b8b37 100644 --- a/www/api/shear.html +++ b/www/api/shear.html @@ -235,7 +235,7 @@ _8c.html" target="source" name="RotateImage">RotateImage _8c.html" target="source" name="ShearImage">ShearImage
-

ShearImage() creates a new image that is a shear_image copy of an existing one. Shearing slides one edge of an image assize_t the X or Y axis, creating a parallelogram. An X direction shear slides an edge assize_t the X axis, while a Y direction shear slides an edge assize_t the Y axis. The amount of the shear is controlled by a shear angle. For X direction shears, x_shear is measured relative to the Y axis, and similarly, for Y direction shears y_shear is measured relative to the X axis. Empty triangles left over from shearing the image are filled with the background color defined by member 'background_color' of the image.. ShearImage() allocates the memory necessary for the new Image structure and returns a pointer to the new image.

+

ShearImage() creates a new image that is a shear_image copy of an existing one. Shearing slides one edge of an image along the X or Y axis, creating a parallelogram. An X direction shear slides an edge along the X axis, while a Y direction shear slides an edge along the Y axis. The amount of the shear is controlled by a shear angle. For X direction shears, x_shear is measured relative to the Y axis, and similarly, for Y direction shears y_shear is measured relative to the X axis. Empty triangles left over from shearing the image are filled with the background color defined by member 'background_color' of the image.. ShearImage() allocates the memory necessary for the new Image structure and returns a pointer to the new image.

ShearImage() is based on the paper "A Fast Algorithm for General Raster Rotatation" by Alan W. Paeth.

diff --git a/www/api/signature.html b/www/api/signature.html index f9a6ce081..0318c81bd 100644 --- a/www/api/signature.html +++ b/www/api/signature.html @@ -142,7 +142,7 @@ Druckerei Online
@@ -179,7 +179,7 @@ _8c.html" target="source" name="SignatureImage">SignatureImage Discourse Server • - Studio + Studio   diff --git a/www/api/statistic.html b/www/api/statistic.html index eceb5678d..e11cf3da7 100644 --- a/www/api/statistic.html +++ b/www/api/statistic.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/stream.html b/www/api/stream.html index 90f602207..4ec7ffe4b 100644 --- a/www/api/stream.html +++ b/www/api/stream.html @@ -142,7 +142,7 @@ Druckerei Online @@ -208,7 +208,7 @@ _8c.html" target="source" name="WriteStream">WriteStream Discourse Server • - Studio + Studio   diff --git a/www/api/transform.html b/www/api/transform.html index 49ac8785d..f6eaaa14e 100644 --- a/www/api/transform.html +++ b/www/api/transform.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/api/version.html b/www/api/version.html index 758099e7c..297784dd7 100644 --- a/www/api/version.html +++ b/www/api/version.html @@ -286,7 +286,7 @@ _8c.html" target="source" name="GetMagickVersion">GetMagickVersion Discourse Server • - Studio + Studio   diff --git a/www/architecture.html b/www/architecture.html index c3063b6ce..7b92e65d1 100644 --- a/www/architecture.html +++ b/www/architecture.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/binary-releases.html b/www/binary-releases.html index d6725d10b..31e2d5167 100644 --- a/www/binary-releases.html +++ b/www/binary-releases.html @@ -142,7 +142,7 @@ Druckerei Online @@ -373,7 +373,7 @@ Discourse Server • - Studio + Studio   diff --git a/www/changelog.html b/www/changelog.html index 213e67f5d..df80fbe46 100644 --- a/www/changelog.html +++ b/www/changelog.html @@ -160,7 +160,8 @@
  • Respect density when rendering SVG images.
  • Set AVI handler to the MPEG coder.
  • Compute the proper DPX user data field size.
    • -
  • Do not interpret a format specifier when enclosed in brackets (e.g. rose_tile_%[filename:tile].gif.

    • +
  • Do not interpret a format specifier when enclosed in brackets (e.g. rose_tile_%[filename:tile].gif.
    • +
  • Use 64-bit types when compiling with the 64-bit Visual C++ compiler under Windows.

    • 2010-05-23 6.6.2.0 Anthony Thyssen <A.Thyssen@griffith...>
  • Third Re-write of MorphologyApply() to better handle compound methods.
  • Implemented -set option:morphology:compose for merging results of multiple kernels. "None" means re-iterate results with next kernel. While "Undefined" means to use the internal default for a method. Thinning, Thickening, HitAndMiss, Convolve, Correlate defaults to "None" while HitAndMiss defaults to "Lighten" (union of all kernel results). Other morphology methods defaults still to be decided.
    • diff --git a/www/cipher.html b/www/cipher.html index a8338934a..2b1dff0e9 100644 --- a/www/cipher.html +++ b/www/cipher.html @@ -143,7 +143,7 @@ Druckerei Online @@ -206,7 +206,7 @@ Discourse Server • - Studio + Studio   diff --git a/www/color.html b/www/color.html index be3ea7484..7fe632ae9 100644 --- a/www/color.html +++ b/www/color.html @@ -5018,7 +5018,7 @@ color swatch of that color and to convert to all the other color models. Discourse Server • - Studio + Studio   diff --git a/www/command-line-processing.html b/www/command-line-processing.html index 4e830b80b..40d970434 100644 --- a/www/command-line-processing.html +++ b/www/command-line-processing.html @@ -142,7 +142,7 @@ Druckerei Online @@ -635,7 +635,7 @@ above.

    Discourse Server • - Studio + Studio   diff --git a/www/command-line-tools.html b/www/command-line-tools.html index c0ec7546a..bce2c2f85 100644 --- a/www/command-line-tools.html +++ b/www/command-line-tools.html @@ -142,7 +142,7 @@ Druckerei Online @@ -154,11 +154,11 @@

    [animate • compare • composite • conjure • convert • display • identify • import • mogrify • montage • stream]

    -

    ImageMagick includes a number of command-line utilities for manipulating images. Most of you are probably accustomed to editing images one at a time with a graphical user interface (GUI) with such programs as gimp or Photoshop. However, a GUI is not always convenient. Suppose you want to process an image dynamically from a web script or you want to apply the same operations to many images or repeat a specific operation at different times to the same or different image. For these types of operations, the command-line image processing utility is appropriate.

    +

    ImageMagick includes a number of command-line utilities for manipulating images. Most of you are probably accustomed to editing images one at a time with a graphical user interface (GUI) with such programs as gimp or Photoshop. However, a GUI is not always convenient. Suppose you want to process an image dynamically from a web script or you want to apply the same operations to many images or repeat a specific operation at different times to the same or different image. For these types of operations, the command-line image processing utility is appropriate.

    The ImageMagick command-line tools exit with a status of 0 if the command line arguments have a proper syntax and no problems are encountered. Expect a descriptive message and an exit status of 1 if any exception occurs such as improper syntax, a problem reading or writing an image, or any other problem that prevents the command from completing successfully.

    -

    In the paragraphs below, find a short description for each command-line tool. Click on the program name to get details about the program usage and a list of command-line options that alters how the program behaves. If you are just getting acquainted with ImageMagick, start with the convert program. Be sure to peruse Anthony Thyssen's tutorial on how to use ImageMagick utilities to convert, compose, or edit images from the command-line.

    +

    In the paragraphs below, find a short description for each command-line tool. Click on the program name to get details about the program usage and a list of command-line options that alters how the program behaves. If you are just getting acquainted with ImageMagick, start with the convert program. Be sure to peruse Anthony Thyssen's tutorial on how to use ImageMagick utilities to convert, compose, or edit images from the command-line.

    animate

    @@ -232,7 +232,7 @@ Discourse Server • - Studio + Studio  
    diff --git a/www/compare.html b/www/compare.html index 78eb20ded..0a66e10f5 100644 --- a/www/compare.html +++ b/www/compare.html @@ -143,7 +143,7 @@ Druckerei Online @@ -396,7 +396,7 @@ transparent, extract, background, or shape the alpha channel Discourse Server • - Studio + Studio   diff --git a/www/composite.html b/www/composite.html index 7d0272efa..42c3adab5 100644 --- a/www/composite.html +++ b/www/composite.html @@ -600,7 +600,7 @@ transparent, extract, background, or shape the alpha channel Discourse Server • - Studio + Studio   diff --git a/www/conjure.html b/www/conjure.html index 86eeded0b..a52a679fc 100644 --- a/www/conjure.html +++ b/www/conjure.html @@ -143,7 +143,7 @@ Druckerei Online @@ -306,7 +306,7 @@ Discourse Server • - Studio + Studio   diff --git a/www/contact.html b/www/contact.html index 4193be14f..54d5f0213 100644 --- a/www/contact.html +++ b/www/contact.html @@ -142,7 +142,7 @@ Druckerei Online @@ -160,7 +160,7 @@

    Contact the Development Team

    -

    Use this form to contact the ImageMagick Wizards for any of the issues listed below. You can expect a reply within 24-48 hours if your message is a sponsorshp, license, or security issue. The bug and documentation issues are for reporting only. For any other issue, post your message to the discourse server.

    +

    Use this form to contact the ImageMagick Wizards for any of the issues listed below. You can expect a reply within 24-48 hours if your message is a sponsorshp, license, or security issue. The bug and documentation issues are for reporting only. For any other issue, post your message to the discourse server.

    Contact the Wizards

    Enter this code, @@ -216,7 +216,7 @@ Discourse Server • - Studio + Studio   diff --git a/www/convert.html b/www/convert.html index f0c8a4baa..5e59aacb7 100644 --- a/www/convert.html +++ b/www/convert.html @@ -1280,7 +1280,7 @@ transparent, extract, background, or shape the alpha channel Discourse Server • - Studio + Studio   diff --git a/www/display.html b/www/display.html index 5bef90af2..c8b9c0781 100644 --- a/www/display.html +++ b/www/display.html @@ -143,7 +143,7 @@ Druckerei Online

    @@ -643,7 +643,7 @@ transparent, extract, background, or shape the alpha channel Discourse Server • - Studio + Studio   diff --git a/www/download.html b/www/download.html index aeb955bec..57480922e 100644 --- a/www/download.html +++ b/www/download.html @@ -204,7 +204,7 @@ Discourse Server • - Studio + Studio   diff --git a/www/escape.html b/www/escape.html index b323036f9..902a50b5b 100644 --- a/www/escape.html +++ b/www/escape.html @@ -143,7 +143,7 @@ Druckerei Online diff --git a/www/examples.html b/www/examples.html index 88b72cdc8..311b8753e 100644 --- a/www/examples.html +++ b/www/examples.html @@ -142,7 +142,7 @@ Druckerei Online @@ -152,7 +152,7 @@
    -

    Here are a few examples of what you can do with an image using ImageMagick from the command line, a program interface, or script. You can generate this image yourself with this PerlMagick script, examples.pl.


    +

    Here are a few examples of what you can do with an image using ImageMagick from the command line, a program interface, or script. You can generate this image yourself with this PerlMagick script, examples.pl.


    [ImageMagick] @@ -164,7 +164,7 @@ Discourse Server • - Studio + Studio  
    diff --git a/www/exception.html b/www/exception.html index 77bcf8441..f865e67b1 100644 --- a/www/exception.html +++ b/www/exception.html @@ -142,7 +142,7 @@ Druckerei Online
    @@ -354,7 +354,7 @@ Discourse Server • - Studio + Studio   diff --git a/www/formats.html b/www/formats.html index 34039f3c7..08e5f04b0 100644 --- a/www/formats.html +++ b/www/formats.html @@ -1761,7 +1761,7 @@ convert \( -size 15x15 xc:black xc:white -append \) \ Discourse Server • - Studio + Studio   diff --git a/www/fx.html b/www/fx.html index 773bd7331..b41f7bffb 100644 --- a/www/fx.html +++ b/www/fx.html @@ -143,7 +143,7 @@ Druckerei Online diff --git a/www/high-dynamic-range.html b/www/high-dynamic-range.html index 8f23acc60..7efa58184 100644 --- a/www/high-dynamic-range.html +++ b/www/high-dynamic-range.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/history.html b/www/history.html index 7c3b80d25..9d5431b4c 100644 --- a/www/history.html +++ b/www/history.html @@ -142,7 +142,7 @@ Druckerei Online @@ -164,7 +164,7 @@ I swear by my life and my love of it that I will never live for the sake of anot

    The next generation of ImageMagick, version 5, started when Bob Friesenhahn contacted me and suggested I improve the application programming interface so users could leverage the image-processing algorithms from other languages or scripts. Bob also wrote a C++ wrapper for ImageMagick called Magick++, and began contributing enhancements such as the module loader facility, automatic file identification, and test suites. In the mean-time, the project picked up a few other notable contributors: Glenn Randers-Pehrson, William Radcliffe, and Leonard Rosenthol. By now, ImageMagick was being utilized by tens of thousands of users, who reacted gruffly when a new release broke an existing API call or script. The other members of the group wanted to freeze the API and command line but I was not quite ready, since ImageMagick was not quite what I had envisioned it could be. Bob and the others created a fork of ImageMagick while I continued to develop ImageMagick.

    -

    I did not work alone for long. Anthony Thyssen contacted me about deficiencies in the ImageMagick command line programs. He pointed out that the command line was confusing when dealing with more than one image. He suggested an orderly, well-defined method for dealing with the command line, and this became ImageMagick version 6 (the current release). His efforts are detailed on his web pages, Examples of ImageMagick Usage. I highly recommend that you peruse his site. He has illustrated the power of ImageMagick in ways that even I did not know were possible.

    +

    I did not work alone for long. Anthony Thyssen contacted me about deficiencies in the ImageMagick command line programs. He pointed out that the command line was confusing when dealing with more than one image. He suggested an orderly, well-defined method for dealing with the command line, and this became ImageMagick version 6 (the current release). His efforts are detailed on his web pages, Examples of ImageMagick Usage. I highly recommend that you peruse his site. He has illustrated the power of ImageMagick in ways that even I did not know were possible.

    Another notable contributer, Fred Weinhaus, makes available a plethora of command-line scripts that perform geometric transforms, blurs, sharpens, edging, noise removal, and color manipulations.

    diff --git a/www/identify.html b/www/identify.html index 77adaf84c..c688039d4 100644 --- a/www/identify.html +++ b/www/identify.html @@ -142,7 +142,7 @@ Druckerei Online diff --git a/www/import.html b/www/import.html index 8500c48a3..86eeaede0 100644 --- a/www/import.html +++ b/www/import.html @@ -495,7 +495,7 @@ Discourse Server • - Studio + Studio   diff --git a/www/index.html b/www/index.html index 0fb68d937..7134291b2 100644 --- a/www/index.html +++ b/www/index.html @@ -223,7 +223,7 @@ Discourse Server • - Studio + Studio   diff --git a/www/install-source.html b/www/install-source.html index 4637145d1..fc82cfe22 100644 --- a/www/install-source.html +++ b/www/install-source.html @@ -142,7 +142,7 @@ Druckerei Online @@ -223,7 +223,7 @@ to compile the program and on completion run the program.

    Discourse Server • - Studio + Studio   diff --git a/www/jp2.html b/www/jp2.html index 630c07732..8e0def141 100644 --- a/www/jp2.html +++ b/www/jp2.html @@ -262,7 +262,7 @@ Discourse Server • - Studio + Studio   diff --git a/www/links.html b/www/links.html index f7fe96bfb..8ce9d8947 100644 --- a/www/links.html +++ b/www/links.html @@ -142,7 +142,7 @@ Druckerei Online @@ -160,23 +160,23 @@

    Command-line Tutorials

    @@ -184,18 +184,18 @@
    @@ -203,10 +203,10 @@
    @@ -214,24 +214,24 @@

    ImageMagick Book Review

    Mailing List Archives

    @@ -239,13 +239,13 @@
    Denmark
    -
    http://imagemagick.europnews.de

    +
    http://imagemagick.europnews.de

    Germany
    -
    http://imagemagick.linux-mirror.org

    +
    http://imagemagick.linux-mirror.org

    Ireland
    -
    http://imagemagick.oss-mirror.org

    +
    http://imagemagick.oss-mirror.org

    United States
    -
    http://www.imagemagick.org
    +
    http://www.imagemagick.org
    @@ -253,16 +253,16 @@
      -
      G'MIC: convert, manipulate and visualize generic 1D/2D/3D multi-spectral image files
      -
      Image Commander: bulk picture processing with a GUI
      +
      G'MIC: convert, manipulate and visualize generic 1D/2D/3D multi-spectral image files
      +
      Image Commander: bulk picture processing with a GUI

    Other Projects Hosted by ImageMagick Studio

    @@ -272,7 +272,7 @@ Discourse Server • - Studio + Studio   diff --git a/www/magick-core.html b/www/magick-core.html index 212f2fd15..14c95fbc5 100644 --- a/www/magick-core.html +++ b/www/magick-core.html @@ -143,7 +143,7 @@ Druckerei Online @@ -287,7 +287,7 @@ Discourse Server • - Studio + Studio   diff --git a/www/miff.html b/www/miff.html index a6aff4eb9..b3f5eb7a6 100644 --- a/www/miff.html +++ b/www/miff.html @@ -142,7 +142,7 @@ Druckerei Online @@ -308,7 +308,7 @@ or fewer colors in the image, each byte of image data contains an index value. I Discourse Server • - Studio + Studio   diff --git a/www/mirrors.html b/www/mirrors.html index a8bef1172..f2495e572 100644 --- a/www/mirrors.html +++ b/www/mirrors.html @@ -142,7 +142,7 @@ Druckerei Online @@ -155,9 +155,9 @@

    The ImageMagick web site is available from a variety of web mirrors around the world listed below.

    France
    -
    http://imagemagick.europnews.de/

    +
    http://imagemagick.europnews.de/

    Unites States
    -
    http://www.imagemagick.org/
    +
    http://www.imagemagick.org/

    If you want to add a new web-site mirror, please contact us.

    @@ -167,7 +167,7 @@ Discourse Server • - Studio + Studio   diff --git a/www/mogrify.html b/www/mogrify.html index f1aff9e45..2342a7c78 100644 --- a/www/mogrify.html +++ b/www/mogrify.html @@ -1278,7 +1278,7 @@ transparent, extract, background, or shape the alpha channel Discourse Server • - Studio + Studio   diff --git a/www/montage.html b/www/montage.html index 59dcde50f..564da20b4 100644 --- a/www/montage.html +++ b/www/montage.html @@ -143,7 +143,7 @@ Druckerei Online @@ -698,7 +698,7 @@ transparent, extract, background, or shape the alpha channel Discourse Server • - Studio + Studio   diff --git a/www/motion-picture.html b/www/motion-picture.html index 3e12fa4ef..68f6fdd62 100644 --- a/www/motion-picture.html +++ b/www/motion-picture.html @@ -143,7 +143,7 @@ Druckerei Online diff --git a/www/perl-magick.html b/www/perl-magick.html index 0fb09d897..99d8cd5e6 100644 --- a/www/perl-magick.html +++ b/www/perl-magick.html @@ -142,7 +142,7 @@ Druckerei Online @@ -2558,7 +2558,7 @@ blobs in any of these image formats and provid Discourse Server • - Studio + Studio   diff --git a/www/quantize.html b/www/quantize.html index a4013c2bf..69b813b1c 100644 --- a/www/quantize.html +++ b/www/quantize.html @@ -142,7 +142,7 @@ Druckerei Online @@ -285,7 +285,7 @@ Discourse Server • - Studio + Studio   diff --git a/www/resources.html b/www/resources.html index 2ab1fe628..e5fcd0490 100644 --- a/www/resources.html +++ b/www/resources.html @@ -407,7 +407,7 @@ file or data stream.

    Discourse Server • - Studio + Studio   diff --git a/www/sitemap.html b/www/sitemap.html index 998e93347..892372297 100644 --- a/www/sitemap.html +++ b/www/sitemap.html @@ -142,7 +142,7 @@ Druckerei Online @@ -163,7 +163,7 @@
    Introduction: convert, edit, and compose images from the command-line or program interface.
    Examples of ImageMagick usage: a few examples that show what you can do with an image using ImageMagick.
    -
    Anthony Thyssen's examples of ImageMagick usage: a comprehensive tutorial of using ImageMagick from the command line.
    +
    Anthony Thyssen's examples of ImageMagick usage: a comprehensive tutorial of using ImageMagick from the command line.
    Color names: how to specify a color name, a hex color, or a numerical RGB, RGBA, HSL, HSLA, CMYK, or CMYKA color.
    Resources: ImageMagick depends on external resources including configuration files, loadable modules, fonts, and environment variables.
    Architecture: get to know more about the software and algorithms behind ImageMagick.
    @@ -177,12 +177,12 @@
    Download ImageMagick: ImageMagick source and binary distributions are available from a variety of FTP and Web mirrors.
    @@ -221,7 +221,7 @@
    Command line processing: the anatomy of the command line.
    Command line options: annotated list of all options that can appear on the command-line.
    Fx: apply a mathematical expression to an image or image channels.
    -
    Fred's ImageMagick Scripts: a plethora of command-line scripts that perform geometric transforms, blurs, sharpens, edging, noise removal, and color manipulations.
    +
    Fred's ImageMagick Scripts: a plethora of command-line scripts that perform geometric transforms, blurs, sharpens, edging, noise removal, and color manipulations.
    @@ -231,21 +231,21 @@
    Program interfaces: application programming interfaces.
      -
      ChMagick: is a Ch an embeddable MagickCore C/C++ interpreter for cross-platform scripting.
      -
      CL-Magick: provides a Common Lisp interface to the ImageMagick library.
      -
      G2F: implements an Ada 95 binding to a subset of the low-level MagickCore library.
      -
      Magick++: provides an object-oriented C++ interface to ImageMagick.
      -
      IMagick: is a native PHP extension to create and modify images using the ImageMagick API.
      -
      JMagick: provides an object-oriented Java interface to ImageMagick.
      +
      ChMagick: is a Ch an embeddable MagickCore C/C++ interpreter for cross-platform scripting.
      +
      CL-Magick: provides a Common Lisp interface to the ImageMagick library.
      +
      G2F: implements an Ada 95 binding to a subset of the low-level MagickCore library.
      +
      Magick++: provides an object-oriented C++ interface to ImageMagick.
      +
      IMagick: is a native PHP extension to create and modify images using the ImageMagick API.
      +
      JMagick: provides an object-oriented Java interface to ImageMagick.
      MagickCore: C API, recommended for wizard-level developers.
      MagickWand: convert, compose, and edit images from the C language.
      -
      MagickWand for PHP: a native PHP-extension to the ImageMagick MagickWand API.
      -
      nMagick: is a port of the ImageMagick library to the haXe and Neko platforms.
      -
      PascalMagick: a Pascal binding for the MagickWand API and also the low-level MagickCore library.
      +
      MagickWand for PHP: a native PHP-extension to the ImageMagick MagickWand API.
      +
      nMagick: is a port of the ImageMagick library to the haXe and Neko platforms.
      +
      PascalMagick: a Pascal binding for the MagickWand API and also the low-level MagickCore library.
      PerlMagick: convert, compose, and edit images from the Perl language.
      -
      PythonMagick: an object-oriented Python interface to ImageMagick.
      -
      RMagick: is an interface between the Ruby programming language and ImageMagick.
      -
      TclMagick: a native Tcl-extension to the ImageMagick MagickWand API.
      +
      PythonMagick: an object-oriented Python interface to ImageMagick.
      +
      RMagick: is an interface between the Ruby programming language and ImageMagick.
      +
      TclMagick: a native Tcl-extension to the ImageMagick MagickWand API.
    @@ -265,8 +265,8 @@
    -
    Definitive Guide to ImageMagick: this book explains ImageMagick in a practical, learn-by-example fashion.
    -
    ImageMagick Tricks: this book is packed with examples of photo manipulations, logo creation, animations, and complete web projects.
    +
    Definitive Guide to ImageMagick: this book explains ImageMagick in a practical, learn-by-example fashion.
    +
    ImageMagick Tricks: this book is packed with examples of photo manipulations, logo creation, animations, and complete web projects.
    Discourse server: get help from fellow ImageMagick users and developers, post to these forums.
    Contact the Wizards: for bug reports (only if you do not want to sign up to the discourse server), a source or documentation patch, a security or license issue, or if you want to be a sponsor of the ImageMagick project.
    @@ -276,7 +276,7 @@
    -
    Report bugs and vulnerabilities: our highest priority is to fix security defects and bug reports, usually within 48 hours of your report. The bug discourse server requires that you register. If you do not want to register, you can contact the ImageMagick developers with a convenient web form.
    +
    Report bugs and vulnerabilities: our highest priority is to fix security defects and bug reports, usually within 48 hours of your report. The bug discourse server requires that you register. If you do not want to register, you can contact the ImageMagick developers with a convenient web form.
    Sponsor ImageMagick: contribute bug fixes, enhancements, hardware, funds, etc. to ensure the ImageMagick project thrives.
    ImageMagick t-shirt: donate $25 USD and we acknowledge your gift with a logoed t-shirt.
    @@ -302,8 +302,8 @@

    Technology Sandbox

    -
    Fourier Transform Processing With ImageMagick
    -
    ImageMagick v6 Examples -- Fourier Transforms
    +
    Fourier Transform Processing With ImageMagick
    +
    ImageMagick v6 Examples -- Fourier Transforms
    diff --git a/www/stream.html b/www/stream.html index 463821146..ad55ca6e7 100644 --- a/www/stream.html +++ b/www/stream.html @@ -143,7 +143,7 @@ Druckerei Online diff --git a/www/subversion.html b/www/subversion.html index 0d34965a9..81def2900 100644 --- a/www/subversion.html +++ b/www/subversion.html @@ -142,7 +142,7 @@ Druckerei Online @@ -176,7 +176,7 @@ ImageMagick-6.6.2

    Discourse Server • - Studio + Studio   diff --git a/www/t-shirt.html b/www/t-shirt.html index 6e791c784..fb5559327 100644 --- a/www/t-shirt.html +++ b/www/t-shirt.html @@ -142,7 +142,7 @@ Druckerei Online