diff --git a/Magick++/lib/Color.cpp b/Magick++/lib/Color.cpp
index a30862d..364bfaf 100644
--- a/Magick++/lib/Color.cpp
+++ b/Magick++/lib/Color.cpp
@@ -65,7 +65,7 @@
// 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 ( Quantum red_,
Quantum green_,
Quantum blue_ )
- : _pixel(new PixelPacket),
+ : _pixel(new PixelInfo),
_pixelOwn(true),
_isValid(true),
_pixelType(RGBPixel)
@@ -93,7 +93,7 @@
Quantum green_,
Quantum blue_,
Quantum alpha_ )
- : _pixel(new PixelPacket),
+ : _pixel(new PixelInfo),
_pixelOwn(true),
_isValid(true),
_pixelType(RGBAPixel)
@@ -106,7 +106,7 @@
// 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 @@
// 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 @@
// 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 @@
*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 @@
_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 @@
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 @@
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 @@
// 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 @@
if ( !_pixelOwn )
{
- _pixel = new PixelPacket;
+ _pixel = new PixelInfo;
_pixelOwn = true;
}
diff --git a/Magick++/lib/Drawable.cpp b/Magick++/lib/Drawable.cpp
index 33363b9..663ac0b 100644
--- a/Magick++/lib/Drawable.cpp
+++ b/Magick++/lib/Drawable.cpp
@@ -583,7 +583,7 @@
void Magick::DrawableFillColor::operator()
( MagickCore::DrawingWand * context_ ) const
{
- PixelPacket color = static_cast<PixelPacket>(_color);
+ PixelInfo color = static_cast<PixelInfo>(_color);
PixelWand *pixel_wand=NewPixelWand();
PixelSetQuantumPacket(pixel_wand,&color);
DrawSetFillColor(context_,pixel_wand);
@@ -1210,7 +1210,7 @@
void Magick::DrawableStrokeColor::operator()
( MagickCore::DrawingWand * context_ ) const
{
- PixelPacket color = static_cast<PixelPacket>(_color);
+ PixelInfo color = static_cast<PixelInfo>(_color);
PixelWand *pixel_wand=NewPixelWand();
PixelSetQuantumPacket(pixel_wand,&color);
DrawSetStrokeColor(context_,pixel_wand);
@@ -1356,7 +1356,7 @@
void Magick::DrawableTextUnderColor::operator()
( MagickCore::DrawingWand * context_ ) const
{
- PixelPacket color = static_cast<PixelPacket>(_color);
+ PixelInfo color = static_cast<PixelInfo>(_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 86d0122..a8ff3f7 100644
--- a/Magick++/lib/Image.cpp
+++ b/Magick++/lib/Image.cpp
@@ -607,7 +607,7 @@
GetExceptionInfo( &exceptionInfo );
PixelInfo target;
GetPixelInfo(image(),&target);
- PixelPacket pixel=static_cast<PixelPacket>(penColor_);
+ PixelInfo pixel=static_cast<PixelInfo>(penColor_);
target.red=pixel.red;
target.green=pixel.green;
target.blue=pixel.blue;
@@ -1010,7 +1010,7 @@
modifyImage();
PixelInfo target;
GetPixelInfo(image(),&target);
- PixelPacket pixel=static_cast<PixelPacket>(pixelColor(x_,y_));
+ PixelInfo pixel=static_cast<PixelInfo>(pixelColor(x_,y_));
target.red=pixel.red;
target.green=pixel.green;
target.blue=pixel.blue;
@@ -1083,9 +1083,9 @@
PixelInfo target;
GetPixelInfo(constImage(),&target);
- target.red=static_cast<PixelPacket>(borderColor_).red;
- target.green=static_cast<PixelPacket>(borderColor_).green;
- target.blue=static_cast<PixelPacket>(borderColor_).blue;
+ target.red=static_cast<PixelInfo>(borderColor_).red;
+ target.green=static_cast<PixelInfo>(borderColor_).green;
+ target.blue=static_cast<PixelInfo>(borderColor_).blue;
ExceptionInfo exceptionInfo;
GetExceptionInfo( &exceptionInfo );
FloodfillPaintImage ( image(),
@@ -1343,9 +1343,9 @@
modifyImage();
PixelInfo target;
GetPixelInfo(constImage(),&target);
- target.red=static_cast<PixelPacket>(target_).red;
- target.green=static_cast<PixelPacket>(target_).green;
- target.blue=static_cast<PixelPacket>(target_).blue;
+ target.red=static_cast<PixelInfo>(target_).red;
+ target.green=static_cast<PixelInfo>(target_).green;
+ target.blue=static_cast<PixelInfo>(target_).blue;
target.alpha=alpha_;
ChannelType channel_mask = SetPixelChannelMask( image(), AlphaChannel );
ExceptionInfo exceptionInfo;
@@ -2610,7 +2610,7 @@
// 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<MagickCore::ClassType>(DirectClass);
return;
@@ -2723,14 +2723,14 @@
{
// Allocate colormap
imageptr->colormap =
- static_cast<PixelPacket*>(AcquireMagickMemory(entries_*sizeof(PixelPacket)));
+ static_cast<PixelInfo*>(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 @@
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 @@
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 dd03a6a..6c53fd9 100644
--- a/Magick++/lib/Magick++/Color.h
+++ b/Magick++/lib/Magick++/Color.h
@@ -75,14 +75,14 @@
// 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 @@
protected:
- // PixelType specifies the interpretation of PixelPacket members
+ // PixelType specifies the interpretation of PixelInfo members
// RGBPixel:
// Red = red;
// Green = green;
@@ -137,25 +137,25 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
// Color
//
-// Common initializer for PixelPacket representation
+// Common initializer for PixelInfo representation
// Initialized transparent black
inline void Magick::Color::initPixel()
{
@@ -369,8 +369,8 @@
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 @@
//
// 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 @@
//
// 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 @@
//
// 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 @@
//
// 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 @@
// 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 8bbd9d2..7f3b6d6 100644
--- a/Magick++/lib/Magick++/Include.h
+++ b/Magick++/lib/Magick++/Include.h
@@ -459,8 +459,8 @@
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 e8fe33f..da348f7 100644
--- a/Magick++/lib/Magick++/STL.h
+++ b/Magick++/lib/Magick++/STL.h
@@ -2101,7 +2101,7 @@
// 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 @@
}
// Deallocate histogram array
- histogram_array=(MagickCore::PixelPacket *)
+ histogram_array=(MagickCore::PixelInfo *)
MagickCore::RelinquishMagickMemory(histogram_array);
}