From 101ab708b0574518ac5715da4d3915400e9df79a Mon Sep 17 00:00:00 2001 From: cristy Date: Thu, 13 Oct 2011 13:06:32 +0000 Subject: [PATCH] --- Magick++/lib/Color.cpp | 32 +++++----- Magick++/lib/Drawable.cpp | 6 +- Magick++/lib/Image.cpp | 32 +++++----- Magick++/lib/Magick++/Color.h | 62 +++++++++--------- Magick++/lib/Magick++/Include.h | 4 +- Magick++/lib/Magick++/STL.h | 4 +- MagickCore/accelerate.c | 18 +++--- MagickCore/animate.c | 4 +- MagickCore/annotate.c | 4 +- MagickCore/attribute.c | 4 +- MagickCore/color.c | 24 +++---- MagickCore/color.h | 6 +- MagickCore/colormap.c | 22 +++---- MagickCore/composite-private.h | 2 +- MagickCore/compress.c | 2 +- MagickCore/display.c | 25 ++++---- MagickCore/draw-private.h | 4 +- MagickCore/draw.c | 41 ++++++------ MagickCore/draw.h | 4 +- MagickCore/enhance.c | 8 +-- MagickCore/feature.c | 16 ++--- MagickCore/fx.c | 8 +-- MagickCore/histogram.c | 58 ++++++++--------- MagickCore/histogram.h | 2 +- MagickCore/identify.c | 2 +- MagickCore/image.c | 16 ++--- MagickCore/image.h | 8 +-- MagickCore/magick-config.h | 34 +++++++--- MagickCore/methods.h | 2 +- MagickCore/montage.h | 2 +- MagickCore/nt-base.c | 4 +- MagickCore/paint.c | 18 +++--- MagickCore/paint.h | 2 +- MagickCore/pixel-accessor.h | 70 +++------------------ MagickCore/pixel.c | 99 +---------------------------- MagickCore/pixel.h | 45 +------------ MagickCore/quantize.c | 108 ++++++++++++++++---------------- MagickCore/quantum-import.c | 40 ++++++------ MagickCore/segment.c | 2 +- MagickCore/threshold.c | 2 +- MagickCore/version.h | 4 +- MagickCore/xwindow.c | 26 ++++---- MagickWand/drawing-wand.c | 20 +++--- MagickWand/magick-image.c | 10 +-- MagickWand/pixel-wand.c | 16 ++--- MagickWand/pixel-wand.h | 4 +- PerlMagick/Magick.xs | 14 ++--- coders/bmp.c | 6 +- coders/braille.c | 6 +- coders/dcm.c | 4 +- coders/gif.c | 4 +- coders/gradient.c | 4 +- coders/jbig.c | 2 +- coders/jpeg.c | 4 +- coders/map.c | 2 +- coders/palm.c | 12 ++-- coders/pcx.c | 6 +- coders/png.c | 34 +++++----- coders/ps.c | 6 +- coders/psd.c | 4 +- coders/rle.c | 2 +- coders/stegano.c | 2 +- coders/svg.c | 2 +- coders/tga.c | 2 +- coders/ttf.c | 4 +- coders/txt.c | 14 ++--- coders/uil.c | 2 +- coders/wpg.c | 30 ++++----- coders/xc.c | 4 +- coders/xcf.c | 10 +-- coders/xpm.c | 6 +- coders/xwd.c | 2 +- 72 files changed, 471 insertions(+), 643 deletions(-) diff --git a/Magick++/lib/Color.cpp b/Magick++/lib/Color.cpp index a30862dac..364bfaff7 100644 --- a/Magick++/lib/Color.cpp +++ b/Magick++/lib/Color.cpp @@ -65,7 +65,7 @@ int Magick::operator <= ( const Magick::Color& left_, // Default constructor Magick::Color::Color ( void ) - : _pixel(new PixelPacket), + : _pixel(new PixelInfo), _pixelOwn(true), _isValid(false), _pixelType(RGBPixel) @@ -77,7 +77,7 @@ Magick::Color::Color ( void ) Magick::Color::Color ( Quantum red_, Quantum green_, Quantum blue_ ) - : _pixel(new PixelPacket), + : _pixel(new PixelInfo), _pixelOwn(true), _isValid(true), _pixelType(RGBPixel) @@ -93,7 +93,7 @@ Magick::Color::Color ( Quantum red_, Quantum green_, Quantum blue_, Quantum alpha_ ) - : _pixel(new PixelPacket), + : _pixel(new PixelInfo), _pixelOwn(true), _isValid(true), _pixelType(RGBAPixel) @@ -106,7 +106,7 @@ Magick::Color::Color ( Quantum red_, // Copy constructor Magick::Color::Color ( const Magick::Color & color_ ) - : _pixel( new PixelPacket ), + : _pixel( new PixelInfo ), _pixelOwn( true ), _isValid( color_._isValid ), _pixelType( color_._pixelType ) @@ -116,7 +116,7 @@ Magick::Color::Color ( const Magick::Color & color_ ) // Construct from color expressed as C++ string Magick::Color::Color ( const std::string &x11color_ ) - : _pixel(new PixelPacket), + : _pixel(new PixelInfo), _pixelOwn(true), _isValid(true), _pixelType(RGBPixel) @@ -129,7 +129,7 @@ Magick::Color::Color ( const std::string &x11color_ ) // Construct from color expressed as C string Magick::Color::Color ( const char * x11color_ ) - : _pixel(new PixelPacket), + : _pixel(new PixelInfo), _pixelOwn(true), _isValid(true), _pixelType(RGBPixel) @@ -140,9 +140,9 @@ Magick::Color::Color ( const char * x11color_ ) *this = x11color_; } -// Construct color via ImageMagick PixelPacket -Magick::Color::Color ( const PixelPacket &color_ ) - : _pixel(new PixelPacket), +// Construct color via ImageMagick PixelInfo +Magick::Color::Color ( const PixelInfo &color_ ) + : _pixel(new PixelInfo), _pixelOwn(true), // We allocated this pixel _isValid(true), _pixelType(RGBPixel) // RGB pixel by default @@ -153,9 +153,9 @@ Magick::Color::Color ( const PixelPacket &color_ ) _pixelType = RGBAPixel; } -// Protected constructor to construct with PixelPacket* +// Protected constructor to construct with PixelInfo* // Used to point Color at a pixel. -Magick::Color::Color ( PixelPacket* rep_, PixelType pixelType_ ) +Magick::Color::Color ( PixelInfo* rep_, PixelType pixelType_ ) : _pixel(rep_), _pixelOwn(false), _isValid(true), @@ -193,7 +193,7 @@ Magick::Color& Magick::Color::operator = ( const Magick::Color& color_ ) const Magick::Color& Magick::Color::operator = ( const std::string &x11color_ ) { initPixel(); - PixelPacket target_color; + PixelInfo target_color; ExceptionInfo exception; GetExceptionInfo( &exception ); if ( QueryColorCompliance( x11color_.c_str(), AllCompliance, &target_color, &exception ) ) @@ -248,8 +248,8 @@ Magick::Color::operator std::string() const return std::string(colorbuf); } -// Set color via ImageMagick PixelPacket -const Magick::Color& Magick::Color::operator= ( const MagickCore::PixelPacket &color_ ) +// Set color via ImageMagick PixelInfo +const Magick::Color& Magick::Color::operator= ( const MagickCore::PixelInfo &color_ ) { *_pixel = color_; if ( color_.alpha != OpaqueAlpha ) @@ -261,7 +261,7 @@ const Magick::Color& Magick::Color::operator= ( const MagickCore::PixelPacket &c // Set pixel // Used to point Color at a pixel in an image -void Magick::Color::pixel ( PixelPacket* rep_, PixelType pixelType_ ) +void Magick::Color::pixel ( PixelInfo* rep_, PixelType pixelType_ ) { if ( _pixelOwn ) delete _pixel; @@ -283,7 +283,7 @@ void Magick::Color::isValid ( bool valid_ ) if ( !_pixelOwn ) { - _pixel = new PixelPacket; + _pixel = new PixelInfo; _pixelOwn = true; } diff --git a/Magick++/lib/Drawable.cpp b/Magick++/lib/Drawable.cpp index 33363b92f..663ac0bea 100644 --- a/Magick++/lib/Drawable.cpp +++ b/Magick++/lib/Drawable.cpp @@ -583,7 +583,7 @@ Magick::DrawableFillColor::~DrawableFillColor( void ) void Magick::DrawableFillColor::operator() ( MagickCore::DrawingWand * context_ ) const { - PixelPacket color = static_cast(_color); + PixelInfo color = static_cast(_color); PixelWand *pixel_wand=NewPixelWand(); PixelSetQuantumPacket(pixel_wand,&color); DrawSetFillColor(context_,pixel_wand); @@ -1210,7 +1210,7 @@ Magick::DrawableStrokeColor::~DrawableStrokeColor ( void ) void Magick::DrawableStrokeColor::operator() ( MagickCore::DrawingWand * context_ ) const { - PixelPacket color = static_cast(_color); + PixelInfo color = static_cast(_color); PixelWand *pixel_wand=NewPixelWand(); PixelSetQuantumPacket(pixel_wand,&color); DrawSetStrokeColor(context_,pixel_wand); @@ -1356,7 +1356,7 @@ Magick::DrawableTextUnderColor::~DrawableTextUnderColor ( void ) void Magick::DrawableTextUnderColor::operator() ( MagickCore::DrawingWand * context_ ) const { - PixelPacket color = static_cast(_color); + PixelInfo color = static_cast(_color); PixelWand *pixel_wand=NewPixelWand(); PixelSetQuantumPacket(pixel_wand,&color); DrawSetTextUnderColor(context_,pixel_wand); diff --git a/Magick++/lib/Image.cpp b/Magick++/lib/Image.cpp index 86d012292..a8ff3f7ce 100644 --- a/Magick++/lib/Image.cpp +++ b/Magick++/lib/Image.cpp @@ -607,7 +607,7 @@ void Magick::Image::colorize ( const unsigned int alphaRed_, GetExceptionInfo( &exceptionInfo ); PixelInfo target; GetPixelInfo(image(),&target); - PixelPacket pixel=static_cast(penColor_); + PixelInfo pixel=static_cast(penColor_); target.red=pixel.red; target.green=pixel.green; target.blue=pixel.blue; @@ -1010,7 +1010,7 @@ void Magick::Image::floodFillAlpha( const ssize_t x_, modifyImage(); PixelInfo target; GetPixelInfo(image(),&target); - PixelPacket pixel=static_cast(pixelColor(x_,y_)); + PixelInfo pixel=static_cast(pixelColor(x_,y_)); target.red=pixel.red; target.green=pixel.green; target.blue=pixel.blue; @@ -1083,9 +1083,9 @@ void Magick::Image::floodFillTexture( const ssize_t x_, PixelInfo target; GetPixelInfo(constImage(),&target); - target.red=static_cast(borderColor_).red; - target.green=static_cast(borderColor_).green; - target.blue=static_cast(borderColor_).blue; + target.red=static_cast(borderColor_).red; + target.green=static_cast(borderColor_).green; + target.blue=static_cast(borderColor_).blue; ExceptionInfo exceptionInfo; GetExceptionInfo( &exceptionInfo ); FloodfillPaintImage ( image(), @@ -1343,9 +1343,9 @@ void Magick::Image::matteFloodfill ( const Color &target_ , modifyImage(); PixelInfo target; GetPixelInfo(constImage(),&target); - target.red=static_cast(target_).red; - target.green=static_cast(target_).green; - target.blue=static_cast(target_).blue; + target.red=static_cast(target_).red; + target.green=static_cast(target_).green; + target.blue=static_cast(target_).blue; target.alpha=alpha_; ChannelType channel_mask = SetPixelChannelMask( image(), AlphaChannel ); ExceptionInfo exceptionInfo; @@ -2610,7 +2610,7 @@ void Magick::Image::classType ( const ClassType class_ ) // color map and then set to DirectClass type. modifyImage(); SyncImage( image() ); - image()->colormap = (PixelPacket *) + image()->colormap = (PixelInfo *) RelinquishMagickMemory( image()->colormap ); image()->storage_class = static_cast(DirectClass); return; @@ -2723,14 +2723,14 @@ void Magick::Image::colorMapSize ( const size_t entries_ ) { // Allocate colormap imageptr->colormap = - static_cast(AcquireMagickMemory(entries_*sizeof(PixelPacket))); + static_cast(AcquireMagickMemory(entries_*sizeof(PixelInfo))); imageptr->colors = 0; } else if ( entries_ > imageptr->colors ) { // Re-allocate colormap - imageptr->colormap=(PixelPacket *) - ResizeMagickMemory(imageptr->colormap,(entries_)*sizeof(PixelPacket)); + imageptr->colormap=(PixelInfo *) + ResizeMagickMemory(imageptr->colormap,(entries_)*sizeof(PixelInfo)); } // Initialize any new colormap entries as all black @@ -3475,8 +3475,8 @@ void Magick::Image::pixelColor ( const ssize_t x_, const ssize_t y_, Pixels pixels(*this); // Set pixel value Quantum *pixel = pixels.get(x_, y_, 1, 1 ); - PixelPacket packet = color_; - MagickCore::SetPixelPacket(constImage(),&packet,pixel); + PixelInfo packet = color_; + MagickCore::SetPixelPixelInfo(constImage(),&packet,pixel); // Tell ImageMagick that pixels have been updated pixels.sync(); @@ -3493,8 +3493,8 @@ Magick::Color Magick::Image::pixelColor ( const ssize_t x_, const Quantum* pixel = getConstPixels( x_, y_, 1, 1 ); if ( pixel ) { - PixelPacket packet; - MagickCore::GetPixelPacketPixel(constImage(),pixel,&packet); + PixelInfo packet; + MagickCore::GetPixelInfoPixel(constImage(),pixel,&packet); return Color( packet ); } diff --git a/Magick++/lib/Magick++/Color.h b/Magick++/lib/Magick++/Color.h index dd03a6a7c..6c53fd916 100644 --- a/Magick++/lib/Magick++/Color.h +++ b/Magick++/lib/Magick++/Color.h @@ -75,14 +75,14 @@ namespace Magick // Return X11 color specification string /* virtual */ operator std::string() const; - // Return ImageMagick PixelPacket - operator PixelPacket() const; + // Return ImageMagick PixelInfo + operator PixelInfo() const; - // Construct color via ImageMagick PixelPacket - Color ( const PixelPacket &color_ ); + // Construct color via ImageMagick PixelInfo + Color ( const PixelInfo &color_ ); - // Set color via ImageMagick PixelPacket - const Color& operator= ( const PixelPacket &color_ ); + // Set color via ImageMagick PixelInfo + const Color& operator= ( const PixelInfo &color_ ); // // Public methods beyond this point are for Magick++ use only. @@ -115,7 +115,7 @@ namespace Magick protected: - // PixelType specifies the interpretation of PixelPacket members + // PixelType specifies the interpretation of PixelInfo members // RGBPixel: // Red = red; // Green = green; @@ -137,25 +137,25 @@ namespace Magick CYMKPixel }; - // Constructor to construct with PixelPacket* + // Constructor to construct with PixelInfo* // Used to point Color at a pixel in an image - Color ( PixelPacket* rep_, PixelType pixelType_ ); + Color ( PixelInfo* rep_, PixelType pixelType_ ); // Set pixel // Used to point Color at a pixel in an image - void pixel ( PixelPacket* rep_, PixelType pixelType_ ); + void pixel ( PixelInfo* rep_, PixelType pixelType_ ); - // PixelPacket represents a color pixel: + // PixelInfo represents a color pixel: // red = red (range 0 to QuantumRange) // green = green (range 0 to QuantumRange) // blue = blue (range 0 to QuantumRange) // alpha = alpha (range OpaqueAlpha=0 to TransparentAlpha=QuantumRange) // index = PseudoColor colormap index - PixelPacket* _pixel; + PixelInfo* _pixel; private: - // Common initializer for PixelPacket representation + // Common initializer for PixelInfo representation void initPixel(); // Set true if we allocated pixel @@ -193,8 +193,8 @@ namespace Magick ColorHSL& operator= ( const Color& color_ ); protected: - // Constructor to construct with PixelPacket* - ColorHSL ( PixelPacket* rep_, PixelType pixelType_ ); + // Constructor to construct with PixelInfo* + ColorHSL ( PixelInfo* rep_, PixelType pixelType_ ); }; // @@ -217,8 +217,8 @@ namespace Magick ColorGray& operator= ( const Color& color_ ); protected: - // Constructor to construct with PixelPacket* - ColorGray ( PixelPacket* rep_, PixelType pixelType_ ); + // Constructor to construct with PixelInfo* + ColorGray ( PixelInfo* rep_, PixelType pixelType_ ); }; // @@ -241,8 +241,8 @@ namespace Magick ColorMono& operator= ( const Color& color_ ); protected: - // Constructor to construct with PixelPacket* - ColorMono ( PixelPacket* rep_, PixelType pixelType_ ); + // Constructor to construct with PixelInfo* + ColorMono ( PixelInfo* rep_, PixelType pixelType_ ); }; // @@ -270,8 +270,8 @@ namespace Magick ColorRGB& operator= ( const Color& color_ ); protected: - // Constructor to construct with PixelPacket* - ColorRGB ( PixelPacket* rep_, PixelType pixelType_ ); + // Constructor to construct with PixelInfo* + ColorRGB ( PixelInfo* rep_, PixelType pixelType_ ); }; // @@ -302,8 +302,8 @@ namespace Magick ColorYUV& operator= ( const Color& color_ ); protected: - // Constructor to construct with PixelPacket* - ColorYUV ( PixelPacket* rep_, PixelType pixelType_ ); + // Constructor to construct with PixelInfo* + ColorYUV ( PixelInfo* rep_, PixelType pixelType_ ); }; } // namespace Magick @@ -315,7 +315,7 @@ namespace Magick // Color // -// Common initializer for PixelPacket representation +// Common initializer for PixelInfo representation // Initialized transparent black inline void Magick::Color::initPixel() { @@ -369,8 +369,8 @@ inline Magick::Quantum Magick::Color::alphaQuantum ( void ) const return _pixel->alpha; } -// Return ImageMagick PixelPacket struct based on color. -inline Magick::Color::operator MagickCore::PixelPacket () const +// Return ImageMagick PixelInfo struct based on color. +inline Magick::Color::operator MagickCore::PixelInfo () const { return *_pixel; } @@ -388,7 +388,7 @@ inline double Magick::Color::alpha ( void ) const // // ColorHSL // -inline Magick::ColorHSL::ColorHSL ( Magick::PixelPacket* rep_, +inline Magick::ColorHSL::ColorHSL ( Magick::PixelInfo* rep_, Magick::Color::PixelType pixelType_ ) : Color( rep_, pixelType_ ) { @@ -397,7 +397,7 @@ inline Magick::ColorHSL::ColorHSL ( Magick::PixelPacket* rep_, // // ColorGray // -inline Magick::ColorGray::ColorGray ( Magick::PixelPacket* rep_, +inline Magick::ColorGray::ColorGray ( Magick::PixelInfo* rep_, Magick::Color::PixelType pixelType_ ) : Color( rep_, pixelType_ ) { @@ -406,7 +406,7 @@ inline Magick::ColorGray::ColorGray ( Magick::PixelPacket* rep_, // // ColorMono // -inline Magick::ColorMono::ColorMono ( Magick::PixelPacket* rep_, +inline Magick::ColorMono::ColorMono ( Magick::PixelInfo* rep_, Magick::Color::PixelType pixelType_ ) : Color( rep_, pixelType_ ) { @@ -415,7 +415,7 @@ inline Magick::ColorMono::ColorMono ( Magick::PixelPacket* rep_, // // ColorRGB // -inline Magick::ColorRGB::ColorRGB ( Magick::PixelPacket* rep_, +inline Magick::ColorRGB::ColorRGB ( Magick::PixelInfo* rep_, Magick::Color::PixelType pixelType_ ) : Color( rep_, pixelType_ ) { @@ -455,7 +455,7 @@ inline double Magick::ColorRGB::blue ( void ) const // ColorYUV // -inline Magick::ColorYUV::ColorYUV ( Magick::PixelPacket* rep_, +inline Magick::ColorYUV::ColorYUV ( Magick::PixelInfo* rep_, Magick::Color::PixelType pixelType_ ) : Color( rep_, pixelType_ ) { diff --git a/Magick++/lib/Magick++/Include.h b/Magick++/lib/Magick++/Include.h index 8bbd9d205..7f3b6d6f1 100644 --- a/Magick++/lib/Magick++/Include.h +++ b/Magick++/lib/Magick++/Include.h @@ -459,8 +459,8 @@ namespace Magick using MagickCore::PixelsPerInchResolution; using MagickCore::PixelsPerCentimeterResolution; - // PixelPacket structure - using MagickCore::PixelPacket; + // PixelInfo structure + using MagickCore::PixelInfo; using MagickCore::Quantum; // Sparse Color methods diff --git a/Magick++/lib/Magick++/STL.h b/Magick++/lib/Magick++/STL.h index e8fe33f35..da348f731 100644 --- a/Magick++/lib/Magick++/STL.h +++ b/Magick++/lib/Magick++/STL.h @@ -2101,7 +2101,7 @@ namespace Magick // Obtain histogram array size_t colors; - MagickCore::PixelPacket *histogram_array = + MagickCore::PixelInfo *histogram_array = MagickCore::GetImageHistogram( image.constImage(), &colors, &exceptionInfo ); throwException( exceptionInfo ); (void) MagickCore::DestroyExceptionInfo( &exceptionInfo ); @@ -2120,7 +2120,7 @@ namespace Magick } // Deallocate histogram array - histogram_array=(MagickCore::PixelPacket *) + histogram_array=(MagickCore::PixelInfo *) MagickCore::RelinquishMagickMemory(histogram_array); } diff --git a/MagickCore/accelerate.c b/MagickCore/accelerate.c index b59a086b6..a2b5f4880 100644 --- a/MagickCore/accelerate.c +++ b/MagickCore/accelerate.c @@ -118,24 +118,24 @@ #if defined(MAGICKCORE_HDRI_SUPPORT) #define CLOptions "-DMAGICKCORE_HDRI_SUPPORT=1 -DCLQuantum=float " \ "-DCLPixelType=float4 -DQuantumRange=%g -DMagickEpsilon=%g" -#define CLPixelPacket cl_float4 +#define CLPixelInfo cl_float4 #else #if (MAGICKCORE_QUANTUM_DEPTH == 8) #define CLOptions "-DCLQuantum=uchar -DCLPixelType=uchar4 " \ "-DQuantumRange=%g -DMagickEpsilon=%g" -#define CLPixelPacket cl_uchar4 +#define CLPixelInfo cl_uchar4 #elif (MAGICKCORE_QUANTUM_DEPTH == 16) #define CLOptions "-DCLQuantum=ushort -DCLPixelType=ushort4 " \ "-DQuantumRange=%g -DMagickEpsilon=%g" -#define CLPixelPacket cl_ushort4 +#define CLPixelInfo cl_ushort4 #elif (MAGICKCORE_QUANTUM_DEPTH == 32) #define CLOptions "-DCLQuantum=uint -DCLPixelType=uint4 " \ "-DQuantumRange=%g -DMagickEpsilon=%g" -#define CLPixelPacket cl_uint4 +#define CLPixelInfo cl_uint4 #elif (MAGICKCORE_QUANTUM_DEPTH == 64) #define CLOptions "-DCLQuantum=ussize_t -DCLPixelType=ussize_t4 " \ "-DQuantumRange=%g -DMagickEpsilon=%g" -#define CLPixelPacket cl_ulong4 +#define CLPixelInfo cl_ulong4 #endif #endif @@ -337,7 +337,7 @@ static MagickBooleanType BindConvolveParameters(ConvolveInfo *convolve_info, */ length=image->columns*image->rows; convolve_info->pixels=clCreateBuffer(convolve_info->context,(cl_mem_flags) - (CL_MEM_READ_ONLY | CL_MEM_USE_HOST_PTR),length*sizeof(CLPixelPacket), + (CL_MEM_READ_ONLY | CL_MEM_USE_HOST_PTR),length*sizeof(CLPixelInfo), (void *) pixels,&status); if ((convolve_info->pixels == (cl_mem) NULL) || (status != CL_SUCCESS)) return(MagickFalse); @@ -350,7 +350,7 @@ static MagickBooleanType BindConvolveParameters(ConvolveInfo *convolve_info, length=image->columns*image->rows; convolve_info->convolve_pixels=clCreateBuffer(convolve_info->context, (cl_mem_flags) (CL_MEM_WRITE_ONLY | CL_MEM_USE_HOST_PTR),length* - sizeof(CLPixelPacket),convolve_pixels,&status); + sizeof(CLPixelInfo),convolve_pixels,&status); if ((convolve_info->convolve_pixels == (cl_mem) NULL) || (status != CL_SUCCESS)) return(MagickFalse); @@ -438,7 +438,7 @@ static MagickBooleanType EnqueueConvolveKernel(ConvolveInfo *convolve_info, length=image->columns*image->rows; status=clEnqueueWriteBuffer(convolve_info->command_queue, - convolve_info->pixels,CL_TRUE,0,length*sizeof(CLPixelPacket),pixels,0,NULL, + convolve_info->pixels,CL_TRUE,0,length*sizeof(CLPixelInfo),pixels,0,NULL, NULL); length=width*height; status=clEnqueueWriteBuffer(convolve_info->command_queue, @@ -454,7 +454,7 @@ static MagickBooleanType EnqueueConvolveKernel(ConvolveInfo *convolve_info, return(MagickFalse); length=image->columns*image->rows; status=clEnqueueReadBuffer(convolve_info->command_queue, - convolve_info->convolve_pixels,CL_TRUE,0,length*sizeof(CLPixelPacket), + convolve_info->convolve_pixels,CL_TRUE,0,length*sizeof(CLPixelInfo), convolve_pixels,0,NULL,NULL); if (status != CL_SUCCESS) return(MagickFalse); diff --git a/MagickCore/animate.c b/MagickCore/animate.c index baa6196c2..8d0e59ac9 100644 --- a/MagickCore/animate.c +++ b/MagickCore/animate.c @@ -888,7 +888,7 @@ MagickExport void XAnimateBackgroundImage(Display *display, (next->colors > (size_t) visual_info->colormap_size)) break; for (i=0; i < (ssize_t) images->colors; i++) - if (IsPixelPacketEquivalent(next->colormap+i,images->colormap+i) == MagickFalse) + if (IsPixelInfoEquivalent(next->colormap+i,images->colormap+i) == MagickFalse) break; if (i < (ssize_t) images->colors) break; @@ -1510,7 +1510,7 @@ MagickExport Image *XAnimateImages(Display *display, (next->colors > (size_t) visual_info->colormap_size)) break; for (i=0; i < (ssize_t) images->colors; i++) - if (IsPixelPacketEquivalent(next->colormap+i,images->colormap+i) == MagickFalse) + if (IsPixelInfoEquivalent(next->colormap+i,images->colormap+i) == MagickFalse) break; if (i < (ssize_t) images->colors) break; diff --git a/MagickCore/annotate.c b/MagickCore/annotate.c index aa79a82ee..4e96da2de 100644 --- a/MagickCore/annotate.c +++ b/MagickCore/annotate.c @@ -1384,7 +1384,7 @@ static MagickBooleanType RenderFreetype(Image *image,const DrawInfo *draw_info, MagickRealType fill_opacity; - PixelPacket + PixelInfo fill_color; register Quantum @@ -1792,7 +1792,7 @@ static MagickBooleanType RenderPostscript(Image *image, MagickBooleanType sync; - PixelPacket + PixelInfo fill_color; /* diff --git a/MagickCore/attribute.c b/MagickCore/attribute.c index a4538acc4..86cf24ade 100644 --- a/MagickCore/attribute.c +++ b/MagickCore/attribute.c @@ -301,7 +301,7 @@ MagickExport size_t GetImageDepth(const Image *image, current_depth[id]=1; if ((image->storage_class == PseudoClass) && (image->matte == MagickFalse)) { - register const PixelPacket + register const PixelInfo *restrict p; register ssize_t @@ -884,7 +884,7 @@ MagickExport MagickBooleanType SetImageDepth(Image *image, image_view=DestroyCacheView(image_view); if (image->storage_class == PseudoClass) { - register PixelPacket + register PixelInfo *restrict p; register ssize_t diff --git a/MagickCore/color.c b/MagickCore/color.c index 27d7a86ee..e30c5e570 100644 --- a/MagickCore/color.c +++ b/MagickCore/color.c @@ -888,7 +888,7 @@ MagickPrivate void ColorComponentTerminus(void) % % The format of the GetColorInfo method is: % -% const PixelPacket *GetColorInfo(const char *name, +% const PixelInfo *GetColorInfo(const char *name, % const ComplianceType compliance,ExceptionInfo *exception) % % A description of each parameter follows: @@ -972,7 +972,7 @@ MagickExport const ColorInfo *GetColorCompliance(const char *name, % % The format of the GetColorInfo method is: % -% const PixelPacket *GetColorInfo(const char *name, +% const PixelInfo *GetColorInfo(const char *name, % ExceptionInfo *exception) % % A description of each parameter follows: @@ -1532,8 +1532,8 @@ static MagickBooleanType InitializeColorList(ExceptionInfo *exception) % % The format of the IsEquivalentAlpha method is: % -% void IsEquivalentAlpha(const Image *image,const PixelPacket *p, -% const PixelPacket *q) +% void IsEquivalentAlpha(const Image *image,const PixelInfo *p, +% const PixelInfo *q) % % A description of each parameter follows: % @@ -1553,7 +1553,7 @@ static inline double MagickMax(const double x,const double y) } MagickExport MagickBooleanType IsEquivalentAlpha(const Image *image, - const PixelPacket *p,const PixelPacket *q) + const PixelInfo *p,const PixelInfo *q) { MagickRealType fuzz, @@ -2122,7 +2122,7 @@ static MagickBooleanType LoadColorLists(const char *filename, % The format of the QueryColorCompliance method is: % % MagickBooleanType QueryColorCompliance(const char *name, -% const ComplianceType compliance,PixelPacket *color, +% const ComplianceType compliance,PixelInfo *color, % ExceptionInfo *exception) % % A description of each parameter follows: @@ -2146,7 +2146,7 @@ static inline double MagickMin(const double x,const double y) } MagickExport MagickBooleanType QueryColorCompliance(const char *name, - const ComplianceType compliance,PixelPacket *color,ExceptionInfo *exception) + const ComplianceType compliance,PixelInfo *color,ExceptionInfo *exception) { MagickBooleanType status; @@ -2195,7 +2195,7 @@ MagickExport MagickBooleanType QueryColorCompliance(const char *name, % The format of the QueryColorname method is: % % MagickBooleanType QueryColorname(const Image *image, -% const PixelPacket *color,const ComplianceType compliance,char *name, +% const PixelInfo *color,const ComplianceType compliance,char *name, % ExceptionInfo *exception) % % A description of each parameter follows. @@ -2212,7 +2212,7 @@ MagickExport MagickBooleanType QueryColorCompliance(const char *name, % */ MagickExport MagickBooleanType QueryColorname(const Image *image, - const PixelPacket *color,const ComplianceType compliance,char *name, + const PixelInfo *color,const ComplianceType compliance,char *name, ExceptionInfo *exception) { PixelInfo @@ -2292,7 +2292,7 @@ MagickExport MagickBooleanType QueryMagickColorCompliance(const char *name, char c; - PixelLongPacket + PixelPacket pixel; QuantumAny @@ -2445,7 +2445,7 @@ MagickExport MagickBooleanType QueryMagickColorCompliance(const char *name, (LocaleCompare(colorspace,"HSL") == 0) || (LocaleCompare(colorspace,"HWB") == 0)) { - PixelPacket + PixelInfo pixel; scale=1.0/360.0; @@ -2512,7 +2512,7 @@ MagickExport MagickBooleanType QueryMagickColorCompliance(const char *name, % The format of the QueryMagickColorname method is: % % MagickBooleanType QueryMagickColorname(const Image *image, -% const PixelPacket *color,const ComplianceType compliance,char *name, +% const PixelInfo *color,const ComplianceType compliance,char *name, % ExceptionInfo *exception) % % A description of each parameter follows. diff --git a/MagickCore/color.h b/MagickCore/color.h index 998deb03f..2761257c9 100644 --- a/MagickCore/color.h +++ b/MagickCore/color.h @@ -71,13 +71,13 @@ extern MagickExport const ColorInfo **GetColorInfoList(const char *,size_t *,ExceptionInfo *); extern MagickExport MagickBooleanType - IsEquivalentAlpha(const Image *,const PixelPacket *,const PixelPacket *), + IsEquivalentAlpha(const Image *,const PixelInfo *,const PixelInfo *), IsEquivalentImage(const Image *,const Image *,ssize_t *x,ssize_t *y, ExceptionInfo *), ListColorInfo(FILE *,ExceptionInfo *), - QueryColorCompliance(const char *,const ComplianceType,PixelPacket *, + QueryColorCompliance(const char *,const ComplianceType,PixelInfo *, ExceptionInfo *), - QueryColorname(const Image *,const PixelPacket *,const ComplianceType,char *, + QueryColorname(const Image *,const PixelInfo *,const ComplianceType,char *, ExceptionInfo *), QueryMagickColorCompliance(const char *,const ComplianceType,PixelInfo *, ExceptionInfo *), diff --git a/MagickCore/colormap.c b/MagickCore/colormap.c index 618f8e3de..4b6ab0d03 100644 --- a/MagickCore/colormap.c +++ b/MagickCore/colormap.c @@ -125,13 +125,13 @@ MagickExport MagickBooleanType AcquireImageColormap(Image *image, (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); image->colors=colors; length=(size_t) colors; - if (image->colormap == (PixelPacket *) NULL) - image->colormap=(PixelPacket *) AcquireQuantumMemory(length, + if (image->colormap == (PixelInfo *) NULL) + image->colormap=(PixelInfo *) AcquireQuantumMemory(length, sizeof(*image->colormap)); else - image->colormap=(PixelPacket *) ResizeQuantumMemory(image->colormap,length, + image->colormap=(PixelInfo *) ResizeQuantumMemory(image->colormap,length, sizeof(*image->colormap)); - if (image->colormap == (PixelPacket *) NULL) + if (image->colormap == (PixelInfo *) NULL) ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed", image->filename); for (i=0; i < (ssize_t) image->colors; i++) @@ -225,7 +225,7 @@ MagickExport MagickBooleanType CycleColormapImage(Image *image, if (index < 0) index+=(ssize_t) image->colors; SetPixelIndex(image,(Quantum) index,q); - SetPixelPacket(image,image->colormap+(ssize_t) index,q); + SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q); q+=GetPixelChannels(image); } if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse) @@ -268,17 +268,17 @@ extern "C" { static int IntensityCompare(const void *x,const void *y) { - const PixelPacket + const PixelInfo *color_1, *color_2; int intensity; - color_1=(const PixelPacket *) x; - color_2=(const PixelPacket *) y; - intensity=(int) GetPixelPacketIntensity(color_2)-(int) - GetPixelPacketIntensity(color_1); + color_1=(const PixelInfo *) x; + color_2=(const PixelInfo *) y; + intensity=(int) GetPixelInfoIntensity(color_2)-(int) + GetPixelInfoIntensity(color_1); return(intensity); } @@ -362,7 +362,7 @@ MagickExport MagickBooleanType SortColormapByIntensity(Image *image, { index=(Quantum) pixels[(ssize_t) GetPixelIndex(image,q)]; SetPixelIndex(image,index,q); - SetPixelPacket(image,image->colormap+(ssize_t) index,q); + SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q); q+=GetPixelChannels(image); } if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse) diff --git a/MagickCore/composite-private.h b/MagickCore/composite-private.h index e2efff089..58695d379 100644 --- a/MagickCore/composite-private.h +++ b/MagickCore/composite-private.h @@ -43,7 +43,7 @@ static inline MagickRealType MagickOver_(const MagickRealType p, return(Sa*p-Sa*Da*q+Da*q); } -static inline void CompositePixelOver(const Image *image,const PixelPacket *p, +static inline void CompositePixelOver(const Image *image,const PixelInfo *p, const MagickRealType alpha,const Quantum *q,const MagickRealType beta, Quantum *composite) { diff --git a/MagickCore/compress.c b/MagickCore/compress.c index 812537d91..c845f3f5d 100644 --- a/MagickCore/compress.c +++ b/MagickCore/compress.c @@ -635,7 +635,7 @@ MagickExport MagickBooleanType HuffmanDecodeImage(Image *image, { index=(Quantum) (*p++); SetPixelIndex(image,index,q); - SetPixelPacket(image,image->colormap+(ssize_t) index,q); + SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q); q+=GetPixelChannels(image); } if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse) diff --git a/MagickCore/display.c b/MagickCore/display.c index aa73468d0..a05a1dadf 100644 --- a/MagickCore/display.c +++ b/MagickCore/display.c @@ -3751,7 +3751,7 @@ static MagickBooleanType XColorEditImage(Display *display, } case ReplaceMethod: { - PixelPacket + PixelInfo pixel, target; @@ -3777,8 +3777,8 @@ static MagickBooleanType XColorEditImage(Display *display, break; for (x=0; x < (int) (*image)->columns; x++) { - GetPixelPacketPixel(*image,q,&pixel); - if (IsFuzzyEquivalencePixelPacket(*image,&pixel,&target)) + GetPixelInfoPixel(*image,q,&pixel); + if (IsFuzzyEquivalencePixelInfo(&pixel,&target)) { SetPixelRed(*image,ScaleShortToQuantum( color.red),q); @@ -3796,7 +3796,7 @@ static MagickBooleanType XColorEditImage(Display *display, else { for (i=0; i < (ssize_t) (*image)->colors; i++) - if (IsFuzzyEquivalencePixelPacket(*image,(*image)->colormap+i,&target)) + if (IsFuzzyEquivalencePixelInfo((*image)->colormap+i,&target)) { (*image)->colormap[i].red=ScaleShortToQuantum( color.red); @@ -6566,7 +6566,7 @@ static void XImageCache(Display *display,XResourceInfo *resource_info, ssize_t bytes; - bytes=(ssize_t) ((*image)->columns*(*image)->rows*sizeof(PixelPacket)); + bytes=(ssize_t) ((*image)->columns*(*image)->rows*sizeof(PixelInfo)); if (undo_image != (Image *) NULL) { /* @@ -6576,14 +6576,14 @@ static void XImageCache(Display *display,XResourceInfo *resource_info, while (previous_image != (Image *) NULL) { bytes+=previous_image->list->columns*previous_image->list->rows* - sizeof(PixelPacket); + sizeof(PixelInfo); if (bytes <= (ssize_t) (resource_info->undo_cache << 20)) { previous_image=GetPreviousImageInList(previous_image); continue; } bytes-=previous_image->list->columns*previous_image->list->rows* - sizeof(PixelPacket); + sizeof(PixelInfo); if (previous_image == undo_image) undo_image=NewImageList(); else @@ -10103,7 +10103,7 @@ static MagickBooleanType XMatteEditImage(Display *display, } case ReplaceMethod: { - PixelPacket + PixelInfo pixel, target; @@ -10127,8 +10127,8 @@ static MagickBooleanType XMatteEditImage(Display *display, break; for (x=0; x < (int) (*image)->columns; x++) { - GetPixelPacketPixel(*image,q,&pixel); - if (IsFuzzyEquivalencePixelPacket(*image,&pixel,&target)) + GetPixelInfoPixel(*image,q,&pixel); + if (IsFuzzyEquivalencePixelInfo(&pixel,&target)) SetPixelAlpha(*image,(Quantum) StringToLong(matte),q); q+=GetPixelChannels(*image); } @@ -13215,7 +13215,7 @@ static Image *XTileImage(Display *display,XResourceInfo *resource_info, x_offset, y_offset; - PixelPacket + PixelInfo pixel; Quantum @@ -13231,6 +13231,7 @@ static Image *XTileImage(Display *display,XResourceInfo *resource_info, Ensure all the images exist. */ tile=0; + GetPixelInfo(image,&pixel); for (p=image->directory; *p != '\0'; p++) { CacheView @@ -13266,7 +13267,7 @@ static Image *XTileImage(Display *display,XResourceInfo *resource_info, break; for (j=0; j < (int) width; j++) { - SetPixelPacket(image,&pixel,s); + SetPixelPixelInfo(image,&pixel,s); s+=GetPixelChannels(image); } if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse) diff --git a/MagickCore/draw-private.h b/MagickCore/draw-private.h index b6aee7bd2..46f358863 100644 --- a/MagickCore/draw-private.h +++ b/MagickCore/draw-private.h @@ -27,7 +27,7 @@ extern "C" { #include "MagickCore/memory_.h" static inline MagickBooleanType GetFillColor(const DrawInfo *draw_info, - const ssize_t x,const ssize_t y,PixelPacket *fill,ExceptionInfo *exception) + const ssize_t x,const ssize_t y,PixelInfo *fill,ExceptionInfo *exception) { if (draw_info->fill_pattern == (Image *) NULL) { @@ -59,7 +59,7 @@ static inline MagickBooleanType GetFillColor(const DrawInfo *draw_info, } static inline MagickBooleanType GetStrokeColor(const DrawInfo *draw_info, - const ssize_t x,const ssize_t y,PixelPacket *stroke,ExceptionInfo *exception) + const ssize_t x,const ssize_t y,PixelInfo *stroke,ExceptionInfo *exception) { if (draw_info->stroke_pattern == (Image *) NULL) { diff --git a/MagickCore/draw.c b/MagickCore/draw.c index b22152da6..2b234b2a4 100644 --- a/MagickCore/draw.c +++ b/MagickCore/draw.c @@ -1703,7 +1703,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info, PointInfo point; - PixelPacket + PixelInfo start_color; PrimitiveInfo @@ -2481,7 +2481,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info, } if (LocaleCompare("stop-color",keyword) == 0) { - PixelPacket + PixelInfo stop_color; GetMagickToken(q,&q,token); @@ -3865,7 +3865,7 @@ static MagickBooleanType DrawPolygonPrimitive(Image *image, MagickBooleanType sync; - PixelPacket + PixelInfo pixel; register ssize_t @@ -3884,13 +3884,14 @@ static MagickBooleanType DrawPolygonPrimitive(Image *image, status=MagickFalse; continue; } + GetPixelInfo(image,&pixel); for ( ; x <= stop; x++) { if ((x == (ssize_t) ceil(primitive_info->point.x-0.5)) && (y == (ssize_t) ceil(primitive_info->point.y-0.5))) { (void) GetStrokeColor(draw_info,x,y,&pixel,exception); - SetPixelPacket(image,&pixel,q); + SetPixelPixelInfo(image,&pixel,q); } q+=GetPixelChannels(image); } @@ -3922,7 +3923,7 @@ static MagickBooleanType DrawPolygonPrimitive(Image *image, fill_opacity, stroke_opacity; - PixelPacket + PixelInfo fill_color, stroke_color; @@ -4140,7 +4141,7 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image, { case PointPrimitive: { - PixelPacket + PixelInfo fill_color; register Quantum @@ -4166,7 +4167,7 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image, case PointMethod: default: { - PixelPacket + PixelInfo pixel; register Quantum @@ -4175,8 +4176,9 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image, q=GetCacheViewAuthenticPixels(image_view,x,y,1,1,exception); if (q == (Quantum *) NULL) break; + GetPixelInfo(image,&pixel); (void) GetFillColor(draw_info,x,y,&pixel,exception); - SetPixelPacket(image,&pixel,q); + SetPixelPixelInfo(image,&pixel,q); (void) SyncCacheViewAuthenticPixels(image_view,exception); break; } @@ -4185,7 +4187,7 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image, MagickBooleanType sync; - PixelPacket + PixelInfo pixel, target; @@ -4209,14 +4211,14 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image, break; for (x=0; x < (ssize_t) image->columns; x++) { - GetPixelPacketPixel(image,q,&pixel); - if (IsFuzzyEquivalencePixelPacket(image,&pixel,&target) == MagickFalse) + GetPixelInfoPixel(image,q,&pixel); + if (IsFuzzyEquivalencePixelInfo(&pixel,&target) == MagickFalse) { q+=GetPixelChannels(image); continue; } (void) GetFillColor(draw_info,x,y,&pixel,exception); - SetPixelPacket(image,&pixel,q); + SetPixelPixelInfo(image,&pixel,q); q+=GetPixelChannels(image); } sync=SyncCacheViewAuthenticPixels(image_view,exception); @@ -4248,9 +4250,10 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image, MagickBooleanType sync; - PixelPacket + PixelInfo pixel; + GetPixelInfo(image,&pixel); for (y=0; y < (ssize_t) image->rows; y++) { register Quantum @@ -4266,7 +4269,7 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image, for (x=0; x < (ssize_t) image->columns; x++) { (void) GetFillColor(draw_info,x,y,&pixel,exception); - SetPixelPacket(image,&pixel,q); + SetPixelPixelInfo(image,&pixel,q); q+=GetPixelChannels(image); } sync=SyncCacheViewAuthenticPixels(image_view,exception); @@ -4287,7 +4290,7 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image, case PointMethod: default: { - PixelPacket + PixelInfo pixel; register Quantum @@ -4306,7 +4309,7 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image, MagickBooleanType sync; - PixelPacket + PixelInfo pixel, target; @@ -4333,8 +4336,8 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image, break; for (x=0; x < (ssize_t) image->columns; x++) { - GetPixelPacketPixel(image,q,&pixel); - if (IsFuzzyEquivalencePixelPacket(image,&pixel,&target) == MagickFalse) + GetPixelInfoPixel(image,q,&pixel); + if (IsFuzzyEquivalencePixelInfo(&pixel,&target) == MagickFalse) { q+=GetPixelChannels(image); continue; @@ -4377,7 +4380,7 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image, MagickBooleanType sync; - PixelPacket + PixelInfo pixel; for (y=0; y < (ssize_t) image->rows; y++) diff --git a/MagickCore/draw.h b/MagickCore/draw.h index 164b10c33..16c9de00e 100644 --- a/MagickCore/draw.h +++ b/MagickCore/draw.h @@ -217,7 +217,7 @@ typedef struct _DrawInfo GravityType gravity; - PixelPacket + PixelInfo fill, stroke; @@ -288,7 +288,7 @@ typedef struct _DrawInfo AlignType align; - PixelPacket + PixelInfo undercolor, border_color; diff --git a/MagickCore/enhance.c b/MagickCore/enhance.c index 6e3ca6790..30a0ff7d1 100644 --- a/MagickCore/enhance.c +++ b/MagickCore/enhance.c @@ -508,7 +508,7 @@ MagickExport MagickBooleanType ColorDecisionListImage(Image *image, MagickOffsetType progress; - PixelPacket + PixelInfo *cdl_map; register ssize_t @@ -701,8 +701,8 @@ MagickExport MagickBooleanType ColorDecisionListImage(Image *image, (void) LogMagickEvent(TransformEvent,GetMagickModule(), " color_correction.saturation: %g",color_correction.saturation); } - cdl_map=(PixelPacket *) AcquireQuantumMemory(MaxMap+1UL,sizeof(*cdl_map)); - if (cdl_map == (PixelPacket *) NULL) + cdl_map=(PixelInfo *) AcquireQuantumMemory(MaxMap+1UL,sizeof(*cdl_map)); + if (cdl_map == (PixelInfo *) NULL) ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed", image->filename); #if defined(MAGICKCORE_OPENMP_SUPPORT) @@ -803,7 +803,7 @@ MagickExport MagickBooleanType ColorDecisionListImage(Image *image, } } image_view=DestroyCacheView(image_view); - cdl_map=(PixelPacket *) RelinquishMagickMemory(cdl_map); + cdl_map=(PixelInfo *) RelinquishMagickMemory(cdl_map); return(status); } diff --git a/MagickCore/feature.c b/MagickCore/feature.c index 3ccfa55f6..f0b12578a 100644 --- a/MagickCore/feature.c +++ b/MagickCore/feature.c @@ -140,7 +140,7 @@ MagickExport ChannelFeatures *GetImageFeatures(const Image *image, { typedef struct _ChannelStatistics { - PixelDoublePacket + PixelInfo direction[4]; /* horizontal, vertical, left and right diagonals */ } ChannelStatistics; @@ -167,7 +167,7 @@ MagickExport ChannelFeatures *GetImageFeatures(const Image *image, sum_squares, variance; - PixelLongPacket + PixelPacket gray, *grays; @@ -203,8 +203,8 @@ MagickExport ChannelFeatures *GetImageFeatures(const Image *image, /* Form grays. */ - grays=(PixelLongPacket *) AcquireQuantumMemory(MaxMap+1UL,sizeof(*grays)); - if (grays == (PixelLongPacket *) NULL) + grays=(PixelPacket *) AcquireQuantumMemory(MaxMap+1UL,sizeof(*grays)); + if (grays == (PixelPacket *) NULL) { channel_features=(ChannelFeatures *) RelinquishMagickMemory( channel_features); @@ -261,7 +261,7 @@ MagickExport ChannelFeatures *GetImageFeatures(const Image *image, image_view=DestroyCacheView(image_view); if (status == MagickFalse) { - grays=(PixelLongPacket *) RelinquishMagickMemory(grays); + grays=(PixelPacket *) RelinquishMagickMemory(grays); channel_features=(ChannelFeatures *) RelinquishMagickMemory( channel_features); return(channel_features); @@ -335,7 +335,7 @@ MagickExport ChannelFeatures *GetImageFeatures(const Image *image, cooccurrence=(ChannelStatistics **) RelinquishMagickMemory( cooccurrence); } - grays=(PixelLongPacket *) RelinquishMagickMemory(grays); + grays=(PixelPacket *) RelinquishMagickMemory(grays); channel_features=(ChannelFeatures *) RelinquishMagickMemory( channel_features); (void) ThrowMagickException(exception,GetMagickModule(), @@ -384,7 +384,7 @@ MagickExport ChannelFeatures *GetImageFeatures(const Image *image, density_y=(ChannelStatistics *) RelinquishMagickMemory(density_y); density_xy=(ChannelStatistics *) RelinquishMagickMemory(density_xy); density_x=(ChannelStatistics *) RelinquishMagickMemory(density_x); - grays=(PixelLongPacket *) RelinquishMagickMemory(grays); + grays=(PixelPacket *) RelinquishMagickMemory(grays); channel_features=(ChannelFeatures *) RelinquishMagickMemory( channel_features); (void) ThrowMagickException(exception,GetMagickModule(), @@ -510,7 +510,7 @@ MagickExport ChannelFeatures *GetImageFeatures(const Image *image, p+=GetPixelChannels(image); } } - grays=(PixelLongPacket *) RelinquishMagickMemory(grays); + grays=(PixelPacket *) RelinquishMagickMemory(grays); image_view=DestroyCacheView(image_view); if (status == MagickFalse) { diff --git a/MagickCore/fx.c b/MagickCore/fx.c index 0e33a9350..6abf33db6 100644 --- a/MagickCore/fx.c +++ b/MagickCore/fx.c @@ -4624,7 +4624,7 @@ MagickExport Image *SteganoImage(const Image *image,const Image *watermark, MagickBooleanType status; - PixelPacket + PixelInfo pixel; register Quantum @@ -4702,19 +4702,19 @@ MagickExport Image *SteganoImage(const Image *image,const Image *watermark, case 0: { SetPixelRed(image,SetBit(GetPixelRed(image,q),j,GetBit( - GetPixelPacketIntensity(&pixel),i)),q); + GetPixelInfoIntensity(&pixel),i)),q); break; } case 1: { SetPixelGreen(image,SetBit(GetPixelGreen(image,q),j,GetBit( - GetPixelPacketIntensity(&pixel),i)),q); + GetPixelInfoIntensity(&pixel),i)),q); break; } case 2: { SetPixelBlue(image,SetBit(GetPixelBlue(image,q),j,GetBit( - GetPixelPacketIntensity(&pixel),i)),q); + GetPixelInfoIntensity(&pixel),i)),q); break; } } diff --git a/MagickCore/histogram.c b/MagickCore/histogram.c index ea7e2a621..37486040f 100644 --- a/MagickCore/histogram.c +++ b/MagickCore/histogram.c @@ -75,7 +75,7 @@ typedef struct _NodeInfo struct _NodeInfo *child[16]; - PixelPacket + PixelInfo *list; MagickSizeType @@ -266,12 +266,12 @@ static CubeInfo *ClassifyImageColors(const Image *image, else { if (node_info->number_unique == 0) - node_info->list=(PixelPacket *) AcquireMagickMemory( + node_info->list=(PixelInfo *) AcquireMagickMemory( sizeof(*node_info->list)); else - node_info->list=(PixelPacket *) ResizeQuantumMemory(node_info->list, + node_info->list=(PixelInfo *) ResizeQuantumMemory(node_info->list, (size_t) (i+1),sizeof(*node_info->list)); - if (node_info->list == (PixelPacket *) NULL) + if (node_info->list == (PixelInfo *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), ResourceLimitError,"MemoryAllocationFailed","`%s'", @@ -317,7 +317,7 @@ static CubeInfo *ClassifyImageColors(const Image *image, % The format of the DefineImageHistogram method is: % % DefineImageHistogram(const Image *image,NodeInfo *node_info, -% PixelPacket **unique_colors) +% PixelInfo **unique_colors) % % A description of each parameter follows. % @@ -330,7 +330,7 @@ static CubeInfo *ClassifyImageColors(const Image *image, % */ static void DefineImageHistogram(const Image *image,NodeInfo *node_info, - PixelPacket **histogram) + PixelInfo **histogram) { register ssize_t i; @@ -347,7 +347,7 @@ static void DefineImageHistogram(const Image *image,NodeInfo *node_info, DefineImageHistogram(image,node_info->child[i],histogram); if (node_info->level == (MaxTreeDepth-1)) { - register PixelPacket + register PixelInfo *p; p=node_info->list; @@ -449,8 +449,8 @@ static void DestroyColorCube(const Image *image,NodeInfo *node_info) for (i=0; i < (ssize_t) number_children; i++) if (node_info->child[i] != (NodeInfo *) NULL) DestroyColorCube(image,node_info->child[i]); - if (node_info->list != (PixelPacket *) NULL) - node_info->list=(PixelPacket *) RelinquishMagickMemory(node_info->list); + if (node_info->list != (PixelInfo *) NULL) + node_info->list=(PixelInfo *) RelinquishMagickMemory(node_info->list); } /* @@ -523,28 +523,28 @@ static CubeInfo *GetCubeInfo(void) % o exception: return any errors or warnings in this structure. % */ -MagickExport PixelPacket *GetImageHistogram(const Image *image, +MagickExport PixelInfo *GetImageHistogram(const Image *image, size_t *number_colors,ExceptionInfo *exception) { - PixelPacket + PixelInfo *histogram; CubeInfo *cube_info; *number_colors=0; - histogram=(PixelPacket *) NULL; + histogram=(PixelInfo *) NULL; cube_info=ClassifyImageColors(image,exception); if (cube_info != (CubeInfo *) NULL) { - histogram=(PixelPacket *) AcquireQuantumMemory((size_t) cube_info->colors, + histogram=(PixelInfo *) AcquireQuantumMemory((size_t) cube_info->colors, sizeof(*histogram)); - if (histogram == (PixelPacket *) NULL) + if (histogram == (PixelInfo *) NULL) (void) ThrowMagickException(exception,GetMagickModule(), ResourceLimitError,"MemoryAllocationFailed","`%s'",image->filename); else { - PixelPacket + PixelInfo *root; *number_colors=cube_info->colors; @@ -737,12 +737,12 @@ MagickExport MagickBooleanType IsHistogramImage(const Image *image, Add this unique color to the color list. */ if (node_info->number_unique == 0) - node_info->list=(PixelPacket *) AcquireMagickMemory( + node_info->list=(PixelInfo *) AcquireMagickMemory( sizeof(*node_info->list)); else - node_info->list=(PixelPacket *) ResizeQuantumMemory(node_info->list, + node_info->list=(PixelInfo *) ResizeQuantumMemory(node_info->list, (size_t) (i+1),sizeof(*node_info->list)); - if (node_info->list == (PixelPacket *) NULL) + if (node_info->list == (PixelInfo *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), ResourceLimitError,"MemoryAllocationFailed","`%s'", @@ -897,12 +897,12 @@ MagickExport MagickBooleanType IsPaletteImage(const Image *image, Add this unique color to the color list. */ if (node_info->number_unique == 0) - node_info->list=(PixelPacket *) AcquireMagickMemory( + node_info->list=(PixelInfo *) AcquireMagickMemory( sizeof(*node_info->list)); else - node_info->list=(PixelPacket *) ResizeQuantumMemory(node_info->list, + node_info->list=(PixelInfo *) ResizeQuantumMemory(node_info->list, (size_t) (i+1),sizeof(*node_info->list)); - if (node_info->list == (PixelPacket *) NULL) + if (node_info->list == (PixelInfo *) NULL) { (void) ThrowMagickException(exception,GetMagickModule(), ResourceLimitError,"MemoryAllocationFailed","`%s'", @@ -1065,12 +1065,12 @@ extern "C" { static int HistogramCompare(const void *x,const void *y) { - const PixelPacket + const PixelInfo *color_1, *color_2; - color_1=(const PixelPacket *) x; - color_2=(const PixelPacket *) y; + color_1=(const PixelInfo *) x; + color_2=(const PixelInfo *) y; if (color_2->red != color_1->red) return((int) color_1->red-(int) color_2->red); if (color_2->green != color_1->green) @@ -1094,7 +1094,7 @@ MagickExport size_t GetNumberColors(const Image *image,FILE *file, hex[MaxTextExtent], tuple[MaxTextExtent]; - PixelPacket + PixelInfo *histogram; MagickBooleanType @@ -1103,7 +1103,7 @@ MagickExport size_t GetNumberColors(const Image *image,FILE *file, PixelInfo pixel; - register PixelPacket + register PixelInfo *p; register ssize_t @@ -1125,7 +1125,7 @@ MagickExport size_t GetNumberColors(const Image *image,FILE *file, return(number_colors); } histogram=GetImageHistogram(image,&number_colors,exception); - if (histogram == (PixelPacket *) NULL) + if (histogram == (PixelInfo *) NULL) return(number_colors); qsort((void *) histogram,(size_t) number_colors,sizeof(*histogram), HistogramCompare); @@ -1171,7 +1171,7 @@ MagickExport size_t GetNumberColors(const Image *image,FILE *file, p++; } (void) fflush(file); - histogram=(PixelPacket *) RelinquishMagickMemory(histogram); + histogram=(PixelInfo *) RelinquishMagickMemory(histogram); if (status == MagickFalse) return(0); return(number_colors); @@ -1226,7 +1226,7 @@ static void UniqueColorsToImage(Image *unique_image,CacheView *unique_view, node_info->child[i],exception); if (node_info->level == (MaxTreeDepth-1)) { - register PixelPacket + register PixelInfo *p; register Quantum diff --git a/MagickCore/histogram.h b/MagickCore/histogram.h index 533f4b6e9..06606c0c7 100644 --- a/MagickCore/histogram.h +++ b/MagickCore/histogram.h @@ -22,7 +22,7 @@ extern "C" { #endif -extern MagickExport PixelPacket +extern MagickExport PixelInfo *GetImageHistogram(const Image *,size_t *,ExceptionInfo *); extern MagickExport Image diff --git a/MagickCore/identify.c b/MagickCore/identify.c index 782d048ee..626362088 100644 --- a/MagickCore/identify.c +++ b/MagickCore/identify.c @@ -635,7 +635,7 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file, PixelInfo pixel; - register PixelPacket + register PixelInfo *restrict p; GetPixelInfo(image,&pixel); diff --git a/MagickCore/image.c b/MagickCore/image.c index 9bc75e41b..371d28a43 100644 --- a/MagickCore/image.c +++ b/MagickCore/image.c @@ -805,16 +805,16 @@ MagickExport Image *CloneImage(const Image *image,const size_t columns, clone_image->columns=image->columns; clone_image->rows=image->rows; clone_image->dither=image->dither; - if (image->colormap != (PixelPacket *) NULL) + if (image->colormap != (PixelInfo *) NULL) { /* Allocate and copy the image colormap. */ clone_image->colors=image->colors; length=(size_t) image->colors; - clone_image->colormap=(PixelPacket *) AcquireQuantumMemory(length, + clone_image->colormap=(PixelInfo *) AcquireQuantumMemory(length, sizeof(*clone_image->colormap)); - if (clone_image->colormap == (PixelPacket *) NULL) + if (clone_image->colormap == (PixelInfo *) NULL) ThrowImageException(ResourceLimitError,"MemoryAllocationFailed"); (void) CopyMagickMemory(clone_image->colormap,image->colormap,length* sizeof(*clone_image->colormap)); @@ -1217,8 +1217,8 @@ MagickExport Image *DestroyImage(Image *image) image->montage=DestroyString(image->montage); if (image->directory != (char *) NULL) image->directory=DestroyString(image->directory); - if (image->colormap != (PixelPacket *) NULL) - image->colormap=(PixelPacket *) RelinquishMagickMemory(image->colormap); + if (image->colormap != (PixelInfo *) NULL) + image->colormap=(PixelInfo *) RelinquishMagickMemory(image->colormap); if (image->geometry != (char *) NULL) image->geometry=DestroyString(image->geometry); DestroyImageProfiles(image); @@ -2482,7 +2482,7 @@ MagickExport MagickBooleanType SetImageAlphaChannel(Image *image, PixelInfo background; - PixelPacket + PixelInfo pixel; ssize_t @@ -2639,7 +2639,7 @@ MagickExport MagickBooleanType SetImageBackgroundColor(Image *image) PixelInfo background; - PixelPacket + PixelInfo pixel; ssize_t @@ -4092,7 +4092,7 @@ MagickExport MagickBooleanType SyncImage(Image *image) { index=PushColormapIndex(image,(size_t) GetPixelIndex(image,q), &range_exception); - SetPixelPacket(image,image->colormap+(ssize_t) index,q); + SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q); q+=GetPixelChannels(image); } if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse) diff --git a/MagickCore/image.h b/MagickCore/image.h index ac3691e51..288e84467 100644 --- a/MagickCore/image.h +++ b/MagickCore/image.h @@ -172,7 +172,7 @@ struct _Image colors; /* Size of color table, or actual color count if known */ /* Only valid if image is not DirectClass */ - PixelPacket + PixelInfo *colormap, background_color, /* current background color attribute */ border_color, /* current bordercolor attribute */ @@ -255,7 +255,7 @@ struct _Image MagickBooleanType black_point_compensation; - PixelPacket + PixelInfo transparent_color; /* color for 'transparent' color index in GIF */ struct _Image @@ -398,7 +398,7 @@ struct _ImageInfo pointsize, fuzz; /* current color fuzz attribute */ - PixelPacket + PixelInfo background_color, border_color, matte_color; @@ -436,7 +436,7 @@ struct _ImageInfo VirtualPixelMethod virtual_pixel_method; - PixelPacket + PixelInfo transparent_color; void diff --git a/MagickCore/magick-config.h b/MagickCore/magick-config.h index df4049a78..d7d2044be 100644 --- a/MagickCore/magick-config.h +++ b/MagickCore/magick-config.h @@ -12,7 +12,9 @@ /* #undef AUTOTRACE_DELEGATE */ /* Define if coders and filters are to be built as modules. */ -/* #undef BUILD_MODULES */ +#ifndef MAGICKCORE_BUILD_MODULES +#define MAGICKCORE_BUILD_MODULES 1 +#endif /* Define if you have the bzip2 library */ #ifndef MAGICKCORE_BZLIB_DELEGATE @@ -75,7 +77,9 @@ #endif /* Define if you have FFTW library */ -/* #undef FFTW_DELEGATE */ +#ifndef MAGICKCORE_FFTW_DELEGATE +#define MAGICKCORE_FFTW_DELEGATE 1 +#endif /* Location of filter modules */ #ifndef MAGICKCORE_FILTER_PATH @@ -217,7 +221,9 @@ #endif /* Define to 1 if you have the header file. */ -/* #undef HAVE_CL_CL_H */ +#ifndef MAGICKCORE_HAVE_CL_CL_H +#define MAGICKCORE_HAVE_CL_CL_H 1 +#endif /* Define to 1 if you have the header file. */ #ifndef MAGICKCORE_HAVE_COMPLEX_H @@ -1160,7 +1166,9 @@ #endif /* Define if you have JBIG library */ -/* #undef JBIG_DELEGATE */ +#ifndef MAGICKCORE_JBIG_DELEGATE +#define MAGICKCORE_JBIG_DELEGATE 1 +#endif /* Define if you have JPEG version 2 "Jasper" library */ #ifndef MAGICKCORE_JP2_DELEGATE @@ -1201,7 +1209,7 @@ /* Define to the system default library search path. */ #ifndef MAGICKCORE_LT_DLSEARCH_PATH -#define MAGICKCORE_LT_DLSEARCH_PATH "/lib64:/usr/lib64:/lib:/usr/lib:/usr/lib64/atlas:/usr/lib/llvm:/usr/lib64/llvm:/usr/lib64/mysql:/usr/lib64/qt-3.3/lib:/usr/lib64/tcl8.5/tclx8.4:/usr/lib64/tcl8.5:/usr/lib/wine/:/usr/lib64/wine/:/usr/lib64/xulrunner-2" +#define MAGICKCORE_LT_DLSEARCH_PATH "/lib64:/usr/lib64:/lib:/usr/lib:/usr/lib64/R/lib:/usr/lib64/alliance/lib:/usr/lib64/atlas:/opt/modules/pkg/intel/f77/10.0.025/lib:/usr/lib64/kicad:/usr/lib/llvm:/usr/lib64/llvm:/usr/local/lib:/usr/lib64/mpich2/lib/:/usr/lib64/mysql:/usr/lib64/nvidia:/usr/lib64/octave/3.4.2:/usr/lib64/openmotif:/usr/lib64/qt-3.3/lib:/usr/lib64/tcl8.5/tclx8.4:/usr/lib/wine/:/usr/lib64/wine/:/usr/lib64/xulrunner-2" #endif /* The archive extension */ @@ -1252,7 +1260,9 @@ /* #undef NO_MINUS_C_MINUS_O */ /* Define if you have OPENEXR library */ -/* #undef OPENEXR_DELEGATE */ +#ifndef MAGICKCORE_OPENEXR_DELEGATE +#define MAGICKCORE_OPENEXR_DELEGATE 1 +#endif /* Define to the address where bug reports for this package should be sent. */ #ifndef MAGICKCORE_PACKAGE_BUGREPORT @@ -1307,7 +1317,9 @@ #endif /* Define if you have RSVG library */ -/* #undef RSVG_DELEGATE */ +#ifndef MAGICKCORE_RSVG_DELEGATE +#define MAGICKCORE_RSVG_DELEGATE 1 +#endif /* Define to the type of arg 1 for `select'. */ #ifndef MAGICKCORE_SELECT_TYPE_ARG1 @@ -1453,7 +1465,9 @@ /* #undef WITH_DMALLOC */ /* Define if you have WMF library */ -/* #undef WMF_DELEGATE */ +#ifndef MAGICKCORE_WMF_DELEGATE +#define MAGICKCORE_WMF_DELEGATE 1 +#endif /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ @@ -1509,7 +1523,9 @@ /* #undef _MINIX */ /* Define this for the OpenCL Accelerator */ -/* #undef _OPENCL */ +#ifndef MAGICKCORE__OPENCL +#define MAGICKCORE__OPENCL 1 +#endif /* Define to 2 if the system does not provide POSIX.1 features except with this defined. */ diff --git a/MagickCore/methods.h b/MagickCore/methods.h index 59b05b6a5..23bf50f67 100644 --- a/MagickCore/methods.h +++ b/MagickCore/methods.h @@ -652,7 +652,7 @@ extern "C" { #define IsBlobExempt PrependMagickMethod(IsBlobExempt) #define IsBlobSeekable PrependMagickMethod(IsBlobSeekable) #define IsBlobTemporary PrependMagickMethod(IsBlobTemporary) -#define IsFuzzyEquivalencePixelPacket PrependMagickMethod(IsFuzzyEquivalencePixelPacket) +#define IsFuzzyEquivalencePixelInfo PrependMagickMethod(IsFuzzyEquivalencePixelInfo) #define IsEventLogging PrependMagickMethod(IsEventLogging) #define IsGeometry PrependMagickMethod(IsGeometry) #define IsGlob PrependMagickMethod(IsGlob) diff --git a/MagickCore/montage.h b/MagickCore/montage.h index 34b4a0a37..3a7a6c88b 100644 --- a/MagickCore/montage.h +++ b/MagickCore/montage.h @@ -49,7 +49,7 @@ typedef struct _MontageInfo MagickBooleanType shadow; - PixelPacket + PixelInfo fill, stroke, background_color, diff --git a/MagickCore/nt-base.c b/MagickCore/nt-base.c index a1a5e4ddf..a4c1da97b 100644 --- a/MagickCore/nt-base.c +++ b/MagickCore/nt-base.c @@ -218,8 +218,8 @@ MagickExport void *CropImageToHBITMAP(Image *image, break; #if MAGICKCORE_QUANTUM_DEPTH == 8 - /* Form of PixelPacket is identical to RGBQUAD when MAGICKCORE_QUANTUM_DEPTH==8 */ - CopyMagickMemory((void*)q,(const void*)p,page.width*sizeof(PixelPacket)); + /* Form of PixelInfo is identical to RGBQUAD when MAGICKCORE_QUANTUM_DEPTH==8 */ + CopyMagickMemory((void*)q,(const void*)p,page.width*sizeof(PixelInfo)); q += page.width; #else /* 16 or 32 bit Quantum */ diff --git a/MagickCore/paint.c b/MagickCore/paint.c index c94f8919a..ae2d91f77 100644 --- a/MagickCore/paint.c +++ b/MagickCore/paint.c @@ -141,7 +141,7 @@ MagickExport MagickBooleanType FloodfillPaintImage(Image *image, fill, pixel; - PixelPacket + PixelInfo fill_color; register SegmentInfo @@ -382,8 +382,8 @@ MagickExport MagickBooleanType FloodfillPaintImage(Image *image, % The format of the GradientImage method is: % % MagickBooleanType GradientImage(Image *image,const GradientType type, -% const SpreadMethod method,const PixelPacket *start_color, -% const PixelPacket *stop_color,ExceptionInfo *exception) +% const SpreadMethod method,const PixelInfo *start_color, +% const PixelInfo *stop_color,ExceptionInfo *exception) % % A description of each parameter follows: % @@ -408,7 +408,7 @@ static inline double MagickMax(const double x,const double y) MagickExport MagickBooleanType GradientImage(Image *image, const GradientType type,const SpreadMethod method, - const PixelPacket *start_color,const PixelPacket *stop_color, + const PixelInfo *start_color,const PixelInfo *stop_color, ExceptionInfo *exception) { DrawInfo @@ -430,8 +430,8 @@ MagickExport MagickBooleanType GradientImage(Image *image, assert(image->signature == MagickSignature); if (image->debug != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); - assert(start_color != (const PixelPacket *) NULL); - assert(stop_color != (const PixelPacket *) NULL); + assert(start_color != (const PixelInfo *) NULL); + assert(stop_color != (const PixelInfo *) NULL); draw_info=AcquireDrawInfo(); gradient=(&draw_info->gradient); gradient->type=type; @@ -469,8 +469,8 @@ MagickExport MagickBooleanType GradientImage(Image *image, draw_info=DestroyDrawInfo(draw_info); if ((start_color->alpha == OpaqueAlpha) && (stop_color->alpha == OpaqueAlpha)) image->matte=MagickFalse; - if ((IsPixelPacketGray(start_color) != MagickFalse) && - (IsPixelPacketGray(stop_color) != MagickFalse)) + if ((IsPixelInfoGray(start_color) != MagickFalse) && + (IsPixelInfoGray(stop_color) != MagickFalse)) image->type=GrayscaleType; return(status); } @@ -729,7 +729,7 @@ MagickExport Image *OilPaintImage(const Image *image,const double radius, % The format of the OpaquePaintImage method is: % % MagickBooleanType OpaquePaintImage(Image *image, -% const PixelPacket *target,const PixelPacket *fill, +% const PixelInfo *target,const PixelInfo *fill, % const MagickBooleanType invert,ExceptionInfo *exception) % % A description of each parameter follows: diff --git a/MagickCore/paint.h b/MagickCore/paint.h index 0576d7db9..a6df12453 100644 --- a/MagickCore/paint.h +++ b/MagickCore/paint.h @@ -32,7 +32,7 @@ extern MagickExport MagickBooleanType FloodfillPaintImage(Image *,const DrawInfo *,const PixelInfo *,const ssize_t, const ssize_t,const MagickBooleanType,ExceptionInfo *), GradientImage(Image *,const GradientType,const SpreadMethod, - const PixelPacket *,const PixelPacket *,ExceptionInfo *), + const PixelInfo *,const PixelInfo *,ExceptionInfo *), OpaquePaintImage(Image *,const PixelInfo *,const PixelInfo *, const MagickBooleanType,ExceptionInfo *), TransparentPaintImage(Image *,const PixelInfo *, diff --git a/MagickCore/pixel-accessor.h b/MagickCore/pixel-accessor.h index 5ea7abde0..c480fd69f 100644 --- a/MagickCore/pixel-accessor.h +++ b/MagickCore/pixel-accessor.h @@ -198,8 +198,8 @@ static inline PixelTrait GetPixelRedTraits(const Image *image) return(image->channel_map[RedPixelChannel].traits); } -static inline void GetPixelPacketPixel(const Image *image,const Quantum *pixel, - PixelPacket *packet) +static inline void GetPixelInfoPixel(const Image *image,const Quantum *pixel, + PixelInfo *packet) { packet->red=(double) pixel[image->channel_map[RedPixelChannel].channel]; packet->green=(double) pixel[image->channel_map[GreenPixelChannel].channel]; @@ -207,27 +207,6 @@ static inline void GetPixelPacketPixel(const Image *image,const Quantum *pixel, packet->alpha=(double) pixel[image->channel_map[AlphaPixelChannel].channel]; } -static inline Quantum GetPixelPacketIntensity(const PixelPacket *pixel) -{ -#if !defined(MAGICKCORE_HDRI_SUPPORT) - if ((pixel->red == pixel->green) && (pixel->green == pixel->blue)) - return((Quantum) pixel->red); - return((Quantum) (0.299*pixel->red+0.587*pixel->green+0.114*pixel->blue+0.5)); -#else - { - double - alpha, - beta; - - alpha=pixel->red-pixel->green; - beta=pixel->green-pixel->blue; - if ((fabs(alpha) <= MagickEpsilon) && (fabs(beta) <= MagickEpsilon)) - return((Quantum) pixel->red); - return((Quantum) (0.299*pixel->red+0.587*pixel->green+0.114*pixel->blue)); - } -#endif -} - static inline PixelTrait GetPixelTraits(const Image *image, const PixelChannel channel) { @@ -255,7 +234,7 @@ static inline PixelTrait GetPixelYellowTraits(const Image *image) } static inline MagickBooleanType IsPixelEquivalent(const Image *image, - const Quantum *p,const PixelPacket *q) + const Quantum *p,const PixelInfo *q) { if (((double) p[image->channel_map[RedPixelChannel].channel] == q->red) && ((double) p[image->channel_map[GreenPixelChannel].channel] == q->green) && @@ -347,15 +326,7 @@ static inline MagickBooleanType IsPixelMonochrome(const Image *image, return(MagickFalse); } -static inline MagickBooleanType IsPixelPacketEquivalent(const PixelPacket *p, - const PixelPacket *q) -{ - if ((p->red == q->red) && (p->green == q->green) && (p->blue == q->blue)) - return(MagickTrue); - return(MagickFalse); -} - -static inline MagickBooleanType IsPixelPacketGray(const PixelPacket *pixel) +static inline MagickBooleanType IsPixelInfoGray(const PixelInfo *pixel) { #if !defined(MAGICKCORE_HDRI_SUPPORT) if ((pixel->red == pixel->green) && (pixel->green == pixel->blue)) @@ -375,8 +346,8 @@ static inline MagickBooleanType IsPixelPacketGray(const PixelPacket *pixel) return(MagickFalse); } -static inline MagickBooleanType IsPixelPacketMonochrome( - const PixelPacket *pixel) +static inline MagickBooleanType IsPixelInfoMonochrome( + const PixelInfo *pixel) { #if !defined(MAGICKCORE_HDRI_SUPPORT) if (((pixel->red == 0) || (pixel->red == (Quantum) QuantumRange)) && @@ -400,7 +371,7 @@ static inline MagickBooleanType IsPixelPacketMonochrome( } static inline void SetPacketPixelInfo(const Image *image, - const PixelInfo *pixel_info,PixelPacket *packet) + const PixelInfo *pixel_info,PixelInfo *packet) { packet->red=pixel_info->red; packet->green=pixel_info->green; @@ -554,20 +525,8 @@ static inline void SetPixelInfo(const Image *image,const Quantum *pixel, pixel[image->channel_map[IndexPixelChannel].channel]; } -static inline void SetPixelInfoBias(const Image *image,PixelInfo *pixel_info) -{ - /* - Obsoleted by MorphologyApply(). - */ - pixel_info->red=image->bias; - pixel_info->green=image->bias; - pixel_info->blue=image->bias; - pixel_info->alpha=image->bias; - pixel_info->black=image->bias; -} - static inline void SetPixelInfoPacket(const Image *image, - const PixelPacket *pixel,PixelInfo *pixel_info) + const PixelInfo *pixel,PixelInfo *pixel_info) { pixel_info->red=(MagickRealType) pixel->red; pixel_info->green=(MagickRealType) pixel->green; @@ -612,19 +571,6 @@ static inline void SetPixelRedTraits(Image *image,const PixelTrait traits) image->channel_map[RedPixelChannel].traits=traits; } -static inline void SetPixelPacket(const Image *image,const PixelPacket *packet, - Quantum *pixel) -{ - pixel[image->channel_map[RedPixelChannel].channel]= - ClampToQuantum(packet->red); - pixel[image->channel_map[GreenPixelChannel].channel]= - ClampToQuantum(packet->green); - pixel[image->channel_map[BluePixelChannel].channel]= - ClampToQuantum(packet->blue); - pixel[image->channel_map[AlphaPixelChannel].channel]= - ClampToQuantum(packet->alpha); -} - static inline void SetPixelPixelInfo(const Image *image, const PixelInfo *pixel_info,Quantum *pixel) { diff --git a/MagickCore/pixel.c b/MagickCore/pixel.c index 9ed61f54b..c85cdad74 100644 --- a/MagickCore/pixel.c +++ b/MagickCore/pixel.c @@ -1745,7 +1745,7 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image, % % o image: the image. % -% o pixel: Specifies a pointer to a PixelPacket structure. +% o pixel: Specifies a pointer to a PixelInfo structure. % */ MagickExport void GetPixelInfo(const Image *image,PixelInfo *pixel) @@ -5296,103 +5296,6 @@ MagickExport MagickBooleanType IsFuzzyEquivalencePixelInfo(const PixelInfo *p, % % % % % % -+ I s F u z z y E q u i v a l e n c e P i x e l P a c k e t % -% % -% % -% % -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% -% IsFuzzyEquivalencePixelPacket() returns MagickTrue if the distance between -% two pixels is less than the specified distance in a linear three (or four) -% dimensional color space. -% -% The format of the IsFuzzyEquivalencePixelPacket method is: -% -% void IsFuzzyEquivalencePixelPacket(const Image *image, -% const PixelPacket *p,const PixelPacket *q) -% -% A description of each parameter follows: -% -% o image: the image. -% -% o p: Pixel p. -% -% o q: Pixel q. -% -*/ -MagickExport MagickBooleanType IsFuzzyEquivalencePixelPacket(const Image *image, - const PixelPacket *p,const PixelPacket *q) -{ - MagickRealType - fuzz, - pixel; - - register MagickRealType - distance, - scale; - - if ((image->fuzz == 0.0) && (image->matte == MagickFalse)) - return(IsPixelPacketEquivalent(p,q)); - fuzz=MagickMax(image->fuzz,(MagickRealType) MagickSQ1_2)* - MagickMax(image->fuzz,(MagickRealType) MagickSQ1_2); - scale=1.0; - distance=0.0; - if (image->matte != MagickFalse) - { - /* - Transparencies are involved - set alpha distance - */ - pixel=(MagickRealType) ((image->matte != MagickFalse ? p->alpha : - OpaqueAlpha)-(image->matte != MagickFalse ? q->alpha : OpaqueAlpha)); - distance=pixel*pixel; - if (distance > fuzz) - return(MagickFalse); - /* - Generate a alpha scaling factor to generate a 4D cone on colorspace - Note that if one color is transparent, distance has no color component. - */ - scale=QuantumScale*p->alpha; - scale*=QuantumScale*q->alpha; - if (scale <= MagickEpsilon) - return(MagickTrue); - } - /* - RGB or CMY color cube - */ - distance*=3.0; /* rescale appropriately */ - fuzz*=3.0; - pixel=p->red-(MagickRealType) q->red; - if ((image->colorspace == HSLColorspace) || - (image->colorspace == HSBColorspace) || - (image->colorspace == HWBColorspace)) - { - /* - Compute an arc distance for hue. It should be a vector angle of - 'S'/'W' length with 'L'/'B' forming appropriate cones. - */ - if (fabs((double) pixel) > (QuantumRange/2)) - pixel-=QuantumRange; - pixel*=2; - } - distance+=scale*pixel*pixel; - if (distance > fuzz) - return(MagickFalse); - pixel=(MagickRealType) p->green-q->green; - distance+=scale*pixel*pixel; - if (distance > fuzz) - return(MagickFalse); - pixel=(MagickRealType) p->blue-q->blue; - distance+=scale*pixel*pixel; - if (distance > fuzz) - return(MagickFalse); - return(MagickTrue); -} - -/* -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% % -% % -% % % S e t P i x e l C h a n n e l M a p % % % % % diff --git a/MagickCore/pixel.h b/MagickCore/pixel.h index 31a03ccb9..c852801e0 100644 --- a/MagickCore/pixel.h +++ b/MagickCore/pixel.h @@ -78,16 +78,6 @@ typedef struct _PixelChannelMap traits; } PixelChannelMap; -typedef struct _PixelDoublePacket -{ - double - red, - green, - blue, - alpha, - black; -} PixelDoublePacket; - typedef struct _PixelInfo { ClassType @@ -117,7 +107,7 @@ typedef struct _PixelInfo index; } PixelInfo; -typedef struct _PixelLongPacket +typedef struct _PixelPacket { unsigned int red, @@ -125,35 +115,6 @@ typedef struct _PixelLongPacket blue, alpha, black; -} PixelLongPacket; - -typedef struct _PixelPacket -{ - ClassType - storage_class; - - ColorspaceType - colorspace; - - MagickBooleanType - matte; - - double - fuzz; - - size_t - depth; - - MagickSizeType - count; - - double - red, - green, - blue, - black, - alpha, - index; } PixelPacket; typedef struct _CacheView @@ -178,9 +139,7 @@ extern MagickExport MagickBooleanType ExceptionInfo *), IsFuzzyEquivalencePixel(const Image *,const Quantum *, const Quantum *), - IsFuzzyEquivalencePixelInfo(const PixelInfo *,const PixelInfo *), - IsFuzzyEquivalencePixelPacket(const Image *,const PixelPacket *, - const PixelPacket *); + IsFuzzyEquivalencePixelInfo(const PixelInfo *,const PixelInfo *); extern MagickExport PixelChannelMap *AcquirePixelChannelMap(void), diff --git a/MagickCore/quantize.c b/MagickCore/quantize.c index 8eb43f92a..1a4e8e7cc 100644 --- a/MagickCore/quantize.c +++ b/MagickCore/quantize.c @@ -216,14 +216,14 @@ /* Typdef declarations. */ -typedef struct _RealPixelPacket +typedef struct _RealPixelInfo { MagickRealType red, green, blue, alpha; -} RealPixelPacket; +} RealPixelInfo; typedef struct _NodeInfo { @@ -234,7 +234,7 @@ typedef struct _NodeInfo MagickSizeType number_unique; - RealPixelPacket + RealPixelInfo total_color; MagickRealType @@ -270,7 +270,7 @@ typedef struct _CubeInfo MagickSizeType transparent_pixels; - RealPixelPacket + RealPixelInfo target; MagickRealType @@ -292,7 +292,7 @@ typedef struct _CubeInfo ssize_t *cache; - RealPixelPacket + RealPixelInfo error[ErrorQueueLength]; MagickRealType @@ -430,7 +430,7 @@ MagickExport QuantizeInfo *AcquireQuantizeInfo(const ImageInfo *image_info) */ static inline void AssociateAlphaPixel(const Image *image, - const CubeInfo *cube_info,const Quantum *pixel,RealPixelPacket *alpha_pixel) + const CubeInfo *cube_info,const Quantum *pixel,RealPixelInfo *alpha_pixel) { MagickRealType alpha; @@ -451,9 +451,9 @@ static inline void AssociateAlphaPixel(const Image *image, alpha_pixel->alpha=(MagickRealType) GetPixelAlpha(image,pixel); } -static inline void AssociateAlphaPixelPacket(const Image *image, - const CubeInfo *cube_info,const PixelPacket *pixel, - RealPixelPacket *alpha_pixel) +static inline void AssociateAlphaPixelInfo(const Image *image, + const CubeInfo *cube_info,const PixelInfo *pixel, + RealPixelInfo *alpha_pixel) { MagickRealType alpha; @@ -484,7 +484,7 @@ static inline Quantum ClampToUnsignedQuantum(const MagickRealType value) } static inline size_t ColorToNodeId(const CubeInfo *cube_info, - const RealPixelPacket *pixel,size_t index) + const RealPixelInfo *pixel,size_t index) { size_t id; @@ -573,7 +573,7 @@ static MagickBooleanType AssignImageColors(Image *image,CubeInfo *cube_info, cube=(*cube_info); for (x=0; x < (ssize_t) image->columns; x+=count) { - RealPixelPacket + RealPixelInfo pixel; register const NodeInfo @@ -591,10 +591,10 @@ static MagickBooleanType AssignImageColors(Image *image,CubeInfo *cube_info, */ for (count=1; (x+count) < (ssize_t) image->columns; count++) { - PixelPacket + PixelInfo packet; - GetPixelPacketPixel(image,q+count*GetPixelChannels(image),&packet); + GetPixelInfoPixel(image,q+count*GetPixelChannels(image),&packet); if (IsPixelEquivalent(image,q,&packet) == MagickFalse) break; } @@ -656,7 +656,7 @@ static MagickBooleanType AssignImageColors(Image *image,CubeInfo *cube_info, Quantum intensity; - register PixelPacket + register PixelInfo *restrict q; register ssize_t @@ -668,7 +668,7 @@ static MagickBooleanType AssignImageColors(Image *image,CubeInfo *cube_info, q=image->colormap; for (i=0; i < (ssize_t) image->colors; i++) { - intensity=(Quantum) ((MagickRealType) GetPixelPacketIntensity(q) < + intensity=(Quantum) ((MagickRealType) GetPixelInfoIntensity(q) < ((MagickRealType) QuantumRange/2.0) ? 0 : QuantumRange); q->red=intensity; q->green=intensity; @@ -775,7 +775,7 @@ static MagickBooleanType ClassifyImageColors(CubeInfo *cube_info, NodeInfo *node_info; - RealPixelPacket + RealPixelInfo error, mid, midpoint, @@ -835,10 +835,10 @@ static MagickBooleanType ClassifyImageColors(CubeInfo *cube_info, */ for (count=1; (x+(ssize_t) count) < (ssize_t) image->columns; count++) { - PixelPacket + PixelInfo packet; - GetPixelPacketPixel(image,p+count*GetPixelChannels(image),&packet); + GetPixelInfoPixel(image,p+count*GetPixelChannels(image),&packet); if (IsPixelEquivalent(image,p,&packet) == MagickFalse) break; } @@ -930,10 +930,10 @@ static MagickBooleanType ClassifyImageColors(CubeInfo *cube_info, */ for (count=1; (x+(ssize_t) count) < (ssize_t) image->columns; count++) { - PixelPacket + PixelInfo packet; - GetPixelPacketPixel(image,p+count*GetPixelChannels(image),&packet); + GetPixelInfoPixel(image,p+count*GetPixelChannels(image),&packet); if (IsPixelEquivalent(image,p,&packet) == MagickFalse) break; } @@ -1102,10 +1102,10 @@ static void ClosestColor(const Image *image,CubeInfo *cube_info, beta, distance; - register PixelPacket + register PixelInfo *restrict p; - register RealPixelPacket + register RealPixelInfo *restrict q; /* @@ -1241,7 +1241,7 @@ static size_t DefineImageColormap(Image *image,CubeInfo *cube_info, register MagickRealType alpha; - register PixelPacket + register PixelInfo *restrict q; /* @@ -1408,22 +1408,22 @@ MagickExport QuantizeInfo *DestroyQuantizeInfo(QuantizeInfo *quantize_info) % */ -static RealPixelPacket **DestroyPixelThreadSet(RealPixelPacket **pixels) +static RealPixelInfo **DestroyPixelThreadSet(RealPixelInfo **pixels) { register ssize_t i; - assert(pixels != (RealPixelPacket **) NULL); + assert(pixels != (RealPixelInfo **) NULL); for (i=0; i < (ssize_t) GetOpenMPMaximumThreads(); i++) - if (pixels[i] != (RealPixelPacket *) NULL) - pixels[i]=(RealPixelPacket *) RelinquishMagickMemory(pixels[i]); - pixels=(RealPixelPacket **) RelinquishMagickMemory(pixels); + if (pixels[i] != (RealPixelInfo *) NULL) + pixels[i]=(RealPixelInfo *) RelinquishMagickMemory(pixels[i]); + pixels=(RealPixelInfo **) RelinquishMagickMemory(pixels); return(pixels); } -static RealPixelPacket **AcquirePixelThreadSet(const size_t count) +static RealPixelInfo **AcquirePixelThreadSet(const size_t count) { - RealPixelPacket + RealPixelInfo **pixels; register ssize_t @@ -1433,23 +1433,23 @@ static RealPixelPacket **AcquirePixelThreadSet(const size_t count) number_threads; number_threads=GetOpenMPMaximumThreads(); - pixels=(RealPixelPacket **) AcquireQuantumMemory(number_threads, + pixels=(RealPixelInfo **) AcquireQuantumMemory(number_threads, sizeof(*pixels)); - if (pixels == (RealPixelPacket **) NULL) - return((RealPixelPacket **) NULL); + if (pixels == (RealPixelInfo **) NULL) + return((RealPixelInfo **) NULL); (void) ResetMagickMemory(pixels,0,number_threads*sizeof(*pixels)); for (i=0; i < (ssize_t) number_threads; i++) { - pixels[i]=(RealPixelPacket *) AcquireQuantumMemory(count, + pixels[i]=(RealPixelInfo *) AcquireQuantumMemory(count, 2*sizeof(**pixels)); - if (pixels[i] == (RealPixelPacket *) NULL) + if (pixels[i] == (RealPixelInfo *) NULL) return(DestroyPixelThreadSet(pixels)); } return(pixels); } static inline ssize_t CacheOffset(CubeInfo *cube_info, - const RealPixelPacket *pixel) + const RealPixelInfo *pixel) { #define RedShift(pixel) (((pixel) >> CacheShift) << (0*(8-CacheShift))) #define GreenShift(pixel) (((pixel) >> CacheShift) << (1*(8-CacheShift))) @@ -1482,7 +1482,7 @@ static MagickBooleanType FloydSteinbergDither(Image *image,CubeInfo *cube_info) MagickBooleanType status; - RealPixelPacket + RealPixelInfo **pixels; ssize_t @@ -1492,7 +1492,7 @@ static MagickBooleanType FloydSteinbergDither(Image *image,CubeInfo *cube_info) Distribute quantization error using Floyd-Steinberg. */ pixels=AcquirePixelThreadSet(image->columns); - if (pixels == (RealPixelPacket **) NULL) + if (pixels == (RealPixelInfo **) NULL) return(MagickFalse); exception=(&image->exception); status=MagickTrue; @@ -1505,7 +1505,7 @@ static MagickBooleanType FloydSteinbergDither(Image *image,CubeInfo *cube_info) CubeInfo cube; - RealPixelPacket + RealPixelInfo *current, *previous; @@ -1536,7 +1536,7 @@ static MagickBooleanType FloydSteinbergDither(Image *image,CubeInfo *cube_info) v=(ssize_t) ((y & 0x01) != 0 ? -1 : 1); for (x=0; x < (ssize_t) image->columns; x++) { - RealPixelPacket + RealPixelInfo color, pixel; @@ -1634,7 +1634,7 @@ static MagickBooleanType FloydSteinbergDither(Image *image,CubeInfo *cube_info) /* Store the error. */ - AssociateAlphaPixelPacket(image,&cube,image->colormap+index,&color); + AssociateAlphaPixelInfo(image,&cube,image->colormap+index,&color); current[u].red=pixel.red-color.red; current[u].green=pixel.green-color.green; current[u].blue=pixel.blue-color.blue; @@ -1761,7 +1761,7 @@ static MagickBooleanType RiemersmaDither(Image *image,CacheView *image_view, MagickBooleanType proceed; - RealPixelPacket + RealPixelInfo color, pixel; @@ -1856,7 +1856,7 @@ static MagickBooleanType RiemersmaDither(Image *image,CacheView *image_view, */ (void) CopyMagickMemory(p->error,p->error+1,(ErrorQueueLength-1)* sizeof(p->error[0])); - AssociateAlphaPixelPacket(image,cube_info,image->colormap+index,&color); + AssociateAlphaPixelInfo(image,cube_info,image->colormap+index,&color); p->error[ErrorQueueLength-1].red=pixel.red-color.red; p->error[ErrorQueueLength-1].green=pixel.green-color.green; p->error[ErrorQueueLength-1].blue=pixel.blue-color.blue; @@ -3200,17 +3200,17 @@ extern "C" { static int IntensityCompare(const void *x,const void *y) { - PixelPacket + PixelInfo *color_1, *color_2; ssize_t intensity; - color_1=(PixelPacket *) x; - color_2=(PixelPacket *) y; - intensity=GetPixelPacketIntensity(color_1)-(ssize_t) - GetPixelPacketIntensity(color_2); + color_1=(PixelInfo *) x; + color_2=(PixelInfo *) y; + intensity=GetPixelInfoIntensity(color_1)-(ssize_t) + GetPixelInfoIntensity(color_2); return((int) intensity); } @@ -3227,7 +3227,7 @@ static MagickBooleanType SetGrayscaleImage(Image *image, MagickBooleanType status; - PixelPacket + PixelInfo *colormap; register ssize_t @@ -3308,18 +3308,18 @@ static MagickBooleanType SetGrayscaleImage(Image *image, } for (i=0; i < (ssize_t) image->colors; i++) image->colormap[i].alpha=(unsigned short) i; - qsort((void *) image->colormap,image->colors,sizeof(PixelPacket), + qsort((void *) image->colormap,image->colors,sizeof(PixelInfo), IntensityCompare); - colormap=(PixelPacket *) AcquireQuantumMemory(image->colors, + colormap=(PixelInfo *) AcquireQuantumMemory(image->colors, sizeof(*colormap)); - if (colormap == (PixelPacket *) NULL) + if (colormap == (PixelInfo *) NULL) ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed", image->filename); j=0; colormap[j]=image->colormap[0]; for (i=0; i < (ssize_t) image->colors; i++) { - if (IsPixelPacketEquivalent(&colormap[j],&image->colormap[i]) == MagickFalse) + if (IsPixelInfoEquivalent(&colormap[j],&image->colormap[i]) == MagickFalse) { j++; colormap[j]=image->colormap[i]; @@ -3327,7 +3327,7 @@ static MagickBooleanType SetGrayscaleImage(Image *image, colormap_index[(ssize_t) image->colormap[i].alpha]=j; } image->colors=(size_t) (j+1); - image->colormap=(PixelPacket *) RelinquishMagickMemory(image->colormap); + image->colormap=(PixelInfo *) RelinquishMagickMemory(image->colormap); image->colormap=colormap; status=MagickTrue; image_view=AcquireCacheView(image); diff --git a/MagickCore/quantum-import.c b/MagickCore/quantum-import.c index a1cbd315c..8d132e3ca 100644 --- a/MagickCore/quantum-import.c +++ b/MagickCore/quantum-import.c @@ -344,7 +344,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, 0x00 : 0x01); SetPixelIndex(image,PushColormapIndex(image,pixel, &range_exception),q); - SetPixelPacket(image,image->colormap+(ssize_t) + SetPixelPixelInfo(image,image->colormap+(ssize_t) GetPixelIndex(image,q),q); q+=channels; } @@ -360,7 +360,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, 0x00 : 0x01); SetPixelIndex(image,PushColormapIndex(image,pixel, &range_exception),q); - SetPixelPacket(image,image->colormap+(ssize_t) + SetPixelPixelInfo(image,image->colormap+(ssize_t) GetPixelIndex(image,q),q); q+=channels; } @@ -376,13 +376,13 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, pixel=(unsigned char) ((*p >> 4) & 0xf); SetPixelIndex(image,PushColormapIndex(image,pixel, &range_exception),q); - SetPixelPacket(image,image->colormap+(ssize_t) + SetPixelPixelInfo(image,image->colormap+(ssize_t) GetPixelIndex(image,q),q); q+=channels; pixel=(unsigned char) ((*p) & 0xf); SetPixelIndex(image,PushColormapIndex(image,pixel, &range_exception),q); - SetPixelPacket(image,image->colormap+(ssize_t) + SetPixelPixelInfo(image,image->colormap+(ssize_t) GetPixelIndex(image,q),q); p++; q+=channels; @@ -392,7 +392,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, pixel=(unsigned char) ((*p++ >> 4) & 0xf); SetPixelIndex(image,PushColormapIndex(image,pixel, &range_exception),q); - SetPixelPacket(image,image->colormap+(ssize_t) + SetPixelPixelInfo(image,image->colormap+(ssize_t) GetPixelIndex(image,q),q); q+=channels; } @@ -408,7 +408,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, p=PushCharPixel(p,&pixel); SetPixelIndex(image,PushColormapIndex(image,pixel, &range_exception),q); - SetPixelPacket(image,image->colormap+(ssize_t) + SetPixelPixelInfo(image,image->colormap+(ssize_t) GetPixelIndex(image,q),q); p+=quantum_info->pad; q+=channels; @@ -428,7 +428,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, SetPixelIndex(image,PushColormapIndex(image,ClampToQuantum( (MagickRealType) QuantumRange*HalfToSinglePrecision(pixel)), &range_exception),q); - SetPixelPacket(image,image->colormap+(ssize_t) + SetPixelPixelInfo(image,image->colormap+(ssize_t) GetPixelIndex(image,q),q); p+=quantum_info->pad; q+=channels; @@ -440,7 +440,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, p=PushShortPixel(endian,p,&pixel); SetPixelIndex(image,PushColormapIndex(image,pixel, &range_exception),q); - SetPixelPacket(image,image->colormap+(ssize_t) + SetPixelPixelInfo(image,image->colormap+(ssize_t) GetPixelIndex(image,q),q); p+=quantum_info->pad; q+=channels; @@ -462,7 +462,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, p=PushFloatPixel(&quantum_state,p,&pixel); SetPixelIndex(image,PushColormapIndex(image, ClampToQuantum(pixel),&range_exception),q); - SetPixelPacket(image,image->colormap+(ssize_t) + SetPixelPixelInfo(image,image->colormap+(ssize_t) GetPixelIndex(image,q),q); p+=quantum_info->pad; q+=channels; @@ -474,7 +474,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, p=PushLongPixel(endian,p,&pixel); SetPixelIndex(image,PushColormapIndex(image,pixel, &range_exception),q); - SetPixelPacket(image,image->colormap+(ssize_t) + SetPixelPixelInfo(image,image->colormap+(ssize_t) GetPixelIndex(image,q),q); p+=quantum_info->pad; q+=channels; @@ -493,7 +493,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, p=PushDoublePixel(&quantum_state,p,&pixel); SetPixelIndex(image,PushColormapIndex(image, ClampToQuantum(pixel),&range_exception),q); - SetPixelPacket(image,image->colormap+(ssize_t) + SetPixelPixelInfo(image,image->colormap+(ssize_t) GetPixelIndex(image,q),q); p+=quantum_info->pad; q+=channels; @@ -508,7 +508,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel); SetPixelIndex(image,PushColormapIndex(image,pixel, &range_exception),q); - SetPixelPacket(image,image->colormap+(ssize_t) + SetPixelPixelInfo(image,image->colormap+(ssize_t) GetPixelIndex(image,q),q); p+=quantum_info->pad; q+=channels; @@ -589,7 +589,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, pixel=(unsigned char) ((*p >> 4) & 0xf); SetPixelIndex(image,PushColormapIndex(image,pixel, &range_exception),q); - SetPixelPacket(image,image->colormap+(ssize_t) + SetPixelPixelInfo(image,image->colormap+(ssize_t) GetPixelIndex(image,q),q); pixel=(unsigned char) ((*p) & 0xf); SetPixelAlpha(image,ScaleAnyToQuantum(pixel,range),q); @@ -608,7 +608,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, p=PushCharPixel(p,&pixel); SetPixelIndex(image,PushColormapIndex(image,pixel, &range_exception),q); - SetPixelPacket(image,image->colormap+(ssize_t) + SetPixelPixelInfo(image,image->colormap+(ssize_t) GetPixelIndex(image,q),q); p=PushCharPixel(p,&pixel); SetPixelAlpha(image,ScaleCharToQuantum(pixel),q); @@ -630,7 +630,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, SetPixelIndex(image,PushColormapIndex(image,ClampToQuantum( (MagickRealType) QuantumRange*HalfToSinglePrecision(pixel)), &range_exception),q); - SetPixelPacket(image,image->colormap+(ssize_t) + SetPixelPixelInfo(image,image->colormap+(ssize_t) GetPixelIndex(image,q),q); p=PushShortPixel(endian,p,&pixel); SetPixelAlpha(image,ClampToQuantum((MagickRealType) @@ -645,7 +645,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, p=PushShortPixel(endian,p,&pixel); SetPixelIndex(image,PushColormapIndex(image,pixel, &range_exception),q); - SetPixelPacket(image,image->colormap+(ssize_t) + SetPixelPixelInfo(image,image->colormap+(ssize_t) GetPixelIndex(image,q),q); p=PushShortPixel(endian,p,&pixel); SetPixelAlpha(image,ScaleShortToQuantum(pixel),q); @@ -669,7 +669,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, p=PushFloatPixel(&quantum_state,p,&pixel); SetPixelIndex(image,PushColormapIndex(image, ClampToQuantum(pixel),&range_exception),q); - SetPixelPacket(image,image->colormap+(ssize_t) + SetPixelPixelInfo(image,image->colormap+(ssize_t) GetPixelIndex(image,q),q); p=PushFloatPixel(&quantum_state,p,&pixel); SetPixelAlpha(image,ClampToQuantum(pixel),q); @@ -683,7 +683,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, p=PushLongPixel(endian,p,&pixel); SetPixelIndex(image,PushColormapIndex(image,pixel, &range_exception),q); - SetPixelPacket(image,image->colormap+(ssize_t) + SetPixelPixelInfo(image,image->colormap+(ssize_t) GetPixelIndex(image,q),q); p=PushLongPixel(endian,p,&pixel); SetPixelAlpha(image,ScaleLongToQuantum(pixel),q); @@ -704,7 +704,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, p=PushDoublePixel(&quantum_state,p,&pixel); SetPixelIndex(image,PushColormapIndex(image, ClampToQuantum(pixel),&range_exception),q); - SetPixelPacket(image,image->colormap+(ssize_t) + SetPixelPixelInfo(image,image->colormap+(ssize_t) GetPixelIndex(image,q),q); p=PushDoublePixel(&quantum_state,p,&pixel); SetPixelAlpha(image,ClampToQuantum(pixel),q); @@ -722,7 +722,7 @@ MagickExport size_t ImportQuantumPixels(Image *image,CacheView *image_view, p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel); SetPixelIndex(image,PushColormapIndex(image,pixel, &range_exception),q); - SetPixelPacket(image,image->colormap+(ssize_t) + SetPixelPixelInfo(image,image->colormap+(ssize_t) GetPixelIndex(image,q),q); p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel); SetPixelAlpha(image,ScaleAnyToQuantum(pixel,range),q); diff --git a/MagickCore/segment.c b/MagickCore/segment.c index 91a105532..a56976d88 100644 --- a/MagickCore/segment.c +++ b/MagickCore/segment.c @@ -538,7 +538,7 @@ static MagickBooleanType Classify(Image *image,short **extrema, Cluster *cluster; - register const PixelPacket + register const PixelInfo *restrict p; register ssize_t diff --git a/MagickCore/threshold.c b/MagickCore/threshold.c index 402957e35..1d81464e0 100644 --- a/MagickCore/threshold.c +++ b/MagickCore/threshold.c @@ -650,7 +650,7 @@ MagickExport MagickBooleanType ClampImage(Image *image) register ssize_t i; - register PixelPacket + register PixelInfo *restrict q; q=image->colormap; diff --git a/MagickCore/version.h b/MagickCore/version.h index 19e6d8451..d50ee27b0 100644 --- a/MagickCore/version.h +++ b/MagickCore/version.h @@ -27,14 +27,14 @@ extern "C" { */ #define MagickPackageName "ImageMagick" #define MagickCopyright "Copyright (C) 1999-2011 ImageMagick Studio LLC" -#define MagickSVNRevision "5599" +#define MagickSVNRevision "exported" #define MagickLibVersion 0x700 #define MagickLibVersionText "7.0.0" #define MagickLibVersionNumber 7,0,0 #define MagickLibAddendum "-0" #define MagickLibInterface 7 #define MagickLibMinInterface 7 -#define MagickReleaseDate "2011-10-12" +#define MagickReleaseDate "2011-10-13" #define MagickChangeDate "20110801" #define MagickAuthoritativeURL "http://www.imagemagick.org" #if defined(MAGICKCORE_OPENMP_SUPPORT) diff --git a/MagickCore/xwindow.c b/MagickCore/xwindow.c index 395dabbcf..0654b6585 100644 --- a/MagickCore/xwindow.c +++ b/MagickCore/xwindow.c @@ -2046,7 +2046,7 @@ MagickPrivate void XDisplayImageInfo(Display *display, for (levels=0; undo_image != (Image *) NULL; levels++) { number_pixels=undo_image->list->columns*undo_image->list->rows; - bytes+=number_pixels*sizeof(PixelPacket); + bytes+=number_pixels*sizeof(PixelInfo); undo_image=GetPreviousImageInList(undo_image); } (void) FormatLocaleFile(file,"Undo Edit Cache\n levels: %u\n",levels); @@ -2142,7 +2142,7 @@ static void XDitherImage(Image *image,XImage *ximage) value, y; - PixelPacket + PixelInfo color; register char @@ -2506,7 +2506,7 @@ MagickPrivate MagickBooleanType XDrawImage(Display *display, /* Set this pixel to the background color. */ - SetPixelPacket(draw_image,&draw_image->background_color,q); + SetPixelPixelInfo(draw_image,&draw_image->background_color,q); SetPixelAlpha(draw_image,(Quantum) (draw_info->stencil == OpaqueStencil ? TransparentAlpha : OpaqueAlpha),q); } @@ -3002,7 +3002,7 @@ MagickPrivate void XGetMapInfo(const XVisualInfo *visual_info, % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% XGetPixelInfo() initializes the PixelPacket structure. +% XGetPixelInfo() initializes the PixelInfo structure. % % The format of the XGetPixelInfo method is: % @@ -3856,7 +3856,7 @@ MagickPrivate MagickBooleanType XGetWindowColor(Display *display, x, y; - PixelPacket + PixelInfo pixel; RectangleInfo @@ -4489,7 +4489,7 @@ static Image *XGetWindowImage(Display *display,const Window window, { index=(Quantum) XGetPixel(ximage,x,y); SetPixelIndex(composite_image,index,q); - SetPixelPacket(composite_image, + SetPixelPixelInfo(composite_image, composite_image->colormap+(ssize_t) index,q); q+=GetPixelChannels(composite_image); } @@ -5953,11 +5953,11 @@ static void XMakeImageLSBFirst(const XResourceInfo *resource_info, foreground=(unsigned char) (XPixelIntensity(&window->pixel_info->background_color) < XPixelIntensity(&window->pixel_info->foreground_color) ? 0x80 : 0x00); - polarity=(unsigned short) ((GetPixelPacketIntensity( + polarity=(unsigned short) ((GetPixelInfoIntensity( &canvas->colormap[0])) < ((Quantum) QuantumRange/2) ? 1 : 0); if (canvas->colors == 2) - polarity=GetPixelPacketIntensity(&canvas->colormap[0]) < - GetPixelPacketIntensity(&canvas->colormap[1]); + polarity=GetPixelInfoIntensity(&canvas->colormap[0]) < + GetPixelInfoIntensity(&canvas->colormap[1]); for (y=0; y < (int) canvas->rows; y++) { p=GetCacheViewVirtualPixels(canvas_view,0,(ssize_t) y,canvas->columns,1, @@ -6580,11 +6580,11 @@ static void XMakeImageMSBFirst(const XResourceInfo *resource_info, foreground=(unsigned char) (XPixelIntensity(&window->pixel_info->background_color) < XPixelIntensity(&window->pixel_info->foreground_color) ? 0x01 : 0x00); - polarity=(unsigned short) ((GetPixelPacketIntensity( + polarity=(unsigned short) ((GetPixelInfoIntensity( &canvas->colormap[0])) < ((Quantum) QuantumRange/2) ? 1 : 0); if (canvas->colors == 2) - polarity=GetPixelPacketIntensity(&canvas->colormap[0]) < - GetPixelPacketIntensity(&canvas->colormap[1]); + polarity=GetPixelInfoIntensity(&canvas->colormap[0]) < + GetPixelInfoIntensity(&canvas->colormap[1]); for (y=0; y < (int) canvas->rows; y++) { p=GetCacheViewVirtualPixels(canvas_view,0,(ssize_t) y,canvas->columns,1, @@ -8655,7 +8655,7 @@ MagickPrivate MagickBooleanType XMagickProgressMonitor(const char *tag, % % o target: Specifies the color to lookup in the X color database. % -% o color: A pointer to an PixelPacket structure. The RGB value of the target +% o color: A pointer to an PixelInfo structure. The RGB value of the target % color is returned as this value. % */ diff --git a/MagickWand/drawing-wand.c b/MagickWand/drawing-wand.c index 9267695e2..5aa037b62 100644 --- a/MagickWand/drawing-wand.c +++ b/MagickWand/drawing-wand.c @@ -272,7 +272,7 @@ static int (printf,2,3))); static void - MvgAppendColor(DrawingWand *,const PixelPacket *); + MvgAppendColor(DrawingWand *,const PixelInfo *); /* "Printf" for MVG commands @@ -386,7 +386,7 @@ static int MvgAutoWrapPrintf(DrawingWand *wand,const char *format,...) return(count); } -static void MvgAppendColor(DrawingWand *wand,const PixelPacket *packet) +static void MvgAppendColor(DrawingWand *wand,const PixelInfo *packet) { if ((packet->red == 0) && (packet->green == 0) && (packet->blue == 0) && (packet->alpha == (Quantum) TransparentAlpha)) @@ -4486,7 +4486,7 @@ WandExport void DrawScale(DrawingWand *wand,const double x,const double y) WandExport void DrawSetBorderColor(DrawingWand *wand, const PixelWand *border_wand) { - PixelPacket + PixelInfo *current_border, border_color, new_border; @@ -4500,7 +4500,7 @@ WandExport void DrawSetBorderColor(DrawingWand *wand, new_border=border_color; current_border=(&CurrentContext->border_color); if ((wand->filter_off != MagickFalse) || - (IsPixelPacketEquivalent(current_border,&new_border) == MagickFalse)) + (IsPixelInfoEquivalent(current_border,&new_border) == MagickFalse)) { CurrentContext->border_color=new_border; (void) MvgPrintf(wand,"border-color '"); @@ -4678,7 +4678,7 @@ WandExport void DrawSetClipUnits(DrawingWand *wand, */ WandExport void DrawSetFillColor(DrawingWand *wand,const PixelWand *fill_wand) { - PixelPacket + PixelInfo *current_fill, fill_color, new_fill; @@ -4692,7 +4692,7 @@ WandExport void DrawSetFillColor(DrawingWand *wand,const PixelWand *fill_wand) new_fill=fill_color; current_fill=(&CurrentContext->fill); if ((wand->filter_off != MagickFalse) || - (IsPixelPacketEquivalent(current_fill,&new_fill) == MagickFalse)) + (IsPixelInfoEquivalent(current_fill,&new_fill) == MagickFalse)) { CurrentContext->fill=new_fill; (void) MvgPrintf(wand,"fill '"); @@ -5253,7 +5253,7 @@ WandExport void DrawSetGravity(DrawingWand *wand,const GravityType gravity) WandExport void DrawSetStrokeColor(DrawingWand *wand, const PixelWand *stroke_wand) { - PixelPacket + PixelInfo *current_stroke, new_stroke, stroke_color; @@ -5267,7 +5267,7 @@ WandExport void DrawSetStrokeColor(DrawingWand *wand, new_stroke=stroke_color; current_stroke=(&CurrentContext->stroke); if ((wand->filter_off != MagickFalse) || - (IsPixelPacketEquivalent(current_stroke,&new_stroke) == MagickFalse)) + (IsPixelInfoEquivalent(current_stroke,&new_stroke) == MagickFalse)) { CurrentContext->stroke=new_stroke; (void) MvgPrintf(wand,"stroke '"); @@ -6073,7 +6073,7 @@ WandExport void DrawSetTextInterwordSpacing(DrawingWand *wand, WandExport void DrawSetTextUnderColor(DrawingWand *wand, const PixelWand *under_wand) { - PixelPacket + PixelInfo under_color; assert(wand != (DrawingWand *) NULL); @@ -6083,7 +6083,7 @@ WandExport void DrawSetTextUnderColor(DrawingWand *wand, assert(under_wand != (const PixelWand *) NULL); PixelGetQuantumPacket(under_wand,&under_color); if ((wand->filter_off != MagickFalse) || - (IsPixelPacketEquivalent(&CurrentContext->undercolor,&under_color) == MagickFalse)) + (IsPixelInfoEquivalent(&CurrentContext->undercolor,&under_color) == MagickFalse)) { CurrentContext->undercolor=under_color; (void) MvgPrintf(wand,"text-undercolor '"); diff --git a/MagickWand/magick-image.c b/MagickWand/magick-image.c index 85fc280e7..e261aaafd 100644 --- a/MagickWand/magick-image.c +++ b/MagickWand/magick-image.c @@ -4027,7 +4027,7 @@ WandExport MagickBooleanType MagickGetImageColormapColor(MagickWand *wand, (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name); if (wand->images == (Image *) NULL) ThrowWandException(WandError,"ContainsNoImages",wand->name); - if ((wand->images->colormap == (PixelPacket *) NULL) || + if ((wand->images->colormap == (PixelInfo *) NULL) || (index >= wand->images->colors)) { (void) ThrowMagickException(wand->exception,GetMagickModule(),WandError, @@ -4719,7 +4719,7 @@ WandExport size_t MagickGetImageHeight(MagickWand *wand) WandExport PixelWand **MagickGetImageHistogram(MagickWand *wand, size_t *number_colors) { - PixelPacket + PixelInfo *histogram; PixelWand @@ -4739,7 +4739,7 @@ WandExport PixelWand **MagickGetImageHistogram(MagickWand *wand, return((PixelWand **) NULL); } histogram=GetImageHistogram(wand->images,number_colors,wand->exception); - if (histogram == (PixelPacket *) NULL) + if (histogram == (PixelInfo *) NULL) return((PixelWand **) NULL); pixel_wands=NewPixelWands(*number_colors); for (i=0; i < (ssize_t) *number_colors; i++) @@ -4747,7 +4747,7 @@ WandExport PixelWand **MagickGetImageHistogram(MagickWand *wand, PixelSetQuantumPacket(pixel_wands[i],&histogram[i]); PixelSetColorCount(pixel_wands[i],(size_t) histogram[i].count); } - histogram=(PixelPacket *) RelinquishMagickMemory(histogram); + histogram=(PixelInfo *) RelinquishMagickMemory(histogram); return(pixel_wands); } @@ -8867,7 +8867,7 @@ WandExport MagickBooleanType MagickSetImageColormapColor(MagickWand *wand, (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name); if (wand->images == (Image *) NULL) ThrowWandException(WandError,"ContainsNoImages",wand->name); - if ((wand->images->colormap == (PixelPacket *) NULL) || + if ((wand->images->colormap == (PixelInfo *) NULL) || (index >= wand->images->colors)) ThrowWandException(WandError,"InvalidColormapIndex",wand->name); PixelGetQuantumPacket(color,wand->images->colormap+index); diff --git a/MagickWand/pixel-wand.c b/MagickWand/pixel-wand.c index a3e676bb8..130266127 100644 --- a/MagickWand/pixel-wand.c +++ b/MagickWand/pixel-wand.c @@ -1242,11 +1242,11 @@ WandExport PixelInfo PixelGetPixel(const PixelWand *wand) % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% PixelGetQuantumPacket() gets the packet of the pixel wand as a PixelPacket. +% PixelGetQuantumPacket() gets the packet of the pixel wand as a PixelInfo. % % The format of the PixelGetQuantumPacket method is: % -% void PixelGetQuantumPacket(PixelWand *wand,PixelPacket *packet) +% void PixelGetQuantumPacket(PixelWand *wand,PixelInfo *packet) % % A description of each parameter follows: % @@ -1255,13 +1255,13 @@ WandExport PixelInfo PixelGetPixel(const PixelWand *wand) % o packet: The pixel wand packet is returned here. % */ -WandExport void PixelGetQuantumPacket(const PixelWand *wand,PixelPacket *packet) +WandExport void PixelGetQuantumPacket(const PixelWand *wand,PixelInfo *packet) { assert(wand != (const PixelWand *) NULL); assert(wand->signature == WandSignature); if (wand->debug != MagickFalse) (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name); - assert(packet != (PixelPacket *) NULL); + assert(packet != (PixelInfo *) NULL); packet->alpha=ClampToQuantum(wand->pixel.alpha); if (wand->pixel.colorspace == CMYKColorspace) { @@ -1293,7 +1293,7 @@ WandExport void PixelGetQuantumPacket(const PixelWand *wand,PixelPacket *packet) % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% PixelGetQuantumPixel() gets the pixel of the pixel wand as a PixelPacket. +% PixelGetQuantumPixel() gets the pixel of the pixel wand as a PixelInfo. % % The format of the PixelGetQuantumPixel method is: % @@ -2133,7 +2133,7 @@ WandExport void PixelSetPixelInfo(PixelWand *wand, % % The format of the PixelSetQuantumPacket method is: % -% PixelSetQuantumPacket(PixelWand *wand,const PixelPacket *packet) +% PixelSetQuantumPacket(PixelWand *wand,const PixelInfo *packet) % % A description of each parameter follows: % @@ -2142,13 +2142,13 @@ WandExport void PixelSetPixelInfo(PixelWand *wand, % o packet: the pixel wand packet. % */ -WandExport void PixelSetQuantumPacket(PixelWand *wand,const PixelPacket *packet) +WandExport void PixelSetQuantumPacket(PixelWand *wand,const PixelInfo *packet) { assert(wand != (const PixelWand *) NULL); assert(wand->signature == WandSignature); if (wand->debug != MagickFalse) (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name); - assert(packet != (PixelPacket *) NULL); + assert(packet != (PixelInfo *) NULL); wand->pixel.red=(MagickRealType) packet->red; wand->pixel.green=(MagickRealType) packet->green; wand->pixel.blue=(MagickRealType) packet->blue; diff --git a/MagickWand/pixel-wand.h b/MagickWand/pixel-wand.h index 22d7b62b0..b288a600f 100644 --- a/MagickWand/pixel-wand.h +++ b/MagickWand/pixel-wand.h @@ -81,7 +81,7 @@ extern WandExport void ClearPixelWand(PixelWand *), PixelGetHSL(const PixelWand *,double *,double *,double *), PixelGetMagickColor(const PixelWand *,PixelInfo *), - PixelGetQuantumPacket(const PixelWand *,PixelPacket *), + PixelGetQuantumPacket(const PixelWand *,PixelInfo *), PixelGetQuantumPixel(const Image *,const PixelWand *,Quantum *), PixelSetAlpha(PixelWand *,const double), PixelSetAlphaQuantum(PixelWand *,const Quantum), @@ -103,7 +103,7 @@ extern WandExport void PixelSetPixelInfo(PixelWand *,const PixelInfo *), PixelSetAlpha(PixelWand *,const double), PixelSetAlphaQuantum(PixelWand *,const Quantum), - PixelSetQuantumPacket(PixelWand *,const PixelPacket *), + PixelSetQuantumPacket(PixelWand *,const PixelInfo *), PixelSetQuantumPixel(const Image *,const Quantum *,PixelWand *), PixelSetRed(PixelWand *,const double), PixelSetRedQuantum(PixelWand *,const Quantum), diff --git a/PerlMagick/Magick.xs b/PerlMagick/Magick.xs index 21adca795..f892e4788 100644 --- a/PerlMagick/Magick.xs +++ b/PerlMagick/Magick.xs @@ -1076,7 +1076,7 @@ static void SetAttribute(pTHX_ struct PackageInfo *info,Image *image, MagickStatusType flags; - PixelPacket + PixelInfo *color, target_color; @@ -3921,7 +3921,7 @@ Flatten(ref) Image *image; - PixelPacket + PixelInfo background_color; register ssize_t @@ -5947,7 +5947,7 @@ Histogram(ref,...) char message[MaxTextExtent]; - PixelPacket + PixelInfo *histogram; ExceptionInfo @@ -5998,7 +5998,7 @@ Histogram(ref,...) for ( ; image; image=image->next) { histogram=GetImageHistogram(image,&number_colors,&image->exception); - if (histogram == (PixelPacket *) NULL) + if (histogram == (PixelInfo *) NULL) continue; count+=(ssize_t) number_colors; EXTEND(sp,6*count); @@ -6026,7 +6026,7 @@ Histogram(ref,...) histogram[i].count); PUSHs(sv_2mortal(newSVpv(message,0))); } - histogram=(PixelPacket *) RelinquishMagickMemory(histogram); + histogram=(PixelInfo *) RelinquishMagickMemory(histogram); } PerlException: @@ -7249,7 +7249,7 @@ Mogrify(ref,...) MagickStatusType flags; - PixelPacket + PixelInfo fill_color; RectangleInfo @@ -11911,7 +11911,7 @@ QueryColorname(ref,...) Image *image; - PixelPacket + PixelInfo target_color; register ssize_t diff --git a/coders/bmp.c b/coders/bmp.c index 6efd7f9c4..8c3b4a503 100644 --- a/coders/bmp.c +++ b/coders/bmp.c @@ -555,11 +555,11 @@ static Image *ReadBMPImage(const ImageInfo *image_info,ExceptionInfo *exception) count=ReadBlob(image,2,magick); do { - PixelLongPacket - shift; + PixelInfo + quantum_bits; PixelPacket - quantum_bits; + shift; size_t profile_data, diff --git a/coders/braille.c b/coders/braille.c index 3b78180bc..f4a5a13d2 100644 --- a/coders/braille.c +++ b/coders/braille.c @@ -252,11 +252,11 @@ static MagickBooleanType WriteBRAILLEImage(const ImageInfo *image_info, (void) SetImageType(image,BilevelType,exception); polarity = 0; if (image->storage_class == PseudoClass) { - polarity=(Quantum) (GetPixelPacketIntensity(&image->colormap[0]) >= + polarity=(Quantum) (GetPixelInfoIntensity(&image->colormap[0]) >= (Quantum) (QuantumRange/2)); if (image->colors == 2) - polarity=(Quantum) (GetPixelPacketIntensity(&image->colormap[0]) >= - GetPixelPacketIntensity(&image->colormap[1])); + polarity=(Quantum) (GetPixelInfoIntensity(&image->colormap[0]) >= + GetPixelInfoIntensity(&image->colormap[1])); } for (y=0; y < (ssize_t) image->rows; y+=(ssize_t) cell_height) { diff --git a/coders/dcm.c b/coders/dcm.c index 3cf291e26..2a42e89ca 100644 --- a/coders/dcm.c +++ b/coders/dcm.c @@ -3638,7 +3638,7 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception) image->columns=(size_t) width; image->rows=(size_t) height; image->depth=depth; - if ((image->colormap == (PixelPacket *) NULL) && (samples_per_pixel == 1)) + if ((image->colormap == (PixelInfo *) NULL) && (samples_per_pixel == 1)) { size_t one; @@ -3774,7 +3774,7 @@ static Image *ReadDCMImage(const ImageInfo *image_info,ExceptionInfo *exception) int byte; - PixelLongPacket + PixelPacket pixel; /* diff --git a/coders/gif.c b/coders/gif.c index 16b424758..55b6ea737 100644 --- a/coders/gif.c +++ b/coders/gif.c @@ -443,7 +443,7 @@ static MagickBooleanType DecodeImage(Image *image,const ssize_t opacity, break; index=ConstrainColormapIndex(image,(size_t) c); SetPixelIndex(image,index,q); - SetPixelPacket(image,image->colormap+(ssize_t) index,q); + SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q); SetPixelAlpha(image,(ssize_t) index == opacity ? TransparentAlpha : OpaqueAlpha,q); x++; @@ -1652,7 +1652,7 @@ static MagickBooleanType WriteGIFImage(const ImageInfo *image_info,Image *image, c|=(bits_per_pixel-1); /* size of global colormap */ (void) WriteBlobByte(image,(unsigned char) c); for (j=0; j < (ssize_t) image->colors; j++) - if (IsPixelPacketEquivalent(&image->background_color,image->colormap+j)) + if (IsPixelInfoEquivalent(&image->background_color,image->colormap+j)) break; (void) WriteBlobByte(image,(unsigned char) (j == (ssize_t) image->colors ? 0 : j)); /* background color */ diff --git a/coders/gradient.c b/coders/gradient.c index 8cd14f68b..b0d33368d 100644 --- a/coders/gradient.c +++ b/coders/gradient.c @@ -100,7 +100,7 @@ static Image *ReadGRADIENTImage(const ImageInfo *image_info, MagickBooleanType status; - PixelPacket + PixelInfo start_color, stop_color; @@ -128,7 +128,7 @@ static Image *ReadGRADIENTImage(const ImageInfo *image_info, return((Image *) NULL); } (void) CopyMagickString(colorname,"white",MaxTextExtent); - if (GetPixelPacketIntensity(&start_color) > (Quantum) (QuantumRange/2)) + if (GetPixelInfoIntensity(&start_color) > (Quantum) (QuantumRange/2)) (void) CopyMagickString(colorname,"black",MaxTextExtent); (void) sscanf(image_info->filename,"%*[^-]-%s",colorname); status=QueryColorCompliance(colorname,AllCompliance,&stop_color,exception); diff --git a/coders/jbig.c b/coders/jbig.c index 1304e9bd2..a54a90406 100644 --- a/coders/jbig.c +++ b/coders/jbig.c @@ -234,7 +234,7 @@ static Image *ReadJBIGImage(const ImageInfo *image_info, if (bit == 8) bit=0; SetPixelIndex(image,index,q); - SetPixelPacket(image,image->colormap+(ssize_t) index,q); + SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q); q+=GetPixelChannels(image); } if (SyncAuthenticPixels(image,exception) == MagickFalse) diff --git a/coders/jpeg.c b/coders/jpeg.c index cb7118de2..1e2395411 100644 --- a/coders/jpeg.c +++ b/coders/jpeg.c @@ -1289,7 +1289,7 @@ static Image *ReadJPEGImage(const ImageInfo *image_info, pixel=(size_t) ((GETJSAMPLE(*p) ^ 0x80) << 4); index=ConstrainColormapIndex(image,pixel); SetPixelIndex(image,index,q); - SetPixelPacket(image,image->colormap+(ssize_t) index,q); + SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q); p++; q+=GetPixelChannels(image); } @@ -1327,7 +1327,7 @@ static Image *ReadJPEGImage(const ImageInfo *image_info, { index=ConstrainColormapIndex(image,(size_t) GETJSAMPLE(*p)); SetPixelIndex(image,index,q); - SetPixelPacket(image,image->colormap+(ssize_t) index,q); + SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q); p++; q+=GetPixelChannels(image); } diff --git a/coders/map.c b/coders/map.c index f864b5738..8e3c009dd 100644 --- a/coders/map.c +++ b/coders/map.c @@ -226,7 +226,7 @@ static Image *ReadMAPImage(const ImageInfo *image_info,ExceptionInfo *exception) p++; } SetPixelIndex(image,index,q); - SetPixelPacket(image,image->colormap+(ssize_t) index,q); + SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q); q+=GetPixelChannels(image); } if (SyncAuthenticPixels(image,exception) == MagickFalse) diff --git a/coders/palm.c b/coders/palm.c index a9f45b92b..28082bcc3 100644 --- a/coders/palm.c +++ b/coders/palm.c @@ -175,20 +175,20 @@ static MagickBooleanType %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % FindColor() returns the index of the matching entry from PalmPalette for a -% given PixelPacket. +% given PixelInfo. % % The format of the FindColor method is: % -% int FindColor(const Image *image,PixelPacket *pixel) +% int FindColor(const Image *image,PixelInfo *pixel) % % A description of each parameter follows: % % o int: the index of the matching color or -1 if not found/ % -% o pixel: a pointer to the PixelPacket to be matched. +% o pixel: a pointer to the PixelInfo to be matched. % */ -static int FindColor(const Image *image,PixelPacket *packet) +static int FindColor(const Image *image,PixelInfo *packet) { register ssize_t i; @@ -489,7 +489,7 @@ static Image *ReadPALMImage(const ImageInfo *image_info, ThrowReaderException(CorruptImageError,"CorruptImage"); index=(Quantum) (mask-(((*ptr) & (mask << bit)) >> bit)); SetPixelIndex(image,index,q); - SetPixelPacket(image,image->colormap+(ssize_t) index,q); + SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q); if (bit) bit-=bits_per_pixel; else @@ -668,7 +668,7 @@ static MagickBooleanType WritePALMImage(const ImageInfo *image_info, MagickSizeType cc; - PixelPacket + PixelInfo transpix; QuantizeInfo diff --git a/coders/pcx.c b/coders/pcx.c index 42feec62a..11e7d3493 100644 --- a/coders/pcx.c +++ b/coders/pcx.c @@ -1094,11 +1094,11 @@ static MagickBooleanType WritePCXImage(const ImageInfo *image_info,Image *image, /* Convert PseudoClass image to a PCX monochrome image. */ - polarity=(Quantum) (GetPixelPacketIntensity( + polarity=(Quantum) (GetPixelInfoIntensity( &image->colormap[0]) < ((Quantum) QuantumRange/2) ? 1 : 0); if (image->colors == 2) - polarity=(Quantum) (GetPixelPacketIntensity(&image->colormap[0]) < - GetPixelPacketIntensity(&image->colormap[1]) ? 1 : 0); + polarity=(Quantum) (GetPixelInfoIntensity(&image->colormap[0]) < + GetPixelInfoIntensity(&image->colormap[1]) ? 1 : 0); for (y=0; y < (ssize_t) image->rows; y++) { p=GetVirtualPixels(image,0,y,image->columns,1,exception); diff --git a/coders/png.c b/coders/png.c index 0e77540c9..a7108910f 100644 --- a/coders/png.c +++ b/coders/png.c @@ -129,7 +129,7 @@ #endif /* Macros for left-bit-replication to ensure that pixels - * and PixelPackets all have the image->depth, and for use + * and PixelInfos all have the image->depth, and for use * in PNG8 quantization. */ @@ -903,7 +903,7 @@ typedef struct _MngInfo magn_methx, magn_methy; - PixelPacket + PixelInfo mng_global_bkgd; /* Added at version 6.6.6-7 */ @@ -1145,7 +1145,7 @@ static MagickBooleanType ImageIsGray(Image *image) if (image->storage_class == PseudoClass) { for (i=0; i < (ssize_t) image->colors; i++) - if (IsPixelPacketGray(image->colormap+i) == MagickFalse) + if (IsPixelInfoGray(image->colormap+i) == MagickFalse) return(MagickFalse); return(MagickTrue); } @@ -2000,7 +2000,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info, double file_gamma; - PixelLongPacket + PixelInfo transparent_color; MagickBooleanType @@ -2627,7 +2627,7 @@ static Image *ReadOnePNGImage(MngInfo *mng_info, " Raw tRNS graylevel is %d.",ping_trans_color->gray); (void) LogMagickEvent(CoderEvent,GetMagickModule(), - " scaled graylevel is %d.",transparent_color.alpha); + " scaled graylevel is %.20g.",transparent_color.alpha); } transparent_color.red=transparent_color.alpha; transparent_color.green=transparent_color.alpha; @@ -4602,7 +4602,7 @@ static Image *ReadMNGImage(const ImageInfo *image_info,ExceptionInfo *exception) previous_fb; #if defined(MNG_INSERT_LAYERS) - PixelPacket + PixelInfo mng_background_color; #endif @@ -7979,7 +7979,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info, int n; - PixelPacket + PixelInfo opaque[260], semitransparent[260], transparent[260]; @@ -8074,7 +8074,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info, { if (number_opaque == 0) { - GetPixelPacketPixel(image, q, opaque); + GetPixelInfoPixel(image, q, opaque); opaque[0].alpha=OpaqueAlpha; number_opaque=1; } @@ -8089,7 +8089,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info, number_opaque < 259) { number_opaque++; - GetPixelPacketPixel(image, q, opaque+i); + GetPixelInfoPixel(image, q, opaque+i); opaque[i].alpha=OpaqueAlpha; } } @@ -8100,7 +8100,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info, { if (number_transparent == 0) { - GetPixelPacketPixel(image, q, transparent); + GetPixelInfoPixel(image, q, transparent); ping_trans_color.red=(unsigned short) GetPixelRed(image,q); ping_trans_color.green=(unsigned short) @@ -8122,7 +8122,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info, number_transparent < 259) { number_transparent++; - GetPixelPacketPixel(image,q,transparent+i); + GetPixelInfoPixel(image,q,transparent+i); } } } @@ -8132,7 +8132,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info, { if (number_semitransparent == 0) { - GetPixelPacketPixel(image,q,semitransparent); + GetPixelInfoPixel(image,q,semitransparent); number_semitransparent = 1; } @@ -8148,7 +8148,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info, number_semitransparent < 259) { number_semitransparent++; - GetPixelPacketPixel(image, q, semitransparent+i); + GetPixelInfoPixel(image, q, semitransparent+i); } } } @@ -8270,7 +8270,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info, if (image_colors < 257) { - PixelPacket + PixelInfo colormap[260]; /* @@ -8491,7 +8491,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info, { if (GetPixelAlpha(image,r) < OpaqueAlpha/2) { - SetPixelPacket(image,&image->background_color,r); + SetPixelPixelInfo(image,&image->background_color,r); SetPixelAlpha(image,TransparentAlpha,r); } else @@ -9360,7 +9360,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info, (ScaleQuantumToShort(image->colormap[0].blue) & mask); ping_trans_color.gray=(png_uint_16) - (ScaleQuantumToShort(GetPixelPacketIntensity( + (ScaleQuantumToShort(GetPixelInfoIntensity( image->colormap)) & mask); ping_trans_color.index=(png_byte) 0; @@ -9639,7 +9639,7 @@ static MagickBooleanType WriteOnePNGImage(MngInfo *mng_info, { ping_background.gray=(png_uint_16) - ((maxval/255.)*((GetPixelPacketIntensity(&image->background_color))) + ((maxval/255.)*((GetPixelInfoIntensity(&image->background_color))) +.5); if (logging != MagickFalse) diff --git a/coders/ps.c b/coders/ps.c index 945b1ebd7..298c95ef4 100644 --- a/coders/ps.c +++ b/coders/ps.c @@ -1357,7 +1357,7 @@ static MagickBooleanType WritePSImage(const ImageInfo *image_info,Image *image, MagickStatusType flags; - PixelPacket + PixelInfo pixel; PointInfo @@ -1883,7 +1883,7 @@ static MagickBooleanType WritePSImage(const ImageInfo *image_info,Image *image, p=GetVirtualPixels(image,0,y,image->columns,1,exception); if (p == (const Quantum *) NULL) break; - GetPixelPacketPixel(image,p,&pixel); + GetPixelInfoPixel(image,p,&pixel); length=255; for (x=0; x < (ssize_t) image->columns; x++) { @@ -1907,7 +1907,7 @@ static MagickBooleanType WritePSImage(const ImageInfo *image_info,Image *image, } length=0; } - GetPixelPacketPixel(image,p,&pixel); + GetPixelInfoPixel(image,p,&pixel); p+=GetPixelChannels(image); } WriteRunlengthPacket(image,pixel,length,p); diff --git a/coders/psd.c b/coders/psd.c index 3054257bb..68f2e7b0a 100644 --- a/coders/psd.c +++ b/coders/psd.c @@ -652,7 +652,7 @@ static MagickBooleanType ReadPSDLayer(Image *image,const size_t channels, SetPixelIndex(image,ScaleQuantumToChar(pixel),q); else SetPixelIndex(image,ScaleQuantumToShort(pixel),q); - SetPixelPacket(image,image->colormap+(ssize_t) + SetPixelPixelInfo(image,image->colormap+(ssize_t) GetPixelIndex(image,q),q); if (image->depth == 1) { @@ -667,7 +667,7 @@ static MagickBooleanType ReadPSDLayer(Image *image,const size_t channels, { SetPixelIndex(image,(((unsigned char) pixel) & (0x01 << (7-bit))) != 0 ? 0 : 255,q); - SetPixelPacket(image,image->colormap+(ssize_t) + SetPixelPixelInfo(image,image->colormap+(ssize_t) GetPixelIndex(image,q),q); q+=GetPixelChannels(image); x++; diff --git a/coders/rle.c b/coders/rle.c index e2900cd8d..8111105ff 100644 --- a/coders/rle.c +++ b/coders/rle.c @@ -545,7 +545,7 @@ static Image *ReadRLEImage(const ImageInfo *image_info,ExceptionInfo *exception) break; } } - image->colormap=(PixelPacket *) RelinquishMagickMemory( + image->colormap=(PixelInfo *) RelinquishMagickMemory( image->colormap); image->storage_class=DirectClass; image->colors=0; diff --git a/coders/stegano.c b/coders/stegano.c index 995191290..c5922d550 100644 --- a/coders/stegano.c +++ b/coders/stegano.c @@ -118,7 +118,7 @@ static Image *ReadSTEGANOImage(const ImageInfo *image_info, MagickBooleanType status; - PixelPacket + PixelInfo pixel; register Quantum diff --git a/coders/svg.c b/coders/svg.c index faa3f52fb..5db009686 100644 --- a/coders/svg.c +++ b/coders/svg.c @@ -2819,7 +2819,7 @@ static Image *ReadSVGImage(const ImageInfo *image_info,ExceptionInfo *exception) ssize_t y; - PixelPacket + PixelInfo fill_color; register ssize_t diff --git a/coders/tga.c b/coders/tga.c index 2e93d8ce5..e5d1a8318 100644 --- a/coders/tga.c +++ b/coders/tga.c @@ -137,7 +137,7 @@ static Image *ReadTGAImage(const ImageInfo *image_info,ExceptionInfo *exception) MagickBooleanType status; - PixelPacket + PixelInfo pixel; Quantum diff --git a/coders/ttf.c b/coders/ttf.c index 104e0ae4f..170d754d4 100644 --- a/coders/ttf.c +++ b/coders/ttf.c @@ -190,7 +190,7 @@ static Image *ReadTTFImage(const ImageInfo *image_info,ExceptionInfo *exception) MagickBooleanType status; - PixelPacket + PixelInfo background_color; register ssize_t @@ -237,7 +237,7 @@ static Image *ReadTTFImage(const ImageInfo *image_info,ExceptionInfo *exception) break; for (x=0; x < (ssize_t) image->columns; x++) { - SetPixelPacket(image,&background_color,q); + SetPixelPixelInfo(image,&background_color,q); q+=GetPixelChannels(image); } if (SyncAuthenticPixels(image,exception) == MagickFalse) diff --git a/coders/txt.c b/coders/txt.c index 1b6e2d4a4..db0cda327 100644 --- a/coders/txt.c +++ b/coders/txt.c @@ -373,7 +373,7 @@ static Image *ReadTXTImage(const ImageInfo *image_info,ExceptionInfo *exception) y, y_offset; - PixelLongPacket + PixelInfo pixel; MagickBooleanType @@ -454,19 +454,19 @@ static Image *ReadTXTImage(const ImageInfo *image_info,ExceptionInfo *exception) if (image->colorspace == CMYKColorspace) { if (image->matte != MagickFalse) - count=(ssize_t) sscanf(text,"%ld,%ld: (%u,%u,%u,%u,%u",&x_offset, - &y_offset,&pixel.red,&pixel.green,&pixel.blue,&pixel.black, - &pixel.alpha); + count=(ssize_t) sscanf(text,"%ld,%ld: (%lf,%lf,%lf,%lf,%lf", + &x_offset,&y_offset,&pixel.red,&pixel.green,&pixel.blue, + &pixel.black,&pixel.alpha); else - count=(ssize_t) sscanf(text,"%ld,%ld: (%u,%u,%u,%u",&x_offset, + count=(ssize_t) sscanf(text,"%ld,%ld: (%lf,%lf,%lf,%lf",&x_offset, &y_offset,&pixel.red,&pixel.green,&pixel.blue,&pixel.black); } else if (image->matte != MagickFalse) - count=(ssize_t) sscanf(text,"%ld,%ld: (%u,%u,%u,%u",&x_offset, + count=(ssize_t) sscanf(text,"%ld,%ld: (%lf,%lf,%lf,%lf",&x_offset, &y_offset,&pixel.red,&pixel.green,&pixel.blue,&pixel.alpha); else - count=(ssize_t) sscanf(text,"%ld,%ld: (%u,%u,%u",&x_offset, + count=(ssize_t) sscanf(text,"%ld,%ld: (%lf,%lf,%lf",&x_offset, &y_offset,&pixel.red,&pixel.green,&pixel.blue); if (count < 5) continue; diff --git a/coders/uil.c b/coders/uil.c index 7a86a5904..28003f387 100644 --- a/coders/uil.c +++ b/coders/uil.c @@ -329,7 +329,7 @@ static MagickBooleanType WriteUILImage(const ImageInfo *image_info,Image *image, else (void) FormatLocaleString(buffer,MaxTextExtent, " color('%s',%s) = '%s'",name, - GetPixelPacketIntensity(image->colormap+i) < + GetPixelInfoIntensity(image->colormap+i) < ((Quantum) QuantumRange/2) ? "background" : "foreground",symbol); (void) WriteBlobString(image,buffer); (void) FormatLocaleString(buffer,MaxTextExtent,"%s", diff --git a/coders/wpg.c b/coders/wpg.c index b8e784b3d..3c2719be8 100644 --- a/coders/wpg.c +++ b/coders/wpg.c @@ -295,7 +295,7 @@ static void InsertRow(unsigned char *p,ssize_t y,Image *image, int bpp) { index=((*p) & (0x80 >> bit) ? 0x01 : 0x00); SetPixelIndex(image,index,q); - SetPixelPacket(image,image->colormap+(ssize_t) index,q); + SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q); q+=GetPixelChannels(image); } p++; @@ -306,7 +306,7 @@ static void InsertRow(unsigned char *p,ssize_t y,Image *image, int bpp) { index=((*p) & (0x80 >> bit) ? 0x01 : 0x00); SetPixelIndex(image,index,q); - SetPixelPacket(image,image->colormap+(ssize_t) index,q); + SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q); q+=GetPixelChannels(image); } p++; @@ -324,19 +324,19 @@ static void InsertRow(unsigned char *p,ssize_t y,Image *image, int bpp) { index=ConstrainColormapIndex(image,(*p >> 6) & 0x3); SetPixelIndex(image,index,q); - SetPixelPacket(image,image->colormap+(ssize_t) index,q); + SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q); q+=GetPixelChannels(image); index=ConstrainColormapIndex(image,(*p >> 4) & 0x3); SetPixelIndex(image,index,q); - SetPixelPacket(image,image->colormap+(ssize_t) index,q); + SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q); q+=GetPixelChannels(image); index=ConstrainColormapIndex(image,(*p >> 2) & 0x3); SetPixelIndex(image,index,q); - SetPixelPacket(image,image->colormap+(ssize_t) index,q); + SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q); q+=GetPixelChannels(image); index=ConstrainColormapIndex(image,(*p) & 0x3); SetPixelIndex(image,index,q); - SetPixelPacket(image,image->colormap+(ssize_t) index,q); + SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q); p++; q+=GetPixelChannels(image); } @@ -344,21 +344,21 @@ static void InsertRow(unsigned char *p,ssize_t y,Image *image, int bpp) { index=ConstrainColormapIndex(image,(*p >> 6) & 0x3); SetPixelIndex(image,index,q); - SetPixelPacket(image,image->colormap+(ssize_t) index,q); + SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q); q+=GetPixelChannels(image); if ((image->columns % 4) >= 1) { index=ConstrainColormapIndex(image,(*p >> 4) & 0x3); SetPixelIndex(image,index,q); - SetPixelPacket(image,image->colormap+(ssize_t) index,q); + SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q); q+=GetPixelChannels(image); if ((image->columns % 4) >= 2) { index=ConstrainColormapIndex(image,(*p >> 2) & 0x3); SetPixelIndex(image,index,q); - SetPixelPacket(image,image->colormap+(ssize_t) index,q); + SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q); q+=GetPixelChannels(image); } } @@ -378,11 +378,11 @@ static void InsertRow(unsigned char *p,ssize_t y,Image *image, int bpp) { index=ConstrainColormapIndex(image,(*p >> 4) & 0x0f); SetPixelIndex(image,index,q); - SetPixelPacket(image,image->colormap+(ssize_t) index,q); + SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q); q+=GetPixelChannels(image); index=ConstrainColormapIndex(image,(*p) & 0x0f); SetPixelIndex(image,index,q); - SetPixelPacket(image,image->colormap+(ssize_t) index,q); + SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q); p++; q+=GetPixelChannels(image); } @@ -390,7 +390,7 @@ static void InsertRow(unsigned char *p,ssize_t y,Image *image, int bpp) { index=ConstrainColormapIndex(image,(*p >> 4) & 0x0f); SetPixelIndex(image,index,q); - SetPixelPacket(image,image->colormap+(ssize_t) index,q); + SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q); p++; q+=GetPixelChannels(image); } @@ -407,7 +407,7 @@ static void InsertRow(unsigned char *p,ssize_t y,Image *image, int bpp) { index=ConstrainColormapIndex(image,*p); SetPixelIndex(image,index,q); - SetPixelPacket(image,image->colormap+(ssize_t) index,q); + SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q); p++; q+=GetPixelChannels(image); } @@ -1108,7 +1108,7 @@ static Image *ReadWPGImage(const ImageInfo *image_info, { if (bpp < 24) if ( (image->colors < (one << bpp)) && (bpp != 24) ) - image->colormap=(PixelPacket *) ResizeQuantumMemory( + image->colormap=(PixelInfo *) ResizeQuantumMemory( image->colormap,(size_t) (one << bpp), sizeof(*image->colormap)); } @@ -1281,7 +1281,7 @@ static Image *ReadWPGImage(const ImageInfo *image_info, { if(bpp < 24) if( image->colors<(one << bpp) && bpp!=24 ) - image->colormap=(PixelPacket *) ResizeQuantumMemory( + image->colormap=(PixelInfo *) ResizeQuantumMemory( image->colormap,(size_t) (one << bpp), sizeof(*image->colormap)); } diff --git a/coders/xc.c b/coders/xc.c index eadd53d23..d15fe41f9 100644 --- a/coders/xc.c +++ b/coders/xc.c @@ -99,7 +99,7 @@ static Image *ReadXCImage(const ImageInfo *image_info,ExceptionInfo *exception) PixelInfo color; - PixelPacket + PixelInfo pixel; register ssize_t @@ -145,7 +145,7 @@ static Image *ReadXCImage(const ImageInfo *image_info,ExceptionInfo *exception) break; for (x=0; x < (ssize_t) image->columns; x++) { - SetPixelPacket(image,&pixel,q); + SetPixelPixelInfo(image,&pixel,q); if (image->colorspace == CMYKColorspace) SetPixelBlack(image,pixel.black,q); q+=GetPixelChannels(image); diff --git a/coders/xcf.c b/coders/xcf.c index 2ad16635b..e6caf5574 100644 --- a/coders/xcf.c +++ b/coders/xcf.c @@ -168,7 +168,7 @@ typedef struct green, blue, alpha; -} XCFPixelPacket; +} XCFPixelInfo; /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -349,12 +349,12 @@ static MagickBooleanType load_tile(Image *image,Image *tile_image, unsigned char *graydata; - XCFPixelPacket + XCFPixelInfo *xcfdata, *xcfodata; - xcfdata=(XCFPixelPacket *) AcquireQuantumMemory(data_length,sizeof(*xcfdata)); - if (xcfdata == (XCFPixelPacket *) NULL) + xcfdata=(XCFPixelInfo *) AcquireQuantumMemory(data_length,sizeof(*xcfdata)); + if (xcfdata == (XCFPixelInfo *) NULL) ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed", image->filename); xcfodata=xcfdata; @@ -398,7 +398,7 @@ static MagickBooleanType load_tile(Image *image,Image *tile_image, if (SyncAuthenticPixels(tile_image,exception) == MagickFalse) break; } - xcfodata=(XCFPixelPacket *) RelinquishMagickMemory(xcfodata); + xcfodata=(XCFPixelInfo *) RelinquishMagickMemory(xcfodata); return MagickTrue; } diff --git a/coders/xpm.c b/coders/xpm.c index 09ae938c4..1b16ce2aa 100644 --- a/coders/xpm.c +++ b/coders/xpm.c @@ -405,7 +405,7 @@ static Image *ReadXPMImage(const ImageInfo *image_info,ExceptionInfo *exception) j=(ssize_t) GetValueFromSplayTree(xpm_colors,key); if (image->storage_class == PseudoClass) SetPixelIndex(image,j,r); - SetPixelPacket(image,image->colormap+j,r); + SetPixelPixelInfo(image,image->colormap+j,r); p+=width; r+=GetPixelChannels(image); } @@ -693,9 +693,9 @@ static MagickBooleanType WritePICONImage(const ImageInfo *image_info, if (transparent != MagickFalse) { colors++; - picon->colormap=(PixelPacket *) ResizeQuantumMemory((void **) + picon->colormap=(PixelInfo *) ResizeQuantumMemory((void **) picon->colormap,(size_t) colors,sizeof(*picon->colormap)); - if (picon->colormap == (PixelPacket *) NULL) + if (picon->colormap == (PixelInfo *) NULL) ThrowWriterException(ResourceLimitError,"MemoryAllocationError"); for (y=0; y < (ssize_t) picon->rows; y++) { diff --git a/coders/xwd.c b/coders/xwd.c index 1623e6764..c5a3bd5d5 100644 --- a/coders/xwd.c +++ b/coders/xwd.c @@ -476,7 +476,7 @@ static Image *ReadXWDImage(const ImageInfo *image_info,ExceptionInfo *exception) index=ConstrainColormapIndex(image,XGetPixel(ximage,(int) x, (int) y)); SetPixelIndex(image,index,q); - SetPixelPacket(image,image->colormap+(ssize_t) index,q); + SetPixelPixelInfo(image,image->colormap+(ssize_t) index,q); q+=GetPixelChannels(image); } if (SyncAuthenticPixels(image,exception) == MagickFalse) -- 2.40.0