diff --git a/Install-vms.txt b/Install-vms.txt
index bdf8c07..f6d14cd 100644
--- a/Install-vms.txt
+++ b/Install-vms.txt
@@ -6,7 +6,7 @@
Type
- unzip ImageMagick-6.7.1-0.zip
+ unzip ImageMagick-7.0.0-0.zip
set default [.imagemagick]
@make
set display/create/node=node_name::
diff --git a/Install-windows.txt b/Install-windows.txt
index b2cc7f6..378cb69 100644
--- a/Install-windows.txt
+++ b/Install-windows.txt
@@ -345,7 +345,7 @@
Install the Binary Distribution
- 1. Double-click on VisualMagick/bin/ImageMagick-6.7.1-0-Q16-windows-dll.exe
+ 1. Double-click on VisualMagick/bin/ImageMagick-7.0.0-0-Q16-windows-dll.exe
to launch the ImageMagick binary distribution.
2. Complete the installer screens to install ImageMagick on your system.
diff --git a/Magick++/Makefile.am b/Magick++/Makefile.am
index 6ae4f5f..eb3c897 100644
--- a/Magick++/Makefile.am
+++ b/Magick++/Makefile.am
@@ -13,7 +13,6 @@
MAGICKPP_PKGCONFIG = $(MAGICKPP_PKGCONFIG_OPT)
MAGICKPP_SCRPTS = $(MAGICKPP_SCRIPTS_OPT)
MAGICKPP_TESTS = $(MAGICKPP_TEST_SCRIPTS_OPT)
-MAGICKPP_TOP_INCHEADERS = $(MAGICKPP_TOP_INCHEADERS_OPT)
MAGICKPP_INCHEADERS = $(MAGICKPP_INCHEADERS_OPT)
else
MAGICKPP_LIBS =
@@ -22,7 +21,6 @@
MAGICKPP_PKGCONFIG =
MAGICKPP_SCRPTS =
MAGICKPP_TESTS =
-MAGICKPP_TOP_INCHEADERS =
MAGICKPP_INCHEADERS =
endif
@@ -137,16 +135,14 @@
Magick++/lib/Magick++/TypeMetric.h
magickpptopincdir = $(topincludedir)
-magickpptopinc_HEADERS = $(MAGICKPP_TOP_INCHEADERS)
-
-MAGICKPP_TOP_INCHEADERS_OPT = \
- Magick++/lib/Magick++.h
+magickpptopinc_HEADERS =
magickppincdir = $(topincludedir)/Magick++
magickppinc_HEADERS = $(MAGICKPP_INCHEADERS)
MAGICKPP_INCHEADERS_OPT = \
+ Magick++/lib/Magick++.h
Magick++/lib/Magick++/Blob.h \
Magick++/lib/Magick++/CoderInfo.h \
Magick++/lib/Magick++/Color.h \
diff --git a/Magick++/lib/Color.cpp b/Magick++/lib/Color.cpp
index 640212c..3a8f8b5 100644
--- a/Magick++/lib/Color.cpp
+++ b/Magick++/lib/Color.cpp
@@ -85,7 +85,7 @@
redQuantum ( red_ );
greenQuantum ( green_ );
blueQuantum ( blue_ );
- alphaQuantum ( OpaqueOpacity );
+ alphaQuantum ( OpaqueAlpha );
}
// Construct from RGBA
@@ -149,7 +149,7 @@
{
*_pixel = color_;
- if ( color_.opacity != OpaqueOpacity )
+ if ( color_.alpha != OpaqueAlpha )
_pixelType = RGBAPixel;
}
@@ -201,9 +201,9 @@
redQuantum( target_color.red );
greenQuantum( target_color.green );
blueQuantum( target_color.blue );
- alphaQuantum( target_color.opacity );
+ alphaQuantum( target_color.alpha );
- if ( target_color.opacity > OpaqueOpacity )
+ if ( target_color.alpha != OpaqueAlpha )
_pixelType = RGBAPixel;
else
_pixelType = RGBPixel;
@@ -233,7 +233,7 @@
char colorbuf[MaxTextExtent];
- MagickPixelPacket
+ PixelInfo
pixel;
pixel.colorspace=RGBColorspace;
@@ -242,7 +242,7 @@
pixel.red=_pixel->red;
pixel.green=_pixel->green;
pixel.blue=_pixel->blue;
- pixel.opacity=_pixel->opacity;
+ pixel.alpha=_pixel->alpha;
GetColorTuple( &pixel, MagickTrue, colorbuf );
return std::string(colorbuf);
@@ -252,7 +252,7 @@
const Magick::Color& Magick::Color::operator= ( const MagickCore::PixelPacket &color_ )
{
*_pixel = color_;
- if ( color_.opacity != OpaqueOpacity )
+ if ( color_.alpha != OpaqueAlpha )
_pixelType = RGBAPixel;
else
_pixelType = RGBPixel;
@@ -313,7 +313,7 @@
redQuantum ( red );
greenQuantum ( green );
blueQuantum ( blue );
- alphaQuantum ( OpaqueOpacity );
+ alphaQuantum ( OpaqueAlpha );
}
// Null constructor
@@ -463,7 +463,7 @@
scaleDoubleToQuantum( shade_ ),
scaleDoubleToQuantum( shade_ ) )
{
- alphaQuantum ( OpaqueOpacity );
+ alphaQuantum ( OpaqueAlpha );
}
// Null constructor
@@ -512,7 +512,7 @@
( mono_ ? QuantumRange : 0 ),
( mono_ ? QuantumRange : 0 ) )
{
- alphaQuantum ( OpaqueOpacity );
+ alphaQuantum ( OpaqueAlpha );
}
// Null constructor
@@ -567,7 +567,7 @@
scaleDoubleToQuantum(green_),
scaleDoubleToQuantum(blue_) )
{
- alphaQuantum ( OpaqueOpacity );
+ alphaQuantum ( OpaqueAlpha );
}
// Null constructor
Magick::ColorRGB::ColorRGB ( void )
@@ -619,7 +619,7 @@
scaleDoubleToQuantum(y_ - (0.39380 * u_) - (0.58050 * v_) ),
scaleDoubleToQuantum(y_ + 2.02790 * u_ ) )
{
- alphaQuantum ( OpaqueOpacity );
+ alphaQuantum ( OpaqueAlpha );
}
// Null constructor
Magick::ColorYUV::ColorYUV ( void )
diff --git a/Magick++/lib/Drawable.cpp b/Magick++/lib/Drawable.cpp
index 90644bc..5484032 100644
--- a/Magick++/lib/Drawable.cpp
+++ b/Magick++/lib/Drawable.cpp
@@ -9,9 +9,9 @@
#define MAGICK_PLUSPLUS_IMPLEMENTATION 1
#define MAGICK_DRAWABLE_IMPLEMENTATION
-#include "Magick++/Include.h"
#include <math.h>
#include <string>
+#include "Magick++/Include.h"
#include "Magick++/Drawable.h"
#include "Magick++/Image.h"
@@ -585,7 +585,7 @@
{
PixelPacket color = static_cast<PixelPacket>(_color);
PixelWand *pixel_wand=NewPixelWand();
- PixelSetQuantumColor(pixel_wand,&color);
+ PixelSetQuantumPacket(pixel_wand,&color);
DrawSetFillColor(context_,pixel_wand);
pixel_wand=DestroyPixelWand(pixel_wand);
}
@@ -608,14 +608,14 @@
return new DrawableFillRule(*this);
}
-// Specify drawing fill opacity
+// Specify drawing fill alpha
Magick::DrawableFillOpacity::~DrawableFillOpacity ( void )
{
}
void Magick::DrawableFillOpacity::operator()
( MagickCore::DrawingWand * context_ ) const
{
- DrawSetFillOpacity( context_, _opacity );
+ DrawSetFillOpacity( context_, _alpha );
}
Magick::DrawableBase* Magick::DrawableFillOpacity::copy() const
{
@@ -1212,7 +1212,7 @@
{
PixelPacket color = static_cast<PixelPacket>(_color);
PixelWand *pixel_wand=NewPixelWand();
- PixelSetQuantumColor(pixel_wand,&color);
+ PixelSetQuantumPacket(pixel_wand,&color);
DrawSetStrokeColor(context_,pixel_wand);
pixel_wand=DestroyPixelWand(pixel_wand);
}
@@ -1221,14 +1221,14 @@
return new DrawableStrokeColor(*this);
}
-// Stroke opacity
+// Stroke alpha
Magick::DrawableStrokeOpacity::~DrawableStrokeOpacity ( void )
{
}
void Magick::DrawableStrokeOpacity::operator()
( MagickCore::DrawingWand * context_ ) const
{
- DrawSetStrokeOpacity( context_, _opacity );
+ DrawSetStrokeOpacity( context_, _alpha );
}
Magick::DrawableBase* Magick::DrawableStrokeOpacity::copy() const
{
@@ -1358,7 +1358,7 @@
{
PixelPacket color = static_cast<PixelPacket>(_color);
PixelWand *pixel_wand=NewPixelWand();
- PixelSetQuantumColor(pixel_wand,&color);
+ PixelSetQuantumPacket(pixel_wand,&color);
DrawSetTextUnderColor(context_,pixel_wand);
pixel_wand=DestroyPixelWand(pixel_wand);
}
diff --git a/Magick++/lib/Image.cpp b/Magick++/lib/Image.cpp
index 17cec1e..92d7ee0 100644
--- a/Magick++/lib/Image.cpp
+++ b/Magick++/lib/Image.cpp
@@ -8,7 +8,6 @@
#define MAGICKCORE_IMPLEMENTATION 1
#define MAGICK_PLUSPLUS_IMPLEMENTATION 1
-#include "Magick++/Include.h"
#include <cstdlib>
#include <string>
#include <string.h>
@@ -17,6 +16,7 @@
#if !defined(MAGICKCORE_WINDOWS_SUPPORT)
#include <strings.h>
#endif
+#include "Magick++/Include.h"
using namespace std;
@@ -27,7 +27,6 @@
#include "Magick++/ImageRef.h"
#define AbsoluteValue(x) ((x) < 0 ? -(x) : (x))
-#define MagickPI 3.14159265358979323846264338327950288419716939937510
#define DegreesToRadians(x) (MagickPI*(x)/180.0)
MagickDLLDeclExtern const char *Magick::borderGeometryDefault = "6x6+0+0";
@@ -581,9 +580,9 @@
}
// Colorize
-void Magick::Image::colorize ( const unsigned int opacityRed_,
- const unsigned int opacityGreen_,
- const unsigned int opacityBlue_,
+void Magick::Image::colorize ( const unsigned int alphaRed_,
+ const unsigned int alphaGreen_,
+ const unsigned int alphaBlue_,
const Color &penColor_ )
{
if ( !penColor_.isValid() )
@@ -592,22 +591,22 @@
"Pen color argument is invalid");
}
- char opacity[MaxTextExtent];
- FormatLocaleString(opacity,MaxTextExtent,"%u/%u/%u",opacityRed_,opacityGreen_,opacityBlue_);
+ char alpha[MaxTextExtent];
+ FormatLocaleString(alpha,MaxTextExtent,"%u/%u/%u",alphaRed_,alphaGreen_,alphaBlue_);
ExceptionInfo exceptionInfo;
GetExceptionInfo( &exceptionInfo );
MagickCore::Image* newImage =
- ColorizeImage ( image(), opacity,
+ ColorizeImage ( image(), alpha,
penColor_, &exceptionInfo );
replaceImage( newImage );
throwException( exceptionInfo );
(void) DestroyExceptionInfo( &exceptionInfo );
}
-void Magick::Image::colorize ( const unsigned int opacity_,
+void Magick::Image::colorize ( const unsigned int alpha_,
const Color &penColor_ )
{
- colorize( opacity_, opacity_, opacity_, penColor_ );
+ colorize( alpha_, alpha_, alpha_, penColor_ );
}
// Apply a color matrix to the image channels. The user supplied
@@ -960,20 +959,20 @@
}
// Floodfill pixels matching color (within fuzz factor) of target
-// pixel(x,y) with replacement opacity value using method.
+// pixel(x,y) with replacement alpha value using method.
void Magick::Image::floodFillOpacity( const ssize_t x_,
const ssize_t y_,
- const unsigned int opacity_,
+ const unsigned int alpha_,
const PaintMethod method_ )
{
modifyImage();
- MagickPixelPacket target;
- GetMagickPixelPacket(image(),&target);
+ PixelInfo target;
+ GetPixelInfo(image(),&target);
PixelPacket pixel=static_cast<PixelPacket>(pixelColor(x_,y_));
target.red=pixel.red;
target.green=pixel.green;
target.blue=pixel.blue;
- target.opacity=opacity_;
+ target.alpha=alpha_;
FloodfillPaintImage ( image(),
DefaultChannels,
options()->drawInfo(), // const DrawInfo *draw_info
@@ -998,12 +997,12 @@
// Get pixel view
Pixels pixels(*this);
// Fill image
- PixelPacket *p = pixels.get(x_, y_, 1, 1 );
- MagickPixelPacket target;
- GetMagickPixelPacket(constImage(),&target);
- target.red=p->red;
- target.green=p->green;
- target.blue=p->blue;
+ Quantum *p = pixels.get(x_, y_, 1, 1 );
+ PixelInfo target;
+ GetPixelInfo(constImage(),&target);
+ target.red=GetPixelRed(constImage(),p);
+ target.green=GetPixelGreen(constImage(),p);
+ target.blue=GetPixelBlue(constImage(),p);
if (p)
FloodfillPaintImage ( image(), // Image *image
DefaultChannels,
@@ -1035,8 +1034,8 @@
// Set drawing fill pattern
options()->fillPattern(texture_.constImage());
- MagickPixelPacket target;
- GetMagickPixelPacket(constImage(),&target);
+ 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;
@@ -1293,19 +1292,19 @@
mapImage_.constImage());
throwImageException();
}
-// Floodfill designated area with replacement opacity value
+// Floodfill designated area with replacement alpha value
void Magick::Image::matteFloodfill ( const Color &target_ ,
- const unsigned int opacity_,
+ const unsigned int alpha_,
const ssize_t x_, const ssize_t y_,
const Magick::PaintMethod method_ )
{
modifyImage();
- MagickPixelPacket target;
- GetMagickPixelPacket(constImage(),&target);
+ 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.opacity=opacity_;
+ target.alpha=alpha_;
FloodfillPaintImage ( image(), OpacityChannel, options()->drawInfo(), &target,
x_, y_, method_ == FloodfillMethod ? MagickFalse : MagickTrue);
throwImageException();
@@ -1399,16 +1398,16 @@
(void) DestroyExceptionInfo( &exceptionInfo );
}
-// Set or attenuate the opacity channel. If the image pixels are
-// opaque then they are set to the specified opacity value, otherwise
-// they are blended with the supplied opacity value. The value of
-// opacity_ ranges from 0 (completely opaque) to QuantumRange. The defines
-// OpaqueOpacity and TransparentOpacity are available to specify
+// Set or attenuate the alpha channel. If the image pixels are
+// opaque then they are set to the specified alpha value, otherwise
+// they are blended with the supplied alpha value. The value of
+// alpha_ ranges from 0 (completely opaque) to QuantumRange. The defines
+// OpaqueAlpha and TransparentAlpha are available to specify
// completely opaque or completely transparent, respectively.
-void Magick::Image::opacity ( const unsigned int opacity_ )
+void Magick::Image::alpha ( const unsigned int alpha_ )
{
modifyImage();
- SetImageOpacity( image(), opacity_ );
+ SetImageOpacity( image(), alpha_ );
}
// Change the color of an opaque pixel to the pen color.
@@ -1430,8 +1429,8 @@
std::string opaqueColor = opaqueColor_;
std::string penColor = penColor_;
- MagickPixelPacket opaque;
- MagickPixelPacket pen;
+ PixelInfo opaque;
+ PixelInfo pen;
(void) QueryMagickColor(std::string(opaqueColor_).c_str(),&opaque,&image()->exception);
(void) QueryMagickColor(std::string(penColor_).c_str(),&pen,&image()->exception);
OpaquePaintImage ( image(), &opaque, &pen, MagickFalse );
@@ -2062,10 +2061,10 @@
std::string color = color_;
- MagickPixelPacket target;
+ PixelInfo target;
(void) QueryMagickColor(std::string(color_).c_str(),&target,&image()->exception);
modifyImage();
- TransparentPaintImage ( image(), &target, TransparentOpacity, MagickFalse );
+ TransparentPaintImage ( image(), &target, TransparentAlpha, MagickFalse );
throwImageException();
}
@@ -2082,15 +2081,15 @@
std::string colorLow = colorLow_;
std::string colorHigh = colorHigh_;
- MagickPixelPacket targetLow;
- MagickPixelPacket targetHigh;
+ PixelInfo targetLow;
+ PixelInfo targetHigh;
(void) QueryMagickColor(std::string(colorLow_).c_str(),&targetLow,
&image()->exception);
(void) QueryMagickColor(std::string(colorHigh_).c_str(),&targetHigh,
&image()->exception);
modifyImage();
TransparentPaintImageChroma ( image(), &targetLow, &targetHigh,
- TransparentOpacity, MagickFalse );
+ TransparentAlpha, MagickFalse );
throwImageException();
}
@@ -3202,7 +3201,7 @@
// desired, then set the matte channel to opaque.
if ((matteFlag_ && !constImage()->matte) ||
(constImage()->matte && !matteFlag_))
- SetImageOpacity(image(),OpaqueOpacity);
+ SetImageOpacity(image(),OpaqueAlpha);
image()->matte = (MagickBooleanType) matteFlag_;
}
@@ -3364,7 +3363,9 @@
// Get pixel view
Pixels pixels(*this);
// Set pixel value
- *(pixels.get(x_, y_, 1, 1 )) = color_;
+ Quantum *pixel = pixels.get(x_, y_, 1, 1 );
+ PixelPacket packet = color_;
+ MagickCore::SetPixelPacket(constImage(),&packet,pixel);
// Tell ImageMagick that pixels have been updated
pixels.sync();
@@ -3378,19 +3379,12 @@
ClassType storage_class;
storage_class = classType();
// DirectClass
- const PixelPacket* pixel = getConstPixels( x_, y_, 1, 1 );
- if ( storage_class == DirectClass )
+ const Quantum* pixel = getConstPixels( x_, y_, 1, 1 );
+ if ( pixel )
{
- if ( pixel )
- return Color( *pixel );
- }
-
- // PseudoClass
- if ( storage_class == PseudoClass )
- {
- const IndexPacket* indexes = getConstIndexes();
- if ( indexes )
- return colorMap( (size_t) *indexes );
+ PixelPacket packet;
+ MagickCore::GetPixelPacket(constImage(),pixel,&packet);
+ return Color( packet );
}
return Color(); // invalid
@@ -3613,13 +3607,13 @@
&statistics->blue.kurtosis,&statistics->blue.skewness,&exceptionInfo);
(void) GetImageChannelRange(constImage(),OpacityChannel,&minimum,&maximum,
&exceptionInfo);
- statistics->opacity.minimum=minimum;
- statistics->opacity.maximum=maximum;
+ statistics->alpha.minimum=minimum;
+ statistics->alpha.maximum=maximum;
(void) GetImageChannelMean(constImage(),OpacityChannel,
- &statistics->opacity.mean,&statistics->opacity.standard_deviation,
+ &statistics->alpha.mean,&statistics->alpha.standard_deviation,
&exceptionInfo);
(void) GetImageChannelKurtosis(constImage(),OpacityChannel,
- &statistics->opacity.kurtosis,&statistics->opacity.skewness,&exceptionInfo);
+ &statistics->alpha.kurtosis,&statistics->alpha.skewness,&exceptionInfo);
throwException( exceptionInfo );
(void) DestroyExceptionInfo( &exceptionInfo );
}
@@ -3795,16 +3789,6 @@
return constOptions()->textEncoding( );
}
-void Magick::Image::tileName ( const std::string &tileName_ )
-{
- modifyImage();
- options()->tileName( tileName_ );
-}
-std::string Magick::Image::tileName ( void ) const
-{
- return constOptions()->tileName( );
-}
-
size_t Magick::Image::totalColors ( void )
{
ExceptionInfo exceptionInfo;
@@ -3980,14 +3964,14 @@
// Transfers read-only pixels from the image to the pixel cache as
// defined by the specified region
-const Magick::PixelPacket* Magick::Image::getConstPixels
+const Magick::Quantum* Magick::Image::getConstPixels
( const ssize_t x_, const ssize_t y_,
const size_t columns_,
const size_t rows_ ) const
{
ExceptionInfo exceptionInfo;
GetExceptionInfo( &exceptionInfo );
- const PixelPacket* p = (*GetVirtualPixels)( constImage(),
+ const Quantum* p = (*GetVirtualPixels)( constImage(),
x_, y_,
columns_, rows_,
&exceptionInfo );
@@ -3996,10 +3980,10 @@
return p;
}
-// Obtain read-only pixel indexes (valid for PseudoClass images)
-const Magick::IndexPacket* Magick::Image::getConstIndexes ( void ) const
+// Obtain read-only pixel associated pixels channels
+const void* Magick::Image::getConstMetacontent ( void ) const
{
- const Magick::IndexPacket* result = GetVirtualIndexQueue( constImage() );
+ const void* result = GetVirtualMetacontent( constImage() );
if( !result )
throwImageException();
@@ -4007,10 +3991,10 @@
return result;
}
-// Obtain image pixel indexes (valid for PseudoClass images)
-Magick::IndexPacket* Magick::Image::getIndexes ( void )
+// Obtain image pixel associated pixels channels
+void* Magick::Image::getMetacontent ( void )
{
- Magick::IndexPacket* result = GetAuthenticIndexQueue( image() );
+ void* result = GetAuthenticMetacontent( image() );
if( !result )
throwImageException();
@@ -4021,14 +4005,14 @@
// Transfers pixels from the image to the pixel cache as defined
// by the specified region. Modified pixels may be subsequently
// transferred back to the image via syncPixels.
-Magick::PixelPacket* Magick::Image::getPixels ( const ssize_t x_, const ssize_t y_,
+Magick::Quantum* Magick::Image::getPixels ( const ssize_t x_, const ssize_t y_,
const size_t columns_,
const size_t rows_ )
{
modifyImage();
ExceptionInfo exceptionInfo;
GetExceptionInfo( &exceptionInfo );
- PixelPacket* result = (*GetAuthenticPixels)( image(),
+ Quantum* result = (*GetAuthenticPixels)( image(),
x_, y_,
columns_, rows_, &exceptionInfo );
throwException( exceptionInfo );
@@ -4040,14 +4024,14 @@
// Allocates a pixel cache region to store image pixels as defined
// by the region rectangle. This area is subsequently transferred
// from the pixel cache to the image via syncPixels.
-Magick::PixelPacket* Magick::Image::setPixels ( const ssize_t x_, const ssize_t y_,
+Magick::Quantum* Magick::Image::setPixels ( const ssize_t x_, const ssize_t y_,
const size_t columns_,
const size_t rows_ )
{
modifyImage();
ExceptionInfo exceptionInfo;
GetExceptionInfo( &exceptionInfo );
- PixelPacket* result = (*QueueAuthenticPixels)( image(),
+ Quantum* result = (*QueueAuthenticPixels)( image(),
x_, y_,
columns_, rows_, &exceptionInfo );
throwException( exceptionInfo );
diff --git a/Magick++/lib/Magick++/Color.h b/Magick++/lib/Magick++/Color.h
index e082a80..581eedd 100644
--- a/Magick++/lib/Magick++/Color.h
+++ b/Magick++/lib/Magick++/Color.h
@@ -52,7 +52,7 @@
void blueQuantum ( Quantum blue_ );
Quantum blueQuantum ( void ) const;
- // Alpha level (range OpaqueOpacity=0 to TransparentOpacity=QuantumRange)
+ // Alpha level (range OpaqueAlpha=0 to TransparentAlpha=QuantumRange)
void alphaQuantum ( Quantum alpha_ );
Quantum alphaQuantum ( void ) const;
@@ -124,12 +124,12 @@
// Red = red;
// Green = green;
// Blue = blue;
- // Alpha = opacity;
+ // Alpha = alpha;
// CYMKPixel:
// Cyan = red
// Yellow = green
// Magenta = blue
- // Black(K) = opacity
+ // Black(K) = alpha
enum PixelType
{
RGBPixel,
@@ -149,7 +149,7 @@
// red = red (range 0 to QuantumRange)
// green = green (range 0 to QuantumRange)
// blue = blue (range 0 to QuantumRange)
- // opacity = alpha (range OpaqueOpacity=0 to TransparentOpacity=QuantumRange)
+ // alpha = alpha (range OpaqueAlpha=0 to TransparentAlpha=QuantumRange)
// index = PseudoColor colormap index
PixelPacket* _pixel;
@@ -322,7 +322,7 @@
_pixel->red = 0;
_pixel->green = 0;
_pixel->blue = 0;
- _pixel->opacity = TransparentOpacity;
+ _pixel->alpha = TransparentAlpha;
}
inline void Magick::Color::redQuantum ( Magick::Quantum red_ )
@@ -360,13 +360,13 @@
inline void Magick::Color::alphaQuantum ( Magick::Quantum alpha_ )
{
- _pixel->opacity = alpha_;
+ _pixel->alpha = alpha_;
_isValid = true ;
}
inline Magick::Quantum Magick::Color::alphaQuantum ( void ) const
{
- return _pixel->opacity;
+ return _pixel->alpha;
}
// Return ImageMagick PixelPacket struct based on color.
diff --git a/Magick++/lib/Magick++/Drawable.h b/Magick++/lib/Magick++/Drawable.h
index 272a54a..bf0a385 100644
--- a/Magick++/lib/Magick++/Drawable.h
+++ b/Magick++/lib/Magick++/Drawable.h
@@ -896,12 +896,12 @@
FillRule _fillRule;
};
-// Specify drawing fill opacity
+// Specify drawing fill alpha
class MagickDLLDecl DrawableFillOpacity : public DrawableBase
{
public:
- DrawableFillOpacity ( double opacity_ )
- : _opacity(opacity_)
+ DrawableFillOpacity ( double alpha_ )
+ : _alpha(alpha_)
{
}
@@ -913,17 +913,17 @@
// Return polymorphic copy of object
/*virtual*/ DrawableBase* copy() const;
- void opacity( double opacity_ )
+ void alpha( double alpha_ )
{
- _opacity = opacity_;
+ _alpha = alpha_;
}
- double opacity( void ) const
+ double alpha( void ) const
{
- return _opacity;
+ return _alpha;
}
private:
- double _opacity;
+ double _alpha;
};
// Specify text font
@@ -1807,12 +1807,12 @@
Color _color;
};
-// Stroke opacity
+// Stroke alpha
class MagickDLLDecl DrawableStrokeOpacity : public DrawableBase
{
public:
- DrawableStrokeOpacity ( double opacity_ )
- : _opacity(opacity_)
+ DrawableStrokeOpacity ( double alpha_ )
+ : _alpha(alpha_)
{
}
@@ -1824,17 +1824,17 @@
// Return polymorphic copy of object
/*virtual*/ DrawableBase* copy() const;
- void opacity( double opacity_ )
+ void alpha( double alpha_ )
{
- _opacity = opacity_;
+ _alpha = alpha_;
}
- double opacity( void ) const
+ double alpha( void ) const
{
- return _opacity;
+ return _alpha;
}
private:
- double _opacity;
+ double _alpha;
};
// Stroke width
diff --git a/Magick++/lib/Magick++/Image.h b/Magick++/lib/Magick++/Image.h
index 5dfc8aa..6f37b2e 100644
--- a/Magick++/lib/Magick++/Image.h
+++ b/Magick++/lib/Magick++/Image.h
@@ -203,14 +203,14 @@
// applies the correction to the image.
void cdl ( const std::string &cdl_ );
- // Colorize image with pen color, using specified percent opacity
+ // Colorize image with pen color, using specified percent alpha
// for red, green, and blue quantums
- void colorize ( const unsigned int opacityRed_,
- const unsigned int opacityGreen_,
- const unsigned int opacityBlue_,
+ void colorize ( const unsigned int alphaRed_,
+ const unsigned int alphaGreen_,
+ const unsigned int alphaBlue_,
const Color &penColor_ );
- // Colorize image with pen color, using specified percent opacity.
- void colorize ( const unsigned int opacity_,
+ // Colorize image with pen color, using specified percent alpha.
+ void colorize ( const unsigned int alpha_,
const Color &penColor_ );
// Apply a color matrix to the image channels. The user supplied
@@ -332,10 +332,10 @@
const Color &borderColor_ );
// Floodfill pixels matching color (within fuzz factor) of target
- // pixel(x,y) with replacement opacity value using method.
+ // pixel(x,y) with replacement alpha value using method.
void floodFillOpacity ( const ::ssize_t x_,
const ::ssize_t y_,
- const unsigned int opacity_,
+ const unsigned int alpha_,
const PaintMethod method_ );
// Flood-fill texture across pixels that match the color of the
@@ -442,9 +442,9 @@
void map ( const Image &mapImage_ ,
const bool dither_ = false );
- // Floodfill designated area with replacement opacity value
+ // Floodfill designated area with replacement alpha value
void matteFloodfill ( const Color &target_ ,
- const unsigned int opacity_,
+ const unsigned int alpha_,
const ::ssize_t x_, const ::ssize_t y_,
const PaintMethod method_ );
@@ -481,14 +481,14 @@
// Oilpaint image (image looks like oil painting)
void oilPaint ( const double radius_ = 3.0 );
- // Set or attenuate the opacity channel in the image. If the image
- // pixels are opaque then they are set to the specified opacity
- // value, otherwise they are blended with the supplied opacity
- // value. The value of opacity_ ranges from 0 (completely opaque)
- // to QuantumRange. The defines OpaqueOpacity and TransparentOpacity are
+ // Set or attenuate the alpha channel in the image. If the image
+ // pixels are opaque then they are set to the specified alpha
+ // value, otherwise they are blended with the supplied alpha
+ // value. The value of alpha_ ranges from 0 (completely opaque)
+ // to QuantumRange. The defines OpaqueAlpha and TransparentAlpha are
// available to specify completely opaque or completely
// transparent, respectively.
- void opacity ( const unsigned int opacity_ );
+ void alpha ( const unsigned int alpha_ );
// Change color of opaque pixel to specified pen color.
void opaque ( const Color &opaqueColor_,
@@ -1021,7 +1021,7 @@
ImageChannelStatistics red;
ImageChannelStatistics green;
ImageChannelStatistics blue;
- ImageChannelStatistics opacity;
+ ImageChannelStatistics alpha;
} ImageStatistics;
void statistics ( ImageStatistics *statistics ) const;
@@ -1209,10 +1209,6 @@
void textEncoding ( const std::string &encoding_ );
std::string textEncoding ( void ) const;
- // Tile name
- void tileName ( const std::string &tileName_ );
- std::string tileName ( void ) const;
-
// Number of colors in the image
size_t totalColors ( void );
@@ -1276,28 +1272,28 @@
// Transfers read-only pixels from the image to the pixel cache as
// defined by the specified region
- const PixelPacket* getConstPixels ( const ::ssize_t x_, const ::ssize_t y_,
+ const Quantum* getConstPixels ( const ::ssize_t x_, const ::ssize_t y_,
const size_t columns_,
const size_t rows_ ) const;
- // Obtain mutable image pixel indexes (valid for PseudoClass images)
- IndexPacket* getIndexes ( void );
+ // Obtain mutable image pixel metacontent (valid for PseudoClass images)
+ void* getMetacontent ( void );
- // Obtain immutable image pixel indexes (valid for PseudoClass images)
- const IndexPacket* getConstIndexes ( void ) const;
+ // Obtain immutable image pixel metacontent (valid for PseudoClass images)
+ const void* getConstMetacontent ( void ) const;
// Transfers pixels from the image to the pixel cache as defined
// by the specified region. Modified pixels may be subsequently
// transferred back to the image via syncPixels. This method is
// valid for DirectClass images.
- PixelPacket* getPixels ( const ::ssize_t x_, const ::ssize_t y_,
+ Quantum* getPixels ( const ::ssize_t x_, const ::ssize_t y_,
const size_t columns_,
const size_t rows_ );
// Allocates a pixel cache region to store image pixels as defined
// by the region rectangle. This area is subsequently transferred
// from the pixel cache to the image via syncPixels.
- PixelPacket* setPixels ( const ::ssize_t x_, const ::ssize_t y_,
+ Quantum* setPixels ( const ::ssize_t x_, const ::ssize_t y_,
const size_t columns_,
const size_t rows_ );
diff --git a/Magick++/lib/Magick++/Include.h b/Magick++/lib/Magick++/Include.h
index 7f72357..de0846e 100644
--- a/Magick++/lib/Magick++/Include.h
+++ b/Magick++/lib/Magick++/Include.h
@@ -10,7 +10,7 @@
#if !defined(_MAGICK_CONFIG_H)
# define _MAGICK_CONFIG_H
# if !defined(vms) && !defined(macintosh)
-# include "magick/magick-config.h"
+# include "MagickCore/magick-config.h"
# else
# include "magick-config.h"
# endif
@@ -44,8 +44,8 @@
//
namespace MagickCore
{
-#include <magick/MagickCore.h>
-#include <wand/MagickWand.h>
+#include <MagickCore/MagickCore.h>
+#include <MagickWand/MagickWand.h>
#undef inline // Remove possible definition from config.h
#undef class
@@ -144,7 +144,6 @@
using MagickCore::YellowChannel;
using MagickCore::OpacityChannel;
using MagickCore::BlackChannel;
- using MagickCore::MatteChannel;
using MagickCore::DefaultChannels;
using MagickCore::AllChannels;
@@ -170,7 +169,6 @@
using MagickCore::YUVColorspace;
// Composition operations
- using MagickCore::AddCompositeOp;
using MagickCore::AtopCompositeOp;
using MagickCore::BlendCompositeOp;
using MagickCore::BumpmapCompositeOp;
@@ -196,7 +194,6 @@
using MagickCore::InCompositeOp;
using MagickCore::LightenCompositeOp;
using MagickCore::LuminizeCompositeOp;
- using MagickCore::MinusCompositeOp;
using MagickCore::ModulateCompositeOp;
using MagickCore::MultiplyCompositeOp;
using MagickCore::NoCompositeOp;
@@ -207,7 +204,6 @@
using MagickCore::SaturateCompositeOp;
using MagickCore::ScreenCompositeOp;
using MagickCore::SoftLightCompositeOp;
- using MagickCore::SubtractCompositeOp;
using MagickCore::ThresholdCompositeOp;
using MagickCore::UndefinedCompositeOp;
using MagickCore::XorCompositeOp;
@@ -451,9 +447,7 @@
// PixelPacket structure
using MagickCore::PixelPacket;
-
- // IndexPacket type
- using MagickCore::IndexPacket;
+ using MagickCore::Quantum;
// Sparse Color methods
using MagickCore::SparseColorMethod;
@@ -571,7 +565,6 @@
using MagickCore::ColorDecisionListImage;
using MagickCore::ColorizeImage;
using MagickCore::ColorMatrixImage;
- using MagickCore::ColorPacket;
using MagickCore::CompositeImage;
using MagickCore::ConfigureError;
using MagickCore::ConfigureFatalError;
@@ -587,7 +580,6 @@
using MagickCore::CorruptImageWarning;
using MagickCore::CropImage;
using MagickCore::CycleColormapImage;
- using MagickCore::DeconstructImages;
using MagickCore::DelegateError;
using MagickCore::DelegateFatalError;
using MagickCore::DelegateWarning;
@@ -720,10 +712,10 @@
using MagickCore::GaussianBlurImage;
using MagickCore::GaussianBlurImageChannel;
using MagickCore::GetAffineMatrix;
- using MagickCore::GetAuthenticIndexQueue;
+ using MagickCore::GetAuthenticMetacontent;
using MagickCore::GetBlobSize;
using MagickCore::GetCacheViewException;
- using MagickCore::GetCacheViewAuthenticIndexQueue;
+ using MagickCore::GetCacheViewAuthenticMetacontent;
using MagickCore::GetCacheViewAuthenticPixels;
using MagickCore::GetColorTuple;
using MagickCore::GetDrawInfo;
@@ -745,14 +737,14 @@
using MagickCore::GetImageQuantizeError;
using MagickCore::GetImageType;
using MagickCore::GetMagickInfo;
- using MagickCore::GetMagickPixelPacket;
+ using MagickCore::GetPixelInfo;
using MagickCore::GetNumberColors;
using MagickCore::GetPageGeometry;
using MagickCore::GetQuantizeInfo;
using MagickCore::GetStringInfoDatum;
using MagickCore::GetStringInfoLength;
using MagickCore::GetTypeMetrics;
- using MagickCore::GetVirtualIndexQueue;
+ using MagickCore::GetVirtualMetacontent;
using MagickCore::GetImageVirtualPixelMethod;
using MagickCore::GlobExpression;
using MagickCore::GravityAdjustGeometry;
@@ -780,7 +772,7 @@
using MagickCore::LogMagickEvent;
using MagickCore::MagickCoreTerminus;
using MagickCore::MagickInfo;
- using MagickCore::MagickPixelPacket;
+ using MagickCore::PixelInfo;
using MagickCore::MagickToMime;
using MagickCore::MagickWand;
using MagickCore::MagnifyImage;
@@ -813,7 +805,7 @@
using MagickCore::PercentValue;
using MagickCore::PingBlob;
using MagickCore::PingImage;
- using MagickCore::PixelSetQuantumColor;
+ using MagickCore::PixelSetQuantumPacket;
using MagickCore::PixelWand;
using MagickCore::PointInfo;
using MagickCore::PopDrawingWand;
diff --git a/Magick++/lib/Magick++/Options.h b/Magick++/lib/Magick++/Options.h
index d646b8c..8491958 100644
--- a/Magick++/lib/Magick++/Options.h
+++ b/Magick++/lib/Magick++/Options.h
@@ -230,9 +230,6 @@
void textEncoding ( const std::string &encoding_ );
std::string textEncoding ( void ) const;
- void tileName ( const std::string &tileName_ );
- std::string tileName ( void ) const;
-
// Image representation type
void type ( const ImageType type_ );
ImageType type ( void ) const;
diff --git a/Magick++/lib/Magick++/Pixels.h b/Magick++/lib/Magick++/Pixels.h
index 3c5f528..22c6a76 100644
--- a/Magick++/lib/Magick++/Pixels.h
+++ b/Magick++/lib/Magick++/Pixels.h
@@ -27,12 +27,12 @@
// Transfer pixels from the image to the pixel view as defined by
// the specified region. Modified pixels may be subsequently
// transferred back to the image via sync.
- PixelPacket* get ( const ::ssize_t x_, const ::ssize_t y_,
+ Quantum* get ( const ::ssize_t x_, const ::ssize_t y_,
const size_t columns_,const size_t rows_ );
// Transfer read-only pixels from the image to the pixel view as
// defined by the specified region.
- const PixelPacket* getConst ( const ::ssize_t x_, const ::ssize_t y_,
+ const Quantum* getConst ( const ::ssize_t x_, const ::ssize_t y_,
const size_t columns_,
const size_t rows_ );
@@ -42,11 +42,11 @@
// Allocate a pixel view region to store image pixels as defined
// by the region rectangle. This area is subsequently transferred
// from the pixel view to the image via sync.
- PixelPacket* set ( const ::ssize_t x_, const ::ssize_t y_,
+ Quantum* set ( const ::ssize_t x_, const ::ssize_t y_,
const size_t columns_, const size_t rows_ );
// Return pixel colormap index array
- IndexPacket* indexes ( void );
+ Quantum* metacontent ( void );
// Left ordinate of view
::ssize_t x ( void ) const;
diff --git a/Magick++/lib/Magick++/STL.h b/Magick++/lib/Magick++/STL.h
index 2518572..0483535 100644
--- a/Magick++/lib/Magick++/STL.h
+++ b/Magick++/lib/Magick++/STL.h
@@ -213,24 +213,24 @@
std::string _cdl;
};
- // Colorize image using pen color at specified percent opacity
+ // Colorize image using pen color at specified percent alpha
class MagickDLLDecl colorizeImage : public std::unary_function<Image&,void>
{
public:
- colorizeImage( const unsigned int opacityRed_,
- const unsigned int opacityGreen_,
- const unsigned int opacityBlue_,
+ colorizeImage( const unsigned int alphaRed_,
+ const unsigned int alphaGreen_,
+ const unsigned int alphaBlue_,
const Color &penColor_ );
- colorizeImage( const unsigned int opacity_,
+ colorizeImage( const unsigned int alpha_,
const Color &penColor_ );
void operator()( Image &image_ ) const;
private:
- unsigned int _opacityRed;
- unsigned int _opacityGreen;
- unsigned int _opacityBlue;
+ unsigned int _alphaRed;
+ unsigned int _alphaGreen;
+ unsigned int _alphaBlue;
Color _penColor;
};
@@ -807,22 +807,22 @@
double _radius;
};
- // Set or attenuate the image opacity channel. If the image pixels
- // are opaque then they are set to the specified opacity value,
- // otherwise they are blended with the supplied opacity value. The
- // value of opacity_ ranges from 0 (completely opaque) to
- // QuantumRange. The defines OpaqueOpacity and TransparentOpacity are
+ // Set or attenuate the image alpha channel. If the image pixels
+ // are opaque then they are set to the specified alpha value,
+ // otherwise they are blended with the supplied alpha value. The
+ // value of alpha_ ranges from 0 (completely opaque) to
+ // QuantumRange. The defines OpaqueAlpha and TransparentAlpha are
// available to specify completely opaque or completely transparent,
// respectively.
- class MagickDLLDecl opacityImage : public std::unary_function<Image&,void>
+ class MagickDLLDecl alphaImage : public std::unary_function<Image&,void>
{
public:
- opacityImage( const unsigned int opacity_ );
+ alphaImage( const unsigned int alpha_ );
void operator()( Image &image_ ) const;
private:
- unsigned int _opacity;
+ unsigned int _alpha;
};
// Change color of opaque pixel to specified pen color.
@@ -1776,18 +1776,6 @@
size_t _subRange;
};
- // Tile name
- class MagickDLLDecl tileNameImage : public std::unary_function<Image&,void>
- {
- public:
- tileNameImage( const std::string &tileName_ );
-
- void operator()( Image &image_ ) const;
-
- private:
- std::string _tileName;
- };
-
// Image storage type
class MagickDLLDecl typeImage : public std::unary_function<Image&,void>
{
@@ -1968,7 +1956,7 @@
MagickCore::GetExceptionInfo( &exceptionInfo );
linkImages( first_, last_ );
MagickCore::Image* image = MagickCore::EvaluateImages( first_->image(),
- MagickCore::MeanEvaluateOperator, &exceptionInfo );
+ MagickCore::MeanEvaluateOperator, &exceptionInfo );
unlinkImages( first_, last_ );
averagedImage_->replaceImage( image );
throwException( exceptionInfo );
@@ -2130,7 +2118,7 @@
// Obtain histogram array
size_t colors;
- MagickCore::ColorPacket *histogram_array =
+ MagickCore::PixelPacket *histogram_array =
MagickCore::GetImageHistogram( image.constImage(), &colors, &exceptionInfo );
throwException( exceptionInfo );
(void) MagickCore::DestroyExceptionInfo( &exceptionInfo );
@@ -2142,14 +2130,14 @@
for ( size_t i=0; i < colors; i++)
{
histogram_->insert(histogram_->end(),std::pair<const Color,size_t>
- ( Color(histogram_array[i].pixel.red,
- histogram_array[i].pixel.green,
- histogram_array[i].pixel.blue),
+ ( Color(histogram_array[i].red,
+ histogram_array[i].green,
+ histogram_array[i].blue),
(size_t) histogram_array[i].count) );
}
// Deallocate histogram array
- histogram_array=(MagickCore::ColorPacket *)
+ histogram_array=(MagickCore::PixelPacket *)
MagickCore::RelinquishMagickMemory(histogram_array);
}
diff --git a/Magick++/lib/Options.cpp b/Magick++/lib/Options.cpp
index 04fe105..1ded7bc 100644
--- a/Magick++/lib/Options.cpp
+++ b/Magick++/lib/Options.cpp
@@ -10,16 +10,15 @@
#define MAGICKCORE_IMPLEMENTATION 1
#define MAGICK_PLUSPLUS_IMPLEMENTATION 1
-#include "Magick++/Include.h"
#include <string>
#include <string.h>
#include <stdlib.h>
#include <math.h>
+#include "Magick++/Include.h"
#include "Magick++/Options.h"
#include "Magick++/Functions.h"
#include "Magick++/Exception.h"
-#define MagickPI 3.14159265358979323846264338327950288419716939937510
#define DegreesToRadians(x) (MagickPI*(x)/180.0)
// Constructor
@@ -644,20 +643,6 @@
return std::string();
}
-void Magick::Options::tileName ( const std::string &tileName_ )
-{
- if ( tileName_.length() == 0 )
- _imageInfo->tile=(char *) RelinquishMagickMemory(_imageInfo->tile);
- else
- Magick::CloneString( &_imageInfo->tile, tileName_ );
-}
-std::string Magick::Options::tileName ( void ) const
-{
- if ( _imageInfo->tile )
- return std::string( _imageInfo->tile );
- return std::string();
-}
-
// Image representation type
void Magick::Options::type ( const Magick::ImageType type_ )
{
diff --git a/Magick++/lib/Pixels.cpp b/Magick++/lib/Pixels.cpp
index 1b15e3b..5f75570 100644
--- a/Magick++/lib/Pixels.cpp
+++ b/Magick++/lib/Pixels.cpp
@@ -47,7 +47,7 @@
// Transfer pixels from the image to the pixel view as defined by
// the specified region. Modified pixels may be subsequently
// transferred back to the image via sync.
-Magick::PixelPacket* Magick::Pixels::get ( const ssize_t x_,
+Magick::Quantum* Magick::Pixels::get ( const ssize_t x_,
const ssize_t y_,
const size_t columns_,
const size_t rows_ )
@@ -57,7 +57,7 @@
_columns = columns_;
_rows = rows_;
- PixelPacket* pixels = GetCacheViewAuthenticPixels( _view, x_, y_, columns_, rows_, &_exception);
+ Quantum* pixels = GetCacheViewAuthenticPixels( _view, x_, y_, columns_, rows_, &_exception);
if ( !pixels )
throwException( _exception );
@@ -67,7 +67,7 @@
// Transfer read-only pixels from the image to the pixel view as
// defined by the specified region.
-const Magick::PixelPacket* Magick::Pixels::getConst ( const ssize_t x_, const ssize_t y_,
+const Magick::Quantum* Magick::Pixels::getConst ( const ssize_t x_, const ssize_t y_,
const size_t columns_,
const size_t rows_ )
{
@@ -76,7 +76,7 @@
_columns = columns_;
_rows = rows_;
- const PixelPacket* pixels =
+ const Quantum* pixels =
GetCacheViewVirtualPixels(_view, x_, y_, columns_, rows_, &_exception );
if ( !pixels )
@@ -95,7 +95,7 @@
// Allocate a pixel view region to store image pixels as defined
// by the region rectangle. This area is subsequently transferred
// from the pixel view to the image via 'sync'.
-Magick::PixelPacket* Magick::Pixels::set ( const ssize_t x_,
+Magick::Quantum* Magick::Pixels::set ( const ssize_t x_,
const ssize_t y_,
const size_t columns_,
const size_t rows_ )
@@ -105,7 +105,7 @@
_columns = columns_;
_rows = rows_;
- PixelPacket* pixels = QueueCacheViewAuthenticPixels( _view, x_, y_,
+ Quantum* pixels = QueueCacheViewAuthenticPixels( _view, x_, y_,
columns_, rows_, &_exception );
if ( !pixels )
throwException( _exception );
@@ -114,12 +114,14 @@
}
// Return pixel colormap index array
-Magick::IndexPacket* Magick::Pixels::indexes ( void )
+/*
+Magick::void* Magick::Pixels::metacontent ( void )
{
- IndexPacket* pixel_indexes = GetCacheViewAuthenticIndexQueue( _view );
+ void* pixel_metacontent = GetCacheViewAuthenticMetacontent( _view );
- if ( !pixel_indexes )
+ if ( !pixel_metacontent )
_image.throwImageException();
- return pixel_indexes;
+ return pixel_metacontent;
}
+*/
diff --git a/Magick++/lib/STL.cpp b/Magick++/lib/STL.cpp
index b87e214..af681c5 100644
--- a/Magick++/lib/STL.cpp
+++ b/Magick++/lib/STL.cpp
@@ -169,28 +169,28 @@
image_.cdl( _cdl.c_str() );
}
-// Colorize image using pen color at specified percent opacity
-Magick::colorizeImage::colorizeImage( const unsigned int opacityRed_,
- const unsigned int opacityGreen_,
- const unsigned int opacityBlue_,
+// Colorize image using pen color at specified percent alpha
+Magick::colorizeImage::colorizeImage( const unsigned int alphaRed_,
+ const unsigned int alphaGreen_,
+ const unsigned int alphaBlue_,
const Magick::Color &penColor_ )
- : _opacityRed ( opacityRed_ ),
- _opacityGreen ( opacityGreen_ ),
- _opacityBlue ( opacityBlue_ ),
+ : _alphaRed ( alphaRed_ ),
+ _alphaGreen ( alphaGreen_ ),
+ _alphaBlue ( alphaBlue_ ),
_penColor( penColor_ )
{
}
-Magick::colorizeImage::colorizeImage( const unsigned int opacity_,
+Magick::colorizeImage::colorizeImage( const unsigned int alpha_,
const Magick::Color &penColor_ )
- : _opacityRed ( opacity_ ),
- _opacityGreen ( opacity_ ),
- _opacityBlue ( opacity_ ),
+ : _alphaRed ( alpha_ ),
+ _alphaGreen ( alpha_ ),
+ _alphaBlue ( alpha_ ),
_penColor( penColor_ )
{
}
void Magick::colorizeImage::operator()( Magick::Image &image_ ) const
{
- image_.colorize( _opacityRed, _opacityGreen, _opacityBlue, _penColor );
+ image_.colorize( _alphaRed, _alphaGreen, _alphaBlue, _penColor );
}
// Apply a color matrix to the image channels. The user supplied
@@ -758,19 +758,19 @@
image_.oilPaint( _radius );
}
-// Set or attenuate the image opacity channel. If the image pixels are
-// opaque then they are set to the specified opacity value, otherwise
-// they are blended with the supplied opacity value. The value of
-// opacity_ ranges from 0 (completely opaque) to QuantumRange. The defines
-// OpaqueOpacity and TransparentOpacity are available to specify
+// Set or attenuate the image alpha channel. If the image pixels are
+// opaque then they are set to the specified alpha value, otherwise
+// they are blended with the supplied alpha value. The value of
+// alpha_ ranges from 0 (completely opaque) to QuantumRange. The defines
+// OpaqueAlpha and TransparentAlpha are available to specify
// completely opaque or completely transparent, respectively.
-Magick::opacityImage::opacityImage( const unsigned int opacity_ )
- : _opacity( opacity_ )
+Magick::alphaImage::alphaImage( const unsigned int alpha_ )
+ : _alpha( alpha_ )
{
}
-void Magick::opacityImage::operator()( Magick::Image &image_ ) const
+void Magick::alphaImage::operator()( Magick::Image &image_ ) const
{
- image_.opacity( _opacity );
+ image_.alpha( _alpha );
}
// Change color of opaque pixel to specified pen color.
@@ -1573,16 +1573,6 @@
image_.subRange( _subRange );
}
-// Tile name
-Magick::tileNameImage::tileNameImage( const std::string &tileName_ )
- : _tileName( tileName_ )
-{
-}
-void Magick::tileNameImage::operator()( Magick::Image &image_ ) const
-{
- image_.tileName( _tileName );
-}
-
// Image storage type
Magick::typeImage::typeImage( const Magick::ImageType type_ )
: _type( type_ )
diff --git a/Magick++/tests/attributes.cpp b/Magick++/tests/attributes.cpp
index 3b92139..6368ad5 100644
--- a/Magick++/tests/attributes.cpp
+++ b/Magick++/tests/attributes.cpp
@@ -1362,32 +1362,6 @@
image.subRange(0);
//
- // tileName
- //
- if ( image.tileName().length() != 0 )
- {
- ++failures;
- cout << "Line: " << __LINE__
- << ", tileName default is not empty string as expected" << endl;
- }
-
- image.tileName("How now brown cow?");
- if ( image.tileName() != "How now brown cow?" )
- {
- ++failures;
- cout << "Line: " << __LINE__
- << ", tileName set/get failed" << endl;
- }
-
- image.tileName( string() );
- if ( image.tileName().length() != 0 )
- {
- ++failures;
- cout << "Line: " << __LINE__
- << ", tileName failed to unset" << endl;
- }
-
- //
// totalColors
//
if ( image.totalColors() != 2 )
diff --git a/magick/ImageMagick.h b/MagickCore/ImageMagick.h
similarity index 100%
rename from magick/ImageMagick.h
rename to MagickCore/ImageMagick.h
diff --git a/magick/ImageMagick.ico b/MagickCore/ImageMagick.ico
similarity index 100%
rename from magick/ImageMagick.ico
rename to MagickCore/ImageMagick.ico
Binary files differ
diff --git a/magick/ImageMagick.pc b/MagickCore/ImageMagick.pc
similarity index 100%
rename from magick/ImageMagick.pc
rename to MagickCore/ImageMagick.pc
diff --git a/magick/ImageMagick.pc.in b/MagickCore/ImageMagick.pc.in
similarity index 100%
rename from magick/ImageMagick.pc.in
rename to MagickCore/ImageMagick.pc.in
diff --git a/magick/ImageMagick.rc b/MagickCore/ImageMagick.rc
similarity index 100%
rename from magick/ImageMagick.rc
rename to MagickCore/ImageMagick.rc
diff --git a/magick/Magick-config b/MagickCore/Magick-config
similarity index 100%
rename from magick/Magick-config
rename to MagickCore/Magick-config
diff --git a/magick/Magick-config.1 b/MagickCore/Magick-config.1
similarity index 100%
rename from magick/Magick-config.1
rename to MagickCore/Magick-config.1
diff --git a/magick/MagickCore-config.1 b/MagickCore/MagickCore-config.1
similarity index 100%
rename from magick/MagickCore-config.1
rename to MagickCore/MagickCore-config.1
diff --git a/magick/MagickCore-config.in b/MagickCore/MagickCore-config.in
similarity index 100%
rename from magick/MagickCore-config.in
rename to MagickCore/MagickCore-config.in
diff --git a/MagickCore/MagickCore.h b/MagickCore/MagickCore.h
new file mode 100644
index 0000000..1cf4ed3
--- /dev/null
+++ b/MagickCore/MagickCore.h
@@ -0,0 +1,214 @@
+/*
+ Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization
+ dedicated to making software imaging solutions freely available.
+
+ You may not use this file except in compliance with the License.
+ obtain a copy of the License at
+
+ http://www.imagemagick.org/script/license.php
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ MagickCore Application Programming Interface declarations.
+*/
+
+#ifndef _MAGICKCORE_CORE_H
+#define _MAGICKCORE_CORE_H
+
+#if defined(__cplusplus) || defined(c_plusplus)
+extern "C" {
+#endif
+
+#if !defined(_MAGICKCORE_CONFIG_H)
+# define _MAGICKCORE_CONFIG_H
+# if !defined(vms) && !defined(macintosh)
+# include "MagickCore/magick-config.h"
+# else
+# include "magick-config.h"
+# endif
+#if defined(_magickcore_const) && !defined(const)
+# define const _magickcore_const
+#endif
+#if defined(_magickcore_inline) && !defined(inline)
+# define inline _magickcore_inline
+#endif
+#if defined(_magickcore_restrict) && !defined(restrict)
+# define restrict _magickcore_restrict
+#endif
+# if defined(__cplusplus) || defined(c_plusplus)
+# undef inline
+# endif
+#endif
+
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <sys/types.h>
+
+#if defined(WIN32) || defined(WIN64)
+# define MAGICKCORE_WINDOWS_SUPPORT
+#else
+# define MAGICKCORE_POSIX_SUPPORT
+#endif
+
+#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(__CYGWIN__) && !defined(__MINGW32__)
+# if defined(_MT) && defined(_DLL) && !defined(_MAGICKDLL_) && !defined(_LIB) && !defined(MAGICK_STATIC_LINK)
+# define _MAGICKDLL_
+# endif
+# if defined(_MAGICKDLL_)
+# if defined(_VISUALC_)
+# pragma warning( disable: 4273 ) /* Disable the dll linkage warnings */
+# endif
+# if !defined(_MAGICKLIB_)
+# define MagickExport __declspec(dllimport)
+# if defined(_VISUALC_)
+# pragma message( "Magick lib DLL import interface" )
+# endif
+# else
+# define MagickExport __declspec(dllexport)
+# if defined(_VISUALC_)
+# pragma message( "Magick lib DLL export interface" )
+# endif
+# endif
+# else
+# define MagickExport
+# if defined(_VISUALC_)
+# pragma message( "Magick lib static interface" )
+# endif
+# endif
+
+# if defined(_DLL) && !defined(_LIB)
+# define ModuleExport __declspec(dllexport)
+# if defined(_VISUALC_)
+# pragma message( "Magick module DLL export interface" )
+# endif
+# else
+# define ModuleExport
+# if defined(_VISUALC_)
+# pragma message( "Magick module static interface" )
+# endif
+
+# endif
+# define MagickGlobal __declspec(thread)
+# if defined(_VISUALC_)
+# pragma warning(disable : 4018)
+# pragma warning(disable : 4244)
+# pragma warning(disable : 4142)
+# pragma warning(disable : 4800)
+# pragma warning(disable : 4786)
+# pragma warning(disable : 4996)
+# endif
+#else
+# define MagickExport
+# define ModuleExport
+# define MagickGlobal
+#endif
+
+#if !defined(MaxTextExtent)
+# define MaxTextExtent 4096
+#endif
+#define MagickSignature 0xabacadabUL
+
+#if !defined(magick_attribute)
+# if !defined(__GNUC__)
+# define magick_attribute(x) /* nothing */
+# else
+# define magick_attribute __attribute__
+# endif
+#endif
+
+#if defined(MAGICKCORE_NAMESPACE_PREFIX)
+# include "MagickCore/methods.h"
+#endif
+#include "MagickCore/magick-type.h"
+#include "MagickCore/accelerate.h"
+#include "MagickCore/animate.h"
+#include "MagickCore/annotate.h"
+#include "MagickCore/artifact.h"
+#include "MagickCore/attribute.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/cache-view.h"
+#include "MagickCore/cipher.h"
+#include "MagickCore/client.h"
+#include "MagickCore/coder.h"
+#include "MagickCore/color.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/colormap.h"
+#include "MagickCore/compare.h"
+#include "MagickCore/composite.h"
+#include "MagickCore/compress.h"
+#include "MagickCore/configure.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/decorate.h"
+#include "MagickCore/delegate.h"
+#include "MagickCore/display.h"
+#include "MagickCore/distort.h"
+#include "MagickCore/draw.h"
+#include "MagickCore/effect.h"
+#include "MagickCore/enhance.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/feature.h"
+#include "MagickCore/fourier.h"
+#include "MagickCore/fx.h"
+#include "MagickCore/gem.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/hashmap.h"
+#include "MagickCore/histogram.h"
+#include "MagickCore/identify.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-view.h"
+#include "MagickCore/layer.h"
+#include "MagickCore/list.h"
+#include "MagickCore/locale_.h"
+#include "MagickCore/log.h"
+#include "MagickCore/magic.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/matrix.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/mime.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/montage.h"
+#include "MagickCore/morphology.h"
+#include "MagickCore/option.h"
+#include "MagickCore/paint.h"
+#include "MagickCore/pixel.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/policy.h"
+#include "MagickCore/prepress.h"
+#include "MagickCore/profile.h"
+#include "MagickCore/property.h"
+#include "MagickCore/quantize.h"
+#include "MagickCore/quantum.h"
+#include "MagickCore/registry.h"
+#include "MagickCore/random_.h"
+#include "MagickCore/resample.h"
+#include "MagickCore/resize.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/segment.h"
+#include "MagickCore/shear.h"
+#include "MagickCore/signature.h"
+#include "MagickCore/splay-tree.h"
+#include "MagickCore/stream.h"
+#include "MagickCore/statistic.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/timer.h"
+#include "MagickCore/token.h"
+#include "MagickCore/transform.h"
+#include "MagickCore/threshold.h"
+#include "MagickCore/type.h"
+#include "MagickCore/utility.h"
+#include "MagickCore/version.h"
+#include "MagickCore/xml-tree.h"
+#include "MagickCore/xwindow.h"
+
+#if defined(__cplusplus) || defined(c_plusplus)
+}
+#endif
+
+#endif
diff --git a/magick/MagickCore.pc.in b/MagickCore/MagickCore.pc.in
similarity index 100%
rename from magick/MagickCore.pc.in
rename to MagickCore/MagickCore.pc.in
diff --git a/magick/Make.com b/MagickCore/Make.com
similarity index 100%
rename from magick/Make.com
rename to MagickCore/Make.com
diff --git a/MagickCore/Makefile.am b/MagickCore/Makefile.am
new file mode 100644
index 0000000..e4b326c
--- /dev/null
+++ b/MagickCore/Makefile.am
@@ -0,0 +1,429 @@
+# Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization
+# dedicated to making software imaging solutions freely available.
+#
+# You may not use this file except in compliance with the License. You may
+# obtain a copy of the License at
+#
+# http://www.imagemagick.org/script/license.php
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Makefile for building the MagickCore API.
+#
+
+MagickCoreincdir = $(topincludedir)/MagickCore
+
+# Headers which are installed
+MagickCoreinc_HEADERS = \
+ $(MAGICKCORE_INCLUDE_HDRS)
+
+MAGICKCORE_BIN_SCRPTS = \
+ MagickCore/MagickCore-config
+
+MAGICKCORE_PKGCONFIG = \
+ MagickCore/ImageMagick.pc \
+ MagickCore/MagickCore.pc
+
+OSX_GCOV_LDFLAG = @OSX_GCOV_LDFLAG@
+
+MAGICKCORE_MANS = \
+ MagickCore/MagickCore-config.1
+
+MAGICKCORE_LIBS = MagickCore/libMagickCore.la
+
+if WITH_MODULES
+MagickCore_libMagickCore_la_SOURCES = $(MAGICKCORE_BASE_SRCS) $(MAGICKCORE_PLATFORM_SRCS)
+MagickCore_libMagickCore_la_LIBADD = $(MAGICK_DEP_LIBS) $(MAGICK_LIBLTDL)
+else
+MagickCore_libMagickCore_la_SOURCES = $(MAGICKCORE_BASE_SRCS) $(MAGICKCORE_PLATFORM_SRCS) $(MAGICKCORE_CODER_SRCS) $(MAGICKCORE_FILTER_SRCS)
+MagickCore_libMagickCore_la_LIBADD = $(MAGICK_DEP_LIBS) $(MAGICK_LIBLTDL)
+endif # WITH_MODULES
+MagickCore_libMagickCore_la_CPPFLAGS = -I$(top_builddir)/ltdl -I$(top_srcdir)/ltdl $(LIBRARY_EXTRA_CPPFLAGS)
+MagickCore_libMagickCore_la_LDFLAGS = -no-undefined -export-symbols-regex ".*" \
+ $(OSX_GCOV_LDFLAG) -version-info \
+ $(MAGICK_LIBRARY_CURRENT):$(MAGICK_LIBRARY_REVISION):$(MAGICK_LIBRARY_AGE)
+MagickCore_libMagickCore_la_DEPENDENCIES = $(MAGICKCORE_LTDLDEPS)
+
+# Library base sources
+MAGICKCORE_BASE_SRCS = \
+ MagickCore/MagickCore.h \
+ MagickCore/accelerate.c \
+ MagickCore/accelerate.h \
+ MagickCore/animate.c \
+ MagickCore/animate.h \
+ MagickCore/animate-private.h \
+ MagickCore/annotate.c \
+ MagickCore/annotate.h \
+ MagickCore/artifact.c \
+ MagickCore/artifact.h \
+ MagickCore/attribute.c \
+ MagickCore/attribute.h \
+ MagickCore/blob.c \
+ MagickCore/blob.h \
+ MagickCore/blob-private.h \
+ MagickCore/cache.c \
+ MagickCore/cache.h \
+ MagickCore/cache-private.h \
+ MagickCore/cache-view.c \
+ MagickCore/cache-view.h \
+ MagickCore/cipher.c \
+ MagickCore/cipher.h \
+ MagickCore/client.c \
+ MagickCore/client.h \
+ MagickCore/coder.c \
+ MagickCore/coder.h \
+ MagickCore/color.c \
+ MagickCore/color.h \
+ MagickCore/color-private.h \
+ MagickCore/colormap.c \
+ MagickCore/colormap.h \
+ MagickCore/colormap-private.h \
+ MagickCore/colorspace.c \
+ MagickCore/colorspace.h \
+ MagickCore/colorspace-private.h \
+ MagickCore/compare.c \
+ MagickCore/compare.h \
+ MagickCore/composite.c \
+ MagickCore/composite.h \
+ MagickCore/composite-private.h \
+ MagickCore/compress.c \
+ MagickCore/compress.h \
+ MagickCore/configure.c \
+ MagickCore/configure.h \
+ MagickCore/constitute.c \
+ MagickCore/constitute.h \
+ MagickCore/decorate.c \
+ MagickCore/decorate.h \
+ MagickCore/delegate.c \
+ MagickCore/delegate.h \
+ MagickCore/delegate-private.h \
+ MagickCore/deprecate.c \
+ MagickCore/deprecate.h \
+ MagickCore/display.c \
+ MagickCore/display.h \
+ MagickCore/display-private.h \
+ MagickCore/distort.c \
+ MagickCore/distort.h \
+ MagickCore/draw.c \
+ MagickCore/draw.h \
+ MagickCore/draw-private.h \
+ MagickCore/effect.c \
+ MagickCore/effect.h \
+ MagickCore/enhance.c \
+ MagickCore/enhance.h \
+ MagickCore/exception.c \
+ MagickCore/exception.h \
+ MagickCore/exception-private.h \
+ MagickCore/feature.c \
+ MagickCore/feature.h \
+ MagickCore/fourier.c \
+ MagickCore/fourier.h \
+ MagickCore/fx.c \
+ MagickCore/fx.h \
+ MagickCore/fx-private.h \
+ MagickCore/gem.c \
+ MagickCore/gem.h \
+ MagickCore/geometry.c \
+ MagickCore/geometry.h \
+ MagickCore/hashmap.c \
+ MagickCore/hashmap.h \
+ MagickCore/histogram.c \
+ MagickCore/histogram.h \
+ MagickCore/identify.c \
+ MagickCore/identify.h \
+ MagickCore/image.c \
+ MagickCore/image.h \
+ MagickCore/image-private.h \
+ MagickCore/image-view.c \
+ MagickCore/image-view.h \
+ MagickCore/layer.c \
+ MagickCore/layer.h \
+ MagickCore/list.c \
+ MagickCore/list.h \
+ MagickCore/locale.c \
+ MagickCore/locale_.h \
+ MagickCore/log.c \
+ MagickCore/log.h \
+ MagickCore/mac.h \
+ MagickCore/magic.c \
+ MagickCore/magic.h \
+ MagickCore/magick.c \
+ MagickCore/magick-config.h \
+ MagickCore/magick-type.h \
+ MagickCore/magick.h \
+ MagickCore/matrix.c \
+ MagickCore/matrix.h \
+ MagickCore/memory.c \
+ MagickCore/memory_.h \
+ MagickCore/methods.h \
+ MagickCore/mime.c \
+ MagickCore/mime.h \
+ MagickCore/module.c \
+ MagickCore/module.h \
+ MagickCore/monitor.c \
+ MagickCore/monitor.h \
+ MagickCore/monitor-private.h \
+ MagickCore/montage.c \
+ MagickCore/montage.h \
+ MagickCore/morphology.c \
+ MagickCore/morphology.h \
+ MagickCore/morphology-private.h \
+ MagickCore/nt-base.h \
+ MagickCore/nt-feature.h \
+ MagickCore/option.c \
+ MagickCore/option.h \
+ MagickCore/paint.c \
+ MagickCore/paint.h \
+ MagickCore/pixel.c \
+ MagickCore/pixel.h \
+ MagickCore/pixel-accessor.h \
+ MagickCore/policy.c \
+ MagickCore/policy.h \
+ MagickCore/PreRvIcccm.c \
+ MagickCore/PreRvIcccm.h \
+ MagickCore/prepress.c \
+ MagickCore/prepress.h \
+ MagickCore/property.c \
+ MagickCore/property.h \
+ MagickCore/profile.c \
+ MagickCore/profile.h \
+ MagickCore/quantize.c \
+ MagickCore/quantize.h \
+ MagickCore/quantum.c \
+ MagickCore/quantum.h \
+ MagickCore/quantum-export.c \
+ MagickCore/quantum-import.c \
+ MagickCore/quantum-private.h \
+ MagickCore/random.c \
+ MagickCore/random_.h \
+ MagickCore/random-private.h \
+ MagickCore/registry.c \
+ MagickCore/registry.h \
+ MagickCore/resample.c \
+ MagickCore/resample.h \
+ MagickCore/resample-private.h \
+ MagickCore/resize.c \
+ MagickCore/resize.h \
+ MagickCore/resize-private.h \
+ MagickCore/resource.c \
+ MagickCore/resource_.h \
+ MagickCore/segment.c \
+ MagickCore/segment.h \
+ MagickCore/semaphore.c \
+ MagickCore/semaphore.h \
+ MagickCore/semaphore-private.h \
+ MagickCore/shear.c \
+ MagickCore/shear.h \
+ MagickCore/signature.c \
+ MagickCore/signature.h \
+ MagickCore/signature-private.h \
+ MagickCore/splay-tree.c \
+ MagickCore/splay-tree.h \
+ MagickCore/static.c \
+ MagickCore/static.h \
+ MagickCore/statistic.c \
+ MagickCore/statistic.h \
+ MagickCore/stream.c \
+ MagickCore/stream.h \
+ MagickCore/stream-private.h \
+ MagickCore/string.c \
+ MagickCore/string_.h \
+ MagickCore/string-private.h \
+ MagickCore/studio.h \
+ MagickCore/thread.c \
+ MagickCore/thread_.h \
+ MagickCore/thread-private.h \
+ MagickCore/timer.c \
+ MagickCore/timer.h \
+ MagickCore/token.c \
+ MagickCore/token.h \
+ MagickCore/token-private.h \
+ MagickCore/transform.c \
+ MagickCore/transform.h \
+ MagickCore/threshold.c \
+ MagickCore/threshold.h \
+ MagickCore/type.c \
+ MagickCore/type.h \
+ MagickCore/utility.c \
+ MagickCore/utility.h \
+ MagickCore/version.c \
+ MagickCore/version.h \
+ MagickCore/vms.h \
+ MagickCore/widget.c \
+ MagickCore/widget.h \
+ MagickCore/xml-tree.c \
+ MagickCore/xml-tree.h \
+ MagickCore/xwindow.c \
+ MagickCore/xwindow.h
+
+if WIN32_NATIVE_BUILD
+MAGICKCORE_PLATFORM_SRCS = \
+ MagickCore/nt-base.c \
+ MagickCore/nt-base.h \
+ MagickCore/nt-feature.c \
+ MagickCore/nt-feature.h
+else
+if CYGWIN_BUILD
+MAGICKCORE_PLATFORM_SRCS = \
+ MagickCore/nt-feature.c \
+ MagickCore/nt-feature.h
+else
+MAGICKCORE_PLATFORM_SRCS =
+endif # if CYGWIN_BUILD
+endif # if WIN32_NATIVE_BUILD
+
+MAGICKCORE_INCLUDE_HDRS = \
+ MagickCore/MagickCore.h \
+ MagickCore/PreRvIcccm.h \
+ MagickCore/accelerate.h \
+ MagickCore/animate.h \
+ MagickCore/annotate.h \
+ MagickCore/artifact.h \
+ MagickCore/attribute.h \
+ MagickCore/blob.h \
+ MagickCore/cache.h \
+ MagickCore/cache-view.h \
+ MagickCore/cipher.h \
+ MagickCore/client.h \
+ MagickCore/coder.h \
+ MagickCore/color.h \
+ MagickCore/colormap.h \
+ MagickCore/colorspace.h \
+ MagickCore/compare.h \
+ MagickCore/composite.h \
+ MagickCore/compress.h \
+ MagickCore/configure.h \
+ MagickCore/constitute.h \
+ MagickCore/decorate.h \
+ MagickCore/delegate.h \
+ MagickCore/deprecate.h \
+ MagickCore/display.h \
+ MagickCore/distort.h \
+ MagickCore/draw.h \
+ MagickCore/effect.h \
+ MagickCore/enhance.h \
+ MagickCore/exception.h \
+ MagickCore/feature.h \
+ MagickCore/fourier.h \
+ MagickCore/fx.h \
+ MagickCore/gem.h \
+ MagickCore/geometry.h \
+ MagickCore/hashmap.h \
+ MagickCore/histogram.h \
+ MagickCore/identify.h \
+ MagickCore/image.h \
+ MagickCore/image-view.h \
+ MagickCore/layer.h \
+ MagickCore/list.h \
+ MagickCore/locale_.h \
+ MagickCore/log.h \
+ MagickCore/magic.h \
+ MagickCore/magick.h \
+ MagickCore/magick-config.h \
+ MagickCore/magick-type.h \
+ MagickCore/matrix.h \
+ MagickCore/memory_.h \
+ MagickCore/methods.h \
+ MagickCore/mime.h \
+ MagickCore/module.h \
+ MagickCore/monitor.h \
+ MagickCore/montage.h \
+ MagickCore/morphology.h \
+ MagickCore/option.h \
+ MagickCore/paint.h \
+ MagickCore/pixel.h \
+ MagickCore/pixel-accessor.h \
+ MagickCore/policy.h \
+ MagickCore/prepress.h \
+ MagickCore/profile.h \
+ MagickCore/property.h \
+ MagickCore/quantize.h \
+ MagickCore/quantum.h \
+ MagickCore/random_.h \
+ MagickCore/registry.h \
+ MagickCore/resample.h \
+ MagickCore/resize.h \
+ MagickCore/resource_.h \
+ MagickCore/segment.h \
+ MagickCore/semaphore.h \
+ MagickCore/shear.h \
+ MagickCore/signature.h \
+ MagickCore/splay-tree.h \
+ MagickCore/statistic.h \
+ MagickCore/stream.h \
+ MagickCore/string_.h \
+ MagickCore/timer.h \
+ MagickCore/token.h \
+ MagickCore/transform.h \
+ MagickCore/threshold.h \
+ MagickCore/type.h \
+ MagickCore/utility.h \
+ MagickCore/version.h \
+ MagickCore/widget.h \
+ MagickCore/xml-tree.h \
+ MagickCore/xwindow.h
+
+MAGICKCORE_NOINST_HDRS = \
+ MagickCore/animate-private.h \
+ MagickCore/blob-private.h \
+ MagickCore/cache-private.h \
+ MagickCore/color-private.h \
+ MagickCore/colormap-private.h \
+ MagickCore/colorspace-private.h \
+ MagickCore/composite-private.h \
+ MagickCore/delegate-private.h \
+ MagickCore/display-private.h \
+ MagickCore/draw-private.h \
+ MagickCore/exception-private.h \
+ MagickCore/fx-private.h \
+ MagickCore/image-private.h \
+ MagickCore/mac.h \
+ MagickCore/mime-private.h \
+ MagickCore/monitor-private.h \
+ MagickCore/morphology-private.h \
+ MagickCore/nt-base.h \
+ MagickCore/nt-feature.h \
+ MagickCore/quantum-private.h \
+ MagickCore/random-private.h \
+ MagickCore/resample-private.h \
+ MagickCore/resize-private.h \
+ MagickCore/semaphore-private.h \
+ MagickCore/signature-private.h \
+ MagickCore/static.h \
+ MagickCore/stream-private.h \
+ MagickCore/string-private.h \
+ MagickCore/studio.h \
+ MagickCore/thread_.h \
+ MagickCore/thread-private.h \
+ MagickCore/token-private.h \
+ MagickCore/xwindow-private.h \
+ MagickCore/vms.h
+
+MAGICKCORE_EXTRA_DIST = \
+ MagickCore/MagickCore-config.in \
+ $(MAGICKCORE_MANS) \
+ MagickCore/ImageMagick.pc.in \
+ MagickCore/MagickCore.pc.in \
+ MagickCore/Make.com \
+ MagickCore/config.h_vms \
+ MagickCore/mac.c \
+ MagickCore/nt-base.c \
+ MagickCore/nt-feature.c \
+ MagickCore/vms.c \
+ MagickCore/xwdfile.h_vms
+
+# Install magick-config.h
+MAGICKCORE_INSTALL_DATA_LOCAL_TARGETS = MagickCore-install-data-local
+MagickCore-install-data-local:
+ $(mkinstalldirs) $(DESTDIR)$(MagickCoreincdir)
+ $(INSTALL_HEADER) MagickCore/magick-config.h $(DESTDIR)$(MagickCoreincdir)/magick-config.h
+
+# Uninstall magick-config.h
+MAGICKCORE_UNINSTALL_LOCAL_TARGETS = MagickCore-uninstall-local
+MagickCore-uninstall-local:
+ rm -f $(DESTDIR)$(MagickCoreincdir)/magick-config.h
+
diff --git a/magick/PreRvIcccm.c b/MagickCore/PreRvIcccm.c
similarity index 98%
rename from magick/PreRvIcccm.c
rename to MagickCore/PreRvIcccm.c
index 3b42217..6ca0ad6 100644
--- a/magick/PreRvIcccm.c
+++ b/MagickCore/PreRvIcccm.c
@@ -36,9 +36,9 @@
%
*/
-#include "magick/studio.h"
+#include "MagickCore/studio.h"
#if defined(MAGICKCORE_X11_DELEGATE)
-#include "magick/xwindow-private.h"
+#include "MagickCore/xwindow-private.h"
#if defined(PRE_R6_ICCCM)
/*
diff --git a/magick/PreRvIcccm.h b/MagickCore/PreRvIcccm.h
similarity index 100%
rename from magick/PreRvIcccm.h
rename to MagickCore/PreRvIcccm.h
diff --git a/magick/accelerate.c b/MagickCore/accelerate.c
similarity index 95%
rename from magick/accelerate.c
rename to MagickCore/accelerate.c
index e530e55..ceb0521 100644
--- a/magick/accelerate.c
+++ b/MagickCore/accelerate.c
@@ -49,33 +49,33 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/accelerate.h"
-#include "magick/artifact.h"
-#include "magick/cache-view.h"
-#include "magick/color-private.h"
-#include "magick/enhance.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/gem.h"
-#include "magick/hashmap.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/memory_.h"
-#include "magick/monitor-private.h"
-#include "magick/accelerate.h"
-#include "magick/option.h"
-#include "magick/pixel-private.h"
-#include "magick/prepress.h"
-#include "magick/quantize.h"
-#include "magick/registry.h"
-#include "magick/semaphore.h"
-#include "magick/splay-tree.h"
-#include "magick/statistic.h"
-#include "magick/string_.h"
-#include "magick/string-private.h"
-#include "magick/token.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/accelerate.h"
+#include "MagickCore/artifact.h"
+#include "MagickCore/cache-view.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/enhance.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/gem.h"
+#include "MagickCore/hashmap.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/accelerate.h"
+#include "MagickCore/option.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/prepress.h"
+#include "MagickCore/quantize.h"
+#include "MagickCore/registry.h"
+#include "MagickCore/semaphore.h"
+#include "MagickCore/splay-tree.h"
+#include "MagickCore/statistic.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/string-private.h"
+#include "MagickCore/token.h"
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -247,7 +247,7 @@
" {\n"
" const unsigned long index=ClampToCanvas(y+v,rows)*columns+\n"
" ClampToCanvas(x+u,columns);\n"
- " const double alpha=scale*(QuantumRange-input[index].w);\n"
+ " const double alpha=scale*input[index].w;\n"
" sum.x+=alpha*filter[i]*input[index].x;\n"
" sum.y+=alpha*filter[i]*input[index].y;\n"
" sum.z+=alpha*filter[i]*input[index].z;\n"
@@ -281,7 +281,7 @@
" for (long u=(-mid_width); u <= mid_width; u++)\n"
" {\n"
" const unsigned long index=(y+v)*columns+(x+u);\n"
- " const double alpha=scale*(QuantumRange-input[index].w);\n"
+ " const double alpha=scale*input[index].w;\n"
" sum.x+=alpha*filter[i]*input[index].x;\n"
" sum.y+=alpha*filter[i]*input[index].y;\n"
" sum.z+=alpha*filter[i]*input[index].z;\n"
diff --git a/magick/accelerate.h b/MagickCore/accelerate.h
similarity index 96%
rename from magick/accelerate.h
rename to MagickCore/accelerate.h
index c575667..89151d4 100644
--- a/magick/accelerate.h
+++ b/MagickCore/accelerate.h
@@ -22,7 +22,7 @@
extern "C" {
#endif
-#include <magick/morphology.h>
+#include <MagickCore/morphology.h>
extern MagickExport MagickBooleanType
AccelerateConvolveImage(const Image *,const KernelInfo *,Image *,
diff --git a/magick/animate-private.h b/MagickCore/animate-private.h
similarity index 96%
rename from magick/animate-private.h
rename to MagickCore/animate-private.h
index daadec9..ac69c54 100644
--- a/magick/animate-private.h
+++ b/MagickCore/animate-private.h
@@ -23,7 +23,7 @@
#endif
#if defined(MAGICKCORE_X11_DELEGATE)
-#include "magick/xwindow-private.h"
+#include "MagickCore/xwindow-private.h"
extern MagickExport Image
*XAnimateImages(Display *,XResourceInfo *,char **,const int,Image *);
diff --git a/magick/animate.c b/MagickCore/animate.c
similarity index 98%
rename from magick/animate.c
rename to MagickCore/animate.c
index 7459c58..7d42366 100644
--- a/magick/animate.c
+++ b/MagickCore/animate.c
@@ -39,36 +39,37 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/animate.h"
-#include "magick/animate-private.h"
-#include "magick/client.h"
-#include "magick/color.h"
-#include "magick/color-private.h"
-#include "magick/colorspace.h"
-#include "magick/constitute.h"
-#include "magick/delegate.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/geometry.h"
-#include "magick/image-private.h"
-#include "magick/layer.h"
-#include "magick/list.h"
-#include "magick/log.h"
-#include "magick/image.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/option.h"
-#include "magick/property.h"
-#include "magick/resource_.h"
-#include "magick/string_.h"
-#include "magick/string-private.h"
-#include "magick/transform.h"
-#include "magick/utility.h"
-#include "magick/version.h"
-#include "magick/widget.h"
-#include "magick/xwindow-private.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/animate.h"
+#include "MagickCore/animate-private.h"
+#include "MagickCore/client.h"
+#include "MagickCore/color.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/delegate.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/layer.h"
+#include "MagickCore/list.h"
+#include "MagickCore/log.h"
+#include "MagickCore/image.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/option.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/property.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/string-private.h"
+#include "MagickCore/transform.h"
+#include "MagickCore/utility.h"
+#include "MagickCore/version.h"
+#include "MagickCore/widget.h"
+#include "MagickCore/xwindow-private.h"
#if defined(MAGICKCORE_X11_DELEGATE)
/*
@@ -875,7 +876,7 @@
(next->colors > (size_t) visual_info->colormap_size))
break;
for (i=0; i < (ssize_t) images->colors; i++)
- if (IsColorEqual(next->colormap+i,images->colormap+i) == MagickFalse)
+ if (IsPixelPacketEquivalent(next->colormap+i,images->colormap+i) == MagickFalse)
break;
if (i < (ssize_t) images->colors)
break;
@@ -1072,7 +1073,7 @@
(visual_info->klass == TrueColor) ||
(visual_info->klass == DirectColor))
if (image_list[scene]->storage_class == PseudoClass)
- XGetPixelPacket(display,visual_info,map_info,&resources,
+ XGetPixelInfo(display,visual_info,map_info,&resources,
image_list[scene],window_info.pixel_info);
columns=(unsigned int) image_list[scene]->columns;
rows=(unsigned int) image_list[scene]->rows;
@@ -1493,7 +1494,7 @@
(next->colors > (size_t) visual_info->colormap_size))
break;
for (i=0; i < (ssize_t) images->colors; i++)
- if (IsColorEqual(next->colormap+i,images->colormap+i) == MagickFalse)
+ if (IsPixelPacketEquivalent(next->colormap+i,images->colormap+i) == MagickFalse)
break;
if (i < (ssize_t) images->colors)
break;
@@ -1919,7 +1920,7 @@
(visual_info->klass == TrueColor) ||
(visual_info->klass == DirectColor))
if (image_list[scene]->storage_class == PseudoClass)
- XGetPixelPacket(display,visual_info,map_info,resource_info,
+ XGetPixelInfo(display,visual_info,map_info,resource_info,
image_list[scene],windows->image.pixel_info);
columns=(unsigned int) image_list[scene]->columns;
rows=(unsigned int) image_list[scene]->rows;
@@ -2106,7 +2107,7 @@
/*
Copy X pixmap to Image window.
*/
- XGetPixelPacket(display,visual_info,map_info,resource_info,
+ XGetPixelInfo(display,visual_info,map_info,resource_info,
image_list[scene],windows->image.pixel_info);
windows->image.ximage->width=(int) image->columns;
windows->image.ximage->height=(int) image->rows;
diff --git a/magick/animate.h b/MagickCore/animate.h
similarity index 100%
rename from magick/animate.h
rename to MagickCore/animate.h
diff --git a/magick/annotate.c b/MagickCore/annotate.c
similarity index 95%
rename from magick/annotate.c
rename to MagickCore/annotate.c
index 57560d2..ccdf213 100644
--- a/magick/annotate.c
+++ b/MagickCore/annotate.c
@@ -42,36 +42,37 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/annotate.h"
-#include "magick/attribute.h"
-#include "magick/cache-view.h"
-#include "magick/client.h"
-#include "magick/color.h"
-#include "magick/color-private.h"
-#include "magick/composite.h"
-#include "magick/composite-private.h"
-#include "magick/constitute.h"
-#include "magick/draw.h"
-#include "magick/draw-private.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/gem.h"
-#include "magick/geometry.h"
-#include "magick/image-private.h"
-#include "magick/log.h"
-#include "magick/quantum.h"
-#include "magick/quantum-private.h"
-#include "magick/property.h"
-#include "magick/resource_.h"
-#include "magick/semaphore.h"
-#include "magick/statistic.h"
-#include "magick/string_.h"
-#include "magick/token-private.h"
-#include "magick/transform.h"
-#include "magick/type.h"
-#include "magick/utility.h"
-#include "magick/xwindow-private.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/annotate.h"
+#include "MagickCore/attribute.h"
+#include "MagickCore/cache-view.h"
+#include "MagickCore/client.h"
+#include "MagickCore/color.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/composite.h"
+#include "MagickCore/composite-private.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/draw.h"
+#include "MagickCore/draw-private.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/gem.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/log.h"
+#include "MagickCore/quantum.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/property.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/semaphore.h"
+#include "MagickCore/statistic.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/token-private.h"
+#include "MagickCore/transform.h"
+#include "MagickCore/type.h"
+#include "MagickCore/utility.h"
+#include "MagickCore/xwindow-private.h"
#if defined(MAGICKCORE_FREETYPE_DELEGATE)
#if defined(__MINGW32__)
# undef interface
@@ -437,7 +438,7 @@
default:
break;
}
- if (draw_info->undercolor.opacity != TransparentOpacity)
+ if (draw_info->undercolor.alpha != TransparentAlpha)
{
DrawInfo
*undercolor_info;
@@ -797,8 +798,8 @@
"underline position: %g; underline thickness: %g",annotate_info->text,
metrics->width,metrics->height,metrics->ascent,metrics->descent,
metrics->max_advance,metrics->bounds.x1,metrics->bounds.y1,
- metrics->bounds.x2,metrics->bounds.y2,metrics->origin.x,
- metrics->origin.y,metrics->pixels_per_em.x,metrics->pixels_per_em.y,
+ metrics->bounds.x2,metrics->bounds.y2,metrics->origin.x,metrics->origin.y,
+ metrics->pixels_per_em.x,metrics->pixels_per_em.y,
metrics->underline_position,metrics->underline_thickness);
annotate_info=DestroyDrawInfo(annotate_info);
return(status);
@@ -887,9 +888,6 @@
type_info=GetTypeInfoByFamily("Century Schoolbook",draw_info->style,
draw_info->stretch,draw_info->weight,&image->exception);
if (type_info == (const TypeInfo *) NULL)
- type_info=GetTypeInfoByFamily("Sans",draw_info->style,
- draw_info->stretch,draw_info->weight,&image->exception);
- if (type_info == (const TypeInfo *) NULL)
type_info=GetTypeInfoByFamily((const char *) NULL,draw_info->style,
draw_info->stretch,draw_info->weight,&image->exception);
if (type_info == (const TypeInfo *) NULL)
@@ -1310,7 +1308,7 @@
if ((p == draw_info->text) || (bounds.yMax > metrics->bounds.y2))
metrics->bounds.y2=bounds.yMax;
if (draw_info->render != MagickFalse)
- if ((draw_info->stroke.opacity != TransparentOpacity) ||
+ if ((draw_info->stroke.alpha != TransparentAlpha) ||
(draw_info->stroke_pattern != (Image *) NULL))
{
/*
@@ -1359,7 +1357,7 @@
PixelPacket
fill_color;
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -1378,14 +1376,14 @@
y_offset=(ssize_t) ceil(point.y+y-0.5);
if ((y_offset < 0) || (y_offset >= (ssize_t) image->rows))
continue;
- q=(PixelPacket *) NULL;
+ q=(Quantum *) NULL;
if ((x_offset < 0) || (x_offset >= (ssize_t) image->columns))
active=MagickFalse;
else
{
q=GetCacheViewAuthenticPixels(image_view,x_offset,y_offset,
bitmap->bitmap.width,1,exception);
- active=q != (PixelPacket *) NULL ? MagickTrue : MagickFalse;
+ active=q != (Quantum *) NULL ? MagickTrue : MagickFalse;
}
p=bitmap->bitmap.buffer+y*bitmap->bitmap.width;
for (x=0; x < (ssize_t) bitmap->bitmap.width; x++)
@@ -1395,7 +1393,7 @@
(x_offset >= (ssize_t) image->columns))
{
p++;
- q++;
+ q+=GetPixelChannels(image);
continue;
}
fill_opacity=(MagickRealType) (*p)/(bitmap->bitmap.num_grays-1);
@@ -1404,16 +1402,16 @@
if (active == MagickFalse)
q=GetCacheViewAuthenticPixels(image_view,x_offset,y_offset,1,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
p++;
- q++;
+ q+=GetPixelChannels(image);
continue;
}
(void) GetFillColor(draw_info,x_offset,y_offset,&fill_color);
- fill_opacity=QuantumRange-fill_opacity*(QuantumRange-
- fill_color.opacity);
- MagickCompositeOver(&fill_color,fill_opacity,q,q->opacity,q);
+ fill_opacity=fill_opacity*fill_color.alpha;
+ CompositePixelOver(image,&fill_color,fill_opacity,q,
+ GetPixelAlpha(image,q),q);
if (active == MagickFalse)
{
sync=SyncCacheViewAuthenticPixels(image_view,exception);
@@ -1421,7 +1419,7 @@
status=MagickFalse;
}
p++;
- q++;
+ q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
if (sync == MagickFalse)
@@ -1448,7 +1446,7 @@
utf8=(unsigned char *) RelinquishMagickMemory(utf8);
if (last_glyph.id != 0)
FT_Done_Glyph(last_glyph.image);
- if ((draw_info->stroke.opacity != TransparentOpacity) ||
+ if ((draw_info->stroke.alpha != TransparentAlpha) ||
(draw_info->stroke_pattern != (Image *) NULL))
{
if (draw_info->render != MagickFalse)
@@ -1755,7 +1753,7 @@
annotate_image=DestroyImage(annotate_image);
return(MagickTrue);
}
- if (draw_info->fill.opacity != TransparentOpacity)
+ if (draw_info->fill.alpha != TransparentAlpha)
{
ExceptionInfo
*exception;
@@ -1784,23 +1782,23 @@
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
q=GetCacheViewAuthenticPixels(annotate_view,0,y,annotate_image->columns,
1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) annotate_image->columns; x++)
{
(void) GetFillColor(draw_info,x,y,&fill_color);
- SetPixelAlpha(q,ClampToQuantum((((QuantumRange-
- (MagickRealType) PixelIntensityToQuantum(q))*(QuantumRange-
- fill_color.opacity))/QuantumRange)));
- SetPixelRed(q,fill_color.red);
- SetPixelGreen(q,fill_color.green);
- SetPixelBlue(q,fill_color.blue);
- q++;
+ SetPixelAlpha(annotate_image,ClampToQuantum((((MagickRealType)
+ GetPixelIntensity(annotate_image,q)*fill_color.alpha)/
+ QuantumRange)),q);
+ SetPixelRed(annotate_image,fill_color.red,q);
+ SetPixelGreen(annotate_image,fill_color.green,q);
+ SetPixelBlue(annotate_image,fill_color.blue,q);
+ q+=GetPixelChannels(annotate_image);
}
sync=SyncCacheViewAuthenticPixels(annotate_view,exception);
if (sync == MagickFalse)
@@ -1941,8 +1939,8 @@
*/
XGetMapInfo(visual_info,XDefaultColormap(display,visual_info->screen),
map_info);
- XGetPixelPacket(display,visual_info,map_info,&resource_info,
- (Image *) NULL,&pixel);
+ XGetPixelInfo(display,visual_info,map_info,&resource_info,(Image *) NULL,
+ &pixel);
pixel.annotate_context=XDefaultGC(display,visual_info->screen);
/*
Initialize font info.
@@ -2012,7 +2010,7 @@
metrics->underline_thickness=1.0;
if (draw_info->render == MagickFalse)
return(MagickTrue);
- if (draw_info->fill.opacity == TransparentOpacity)
+ if (draw_info->fill.alpha == TransparentAlpha)
return(MagickTrue);
/*
Render fill color.
diff --git a/magick/annotate.h b/MagickCore/annotate.h
similarity index 97%
rename from magick/annotate.h
rename to MagickCore/annotate.h
index 1ba4faa..14df56a 100644
--- a/magick/annotate.h
+++ b/MagickCore/annotate.h
@@ -22,7 +22,7 @@
extern "C" {
#endif
-#include "magick/draw.h"
+#include "MagickCore/draw.h"
extern MagickExport MagickBooleanType
AnnotateComponentGenesis(void),
diff --git a/magick/api.h b/MagickCore/api.h
similarity index 100%
rename from magick/api.h
rename to MagickCore/api.h
diff --git a/magick/artifact.c b/MagickCore/artifact.c
similarity index 94%
rename from magick/artifact.c
rename to MagickCore/artifact.c
index 7a6e196..9693c7f 100644
--- a/magick/artifact.c
+++ b/MagickCore/artifact.c
@@ -40,37 +40,37 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/artifact.h"
-#include "magick/cache.h"
-#include "magick/color.h"
-#include "magick/compare.h"
-#include "magick/constitute.h"
-#include "magick/draw.h"
-#include "magick/effect.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/fx.h"
-#include "magick/fx-private.h"
-#include "magick/gem.h"
-#include "magick/geometry.h"
-#include "magick/image.h"
-#include "magick/layer.h"
-#include "magick/list.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/montage.h"
-#include "magick/option.h"
-#include "magick/profile.h"
-#include "magick/quantum.h"
-#include "magick/resource_.h"
-#include "magick/splay-tree.h"
-#include "magick/signature-private.h"
-#include "magick/statistic.h"
-#include "magick/string_.h"
-#include "magick/token.h"
-#include "magick/utility.h"
-#include "magick/xml-tree.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/artifact.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/color.h"
+#include "MagickCore/compare.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/draw.h"
+#include "MagickCore/effect.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/fx.h"
+#include "MagickCore/fx-private.h"
+#include "MagickCore/gem.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/image.h"
+#include "MagickCore/layer.h"
+#include "MagickCore/list.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/montage.h"
+#include "MagickCore/option.h"
+#include "MagickCore/profile.h"
+#include "MagickCore/quantum.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/splay-tree.h"
+#include "MagickCore/signature-private.h"
+#include "MagickCore/statistic.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/token.h"
+#include "MagickCore/utility.h"
+#include "MagickCore/xml-tree.h"
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/magick/artifact.h b/MagickCore/artifact.h
similarity index 100%
rename from magick/artifact.h
rename to MagickCore/artifact.h
diff --git a/magick/attribute.c b/MagickCore/attribute.c
similarity index 79%
rename from magick/attribute.c
rename to MagickCore/attribute.c
index f58c794..12f35e3 100644
--- a/magick/attribute.c
+++ b/MagickCore/attribute.c
@@ -40,54 +40,54 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/attribute.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/cache-view.h"
-#include "magick/client.h"
-#include "magick/color.h"
-#include "magick/color-private.h"
-#include "magick/colormap.h"
-#include "magick/colormap-private.h"
-#include "magick/colorspace.h"
-#include "magick/composite.h"
-#include "magick/composite-private.h"
-#include "magick/constitute.h"
-#include "magick/deprecate.h"
-#include "magick/draw.h"
-#include "magick/draw-private.h"
-#include "magick/effect.h"
-#include "magick/enhance.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/geometry.h"
-#include "magick/histogram.h"
-#include "magick/identify.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/log.h"
-#include "magick/memory_.h"
-#include "magick/magick.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/paint.h"
-#include "magick/pixel.h"
-#include "magick/pixel-private.h"
-#include "magick/property.h"
-#include "magick/quantize.h"
-#include "magick/random_.h"
-#include "magick/resource_.h"
-#include "magick/semaphore.h"
-#include "magick/segment.h"
-#include "magick/splay-tree.h"
-#include "magick/string_.h"
-#include "magick/thread-private.h"
-#include "magick/threshold.h"
-#include "magick/transform.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/attribute.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/cache-view.h"
+#include "MagickCore/client.h"
+#include "MagickCore/color.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colormap.h"
+#include "MagickCore/colormap-private.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/composite.h"
+#include "MagickCore/composite-private.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/draw.h"
+#include "MagickCore/draw-private.h"
+#include "MagickCore/effect.h"
+#include "MagickCore/enhance.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/histogram.h"
+#include "MagickCore/identify.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/log.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/paint.h"
+#include "MagickCore/pixel.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/property.h"
+#include "MagickCore/quantize.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/random_.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/semaphore.h"
+#include "MagickCore/segment.h"
+#include "MagickCore/splay-tree.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/thread-private.h"
+#include "MagickCore/threshold.h"
+#include "MagickCore/transform.h"
+#include "MagickCore/utility.h"
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -126,14 +126,14 @@
MagickBooleanType
status;
- MagickPixelPacket
+ PixelInfo
target[3],
zero;
RectangleInfo
bounds;
- register const PixelPacket
+ register const Quantum
*p;
ssize_t
@@ -147,43 +147,37 @@
bounds.height=0;
bounds.x=(ssize_t) image->columns;
bounds.y=(ssize_t) image->rows;
- GetMagickPixelPacket(image,&target[0]);
+ GetPixelInfo(image,&target[0]);
image_view=AcquireCacheView(image);
p=GetCacheViewVirtualPixels(image_view,0,0,1,1,exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
{
image_view=DestroyCacheView(image_view);
return(bounds);
}
- SetMagickPixelPacket(image,p,GetCacheViewAuthenticIndexQueue(image_view),
- &target[0]);
- GetMagickPixelPacket(image,&target[1]);
+ SetPixelInfo(image,p,&target[0]);
+ GetPixelInfo(image,&target[1]);
p=GetCacheViewVirtualPixels(image_view,(ssize_t) image->columns-1,0,1,1,
exception);
- SetMagickPixelPacket(image,p,GetCacheViewAuthenticIndexQueue(image_view),
- &target[1]);
- GetMagickPixelPacket(image,&target[2]);
+ SetPixelInfo(image,p,&target[1]);
+ GetPixelInfo(image,&target[2]);
p=GetCacheViewVirtualPixels(image_view,0,(ssize_t) image->rows-1,1,1,
exception);
- SetMagickPixelPacket(image,p,GetCacheViewAuthenticIndexQueue(image_view),
- &target[2]);
+ SetPixelInfo(image,p,&target[2]);
status=MagickTrue;
- GetMagickPixelPacket(image,&zero);
+ GetPixelInfo(image,&zero);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(dynamic,4) shared(status)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- MagickPixelPacket
+ PixelInfo
pixel;
RectangleInfo
bounding_box;
- register const IndexPacket
- *restrict indexes;
-
- register const PixelPacket
+ register const Quantum
*restrict p;
register ssize_t
@@ -196,29 +190,28 @@
#endif
bounding_box=bounds;
p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewVirtualIndexQueue(image_view);
pixel=zero;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetMagickPixelPacket(image,p,indexes+x,&pixel);
+ SetPixelInfo(image,p,&pixel);
if ((x < bounding_box.x) &&
- (IsMagickColorSimilar(&pixel,&target[0]) == MagickFalse))
+ (IsFuzzyEquivalencePixelInfo(&pixel,&target[0]) == MagickFalse))
bounding_box.x=x;
if ((x > (ssize_t) bounding_box.width) &&
- (IsMagickColorSimilar(&pixel,&target[1]) == MagickFalse))
+ (IsFuzzyEquivalencePixelInfo(&pixel,&target[1]) == MagickFalse))
bounding_box.width=(size_t) x;
if ((y < bounding_box.y) &&
- (IsMagickColorSimilar(&pixel,&target[0]) == MagickFalse))
+ (IsFuzzyEquivalencePixelInfo(&pixel,&target[0]) == MagickFalse))
bounding_box.y=y;
if ((y > (ssize_t) bounding_box.height) &&
- (IsMagickColorSimilar(&pixel,&target[2]) == MagickFalse))
+ (IsFuzzyEquivalencePixelInfo(&pixel,&target[2]) == MagickFalse))
bounding_box.height=(size_t) y;
- p++;
+ p+=GetPixelChannels(image);
}
#if defined(MAGICKCORE_OPENMP_SUPPORT)
# pragma omp critical (MagickCore_GetImageBoundingBox)
@@ -344,13 +337,13 @@
status=0;
range=GetQuantumRange(current_depth[id]);
if ((channel & RedChannel) != 0)
- status|=GetPixelRed(p) != ScaleAnyToQuantum(ScaleQuantumToAny(GetPixelRed(p),
+ status|=p->red != ScaleAnyToQuantum(ScaleQuantumToAny(p->red,
range),range);
if ((channel & GreenChannel) != 0)
- status|=GetPixelGreen(p) != ScaleAnyToQuantum(ScaleQuantumToAny(GetPixelGreen(p),
+ status|=p->green != ScaleAnyToQuantum(ScaleQuantumToAny(p->green,
range),range);
if ((channel & BlueChannel) != 0)
- status|=GetPixelBlue(p) != ScaleAnyToQuantum(ScaleQuantumToAny(GetPixelBlue(p),
+ status|=p->blue != ScaleAnyToQuantum(ScaleQuantumToAny(p->blue,
range),range);
if (status == 0)
break;
@@ -374,10 +367,7 @@
const int
id = GetOpenMPThreadId();
- register const IndexPacket
- *restrict indexes;
-
- register const PixelPacket
+ register const Quantum
*restrict p;
register ssize_t
@@ -386,9 +376,8 @@
if (status == MagickFalse)
continue;
p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
continue;
- indexes=GetCacheViewVirtualIndexQueue(image_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
while (current_depth[id] < MAGICKCORE_QUANTUM_DEPTH)
@@ -402,27 +391,26 @@
status=0;
range=GetQuantumRange(current_depth[id]);
if ((channel & RedChannel) != 0)
- status|=GetPixelRed(p) != ScaleAnyToQuantum(
- ScaleQuantumToAny(GetPixelRed(p),range),range);
+ status|=GetPixelRed(image,p) != ScaleAnyToQuantum(ScaleQuantumToAny(
+ GetPixelRed(image,p),range),range);
if ((channel & GreenChannel) != 0)
- status|=GetPixelGreen(p) != ScaleAnyToQuantum(
- ScaleQuantumToAny(GetPixelGreen(p),range),range);
+ status|=GetPixelGreen(image,p) != ScaleAnyToQuantum(ScaleQuantumToAny(
+ GetPixelGreen(image,p),range),range);
if ((channel & BlueChannel) != 0)
- status|=GetPixelBlue(p) != ScaleAnyToQuantum(
- ScaleQuantumToAny(GetPixelBlue(p),range),range);
- if (((channel & OpacityChannel) != 0) && (image->matte != MagickFalse))
- status|=GetPixelOpacity(p) != ScaleAnyToQuantum(
- ScaleQuantumToAny(GetPixelOpacity(p),range),range);
- if (((channel & IndexChannel) != 0) &&
+ status|=GetPixelBlue(image,p) != ScaleAnyToQuantum(ScaleQuantumToAny(
+ GetPixelBlue(image,p),range),range);
+ if (((channel & AlphaChannel) != 0) && (image->matte != MagickFalse))
+ status|=GetPixelAlpha(image,p) != ScaleAnyToQuantum(ScaleQuantumToAny(
+ GetPixelAlpha(image,p),range),range);
+ if (((channel & BlackChannel) != 0) &&
(image->colorspace == CMYKColorspace))
- status|=GetPixelIndex(indexes+x) !=
- ScaleAnyToQuantum(ScaleQuantumToAny(GetPixelIndex(indexes+
- x),range),range);
+ status|=GetPixelBlack(image,p) != ScaleAnyToQuantum(ScaleQuantumToAny(
+ GetPixelBlack(image,p),range),range);
if (status == 0)
break;
current_depth[id]++;
}
- p++;
+ p+=GetPixelChannels(image);
}
if (current_depth[id] == MAGICKCORE_QUANTUM_DEPTH)
status=MagickFalse;
@@ -539,9 +527,9 @@
return(ColorSeparationType);
return(ColorSeparationMatteType);
}
- if (IsMonochromeImage(image,exception) != MagickFalse)
+ if (IsImageMonochrome(image,exception) != MagickFalse)
return(BilevelType);
- if (IsGrayImage(image,exception) != MagickFalse)
+ if (IsImageGray(image,exception) != MagickFalse)
{
if (image->matte != MagickFalse)
return(GrayscaleMatteType);
@@ -563,18 +551,18 @@
% %
% %
% %
-% I s G r a y I m a g e %
+% I s I m a g e G r a y %
% %
% %
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% IsGrayImage() returns MagickTrue if all the pixels in the image have the
+% IsImageGray() returns MagickTrue if all the pixels in the image have the
% same red, green, and blue intensities.
%
-% The format of the IsGrayImage method is:
+% The format of the IsImageGray method is:
%
-% MagickBooleanType IsGrayImage(const Image *image,
+% MagickBooleanType IsImageGray(const Image *image,
% ExceptionInfo *exception)
%
% A description of each parameter follows:
@@ -584,7 +572,7 @@
% o exception: return any errors or warnings in this structure.
%
*/
-MagickExport MagickBooleanType IsGrayImage(const Image *image,
+MagickExport MagickBooleanType IsImageGray(const Image *image,
ExceptionInfo *exception)
{
CacheView
@@ -593,7 +581,7 @@
ImageType
type;
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
@@ -616,18 +604,19 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- if (IsGrayPixel(p) == MagickFalse)
+ if (IsPixelGray(image,p) == MagickFalse)
{
type=UndefinedType;
break;
}
- if ((type == BilevelType) && (IsMonochromePixel(p) == MagickFalse))
+ if ((type == BilevelType) &&
+ (IsPixelMonochrome(image,p) == MagickFalse))
type=GrayscaleType;
- p++;
+ p+=GetPixelChannels(image);
}
if (type == UndefinedType)
break;
@@ -646,19 +635,19 @@
% %
% %
% %
-% I s M o n o c h r o m e I m a g e %
+% I s I m a g e M o n o c h r o m e %
% %
% %
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% IsMonochromeImage() returns MagickTrue if all the pixels in the image have
+% IsImageMonochrome() returns MagickTrue if all the pixels in the image have
% the same red, green, and blue intensities and the intensity is either
% 0 or QuantumRange.
%
-% The format of the IsMonochromeImage method is:
+% The format of the IsImageMonochrome method is:
%
-% MagickBooleanType IsMonochromeImage(const Image *image,
+% MagickBooleanType IsImageMonochrome(const Image *image,
% ExceptionInfo *exception)
%
% A description of each parameter follows:
@@ -668,7 +657,7 @@
% o exception: return any errors or warnings in this structure.
%
*/
-MagickExport MagickBooleanType IsMonochromeImage(const Image *image,
+MagickExport MagickBooleanType IsImageMonochrome(const Image *image,
ExceptionInfo *exception)
{
CacheView
@@ -680,7 +669,7 @@
register ssize_t
x;
- register const PixelPacket
+ register const Quantum
*p;
ssize_t
@@ -699,16 +688,16 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- if (IsMonochromePixel(p) == MagickFalse)
+ if (IsPixelMonochrome(image,p) == MagickFalse)
{
type=UndefinedType;
break;
}
- p++;
+ p+=GetPixelChannels(image);
}
if (type == UndefinedType)
break;
@@ -725,18 +714,18 @@
% %
% %
% %
-% I s O p a q u e I m a g e %
+% I s I m a g e O p a q u e %
% %
% %
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% IsOpaqueImage() returns MagickTrue if none of the pixels in the image have
+% IsImageOpaque() returns MagickTrue if none of the pixels in the image have
% an opacity value other than opaque (0).
%
-% The format of the IsOpaqueImage method is:
+% The format of the IsImageOpaque method is:
%
-% MagickBooleanType IsOpaqueImage(const Image *image,
+% MagickBooleanType IsImageOpaque(const Image *image,
% ExceptionInfo *exception)
%
% A description of each parameter follows:
@@ -746,13 +735,13 @@
% o exception: return any errors or warnings in this structure.
%
*/
-MagickExport MagickBooleanType IsOpaqueImage(const Image *image,
+MagickExport MagickBooleanType IsImageOpaque(const Image *image,
ExceptionInfo *exception)
{
CacheView
*image_view;
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
@@ -774,13 +763,13 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- if (GetPixelOpacity(p) != OpaqueOpacity)
+ if (GetPixelAlpha(image,p) != OpaqueAlpha)
break;
- p++;
+ p+=GetPixelChannels(image);
}
if (x < (ssize_t) image->columns)
break;
@@ -863,44 +852,40 @@
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- register IndexPacket
- *restrict indexes;
-
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
if ((channel & RedChannel) != 0)
- SetPixelRed(q,ScaleAnyToQuantum(ScaleQuantumToAny(
- GetPixelRed(q),range),range));
+ SetPixelRed(image,ScaleAnyToQuantum(ScaleQuantumToAny(
+ GetPixelRed(image,q),range),range),q);
if ((channel & GreenChannel) != 0)
- SetPixelGreen(q,ScaleAnyToQuantum(ScaleQuantumToAny(
- GetPixelGreen(q),range),range));
+ SetPixelGreen(image,ScaleAnyToQuantum(ScaleQuantumToAny(
+ GetPixelGreen(image,q),range),range),q);
if ((channel & BlueChannel) != 0)
- SetPixelBlue(q,ScaleAnyToQuantum(ScaleQuantumToAny(
- GetPixelBlue(q),range),range));
- if (((channel & OpacityChannel) != 0) && (image->matte != MagickFalse))
- SetPixelOpacity(q,ScaleAnyToQuantum(ScaleQuantumToAny(
- GetPixelOpacity(q),range),range));
- if (((channel & IndexChannel) != 0) &&
+ SetPixelBlue(image,ScaleAnyToQuantum(ScaleQuantumToAny(
+ GetPixelBlue(image,q),range),range),q);
+ if (((channel & BlackChannel) != 0) &&
(image->colorspace == CMYKColorspace))
- SetPixelIndex(indexes+x,ScaleAnyToQuantum(ScaleQuantumToAny(
- GetPixelIndex(indexes+x),range),range));
- q++;
+ SetPixelBlack(image,ScaleAnyToQuantum(ScaleQuantumToAny(
+ GetPixelBlack(image,q),range),range),q);
+ if (((channel & AlphaChannel) != 0) && (image->matte != MagickFalse))
+ SetPixelAlpha(image,ScaleAnyToQuantum(ScaleQuantumToAny(
+ GetPixelAlpha(image,q),range),range),q);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
{
@@ -929,9 +914,8 @@
p->green=ScaleAnyToQuantum(ScaleQuantumToAny(p->green,range),range);
if ((channel & BlueChannel) != 0)
p->blue=ScaleAnyToQuantum(ScaleQuantumToAny(p->blue,range),range);
- if ((channel & OpacityChannel) != 0)
- p->opacity=ScaleAnyToQuantum(ScaleQuantumToAny(p->opacity,range),
- range);
+ if ((channel & AlphaChannel) != 0)
+ p->alpha=ScaleAnyToQuantum(ScaleQuantumToAny(p->alpha,range),range);
p++;
}
}
diff --git a/magick/attribute.h b/MagickCore/attribute.h
similarity index 86%
rename from magick/attribute.h
rename to MagickCore/attribute.h
index a547ce3..029ef11 100644
--- a/magick/attribute.h
+++ b/MagickCore/attribute.h
@@ -22,16 +22,16 @@
extern "C" {
#endif
-#include <magick/image.h>
-#include <magick/exception.h>
+#include <MagickCore/image.h>
+#include <MagickCore/exception.h>
extern MagickExport ImageType
GetImageType(const Image *,ExceptionInfo *);
extern MagickExport MagickBooleanType
- IsGrayImage(const Image *,ExceptionInfo *),
- IsMonochromeImage(const Image *,ExceptionInfo *),
- IsOpaqueImage(const Image *,ExceptionInfo *),
+ IsImageGray(const Image *,ExceptionInfo *),
+ IsImageMonochrome(const Image *,ExceptionInfo *),
+ IsImageOpaque(const Image *,ExceptionInfo *),
SetImageChannelDepth(Image *,const ChannelType,const size_t),
SetImageDepth(Image *,const size_t);
diff --git a/magick/blob-private.h b/MagickCore/blob-private.h
similarity index 97%
rename from magick/blob-private.h
rename to MagickCore/blob-private.h
index 4384b0a..fe31b5f 100644
--- a/magick/blob-private.h
+++ b/MagickCore/blob-private.h
@@ -22,8 +22,8 @@
extern "C" {
#endif
-#include "magick/image.h"
-#include "magick/stream.h"
+#include "MagickCore/image.h"
+#include "MagickCore/stream.h"
#define MagickMinBlobExtent 32767L
#if defined(MAGICKCORE_HAVE_FSEEKO)
diff --git a/magick/blob.c b/MagickCore/blob.c
similarity index 99%
rename from magick/blob.c
rename to MagickCore/blob.c
index 98cd9fe..683dc15 100644
--- a/magick/blob.c
+++ b/MagickCore/blob.c
@@ -40,28 +40,28 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/client.h"
-#include "magick/constitute.h"
-#include "magick/delegate.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/locale_.h"
-#include "magick/log.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/policy.h"
-#include "magick/resource_.h"
-#include "magick/semaphore.h"
-#include "magick/string_.h"
-#include "magick/string-private.h"
-#include "magick/token.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/client.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/delegate.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/locale_.h"
+#include "MagickCore/log.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/policy.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/semaphore.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/string-private.h"
+#include "MagickCore/token.h"
+#include "MagickCore/utility.h"
#if defined(MAGICKCORE_HAVE_MMAP_FILEIO) && !defined(MAGICKCORE_WINDOWS_SUPPORT)
# include <sys/mman.h>
#endif
diff --git a/magick/blob.h b/MagickCore/blob.h
similarity index 96%
rename from magick/blob.h
rename to MagickCore/blob.h
index 8c398f1..6590ab0 100644
--- a/magick/blob.h
+++ b/MagickCore/blob.h
@@ -22,8 +22,8 @@
extern "C" {
#endif
-#include "magick/image.h"
-#include "magick/stream.h"
+#include "MagickCore/image.h"
+#include "MagickCore/stream.h"
#define MagickMaxBufferExtent (32*8192)
diff --git a/magick/cache-private.h b/MagickCore/cache-private.h
similarity index 84%
rename from magick/cache-private.h
rename to MagickCore/cache-private.h
index 8645ba6..5906035 100644
--- a/magick/cache-private.h
+++ b/MagickCore/cache-private.h
@@ -23,9 +23,9 @@
#endif
#include <time.h>
-#include "magick/random_.h"
-#include "magick/thread-private.h"
-#include "magick/semaphore.h"
+#include "MagickCore/random_.h"
+#include "MagickCore/thread-private.h"
+#include "MagickCore/semaphore.h"
typedef enum
{
@@ -39,12 +39,6 @@
typedef void
*Cache;
-typedef const IndexPacket
- *(*GetVirtualIndexesFromHandler)(const Image *);
-
-typedef IndexPacket
- *(*GetAuthenticIndexesFromHandler)(const Image *);
-
typedef MagickBooleanType
(*GetOneAuthenticPixelFromHandler)(Image *,const ssize_t,const ssize_t,
PixelPacket *,ExceptionInfo *),
@@ -52,25 +46,31 @@
const ssize_t,const ssize_t,PixelPacket *,ExceptionInfo *),
(*SyncAuthenticPixelsHandler)(Image *,ExceptionInfo *);
-typedef const PixelPacket
+typedef const Quantum
*(*GetVirtualPixelHandler)(const Image *,const VirtualPixelMethod,
const ssize_t,const ssize_t,const size_t,const size_t,ExceptionInfo *),
*(*GetVirtualPixelsHandler)(const Image *);
-typedef PixelPacket
+typedef const void
+ *(*GetVirtualMetacontentFromHandler)(const Image *);
+
+typedef Quantum
*(*GetAuthenticPixelsHandler)(Image *,const ssize_t,const ssize_t,
const size_t,const size_t,ExceptionInfo *);
-typedef PixelPacket
+typedef Quantum
*(*GetAuthenticPixelsFromHandler)(const Image *);
-typedef PixelPacket
+typedef Quantum
*(*QueueAuthenticPixelsHandler)(Image *,const ssize_t,const ssize_t,
const size_t,const size_t,ExceptionInfo *);
typedef void
(*DestroyPixelHandler)(Image *);
+typedef void
+ *(*GetAuthenticMetacontentFromHandler)(const Image *);
+
typedef struct _CacheMethods
{
GetVirtualPixelHandler
@@ -79,8 +79,8 @@
GetVirtualPixelsHandler
get_virtual_pixels_handler;
- GetVirtualIndexesFromHandler
- get_virtual_indexes_from_handler;
+ GetVirtualMetacontentFromHandler
+ get_virtual_metacontent_from_handler;
GetOneVirtualPixelFromHandler
get_one_virtual_pixel_from_handler;
@@ -88,8 +88,8 @@
GetAuthenticPixelsHandler
get_authentic_pixels_handler;
- GetAuthenticIndexesFromHandler
- get_authentic_indexes_from_handler;
+ GetAuthenticMetacontentFromHandler
+ get_authentic_metacontent_from_handler;
GetOneAuthenticPixelFromHandler
get_one_authentic_pixel_from_handler;
@@ -119,7 +119,8 @@
colorspace;
size_t
- channels;
+ metacontent_extent,
+ pixel_channels;
CacheType
type;
@@ -143,7 +144,7 @@
VirtualPixelMethod
virtual_pixel_method;
- MagickPixelPacket
+ PixelInfo
virtual_pixel_color;
size_t
@@ -152,14 +153,11 @@
NexusInfo
**nexus_info;
- PixelPacket
+ Quantum
*pixels;
- IndexPacket
- *indexes;
-
- MagickBooleanType
- active_index_channel;
+ void
+ *metacontent;
int
file;
@@ -209,17 +207,15 @@
extern MagickExport ColorspaceType
GetPixelCacheColorspace(const Cache);
-extern MagickExport const IndexPacket
- *GetVirtualIndexesFromNexus(const Cache,NexusInfo *);
-extern MagickExport const PixelPacket
+extern MagickExport const Quantum
*GetVirtualPixelsFromNexus(const Image *,const VirtualPixelMethod,
const ssize_t,const ssize_t,const size_t,const size_t,NexusInfo *,
ExceptionInfo *),
*GetVirtualPixelsNexus(const Cache,NexusInfo *);
-extern MagickExport IndexPacket
- *GetPixelCacheNexusIndexes(const Cache,NexusInfo *);
+extern MagickExport const void
+ *GetVirtualMetacontentFromNexus(const Cache,NexusInfo *);
extern MagickExport MagickBooleanType
SyncAuthenticPixelCacheNexus(Image *,NexusInfo *,ExceptionInfo *);
@@ -231,7 +227,7 @@
**AcquirePixelCacheNexus(const size_t),
**DestroyPixelCacheNexus(NexusInfo **,const size_t);
-extern MagickExport PixelPacket
+extern MagickExport Quantum
*GetAuthenticPixelCacheNexus(Image *,const ssize_t,const ssize_t,
const size_t,const size_t,NexusInfo *,ExceptionInfo *),
*GetPixelCacheNexusPixels(const Cache,NexusInfo *),
@@ -247,6 +243,9 @@
GetPixelCacheMethods(CacheMethods *),
SetPixelCacheMethods(Cache,CacheMethods *);
+extern MagickExport void
+ *GetPixelCacheNexusMetacontent(const Cache,NexusInfo *);
+
#if defined(__cplusplus) || defined(c_plusplus)
}
#endif
diff --git a/magick/cache-view.c b/MagickCore/cache-view.c
similarity index 88%
rename from magick/cache-view.c
rename to MagickCore/cache-view.c
index 83e843e..f82db39 100644
--- a/magick/cache-view.c
+++ b/MagickCore/cache-view.c
@@ -46,15 +46,16 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/cache.h"
-#include "magick/cache-private.h"
-#include "magick/cache-view.h"
-#include "magick/memory_.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/string_.h"
-#include "magick/thread-private.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/cache-private.h"
+#include "MagickCore/cache-view.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/thread-private.h"
/*
Typedef declarations.
@@ -216,39 +217,6 @@
% %
% %
% %
-% G e t C a c h e V i e w C h a n n e l s %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% GetCacheViewChannels() returns the image pixel channels associated with
-% the specified view.
-%
-% The format of the GetCacheViewChannels method is:
-%
-% size_t GetCacheViewChannels(const CacheView *cache_view)
-%
-% A description of each parameter follows:
-%
-% o cache_view: the cache view.
-%
-*/
-MagickExport size_t GetCacheViewChannels(const CacheView *cache_view)
-{
- assert(cache_view != (CacheView *) NULL);
- assert(cache_view->signature == MagickSignature);
- if (cache_view->debug != MagickFalse)
- (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
- cache_view->image->filename);
- return(GetPixelCacheChannels(cache_view->image->cache));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
% G e t C a c h e V i e w C o l o r s p a c e %
% %
% %
@@ -339,6 +307,9 @@
const int
id = GetOpenMPThreadId();
+ MagickSizeType
+ extent;
+
assert(cache_view != (CacheView *) NULL);
assert(cache_view->signature == MagickSignature);
if (cache_view->debug != MagickFalse)
@@ -346,8 +317,9 @@
cache_view->image->filename);
assert(cache_view->image->cache != (Cache) NULL);
assert(id < (int) cache_view->number_threads);
- return(GetPixelCacheNexusExtent(cache_view->image->cache,
- cache_view->nexus_info[id]));
+ extent=GetPixelCacheNexusExtent(cache_view->image->cache,
+ cache_view->nexus_info[id]);
+ return(extent);
}
/*
@@ -400,7 +372,7 @@
%
% The format of the GetCacheViewAuthenticPixels method is:
%
-% PixelPacket *GetCacheViewAuthenticPixels(CacheView *cache_view,
+% Quantum *GetCacheViewAuthenticPixels(CacheView *cache_view,
% const ssize_t x,const ssize_t y,const size_t columns,
% const size_t rows,ExceptionInfo *exception)
%
@@ -412,71 +384,22 @@
% pixels.
%
*/
-MagickExport PixelPacket *GetCacheViewAuthenticPixels(CacheView *cache_view,
+MagickExport Quantum *GetCacheViewAuthenticPixels(CacheView *cache_view,
const ssize_t x,const ssize_t y,const size_t columns,const size_t rows,
ExceptionInfo *exception)
{
const int
id = GetOpenMPThreadId();
- assert(cache_view != (CacheView *) NULL);
- assert(cache_view->signature == MagickSignature);
- assert(id < (int) cache_view->number_threads);
- return(GetAuthenticPixelCacheNexus(cache_view->image,x,y,columns,rows,
- cache_view->nexus_info[id],exception));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% G e t O n e C a c h e V i e w A u t h e n t i c P i x e l %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% GetOneCacheViewAuthenticPixel() returns a single pixel at the specified (x,y)
-% location. The image background color is returned if an error occurs.
-%
-% The format of the GetOneCacheViewAuthenticPixel method is:
-%
-% MagickBooleaNType GetOneCacheViewAuthenticPixel(
-% const CacheView *cache_view,const ssize_t x,const ssize_t y,
-% Pixelpacket *pixel,ExceptionInfo *exception)
-%
-% A description of each parameter follows:
-%
-% o cache_view: the cache view.
-%
-% o x,y: These values define the offset of the pixel.
-%
-% o pixel: return a pixel at the specified (x,y) location.
-%
-% o exception: return any errors or warnings in this structure.
-%
-*/
-MagickExport MagickBooleanType GetOneCacheViewAuthenticPixel(
- const CacheView *cache_view,const ssize_t x,const ssize_t y,
- PixelPacket *pixel,ExceptionInfo *exception)
-{
- const int
- id = GetOpenMPThreadId();
-
- PixelPacket
+ Quantum
*pixels;
assert(cache_view != (CacheView *) NULL);
assert(cache_view->signature == MagickSignature);
- *pixel=cache_view->image->background_color;
assert(id < (int) cache_view->number_threads);
- pixels=GetAuthenticPixelCacheNexus(cache_view->image,x,y,1,1,
+ pixels=GetAuthenticPixelCacheNexus(cache_view->image,x,y,columns,rows,
cache_view->nexus_info[id],exception);
- if (pixels == (const PixelPacket *) NULL)
- return(MagickFalse);
- *pixel=(*pixels);
- return(MagickTrue);
+ return(pixels);
}
/*
@@ -484,36 +407,42 @@
% %
% %
% %
-% G e t C a c h e V i e w A u t h e n t i c I n d e x Q u e u e %
+% G e t C a c h e V i e w A u t h e n t i c M e t a c o n t e n t %
% %
% %
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% GetCacheViewAuthenticIndexQueue() returns the indexes associated with the
-% last call to SetCacheViewIndexes() or GetCacheViewAuthenticIndexQueue(). The
-% indexes are authentic and can be updated.
+% GetCacheViewAuthenticMetacontent() returns the meta-content corresponding
+% with the last call to SetCacheViewIndexes() or
+% GetCacheViewAuthenticMetacontent(). The meta-content are authentic and can
+% be updated.
%
-% The format of the GetCacheViewAuthenticIndexQueue() method is:
+% The format of the GetCacheViewAuthenticMetacontent() method is:
%
-% IndexPacket *GetCacheViewAuthenticIndexQueue(CacheView *cache_view)
+% void *GetCacheViewAuthenticMetacontent(CacheView *cache_view)
%
% A description of each parameter follows:
%
% o cache_view: the cache view.
%
*/
-MagickExport IndexPacket *GetCacheViewAuthenticIndexQueue(CacheView *cache_view)
+MagickExport void *GetCacheViewAuthenticMetacontent(
+ CacheView *cache_view)
{
const int
id = GetOpenMPThreadId();
+ void
+ *metacontent;
+
assert(cache_view != (CacheView *) NULL);
assert(cache_view->signature == MagickSignature);
assert(cache_view->image->cache != (Cache) NULL);
assert(id < (int) cache_view->number_threads);
- return(GetPixelCacheNexusIndexes(cache_view->image->cache,
- cache_view->nexus_info[id]));
+ metacontent=GetPixelCacheNexusMetacontent(cache_view->image->cache,
+ cache_view->nexus_info[id]);
+ return(metacontent);
}
/*
@@ -534,24 +463,28 @@
%
% The format of the GetCacheViewAuthenticPixelQueue() method is:
%
-% PixelPacket *GetCacheViewAuthenticPixelQueue(CacheView *cache_view)
+% Quantum *GetCacheViewAuthenticPixelQueue(CacheView *cache_view)
%
% A description of each parameter follows:
%
% o cache_view: the cache view.
%
*/
-MagickExport PixelPacket *GetCacheViewAuthenticPixelQueue(CacheView *cache_view)
+MagickExport Quantum *GetCacheViewAuthenticPixelQueue(CacheView *cache_view)
{
const int
id = GetOpenMPThreadId();
+ Quantum
+ *pixels;
+
assert(cache_view != (CacheView *) NULL);
assert(cache_view->signature == MagickSignature);
assert(cache_view->image->cache != (Cache) NULL);
assert(id < (int) cache_view->number_threads);
- return(GetPixelCacheNexusPixels(cache_view->image->cache,
- cache_view->nexus_info[id]));
+ pixels=GetPixelCacheNexusPixels(cache_view->image->cache,
+ cache_view->nexus_info[id]);
+ return(pixels);
}
/*
@@ -559,19 +492,19 @@
% %
% %
% %
-% G e t C a c h e V i e w V i r t u a l I n d e x Q u e u e %
+% G e t C a c h e V i e w V i r t u a l M e t a c o n t e n t %
% %
% %
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% GetCacheViewVirtualIndexQueue() returns the indexes associated with the
-% last call to GetCacheViewVirtualIndexQueue(). The indexes are virtual and
-% therefore cannot be updated.
+% GetCacheViewVirtualMetacontent() returns the meta-content corresponding
+% with the last call to GetCacheViewVirtualMetacontent(). The meta-content
+% is virtual and therefore cannot be updated.
%
-% The format of the GetCacheViewVirtualIndexQueue() method is:
+% The format of the GetCacheViewVirtualMetacontent() method is:
%
-% const IndexPacket *GetCacheViewVirtualIndexQueue(
+% const void *GetCacheViewVirtualMetacontent(
% const CacheView *cache_view)
%
% A description of each parameter follows:
@@ -579,18 +512,22 @@
% o cache_view: the cache view.
%
*/
-MagickExport const IndexPacket *GetCacheViewVirtualIndexQueue(
+MagickExport const void *GetCacheViewVirtualMetacontent(
const CacheView *cache_view)
{
const int
id = GetOpenMPThreadId();
+ const void
+ *metacontent;
+
assert(cache_view != (const CacheView *) NULL);
assert(cache_view->signature == MagickSignature);
assert(cache_view->image->cache != (Cache) NULL);
assert(id < (int) cache_view->number_threads);
- return(GetVirtualIndexesFromNexus(cache_view->image->cache,
- cache_view->nexus_info[id]));
+ metacontent=GetVirtualMetacontentFromNexus(cache_view->image->cache,
+ cache_view->nexus_info[id]);
+ return(metacontent);
}
/*
@@ -610,7 +547,7 @@
%
% The format of the GetCacheViewVirtualPixelQueue() method is:
%
-% const PixelPacket *GetCacheViewVirtualPixelQueue(
+% const Quantum *GetCacheViewVirtualPixelQueue(
% const CacheView *cache_view)
%
% A description of each parameter follows:
@@ -618,18 +555,22 @@
% o cache_view: the cache view.
%
*/
-MagickExport const PixelPacket *GetCacheViewVirtualPixelQueue(
+MagickExport const Quantum *GetCacheViewVirtualPixelQueue(
const CacheView *cache_view)
{
const int
id = GetOpenMPThreadId();
+ const Quantum
+ *pixels;
+
assert(cache_view != (const CacheView *) NULL);
assert(cache_view->signature == MagickSignature);
assert(cache_view->image->cache != (Cache) NULL);
assert(id < (int) cache_view->number_threads);
- return(GetVirtualPixelsNexus(cache_view->image->cache,
- cache_view->nexus_info[id]));
+ pixels=GetVirtualPixelsNexus(cache_view->image->cache,
+ cache_view->nexus_info[id]);
+ return(pixels);
}
/*
@@ -650,7 +591,7 @@
%
% The format of the GetCacheViewVirtualPixels method is:
%
-% const PixelPacket *GetCacheViewVirtualPixels(
+% const Quantum *GetCacheViewVirtualPixels(
% const CacheView *cache_view,const ssize_t x,const ssize_t y,
% const size_t columns,const size_t rows,ExceptionInfo *exception)
%
@@ -664,19 +605,78 @@
% o exception: return any errors or warnings in this structure.
%
*/
-MagickExport const PixelPacket *GetCacheViewVirtualPixels(
+MagickExport const Quantum *GetCacheViewVirtualPixels(
const CacheView *cache_view,const ssize_t x,const ssize_t y,
const size_t columns,const size_t rows,ExceptionInfo *exception)
{
const int
id = GetOpenMPThreadId();
+ const Quantum
+ *pixels;
+
assert(cache_view != (CacheView *) NULL);
assert(cache_view->signature == MagickSignature);
assert(id < (int) cache_view->number_threads);
- return(GetVirtualPixelsFromNexus(cache_view->image,
+ pixels=GetVirtualPixelsFromNexus(cache_view->image,
cache_view->virtual_pixel_method,x,y,columns,rows,
- cache_view->nexus_info[id],exception));
+ cache_view->nexus_info[id],exception);
+ return(pixels);
+}
+
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% %
+% %
+% %
+% G e t O n e C a c h e V i e w A u t h e n t i c P i x e l %
+% %
+% %
+% %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% GetOneCacheViewAuthenticPixel() returns a single pixel at the specified (x,y)
+% location. The image background color is returned if an error occurs.
+%
+% The format of the GetOneCacheViewAuthenticPixel method is:
+%
+% MagickBooleaNType GetOneCacheViewAuthenticPixel(
+% const CacheView *cache_view,const ssize_t x,const ssize_t y,
+% PixelPacket *pixel,ExceptionInfo *exception)
+%
+% A description of each parameter follows:
+%
+% o cache_view: the cache view.
+%
+% o x,y: These values define the offset of the pixel.
+%
+% o pixel: return a pixel at the specified (x,y) location.
+%
+% o exception: return any errors or warnings in this structure.
+%
+*/
+MagickExport MagickBooleanType GetOneCacheViewAuthenticPixel(
+ const CacheView *cache_view,const ssize_t x,const ssize_t y,
+ PixelPacket *pixel,ExceptionInfo *exception)
+{
+ const int
+ id = GetOpenMPThreadId();
+
+ Quantum
+ *p;
+
+ assert(cache_view != (CacheView *) NULL);
+ assert(cache_view->signature == MagickSignature);
+ *pixel=cache_view->image->background_color;
+ assert(id < (int) cache_view->number_threads);
+ p=GetAuthenticPixelCacheNexus(cache_view->image,x,y,1,1,
+ cache_view->nexus_info[id],exception);
+ if (p == (const Quantum *) NULL)
+ return(MagickFalse);
+ GetPixelPacket(cache_view->image,p,pixel);
+ if (GetPixelCacheColorspace(cache_view->image->cache) == CMYKColorspace)
+ pixel->black=GetPixelBlack(cache_view->image,p);
+ return(MagickTrue);
}
/*
@@ -718,19 +718,21 @@
const int
id = GetOpenMPThreadId();
- const PixelPacket
- *pixels;
+ const Quantum
+ *p;
assert(cache_view != (CacheView *) NULL);
assert(cache_view->signature == MagickSignature);
*pixel=cache_view->image->background_color;
assert(id < (int) cache_view->number_threads);
- pixels=GetVirtualPixelsFromNexus(cache_view->image,
+ p=GetVirtualPixelsFromNexus(cache_view->image,
cache_view->virtual_pixel_method,x,y,1,1,cache_view->nexus_info[id],
exception);
- if (pixels == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
return(MagickFalse);
- *pixel=(*pixels);
+ GetPixelPacket(cache_view->image,p,pixel);
+ if (GetPixelCacheColorspace(cache_view->image->cache) == CMYKColorspace)
+ pixel->black=GetPixelBlack(cache_view->image,p);
return(MagickTrue);
}
@@ -777,18 +779,20 @@
const int
id = GetOpenMPThreadId();
- const PixelPacket
- *pixels;
+ const Quantum
+ *p;
assert(cache_view != (CacheView *) NULL);
assert(cache_view->signature == MagickSignature);
*pixel=cache_view->image->background_color;
assert(id < (int) cache_view->number_threads);
- pixels=GetVirtualPixelsFromNexus(cache_view->image,virtual_pixel_method,x,y,1,
- 1,cache_view->nexus_info[id],exception);
- if (pixels == (const PixelPacket *) NULL)
+ p=GetVirtualPixelsFromNexus(cache_view->image,virtual_pixel_method,x,y,1,1,
+ cache_view->nexus_info[id],exception);
+ if (p == (const Quantum *) NULL)
return(MagickFalse);
- *pixel=(*pixels);
+ GetPixelPacket(cache_view->image,p,pixel);
+ if (GetPixelCacheColorspace(cache_view->image->cache) == CMYKColorspace)
+ pixel->black=GetPixelBlack(cache_view->image,p);
return(MagickTrue);
}
@@ -810,7 +814,7 @@
%
% The format of the QueueCacheViewAuthenticPixels method is:
%
-% PixelPacket *QueueCacheViewAuthenticPixels(CacheView *cache_view,
+% Quantum *QueueCacheViewAuthenticPixels(CacheView *cache_view,
% const ssize_t x,const ssize_t y,const size_t columns,
% const size_t rows,ExceptionInfo *exception)
%
@@ -824,18 +828,22 @@
% o exception: return any errors or warnings in this structure.
%
*/
-MagickExport PixelPacket *QueueCacheViewAuthenticPixels(CacheView *cache_view,
+MagickExport Quantum *QueueCacheViewAuthenticPixels(CacheView *cache_view,
const ssize_t x,const ssize_t y,const size_t columns,const size_t rows,
ExceptionInfo *exception)
{
const int
id = GetOpenMPThreadId();
+ Quantum
+ *pixels;
+
assert(cache_view != (CacheView *) NULL);
assert(cache_view->signature == MagickSignature);
assert(id < (int) cache_view->number_threads);
- return(QueueAuthenticNexus(cache_view->image,x,y,columns,rows,
- cache_view->nexus_info[id],exception));
+ pixels=QueueAuthenticNexus(cache_view->image,x,y,columns,rows,
+ cache_view->nexus_info[id],exception);
+ return(pixels);
}
/*
@@ -946,9 +954,13 @@
const int
id = GetOpenMPThreadId();
+ MagickBooleanType
+ status;
+
assert(cache_view != (CacheView *) NULL);
assert(cache_view->signature == MagickSignature);
assert(id < (int) cache_view->number_threads);
- return(SyncAuthenticPixelCacheNexus(cache_view->image,
- cache_view->nexus_info[id],exception));
+ status=SyncAuthenticPixelCacheNexus(cache_view->image,
+ cache_view->nexus_info[id],exception);
+ return(status);
}
diff --git a/magick/cache-view.h b/MagickCore/cache-view.h
similarity index 88%
rename from magick/cache-view.h
rename to MagickCore/cache-view.h
index c720cd7..7be39f1 100644
--- a/magick/cache-view.h
+++ b/MagickCore/cache-view.h
@@ -22,13 +22,12 @@
extern "C" {
#endif
-#include "magick/pixel.h"
+#include "MagickCore/pixel.h"
typedef enum
{
UndefinedVirtualPixelMethod,
BackgroundVirtualPixelMethod,
- ConstantVirtualPixelMethod, /* deprecated */
DitherVirtualPixelMethod,
EdgeVirtualPixelMethod,
MirrorVirtualPixelMethod,
@@ -60,20 +59,17 @@
extern MagickExport ColorspaceType
GetCacheViewColorspace(const CacheView *);
-extern MagickExport const IndexPacket
- *GetCacheViewVirtualIndexQueue(const CacheView *);
-
-extern MagickExport const PixelPacket
+extern MagickExport const Quantum
*GetCacheViewVirtualPixels(const CacheView *,const ssize_t,const ssize_t,
const size_t,const size_t,ExceptionInfo *),
*GetCacheViewVirtualPixelQueue(const CacheView *);
+extern MagickExport const void
+ *GetCacheViewVirtualMetacontent(const CacheView *);
+
extern MagickExport ExceptionInfo
*GetCacheViewException(const CacheView *);
-extern MagickExport IndexPacket
- *GetCacheViewAuthenticIndexQueue(CacheView *);
-
extern MagickExport MagickBooleanType
GetOneCacheViewVirtualPixel(const CacheView *,const ssize_t,const ssize_t,
PixelPacket *,ExceptionInfo *),
@@ -89,16 +85,16 @@
extern MagickExport MagickSizeType
GetCacheViewExtent(const CacheView *);
-extern MagickExport size_t
- GetCacheViewChannels(const CacheView *);
-
-extern MagickExport PixelPacket
+extern MagickExport Quantum
*GetCacheViewAuthenticPixelQueue(CacheView *),
*GetCacheViewAuthenticPixels(CacheView *,const ssize_t,const ssize_t,
const size_t,const size_t,ExceptionInfo *),
*QueueCacheViewAuthenticPixels(CacheView *,const ssize_t,const ssize_t,
const size_t,const size_t,ExceptionInfo *);
+extern MagickExport void
+ *GetCacheViewAuthenticMetacontent(CacheView *);
+
#if defined(__cplusplus) || defined(c_plusplus)
}
#endif
diff --git a/magick/cache.c b/MagickCore/cache.c
similarity index 78%
rename from magick/cache.c
rename to MagickCore/cache.c
index 052be3e..89cefd4 100644
--- a/magick/cache.c
+++ b/MagickCore/cache.c
@@ -40,32 +40,32 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/cache-private.h"
-#include "magick/color-private.h"
-#include "magick/composite-private.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/geometry.h"
-#include "magick/list.h"
-#include "magick/log.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/pixel.h"
-#include "magick/pixel-private.h"
-#include "magick/policy.h"
-#include "magick/quantum.h"
-#include "magick/random_.h"
-#include "magick/resource_.h"
-#include "magick/semaphore.h"
-#include "magick/splay-tree.h"
-#include "magick/string_.h"
-#include "magick/string-private.h"
-#include "magick/thread-private.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/cache-private.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/composite-private.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/list.h"
+#include "MagickCore/log.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/pixel.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/policy.h"
+#include "MagickCore/quantum.h"
+#include "MagickCore/random_.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/semaphore.h"
+#include "MagickCore/splay-tree.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/string-private.h"
+#include "MagickCore/thread-private.h"
+#include "MagickCore/utility.h"
#if defined(MAGICKCORE_ZLIB_DELEGATE)
#include "zlib.h"
#endif
@@ -96,12 +96,12 @@
MagickSizeType
length;
- PixelPacket
+ Quantum
*cache,
*pixels;
- IndexPacket
- *indexes;
+ void
+ *metacontent;
size_t
signature;
@@ -114,27 +114,27 @@
extern "C" {
#endif
-static const IndexPacket
- *GetVirtualIndexesFromCache(const Image *);
-
-static const PixelPacket
+static const Quantum
*GetVirtualPixelCache(const Image *,const VirtualPixelMethod,const ssize_t,
const ssize_t,const size_t,const size_t,ExceptionInfo *),
*GetVirtualPixelsCache(const Image *);
+static const void
+ *GetVirtualMetacontentFromCache(const Image *);
+
static MagickBooleanType
GetOneAuthenticPixelFromCache(Image *,const ssize_t,const ssize_t,
PixelPacket *,ExceptionInfo *),
GetOneVirtualPixelFromCache(const Image *,const VirtualPixelMethod,
const ssize_t,const ssize_t,PixelPacket *,ExceptionInfo *),
OpenPixelCache(Image *,const MapMode,ExceptionInfo *),
- ReadPixelCacheIndexes(CacheInfo *,NexusInfo *,ExceptionInfo *),
+ ReadPixelCacheMetacontent(CacheInfo *,NexusInfo *,ExceptionInfo *),
ReadPixelCachePixels(CacheInfo *,NexusInfo *,ExceptionInfo *),
SyncAuthenticPixelsCache(Image *,ExceptionInfo *),
- WritePixelCacheIndexes(CacheInfo *,NexusInfo *,ExceptionInfo *),
+ WritePixelCacheMetacontent(CacheInfo *,NexusInfo *,ExceptionInfo *),
WritePixelCachePixels(CacheInfo *,NexusInfo *,ExceptionInfo *);
-static PixelPacket
+static Quantum
*GetAuthenticPixelsCache(Image *,const ssize_t,const ssize_t,const size_t,
const size_t,ExceptionInfo *),
*QueueAuthenticPixelsCache(Image *,const ssize_t,const ssize_t,const size_t,
@@ -192,7 +192,6 @@
cache_info->type=UndefinedCache;
cache_info->mode=IOMode;
cache_info->colorspace=RGBColorspace;
- cache_info->channels=4;
cache_info->file=(-1);
cache_info->id=GetMagickThreadId();
cache_info->number_threads=number_threads;
@@ -384,8 +383,8 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
% ClipPixelCacheNexus() clips the cache nexus as defined by the image clip
-% mask. The method returns MagickTrue if the pixel region is clipped,
-% otherwise MagickFalse.
+% mask. It returns MagickTrue if the pixel region is clipped, otherwise
+% MagickFalse.
%
% The format of the ClipPixelCacheNexus() method is:
%
@@ -414,15 +413,11 @@
**clip_nexus,
**image_nexus;
- register const PixelPacket
+ register const Quantum
+ *restrict p,
*restrict r;
- register IndexPacket
- *restrict nexus_indexes,
- *restrict indexes;
-
- register PixelPacket
- *restrict p,
+ register Quantum
*restrict q;
register ssize_t
@@ -443,12 +438,10 @@
if ((image_nexus == (NexusInfo **) NULL) ||
(clip_nexus == (NexusInfo **) NULL))
ThrowBinaryException(CacheError,"UnableToGetCacheNexus",image->filename);
- p=GetAuthenticPixelCacheNexus(image,nexus_info->region.x,nexus_info->region.y,
- nexus_info->region.width,nexus_info->region.height,image_nexus[0],
- exception);
- indexes=GetPixelCacheNexusIndexes(cache_info,image_nexus[0]);
+ p=(const Quantum *) GetAuthenticPixelCacheNexus(image,
+ nexus_info->region.x,nexus_info->region.y,nexus_info->region.width,
+ nexus_info->region.height,image_nexus[0],exception);
q=nexus_info->pixels;
- nexus_indexes=nexus_info->indexes;
r=GetVirtualPixelsFromNexus(image->clip_mask,MaskVirtualPixelMethod,
nexus_info->region.x,nexus_info->region.y,nexus_info->region.width,
nexus_info->region.height,clip_nexus[0],exception);
@@ -456,21 +449,20 @@
nexus_info->region.height;
for (i=0; i < (ssize_t) number_pixels; i++)
{
- if ((p == (PixelPacket *) NULL) || (r == (const PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) || (r == (const Quantum *) NULL))
break;
- if (PixelIntensityToQuantum(r) > ((Quantum) QuantumRange/2))
+ if (GetPixelIntensity(image,r) > ((Quantum) QuantumRange/2))
{
- SetPixelRed(q,GetPixelRed(p));
- SetPixelGreen(q,GetPixelGreen(p));
- SetPixelBlue(q,GetPixelBlue(p));
- SetPixelOpacity(q,GetPixelOpacity(p));
- if (cache_info->active_index_channel != MagickFalse)
- SetPixelIndex(nexus_indexes+i,GetPixelIndex(
- indexes+i));
+ SetPixelRed(image,GetPixelRed(image,p),q);
+ SetPixelGreen(image,GetPixelGreen(image,p),q);
+ SetPixelBlue(image,GetPixelBlue(image,p),q);
+ if (cache_info->colorspace == CMYKColorspace)
+ SetPixelBlack(image,GetPixelBlack(image,p),q);
+ SetPixelAlpha(image,GetPixelAlpha(image,p),q);
}
- p++;
- q++;
- r++;
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(image);
+ r+=GetPixelChannels(image->clip_mask);
}
clip_nexus=DestroyPixelCacheNexus(clip_nexus,1);
image_nexus=DestroyPixelCacheNexus(image_nexus,1);
@@ -558,9 +550,11 @@
status=(-1);
LockSemaphoreInfo(cache_info->disk_semaphore);
if (cache_info->file != -1)
- status=close(cache_info->file);
- cache_info->file=(-1);
- RelinquishMagickResource(FileResource,1);
+ {
+ status=close(cache_info->file);
+ cache_info->file=(-1);
+ RelinquishMagickResource(FileResource,1);
+ }
UnlockSemaphoreInfo(cache_info->disk_semaphore);
return(status == -1 ? MagickFalse : MagickTrue);
}
@@ -768,518 +762,425 @@
return(i);
}
-static MagickBooleanType CloneDiskToDiskPixelCache(CacheInfo *clone_info,
+static MagickBooleanType DiskToDiskPixelCacheClone(CacheInfo *clone_info,
CacheInfo *cache_info,ExceptionInfo *exception)
{
MagickOffsetType
- count,
- offset,
- source_offset;
+ count;
- MagickSizeType
- length;
-
- register PixelPacket
- *restrict pixels;
-
- register ssize_t
- y;
+ register MagickOffsetType
+ i;
size_t
- columns,
- rows;
+ length;
+ unsigned char
+ *blob;
+
+ /*
+ Clone pixel cache (both caches on disk).
+ */
if (cache_info->debug != MagickFalse)
(void) LogMagickEvent(CacheEvent,GetMagickModule(),"disk => disk");
- if (OpenPixelCacheOnDisk(clone_info,IOMode) == MagickFalse)
+ blob=(unsigned char *) AcquireQuantumMemory(MagickMaxBufferExtent,
+ sizeof(*blob));
+ if (blob == (unsigned char *) NULL)
{
+ (void) ThrowMagickException(exception,GetMagickModule(),
+ ResourceLimitError,"MemoryAllocationFailed","`%s'",
+ cache_info->filename);
+ return(MagickFalse);
+ }
+ if (OpenPixelCacheOnDisk(cache_info,ReadMode) == MagickFalse)
+ {
+ blob=(unsigned char *) RelinquishMagickMemory(blob);
+ ThrowFileException(exception,FileOpenError,"UnableToOpenFile",
+ cache_info->cache_filename);
+ return(MagickFalse);
+ }
+ if (OpenPixelCacheOnDisk(clone_info,WriteMode) == MagickFalse)
+ {
+ (void) ClosePixelCacheOnDisk(cache_info);
+ blob=(unsigned char *) RelinquishMagickMemory(blob);
ThrowFileException(exception,FileOpenError,"UnableToOpenFile",
clone_info->cache_filename);
return(MagickFalse);
}
- if (OpenPixelCacheOnDisk(cache_info,IOMode) == MagickFalse)
- {
- ThrowFileException(exception,FileOpenError,"UnableToOpenFile",
- cache_info->cache_filename);
- return(MagickFalse);
- }
- columns=(size_t) MagickMin(clone_info->columns,cache_info->columns);
- rows=(size_t) MagickMin(clone_info->rows,cache_info->rows);
- if ((clone_info->active_index_channel != MagickFalse) &&
- (cache_info->active_index_channel != MagickFalse))
- {
- register IndexPacket
- *indexes;
-
- /*
- Clone cache indexes.
- */
- length=MagickMax(clone_info->columns,cache_info->columns)*
- sizeof(*indexes);
- indexes=(IndexPacket *) AcquireMagickMemory((size_t) length);
- if (indexes == (IndexPacket *) NULL)
- {
- (void) ThrowMagickException(exception,GetMagickModule(),CacheError,
- "MemoryAllocationFailed","`%s'",cache_info->cache_filename);
- return(MagickFalse);
- }
- (void) ResetMagickMemory(indexes,0,(size_t) length);
- length=columns*sizeof(*indexes);
- source_offset=(MagickOffsetType) cache_info->columns*cache_info->rows*
- sizeof(*pixels);
- offset=(MagickOffsetType) clone_info->columns*clone_info->rows*
- sizeof(*pixels);
- for (y=0; y < (ssize_t) rows; y++)
- {
- count=ReadPixelCacheRegion(cache_info,cache_info->offset+source_offset,
- length,(unsigned char *) indexes);
- if ((MagickSizeType) count != length)
- break;
- count=WritePixelCacheRegion(clone_info,clone_info->offset+offset,length,
- (unsigned char *) indexes);
- if ((MagickSizeType) count != length)
- break;
- source_offset+=cache_info->columns*sizeof(*indexes);
- offset+=clone_info->columns*sizeof(*indexes);
- }
- if (y < (ssize_t) rows)
- {
- indexes=(IndexPacket *) RelinquishMagickMemory(indexes);
- ThrowFileException(exception,CacheError,"UnableToCloneCache",
- cache_info->cache_filename);
- return(MagickFalse);
- }
- if (clone_info->columns > cache_info->columns)
- {
- length=(clone_info->columns-cache_info->columns)*sizeof(*indexes);
- (void) ResetMagickMemory(indexes,0,(size_t) length);
- offset=(MagickOffsetType) clone_info->columns*clone_info->rows*
- sizeof(*pixels);
- for (y=0; y < (ssize_t) rows; y++)
- {
- count=WritePixelCacheRegion(clone_info,clone_info->offset+offset,
- length,(unsigned char *) indexes);
- if ((MagickSizeType) count != length)
- break;
- offset+=clone_info->columns*sizeof(*indexes);
- }
- if (y < (ssize_t) rows)
- {
- indexes=(IndexPacket *) RelinquishMagickMemory(indexes);
- ThrowFileException(exception,CacheError,"UnableToCloneCache",
- cache_info->cache_filename);
- return(MagickFalse);
- }
- }
- indexes=(IndexPacket *) RelinquishMagickMemory(indexes);
- }
- /*
- Clone cache pixels.
- */
- length=MagickMax(clone_info->columns,cache_info->columns)*sizeof(*pixels);
- pixels=(PixelPacket *) AcquireMagickMemory((size_t) length);
- if (pixels == (PixelPacket *) NULL)
- {
- (void) ThrowMagickException(exception,GetMagickModule(),CacheError,
- "MemoryAllocationFailed","`%s'",cache_info->cache_filename);
- return(MagickFalse);
- }
- (void) ResetMagickMemory(pixels,0,(size_t) length);
- length=columns*sizeof(*pixels);
- source_offset=0;
- offset=0;
- for (y=0; y < (ssize_t) rows; y++)
+ count=0;
+ for (i=0; i < (MagickOffsetType) cache_info->length; i+=count)
{
- count=ReadPixelCacheRegion(cache_info,cache_info->offset+source_offset,
- length,(unsigned char *) pixels);
- if ((MagickSizeType) count != length)
- break;
- count=WritePixelCacheRegion(clone_info,clone_info->offset+offset,length,
- (unsigned char *) pixels);
- if ((MagickSizeType) count != length)
- break;
- source_offset+=cache_info->columns*sizeof(*pixels);
- offset+=clone_info->columns*sizeof(*pixels);
- }
- if (y < (ssize_t) rows)
- {
- pixels=(PixelPacket *) RelinquishMagickMemory(pixels);
- ThrowFileException(exception,CacheError,"UnableToCloneCache",
- cache_info->cache_filename);
- return(MagickFalse);
- }
- if (clone_info->columns > cache_info->columns)
- {
- length=(clone_info->columns-cache_info->columns)*sizeof(*pixels);
- (void) ResetMagickMemory(pixels,0,(size_t) length);
- offset=(MagickOffsetType) columns*sizeof(*pixels);
- for (y=0; y < (ssize_t) rows; y++)
+ count=ReadPixelCacheRegion(cache_info,cache_info->offset+i,
+ MagickMin(cache_info->length-i,(MagickSizeType) MagickMaxBufferExtent),
+ blob);
+ if (count <= 0)
{
- count=WritePixelCacheRegion(clone_info,clone_info->offset+offset,length,
- (unsigned char *) pixels);
- if ((MagickSizeType) count != length)
- break;
- offset+=clone_info->columns*sizeof(*pixels);
+ ThrowFileException(exception,CacheError,"UnableToReadPixelCache",
+ cache_info->cache_filename);
+ break;
}
- if (y < (ssize_t) rows)
- {
- pixels=(PixelPacket *) RelinquishMagickMemory(pixels);
- ThrowFileException(exception,CacheError,"UnableToCloneCache",
- cache_info->cache_filename);
- return(MagickFalse);
- }
- }
- pixels=(PixelPacket *) RelinquishMagickMemory(pixels);
+ length=(size_t) count;
+ count=WritePixelCacheRegion(clone_info,clone_info->offset+i,length,blob);
+ if ((MagickSizeType) count != length)
+ {
+ ThrowFileException(exception,CacheError,"UnableToWritePixelCache",
+ clone_info->cache_filename);
+ break;
+ }
+ }
+ (void) ClosePixelCacheOnDisk(clone_info);
+ (void) ClosePixelCacheOnDisk(cache_info);
+ blob=(unsigned char *) RelinquishMagickMemory(blob);
+ if (i < (MagickOffsetType) cache_info->length)
+ return(MagickFalse);
return(MagickTrue);
}
-static MagickBooleanType CloneDiskToMemoryPixelCache(CacheInfo *clone_info,
+static MagickBooleanType OptimizedPixelCacheClone(CacheInfo *clone_info,
CacheInfo *cache_info,ExceptionInfo *exception)
{
MagickOffsetType
- count,
- offset;
+ count;
- MagickSizeType
- length;
-
- register PixelPacket
- *restrict pixels,
- *restrict q;
-
- register ssize_t
- y;
-
- size_t
- columns,
- rows;
-
- if (cache_info->debug != MagickFalse)
- (void) LogMagickEvent(CacheEvent,GetMagickModule(),"disk => memory");
- if (OpenPixelCacheOnDisk(cache_info,IOMode) == MagickFalse)
+ if ((cache_info->type != DiskCache) && (clone_info->type != DiskCache))
{
- ThrowFileException(exception,FileOpenError,"UnableToOpenFile",
- cache_info->cache_filename);
- return(MagickFalse);
- }
- columns=(size_t) MagickMin(clone_info->columns,cache_info->columns);
- rows=(size_t) MagickMin(clone_info->rows,cache_info->rows);
- if ((clone_info->active_index_channel != MagickFalse) &&
- (cache_info->active_index_channel != MagickFalse))
- {
- register IndexPacket
- *indexes,
- *q;
-
/*
- Clone cache indexes.
+ Clone pixel cache (both caches in memory).
*/
- length=MagickMax(clone_info->columns,cache_info->columns)*
- sizeof(*indexes);
- indexes=(IndexPacket *) AcquireMagickMemory((size_t) length);
- if (indexes == (IndexPacket *) NULL)
+ if (cache_info->debug != MagickFalse)
+ (void) LogMagickEvent(CacheEvent,GetMagickModule(),"memory => memory");
+ (void) memcpy(clone_info->pixels,cache_info->pixels,(size_t)
+ cache_info->length);
+ return(MagickTrue);
+ }
+ if ((clone_info->type != DiskCache) && (cache_info->type == DiskCache))
+ {
+ /*
+ Clone pixel cache (one cache on disk, one in memory).
+ */
+ if (cache_info->debug != MagickFalse)
+ (void) LogMagickEvent(CacheEvent,GetMagickModule(),"disk => memory");
+ if (OpenPixelCacheOnDisk(cache_info,ReadMode) == MagickFalse)
{
- (void) ThrowMagickException(exception,GetMagickModule(),CacheError,
- "MemoryAllocationFailed","`%s'",cache_info->cache_filename);
- return(MagickFalse);
- }
- (void) ResetMagickMemory(indexes,0,(size_t) length);
- length=columns*sizeof(IndexPacket);
- offset=(MagickOffsetType) cache_info->columns*cache_info->rows*
- sizeof(*pixels);
- q=clone_info->indexes;
- for (y=0; y < (ssize_t) rows; y++)
- {
- count=ReadPixelCacheRegion(cache_info,cache_info->offset+offset,
- length,(unsigned char *) indexes);
- if ((MagickSizeType) count != length)
- break;
- (void) memcpy(q,indexes,(size_t) length);
- if ((MagickSizeType) count != length)
- break;
- offset+=cache_info->columns*sizeof(*indexes);
- q+=clone_info->columns;
- }
- if (y < (ssize_t) rows)
- {
- indexes=(IndexPacket *) RelinquishMagickMemory(indexes);
- ThrowFileException(exception,CacheError,"UnableToCloneCache",
+ ThrowFileException(exception,FileOpenError,"UnableToOpenFile",
cache_info->cache_filename);
return(MagickFalse);
}
- indexes=(IndexPacket *) RelinquishMagickMemory(indexes);
+ count=ReadPixelCacheRegion(cache_info,cache_info->offset,
+ cache_info->length,(unsigned char *) clone_info->pixels);
+ (void) ClosePixelCacheOnDisk(cache_info);
+ if ((MagickSizeType) count != cache_info->length)
+ {
+ ThrowFileException(exception,CacheError,"UnableToReadPixelCache",
+ cache_info->cache_filename);
+ return(MagickFalse);
+ }
+ return(MagickTrue);
+ }
+ if ((clone_info->type == DiskCache) && (cache_info->type != DiskCache))
+ {
+ /*
+ Clone pixel cache (one cache on disk, one in memory).
+ */
+ if (clone_info->debug != MagickFalse)
+ (void) LogMagickEvent(CacheEvent,GetMagickModule(),"memory => disk");
+ if (OpenPixelCacheOnDisk(clone_info,WriteMode) == MagickFalse)
+ {
+ ThrowFileException(exception,FileOpenError,"UnableToOpenFile",
+ clone_info->cache_filename);
+ return(MagickFalse);
+ }
+ count=WritePixelCacheRegion(clone_info,clone_info->offset,
+ clone_info->length,(unsigned char *) cache_info->pixels);
+ (void) ClosePixelCacheOnDisk(clone_info);
+ if ((MagickSizeType) count != clone_info->length)
+ {
+ ThrowFileException(exception,CacheError,"UnableToWritePixelCache",
+ clone_info->cache_filename);
+ return(MagickFalse);
+ }
+ return(MagickTrue);
}
/*
- Clone cache pixels.
+ Clone pixel cache (both caches on disk).
*/
- length=MagickMax(clone_info->columns,cache_info->columns)*sizeof(*pixels);
- pixels=(PixelPacket *) AcquireMagickMemory((size_t) length);
- if (pixels == (PixelPacket *) NULL)
- {
- (void) ThrowMagickException(exception,GetMagickModule(),CacheError,
- "MemoryAllocationFailed","`%s'",cache_info->cache_filename);
- return(MagickFalse);
- }
- (void) ResetMagickMemory(pixels,0,(size_t) length);
- length=columns*sizeof(*pixels);
- offset=0;
- q=clone_info->pixels;
- for (y=0; y < (ssize_t) rows; y++)
- {
- count=ReadPixelCacheRegion(cache_info,cache_info->offset+offset,length,
- (unsigned char *) pixels);
- if ((MagickSizeType) count != length)
- break;
- (void) memcpy(q,pixels,(size_t) length);
- offset+=cache_info->columns*sizeof(*pixels);
- q+=clone_info->columns;
- }
- if (y < (ssize_t) rows)
- {
- pixels=(PixelPacket *) RelinquishMagickMemory(pixels);
- ThrowFileException(exception,CacheError,"UnableToCloneCache",
- cache_info->cache_filename);
- return(MagickFalse);
- }
- pixels=(PixelPacket *) RelinquishMagickMemory(pixels);
- return(MagickTrue);
+ return(DiskToDiskPixelCacheClone(clone_info,cache_info,exception));
}
-static MagickBooleanType CloneMemoryToDiskPixelCache(CacheInfo *clone_info,
+static MagickBooleanType UnoptimizedPixelCacheClone(CacheInfo *clone_info,
CacheInfo *cache_info,ExceptionInfo *exception)
{
- MagickOffsetType
- count,
- offset;
+ MagickBooleanType
+ status;
- MagickSizeType
+ MagickOffsetType
+ cache_offset,
+ clone_offset,
+ count;
+
+ register ssize_t
+ x;
+
+ size_t
length;
- register PixelPacket
- *restrict p,
- *restrict pixels;
-
- register ssize_t
+ ssize_t
y;
- size_t
- columns,
- rows;
+ unsigned char
+ *blob;
+ /*
+ Clone pixel cache (unoptimized).
+ */
if (cache_info->debug != MagickFalse)
- (void) LogMagickEvent(CacheEvent,GetMagickModule(),"memory => disk");
- if (OpenPixelCacheOnDisk(clone_info,IOMode) == MagickFalse)
{
- ThrowFileException(exception,FileOpenError,"UnableToOpenFile",
- clone_info->cache_filename);
+ if ((cache_info->type != DiskCache) && (clone_info->type != DiskCache))
+ (void) LogMagickEvent(CacheEvent,GetMagickModule(),"memory => memory");
+ else
+ if ((clone_info->type != DiskCache) && (cache_info->type == DiskCache))
+ (void) LogMagickEvent(CacheEvent,GetMagickModule(),"disk => memory");
+ else
+ if ((clone_info->type == DiskCache) && (cache_info->type != DiskCache))
+ (void) LogMagickEvent(CacheEvent,GetMagickModule(),"memory => disk");
+ else
+ (void) LogMagickEvent(CacheEvent,GetMagickModule(),"disk => disk");
+ }
+ length=(size_t) MagickMax(MagickMax(cache_info->pixel_channels,
+ clone_info->pixel_channels)*sizeof(Quantum),MagickMax(
+ cache_info->metacontent_extent,clone_info->metacontent_extent));
+ blob=(unsigned char *) AcquireQuantumMemory(length,sizeof(*blob));
+ if (blob == (unsigned char *) NULL)
+ {
+ (void) ThrowMagickException(exception,GetMagickModule(),
+ ResourceLimitError,"MemoryAllocationFailed","`%s'",
+ cache_info->filename);
return(MagickFalse);
}
- columns=(size_t) MagickMin(clone_info->columns,cache_info->columns);
- rows=(size_t) MagickMin(clone_info->rows,cache_info->rows);
- if ((clone_info->active_index_channel != MagickFalse) &&
- (cache_info->active_index_channel != MagickFalse))
+ (void) ResetMagickMemory(blob,0,length*sizeof(*blob));
+ cache_offset=0;
+ clone_offset=0;
+ if (cache_info->type == DiskCache)
{
- register IndexPacket
- *p,
- *indexes;
-
- /*
- Clone cache indexes.
- */
- length=MagickMax(clone_info->columns,cache_info->columns)*
- sizeof(*indexes);
- indexes=(IndexPacket *) AcquireMagickMemory((size_t) length);
- if (indexes == (IndexPacket *) NULL)
+ if (OpenPixelCacheOnDisk(cache_info,ReadMode) == MagickFalse)
{
- (void) ThrowMagickException(exception,GetMagickModule(),CacheError,
- "MemoryAllocationFailed","`%s'",cache_info->cache_filename);
- return(MagickFalse);
- }
- (void) ResetMagickMemory(indexes,0,(size_t) length);
- length=columns*sizeof(*indexes);
- p=cache_info->indexes;
- offset=(MagickOffsetType) clone_info->columns*clone_info->rows*
- sizeof(*pixels);
- for (y=0; y < (ssize_t) rows; y++)
- {
- (void) memcpy(indexes,p,(size_t) length);
- count=WritePixelCacheRegion(clone_info,clone_info->offset+offset,length,
- (unsigned char *) indexes);
- if ((MagickSizeType) count != length)
- break;
- p+=cache_info->columns;
- offset+=clone_info->columns*sizeof(*indexes);
- }
- if (y < (ssize_t) rows)
- {
- indexes=(IndexPacket *) RelinquishMagickMemory(indexes);
- ThrowFileException(exception,CacheError,"UnableToCloneCache",
+ blob=(unsigned char *) RelinquishMagickMemory(blob);
+ ThrowFileException(exception,FileOpenError,"UnableToOpenFile",
cache_info->cache_filename);
return(MagickFalse);
}
- if (clone_info->columns > cache_info->columns)
+ cache_offset=cache_info->offset;
+ }
+ if (clone_info->type == DiskCache)
+ {
+ if (OpenPixelCacheOnDisk(clone_info,IOMode) == MagickFalse)
{
- length=(clone_info->columns-cache_info->columns)*sizeof(*indexes);
- (void) ResetMagickMemory(indexes,0,(size_t) length);
- offset=(MagickOffsetType) clone_info->columns*clone_info->rows*
- sizeof(*pixels);
- for (y=0; y < (ssize_t) rows; y++)
- {
- count=WritePixelCacheRegion(clone_info,clone_info->offset+offset,
- length,(unsigned char *) indexes);
- if ((MagickSizeType) count != length)
- break;
- offset+=clone_info->columns*sizeof(*indexes);
- }
- if (y < (ssize_t) rows)
- {
- indexes=(IndexPacket *) RelinquishMagickMemory(indexes);
- ThrowFileException(exception,CacheError,"UnableToCloneCache",
- cache_info->cache_filename);
- return(MagickFalse);
- }
+ if (cache_info->type == DiskCache)
+ (void) ClosePixelCacheOnDisk(cache_info);
+ blob=(unsigned char *) RelinquishMagickMemory(blob);
+ ThrowFileException(exception,FileOpenError,"UnableToOpenFile",
+ clone_info->cache_filename);
+ return(MagickFalse);
}
- indexes=(IndexPacket *) RelinquishMagickMemory(indexes);
+ clone_offset=clone_info->offset;
}
/*
- Clone cache pixels.
+ Clone pixel channels.
*/
- length=MagickMax(clone_info->columns,cache_info->columns)*sizeof(*pixels);
- pixels=(PixelPacket *) AcquireMagickMemory((size_t) length);
- if (pixels == (PixelPacket *) NULL)
- {
- (void) ThrowMagickException(exception,GetMagickModule(),CacheError,
- "MemoryAllocationFailed","`%s'",cache_info->cache_filename);
- return(MagickFalse);
- }
- (void) ResetMagickMemory(pixels,0,(size_t) length);
- length=columns*sizeof(*pixels);
- p=cache_info->pixels;
- offset=0;
- for (y=0; y < (ssize_t) rows; y++)
+ status=MagickTrue;
+ for (y=0; y < (ssize_t) cache_info->rows; y++)
{
- (void) memcpy(pixels,p,(size_t) length);
- count=WritePixelCacheRegion(clone_info,clone_info->offset+offset,length,
- (unsigned char *) pixels);
- if ((MagickSizeType) count != length)
- break;
- p+=cache_info->columns;
- offset+=clone_info->columns*sizeof(*pixels);
- }
- if (y < (ssize_t) rows)
+ for (x=0; x < (ssize_t) cache_info->columns; x++)
{
- pixels=(PixelPacket *) RelinquishMagickMemory(pixels);
- ThrowFileException(exception,CacheError,"UnableToCloneCache",
- cache_info->cache_filename);
- return(MagickFalse);
- }
- if (clone_info->columns > cache_info->columns)
- {
- length=(clone_info->columns-cache_info->columns)*sizeof(*pixels);
- (void) ResetMagickMemory(pixels,0,(size_t) length);
- offset=(MagickOffsetType) columns*sizeof(*pixels);
- for (y=0; y < (ssize_t) rows; y++)
- {
- count=WritePixelCacheRegion(clone_info,clone_info->offset+offset,length,
- (unsigned char *) pixels);
- if ((MagickSizeType) count != length)
- break;
- offset+=clone_info->columns*sizeof(*pixels);
- }
- if (y < (ssize_t) rows)
- {
- pixels=(PixelPacket *) RelinquishMagickMemory(pixels);
- ThrowFileException(exception,CacheError,"UnableToCloneCache",
- cache_info->cache_filename);
- return(MagickFalse);
- }
- }
- pixels=(PixelPacket *) RelinquishMagickMemory(pixels);
- return(MagickTrue);
-}
-
-static MagickBooleanType CloneMemoryToMemoryPixelCache(CacheInfo *clone_info,
- CacheInfo *cache_info,ExceptionInfo *magick_unused(exception))
-{
- register PixelPacket
- *restrict pixels,
- *restrict source_pixels;
-
- register ssize_t
- y;
-
- size_t
- columns,
- length,
- rows;
-
- if (cache_info->debug != MagickFalse)
- (void) LogMagickEvent(CacheEvent,GetMagickModule(),"memory => memory");
- columns=(size_t) MagickMin(clone_info->columns,cache_info->columns);
- rows=(size_t) MagickMin(clone_info->rows,cache_info->rows);
- if ((clone_info->active_index_channel != MagickFalse) &&
- (cache_info->active_index_channel != MagickFalse))
- {
- register IndexPacket
- *indexes,
- *source_indexes;
-
/*
- Clone cache indexes.
+ Read a set of pixel channels.
*/
- length=columns*sizeof(*indexes);
- if (clone_info->columns == cache_info->columns)
- (void) memcpy(clone_info->indexes,cache_info->indexes,length*rows);
+ length=cache_info->pixel_channels*sizeof(Quantum);
+ if (cache_info->type != DiskCache)
+ (void) memcpy(blob,(unsigned char *) cache_info->pixels+cache_offset,
+ length);
else
{
- source_indexes=cache_info->indexes;
- indexes=clone_info->indexes;
- for (y=0; y < (ssize_t) rows; y++)
- {
- (void) memcpy(indexes,source_indexes,length);
- source_indexes+=cache_info->columns;
- indexes+=clone_info->columns;
- }
- if (clone_info->columns > cache_info->columns)
+ count=ReadPixelCacheRegion(cache_info,cache_offset,length,blob);
+ if ((MagickSizeType) count != length)
{
- length=(clone_info->columns-cache_info->columns)*sizeof(*indexes);
- indexes=clone_info->indexes+cache_info->columns;
- for (y=0; y < (ssize_t) rows; y++)
- {
- (void) ResetMagickMemory(indexes,0,length);
- indexes+=clone_info->columns;
- }
+ status=MagickFalse;
+ break;
}
}
- }
- /*
- Clone cache pixels.
- */
- length=columns*sizeof(*pixels);
- if (clone_info->columns == cache_info->columns)
- (void) memcpy(clone_info->pixels,cache_info->pixels,length*rows);
- else
- {
- source_pixels=cache_info->pixels;
- pixels=clone_info->pixels;
- for (y=0; y < (ssize_t) rows; y++)
- {
- (void) memcpy(pixels,source_pixels,length);
- source_pixels+=cache_info->columns;
- pixels+=clone_info->columns;
- }
- if (clone_info->columns > cache_info->columns)
+ cache_offset+=length;
+ if ((y < (ssize_t) clone_info->rows) &&
+ (x < (ssize_t) clone_info->columns))
{
- length=(clone_info->columns-cache_info->columns)*sizeof(*pixels);
- pixels=clone_info->pixels+cache_info->columns;
- for (y=0; y < (ssize_t) rows; y++)
- {
- (void) ResetMagickMemory(pixels,0,length);
- pixels+=clone_info->columns;
- }
+ /*
+ Write a set of pixel channels.
+ */
+ length=clone_info->pixel_channels*sizeof(Quantum);
+ if (clone_info->type != DiskCache)
+ (void) memcpy((unsigned char *) clone_info->pixels+clone_offset,
+ blob,length);
+ else
+ {
+ count=WritePixelCacheRegion(clone_info,clone_offset,length,
+ blob);
+ if ((MagickSizeType) count != length)
+ {
+ status=MagickFalse;
+ break;
+ }
+ }
+ clone_offset+=length;
}
}
- return(MagickTrue);
+ length=clone_info->pixel_channels*sizeof(Quantum);
+ (void) ResetMagickMemory(blob,0,length*sizeof(*blob));
+ for ( ; x < (ssize_t) clone_info->columns; x++)
+ {
+ /*
+ Set remaining columns with transparent pixel channels.
+ */
+ if (clone_info->type != DiskCache)
+ (void) memcpy((unsigned char *) clone_info->pixels+clone_offset,blob,
+ length);
+ else
+ {
+ count=WritePixelCacheRegion(clone_info,clone_offset,length,blob);
+ if ((MagickSizeType) count != length)
+ {
+ status=MagickFalse;
+ break;
+ }
+ }
+ clone_offset+=length;
+ }
+ }
+ length=clone_info->pixel_channels*sizeof(Quantum);
+ (void) ResetMagickMemory(blob,0,length*sizeof(*blob));
+ for ( ; y < (ssize_t) clone_info->rows; y++)
+ {
+ /*
+ Set remaining rows with transparent pixels.
+ */
+ for (x=0; x < (ssize_t) clone_info->columns; x++)
+ {
+ if (clone_info->type != DiskCache)
+ (void) memcpy((unsigned char *) clone_info->pixels+clone_offset,blob,
+ length);
+ else
+ {
+ count=WritePixelCacheRegion(clone_info,clone_offset,length,blob);
+ if ((MagickSizeType) count != length)
+ {
+ status=MagickFalse;
+ break;
+ }
+ }
+ clone_offset+=length;
+ }
+ }
+ if ((cache_info->metacontent_extent != 0) &&
+ (clone_info->metacontent_extent != 0))
+ {
+ /*
+ Clone metacontent.
+ */
+ for (y=0; y < (ssize_t) cache_info->rows; y++)
+ {
+ for (x=0; x < (ssize_t) cache_info->columns; x++)
+ {
+ /*
+ Read a set of metacontent.
+ */
+ length=cache_info->metacontent_extent;
+ if (cache_info->type != DiskCache)
+ (void) memcpy(blob,(unsigned char *) cache_info->pixels+
+ cache_offset,length);
+ else
+ {
+ count=ReadPixelCacheRegion(cache_info,cache_offset,length,blob);
+ if ((MagickSizeType) count != length)
+ {
+ status=MagickFalse;
+ break;
+ }
+ }
+ cache_offset+=length;
+ if ((y < (ssize_t) clone_info->rows) &&
+ (x < (ssize_t) clone_info->columns))
+ {
+ /*
+ Write a set of metacontent.
+ */
+ length=clone_info->metacontent_extent;
+ if (clone_info->type != DiskCache)
+ (void) memcpy((unsigned char *) clone_info->pixels+clone_offset,
+ blob,length);
+ else
+ {
+ count=WritePixelCacheRegion(clone_info,clone_offset,length,
+ blob);
+ if ((MagickSizeType) count != length)
+ {
+ status=MagickFalse;
+ break;
+ }
+ }
+ clone_offset+=length;
+ }
+ }
+ length=clone_info->metacontent_extent;
+ (void) ResetMagickMemory(blob,0,length*sizeof(*blob));
+ for ( ; x < (ssize_t) clone_info->columns; x++)
+ {
+ /*
+ Set remaining columns with metacontent.
+ */
+ if (clone_info->type != DiskCache)
+ (void) memcpy((unsigned char *) clone_info->pixels+clone_offset,
+ blob,length);
+ else
+ {
+ count=WritePixelCacheRegion(clone_info,clone_offset,length,
+ blob);
+ if ((MagickSizeType) count != length)
+ {
+ status=MagickFalse;
+ break;
+ }
+ }
+ clone_offset+=length;
+ }
+ }
+ length=clone_info->metacontent_extent;
+ (void) ResetMagickMemory(blob,0,length*sizeof(*blob));
+ for ( ; y < (ssize_t) clone_info->rows; y++)
+ {
+ /*
+ Set remaining rows with metacontent.
+ */
+ for (x=0; x < (ssize_t) clone_info->columns; x++)
+ {
+ if (clone_info->type != DiskCache)
+ (void) memcpy((unsigned char *) clone_info->pixels+clone_offset,
+ blob,length);
+ else
+ {
+ count=WritePixelCacheRegion(clone_info,clone_offset,length,blob);
+ if ((MagickSizeType) count != length)
+ {
+ status=MagickFalse;
+ break;
+ }
+ }
+ clone_offset+=length;
+ }
+ }
+ }
+ if (clone_info->type == DiskCache)
+ (void) ClosePixelCacheOnDisk(clone_info);
+ if (cache_info->type == DiskCache)
+ (void) ClosePixelCacheOnDisk(cache_info);
+ blob=(unsigned char *) RelinquishMagickMemory(blob);
+ return(status);
}
static MagickBooleanType ClonePixelCachePixels(CacheInfo *clone_info,
@@ -1287,13 +1188,12 @@
{
if (cache_info->type == PingCache)
return(MagickTrue);
- if ((clone_info->type != DiskCache) && (cache_info->type != DiskCache))
- return(CloneMemoryToMemoryPixelCache(clone_info,cache_info,exception));
- if ((clone_info->type == DiskCache) && (cache_info->type == DiskCache))
- return(CloneDiskToDiskPixelCache(clone_info,cache_info,exception));
- if (cache_info->type == DiskCache)
- return(CloneDiskToMemoryPixelCache(clone_info,cache_info,exception));
- return(CloneMemoryToDiskPixelCache(clone_info,cache_info,exception));
+ if ((cache_info->columns == clone_info->columns) &&
+ (cache_info->rows == clone_info->rows) &&
+ (cache_info->pixel_channels == clone_info->pixel_channels) &&
+ (cache_info->metacontent_extent == clone_info->metacontent_extent))
+ return(OptimizedPixelCacheClone(clone_info,cache_info,exception));
+ return(UnoptimizedPixelCacheClone(clone_info,cache_info,exception));
}
/*
@@ -1444,17 +1344,17 @@
case MemoryCache:
{
if (cache_info->mapped == MagickFalse)
- cache_info->pixels=(PixelPacket *) RelinquishMagickMemory(
+ cache_info->pixels=(Quantum *) RelinquishMagickMemory(
cache_info->pixels);
else
- cache_info->pixels=(PixelPacket *) UnmapBlob(cache_info->pixels,
+ cache_info->pixels=(Quantum *) UnmapBlob(cache_info->pixels,
(size_t) cache_info->length);
RelinquishMagickResource(MemoryResource,cache_info->length);
break;
}
case MapCache:
{
- cache_info->pixels=(PixelPacket *) UnmapBlob(cache_info->pixels,(size_t)
+ cache_info->pixels=(Quantum *) UnmapBlob(cache_info->pixels,(size_t)
cache_info->length);
RelinquishMagickResource(MapResource,cache_info->length);
}
@@ -1470,7 +1370,7 @@
}
cache_info->type=UndefinedCache;
cache_info->mapped=MagickFalse;
- cache_info->indexes=(IndexPacket *) NULL;
+ cache_info->metacontent=(void *) NULL;
}
MagickExport Cache DestroyPixelCache(Cache cache)
@@ -1559,9 +1459,9 @@
(void) RelinquishMagickMemory(nexus_info->cache);
else
(void) UnmapBlob(nexus_info->cache,(size_t) nexus_info->length);
- nexus_info->cache=(PixelPacket *) NULL;
- nexus_info->pixels=(PixelPacket *) NULL;
- nexus_info->indexes=(IndexPacket *) NULL;
+ nexus_info->cache=(Quantum *) NULL;
+ nexus_info->pixels=(Quantum *) NULL;
+ nexus_info->metacontent=(void *) NULL;
nexus_info->length=0;
nexus_info->mapped=MagickFalse;
}
@@ -1575,7 +1475,7 @@
assert(nexus_info != (NexusInfo **) NULL);
for (i=0; i < (ssize_t) number_threads; i++)
{
- if (nexus_info[i]->cache != (PixelPacket *) NULL)
+ if (nexus_info[i]->cache != (Quantum *) NULL)
RelinquishCacheNexusPixels(nexus_info[i]);
nexus_info[i]->signature=(~MagickSignature);
nexus_info[i]=(NexusInfo *) RelinquishAlignedMemory(nexus_info[i]);
@@ -1589,25 +1489,26 @@
% %
% %
% %
-+ G e t A u t h e n t i c I n d e x e s F r o m C a c h e %
+% G e t A u t h e n t i c M e t a c o n t e n t %
% %
% %
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% GetAuthenticIndexesFromCache() returns the indexes associated with the last
-% call to QueueAuthenticPixelsCache() or GetAuthenticPixelsCache().
+% GetAuthenticMetacontent() returns the authentic metacontent corresponding
+% with the last call to QueueAuthenticPixels() or GetVirtualPixels(). NULL is
+% returned if the associated pixels are not available.
%
-% The format of the GetAuthenticIndexesFromCache() method is:
+% The format of the GetAuthenticMetacontent() method is:
%
-% IndexPacket *GetAuthenticIndexesFromCache(const Image *image)
+% void *GetAuthenticMetacontent(const Image *image)
%
% A description of each parameter follows:
%
% o image: the image.
%
*/
-static IndexPacket *GetAuthenticIndexesFromCache(const Image *image)
+MagickExport void *GetAuthenticMetacontent(const Image *image)
{
CacheInfo
*cache_info;
@@ -1615,13 +1516,25 @@
const int
id = GetOpenMPThreadId();
+ void
+ *metacontent;
+
assert(image != (const Image *) NULL);
assert(image->signature == MagickSignature);
assert(image->cache != (Cache) NULL);
cache_info=(CacheInfo *) image->cache;
assert(cache_info->signature == MagickSignature);
+ if (cache_info->methods.get_authentic_metacontent_from_handler !=
+ (GetAuthenticMetacontentFromHandler) NULL)
+ {
+ metacontent=cache_info->methods.
+ get_authentic_metacontent_from_handler(image);
+ return(metacontent);
+ }
assert(id < (int) cache_info->number_threads);
- return(GetPixelCacheNexusIndexes(image->cache,cache_info->nexus_info[id]));
+ metacontent=GetPixelCacheNexusMetacontent(cache_info,
+ cache_info->nexus_info[id]);
+ return(metacontent);
}
/*
@@ -1629,27 +1542,26 @@
% %
% %
% %
-% G e t A u t h e n t i c I n d e x Q u e u e %
++ G e t A u t h e n t i c M e t a c o n t e n t F r o m C a c h e %
% %
% %
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% GetAuthenticIndexQueue() returns the authentic black channel or the colormap
-% indexes associated with the last call to QueueAuthenticPixels() or
-% GetVirtualPixels(). NULL is returned if the black channel or colormap
-% indexes are not available.
+% GetAuthenticMetacontentFromCache() returns the meta-content corresponding
+% with the last call to QueueAuthenticPixelsCache() or
+% GetAuthenticPixelsCache().
%
-% The format of the GetAuthenticIndexQueue() method is:
+% The format of the GetAuthenticMetacontentFromCache() method is:
%
-% IndexPacket *GetAuthenticIndexQueue(const Image *image)
+% void *GetAuthenticMetacontentFromCache(const Image *image)
%
% A description of each parameter follows:
%
% o image: the image.
%
*/
-MagickExport IndexPacket *GetAuthenticIndexQueue(const Image *image)
+static void *GetAuthenticMetacontentFromCache(const Image *image)
{
CacheInfo
*cache_info;
@@ -1657,16 +1569,18 @@
const int
id = GetOpenMPThreadId();
+ void
+ *metacontent;
+
assert(image != (const Image *) NULL);
assert(image->signature == MagickSignature);
assert(image->cache != (Cache) NULL);
cache_info=(CacheInfo *) image->cache;
assert(cache_info->signature == MagickSignature);
- if (cache_info->methods.get_authentic_indexes_from_handler !=
- (GetAuthenticIndexesFromHandler) NULL)
- return(cache_info->methods.get_authentic_indexes_from_handler(image));
assert(id < (int) cache_info->number_threads);
- return(GetPixelCacheNexusIndexes(cache_info,cache_info->nexus_info[id]));
+ metacontent=GetPixelCacheNexusMetacontent(image->cache,
+ cache_info->nexus_info[id]);
+ return(metacontent);
}
/*
@@ -1687,7 +1601,7 @@
%
% The format of the GetAuthenticPixelCacheNexus() method is:
%
-% PixelPacket *GetAuthenticPixelCacheNexus(Image *image,const ssize_t x,
+% Quantum *GetAuthenticPixelCacheNexus(Image *image,const ssize_t x,
% const ssize_t y,const size_t columns,const size_t rows,
% NexusInfo *nexus_info,ExceptionInfo *exception)
%
@@ -1704,9 +1618,12 @@
%
*/
-static inline MagickBooleanType IsNexusInCore(const CacheInfo *cache_info,
+static inline MagickBooleanType IsPixelAuthentic(const CacheInfo *cache_info,
NexusInfo *nexus_info)
{
+ MagickBooleanType
+ status;
+
MagickOffsetType
offset;
@@ -1714,18 +1631,19 @@
return(MagickTrue);
offset=(MagickOffsetType) nexus_info->region.y*cache_info->columns+
nexus_info->region.x;
- return(nexus_info->pixels == (cache_info->pixels+offset) ? MagickTrue :
- MagickFalse);
+ status=nexus_info->pixels == (cache_info->pixels+offset*
+ cache_info->pixel_channels) ? MagickTrue : MagickFalse;
+ return(status);
}
-MagickExport PixelPacket *GetAuthenticPixelCacheNexus(Image *image,
+MagickExport Quantum *GetAuthenticPixelCacheNexus(Image *image,
const ssize_t x,const ssize_t y,const size_t columns,const size_t rows,
NexusInfo *nexus_info,ExceptionInfo *exception)
{
CacheInfo
*cache_info;
- PixelPacket
+ Quantum
*pixels;
/*
@@ -1734,17 +1652,17 @@
assert(image != (Image *) NULL);
assert(image->signature == MagickSignature);
pixels=QueueAuthenticNexus(image,x,y,columns,rows,nexus_info,exception);
- if (pixels == (PixelPacket *) NULL)
- return((PixelPacket *) NULL);
+ if (pixels == (Quantum *) NULL)
+ return((Quantum *) NULL);
cache_info=(CacheInfo *) image->cache;
assert(cache_info->signature == MagickSignature);
- if (IsNexusInCore(cache_info,nexus_info) != MagickFalse)
+ if (IsPixelAuthentic(cache_info,nexus_info) != MagickFalse)
return(pixels);
if (ReadPixelCachePixels(cache_info,nexus_info,exception) == MagickFalse)
- return((PixelPacket *) NULL);
- if (cache_info->active_index_channel != MagickFalse)
- if (ReadPixelCacheIndexes(cache_info,nexus_info,exception) == MagickFalse)
- return((PixelPacket *) NULL);
+ return((Quantum *) NULL);
+ if (cache_info->metacontent_extent != 0)
+ if (ReadPixelCacheMetacontent(cache_info,nexus_info,exception) == MagickFalse)
+ return((Quantum *) NULL);
return(pixels);
}
@@ -1764,14 +1682,14 @@
%
% The format of the GetAuthenticPixelsFromCache() method is:
%
-% PixelPacket *GetAuthenticPixelsFromCache(const Image image)
+% Quantum *GetAuthenticPixelsFromCache(const Image image)
%
% A description of each parameter follows:
%
% o image: the image.
%
*/
-static PixelPacket *GetAuthenticPixelsFromCache(const Image *image)
+static Quantum *GetAuthenticPixelsFromCache(const Image *image)
{
CacheInfo
*cache_info;
@@ -1799,19 +1717,20 @@
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% GetAuthenticPixelQueue() returns the authentic pixels associated with the
-% last call to QueueAuthenticPixels() or GetAuthenticPixels().
+% GetAuthenticPixelQueue() returns the authentic pixels associated
+% corresponding with the last call to QueueAuthenticPixels() or
+% GetAuthenticPixels().
%
% The format of the GetAuthenticPixelQueue() method is:
%
-% PixelPacket *GetAuthenticPixelQueue(const Image image)
+% Quantum *GetAuthenticPixelQueue(const Image image)
%
% A description of each parameter follows:
%
% o image: the image.
%
*/
-MagickExport PixelPacket *GetAuthenticPixelQueue(const Image *image)
+MagickExport Quantum *GetAuthenticPixelQueue(const Image *image)
{
CacheInfo
*cache_info;
@@ -1839,11 +1758,10 @@
% G e t A u t h e n t i c P i x e l s %
% %
% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
% GetAuthenticPixels() obtains a pixel region for read/write access. If the
-% region is successfully accessed, a pointer to a PixelPacket array
+% region is successfully accessed, a pointer to a Quantum array
% representing the region is returned, otherwise NULL is returned.
%
% The returned pointer may point to a temporary working copy of the pixels
@@ -1854,16 +1772,15 @@
% must *never* be deallocated by the user.
%
% Pixels accessed via the returned pointer represent a simple array of type
-% PixelPacket. If the image type is CMYK or if the storage class is
-% PseduoClass, call GetAuthenticIndexQueue() after invoking
-% GetAuthenticPixels() to obtain the black color component or colormap indexes
-% (of type IndexPacket) corresponding to the region. Once the PixelPacket
-% (and/or IndexPacket) array has been updated, the changes must be saved back
-% to the underlying image using SyncAuthenticPixels() or they may be lost.
+% Quantum. If the image has corresponding metacontent,call
+% GetAuthenticMetacontent() after invoking GetAuthenticPixels() to obtain the
+% meta-content corresponding to the region. Once the Quantum array has
+% been updated, the changes must be saved back to the underlying image using
+% SyncAuthenticPixels() or they may be lost.
%
% The format of the GetAuthenticPixels() method is:
%
-% PixelPacket *GetAuthenticPixels(Image *image,const ssize_t x,
+% Quantum *GetAuthenticPixels(Image *image,const ssize_t x,
% const ssize_t y,const size_t columns,const size_t rows,
% ExceptionInfo *exception)
%
@@ -1877,7 +1794,7 @@
% o exception: return any errors or warnings in this structure.
%
*/
-MagickExport PixelPacket *GetAuthenticPixels(Image *image,const ssize_t x,
+MagickExport Quantum *GetAuthenticPixels(Image *image,const ssize_t x,
const ssize_t y,const size_t columns,const size_t rows,
ExceptionInfo *exception)
{
@@ -1887,18 +1804,25 @@
const int
id = GetOpenMPThreadId();
+ Quantum
+ *pixels;
+
assert(image != (Image *) NULL);
assert(image->signature == MagickSignature);
assert(image->cache != (Cache) NULL);
cache_info=(CacheInfo *) image->cache;
assert(cache_info->signature == MagickSignature);
if (cache_info->methods.get_authentic_pixels_handler !=
- (GetAuthenticPixelsHandler) NULL)
- return(cache_info->methods.get_authentic_pixels_handler(image,x,y,columns,
- rows,exception));
+ (GetAuthenticPixelsHandler) NULL)
+ {
+ pixels=cache_info->methods.get_authentic_pixels_handler(image,x,y,columns,
+ rows,exception);
+ return(pixels);
+ }
assert(id < (int) cache_info->number_threads);
- return(GetAuthenticPixelCacheNexus(image,x,y,columns,rows,
- cache_info->nexus_info[id],exception));
+ pixels=GetAuthenticPixelCacheNexus(image,x,y,columns,rows,
+ cache_info->nexus_info[id],exception);
+ return(pixels);
}
/*
@@ -1918,7 +1842,7 @@
%
% The format of the GetAuthenticPixelsCache() method is:
%
-% PixelPacket *GetAuthenticPixelsCache(Image *image,const ssize_t x,
+% Quantum *GetAuthenticPixelsCache(Image *image,const ssize_t x,
% const ssize_t y,const size_t columns,const size_t rows,
% ExceptionInfo *exception)
%
@@ -1932,7 +1856,7 @@
% o exception: return any errors or warnings in this structure.
%
*/
-static PixelPacket *GetAuthenticPixelsCache(Image *image,const ssize_t x,
+static Quantum *GetAuthenticPixelsCache(Image *image,const ssize_t x,
const ssize_t y,const size_t columns,const size_t rows,
ExceptionInfo *exception)
{
@@ -1942,16 +1866,20 @@
const int
id = GetOpenMPThreadId();
+ Quantum
+ *pixels;
+
assert(image != (const Image *) NULL);
assert(image->signature == MagickSignature);
assert(image->cache != (Cache) NULL);
cache_info=(CacheInfo *) image->cache;
if (cache_info == (Cache) NULL)
- return((PixelPacket *) NULL);
+ return((Quantum *) NULL);
assert(cache_info->signature == MagickSignature);
assert(id < (int) cache_info->number_threads);
- return(GetAuthenticPixelCacheNexus(image,x,y,columns,rows,
- cache_info->nexus_info[id],exception));
+ pixels=GetAuthenticPixelCacheNexus(image,x,y,columns,rows,
+ cache_info->nexus_info[id],exception);
+ return(pixels);
}
/*
@@ -1965,8 +1893,8 @@
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% GetImageExtent() returns the extent of the pixels associated with the
-% last call to QueueAuthenticPixels() or GetAuthenticPixels().
+% GetImageExtent() returns the extent of the pixels associated corresponding
+% with the last call to QueueAuthenticPixels() or GetAuthenticPixels().
%
% The format of the GetImageExtent() method is:
%
@@ -2036,9 +1964,10 @@
cache_info=(CacheInfo *) image->cache;
if ((image->storage_class != cache_info->storage_class) ||
(image->colorspace != cache_info->colorspace) ||
- (image->channels != cache_info->channels) ||
(image->columns != cache_info->columns) ||
(image->rows != cache_info->rows) ||
+ (image->pixel_channels != cache_info->pixel_channels) ||
+ (image->metacontent_extent != cache_info->metacontent_extent) ||
(cache_info->nexus_info == (NexusInfo **) NULL) ||
(cache_info->number_threads < GetOpenMPMaximumThreads()))
return(MagickFalse);
@@ -2189,8 +2118,8 @@
CacheInfo
*cache_info;
- PixelPacket
- *pixels;
+ register Quantum
+ *q;
assert(image != (Image *) NULL);
assert(image->signature == MagickSignature);
@@ -2202,10 +2131,10 @@
(GetOneAuthenticPixelFromHandler) NULL)
return(cache_info->methods.get_one_authentic_pixel_from_handler(image,x,y,
pixel,exception));
- pixels=GetAuthenticPixelsCache(image,x,y,1UL,1UL,exception);
- if (pixels == (PixelPacket *) NULL)
+ q=GetAuthenticPixelsCache(image,x,y,1UL,1UL,exception);
+ if (q == (Quantum *) NULL)
return(MagickFalse);
- *pixel=(*pixels);
+ GetPixelPacket(image,q,pixel);
return(MagickTrue);
}
@@ -2249,21 +2178,21 @@
const int
id = GetOpenMPThreadId();
- PixelPacket
- *pixels;
+ register Quantum
+ *q;
assert(image != (const Image *) NULL);
assert(image->signature == MagickSignature);
assert(image->cache != (Cache) NULL);
cache_info=(CacheInfo *) image->cache;
assert(cache_info->signature == MagickSignature);
- *pixel=image->background_color;
assert(id < (int) cache_info->number_threads);
- pixels=GetAuthenticPixelCacheNexus(image,x,y,1UL,1UL,
- cache_info->nexus_info[id],exception);
- if (pixels == (PixelPacket *) NULL)
+ *pixel=image->background_color;
+ q=GetAuthenticPixelCacheNexus(image,x,y,1UL,1UL,cache_info->nexus_info[id],
+ exception);
+ if (q == (Quantum *) NULL)
return(MagickFalse);
- *pixel=(*pixels);
+ GetPixelPacket(image,q,pixel);
return(MagickTrue);
}
@@ -2285,7 +2214,7 @@
% The format of the GetOneVirtualMagickPixel() method is:
%
% MagickBooleanType GetOneVirtualMagickPixel(const Image image,
-% const ssize_t x,const ssize_t y,MagickPixelPacket *pixel,
+% const ssize_t x,const ssize_t y,PixelInfo *pixel,
% ExceptionInfo exception)
%
% A description of each parameter follows:
@@ -2300,7 +2229,7 @@
%
*/
MagickExport MagickBooleanType GetOneVirtualMagickPixel(const Image *image,
- const ssize_t x,const ssize_t y,MagickPixelPacket *pixel,
+ const ssize_t x,const ssize_t y,PixelInfo *pixel,
ExceptionInfo *exception)
{
CacheInfo
@@ -2309,10 +2238,7 @@
const int
id = GetOpenMPThreadId();
- register const IndexPacket
- *indexes;
-
- register const PixelPacket
+ register const Quantum
*pixels;
assert(image != (const Image *) NULL);
@@ -2323,11 +2249,10 @@
assert(id < (int) cache_info->number_threads);
pixels=GetVirtualPixelsFromNexus(image,GetPixelCacheVirtualMethod(image),x,y,
1UL,1UL,cache_info->nexus_info[id],exception);
- GetMagickPixelPacket(image,pixel);
- if (pixels == (const PixelPacket *) NULL)
+ GetPixelInfo(image,pixel);
+ if (pixels == (const Quantum *) NULL)
return(MagickFalse);
- indexes=GetVirtualIndexesFromNexus(cache_info,cache_info->nexus_info[id]);
- SetMagickPixelPacket(image,pixels,indexes,pixel);
+ SetPixelInfo(image,pixels,pixel);
return(MagickTrue);
}
@@ -2351,7 +2276,7 @@
%
% MagickBooleanType GetOneVirtualMethodPixel(const Image image,
% const VirtualPixelMethod virtual_pixel_method,const ssize_t x,
-% const ssize_t y,Pixelpacket *pixel,ExceptionInfo exception)
+% const ssize_t y,PixelPacket *pixel,ExceptionInfo exception)
%
% A description of each parameter follows:
%
@@ -2376,8 +2301,8 @@
const int
id = GetOpenMPThreadId();
- const PixelPacket
- *pixels;
+ const Quantum
+ *p;
assert(image != (const Image *) NULL);
assert(image->signature == MagickSignature);
@@ -2390,11 +2315,13 @@
return(cache_info->methods.get_one_virtual_pixel_from_handler(image,
virtual_pixel_method,x,y,pixel,exception));
assert(id < (int) cache_info->number_threads);
- pixels=GetVirtualPixelsFromNexus(image,virtual_pixel_method,x,y,1UL,1UL,
+ p=GetVirtualPixelsFromNexus(image,virtual_pixel_method,x,y,1UL,1UL,
cache_info->nexus_info[id],exception);
- if (pixels == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
return(MagickFalse);
- *pixel=(*pixels);
+ GetPixelPacket(image,p,pixel);
+ if (image->colorspace == CMYKColorspace)
+ pixel->black=GetPixelBlack(image,p);
return(MagickTrue);
}
@@ -2438,8 +2365,8 @@
const int
id = GetOpenMPThreadId();
- const PixelPacket
- *pixels;
+ const Quantum
+ *p;
assert(image != (const Image *) NULL);
assert(image->signature == MagickSignature);
@@ -2452,11 +2379,13 @@
return(cache_info->methods.get_one_virtual_pixel_from_handler(image,
GetPixelCacheVirtualMethod(image),x,y,pixel,exception));
assert(id < (int) cache_info->number_threads);
- pixels=GetVirtualPixelsFromNexus(image,GetPixelCacheVirtualMethod(image),x,y,
+ p=GetVirtualPixelsFromNexus(image,GetPixelCacheVirtualMethod(image),x,y,
1UL,1UL,cache_info->nexus_info[id],exception);
- if (pixels == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
return(MagickFalse);
- *pixel=(*pixels);
+ GetPixelPacket(image,p,pixel);
+ if (image->colorspace == CMYKColorspace)
+ pixel->black=GetPixelBlack(image,p);
return(MagickTrue);
}
@@ -2478,7 +2407,7 @@
% The format of the GetOneVirtualPixelFromCache() method is:
%
% MagickBooleanType GetOneVirtualPixelFromCache(const Image image,
-% const VirtualPixelPacket method,const ssize_t x,const ssize_t y,
+% const VirtualPixelMethod method,const ssize_t x,const ssize_t y,
% PixelPacket *pixel,ExceptionInfo *exception)
%
% A description of each parameter follows:
@@ -2504,8 +2433,8 @@
const int
id = GetOpenMPThreadId();
- const PixelPacket
- *pixels;
+ const Quantum
+ *p;
assert(image != (const Image *) NULL);
assert(image->signature == MagickSignature);
@@ -2514,11 +2443,13 @@
assert(cache_info->signature == MagickSignature);
assert(id < (int) cache_info->number_threads);
*pixel=image->background_color;
- pixels=GetVirtualPixelsFromNexus(image,virtual_pixel_method,x,y,1UL,1UL,
+ p=GetVirtualPixelsFromNexus(image,virtual_pixel_method,x,y,1UL,1UL,
cache_info->nexus_info[id],exception);
- if (pixels == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
return(MagickFalse);
- *pixel=(*pixels);
+ GetPixelPacket(image,p,pixel);
+ if (image->colorspace == CMYKColorspace)
+ pixel->black=GetPixelBlack(image,p);
return(MagickTrue);
}
@@ -2527,45 +2458,6 @@
% %
% %
% %
-+ G e t P i x e l C a c h e C h a n n e l s %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% GetPixelCacheChannels() returns the number of pixel channels associated
-% with this instance of the pixel cache.
-%
-% The format of the GetPixelCacheChannels() method is:
-%
-% size_t GetPixelCacheChannels(Cache cache)
-%
-% A description of each parameter follows:
-%
-% o type: GetPixelCacheChannels returns DirectClass or PseudoClass.
-%
-% o cache: the pixel cache.
-%
-*/
-MagickExport size_t GetPixelCacheChannels(const Cache cache)
-{
- CacheInfo
- *cache_info;
-
- assert(cache != (Cache) NULL);
- cache_info=(CacheInfo *) cache;
- assert(cache_info->signature == MagickSignature);
- if (cache_info->debug != MagickFalse)
- (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
- cache_info->filename);
- return(cache_info->channels);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
+ G e t P i x e l C a c h e C o l o r s p a c e %
% %
% %
@@ -2625,11 +2517,12 @@
(void) ResetMagickMemory(cache_methods,0,sizeof(*cache_methods));
cache_methods->get_virtual_pixel_handler=GetVirtualPixelCache;
cache_methods->get_virtual_pixels_handler=GetVirtualPixelsCache;
- cache_methods->get_virtual_indexes_from_handler=GetVirtualIndexesFromCache;
+ cache_methods->get_virtual_metacontent_from_handler=
+ GetVirtualMetacontentFromCache;
cache_methods->get_one_virtual_pixel_from_handler=GetOneVirtualPixelFromCache;
cache_methods->get_authentic_pixels_handler=GetAuthenticPixelsCache;
- cache_methods->get_authentic_indexes_from_handler=
- GetAuthenticIndexesFromCache;
+ cache_methods->get_authentic_metacontent_from_handler=
+ GetAuthenticMetacontentFromCache;
cache_methods->get_authentic_pixels_from_handler=GetAuthenticPixelsFromCache;
cache_methods->get_one_authentic_pixel_from_handler=
GetOneAuthenticPixelFromCache;
@@ -2649,8 +2542,9 @@
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% GetPixelCacheNexusExtent() returns the extent of the pixels associated with
-% the last call to SetPixelCacheNexusPixels() or GetPixelCacheNexusPixels().
+% GetPixelCacheNexusExtent() returns the extent of the pixels associated
+% corresponding with the last call to SetPixelCacheNexusPixels() or
+% GetPixelCacheNexusPixels().
%
% The format of the GetPixelCacheNexusExtent() method is:
%
@@ -2685,28 +2579,28 @@
% %
% %
% %
-+ G e t P i x e l C a c h e N e x u s I n d e x e s %
++ G e t P i x e l C a c h e N e x u s M e t a c o n t e n t %
% %
% %
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% GetPixelCacheNexusIndexes() returns the indexes associated with the
-% specified cache nexus.
+% GetPixelCacheNexusMetacontent() returns the meta-content for the specified
+% cache nexus.
%
-% The format of the GetPixelCacheNexusIndexes() method is:
+% The format of the GetPixelCacheNexusMetacontent() method is:
%
-% IndexPacket *GetPixelCacheNexusIndexes(const Cache cache,
+% void *GetPixelCacheNexusMetacontent(const Cache cache,
% NexusInfo *nexus_info)
%
% A description of each parameter follows:
%
% o cache: the pixel cache.
%
-% o nexus_info: the cache nexus to return the colormap indexes.
+% o nexus_info: the cache nexus to return the meta-content.
%
*/
-MagickExport IndexPacket *GetPixelCacheNexusIndexes(const Cache cache,
+MagickExport void *GetPixelCacheNexusMetacontent(const Cache cache,
NexusInfo *nexus_info)
{
CacheInfo
@@ -2716,8 +2610,8 @@
cache_info=(CacheInfo *) cache;
assert(cache_info->signature == MagickSignature);
if (cache_info->storage_class == UndefinedClass)
- return((IndexPacket *) NULL);
- return(nexus_info->indexes);
+ return((void *) NULL);
+ return(nexus_info->metacontent);
}
/*
@@ -2736,7 +2630,7 @@
%
% The format of the GetPixelCacheNexusPixels() method is:
%
-% PixelPacket *GetPixelCacheNexusPixels(const Cache cache,
+% Quantum *GetPixelCacheNexusPixels(const Cache cache,
% NexusInfo *nexus_info)
%
% A description of each parameter follows:
@@ -2746,7 +2640,7 @@
% o nexus_info: the cache nexus to return the pixels.
%
*/
-MagickExport PixelPacket *GetPixelCacheNexusPixels(const Cache cache,
+MagickExport Quantum *GetPixelCacheNexusPixels(const Cache cache,
NexusInfo *nexus_info)
{
CacheInfo
@@ -2756,7 +2650,7 @@
cache_info=(CacheInfo *) cache;
assert(cache_info->signature == MagickSignature);
if (cache_info->storage_class == UndefinedClass)
- return((PixelPacket *) NULL);
+ return((Quantum *) NULL);
return(nexus_info->pixels);
}
@@ -2876,13 +2770,18 @@
MagickExport void GetPixelCacheTileSize(const Image *image,size_t *width,
size_t *height)
{
+ CacheInfo
+ *cache_info;
+
assert(image != (Image *) NULL);
assert(image->signature == MagickSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
- *width=2048UL/sizeof(PixelPacket);
+ cache_info=(CacheInfo *) image->cache;
+ assert(cache_info->signature == MagickSignature);
+ *width=2048UL/(cache_info->pixel_channels*sizeof(Quantum));
if (GetPixelCacheType(image) == DiskCache)
- *width=8192UL/sizeof(PixelPacket);
+ *width=8192UL/(cache_info->pixel_channels*sizeof(Quantum));
*height=(*width);
}
@@ -2963,25 +2862,25 @@
% %
% %
% %
-+ G e t V i r t u a l I n d e x e s F r o m C a c h e %
++ G e t V i r t u a l M e t a c o n t e n t F r o m C a c h e %
% %
% %
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% GetVirtualIndexesFromCache() returns the indexes associated with the last
-% call to QueueAuthenticPixelsCache() or GetVirtualPixelCache().
+% GetVirtualMetacontentFromCache() returns the meta-content corresponding with
+% the last call to QueueAuthenticPixelsCache() or GetVirtualPixelCache().
%
-% The format of the GetVirtualIndexesFromCache() method is:
+% The format of the GetVirtualMetacontentFromCache() method is:
%
-% IndexPacket *GetVirtualIndexesFromCache(const Image *image)
+% void *GetVirtualMetacontentFromCache(const Image *image)
%
% A description of each parameter follows:
%
% o image: the image.
%
*/
-static const IndexPacket *GetVirtualIndexesFromCache(const Image *image)
+static const void *GetVirtualMetacontentFromCache(const Image *image)
{
CacheInfo
*cache_info;
@@ -2989,13 +2888,18 @@
const int
id = GetOpenMPThreadId();
+ const void
+ *metacontent;
+
assert(image != (const Image *) NULL);
assert(image->signature == MagickSignature);
assert(image->cache != (Cache) NULL);
cache_info=(CacheInfo *) image->cache;
assert(cache_info->signature == MagickSignature);
assert(id < (int) cache_info->number_threads);
- return(GetVirtualIndexesFromNexus(cache_info,cache_info->nexus_info[id]));
+ metacontent=GetVirtualMetacontentFromNexus(cache_info,
+ cache_info->nexus_info[id]);
+ return(metacontent);
}
/*
@@ -3003,29 +2907,29 @@
% %
% %
% %
-+ G e t V i r t u a l I n d e x e s F r o m N e x u s %
++ G e t V i r t u a l M e t a c o n t e n t F r o m N e x u s %
% %
% %
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% GetVirtualIndexesFromNexus() returns the indexes associated with the
-% specified cache nexus.
+% GetVirtualMetacontentFromNexus() returns the meta-content for the specified
+% cache nexus.
%
-% The format of the GetVirtualIndexesFromNexus() method is:
+% The format of the GetVirtualMetacontentFromNexus() method is:
%
-% const IndexPacket *GetVirtualIndexesFromNexus(const Cache cache,
+% const void *GetVirtualMetacontentFromNexus(const Cache cache,
% NexusInfo *nexus_info)
%
% A description of each parameter follows:
%
% o cache: the pixel cache.
%
-% o nexus_info: the cache nexus to return the colormap indexes.
+% o nexus_info: the cache nexus to return the meta-content.
%
*/
-MagickExport const IndexPacket *GetVirtualIndexesFromNexus(const Cache cache,
- NexusInfo *nexus_info)
+MagickExport const void *GetVirtualMetacontentFromNexus(
+ const Cache cache,NexusInfo *nexus_info)
{
CacheInfo
*cache_info;
@@ -3034,8 +2938,8 @@
cache_info=(CacheInfo *) cache;
assert(cache_info->signature == MagickSignature);
if (cache_info->storage_class == UndefinedClass)
- return((IndexPacket *) NULL);
- return(nexus_info->indexes);
+ return((void *) NULL);
+ return(nexus_info->metacontent);
}
/*
@@ -3043,27 +2947,26 @@
% %
% %
% %
-% G e t V i r t u a l I n d e x Q u e u e %
+% G e t V i r t u a l M e t a c o n t e n t %
% %
% %
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% GetVirtualIndexQueue() returns the virtual black channel or the
-% colormap indexes associated with the last call to QueueAuthenticPixels() or
-% GetVirtualPixels(). NULL is returned if the black channel or colormap
-% indexes are not available.
+% GetVirtualMetacontent() returns the virtual metacontent corresponding with
+% the last call to QueueAuthenticPixels() or GetVirtualPixels(). NULL is
+% returned if the meta-content are not available.
%
-% The format of the GetVirtualIndexQueue() method is:
+% The format of the GetVirtualMetacontent() method is:
%
-% const IndexPacket *GetVirtualIndexQueue(const Image *image)
+% const void *GetVirtualMetacontent(const Image *image)
%
% A description of each parameter follows:
%
% o image: the image.
%
*/
-MagickExport const IndexPacket *GetVirtualIndexQueue(const Image *image)
+MagickExport const void *GetVirtualMetacontent(const Image *image)
{
CacheInfo
*cache_info;
@@ -3071,16 +2974,25 @@
const int
id = GetOpenMPThreadId();
+ const void
+ *metacontent;
+
assert(image != (const Image *) NULL);
assert(image->signature == MagickSignature);
assert(image->cache != (Cache) NULL);
cache_info=(CacheInfo *) image->cache;
assert(cache_info->signature == MagickSignature);
- if (cache_info->methods.get_virtual_indexes_from_handler !=
- (GetVirtualIndexesFromHandler) NULL)
- return(cache_info->methods.get_virtual_indexes_from_handler(image));
+ if (cache_info->methods.get_virtual_metacontent_from_handler !=
+ (GetVirtualMetacontentFromHandler) NULL)
+ {
+ metacontent=cache_info->methods.
+ get_virtual_metacontent_from_handler(image);
+ return(metacontent);
+ }
assert(id < (int) cache_info->number_threads);
- return(GetVirtualIndexesFromNexus(cache_info,cache_info->nexus_info[id]));
+ metacontent=GetVirtualMetacontentFromNexus(cache_info,
+ cache_info->nexus_info[id]);
+ return(metacontent);
}
/*
@@ -3100,7 +3012,7 @@
%
% The format of the GetVirtualPixelsFromNexus() method is:
%
-% PixelPacket *GetVirtualPixelsFromNexus(const Image *image,
+% Quantum *GetVirtualPixelsFromNexus(const Image *image,
% const VirtualPixelMethod method,const ssize_t x,const ssize_t y,
% const size_t columns,const size_t rows,NexusInfo *nexus_info,
% ExceptionInfo *exception)
@@ -3207,7 +3119,7 @@
return(modulo);
}
-MagickExport const PixelPacket *GetVirtualPixelsFromNexus(const Image *image,
+MagickExport const Quantum *GetVirtualPixelsFromNexus(const Image *image,
const VirtualPixelMethod virtual_pixel_method,const ssize_t x,const ssize_t y,
const size_t columns,const size_t rows,NexusInfo *nexus_info,
ExceptionInfo *exception)
@@ -3215,9 +3127,6 @@
CacheInfo
*cache_info;
- IndexPacket
- virtual_index;
-
MagickOffsetType
offset;
@@ -3228,29 +3137,32 @@
NexusInfo
**virtual_nexus;
- PixelPacket
+ Quantum
*pixels,
- virtual_pixel;
+ *virtual_pixel;
RectangleInfo
region;
- register const IndexPacket
- *restrict virtual_indexes;
-
- register const PixelPacket
+ register const Quantum
*restrict p;
- register IndexPacket
- *restrict indexes;
+ register const void
+ *restrict r;
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
u,
v;
+ register unsigned char
+ *restrict s;
+
+ void
+ *virtual_associated_pixel;
+
/*
Acquire pixels.
*/
@@ -3260,14 +3172,14 @@
cache_info=(CacheInfo *) image->cache;
assert(cache_info->signature == MagickSignature);
if (cache_info->type == UndefinedCache)
- return((const PixelPacket *) NULL);
+ return((const Quantum *) NULL);
region.x=x;
region.y=y;
region.width=columns;
region.height=rows;
pixels=SetPixelCacheNexusPixels(image,®ion,nexus_info,exception);
- if (pixels == (PixelPacket *) NULL)
- return((const PixelPacket *) NULL);
+ if (pixels == (Quantum *) NULL)
+ return((const Quantum *) NULL);
offset=(MagickOffsetType) nexus_info->region.y*cache_info->columns+
nexus_info->region.x;
length=(MagickSizeType) (nexus_info->region.height-1L)*cache_info->columns+
@@ -3283,17 +3195,16 @@
/*
Pixel request is inside cache extents.
*/
- if (IsNexusInCore(cache_info,nexus_info) != MagickFalse)
+ if (IsPixelAuthentic(cache_info,nexus_info) != MagickFalse)
return(pixels);
status=ReadPixelCachePixels(cache_info,nexus_info,exception);
if (status == MagickFalse)
- return((const PixelPacket *) NULL);
- if ((cache_info->storage_class == PseudoClass) ||
- (cache_info->colorspace == CMYKColorspace))
+ return((const Quantum *) NULL);
+ if (cache_info->metacontent_extent != 0)
{
- status=ReadPixelCacheIndexes(cache_info,nexus_info,exception);
+ status=ReadPixelCacheMetacontent(cache_info,nexus_info,exception);
if (status == MagickFalse)
- return((const PixelPacket *) NULL);
+ return((const Quantum *) NULL);
}
return(pixels);
}
@@ -3301,56 +3212,110 @@
Pixel request is outside cache extents.
*/
q=pixels;
- indexes=GetPixelCacheNexusIndexes(cache_info,nexus_info);
+ s=(unsigned char *) GetPixelCacheNexusMetacontent(cache_info,nexus_info);
virtual_nexus=AcquirePixelCacheNexus(1);
if (virtual_nexus == (NexusInfo **) NULL)
{
+ if (virtual_nexus != (NexusInfo **) NULL)
+ virtual_nexus=DestroyPixelCacheNexus(virtual_nexus,1);
(void) ThrowMagickException(exception,GetMagickModule(),CacheError,
"UnableToGetCacheNexus","`%s'",image->filename);
- return((const PixelPacket *) NULL);
+ return((const Quantum *) NULL);
}
+ virtual_pixel=(Quantum *) NULL;
+ virtual_associated_pixel=(void *) NULL;
switch (virtual_pixel_method)
{
+ case BackgroundVirtualPixelMethod:
case BlackVirtualPixelMethod:
- {
- SetPixelRed(&virtual_pixel,0);
- SetPixelGreen(&virtual_pixel,0);
- SetPixelBlue(&virtual_pixel,0);
- SetPixelOpacity(&virtual_pixel,OpaqueOpacity);
- break;
- }
case GrayVirtualPixelMethod:
- {
- SetPixelRed(&virtual_pixel,QuantumRange/2);
- SetPixelGreen(&virtual_pixel,QuantumRange/2);
- SetPixelBlue(&virtual_pixel,QuantumRange/2);
- SetPixelOpacity(&virtual_pixel,OpaqueOpacity);
- break;
- }
case TransparentVirtualPixelMethod:
- {
- SetPixelRed(&virtual_pixel,0);
- SetPixelGreen(&virtual_pixel,0);
- SetPixelBlue(&virtual_pixel,0);
- SetPixelOpacity(&virtual_pixel,TransparentOpacity);
- break;
- }
case MaskVirtualPixelMethod:
case WhiteVirtualPixelMethod:
+ case EdgeVirtualPixelMethod:
+ case CheckerTileVirtualPixelMethod:
+ case HorizontalTileVirtualPixelMethod:
+ case VerticalTileVirtualPixelMethod:
{
- SetPixelRed(&virtual_pixel,QuantumRange);
- SetPixelGreen(&virtual_pixel,QuantumRange);
- SetPixelBlue(&virtual_pixel,QuantumRange);
- SetPixelOpacity(&virtual_pixel,OpaqueOpacity);
+ /*
+ Acquire virtual pixel and associated channels.
+ */
+ virtual_pixel=(Quantum *) AcquireQuantumMemory(
+ cache_info->pixel_channels,sizeof(*virtual_pixel));
+ if (virtual_pixel == (Quantum *) NULL)
+ {
+ virtual_nexus=DestroyPixelCacheNexus(virtual_nexus,1);
+ (void) ThrowMagickException(exception,GetMagickModule(),CacheError,
+ "UnableToGetCacheNexus","`%s'",image->filename);
+ return((const Quantum *) NULL);
+ }
+ (void) ResetMagickMemory(virtual_pixel,0,cache_info->pixel_channels*
+ sizeof(*virtual_pixel));
+ if (cache_info->metacontent_extent != 0)
+ {
+ virtual_associated_pixel=(void *) AcquireMagickMemory(
+ cache_info->metacontent_extent);
+ if (virtual_associated_pixel == (void *) NULL)
+ {
+ virtual_pixel=(Quantum *) RelinquishMagickMemory(
+ virtual_pixel);
+ virtual_nexus=DestroyPixelCacheNexus(virtual_nexus,1);
+ (void) ThrowMagickException(exception,GetMagickModule(),
+ CacheError,"UnableToGetCacheNexus","`%s'",image->filename);
+ return((const Quantum *) NULL);
+ }
+ (void) ResetMagickMemory(virtual_associated_pixel,0,
+ cache_info->metacontent_extent);
+ }
+ switch (virtual_pixel_method)
+ {
+ case BlackVirtualPixelMethod:
+ {
+ SetPixelRed(image,0,virtual_pixel);
+ SetPixelGreen(image,0,virtual_pixel);
+ SetPixelBlue(image,0,virtual_pixel);
+ SetPixelAlpha(image,OpaqueAlpha,virtual_pixel);
+ break;
+ }
+ case GrayVirtualPixelMethod:
+ {
+ SetPixelRed(image,QuantumRange/2,virtual_pixel);
+ SetPixelGreen(image,QuantumRange/2,virtual_pixel);
+ SetPixelBlue(image,QuantumRange/2,virtual_pixel);
+ SetPixelAlpha(image,OpaqueAlpha,virtual_pixel);
+ break;
+ }
+ case TransparentVirtualPixelMethod:
+ {
+ SetPixelRed(image,0,virtual_pixel);
+ SetPixelGreen(image,0,virtual_pixel);
+ SetPixelBlue(image,0,virtual_pixel);
+ SetPixelAlpha(image,TransparentAlpha,virtual_pixel);
+ break;
+ }
+ case MaskVirtualPixelMethod:
+ case WhiteVirtualPixelMethod:
+ {
+ SetPixelRed(image,(Quantum) QuantumRange,virtual_pixel);
+ SetPixelGreen(image,(Quantum) QuantumRange,virtual_pixel);
+ SetPixelBlue(image,(Quantum) QuantumRange,virtual_pixel);
+ SetPixelAlpha(image,OpaqueAlpha,virtual_pixel);
+ break;
+ }
+ default:
+ {
+ SetPixelRed(image,image->background_color.red,virtual_pixel);
+ SetPixelGreen(image,image->background_color.green,virtual_pixel);
+ SetPixelBlue(image,image->background_color.blue,virtual_pixel);
+ SetPixelAlpha(image,image->background_color.alpha,virtual_pixel);
+ break;
+ }
+ }
break;
}
default:
- {
- virtual_pixel=image->background_color;
break;
- }
}
- virtual_index=0;
for (v=0; v < (ssize_t) rows; v++)
{
for (u=0; u < (ssize_t) columns; u+=length)
@@ -3370,26 +3335,12 @@
length=(MagickSizeType) 1;
switch (virtual_pixel_method)
{
- case BackgroundVirtualPixelMethod:
- case ConstantVirtualPixelMethod:
- case BlackVirtualPixelMethod:
- case GrayVirtualPixelMethod:
- case TransparentVirtualPixelMethod:
- case MaskVirtualPixelMethod:
- case WhiteVirtualPixelMethod:
- {
- p=(&virtual_pixel);
- virtual_indexes=(&virtual_index);
- break;
- }
- case EdgeVirtualPixelMethod:
default:
{
p=GetVirtualPixelsFromNexus(image,virtual_pixel_method,
EdgeX(x+u,cache_info->columns),EdgeY(y+v,cache_info->rows),
1UL,1UL,*virtual_nexus,exception);
- virtual_indexes=GetVirtualIndexesFromNexus(cache_info,
- *virtual_nexus);
+ r=GetVirtualMetacontentFromNexus(cache_info,*virtual_nexus);
break;
}
case RandomVirtualPixelMethod:
@@ -3400,8 +3351,7 @@
RandomX(cache_info->random_info,cache_info->columns),
RandomY(cache_info->random_info,cache_info->rows),1UL,1UL,
*virtual_nexus,exception);
- virtual_indexes=GetVirtualIndexesFromNexus(cache_info,
- *virtual_nexus);
+ r=GetVirtualMetacontentFromNexus(cache_info,*virtual_nexus);
break;
}
case DitherVirtualPixelMethod:
@@ -3409,8 +3359,7 @@
p=GetVirtualPixelsFromNexus(image,virtual_pixel_method,
DitherX(x+u,cache_info->columns),DitherY(y+v,cache_info->rows),
1UL,1UL,*virtual_nexus,exception);
- virtual_indexes=GetVirtualIndexesFromNexus(cache_info,
- *virtual_nexus);
+ r=GetVirtualMetacontentFromNexus(cache_info,*virtual_nexus);
break;
}
case TileVirtualPixelMethod:
@@ -3420,8 +3369,7 @@
p=GetVirtualPixelsFromNexus(image,virtual_pixel_method,
x_modulo.remainder,y_modulo.remainder,1UL,1UL,*virtual_nexus,
exception);
- virtual_indexes=GetVirtualIndexesFromNexus(cache_info,
- *virtual_nexus);
+ r=GetVirtualMetacontentFromNexus(cache_info,*virtual_nexus);
break;
}
case MirrorVirtualPixelMethod:
@@ -3437,59 +3385,7 @@
p=GetVirtualPixelsFromNexus(image,virtual_pixel_method,
x_modulo.remainder,y_modulo.remainder,1UL,1UL,*virtual_nexus,
exception);
- virtual_indexes=GetVirtualIndexesFromNexus(cache_info,
- *virtual_nexus);
- break;
- }
- case CheckerTileVirtualPixelMethod:
- {
- x_modulo=VirtualPixelModulo(x+u,cache_info->columns);
- y_modulo=VirtualPixelModulo(y+v,cache_info->rows);
- if (((x_modulo.quotient ^ y_modulo.quotient) & 0x01) != 0L)
- {
- p=(&virtual_pixel);
- virtual_indexes=(&virtual_index);
- break;
- }
- p=GetVirtualPixelsFromNexus(image,virtual_pixel_method,
- x_modulo.remainder,y_modulo.remainder,1UL,1UL,*virtual_nexus,
- exception);
- virtual_indexes=GetVirtualIndexesFromNexus(cache_info,
- *virtual_nexus);
- break;
- }
- case HorizontalTileVirtualPixelMethod:
- {
- if (((y+v) < 0) || ((y+v) >= (ssize_t) cache_info->rows))
- {
- p=(&virtual_pixel);
- virtual_indexes=(&virtual_index);
- break;
- }
- x_modulo=VirtualPixelModulo(x+u,cache_info->columns);
- y_modulo=VirtualPixelModulo(y+v,cache_info->rows);
- p=GetVirtualPixelsFromNexus(image,virtual_pixel_method,
- x_modulo.remainder,y_modulo.remainder,1UL,1UL,*virtual_nexus,
- exception);
- virtual_indexes=GetVirtualIndexesFromNexus(cache_info,
- *virtual_nexus);
- break;
- }
- case VerticalTileVirtualPixelMethod:
- {
- if (((x+u) < 0) || ((x+u) >= (ssize_t) cache_info->columns))
- {
- p=(&virtual_pixel);
- virtual_indexes=(&virtual_index);
- break;
- }
- x_modulo=VirtualPixelModulo(x+u,cache_info->columns);
- y_modulo=VirtualPixelModulo(y+v,cache_info->rows);
- p=GetVirtualPixelsFromNexus(image,virtual_pixel_method,
- x_modulo.remainder,y_modulo.remainder,1UL,1UL,*virtual_nexus,
- exception);
- virtual_indexes=GetVirtualIndexesFromNexus(cache_info,
- *virtual_nexus);
+ r=GetVirtualMetacontentFromNexus(cache_info,*virtual_nexus);
break;
}
case HorizontalTileEdgeVirtualPixelMethod:
@@ -3498,8 +3394,7 @@
p=GetVirtualPixelsFromNexus(image,virtual_pixel_method,
x_modulo.remainder,EdgeY(y+v,cache_info->rows),1UL,1UL,
*virtual_nexus,exception);
- virtual_indexes=GetVirtualIndexesFromNexus(cache_info,
- *virtual_nexus);
+ r=GetVirtualMetacontentFromNexus(cache_info,*virtual_nexus);
break;
}
case VerticalTileEdgeVirtualPixelMethod:
@@ -3508,38 +3403,108 @@
p=GetVirtualPixelsFromNexus(image,virtual_pixel_method,
EdgeX(x+u,cache_info->columns),y_modulo.remainder,1UL,1UL,
*virtual_nexus,exception);
- virtual_indexes=GetVirtualIndexesFromNexus(cache_info,
- *virtual_nexus);
+ r=GetVirtualMetacontentFromNexus(cache_info,*virtual_nexus);
+ break;
+ }
+ case BackgroundVirtualPixelMethod:
+ case BlackVirtualPixelMethod:
+ case GrayVirtualPixelMethod:
+ case TransparentVirtualPixelMethod:
+ case MaskVirtualPixelMethod:
+ case WhiteVirtualPixelMethod:
+ {
+ p=virtual_pixel;
+ r=virtual_associated_pixel;
+ break;
+ }
+ case EdgeVirtualPixelMethod:
+ case CheckerTileVirtualPixelMethod:
+ {
+ x_modulo=VirtualPixelModulo(x+u,cache_info->columns);
+ y_modulo=VirtualPixelModulo(y+v,cache_info->rows);
+ if (((x_modulo.quotient ^ y_modulo.quotient) & 0x01) != 0L)
+ {
+ p=virtual_pixel;
+ r=virtual_associated_pixel;
+ break;
+ }
+ p=GetVirtualPixelsFromNexus(image,virtual_pixel_method,
+ x_modulo.remainder,y_modulo.remainder,1UL,1UL,*virtual_nexus,
+ exception);
+ r=GetVirtualMetacontentFromNexus(cache_info,*virtual_nexus);
+ break;
+ }
+ case HorizontalTileVirtualPixelMethod:
+ {
+ if (((y+v) < 0) || ((y+v) >= (ssize_t) cache_info->rows))
+ {
+ p=virtual_pixel;
+ r=virtual_associated_pixel;
+ break;
+ }
+ x_modulo=VirtualPixelModulo(x+u,cache_info->columns);
+ y_modulo=VirtualPixelModulo(y+v,cache_info->rows);
+ p=GetVirtualPixelsFromNexus(image,virtual_pixel_method,
+ x_modulo.remainder,y_modulo.remainder,1UL,1UL,*virtual_nexus,
+ exception);
+ r=GetVirtualMetacontentFromNexus(cache_info,*virtual_nexus);
+ break;
+ }
+ case VerticalTileVirtualPixelMethod:
+ {
+ if (((x+u) < 0) || ((x+u) >= (ssize_t) cache_info->columns))
+ {
+ p=virtual_pixel;
+ r=virtual_associated_pixel;
+ break;
+ }
+ x_modulo=VirtualPixelModulo(x+u,cache_info->columns);
+ y_modulo=VirtualPixelModulo(y+v,cache_info->rows);
+ p=GetVirtualPixelsFromNexus(image,virtual_pixel_method,
+ x_modulo.remainder,y_modulo.remainder,1UL,1UL,*virtual_nexus,
+ exception);
+ r=GetVirtualMetacontentFromNexus(cache_info,*virtual_nexus);
break;
}
}
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- *q++=(*p);
- if ((indexes != (IndexPacket *) NULL) &&
- (virtual_indexes != (const IndexPacket *) NULL))
- *indexes++=(*virtual_indexes);
+ (void) memcpy(q,p,(size_t) length*cache_info->pixel_channels*
+ sizeof(*p));
+ q+=cache_info->pixel_channels;
+ if ((s != (void *) NULL) &&
+ (r != (const void *) NULL))
+ {
+ (void) memcpy(s,r,(size_t) cache_info->metacontent_extent);
+ s+=cache_info->metacontent_extent;
+ }
continue;
}
/*
Transfer a run of pixels.
*/
- p=GetVirtualPixelsFromNexus(image,virtual_pixel_method,x+u,y+v,
- (size_t) length,1UL,*virtual_nexus,exception);
- if (p == (const PixelPacket *) NULL)
+ p=GetVirtualPixelsFromNexus(image,virtual_pixel_method,x+u,y+v,(size_t)
+ length,1UL,*virtual_nexus,exception);
+ if (p == (const Quantum *) NULL)
break;
- virtual_indexes=GetVirtualIndexesFromNexus(cache_info,*virtual_nexus);
- (void) memcpy(q,p,(size_t) length*sizeof(*p));
- q+=length;
- if ((indexes != (IndexPacket *) NULL) &&
- (virtual_indexes != (const IndexPacket *) NULL))
+ r=GetVirtualMetacontentFromNexus(cache_info,*virtual_nexus);
+ (void) memcpy(q,p,(size_t) length*cache_info->pixel_channels*sizeof(*p));
+ q+=length*cache_info->pixel_channels;
+ if ((s != (void *) NULL) && (r != (const void *) NULL))
{
- (void) memcpy(indexes,virtual_indexes,(size_t) length*
- sizeof(*virtual_indexes));
- indexes+=length;
+ (void) memcpy(s,r,(size_t) length);
+ s+=length*cache_info->metacontent_extent;
}
}
}
+ /*
+ Free resources.
+ */
+ if (virtual_associated_pixel != (void *) NULL)
+ virtual_associated_pixel=(void *) RelinquishMagickMemory(
+ virtual_associated_pixel);
+ if (virtual_pixel != (Quantum *) NULL)
+ virtual_pixel=(Quantum *) RelinquishMagickMemory(virtual_pixel);
virtual_nexus=DestroyPixelCacheNexus(virtual_nexus,1);
return(pixels);
}
@@ -3561,7 +3526,7 @@
%
% The format of the GetVirtualPixelCache() method is:
%
-% const PixelPacket *GetVirtualPixelCache(const Image *image,
+% const Quantum *GetVirtualPixelCache(const Image *image,
% const VirtualPixelMethod virtual_pixel_method,const ssize_t x,
% const ssize_t y,const size_t columns,const size_t rows,
% ExceptionInfo *exception)
@@ -3578,7 +3543,7 @@
% o exception: return any errors or warnings in this structure.
%
*/
-static const PixelPacket *GetVirtualPixelCache(const Image *image,
+static const Quantum *GetVirtualPixelCache(const Image *image,
const VirtualPixelMethod virtual_pixel_method,const ssize_t x,const ssize_t y,
const size_t columns,const size_t rows,ExceptionInfo *exception)
{
@@ -3588,14 +3553,18 @@
const int
id = GetOpenMPThreadId();
+ const Quantum
+ *pixels;
+
assert(image != (const Image *) NULL);
assert(image->signature == MagickSignature);
assert(image->cache != (Cache) NULL);
cache_info=(CacheInfo *) image->cache;
assert(cache_info->signature == MagickSignature);
assert(id < (int) cache_info->number_threads);
- return(GetVirtualPixelsFromNexus(image,virtual_pixel_method,x,y,columns,rows,
- cache_info->nexus_info[id],exception));
+ pixels=GetVirtualPixelsFromNexus(image,virtual_pixel_method,x,y,columns,rows,
+ cache_info->nexus_info[id],exception);
+ return(pixels);
}
/*
@@ -3609,19 +3578,19 @@
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% GetVirtualPixelQueue() returns the virtual pixels associated with the
-% last call to QueueAuthenticPixels() or GetVirtualPixels().
+% GetVirtualPixelQueue() returns the virtual pixels associated corresponding
+% with the last call to QueueAuthenticPixels() or GetVirtualPixels().
%
% The format of the GetVirtualPixelQueue() method is:
%
-% const PixelPacket *GetVirtualPixelQueue(const Image image)
+% const Quantum *GetVirtualPixelQueue(const Image image)
%
% A description of each parameter follows:
%
% o image: the image.
%
*/
-MagickExport const PixelPacket *GetVirtualPixelQueue(const Image *image)
+MagickExport const Quantum *GetVirtualPixelQueue(const Image *image)
{
CacheInfo
*cache_info;
@@ -3662,10 +3631,10 @@
% returned pointer must *never* be deallocated by the user.
%
% Pixels accessed via the returned pointer represent a simple array of type
-% PixelPacket. If the image type is CMYK or the storage class is PseudoClass,
-% call GetAuthenticIndexQueue() after invoking GetAuthenticPixels() to access
-% the black color component or to obtain the colormap indexes (of type
-% IndexPacket) corresponding to the region.
+% Quantum. If the image type is CMYK or the storage class is PseudoClass,
+% call GetAuthenticMetacontent() after invoking GetAuthenticPixels() to
+% access the meta-content (of type void) corresponding to the the
+% region.
%
% If you plan to modify the pixels, use GetAuthenticPixels() instead.
%
@@ -3675,7 +3644,7 @@
%
% The format of the GetVirtualPixels() method is:
%
-% const PixelPacket *GetVirtualPixels(const Image *image,const ssize_t x,
+% const Quantum *GetVirtualPixels(const Image *image,const ssize_t x,
% const ssize_t y,const size_t columns,const size_t rows,
% ExceptionInfo *exception)
%
@@ -3689,7 +3658,7 @@
% o exception: return any errors or warnings in this structure.
%
*/
-MagickExport const PixelPacket *GetVirtualPixels(const Image *image,
+MagickExport const Quantum *GetVirtualPixels(const Image *image,
const ssize_t x,const ssize_t y,const size_t columns,const size_t rows,
ExceptionInfo *exception)
{
@@ -3699,6 +3668,9 @@
const int
id = GetOpenMPThreadId();
+ const Quantum
+ *pixels;
+
assert(image != (const Image *) NULL);
assert(image->signature == MagickSignature);
assert(image->cache != (Cache) NULL);
@@ -3709,8 +3681,9 @@
return(cache_info->methods.get_virtual_pixel_handler(image,
GetPixelCacheVirtualMethod(image),x,y,columns,rows,exception));
assert(id < (int) cache_info->number_threads);
- return(GetVirtualPixelsFromNexus(image,GetPixelCacheVirtualMethod(image),x,y,
- columns,rows,cache_info->nexus_info[id],exception));
+ pixels=GetVirtualPixelsFromNexus(image,GetPixelCacheVirtualMethod(image),x,y,
+ columns,rows,cache_info->nexus_info[id],exception);
+ return(pixels);
}
/*
@@ -3724,19 +3697,19 @@
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% GetVirtualPixelsCache() returns the pixels associated with the last call
-% to QueueAuthenticPixelsCache() or GetVirtualPixelCache().
+% GetVirtualPixelsCache() returns the pixels associated corresponding with the
+% last call to QueueAuthenticPixelsCache() or GetVirtualPixelCache().
%
% The format of the GetVirtualPixelsCache() method is:
%
-% PixelPacket *GetVirtualPixelsCache(const Image *image)
+% Quantum *GetVirtualPixelsCache(const Image *image)
%
% A description of each parameter follows:
%
% o image: the image.
%
*/
-static const PixelPacket *GetVirtualPixelsCache(const Image *image)
+static const Quantum *GetVirtualPixelsCache(const Image *image)
{
CacheInfo
*cache_info;
@@ -3769,7 +3742,7 @@
%
% The format of the GetVirtualPixelsNexus() method is:
%
-% const IndexPacket *GetVirtualPixelsNexus(const Cache cache,
+% const Quantum *GetVirtualPixelsNexus(const Cache cache,
% NexusInfo *nexus_info)
%
% A description of each parameter follows:
@@ -3779,7 +3752,7 @@
% o nexus_info: the cache nexus to return the colormap pixels.
%
*/
-MagickExport const PixelPacket *GetVirtualPixelsNexus(const Cache cache,
+MagickExport const Quantum *GetVirtualPixelsNexus(const Cache cache,
NexusInfo *nexus_info)
{
CacheInfo
@@ -3789,8 +3762,8 @@
cache_info=(CacheInfo *) cache;
assert(cache_info->signature == MagickSignature);
if (cache_info->storage_class == UndefinedClass)
- return((PixelPacket *) NULL);
- return((const PixelPacket *) nexus_info->pixels);
+ return((Quantum *) NULL);
+ return((const Quantum *) nexus_info->pixels);
}
/*
@@ -3823,14 +3796,14 @@
%
*/
-static inline void MagickPixelCompositeMask(const MagickPixelPacket *p,
- const MagickRealType alpha,const MagickPixelPacket *q,
- const MagickRealType beta,MagickPixelPacket *composite)
+static inline void MagickPixelCompositeMask(const PixelInfo *p,
+ const MagickRealType alpha,const PixelInfo *q,
+ const MagickRealType beta,PixelInfo *composite)
{
MagickRealType
gamma;
- if (alpha == TransparentOpacity)
+ if (alpha == TransparentAlpha)
{
*composite=(*q);
return;
@@ -3841,7 +3814,7 @@
composite->green=gamma*MagickOver_(p->green,alpha,q->green,beta);
composite->blue=gamma*MagickOver_(p->blue,alpha,q->blue,beta);
if ((p->colorspace == CMYKColorspace) && (q->colorspace == CMYKColorspace))
- composite->index=gamma*MagickOver_(p->index,alpha,q->index,beta);
+ composite->black=gamma*MagickOver_(p->black,alpha,q->black,beta);
}
static MagickBooleanType MaskPixelCacheNexus(Image *image,NexusInfo *nexus_info,
@@ -3850,7 +3823,7 @@
CacheInfo
*cache_info;
- MagickPixelPacket
+ PixelInfo
alpha,
beta;
@@ -3861,15 +3834,11 @@
**clip_nexus,
**image_nexus;
- register const PixelPacket
+ register const Quantum
+ *restrict p,
*restrict r;
- register IndexPacket
- *restrict nexus_indexes,
- *restrict indexes;
-
- register PixelPacket
- *restrict p,
+ register Quantum
*restrict q;
register ssize_t
@@ -3890,33 +3859,31 @@
if ((image_nexus == (NexusInfo **) NULL) ||
(clip_nexus == (NexusInfo **) NULL))
ThrowBinaryException(CacheError,"UnableToGetCacheNexus",image->filename);
- p=GetAuthenticPixelCacheNexus(image,nexus_info->region.x,
- nexus_info->region.y,nexus_info->region.width,nexus_info->region.height,
- image_nexus[0],exception);
- indexes=GetPixelCacheNexusIndexes(image->cache,image_nexus[0]);
+ p=(const Quantum *) GetAuthenticPixelCacheNexus(image,
+ nexus_info->region.x,nexus_info->region.y,nexus_info->region.width,
+ nexus_info->region.height,image_nexus[0],exception);
q=nexus_info->pixels;
- nexus_indexes=nexus_info->indexes;
r=GetVirtualPixelsFromNexus(image->mask,MaskVirtualPixelMethod,
nexus_info->region.x,nexus_info->region.y,nexus_info->region.width,
nexus_info->region.height,clip_nexus[0],&image->exception);
- GetMagickPixelPacket(image,&alpha);
- GetMagickPixelPacket(image,&beta);
+ GetPixelInfo(image,&alpha);
+ GetPixelInfo(image,&beta);
number_pixels=(MagickSizeType) nexus_info->region.width*
nexus_info->region.height;
for (i=0; i < (ssize_t) number_pixels; i++)
{
- if ((p == (PixelPacket *) NULL) || (r == (const PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) || (r == (const Quantum *) NULL))
break;
- SetMagickPixelPacket(image,p,indexes+i,&alpha);
- SetMagickPixelPacket(image,q,nexus_indexes+i,&beta);
- MagickPixelCompositeMask(&beta,(MagickRealType) PixelIntensityToQuantum(r),
- &alpha,alpha.opacity,&beta);
- SetPixelRed(q,ClampToQuantum(beta.red));
- SetPixelGreen(q,ClampToQuantum(beta.green));
- SetPixelBlue(q,ClampToQuantum(beta.blue));
- SetPixelOpacity(q,ClampToQuantum(beta.opacity));
- if (cache_info->active_index_channel != MagickFalse)
- SetPixelIndex(nexus_indexes+i,GetPixelIndex(indexes+i));
+ SetPixelInfo(image,p,&alpha);
+ SetPixelInfo(image,q,&beta);
+ MagickPixelCompositeMask(&beta,(MagickRealType) GetPixelIntensity(image,r),
+ &alpha,alpha.alpha,&beta);
+ SetPixelRed(image,ClampToQuantum(beta.red),q);
+ SetPixelGreen(image,ClampToQuantum(beta.green),q);
+ SetPixelBlue(image,ClampToQuantum(beta.blue),q);
+ if (cache_info->colorspace == CMYKColorspace)
+ SetPixelBlack(image,ClampToQuantum(beta.black),q);
+ SetPixelAlpha(image,ClampToQuantum(beta.alpha),q);
p++;
q++;
r++;
@@ -3941,8 +3908,8 @@
%
% OpenPixelCache() allocates the pixel cache. This includes defining the cache
% dimensions, allocating space for the image pixels and optionally the
-% colormap indexes, and memory mapping the cache if it is disk based. The
-% cache nexus array is initialized as well.
+% metacontent, and memory mapping the cache if it is disk based. The cache
+% nexus array is initialized as well.
%
% The format of the OpenPixelCache() method is:
%
@@ -3962,12 +3929,12 @@
static inline void AllocatePixelCachePixels(CacheInfo *cache_info)
{
cache_info->mapped=MagickFalse;
- cache_info->pixels=(PixelPacket *) AcquireMagickMemory((size_t)
+ cache_info->pixels=(Quantum *) AcquireMagickMemory((size_t)
cache_info->length);
- if (cache_info->pixels == (PixelPacket *) NULL)
+ if (cache_info->pixels == (Quantum *) NULL)
{
cache_info->mapped=MagickTrue;
- cache_info->pixels=(PixelPacket *) MapBlob(-1,IOMode,0,(size_t)
+ cache_info->pixels=(Quantum *) MapBlob(-1,IOMode,0,(size_t)
cache_info->length);
}
}
@@ -4018,13 +3985,13 @@
format[MaxTextExtent],
message[MaxTextExtent];
+ MagickBooleanType
+ status;
+
MagickSizeType
length,
number_pixels;
- MagickStatusType
- status;
-
size_t
columns,
packet_size;
@@ -4036,40 +4003,57 @@
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if ((image->columns == 0) || (image->rows == 0))
ThrowBinaryException(CacheError,"NoPixelsDefinedInCache",image->filename);
+ DefinePixelComponentMap(image);
cache_info=(CacheInfo *) image->cache;
assert(cache_info->signature == MagickSignature);
source_info=(*cache_info);
source_info.file=(-1);
(void) FormatLocaleString(cache_info->filename,MaxTextExtent,"%s[%.20g]",
image->filename,(double) GetImageIndexInList(image));
+ cache_info->storage_class=image->storage_class;
+ cache_info->colorspace=image->colorspace;
cache_info->mode=mode;
cache_info->rows=image->rows;
cache_info->columns=image->columns;
- cache_info->channels=image->channels;
- cache_info->active_index_channel=((image->storage_class == PseudoClass) ||
- (image->colorspace == CMYKColorspace)) ? MagickTrue : MagickFalse;
+ cache_info->pixel_channels=GetPixelChannels(image);
+ cache_info->metacontent_extent=image->metacontent_extent;
if (image->ping != MagickFalse)
{
- cache_info->storage_class=image->storage_class;
- cache_info->colorspace=image->colorspace;
cache_info->type=PingCache;
- cache_info->pixels=(PixelPacket *) NULL;
- cache_info->indexes=(IndexPacket *) NULL;
+ cache_info->pixels=(Quantum *) NULL;
+ cache_info->metacontent=(void *) NULL;
cache_info->length=0;
return(MagickTrue);
}
number_pixels=(MagickSizeType) cache_info->columns*cache_info->rows;
- packet_size=sizeof(PixelPacket);
- if (cache_info->active_index_channel != MagickFalse)
- packet_size+=sizeof(IndexPacket);
+ packet_size=cache_info->pixel_channels*sizeof(Quantum);
+ if (image->metacontent_extent != 0)
+ packet_size+=cache_info->metacontent_extent;
length=number_pixels*packet_size;
columns=(size_t) (length/cache_info->rows/packet_size);
if (cache_info->columns != columns)
ThrowBinaryException(ResourceLimitError,"PixelCacheAllocationFailed",
image->filename);
cache_info->length=length;
+ if ((cache_info->type != UndefinedCache) &&
+ (cache_info->columns <= source_info.columns) &&
+ (cache_info->rows <= source_info.rows) &&
+ (cache_info->pixel_channels <= source_info.pixel_channels) &&
+ (cache_info->metacontent_extent <= source_info.metacontent_extent))
+ {
+ /*
+ Inline pixel cache clone optimization.
+ */
+ if ((cache_info->columns == source_info.columns) &&
+ (cache_info->rows == source_info.rows) &&
+ (cache_info->pixel_channels == source_info.pixel_channels) &&
+ (cache_info->metacontent_extent == source_info.metacontent_extent))
+ return(MagickTrue);
+ return(ClonePixelCachePixels(cache_info,&source_info,exception));
+ }
status=AcquireMagickResource(AreaResource,cache_info->length);
- length=number_pixels*(sizeof(PixelPacket)+sizeof(IndexPacket));
+ length=number_pixels*(cache_info->pixel_channels*sizeof(Quantum)+
+ cache_info->metacontent_extent);
if ((status != MagickFalse) && (length == (MagickSizeType) ((size_t) length)))
{
status=AcquireMagickResource(MemoryResource,cache_info->length);
@@ -4077,39 +4061,39 @@
(cache_info->type == MemoryCache))
{
AllocatePixelCachePixels(cache_info);
- if (cache_info->pixels == (PixelPacket *) NULL)
+ if (cache_info->pixels == (Quantum *) NULL)
cache_info->pixels=source_info.pixels;
else
{
/*
Create memory pixel cache.
*/
+ status=MagickTrue;
if (image->debug != MagickFalse)
{
(void) FormatMagickSize(cache_info->length,MagickTrue,
format);
(void) FormatLocaleString(message,MaxTextExtent,
- "open %s (%s memory, %.20gx%.20g %s)",cache_info->filename,
- cache_info->mapped != MagickFalse ? "anonymous" : "heap",
- (double) cache_info->columns,(double) cache_info->rows,
+ "open %s (%s memory, %.20gx%.20gx%.20g %s)",
+ cache_info->filename,cache_info->mapped != MagickFalse ?
+ "anonymous" : "heap",(double) cache_info->columns,(double)
+ cache_info->rows,(double) cache_info->pixel_channels,
format);
(void) LogMagickEvent(CacheEvent,GetMagickModule(),"%s",
message);
}
- cache_info->storage_class=image->storage_class;
- cache_info->colorspace=image->colorspace;
cache_info->type=MemoryCache;
- cache_info->indexes=(IndexPacket *) NULL;
- if (cache_info->active_index_channel != MagickFalse)
- cache_info->indexes=(IndexPacket *) (cache_info->pixels+
- number_pixels);
+ cache_info->metacontent=(void *) NULL;
+ if (cache_info->metacontent_extent != 0)
+ cache_info->metacontent=(void *) (cache_info->pixels+
+ number_pixels*cache_info->pixel_channels);
if (source_info.storage_class != UndefinedClass)
{
- status|=ClonePixelCachePixels(cache_info,&source_info,
+ status=ClonePixelCachePixels(cache_info,&source_info,
exception);
RelinquishPixelCachePixels(&source_info);
}
- return(MagickTrue);
+ return(status);
}
}
RelinquishMagickResource(MemoryResource,cache_info->length);
@@ -4124,6 +4108,12 @@
"CacheResourcesExhausted","`%s'",image->filename);
return(MagickFalse);
}
+ if (cache_info->type == DiskCache)
+ {
+ (void) ClosePixelCacheOnDisk(cache_info);
+ *cache_info->cache_filename='\0';
+ status=DiskToDiskPixelCacheClone(cache_info,&source_info,exception);
+ }
if (OpenPixelCacheOnDisk(cache_info,mode) == MagickFalse)
{
RelinquishMagickResource(DiskResource,cache_info->length);
@@ -4139,9 +4129,8 @@
image->filename);
return(MagickFalse);
}
- cache_info->storage_class=image->storage_class;
- cache_info->colorspace=image->colorspace;
- length=number_pixels*(sizeof(PixelPacket)+sizeof(IndexPacket));
+ length=number_pixels*(cache_info->pixel_channels*sizeof(Quantum)+
+ cache_info->metacontent_extent);
status=AcquireMagickResource(AreaResource,cache_info->length);
if ((status == MagickFalse) || (length != (MagickSizeType) ((size_t) length)))
cache_info->type=DiskCache;
@@ -4153,26 +4142,27 @@
cache_info->type=DiskCache;
else
{
- cache_info->pixels=(PixelPacket *) MapBlob(cache_info->file,mode,
+ cache_info->pixels=(Quantum *) MapBlob(cache_info->file,mode,
cache_info->offset,(size_t) cache_info->length);
- if (cache_info->pixels == (PixelPacket *) NULL)
+ if (cache_info->pixels == (Quantum *) NULL)
{
- cache_info->pixels=source_info.pixels;
cache_info->type=DiskCache;
+ cache_info->pixels=source_info.pixels;
}
else
{
/*
Create file-backed memory-mapped pixel cache.
*/
+ status=MagickTrue;
(void) ClosePixelCacheOnDisk(cache_info);
cache_info->type=MapCache;
cache_info->mapped=MagickTrue;
- cache_info->indexes=(IndexPacket *) NULL;
- if (cache_info->active_index_channel != MagickFalse)
- cache_info->indexes=(IndexPacket *) (cache_info->pixels+
- number_pixels);
- if ((source_info.type != UndefinedCache) && (mode != ReadMode))
+ cache_info->metacontent=(void *) NULL;
+ if (cache_info->metacontent_extent != 0)
+ cache_info->metacontent=(void *) (cache_info->pixels+
+ number_pixels*cache_info->pixel_channels);
+ if (source_info.storage_class != UndefinedClass)
{
status=ClonePixelCachePixels(cache_info,&source_info,
exception);
@@ -4183,18 +4173,20 @@
(void) FormatMagickSize(cache_info->length,MagickTrue,
format);
(void) FormatLocaleString(message,MaxTextExtent,
- "open %s (%s[%d], memory-mapped, %.20gx%.20g %s)",
+ "open %s (%s[%d], memory-mapped, %.20gx%.20gx%.20g %s)",
cache_info->filename,cache_info->cache_filename,
cache_info->file,(double) cache_info->columns,(double)
- cache_info->rows,format);
+ cache_info->rows,(double) cache_info->pixel_channels,
+ format);
(void) LogMagickEvent(CacheEvent,GetMagickModule(),"%s",
message);
}
- return(MagickTrue);
+ return(status);
}
}
RelinquishMagickResource(MapResource,cache_info->length);
}
+ status=MagickTrue;
if ((source_info.type != UndefinedCache) && (mode != ReadMode))
{
status=ClonePixelCachePixels(cache_info,&source_info,exception);
@@ -4204,12 +4196,13 @@
{
(void) FormatMagickSize(cache_info->length,MagickFalse,format);
(void) FormatLocaleString(message,MaxTextExtent,
- "open %s (%s[%d], disk, %.20gx%.20g %s)",cache_info->filename,
+ "open %s (%s[%d], disk, %.20gx%.20gx%.20g %s)",cache_info->filename,
cache_info->cache_filename,cache_info->file,(double)
- cache_info->columns,(double) cache_info->rows,format);
+ cache_info->columns,(double) cache_info->rows,(double)
+ cache_info->pixel_channels,format);
(void) LogMagickEvent(CacheEvent,GetMagickModule(),"%s",message);
}
- return(MagickTrue);
+ return(status);
}
/*
@@ -4362,7 +4355,7 @@
%
% The format of the QueueAuthenticNexus() method is:
%
-% PixelPacket *QueueAuthenticNexus(Image *image,const ssize_t x,
+% Quantum *QueueAuthenticNexus(Image *image,const ssize_t x,
% const ssize_t y,const size_t columns,const size_t rows,
% NexusInfo *nexus_info,ExceptionInfo *exception)
%
@@ -4378,7 +4371,7 @@
% o exception: return any errors or warnings in this structure.
%
*/
-MagickExport PixelPacket *QueueAuthenticNexus(Image *image,const ssize_t x,
+MagickExport Quantum *QueueAuthenticNexus(Image *image,const ssize_t x,
const ssize_t y,const size_t columns,const size_t rows,NexusInfo *nexus_info,
ExceptionInfo *exception)
{
@@ -4403,27 +4396,27 @@
cache_info=(CacheInfo *) GetImagePixelCache(image,MagickTrue,exception);
assert(cache_info->signature == MagickSignature);
if (cache_info == (Cache) NULL)
- return((PixelPacket *) NULL);
+ return((Quantum *) NULL);
if ((cache_info->columns == 0) && (cache_info->rows == 0))
{
(void) ThrowMagickException(exception,GetMagickModule(),CacheError,
"NoPixelsDefinedInCache","`%s'",image->filename);
- return((PixelPacket *) NULL);
+ return((Quantum *) NULL);
}
if ((x < 0) || (y < 0) || (x >= (ssize_t) cache_info->columns) ||
(y >= (ssize_t) cache_info->rows))
{
(void) ThrowMagickException(exception,GetMagickModule(),CacheError,
"PixelsAreNotAuthentic","`%s'",image->filename);
- return((PixelPacket *) NULL);
+ return((Quantum *) NULL);
}
offset=(MagickOffsetType) y*cache_info->columns+x;
if (offset < 0)
- return((PixelPacket *) NULL);
+ return((Quantum *) NULL);
number_pixels=(MagickSizeType) cache_info->columns*cache_info->rows;
offset+=(MagickOffsetType) (rows-1)*cache_info->columns+columns-1;
if ((MagickSizeType) offset >= number_pixels)
- return((PixelPacket *) NULL);
+ return((Quantum *) NULL);
/*
Return pixel cache.
*/
@@ -4453,7 +4446,7 @@
%
% The format of the QueueAuthenticPixelsCache() method is:
%
-% PixelPacket *QueueAuthenticPixelsCache(Image *image,const ssize_t x,
+% Quantum *QueueAuthenticPixelsCache(Image *image,const ssize_t x,
% const ssize_t y,const size_t columns,const size_t rows,
% ExceptionInfo *exception)
%
@@ -4467,7 +4460,7 @@
% o exception: return any errors or warnings in this structure.
%
*/
-static PixelPacket *QueueAuthenticPixelsCache(Image *image,const ssize_t x,
+static Quantum *QueueAuthenticPixelsCache(Image *image,const ssize_t x,
const ssize_t y,const size_t columns,const size_t rows,
ExceptionInfo *exception)
{
@@ -4477,14 +4470,18 @@
const int
id = GetOpenMPThreadId();
+ Quantum
+ *pixels;
+
assert(image != (const Image *) NULL);
assert(image->signature == MagickSignature);
assert(image->cache != (Cache) NULL);
cache_info=(CacheInfo *) image->cache;
assert(cache_info->signature == MagickSignature);
assert(id < (int) cache_info->number_threads);
- return(QueueAuthenticNexus(image,x,y,columns,rows,cache_info->nexus_info[id],
- exception));
+ pixels=QueueAuthenticNexus(image,x,y,columns,rows,cache_info->nexus_info[id],
+ exception);
+ return(pixels);
}
/*
@@ -4499,7 +4496,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
% QueueAuthenticPixels() queues a mutable pixel region. If the region is
-% successfully initialized a pointer to a PixelPacket array representing the
+% successfully initialized a pointer to a Quantum array representing the
% region is returned, otherwise NULL is returned. The returned pointer may
% point to a temporary working buffer for the pixels or it may point to the
% final location of the pixels in memory.
@@ -4520,16 +4517,16 @@
% by the user.
%
% Pixels accessed via the returned pointer represent a simple array of type
-% PixelPacket. If the image type is CMYK or the storage class is PseudoClass,
-% call GetAuthenticIndexQueue() after invoking GetAuthenticPixels() to obtain
-% the black color component or the colormap indexes (of type IndexPacket)
-% corresponding to the region. Once the PixelPacket (and/or IndexPacket)
-% array has been updated, the changes must be saved back to the underlying
-% image using SyncAuthenticPixels() or they may be lost.
+% Quantum. If the image type is CMYK or the storage class is PseudoClass,
+% call GetAuthenticMetacontent() after invoking GetAuthenticPixels() to
+% obtain the meta-content (of type void) corresponding to the region.
+% Once the Quantum (and/or Quantum) array has been updated, the
+% changes must be saved back to the underlying image using
+% SyncAuthenticPixels() or they may be lost.
%
% The format of the QueueAuthenticPixels() method is:
%
-% PixelPacket *QueueAuthenticPixels(Image *image,const ssize_t x,
+% Quantum *QueueAuthenticPixels(Image *image,const ssize_t x,
% const ssize_t y,const size_t columns,const size_t rows,
% ExceptionInfo *exception)
%
@@ -4543,7 +4540,7 @@
% o exception: return any errors or warnings in this structure.
%
*/
-MagickExport PixelPacket *QueueAuthenticPixels(Image *image,const ssize_t x,
+MagickExport Quantum *QueueAuthenticPixels(Image *image,const ssize_t x,
const ssize_t y,const size_t columns,const size_t rows,
ExceptionInfo *exception)
{
@@ -4553,6 +4550,9 @@
const int
id = GetOpenMPThreadId();
+ Quantum
+ *pixels;
+
assert(image != (Image *) NULL);
assert(image->signature == MagickSignature);
assert(image->cache != (Cache) NULL);
@@ -4560,11 +4560,15 @@
assert(cache_info->signature == MagickSignature);
if (cache_info->methods.queue_authentic_pixels_handler !=
(QueueAuthenticPixelsHandler) NULL)
- return(cache_info->methods.queue_authentic_pixels_handler(image,x,y,columns,
- rows,exception));
+ {
+ pixels=cache_info->methods.queue_authentic_pixels_handler(image,x,y,
+ columns,rows,exception);
+ return(pixels);
+ }
assert(id < (int) cache_info->number_threads);
- return(QueueAuthenticNexus(image,x,y,columns,rows,cache_info->nexus_info[id],
- exception));
+ pixels=QueueAuthenticNexus(image,x,y,columns,rows,cache_info->nexus_info[id],
+ exception);
+ return(pixels);
}
/*
@@ -4572,30 +4576,30 @@
% %
% %
% %
-+ R e a d P i x e l C a c h e I n d e x e s %
++ R e a d P i x e l C a c h e M e t a c o n t e n t %
% %
% %
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% ReadPixelCacheIndexes() reads colormap indexes from the specified region of
+% ReadPixelCacheMetacontent() reads metacontent from the specified region of
% the pixel cache.
%
-% The format of the ReadPixelCacheIndexes() method is:
+% The format of the ReadPixelCacheMetacontent() method is:
%
-% MagickBooleanType ReadPixelCacheIndexes(CacheInfo *cache_info,
+% MagickBooleanType ReadPixelCacheMetacontent(CacheInfo *cache_info,
% NexusInfo *nexus_info,ExceptionInfo *exception)
%
% A description of each parameter follows:
%
% o cache_info: the pixel cache.
%
-% o nexus_info: the cache nexus to read the colormap indexes.
+% o nexus_info: the cache nexus to read the metacontent.
%
% o exception: return any errors or warnings in this structure.
%
*/
-static MagickBooleanType ReadPixelCacheIndexes(CacheInfo *cache_info,
+static MagickBooleanType ReadPixelCacheMetacontent(CacheInfo *cache_info,
NexusInfo *nexus_info,ExceptionInfo *exception)
{
MagickOffsetType
@@ -4606,35 +4610,36 @@
extent,
length;
- register IndexPacket
- *restrict q;
-
register ssize_t
y;
+ register unsigned char
+ *restrict q;
+
size_t
rows;
- if (cache_info->active_index_channel == MagickFalse)
+ if (cache_info->metacontent_extent == 0)
return(MagickFalse);
- if (IsNexusInCore(cache_info,nexus_info) != MagickFalse)
+ if (IsPixelAuthentic(cache_info,nexus_info) != MagickFalse)
return(MagickTrue);
offset=(MagickOffsetType) nexus_info->region.y*cache_info->columns+
nexus_info->region.x;
- length=(MagickSizeType) nexus_info->region.width*sizeof(IndexPacket);
+ length=(MagickSizeType) nexus_info->region.width*
+ cache_info->metacontent_extent;
rows=nexus_info->region.height;
extent=length*rows;
- q=nexus_info->indexes;
+ q=(unsigned char *) nexus_info->metacontent;
switch (cache_info->type)
{
case MemoryCache:
case MapCache:
{
- register IndexPacket
+ register unsigned char
*restrict p;
/*
- Read indexes from memory.
+ Read meta-content from memory.
*/
if ((cache_info->columns == nexus_info->region.width) &&
(extent == (MagickSizeType) ((size_t) extent)))
@@ -4642,19 +4647,20 @@
length=extent;
rows=1UL;
}
- p=cache_info->indexes+offset;
+ p=(unsigned char *) cache_info->metacontent+offset*
+ cache_info->metacontent_extent;
for (y=0; y < (ssize_t) rows; y++)
{
(void) memcpy(q,p,(size_t) length);
- p+=cache_info->columns;
- q+=nexus_info->region.width;
+ p+=cache_info->metacontent_extent*cache_info->columns;
+ q+=cache_info->metacontent_extent*nexus_info->region.width;
}
break;
}
case DiskCache:
{
/*
- Read indexes from disk.
+ Read meta content from disk.
*/
if (OpenPixelCacheOnDisk(cache_info,IOMode) == MagickFalse)
{
@@ -4672,11 +4678,12 @@
for (y=0; y < (ssize_t) rows; y++)
{
count=ReadPixelCacheRegion(cache_info,cache_info->offset+extent*
- sizeof(PixelPacket)+offset*sizeof(*q),length,(unsigned char *) q);
- if ((MagickSizeType) count < length)
+ cache_info->pixel_channels*sizeof(Quantum)+offset*
+ cache_info->metacontent_extent,length,(unsigned char *) q);
+ if ((MagickSizeType) count != length)
break;
offset+=cache_info->columns;
- q+=nexus_info->region.width;
+ q+=cache_info->metacontent_extent*nexus_info->region.width;
}
if (y < (ssize_t) rows)
{
@@ -4737,7 +4744,7 @@
extent,
length;
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -4746,11 +4753,12 @@
size_t
rows;
- if (IsNexusInCore(cache_info,nexus_info) != MagickFalse)
+ if (IsPixelAuthentic(cache_info,nexus_info) != MagickFalse)
return(MagickTrue);
offset=(MagickOffsetType) nexus_info->region.y*cache_info->columns+
nexus_info->region.x;
- length=(MagickSizeType) nexus_info->region.width*sizeof(PixelPacket);
+ length=(MagickSizeType) nexus_info->region.width*cache_info->pixel_channels*
+ sizeof(Quantum);
rows=nexus_info->region.height;
extent=length*rows;
q=nexus_info->pixels;
@@ -4759,7 +4767,7 @@
case MemoryCache:
case MapCache:
{
- register PixelPacket
+ register Quantum
*restrict p;
/*
@@ -4771,12 +4779,12 @@
length=extent;
rows=1UL;
}
- p=cache_info->pixels+offset;
+ p=cache_info->pixels+offset*cache_info->pixel_channels;
for (y=0; y < (ssize_t) rows; y++)
{
(void) memcpy(q,p,(size_t) length);
- p+=cache_info->columns;
- q+=nexus_info->region.width;
+ p+=cache_info->pixel_channels*cache_info->columns;
+ q+=cache_info->pixel_channels*nexus_info->region.width;
}
break;
}
@@ -4800,11 +4808,11 @@
for (y=0; y < (ssize_t) rows; y++)
{
count=ReadPixelCacheRegion(cache_info,cache_info->offset+offset*
- sizeof(*q),length,(unsigned char *) q);
- if ((MagickSizeType) count < length)
+ cache_info->pixel_channels*sizeof(*q),length,(unsigned char *) q);
+ if ((MagickSizeType) count != length)
break;
offset+=cache_info->columns;
- q+=nexus_info->region.width;
+ q+=cache_info->pixel_channels*nexus_info->region.width;
}
if (y < (ssize_t) rows)
{
@@ -4914,10 +4922,10 @@
if (cache_methods->destroy_pixel_handler != (DestroyPixelHandler) NULL)
cache_info->methods.destroy_pixel_handler=
cache_methods->destroy_pixel_handler;
- if (cache_methods->get_virtual_indexes_from_handler !=
- (GetVirtualIndexesFromHandler) NULL)
- cache_info->methods.get_virtual_indexes_from_handler=
- cache_methods->get_virtual_indexes_from_handler;
+ if (cache_methods->get_virtual_metacontent_from_handler !=
+ (GetVirtualMetacontentFromHandler) NULL)
+ cache_info->methods.get_virtual_metacontent_from_handler=
+ cache_methods->get_virtual_metacontent_from_handler;
if (cache_methods->get_authentic_pixels_handler !=
(GetAuthenticPixelsHandler) NULL)
cache_info->methods.get_authentic_pixels_handler=
@@ -4934,10 +4942,10 @@
(GetAuthenticPixelsFromHandler) NULL)
cache_info->methods.get_authentic_pixels_from_handler=
cache_methods->get_authentic_pixels_from_handler;
- if (cache_methods->get_authentic_indexes_from_handler !=
- (GetAuthenticIndexesFromHandler) NULL)
- cache_info->methods.get_authentic_indexes_from_handler=
- cache_methods->get_authentic_indexes_from_handler;
+ if (cache_methods->get_authentic_metacontent_from_handler !=
+ (GetAuthenticMetacontentFromHandler) NULL)
+ cache_info->methods.get_authentic_metacontent_from_handler=
+ cache_methods->get_authentic_metacontent_from_handler;
get_one_virtual_pixel_from_handler=
cache_info->methods.get_one_virtual_pixel_from_handler;
if (get_one_virtual_pixel_from_handler !=
@@ -4968,7 +4976,7 @@
%
% The format of the SetPixelCacheNexusPixels() method is:
%
-% PixelPacket SetPixelCacheNexusPixels(const Image *image,
+% Quantum SetPixelCacheNexusPixels(const Image *image,
% const RectangleInfo *region,NexusInfo *nexus_info,
% ExceptionInfo *exception)
%
@@ -4991,15 +4999,15 @@
if (nexus_info->length != (MagickSizeType) ((size_t) nexus_info->length))
return(MagickFalse);
nexus_info->mapped=MagickFalse;
- nexus_info->cache=(PixelPacket *) AcquireMagickMemory((size_t)
+ nexus_info->cache=(Quantum *) AcquireMagickMemory((size_t)
nexus_info->length);
- if (nexus_info->cache == (PixelPacket *) NULL)
+ if (nexus_info->cache == (Quantum *) NULL)
{
nexus_info->mapped=MagickTrue;
- nexus_info->cache=(PixelPacket *) MapBlob(-1,IOMode,0,(size_t)
+ nexus_info->cache=(Quantum *) MapBlob(-1,IOMode,0,(size_t)
nexus_info->length);
}
- if (nexus_info->cache == (PixelPacket *) NULL)
+ if (nexus_info->cache == (Quantum *) NULL)
{
(void) ThrowMagickException(exception,GetMagickModule(),
ResourceLimitError,"MemoryAllocationFailed","`%s'",
@@ -5009,7 +5017,7 @@
return(MagickTrue);
}
-static PixelPacket *SetPixelCacheNexusPixels(const Image *image,
+static Quantum *SetPixelCacheNexusPixels(const Image *image,
const RectangleInfo *region,NexusInfo *nexus_info,ExceptionInfo *exception)
{
CacheInfo
@@ -5025,7 +5033,7 @@
cache_info=(CacheInfo *) image->cache;
assert(cache_info->signature == MagickSignature);
if (cache_info->type == UndefinedCache)
- return((PixelPacket *) NULL);
+ return((Quantum *) NULL);
nexus_info->region=(*region);
if ((cache_info->type != DiskCache) && (cache_info->type != PingCache) &&
(image->clip_mask == (Image *) NULL) && (image->mask == (Image *) NULL))
@@ -5050,10 +5058,12 @@
*/
offset=(MagickOffsetType) nexus_info->region.y*cache_info->columns+
nexus_info->region.x;
- nexus_info->pixels=cache_info->pixels+offset;
- nexus_info->indexes=(IndexPacket *) NULL;
- if (cache_info->active_index_channel != MagickFalse)
- nexus_info->indexes=cache_info->indexes+offset;
+ nexus_info->pixels=cache_info->pixels+cache_info->pixel_channels*
+ offset;
+ nexus_info->metacontent=(void *) NULL;
+ if (cache_info->metacontent_extent != 0)
+ nexus_info->metacontent=(unsigned char *) cache_info->metacontent+
+ offset*cache_info->metacontent_extent;
return(nexus_info->pixels);
}
}
@@ -5062,17 +5072,17 @@
*/
number_pixels=(MagickSizeType) nexus_info->region.width*
nexus_info->region.height;
- length=number_pixels*sizeof(PixelPacket);
- if (cache_info->active_index_channel != MagickFalse)
- length+=number_pixels*sizeof(IndexPacket);
- if (nexus_info->cache == (PixelPacket *) NULL)
+ length=number_pixels*cache_info->pixel_channels*sizeof(Quantum);
+ if (cache_info->metacontent_extent != 0)
+ length+=number_pixels*cache_info->metacontent_extent;
+ if (nexus_info->cache == (Quantum *) NULL)
{
nexus_info->length=length;
status=AcquireCacheNexusPixels(cache_info,nexus_info,exception);
if (status == MagickFalse)
{
nexus_info->length=0;
- return((PixelPacket *) NULL);
+ return((Quantum *) NULL);
}
}
else
@@ -5084,13 +5094,14 @@
if (status == MagickFalse)
{
nexus_info->length=0;
- return((PixelPacket *) NULL);
+ return((Quantum *) NULL);
}
}
nexus_info->pixels=nexus_info->cache;
- nexus_info->indexes=(IndexPacket *) NULL;
- if (cache_info->active_index_channel != MagickFalse)
- nexus_info->indexes=(IndexPacket *) (nexus_info->pixels+number_pixels);
+ nexus_info->metacontent=(void *) NULL;
+ if (cache_info->metacontent_extent != 0)
+ nexus_info->metacontent=(void *) (nexus_info->pixels+number_pixels*
+ cache_info->pixel_channels);
return(nexus_info->pixels);
}
@@ -5197,12 +5208,12 @@
if ((image->mask != (Image *) NULL) &&
(MaskPixelCacheNexus(image,nexus_info,exception) == MagickFalse))
return(MagickFalse);
- if (IsNexusInCore(cache_info,nexus_info) != MagickFalse)
+ if (IsPixelAuthentic(cache_info,nexus_info) != MagickFalse)
return(MagickTrue);
assert(cache_info->signature == MagickSignature);
status=WritePixelCachePixels(cache_info,nexus_info,exception);
- if ((cache_info->active_index_channel != MagickFalse) &&
- (WritePixelCacheIndexes(cache_info,nexus_info,exception) == MagickFalse))
+ if ((cache_info->metacontent_extent != 0) &&
+ (WritePixelCacheMetacontent(cache_info,nexus_info,exception) == MagickFalse))
return(MagickFalse);
return(status);
}
@@ -5243,14 +5254,18 @@
const int
id = GetOpenMPThreadId();
+ MagickBooleanType
+ status;
+
assert(image != (Image *) NULL);
assert(image->signature == MagickSignature);
assert(image->cache != (Cache) NULL);
cache_info=(CacheInfo *) image->cache;
assert(cache_info->signature == MagickSignature);
assert(id < (int) cache_info->number_threads);
- return(SyncAuthenticPixelCacheNexus(image,cache_info->nexus_info[id],
- exception));
+ status=SyncAuthenticPixelCacheNexus(image,cache_info->nexus_info[id],
+ exception);
+ return(status);
}
/*
@@ -5289,6 +5304,9 @@
const int
id = GetOpenMPThreadId();
+ MagickBooleanType
+ status;
+
assert(image != (Image *) NULL);
assert(image->signature == MagickSignature);
assert(image->cache != (Cache) NULL);
@@ -5296,10 +5314,15 @@
assert(cache_info->signature == MagickSignature);
if (cache_info->methods.sync_authentic_pixels_handler !=
(SyncAuthenticPixelsHandler) NULL)
- return(cache_info->methods.sync_authentic_pixels_handler(image,exception));
+ {
+ status=cache_info->methods.sync_authentic_pixels_handler(image,
+ exception);
+ return(status);
+ }
assert(id < (int) cache_info->number_threads);
- return(SyncAuthenticPixelCacheNexus(image,cache_info->nexus_info[id],
- exception));
+ status=SyncAuthenticPixelCacheNexus(image,cache_info->nexus_info[id],
+ exception);
+ return(status);
}
/*
@@ -5307,30 +5330,30 @@
% %
% %
% %
-+ W r i t e P i x e l C a c h e I n d e x e s %
++ W r i t e P i x e l C a c h e M e t a c o n t e n t %
% %
% %
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% WritePixelCacheIndexes() writes the colormap indexes to the specified
-% region of the pixel cache.
+% WritePixelCacheMetacontent() writes the meta-content to the specified region
+% of the pixel cache.
%
-% The format of the WritePixelCacheIndexes() method is:
+% The format of the WritePixelCacheMetacontent() method is:
%
-% MagickBooleanType WritePixelCacheIndexes(CacheInfo *cache_info,
+% MagickBooleanType WritePixelCacheMetacontent(CacheInfo *cache_info,
% NexusInfo *nexus_info,ExceptionInfo *exception)
%
% A description of each parameter follows:
%
% o cache_info: the pixel cache.
%
-% o nexus_info: the cache nexus to write the colormap indexes.
+% o nexus_info: the cache nexus to write the meta-content.
%
% o exception: return any errors or warnings in this structure.
%
*/
-static MagickBooleanType WritePixelCacheIndexes(CacheInfo *cache_info,
+static MagickBooleanType WritePixelCacheMetacontent(CacheInfo *cache_info,
NexusInfo *nexus_info,ExceptionInfo *exception)
{
MagickOffsetType
@@ -5341,7 +5364,7 @@
extent,
length;
- register const IndexPacket
+ register const unsigned char
*restrict p;
register ssize_t
@@ -5350,26 +5373,27 @@
size_t
rows;
- if (cache_info->active_index_channel == MagickFalse)
+ if (cache_info->metacontent_extent == 0)
return(MagickFalse);
- if (IsNexusInCore(cache_info,nexus_info) != MagickFalse)
+ if (IsPixelAuthentic(cache_info,nexus_info) != MagickFalse)
return(MagickTrue);
offset=(MagickOffsetType) nexus_info->region.y*cache_info->columns+
nexus_info->region.x;
- length=(MagickSizeType) nexus_info->region.width*sizeof(IndexPacket);
+ length=(MagickSizeType) nexus_info->region.width*
+ cache_info->metacontent_extent;
rows=nexus_info->region.height;
extent=(MagickSizeType) length*rows;
- p=nexus_info->indexes;
+ p=(unsigned char *) nexus_info->metacontent;
switch (cache_info->type)
{
case MemoryCache:
case MapCache:
{
- register IndexPacket
+ register unsigned char
*restrict q;
/*
- Write indexes to memory.
+ Write associated pixels to memory.
*/
if ((cache_info->columns == nexus_info->region.width) &&
(extent == (MagickSizeType) ((size_t) extent)))
@@ -5377,19 +5401,20 @@
length=extent;
rows=1UL;
}
- q=cache_info->indexes+offset;
+ q=(unsigned char *) cache_info->metacontent+offset*
+ cache_info->metacontent_extent;
for (y=0; y < (ssize_t) rows; y++)
{
(void) memcpy(q,p,(size_t) length);
- p+=nexus_info->region.width;
- q+=cache_info->columns;
+ p+=nexus_info->region.width*cache_info->metacontent_extent;
+ q+=cache_info->columns*cache_info->metacontent_extent;
}
break;
}
case DiskCache:
{
/*
- Write indexes to disk.
+ Write associated pixels to disk.
*/
if (OpenPixelCacheOnDisk(cache_info,IOMode) == MagickFalse)
{
@@ -5407,11 +5432,11 @@
for (y=0; y < (ssize_t) rows; y++)
{
count=WritePixelCacheRegion(cache_info,cache_info->offset+extent*
- sizeof(PixelPacket)+offset*sizeof(*p),length,(const unsigned char *)
- p);
- if ((MagickSizeType) count < length)
+ cache_info->pixel_channels*sizeof(Quantum)+offset*
+ cache_info->metacontent_extent,length,(const unsigned char *) p);
+ if ((MagickSizeType) count != length)
break;
- p+=nexus_info->region.width;
+ p+=nexus_info->region.width*cache_info->metacontent_extent;
offset+=cache_info->columns;
}
if (y < (ssize_t) rows)
@@ -5473,7 +5498,7 @@
extent,
length;
- register const PixelPacket
+ register const Quantum
*restrict p;
register ssize_t
@@ -5482,11 +5507,12 @@
size_t
rows;
- if (IsNexusInCore(cache_info,nexus_info) != MagickFalse)
+ if (IsPixelAuthentic(cache_info,nexus_info) != MagickFalse)
return(MagickTrue);
offset=(MagickOffsetType) nexus_info->region.y*cache_info->columns+
nexus_info->region.x;
- length=(MagickSizeType) nexus_info->region.width*sizeof(PixelPacket);
+ length=(MagickSizeType) nexus_info->region.width*cache_info->pixel_channels*
+ sizeof(Quantum);
rows=nexus_info->region.height;
extent=length*rows;
p=nexus_info->pixels;
@@ -5495,7 +5521,7 @@
case MemoryCache:
case MapCache:
{
- register PixelPacket
+ register Quantum
*restrict q;
/*
@@ -5507,12 +5533,12 @@
length=extent;
rows=1UL;
}
- q=cache_info->pixels+offset;
+ q=cache_info->pixels+offset*cache_info->pixel_channels;
for (y=0; y < (ssize_t) rows; y++)
{
(void) memcpy(q,p,(size_t) length);
- p+=nexus_info->region.width;
- q+=cache_info->columns;
+ p+=nexus_info->region.width*cache_info->pixel_channels;
+ q+=cache_info->columns*cache_info->pixel_channels;
}
break;
}
@@ -5536,10 +5562,11 @@
for (y=0; y < (ssize_t) rows; y++)
{
count=WritePixelCacheRegion(cache_info,cache_info->offset+offset*
- sizeof(*p),length,(const unsigned char *) p);
- if ((MagickSizeType) count < length)
+ cache_info->pixel_channels*sizeof(*p),length,(const unsigned char *)
+ p);
+ if ((MagickSizeType) count != length)
break;
- p+=nexus_info->region.width;
+ p+=nexus_info->region.width*cache_info->pixel_channels;
offset+=cache_info->columns;
}
if (y < (ssize_t) rows)
diff --git a/magick/cache.h b/MagickCore/cache.h
similarity index 88%
rename from magick/cache.h
rename to MagickCore/cache.h
index ad5abfb..2b8ed2b 100644
--- a/magick/cache.h
+++ b/MagickCore/cache.h
@@ -22,26 +22,21 @@
extern "C" {
#endif
-#include "magick/blob.h"
+#include "MagickCore/blob.h"
-extern MagickExport const IndexPacket
- *GetVirtualIndexQueue(const Image *);
-
-extern MagickExport const PixelPacket
+extern MagickExport const Quantum
*GetVirtualPixels(const Image *,const ssize_t,const ssize_t,const size_t,
const size_t,ExceptionInfo *),
*GetVirtualPixelQueue(const Image *);
extern MagickExport const void
- *AcquirePixelCachePixels(const Image *,MagickSizeType *,ExceptionInfo *);
-
-extern MagickExport IndexPacket
- *GetAuthenticIndexQueue(const Image *);
+ *AcquirePixelCachePixels(const Image *,MagickSizeType *,ExceptionInfo *),
+ *GetVirtualMetacontent(const Image *);
extern MagickExport MagickBooleanType
CacheComponentGenesis(void),
GetOneVirtualMagickPixel(const Image *,const ssize_t,const ssize_t,
- MagickPixelPacket *,ExceptionInfo *),
+ PixelInfo *,ExceptionInfo *),
GetOneVirtualPixel(const Image *,const ssize_t,const ssize_t,PixelPacket *,
ExceptionInfo *),
GetOneVirtualMethodPixel(const Image *,const VirtualPixelMethod,const ssize_t,
@@ -55,7 +50,7 @@
extern MagickExport MagickSizeType
GetImageExtent(const Image *);
-extern MagickExport PixelPacket
+extern MagickExport Quantum
*GetAuthenticPixels(Image *,const ssize_t,const ssize_t,const size_t,
const size_t,ExceptionInfo *),
*GetAuthenticPixelQueue(const Image *),
@@ -68,6 +63,7 @@
extern MagickExport void
CacheComponentTerminus(void),
+ *GetAuthenticMetacontent(const Image *),
*GetPixelCachePixels(Image *,MagickSizeType *,ExceptionInfo *);
#if defined(__cplusplus) || defined(c_plusplus)
diff --git a/magick/cipher.c b/MagickCore/cipher.c
similarity index 97%
rename from magick/cipher.c
rename to MagickCore/cipher.c
index 34d8d52..bbc8bee 100644
--- a/magick/cipher.c
+++ b/MagickCore/cipher.c
@@ -38,26 +38,26 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/cache.h"
-#include "magick/cipher.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/hashmap.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/property.h"
-#include "magick/quantum-private.h"
-#include "magick/registry.h"
-#include "magick/semaphore.h"
-#include "magick/signature-private.h"
-#include "magick/splay-tree.h"
-#include "magick/statistic.h"
-#include "magick/string_.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/cipher.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/hashmap.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/property.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/registry.h"
+#include "MagickCore/semaphore.h"
+#include "MagickCore/signature-private.h"
+#include "MagickCore/splay-tree.h"
+#include "MagickCore/statistic.h"
+#include "MagickCore/string_.h"
#if defined(MAGICKCORE_CIPHER_SUPPORT)
/*
@@ -647,11 +647,11 @@
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
length=ExportQuantumPixels(image,image_view,quantum_info,quantum_type,
pixels,exception);
@@ -853,11 +853,11 @@
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
length=ExportQuantumPixels(image,image_view,quantum_info,quantum_type,
pixels,exception);
diff --git a/magick/cipher.h b/MagickCore/cipher.h
similarity index 100%
rename from magick/cipher.h
rename to MagickCore/cipher.h
diff --git a/magick/client.c b/MagickCore/client.c
similarity index 98%
rename from magick/client.c
rename to MagickCore/client.c
index 4ce2090..a625df4 100644
--- a/magick/client.c
+++ b/MagickCore/client.c
@@ -39,9 +39,9 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/client.h"
-#include "magick/string_.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/client.h"
+#include "MagickCore/string_.h"
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/magick/client.h b/MagickCore/client.h
similarity index 100%
rename from magick/client.h
rename to MagickCore/client.h
diff --git a/magick/coder.c b/MagickCore/coder.c
similarity index 97%
rename from magick/coder.c
rename to MagickCore/coder.c
index 7eb93c0..ae27c58 100644
--- a/magick/coder.c
+++ b/MagickCore/coder.c
@@ -39,24 +39,24 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/client.h"
-#include "magick/coder.h"
-#include "magick/configure.h"
-#include "magick/draw.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/hashmap.h"
-#include "magick/log.h"
-#include "magick/memory_.h"
-#include "magick/option.h"
-#include "magick/semaphore.h"
-#include "magick/string_.h"
-#include "magick/splay-tree.h"
-#include "magick/token.h"
-#include "magick/utility.h"
-#include "magick/xml-tree.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/client.h"
+#include "MagickCore/coder.h"
+#include "MagickCore/configure.h"
+#include "MagickCore/draw.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/hashmap.h"
+#include "MagickCore/log.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/option.h"
+#include "MagickCore/semaphore.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/splay-tree.h"
+#include "MagickCore/token.h"
+#include "MagickCore/utility.h"
+#include "MagickCore/xml-tree.h"
/*
Define declarations.
diff --git a/magick/coder.h b/MagickCore/coder.h
similarity index 94%
rename from magick/coder.h
rename to MagickCore/coder.h
index b608d14..2d993bc 100644
--- a/magick/coder.h
+++ b/MagickCore/coder.h
@@ -33,10 +33,6 @@
exempt,
stealth;
- struct _CoderInfo
- *previous,
- *next; /* deprecated, use GetCoderInfoList() */
-
size_t
signature;
} CoderInfo;
diff --git a/magick/accelerate.h b/MagickCore/color-private.h
similarity index 73%
copy from magick/accelerate.h
copy to MagickCore/color-private.h
index c575667..63ba296 100644
--- a/magick/accelerate.h
+++ b/MagickCore/color-private.h
@@ -13,21 +13,15 @@
See the License for the specific language governing permissions and
limitations under the License.
- MagickCore acceleration methods.
+ MagickCore image color methods.
*/
-#ifndef _MAGICKCORE_ACCELERATE_H
-#define _MAGICKCORE_ACCELERATE_H
+#ifndef _MAGICKCORE_COLOR_PRIVATE_H
+#define _MAGICKCORE_COLOR_PRIVATE_H
#if defined(__cplusplus) || defined(c_plusplus)
extern "C" {
#endif
-#include <magick/morphology.h>
-
-extern MagickExport MagickBooleanType
- AccelerateConvolveImage(const Image *,const KernelInfo *,Image *,
- ExceptionInfo *);
-
#if defined(__cplusplus) || defined(c_plusplus)
}
#endif
diff --git a/magick/color.c b/MagickCore/color.c
similarity index 87%
rename from magick/color.c
rename to MagickCore/color.c
index ee02edb..84e1ff4 100644
--- a/magick/color.c
+++ b/MagickCore/color.c
@@ -40,31 +40,32 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/cache-view.h"
-#include "magick/cache.h"
-#include "magick/color.h"
-#include "magick/color-private.h"
-#include "magick/client.h"
-#include "magick/configure.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/gem.h"
-#include "magick/geometry.h"
-#include "magick/image-private.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/option.h"
-#include "magick/pixel-private.h"
-#include "magick/quantize.h"
-#include "magick/quantum.h"
-#include "magick/semaphore.h"
-#include "magick/string_.h"
-#include "magick/token.h"
-#include "magick/utility.h"
-#include "magick/xml-tree.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/cache-view.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/color.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/client.h"
+#include "MagickCore/configure.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/gem.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/option.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantize.h"
+#include "MagickCore/quantum.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/semaphore.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/token.h"
+#include "MagickCore/utility.h"
+#include "MagickCore/xml-tree.h"
/*
Define declarations.
@@ -1002,7 +1003,7 @@
%
% The format of the ConcatenateColorComponent() method is:
%
-% void ConcatenateColorComponent(const MagickPixelPacket *pixel,
+% void ConcatenateColorComponent(const PixelInfo *pixel,
% const ChannelType channel,const ComplianceType compliance,char *tuple)
%
% A description of each parameter follows.
@@ -1016,7 +1017,7 @@
% tuple: The color tuple.
%
*/
-MagickExport void ConcatenateColorComponent(const MagickPixelPacket *pixel,
+MagickExport void ConcatenateColorComponent(const PixelInfo *pixel,
const ChannelType channel,const ComplianceType compliance,char *tuple)
{
char
@@ -1045,12 +1046,12 @@
}
case AlphaChannel:
{
- color=QuantumRange-pixel->opacity;
+ color=pixel->alpha;
break;
}
- case IndexChannel:
+ case BlackChannel:
{
- color=pixel->index;
+ color=pixel->black;
break;
}
default:
@@ -1077,7 +1078,7 @@
(void) ConcatenateMagickString(tuple,component,MaxTextExtent);
return;
}
- if (channel == OpacityChannel)
+ if (channel == AlphaChannel)
{
(void) FormatLocaleString(component,MaxTextExtent,"%g",
(double) (QuantumScale*color));
@@ -1308,7 +1309,7 @@
%
% The format of the GetColorTuple method is:
%
-% GetColorTuple(const MagickPixelPacket *pixel,const MagickBooleanType hex,
+% GetColorTuple(const PixelInfo *pixel,const MagickBooleanType hex,
% char *tuple)
%
% A description of each parameter follows.
@@ -1321,7 +1322,7 @@
%
*/
-static void ConcatentateHexColorComponent(const MagickPixelPacket *pixel,
+static void ConcatentateHexColorComponent(const PixelInfo *pixel,
const ChannelType channel,char *tuple)
{
char
@@ -1348,14 +1349,14 @@
color=pixel->blue;
break;
}
- case OpacityChannel:
+ case AlphaChannel:
{
- color=(MagickRealType) QuantumRange-pixel->opacity;
+ color=pixel->alpha;
break;
}
- case IndexChannel:
+ case BlackChannel:
{
- color=pixel->index;
+ color=pixel->black;
break;
}
default:
@@ -1389,13 +1390,13 @@
return;
}
-MagickExport void GetColorTuple(const MagickPixelPacket *pixel,
+MagickExport void GetColorTuple(const PixelInfo *pixel,
const MagickBooleanType hex,char *tuple)
{
- MagickPixelPacket
+ PixelInfo
color;
- assert(pixel != (const MagickPixelPacket *) NULL);
+ assert(pixel != (const PixelInfo *) NULL);
assert(tuple != (char *) NULL);
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",tuple);
*tuple='\0';
@@ -1409,9 +1410,9 @@
ConcatentateHexColorComponent(pixel,GreenChannel,tuple);
ConcatentateHexColorComponent(pixel,BlueChannel,tuple);
if (pixel->colorspace == CMYKColorspace)
- ConcatentateHexColorComponent(pixel,IndexChannel,tuple);
- if ((pixel->matte != MagickFalse) && (pixel->opacity != OpaqueOpacity))
- ConcatentateHexColorComponent(pixel,OpacityChannel,tuple);
+ ConcatentateHexColorComponent(pixel,BlackChannel,tuple);
+ if ((pixel->matte != MagickFalse) && (pixel->alpha != OpaqueAlpha))
+ ConcatentateHexColorComponent(pixel,AlphaChannel,tuple);
return;
}
/*
@@ -1432,10 +1433,10 @@
status=color.red == SVGCompliant(color.red);
status&=color.green == SVGCompliant(color.green);
status&=color.blue == SVGCompliant(color.blue);
- if (color.colorspace != CMYKColorspace)
- status&=color.index == SVGCompliant(color.index);
+ if (color.colorspace == CMYKColorspace)
+ status&=color.black == SVGCompliant(color.black);
if (color.matte != MagickFalse)
- status&=color.opacity == SVGCompliant(color.opacity);
+ status&=color.alpha == SVGCompliant(color.alpha);
if (status != MagickFalse)
color.depth=8;
}
@@ -1452,7 +1453,7 @@
if (color.colorspace == CMYKColorspace)
{
(void) ConcatenateMagickString(tuple,",",MaxTextExtent);
- ConcatenateColorComponent(&color,IndexChannel,SVGCompliance,tuple);
+ ConcatenateColorComponent(&color,BlackChannel,SVGCompliance,tuple);
}
if (color.matte != MagickFalse)
{
@@ -1510,20 +1511,19 @@
% %
% %
% %
-+ I s C o l o r S i m i l a r %
++ I s A l p h a S i m i l a r %
% %
% %
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% IsColorSimilar() returns MagickTrue if the distance between two colors is
-% less than the specified distance in a linear three dimensional color space.
-% This method is used by ColorFloodFill() and other algorithms which
-% compare two colors.
+% IsEquivalentAlpha() returns true if the distance between two alpha values is
+% less than the specified distance in a linear color space. This method is
+% used by MatteFloodFill() and other algorithms which compare two alpha values.
%
-% The format of the IsColorSimilar method is:
+% The format of the IsEquivalentAlpha method is:
%
-% void IsColorSimilar(const Image *image,const PixelPacket *p,
+% void IsEquivalentAlpha(const Image *image,const PixelPacket *p,
% const PixelPacket *q)
%
% A description of each parameter follows:
@@ -1543,7 +1543,7 @@
return(y);
}
-MagickExport MagickBooleanType IsColorSimilar(const Image *image,
+MagickExport MagickBooleanType IsEquivalentAlpha(const Image *image,
const PixelPacket *p,const PixelPacket *q)
{
MagickRealType
@@ -1551,61 +1551,15 @@
pixel;
register MagickRealType
- distance,
- scale;
+ distance;
- if ((image->fuzz == 0.0) && (image->matte == MagickFalse))
- return(IsColorEqual(p,q));
+ if (image->matte == MagickFalse)
+ return(MagickTrue);
+ if (p->alpha == q->alpha)
+ return(MagickTrue);
fuzz=MagickMax(image->fuzz,MagickSQ1_2)*MagickMax(image->fuzz,MagickSQ1_2);
- scale=1.0;
- distance=0.0;
- if (image->matte != MagickFalse)
- {
- /*
- Transparencies are involved - set alpha distance
- */
- pixel=(MagickRealType) ((image->matte != MagickFalse ? GetPixelOpacity(p) :
- OpaqueOpacity)-(image->matte != MagickFalse ? q->opacity :
- OpaqueOpacity));
- 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*GetPixelAlpha(p));
- scale*=(QuantumScale*GetPixelAlpha(q));
- if (scale <= MagickEpsilon)
- return(MagickTrue);
- }
- /*
- RGB or CMY color cube
- */
- distance*=3.0; /* rescale appropriately */
- fuzz*=3.0;
- pixel=(MagickRealType) GetPixelRed(p)-GetPixelRed(q);
- if ((image->colorspace == HSLColorspace) ||
- (image->colorspace == HSBColorspace) ||
- (image->colorspace == HWBColorspace))
- {
- /* This calculates a arc distance for hue. Really if should be a vector
- angle of 'S'/'W' length with 'L'/'B' forming appropriate cones. In
- other words this is a hack - Anthony
- */
- if (fabs((double) pixel) > (QuantumRange/2))
- pixel-=QuantumRange;
- pixel*=2;
- }
- distance+=scale*pixel*pixel;
- if (distance > fuzz)
- return(MagickFalse);
- pixel=(MagickRealType) GetPixelGreen(p)-q->green;
- distance+=scale*pixel*pixel;
- if (distance > fuzz)
- return(MagickFalse);
- pixel=(MagickRealType) GetPixelBlue(p)-q->blue;
- distance+=scale*pixel*pixel;
+ pixel=(MagickRealType) p->alpha-(MagickRealType) q->alpha;
+ distance=pixel*pixel;
if (distance > fuzz)
return(MagickFalse);
return(MagickTrue);
@@ -1622,12 +1576,12 @@
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% IsImageSimilar() returns true if the target is similar to a region of the
+% IsEquivalentImage() returns true if the target is similar to a region of the
% image.
%
-% The format of the IsImageSimilar method is:
+% The format of the IsEquivalentImage method is:
%
-% MagickBooleanType IsImageSimilar(const Image *image,
+% MagickBooleanType IsEquivalentImage(const Image *image,
% const Image *target_image,ssize_t *x_offset,ssize_t *y_offset,
% ExceptionInfo *exception)
%
@@ -1646,7 +1600,7 @@
% o exception: return any errors or warnings in this structure.
%
*/
-MagickExport MagickBooleanType IsImageSimilar(const Image *image,
+MagickExport MagickBooleanType IsEquivalentImage(const Image *image,
const Image *target_image,ssize_t *x_offset,ssize_t *y_offset,
ExceptionInfo *exception)
{
@@ -1659,18 +1613,14 @@
MagickBooleanType
status;
- MagickPixelPacket
+ PixelInfo
target,
pixel;
- register const PixelPacket
+ register const Quantum
*p,
*q;
- register const IndexPacket
- *indexes,
- *target_indexes;
-
register ssize_t
i,
x;
@@ -1690,8 +1640,8 @@
assert(exception != (ExceptionInfo *) NULL);
x=0;
status=MagickTrue;
- GetMagickPixelPacket(image,&pixel);
- GetMagickPixelPacket(image,&target);
+ GetPixelInfo(image,&pixel);
+ GetPixelInfo(image,&target);
image_view=AcquireCacheView(image);
target_view=AcquireCacheView(target_image);
for (y=(*y_offset); y < (ssize_t) image->rows; y++)
@@ -1703,12 +1653,10 @@
for (i=0; i < (ssize_t) target_image->columns; i++)
{
p=GetCacheViewVirtualPixels(image_view,x+i,y+j,1,1,exception);
- indexes=GetCacheViewVirtualIndexQueue(image_view);
- SetMagickPixelPacket(image,p,indexes,&pixel);
+ SetPixelInfo(image,p,&pixel);
q=GetCacheViewVirtualPixels(target_view,i,j,1,1,exception);
- target_indexes=GetCacheViewVirtualIndexQueue(target_view);
- SetMagickPixelPacket(image,q,target_indexes,&target);
- if (IsMagickColorSimilar(&pixel,&target) == MagickFalse)
+ SetPixelInfo(image,q,&target);
+ if (IsFuzzyEquivalencePixelInfo(&pixel,&target) == MagickFalse)
break;
}
if (i < (ssize_t) target_image->columns)
@@ -1744,189 +1692,6 @@
% %
% %
% %
-+ I s M a g i c k C o l o r S i m i l a r %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% IsMagickColorSimilar() returns true if the distance between two colors is
-% less than the specified distance in a linear three dimensional color space.
-% This method is used by ColorFloodFill() and other algorithms which
-% compare two colors.
-%
-% This implements the equivalent of...
-% fuzz < sqrt( color_distance^2 * u.a*v.a + alpha_distance^2 )
-%
-% Which produces a multi-dimensional cone for that colorspace along the
-% transparency vector.
-%
-% For example for an RGB
-% color_distance^2 = ( (u.r-v.r)^2 + (u.g-v.g)^2 + (u.b-v.b)^2 ) / 3
-%
-% See http://www.imagemagick.org/Usage/bugs/fuzz_distance/
-%
-% Hue colorspace distances need more work. Hue is not a distance, it is an
-% angle!
-%
-% A check that q is in the same color space as p should be made and the
-% appropriate mapping made. -- Anthony Thyssen 8 December 2010
-%
-% The format of the IsMagickColorSimilar method is:
-%
-% MagickBooleanType IsMagickColorSimilar(const MagickPixelPacket *p,
-% const MagickPixelPacket *q)
-%
-% A description of each parameter follows:
-%
-% o p: Pixel p.
-%
-% o q: Pixel q.
-%
-*/
-MagickExport MagickBooleanType IsMagickColorSimilar(const MagickPixelPacket *p,
- const MagickPixelPacket *q)
-{
- MagickRealType
- fuzz,
- pixel;
-
- register MagickRealType
- scale,
- distance;
-
- if ((p->fuzz == 0.0) && (q->fuzz == 0.0))
- return(IsMagickColorEqual(p,q));
- if (p->fuzz == 0.0)
- fuzz=MagickMax(q->fuzz,MagickSQ1_2)*MagickMax(q->fuzz,MagickSQ1_2);
- else if (q->fuzz == 0.0)
- fuzz=MagickMax(p->fuzz,MagickSQ1_2)*MagickMax(p->fuzz,MagickSQ1_2);
- else
- fuzz=MagickMax(p->fuzz,MagickSQ1_2)*MagickMax(q->fuzz,MagickSQ1_2);
- scale=1.0;
- distance=0.0;
- if ((p->matte != MagickFalse) || (q->matte != MagickFalse))
- {
- /*
- Transparencies are involved - set alpha distance.
- */
- pixel=(p->matte != MagickFalse ? GetPixelOpacity(p) :
- OpaqueOpacity)-(q->matte != MagickFalse ? q->opacity : OpaqueOpacity);
- 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
- */
- if (p->matte != MagickFalse)
- scale=(QuantumScale*GetPixelAlpha(p));
- if (q->matte != MagickFalse)
- scale*=(QuantumScale*GetPixelAlpha(q));
- if ( scale <= MagickEpsilon )
- return(MagickTrue);
- }
- /*
- CMYK create a CMY cube with a multi-dimensional cone toward black.
- */
- if (p->colorspace == CMYKColorspace)
- {
- pixel=p->index-q->index;
- distance+=pixel*pixel*scale;
- if (distance > fuzz)
- return(MagickFalse);
- scale*=(MagickRealType) (QuantumScale*(QuantumRange-p->index));
- scale*=(MagickRealType) (QuantumScale*(QuantumRange-q->index));
- }
- /*
- RGB or CMY color cube.
- */
- distance*=3.0; /* rescale appropriately */
- fuzz*=3.0;
- pixel=p->red-q->red;
- if ((p->colorspace == HSLColorspace) || (p->colorspace == HSBColorspace) ||
- (p->colorspace == HWBColorspace))
- {
- /* This calculates a arc distance for hue
- Really if should be a vector angle of 'S'/'W' length
- with 'L'/'B' forming appropriate cones.
- In other words this is a hack - Anthony
- */
- if (fabs((double) pixel) > (QuantumRange/2))
- pixel-=QuantumRange;
- pixel*=2;
- }
- distance+=pixel*pixel*scale;
- if (distance > fuzz)
- return(MagickFalse);
- pixel=GetPixelGreen(p)-q->green;
- distance+=pixel*pixel*scale;
- if (distance > fuzz)
- return(MagickFalse);
- pixel=GetPixelBlue(p)-q->blue;
- distance+=pixel*pixel*scale;
- if (distance > fuzz)
- return(MagickFalse);
- return(MagickTrue);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-+ I s O p a c i t y S i m i l a r %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% IsOpacitySimilar() returns true if the distance between two opacity
-% values is less than the specified distance in a linear color space. This
-% method is used by MatteFloodFill() and other algorithms which compare
-% two opacity values.
-%
-% The format of the IsOpacitySimilar method is:
-%
-% void IsOpacitySimilar(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 IsOpacitySimilar(const Image *image,
- const PixelPacket *p,const PixelPacket *q)
-{
- MagickRealType
- fuzz,
- pixel;
-
- register MagickRealType
- distance;
-
- if (image->matte == MagickFalse)
- return(MagickTrue);
- if (GetPixelOpacity(p) == q->opacity)
- return(MagickTrue);
- fuzz=MagickMax(image->fuzz,MagickSQ1_2)*MagickMax(image->fuzz,MagickSQ1_2);
- pixel=(MagickRealType) GetPixelOpacity(p)-(MagickRealType) q->opacity;
- distance=pixel*pixel;
- if (distance > fuzz)
- return(MagickFalse);
- return(MagickTrue);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
% L i s t C o l o r I n f o %
% %
% %
@@ -2302,15 +2067,11 @@
(void) ResetMagickMemory(color_info,0,sizeof(*color_info));
color_info->path=(char *) "[built-in]";
color_info->name=(char *) p->name;
- GetMagickPixelPacket((Image *) NULL,&color_info->color);
- color_info->color.red=(MagickRealType) ScaleCharToQuantum(
- GetPixelRed(p));
- color_info->color.green=(MagickRealType) ScaleCharToQuantum(
- GetPixelGreen(p));
- color_info->color.blue=(MagickRealType) ScaleCharToQuantum(
- GetPixelBlue(p));
- color_info->color.opacity=(MagickRealType) (QuantumRange-QuantumRange*
- p->alpha);
+ GetPixelInfo((Image *) NULL,&color_info->color);
+ color_info->color.red=(MagickRealType) ScaleCharToQuantum(p->red);
+ color_info->color.green=(MagickRealType) ScaleCharToQuantum(p->green);
+ color_info->color.blue=(MagickRealType) ScaleCharToQuantum(p->blue);
+ color_info->color.alpha=(MagickRealType) (QuantumRange*p->alpha);
color_info->compliance=(ComplianceType) p->compliance;
color_info->exempt=MagickTrue;
color_info->signature=MagickSignature;
@@ -2380,27 +2141,30 @@
MagickBooleanType
status;
- MagickPixelPacket
+ PixelInfo
pixel;
status=QueryMagickColorCompliance(name,compliance,&pixel,exception);
- SetPixelOpacity(color,ClampToQuantum(pixel.opacity));
+ color->alpha=ClampToQuantum(pixel.alpha);
if (pixel.colorspace == CMYKColorspace)
{
- SetPixelRed(color,ClampToQuantum((MagickRealType)
+ color->red=ClampToQuantum((MagickRealType)
(QuantumRange-MagickMin(QuantumRange,(MagickRealType) (QuantumScale*
- pixel.red*(QuantumRange-pixel.index)+pixel.index)))));
- SetPixelGreen(color,ClampToQuantum((MagickRealType)
+ pixel.red*(QuantumRange-pixel.black)+pixel.black))));
+ color->green=ClampToQuantum((MagickRealType)
(QuantumRange-MagickMin(QuantumRange,(MagickRealType) (QuantumScale*
- pixel.green*(QuantumRange-pixel.index)+pixel.index)))));
- SetPixelBlue(color,ClampToQuantum((MagickRealType)
+ pixel.green*(QuantumRange-pixel.black)+pixel.black))));
+ color->blue=ClampToQuantum((MagickRealType)
(QuantumRange-MagickMin(QuantumRange,(MagickRealType) (QuantumScale*
- pixel.blue*(QuantumRange-pixel.index)+pixel.index)))));
+ pixel.blue*(QuantumRange-pixel.black)+pixel.black))));
+ color->black=ClampToQuantum((MagickRealType)
+ (QuantumRange-MagickMin(QuantumRange,(MagickRealType) (QuantumScale*
+ pixel.black*(QuantumRange-pixel.black)+pixel.black))));
return(status);
}
- SetPixelRed(color,ClampToQuantum(pixel.red));
- SetPixelGreen(color,ClampToQuantum(pixel.green));
- SetPixelBlue(color,ClampToQuantum(pixel.blue));
+ color->red=ClampToQuantum(pixel.red);
+ color->green=ClampToQuantum(pixel.green);
+ color->blue=ClampToQuantum(pixel.blue);
return(status);
}
@@ -2476,11 +2240,11 @@
const PixelPacket *color,const ComplianceType compliance,char *name,
ExceptionInfo *exception)
{
- MagickPixelPacket
+ PixelInfo
pixel;
- GetMagickPixelPacket(image,&pixel);
- SetMagickPixelPacket(image,color,(IndexPacket *) NULL,&pixel);
+ GetPixelInfo(image,&pixel);
+ SetPixelInfoPacket(image,color,&pixel);
return(QueryMagickColorname(image,&pixel,compliance,name,exception));
}
@@ -2495,13 +2259,13 @@
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% QueryMagickColorCompliance() returns the red, green, blue, and opacity
+% QueryMagickColorCompliance() returns the red, green, blue, and alpha
% intensities for a given color name and standards compliance.
%
% The format of the QueryMagickColor method is:
%
% MagickBooleanType QueryMagickColor(const char *name,
-% const ComplianceType compliance,MagickPixelPacket *color,
+% const ComplianceType compliance,PixelInfo *color,
% ExceptionInfo *exception)
%
% A description of each parameter follows:
@@ -2517,7 +2281,7 @@
%
*/
MagickExport MagickBooleanType QueryMagickColorCompliance(const char *name,
- const ComplianceType compliance,MagickPixelPacket *color,
+ const ComplianceType compliance,PixelInfo *color,
ExceptionInfo *exception)
{
GeometryInfo
@@ -2543,8 +2307,8 @@
*/
assert(name != (const char *) NULL);
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",name);
- assert(color != (MagickPixelPacket *) NULL);
- GetMagickPixelPacket((Image *) NULL,color);
+ assert(color != (PixelInfo *) NULL);
+ GetPixelInfo((Image *) NULL,color);
if ((name == (char *) NULL) || (*name == '\0'))
name=BackgroundColor;
while (isspace((int) ((unsigned char) *name)) != 0)
@@ -2607,20 +2371,20 @@
{
pixel.red=pixel.green;
pixel.green=pixel.blue;
- pixel.blue=pixel.opacity;
- pixel.opacity=0;
+ pixel.blue=pixel.alpha;
+ pixel.alpha=0;
for (i=(ssize_t) (n/4-1); i >= 0; i--)
{
c=(*name++);
- pixel.opacity<<=4;
+ pixel.alpha<<=4;
if ((c >= '0') && (c <= '9'))
- pixel.opacity|=(int) (c-'0');
+ pixel.alpha|=(int) (c-'0');
else
if ((c >= 'A') && (c <= 'F'))
- pixel.opacity|=(int) c-((int) 'A'-10);
+ pixel.alpha|=(int) c-((int) 'A'-10);
else
if ((c >= 'a') && (c <= 'f'))
- pixel.opacity|=(int) c-((int) 'a'-10);
+ pixel.alpha|=(int) c-((int) 'a'-10);
else
return(MagickFalse);
}
@@ -2633,14 +2397,13 @@
color->red=(MagickRealType) ScaleAnyToQuantum(pixel.red,range);
color->green=(MagickRealType) ScaleAnyToQuantum(pixel.green,range);
color->blue=(MagickRealType) ScaleAnyToQuantum(pixel.blue,range);
- color->opacity=(MagickRealType) OpaqueOpacity;
+ color->alpha=(MagickRealType) OpaqueAlpha;
if ((n % 3) != 0)
{
color->matte=MagickTrue;
- color->opacity=(MagickRealType) (QuantumRange-ScaleAnyToQuantum(
- pixel.opacity,range));
+ color->alpha=(MagickRealType) ScaleAnyToQuantum(pixel.alpha,range);
}
- color->index=0.0;
+ color->black=0.0;
return(MagickTrue);
}
if (strchr(name,'(') != (char *) NULL)
@@ -2682,27 +2445,27 @@
color->green=(MagickRealType) ClampToQuantum(scale*geometry_info.sigma);
if ((flags & XiValue) != 0)
color->blue=(MagickRealType) ClampToQuantum(scale*geometry_info.xi);
- color->opacity=(MagickRealType) OpaqueOpacity;
+ color->alpha=(MagickRealType) OpaqueAlpha;
if ((flags & PsiValue) != 0)
{
if (color->colorspace == CMYKColorspace)
- color->index=(MagickRealType) ClampToQuantum(scale*
+ color->black=(MagickRealType) ClampToQuantum(scale*
geometry_info.psi);
else
if (color->matte != MagickFalse)
- color->opacity=(MagickRealType) ClampToQuantum((MagickRealType)
- (QuantumRange-QuantumRange*geometry_info.psi));
+ color->alpha=(MagickRealType) ClampToQuantum((MagickRealType)
+ QuantumRange*geometry_info.psi);
}
if (((flags & ChiValue) != 0) && (color->matte != MagickFalse))
- color->opacity=(MagickRealType) ClampToQuantum((MagickRealType)
- (QuantumRange-QuantumRange*geometry_info.chi));
+ color->alpha=(MagickRealType) ClampToQuantum((MagickRealType)
+ QuantumRange*geometry_info.chi);
if (LocaleCompare(colorspace,"gray") == 0)
{
color->green=color->red;
color->blue=color->red;
if (((flags & SigmaValue) != 0) && (color->matte != MagickFalse))
- color->opacity=(MagickRealType) ClampToQuantum((MagickRealType)
- (QuantumRange-QuantumRange*geometry_info.sigma));
+ color->alpha=(MagickRealType) ClampToQuantum((MagickRealType)
+ QuantumRange*geometry_info.sigma);
}
if ((LocaleCompare(colorspace,"HSB") == 0) ||
(LocaleCompare(colorspace,"HSL") == 0) ||
@@ -2747,12 +2510,12 @@
if (p == (const ColorInfo *) NULL)
return(MagickFalse);
color->colorspace=RGBColorspace;
- color->matte=p->color.opacity != OpaqueOpacity ? MagickTrue : MagickFalse;
+ color->matte=p->color.alpha != OpaqueAlpha ? MagickTrue : MagickFalse;
color->red=(MagickRealType) p->color.red;
color->green=(MagickRealType) p->color.green;
color->blue=(MagickRealType) p->color.blue;
- color->opacity=(MagickRealType) p->color.opacity;
- color->index=0.0;
+ color->alpha=(MagickRealType) p->color.alpha;
+ color->black=0.0;
return(MagickTrue);
}
@@ -2773,7 +2536,7 @@
% The format of the QueryMagickColor method is:
%
% MagickBooleanType QueryMagickColor(const char *name,
-% MagickPixelPacket *color,ExceptionInfo *exception)
+% PixelInfo *color,ExceptionInfo *exception)
%
% A description of each parameter follows:
%
@@ -2786,7 +2549,7 @@
%
*/
MagickExport MagickBooleanType QueryMagickColor(const char *name,
- MagickPixelPacket *color,ExceptionInfo *exception)
+ PixelInfo *color,ExceptionInfo *exception)
{
return(QueryMagickColorCompliance(name,AllCompliance,color,exception));
}
@@ -2827,10 +2590,10 @@
%
*/
MagickExport MagickBooleanType QueryMagickColorname(const Image *image,
- const MagickPixelPacket *color,const ComplianceType compliance,
+ const PixelInfo *color,const ComplianceType compliance,
char *name,ExceptionInfo *exception)
{
- MagickPixelPacket
+ PixelInfo
pixel;
MagickRealType
@@ -2850,13 +2613,13 @@
name);
(void) GetColorInfo("*",exception);
ResetLinkedListIterator(color_list);
- opacity=image->matte != MagickFalse ? color->opacity : OpaqueOpacity;
+ opacity=image->matte != MagickFalse ? color->alpha : OpaqueAlpha;
p=(const ColorInfo *) GetNextValueInLinkedList(color_list);
while (p != (const ColorInfo *) NULL)
{
if (((p->compliance & compliance) != 0) && ((p->color.red == color->red)) &&
(p->color.green == color->green) && (p->color.blue == color->blue) &&
- (p->color.opacity == opacity))
+ (p->color.alpha == opacity))
{
(void) CopyMagickString(name,p->name,MaxTextExtent);
break;
diff --git a/magick/color.h b/MagickCore/color.h
similarity index 70%
rename from magick/color.h
rename to MagickCore/color.h
index 81b5d09..b6bcafe 100644
--- a/magick/color.h
+++ b/MagickCore/color.h
@@ -22,8 +22,8 @@
extern "C" {
#endif
-#include <magick/pixel.h>
-#include <magick/exception.h>
+#include <MagickCore/pixel.h>
+#include <MagickCore/exception.h>
typedef enum
{
@@ -44,17 +44,13 @@
ComplianceType
compliance;
- MagickPixelPacket
+ PixelInfo
color;
MagickBooleanType
exempt,
stealth;
- struct _ColorInfo
- *previous,
- *next; /* deprecated, use GetColorInfoList() */
-
size_t
signature;
} ColorInfo;
@@ -76,31 +72,26 @@
extern MagickExport MagickBooleanType
ColorComponentGenesis(void),
- IsColorSimilar(const Image *,const PixelPacket *,const PixelPacket *),
- IsGrayImage(const Image *,ExceptionInfo *),
- IsImageSimilar(const Image *,const Image *,ssize_t *x,ssize_t *y,
+ IsEquivalentAlpha(const Image *,const PixelPacket *,const PixelPacket *),
+ IsEquivalentImage(const Image *,const Image *,ssize_t *x,ssize_t *y,
ExceptionInfo *),
- IsMagickColorSimilar(const MagickPixelPacket *,const MagickPixelPacket *),
- IsMonochromeImage(const Image *,ExceptionInfo *),
- IsOpacitySimilar(const Image *,const PixelPacket *,const PixelPacket *),
- IsOpaqueImage(const Image *,ExceptionInfo *),
ListColorInfo(FILE *,ExceptionInfo *),
QueryColorCompliance(const char *,const ComplianceType,PixelPacket *,
ExceptionInfo *),
QueryColorDatabase(const char *,PixelPacket *,ExceptionInfo *),
QueryColorname(const Image *,const PixelPacket *,const ComplianceType,char *,
ExceptionInfo *),
+ QueryMagickColor(const char *,PixelInfo *,ExceptionInfo *),
QueryMagickColorCompliance(const char *,const ComplianceType,
- MagickPixelPacket *,ExceptionInfo *),
- QueryMagickColor(const char *,MagickPixelPacket *,ExceptionInfo *),
- QueryMagickColorname(const Image *,const MagickPixelPacket *,
+ PixelInfo *,ExceptionInfo *),
+ QueryMagickColorname(const Image *,const PixelInfo *,
const ComplianceType,char *,ExceptionInfo *);
extern MagickExport void
ColorComponentTerminus(void),
- ConcatenateColorComponent(const MagickPixelPacket *,const ChannelType,
+ ConcatenateColorComponent(const PixelInfo *,const ChannelType,
const ComplianceType,char *),
- GetColorTuple(const MagickPixelPacket *,const MagickBooleanType,char *);
+ GetColorTuple(const PixelInfo *,const MagickBooleanType,char *);
#if defined(__cplusplus) || defined(c_plusplus)
}
diff --git a/magick/colormap-private.h b/MagickCore/colormap-private.h
similarity index 81%
rename from magick/colormap-private.h
rename to MagickCore/colormap-private.h
index 1102eda..8953148 100644
--- a/magick/colormap-private.h
+++ b/MagickCore/colormap-private.h
@@ -22,18 +22,17 @@
extern "C" {
#endif
-#include <magick/image.h>
-#include <magick/color.h>
-#include <magick/exception-private.h>
+#include <MagickCore/image.h>
+#include <MagickCore/color.h>
+#include <MagickCore/exception-private.h>
-static inline IndexPacket ConstrainColormapIndex(Image *image,
- const size_t index)
+static inline Quantum ConstrainColormapIndex(Image *image,const size_t index)
{
if (index < image->colors)
- return((IndexPacket) index);
+ return((Quantum) index);
(void) ThrowMagickException(&image->exception,GetMagickModule(),
CorruptImageError,"InvalidColormapIndex","`%s'",image->filename);
- return((IndexPacket) 0);
+ return((Quantum) 0);
}
#if defined(__cplusplus) || defined(c_plusplus)
diff --git a/magick/colormap.c b/MagickCore/colormap.c
similarity index 86%
rename from magick/colormap.c
rename to MagickCore/colormap.c
index bc24068..42be2fc 100644
--- a/magick/colormap.c
+++ b/MagickCore/colormap.c
@@ -41,32 +41,32 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/cache-view.h"
-#include "magick/cache.h"
-#include "magick/color.h"
-#include "magick/color-private.h"
-#include "magick/colormap.h"
-#include "magick/client.h"
-#include "magick/configure.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/gem.h"
-#include "magick/geometry.h"
-#include "magick/image-private.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/option.h"
-#include "magick/pixel-private.h"
-#include "magick/quantize.h"
-#include "magick/quantum.h"
-#include "magick/semaphore.h"
-#include "magick/string_.h"
-#include "magick/token.h"
-#include "magick/utility.h"
-#include "magick/xml-tree.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/cache-view.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/color.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colormap.h"
+#include "MagickCore/client.h"
+#include "MagickCore/configure.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/gem.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/option.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantize.h"
+#include "MagickCore/quantum.h"
+#include "MagickCore/semaphore.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/token.h"
+#include "MagickCore/utility.h"
+#include "MagickCore/xml-tree.h"
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -149,7 +149,7 @@
image->colormap[i].red=(Quantum) pixel;
image->colormap[i].green=(Quantum) pixel;
image->colormap[i].blue=(Quantum) pixel;
- image->colormap[i].opacity=OpaqueOpacity;
+ image->colormap[i].alpha=OpaqueAlpha;
}
return(SetImageStorageClass(image,PseudoClass));
}
@@ -209,13 +209,10 @@
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- register IndexPacket
- *restrict indexes;
-
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
ssize_t
@@ -224,21 +221,19 @@
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
- index=(ssize_t) (GetPixelIndex(indexes+x)+displace) %
- image->colors;
+ index=(ssize_t) (GetPixelIndex(image,q)+displace) % image->colors;
if (index < 0)
index+=(ssize_t) image->colors;
- SetPixelIndex(indexes+x,index);
- SetPixelRGBO(q,image->colormap+(ssize_t) index);
- q++;
+ SetPixelIndex(image,(Quantum) index,q);
+ SetPixelPacket(image,image->colormap+(ssize_t) index,q);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -286,8 +281,8 @@
color_1=(const PixelPacket *) x;
color_2=(const PixelPacket *) y;
- intensity=(int) PixelIntensityToQuantum(color_2)-
- (int) PixelIntensityToQuantum(color_1);
+ intensity=(int) GetPixelPacketIntensity(color_2)-(int)
+ GetPixelPacketIntensity(color_1);
return(intensity);
}
@@ -336,7 +331,7 @@
#pragma omp parallel for schedule(dynamic,4) shared(status)
#endif
for (i=0; i < (ssize_t) image->colors; i++)
- image->colormap[i].opacity=(IndexPacket) i;
+ image->colormap[i].alpha=(Quantum) i;
/*
Sort image colormap by decreasing color popularity.
*/
@@ -349,37 +344,33 @@
#pragma omp parallel for schedule(dynamic,4) shared(status)
#endif
for (i=0; i < (ssize_t) image->colors; i++)
- pixels[(ssize_t) image->colormap[i].opacity]=(unsigned short) i;
+ pixels[(ssize_t) image->colormap[i].alpha]=(unsigned short) i;
status=MagickTrue;
exception=(&image->exception);
image_view=AcquireCacheView(image);
for (y=0; y < (ssize_t) image->rows; y++)
{
- IndexPacket
+ Quantum
index;
register ssize_t
x;
- register IndexPacket
- *restrict indexes;
-
- register PixelPacket
+ register Quantum
*restrict q;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
- index=(IndexPacket) pixels[(ssize_t) GetPixelIndex(indexes+x)];
- SetPixelIndex(indexes+x,index);
- SetPixelRGBO(q,image->colormap+(ssize_t) index);
- q++;
+ index=(Quantum) pixels[(ssize_t) GetPixelIndex(image,q)];
+ SetPixelIndex(image,index,q);
+ SetPixelPacket(image,image->colormap+(ssize_t) index,q);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
diff --git a/magick/colormap.h b/MagickCore/colormap.h
similarity index 100%
rename from magick/colormap.h
rename to MagickCore/colormap.h
diff --git a/magick/colorspace-private.h b/MagickCore/colorspace-private.h
similarity index 90%
rename from magick/colorspace-private.h
rename to MagickCore/colorspace-private.h
index c262cd5..6933411 100644
--- a/magick/colorspace-private.h
+++ b/MagickCore/colorspace-private.h
@@ -22,8 +22,8 @@
extern "C" {
#endif
-#include <magick/image-private.h>
-#include <magick/pixel.h>
+#include <MagickCore/image-private.h>
+#include <MagickCore/pixel.h>
static inline MagickBooleanType IsGrayColorspace(
const ColorspaceType colorspace)
@@ -34,7 +34,7 @@
return(MagickFalse);
}
-static inline void ConvertRGBToCMYK(MagickPixelPacket *pixel)
+static inline void ConvertRGBToCMYK(PixelInfo *pixel)
{
MagickRealType
black,
@@ -44,7 +44,7 @@
if ((pixel->red == 0) && (pixel->green == 0) && (pixel->blue == 0))
{
- pixel->index=(MagickRealType) QuantumRange;
+ pixel->black=(MagickRealType) QuantumRange;
return;
}
cyan=(MagickRealType) (1.0-QuantumScale*pixel->red);
@@ -62,7 +62,7 @@
pixel->red=QuantumRange*cyan;
pixel->green=QuantumRange*magenta;
pixel->blue=QuantumRange*yellow;
- pixel->index=QuantumRange*black;
+ pixel->black=QuantumRange*black;
}
#if defined(__cplusplus) || defined(c_plusplus)
diff --git a/magick/colorspace.c b/MagickCore/colorspace.c
similarity index 90%
rename from magick/colorspace.c
rename to MagickCore/colorspace.c
index 730717c..bdcd743 100644
--- a/magick/colorspace.c
+++ b/MagickCore/colorspace.c
@@ -39,29 +39,30 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/property.h"
-#include "magick/cache.h"
-#include "magick/cache-private.h"
-#include "magick/cache-view.h"
-#include "magick/color.h"
-#include "magick/color-private.h"
-#include "magick/colorspace.h"
-#include "magick/colorspace-private.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/gem.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/pixel-private.h"
-#include "magick/quantize.h"
-#include "magick/quantum.h"
-#include "magick/string_.h"
-#include "magick/string-private.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/property.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/cache-private.h"
+#include "MagickCore/cache-view.h"
+#include "MagickCore/color.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/colorspace-private.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/gem.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantize.h"
+#include "MagickCore/quantum.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/string-private.h"
+#include "MagickCore/utility.h"
/*
Typedef declarations.
@@ -255,27 +256,27 @@
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelRed(q,ClampToQuantum((MagickRealType)
- (QuantumRange-GetPixelRed(q))));
- SetPixelGreen(q,ClampToQuantum((MagickRealType)
- (QuantumRange-GetPixelGreen(q))));
- SetPixelBlue(q,ClampToQuantum((MagickRealType)
- (QuantumRange-GetPixelBlue(q))));
- q++;
+ SetPixelRed(image,ClampToQuantum((MagickRealType) (QuantumRange-
+ GetPixelRed(image,q))),q);
+ SetPixelGreen(image,ClampToQuantum((MagickRealType) (QuantumRange-
+ GetPixelGreen(image,q))),q);
+ SetPixelBlue(image,ClampToQuantum((MagickRealType) (QuantumRange-
+ GetPixelBlue(image,q))),q);
+ q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
if (sync == MagickFalse)
@@ -288,7 +289,7 @@
}
case CMYKColorspace:
{
- MagickPixelPacket
+ PixelInfo
zero;
/*
@@ -301,42 +302,38 @@
if (SetImageStorageClass(image,DirectClass) == MagickFalse)
return(MagickFalse);
}
- GetMagickPixelPacket(image,&zero);
+ GetPixelInfo(image,&zero);
image_view=AcquireCacheView(image);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(dynamic,4) shared(status)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- MagickPixelPacket
+ PixelInfo
pixel;
- register IndexPacket
- *restrict indexes;
-
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
pixel=zero;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetMagickPixelPacket(image,q,indexes+x,&pixel);
+ SetPixelInfo(image,q,&pixel);
ConvertRGBToCMYK(&pixel);
- SetPixelPacket(image,&pixel,q,indexes+x);
- q++;
+ SetPixelPixelInfo(image,&pixel,q);
+ q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
if (sync == MagickFalse)
@@ -373,14 +370,14 @@
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
@@ -390,15 +387,15 @@
brightness=0.0;
for (x=0; x < (ssize_t) image->columns; x++)
{
- ConvertRGBToHSB(GetPixelRed(q),GetPixelGreen(q),
- GetPixelBlue(q),&hue,&saturation,&brightness);
- SetPixelRed(q,ClampToQuantum((MagickRealType)
- QuantumRange*hue));
- SetPixelGreen(q,ClampToQuantum((MagickRealType)
- QuantumRange*saturation));
- SetPixelBlue(q,ClampToQuantum((MagickRealType)
- QuantumRange*brightness));
- q++;
+ ConvertRGBToHSB(GetPixelRed(image,q),GetPixelGreen(image,q),
+ GetPixelBlue(image,q),&hue,&saturation,&brightness);
+ SetPixelRed(image,ClampToQuantum((MagickRealType) QuantumRange*
+ hue),q);
+ SetPixelGreen(image,ClampToQuantum((MagickRealType) QuantumRange*
+ saturation),q);
+ SetPixelBlue(image,ClampToQuantum((MagickRealType) QuantumRange*
+ brightness),q);
+ q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
if (sync == MagickFalse)
@@ -433,14 +430,14 @@
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
@@ -450,15 +447,15 @@
lightness=0.0;
for (x=0; x < (ssize_t) image->columns; x++)
{
- ConvertRGBToHSL(GetPixelRed(q),GetPixelGreen(q),
- GetPixelBlue(q),&hue,&saturation,&lightness);
- SetPixelRed(q,ClampToQuantum((MagickRealType)
- QuantumRange*hue));
- SetPixelGreen(q,ClampToQuantum((MagickRealType)
- QuantumRange*saturation));
- SetPixelBlue(q,ClampToQuantum((MagickRealType)
- QuantumRange*lightness));
- q++;
+ ConvertRGBToHSL(GetPixelRed(image,q),GetPixelGreen(image,q),
+ GetPixelBlue(image,q),&hue,&saturation,&lightness);
+ SetPixelRed(image,ClampToQuantum((MagickRealType) QuantumRange*
+ hue),q);
+ SetPixelGreen(image,ClampToQuantum((MagickRealType) QuantumRange*
+ saturation),q);
+ SetPixelBlue(image,ClampToQuantum((MagickRealType) QuantumRange*
+ lightness),q);
+ q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
if (sync == MagickFalse)
@@ -493,14 +490,14 @@
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
@@ -510,15 +507,15 @@
blackness=0.0;
for (x=0; x < (ssize_t) image->columns; x++)
{
- ConvertRGBToHWB(GetPixelRed(q),GetPixelGreen(q),
- GetPixelBlue(q),&hue,&whiteness,&blackness);
- SetPixelRed(q,ClampToQuantum((MagickRealType)
- QuantumRange*hue));
- SetPixelGreen(q,ClampToQuantum((MagickRealType)
- QuantumRange*whiteness));
- SetPixelBlue(q,ClampToQuantum((MagickRealType)
- QuantumRange*blackness));
- q++;
+ ConvertRGBToHWB(GetPixelRed(image,q),GetPixelGreen(image,q),
+ GetPixelBlue(image,q),&hue,&whiteness,&blackness);
+ SetPixelRed(image,ClampToQuantum((MagickRealType) QuantumRange*
+ hue),q);
+ SetPixelGreen(image,ClampToQuantum((MagickRealType) QuantumRange*
+ whiteness),q);
+ SetPixelBlue(image,ClampToQuantum((MagickRealType) QuantumRange*
+ blackness),q);
+ q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
if (sync == MagickFalse)
@@ -556,14 +553,14 @@
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
@@ -576,16 +573,16 @@
Z=0.0;
for (x=0; x < (ssize_t) image->columns; x++)
{
- ConvertRGBToXYZ(GetPixelRed(q),GetPixelGreen(q),
- GetPixelBlue(q),&X,&Y,&Z);
+ ConvertRGBToXYZ(GetPixelRed(image,q),GetPixelGreen(image,q),
+ GetPixelBlue(image,q),&X,&Y,&Z);
ConvertXYZToLab(X,Y,Z,&L,&a,&b);
- SetPixelRed(q,ClampToQuantum((MagickRealType)
- QuantumRange*L));
- SetPixelGreen(q,ClampToQuantum((MagickRealType)
- QuantumRange*a));
- SetPixelBlue(q,ClampToQuantum((MagickRealType)
- QuantumRange*b));
- q++;
+ SetPixelRed(image,ClampToQuantum((MagickRealType) QuantumRange*
+ L),q);
+ SetPixelGreen(image,ClampToQuantum((MagickRealType) QuantumRange*
+ a),q);
+ SetPixelBlue(image,ClampToQuantum((MagickRealType) QuantumRange*
+ b),q);
+ q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
if (sync == MagickFalse)
@@ -659,27 +656,27 @@
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
for (x=(ssize_t) image->columns; x != 0; x--)
{
- SetPixelRed(q,logmap[ScaleQuantumToMap(
- GetPixelRed(q))]);
- SetPixelGreen(q,logmap[ScaleQuantumToMap(
- GetPixelGreen(q))]);
- SetPixelBlue(q,logmap[ScaleQuantumToMap(
- GetPixelBlue(q))]);
- q++;
+ SetPixelRed(image,logmap[ScaleQuantumToMap(
+ GetPixelRed(image,q))],q);
+ SetPixelGreen(image,logmap[ScaleQuantumToMap(
+ GetPixelGreen(image,q))],q);
+ SetPixelBlue(image,logmap[ScaleQuantumToMap(
+ GetPixelBlue(image,q))],q);
+ q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
if (sync == MagickFalse)
@@ -1064,13 +1061,13 @@
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- MagickPixelPacket
+ PixelInfo
pixel;
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
register size_t
@@ -1082,26 +1079,26 @@
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
for (x=0; x < (ssize_t) image->columns; x++)
{
- red=ScaleQuantumToMap(GetPixelRed(q));
- green=ScaleQuantumToMap(GetPixelGreen(q));
- blue=ScaleQuantumToMap(GetPixelBlue(q));
+ red=ScaleQuantumToMap(GetPixelRed(image,q));
+ green=ScaleQuantumToMap(GetPixelGreen(image,q));
+ blue=ScaleQuantumToMap(GetPixelBlue(image,q));
pixel.red=(x_map[red].x+y_map[green].x+z_map[blue].x)+
(MagickRealType) primary_info.x;
pixel.green=(x_map[red].y+y_map[green].y+z_map[blue].y)+
(MagickRealType) primary_info.y;
pixel.blue=(x_map[red].z+y_map[green].z+z_map[blue].z)+
(MagickRealType) primary_info.z;
- SetPixelRed(q,ScaleMapToQuantum(pixel.red));
- SetPixelGreen(q,ScaleMapToQuantum(pixel.green));
- SetPixelBlue(q,ScaleMapToQuantum(pixel.blue));
- q++;
+ SetPixelRed(image,ScaleMapToQuantum(pixel.red),q);
+ SetPixelGreen(image,ScaleMapToQuantum(pixel.green),q);
+ SetPixelBlue(image,ScaleMapToQuantum(pixel.blue),q);
+ q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
if (sync == MagickFalse)
@@ -1136,7 +1133,7 @@
image_view=AcquireCacheView(image);
for (i=0; i < (ssize_t) image->colors; i++)
{
- MagickPixelPacket
+ PixelInfo
pixel;
red=ScaleQuantumToMap(image->colormap[i].red);
@@ -1362,14 +1359,14 @@
*blue=RoundToQuantum((MagickRealType) QuantumRange*b);
}
-static inline void ConvertCMYKToRGB(MagickPixelPacket *pixel)
+static inline void ConvertCMYKToRGB(PixelInfo *pixel)
{
pixel->red=(MagickRealType) QuantumRange-(QuantumScale*pixel->red*
- (QuantumRange-pixel->index)+pixel->index);
+ (QuantumRange-pixel->black)+pixel->black);
pixel->green=(MagickRealType) QuantumRange-(QuantumScale*pixel->green*
- (QuantumRange-pixel->index)+pixel->index);
+ (QuantumRange-pixel->black)+pixel->black);
pixel->blue=(MagickRealType) QuantumRange-(QuantumScale*pixel->blue*
- (QuantumRange-pixel->index)+pixel->index);
+ (QuantumRange-pixel->black)+pixel->black);
}
MagickExport MagickBooleanType TransformRGBImage(Image *image,
@@ -1687,27 +1684,27 @@
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelRed(q,ClampToQuantum((MagickRealType)
- (QuantumRange-GetPixelRed(q))));
- SetPixelGreen(q,ClampToQuantum((MagickRealType)
- (QuantumRange-GetPixelGreen(q))));
- SetPixelBlue(q,ClampToQuantum((MagickRealType)
- (QuantumRange-GetPixelBlue(q))));
- q++;
+ SetPixelRed(image,ClampToQuantum((MagickRealType) (QuantumRange-
+ GetPixelRed(image,q))),q);
+ SetPixelGreen(image,ClampToQuantum((MagickRealType) (QuantumRange-
+ GetPixelGreen(image,q))),q);
+ SetPixelBlue(image,ClampToQuantum((MagickRealType) (QuantumRange-
+ GetPixelBlue(image,q))),q);
+ q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
if (sync == MagickFalse)
@@ -1720,7 +1717,7 @@
}
case CMYKColorspace:
{
- MagickPixelPacket
+ PixelInfo
zero;
/*
@@ -1733,7 +1730,7 @@
if (SetImageStorageClass(image,DirectClass) == MagickFalse)
return(MagickFalse);
}
- GetMagickPixelPacket(image,&zero);
+ GetPixelInfo(image,&zero);
image_view=AcquireCacheView(image);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(dynamic,4) shared(status)
@@ -1743,35 +1740,31 @@
MagickBooleanType
sync;
- MagickPixelPacket
+ PixelInfo
pixel;
- register IndexPacket
- *restrict indexes;
-
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
pixel=zero;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetMagickPixelPacket(image,q,indexes+x,&pixel);
+ SetPixelInfo(image,q,&pixel);
ConvertCMYKToRGB(&pixel);
- SetPixelPacket(image,&pixel,q,indexes+x);
- q++;
+ SetPixelPixelInfo(image,&pixel,q);
+ q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
if (sync == MagickFalse)
@@ -1811,14 +1804,14 @@
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
@@ -1830,14 +1823,14 @@
green,
red;
- hue=(double) (QuantumScale*GetPixelRed(q));
- saturation=(double) (QuantumScale*GetPixelGreen(q));
- brightness=(double) (QuantumScale*GetPixelBlue(q));
+ hue=(double) (QuantumScale*GetPixelRed(image,q));
+ saturation=(double) (QuantumScale*GetPixelGreen(image,q));
+ brightness=(double) (QuantumScale*GetPixelBlue(image,q));
ConvertHSBToRGB(hue,saturation,brightness,&red,&green,&blue);
- SetPixelRed(q,red);
- SetPixelGreen(q,green);
- SetPixelBlue(q,blue);
- q++;
+ SetPixelRed(image,red,q);
+ SetPixelGreen(image,green,q);
+ SetPixelBlue(image,blue,q);
+ q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
if (sync == MagickFalse)
@@ -1877,14 +1870,14 @@
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
@@ -1896,14 +1889,14 @@
green,
red;
- hue=(double) (QuantumScale*GetPixelRed(q));
- saturation=(double) (QuantumScale*GetPixelGreen(q));
- lightness=(double) (QuantumScale*GetPixelBlue(q));
+ hue=(double) (QuantumScale*GetPixelRed(image,q));
+ saturation=(double) (QuantumScale*GetPixelGreen(image,q));
+ lightness=(double) (QuantumScale*GetPixelBlue(image,q));
ConvertHSLToRGB(hue,saturation,lightness,&red,&green,&blue);
- SetPixelRed(q,red);
- SetPixelGreen(q,green);
- SetPixelBlue(q,blue);
- q++;
+ SetPixelRed(image,red,q);
+ SetPixelGreen(image,green,q);
+ SetPixelBlue(image,blue,q);
+ q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
if (sync == MagickFalse)
@@ -1943,14 +1936,14 @@
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
@@ -1962,14 +1955,14 @@
green,
red;
- hue=(double) (QuantumScale*GetPixelRed(q));
- whiteness=(double) (QuantumScale*GetPixelGreen(q));
- blackness=(double) (QuantumScale*GetPixelBlue(q));
+ hue=(double) (QuantumScale*GetPixelRed(image,q));
+ whiteness=(double) (QuantumScale*GetPixelGreen(image,q));
+ blackness=(double) (QuantumScale*GetPixelBlue(image,q));
ConvertHWBToRGB(hue,whiteness,blackness,&red,&green,&blue);
- SetPixelRed(q,red);
- SetPixelGreen(q,green);
- SetPixelBlue(q,blue);
- q++;
+ SetPixelRed(image,red,q);
+ SetPixelGreen(image,green,q);
+ SetPixelBlue(image,blue,q);
+ q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
if (sync == MagickFalse)
@@ -2012,14 +2005,14 @@
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
@@ -2034,15 +2027,15 @@
green,
red;
- L=QuantumScale*GetPixelRed(q);
- a=QuantumScale*GetPixelGreen(q);
- b=QuantumScale*GetPixelBlue(q);
+ L=QuantumScale*GetPixelRed(image,q);
+ a=QuantumScale*GetPixelGreen(image,q);
+ b=QuantumScale*GetPixelBlue(image,q);
ConvertLabToXYZ(L,a,b,&X,&Y,&Z);
ConvertXYZToRGB(X,Y,Z,&red,&green,&blue);
- SetPixelRed(q,red);
- SetPixelGreen(q,green);
- SetPixelBlue(q,blue);
- q++;
+ SetPixelRed(image,red,q);
+ SetPixelGreen(image,green,q);
+ SetPixelBlue(image,blue,q);
+ q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
if (sync == MagickFalse)
@@ -2119,27 +2112,27 @@
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
for (x=(ssize_t) image->columns; x != 0; x--)
{
- SetPixelRed(q,logmap[ScaleQuantumToMap(
- GetPixelRed(q))]);
- SetPixelGreen(q,logmap[ScaleQuantumToMap(
- GetPixelGreen(q))]);
- SetPixelBlue(q,logmap[ScaleQuantumToMap(
- GetPixelBlue(q))]);
- q++;
+ SetPixelRed(image,logmap[ScaleQuantumToMap(
+ GetPixelRed(image,q))],q);
+ SetPixelGreen(image,logmap[ScaleQuantumToMap(
+ GetPixelGreen(image,q))],q);
+ SetPixelBlue(image,logmap[ScaleQuantumToMap(
+ GetPixelBlue(image,q))],q);
+ q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
if (sync == MagickFalse)
@@ -2486,20 +2479,20 @@
MagickBooleanType
sync;
- MagickPixelPacket
+ PixelInfo
pixel;
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
@@ -2511,9 +2504,9 @@
green,
red;
- red=ScaleQuantumToMap(GetPixelRed(q));
- green=ScaleQuantumToMap(GetPixelGreen(q));
- blue=ScaleQuantumToMap(GetPixelBlue(q));
+ red=ScaleQuantumToMap(GetPixelRed(image,q));
+ green=ScaleQuantumToMap(GetPixelGreen(image,q));
+ blue=ScaleQuantumToMap(GetPixelBlue(image,q));
pixel.red=x_map[red].x+y_map[green].x+z_map[blue].x;
pixel.green=x_map[red].y+y_map[green].y+z_map[blue].y;
pixel.blue=x_map[red].z+y_map[green].z+z_map[blue].z;
@@ -2553,13 +2546,13 @@
default:
break;
}
- SetPixelRed(q,ScaleMapToQuantum((MagickRealType) MaxMap*
- QuantumScale*pixel.red));
- SetPixelGreen(q,ScaleMapToQuantum((MagickRealType) MaxMap*
- QuantumScale*pixel.green));
- SetPixelBlue(q,ScaleMapToQuantum((MagickRealType) MaxMap*
- QuantumScale*pixel.blue));
- q++;
+ SetPixelRed(image,ScaleMapToQuantum((MagickRealType) MaxMap*
+ QuantumScale*pixel.red),q);
+ SetPixelGreen(image,ScaleMapToQuantum((MagickRealType) MaxMap*
+ QuantumScale*pixel.green),q);
+ SetPixelBlue(image,ScaleMapToQuantum((MagickRealType) MaxMap*
+ QuantumScale*pixel.blue),q);
+ q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
if (sync == MagickFalse)
@@ -2592,7 +2585,7 @@
#endif
for (i=0; i < (ssize_t) image->colors; i++)
{
- MagickPixelPacket
+ PixelInfo
pixel;
register size_t
diff --git a/magick/colorspace.h b/MagickCore/colorspace.h
similarity index 100%
rename from magick/colorspace.h
rename to MagickCore/colorspace.h
diff --git a/magick/compare.c b/MagickCore/compare.c
similarity index 83%
rename from magick/compare.c
rename to MagickCore/compare.c
index b95185c..f7cad2b 100644
--- a/magick/compare.c
+++ b/MagickCore/compare.c
@@ -40,33 +40,33 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/artifact.h"
-#include "magick/cache-view.h"
-#include "magick/client.h"
-#include "magick/color.h"
-#include "magick/color-private.h"
-#include "magick/colorspace.h"
-#include "magick/colorspace-private.h"
-#include "magick/compare.h"
-#include "magick/composite-private.h"
-#include "magick/constitute.h"
-#include "magick/exception-private.h"
-#include "magick/geometry.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/log.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/option.h"
-#include "magick/pixel-private.h"
-#include "magick/resource_.h"
-#include "magick/string_.h"
-#include "magick/statistic.h"
-#include "magick/transform.h"
-#include "magick/utility.h"
-#include "magick/version.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/artifact.h"
+#include "MagickCore/cache-view.h"
+#include "MagickCore/client.h"
+#include "MagickCore/color.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/colorspace-private.h"
+#include "MagickCore/compare.h"
+#include "MagickCore/composite-private.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/log.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/option.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/statistic.h"
+#include "MagickCore/transform.h"
+#include "MagickCore/utility.h"
+#include "MagickCore/version.h"
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -137,7 +137,7 @@
MagickBooleanType
status;
- MagickPixelPacket
+ PixelInfo
highlight,
lowlight,
zero;
@@ -195,7 +195,7 @@
Generate difference image.
*/
status=MagickTrue;
- GetMagickPixelPacket(image,&zero);
+ GetPixelInfo(image,&zero);
image_view=AcquireCacheView(image);
reconstruct_view=AcquireCacheView(reconstruct_image);
highlight_view=AcquireCacheView(highlight_image);
@@ -207,25 +207,18 @@
MagickBooleanType
sync;
- MagickPixelPacket
+ PixelInfo
pixel,
reconstruct_pixel;
- register const IndexPacket
- *restrict indexes,
- *restrict reconstruct_indexes;
-
- register const PixelPacket
+ register const Quantum
*restrict p,
*restrict q;
- register IndexPacket
- *restrict highlight_indexes;
-
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict r;
if (status == MagickFalse)
@@ -235,15 +228,12 @@
1,exception);
r=QueueCacheViewAuthenticPixels(highlight_view,0,y,highlight_image->columns,
1,exception);
- if ((p == (const PixelPacket *) NULL) ||
- (q == (const PixelPacket *) NULL) || (r == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) ||
+ (q == (const Quantum *) NULL) || (r == (Quantum *) NULL))
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewVirtualIndexQueue(image_view);
- reconstruct_indexes=GetCacheViewVirtualIndexQueue(reconstruct_view);
- highlight_indexes=GetCacheViewAuthenticIndexQueue(highlight_view);
pixel=zero;
reconstruct_pixel=zero;
for (x=0; x < (ssize_t) image->columns; x++)
@@ -251,44 +241,42 @@
MagickStatusType
difference;
- SetMagickPixelPacket(image,p,indexes+x,&pixel);
- SetMagickPixelPacket(reconstruct_image,q,reconstruct_indexes+x,
- &reconstruct_pixel);
+ SetPixelInfo(image,p,&pixel);
+ SetPixelInfo(reconstruct_image,q,&reconstruct_pixel);
difference=MagickFalse;
if (channel == CompositeChannels)
{
- if (IsMagickColorSimilar(&pixel,&reconstruct_pixel) == MagickFalse)
+ if (IsFuzzyEquivalencePixelInfo(&pixel,&reconstruct_pixel) == MagickFalse)
difference=MagickTrue;
}
else
{
if (((channel & RedChannel) != 0) &&
- (GetPixelRed(p) != GetPixelRed(q)))
+ (GetPixelRed(image,p) != GetPixelRed(reconstruct_image,q)))
difference=MagickTrue;
if (((channel & GreenChannel) != 0) &&
- (GetPixelGreen(p) != GetPixelGreen(q)))
+ (GetPixelGreen(image,p) != GetPixelGreen(reconstruct_image,q)))
difference=MagickTrue;
if (((channel & BlueChannel) != 0) &&
- (GetPixelBlue(p) != GetPixelBlue(q)))
+ (GetPixelBlue(image,p) != GetPixelBlue(reconstruct_image,q)))
difference=MagickTrue;
if (((channel & OpacityChannel) != 0) &&
(image->matte != MagickFalse) &&
- (GetPixelOpacity(p) != GetPixelOpacity(q)))
+ (GetPixelAlpha(image,p) != GetPixelAlpha(reconstruct_image,q)))
difference=MagickTrue;
- if ((((channel & IndexChannel) != 0) &&
+ if ((((channel & BlackChannel) != 0) &&
(image->colorspace == CMYKColorspace) &&
(reconstruct_image->colorspace == CMYKColorspace)) &&
- (GetPixelIndex(indexes+x) !=
- GetPixelIndex(reconstruct_indexes+x)))
+ (GetPixelBlack(image,p) != GetPixelBlack(reconstruct_image,q)))
difference=MagickTrue;
}
if (difference != MagickFalse)
- SetPixelPacket(highlight_image,&highlight,r,highlight_indexes+x);
+ SetPixelPixelInfo(highlight_image,&highlight,r);
else
- SetPixelPacket(highlight_image,&lowlight,r,highlight_indexes+x);
- p++;
- q++;
- r++;
+ SetPixelPixelInfo(highlight_image,&lowlight,r);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(reconstruct_image);
+ r+=GetPixelChannels(highlight_image);
}
sync=SyncCacheViewAuthenticPixels(highlight_view,exception);
if (sync == MagickFalse)
@@ -363,7 +351,7 @@
MagickBooleanType
status;
- MagickPixelPacket
+ PixelInfo
zero;
ssize_t
@@ -373,7 +361,7 @@
Compute the absolute difference in pixels between two images.
*/
status=MagickTrue;
- GetMagickPixelPacket(image,&zero);
+ GetPixelInfo(image,&zero);
image_view=AcquireCacheView(image);
reconstruct_view=AcquireCacheView(reconstruct_image);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
@@ -384,15 +372,11 @@
double
channel_distortion[CompositeChannels+1];
- MagickPixelPacket
+ PixelInfo
pixel,
reconstruct_pixel;
- register const IndexPacket
- *restrict indexes,
- *restrict reconstruct_indexes;
-
- register const PixelPacket
+ register const Quantum
*restrict p,
*restrict q;
@@ -405,22 +389,19 @@
p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
q=GetCacheViewVirtualPixels(reconstruct_view,0,y,reconstruct_image->columns,
1,exception);
- if ((p == (const PixelPacket *) NULL) || (q == (const PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (const Quantum *) NULL))
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewVirtualIndexQueue(image_view);
- reconstruct_indexes=GetCacheViewVirtualIndexQueue(reconstruct_view);
pixel=zero;
reconstruct_pixel=pixel;
(void) ResetMagickMemory(channel_distortion,0,sizeof(channel_distortion));
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetMagickPixelPacket(image,p,indexes+x,&pixel);
- SetMagickPixelPacket(reconstruct_image,q,reconstruct_indexes+x,
- &reconstruct_pixel);
- if (IsMagickColorSimilar(&pixel,&reconstruct_pixel) == MagickFalse)
+ SetPixelInfo(image,p,&pixel);
+ SetPixelInfo(reconstruct_image,q,&reconstruct_pixel);
+ if (IsFuzzyEquivalencePixelInfo(&pixel,&reconstruct_pixel) == MagickFalse)
{
if ((channel & RedChannel) != 0)
channel_distortion[RedChannel]++;
@@ -431,13 +412,13 @@
if (((channel & OpacityChannel) != 0) &&
(image->matte != MagickFalse))
channel_distortion[OpacityChannel]++;
- if (((channel & IndexChannel) != 0) &&
+ if (((channel & BlackChannel) != 0) &&
(image->colorspace == CMYKColorspace))
channel_distortion[BlackChannel]++;
channel_distortion[CompositeChannels]++;
}
- p++;
- q++;
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(reconstruct_image);
}
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp critical (MagickCore_GetAbsoluteError)
@@ -463,12 +444,12 @@
channels++;
if ((channel & BlueChannel) != 0)
channels++;
+ if (((channel & BlackChannel) != 0) &&
+ (image->colorspace == CMYKColorspace))
+ channels++;
if (((channel & OpacityChannel) != 0) &&
(image->matte != MagickFalse))
channels++;
- if (((channel & IndexChannel) != 0) &&
- (image->colorspace == CMYKColorspace))
- channels++;
return(channels);
}
@@ -500,11 +481,7 @@
double
channel_distortion[CompositeChannels+1];
- register const IndexPacket
- *restrict indexes,
- *restrict reconstruct_indexes;
-
- register const PixelPacket
+ register const Quantum
*restrict p,
*restrict q;
@@ -517,13 +494,11 @@
p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
q=GetCacheViewVirtualPixels(reconstruct_view,0,y,reconstruct_image->columns,
1,exception);
- if ((p == (const PixelPacket *) NULL) || (q == (const PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (const Quantum *) NULL))
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewVirtualIndexQueue(image_view);
- reconstruct_indexes=GetCacheViewVirtualIndexQueue(reconstruct_view);
(void) ResetMagickMemory(channel_distortion,0,sizeof(channel_distortion));
for (x=0; x < (ssize_t) image->columns; x++)
{
@@ -532,22 +507,22 @@
if ((channel & RedChannel) != 0)
{
- distance=QuantumScale*(GetPixelRed(p)-(MagickRealType)
- GetPixelRed(q));
+ distance=QuantumScale*(GetPixelRed(image,p)-(MagickRealType)
+ GetPixelRed(reconstruct_image,q));
channel_distortion[RedChannel]+=distance*distance;
channel_distortion[CompositeChannels]+=distance*distance;
}
if ((channel & GreenChannel) != 0)
{
- distance=QuantumScale*(GetPixelGreen(p)-(MagickRealType)
- GetPixelGreen(q));
+ distance=QuantumScale*(GetPixelGreen(image,p)-(MagickRealType)
+ GetPixelGreen(reconstruct_image,q));
channel_distortion[GreenChannel]+=distance*distance;
channel_distortion[CompositeChannels]+=distance*distance;
}
if ((channel & BlueChannel) != 0)
{
- distance=QuantumScale*(GetPixelBlue(p)-(MagickRealType)
- GetPixelBlue(q));
+ distance=QuantumScale*(GetPixelBlue(image,p)-(MagickRealType)
+ GetPixelBlue(reconstruct_image,q));
channel_distortion[BlueChannel]+=distance*distance;
channel_distortion[CompositeChannels]+=distance*distance;
}
@@ -555,23 +530,22 @@
(reconstruct_image->matte != MagickFalse)))
{
distance=QuantumScale*((image->matte != MagickFalse ?
- GetPixelOpacity(p) : OpaqueOpacity)-
- (reconstruct_image->matte != MagickFalse ?
- GetPixelOpacity(q): OpaqueOpacity));
+ GetPixelAlpha(image,p) : OpaqueAlpha)-(reconstruct_image->matte !=
+ MagickFalse ? GetPixelAlpha(reconstruct_image,q): OpaqueAlpha));
channel_distortion[OpacityChannel]+=distance*distance;
channel_distortion[CompositeChannels]+=distance*distance;
}
- if (((channel & IndexChannel) != 0) &&
+ if (((channel & BlackChannel) != 0) &&
(image->colorspace == CMYKColorspace) &&
(reconstruct_image->colorspace == CMYKColorspace))
{
- distance=QuantumScale*(GetPixelIndex(indexes+x)-
- (MagickRealType) GetPixelIndex(reconstruct_indexes+x));
+ distance=QuantumScale*(GetPixelBlack(image,p)-(MagickRealType)
+ GetPixelBlack(reconstruct_image,q));
channel_distortion[BlackChannel]+=distance*distance;
channel_distortion[CompositeChannels]+=distance*distance;
}
- p++;
- q++;
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(reconstruct_image);
}
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp critical (MagickCore_GetMeanSquaredError)
@@ -620,11 +594,7 @@
double
channel_distortion[CompositeChannels+1];
- register const IndexPacket
- *restrict indexes,
- *restrict reconstruct_indexes;
-
- register const PixelPacket
+ register const Quantum
*restrict p,
*restrict q;
@@ -637,13 +607,11 @@
p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
q=GetCacheViewVirtualPixels(reconstruct_view,0,y,
reconstruct_image->columns,1,exception);
- if ((p == (const PixelPacket *) NULL) || (q == (const PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (const Quantum *) NULL))
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewVirtualIndexQueue(image_view);
- reconstruct_indexes=GetCacheViewVirtualIndexQueue(reconstruct_view);
(void) ResetMagickMemory(channel_distortion,0,sizeof(channel_distortion));
for (x=0; x < (ssize_t) image->columns; x++)
{
@@ -652,43 +620,43 @@
if ((channel & RedChannel) != 0)
{
- distance=QuantumScale*fabs(GetPixelRed(p)-(double)
- GetPixelRed(q));
+ distance=QuantumScale*fabs(GetPixelRed(image,p)-(double)
+ GetPixelRed(reconstruct_image,q));
channel_distortion[RedChannel]+=distance;
channel_distortion[CompositeChannels]+=distance;
}
if ((channel & GreenChannel) != 0)
{
- distance=QuantumScale*fabs(GetPixelGreen(p)-(double)
- GetPixelGreen(q));
+ distance=QuantumScale*fabs(GetPixelGreen(image,p)-(double)
+ GetPixelGreen(reconstruct_image,q));
channel_distortion[GreenChannel]+=distance;
channel_distortion[CompositeChannels]+=distance;
}
if ((channel & BlueChannel) != 0)
{
- distance=QuantumScale*fabs(GetPixelBlue(p)-(double)
- GetPixelBlue(q));
+ distance=QuantumScale*fabs(GetPixelBlue(image,p)-(double)
+ GetPixelBlue(reconstruct_image,q));
channel_distortion[BlueChannel]+=distance;
channel_distortion[CompositeChannels]+=distance;
}
+ if (((channel & BlackChannel) != 0) &&
+ (image->colorspace == CMYKColorspace))
+ {
+ distance=QuantumScale*fabs(GetPixelBlack(image,p)-(double)
+ GetPixelBlack(reconstruct_image,q));
+ channel_distortion[BlackChannel]+=distance;
+ channel_distortion[CompositeChannels]+=distance;
+ }
if (((channel & OpacityChannel) != 0) &&
(image->matte != MagickFalse))
{
- distance=QuantumScale*fabs(GetPixelOpacity(p)-(double)
- GetPixelOpacity(q));
+ distance=QuantumScale*fabs(GetPixelAlpha(image,p)-(double)
+ GetPixelAlpha(reconstruct_image,q));
channel_distortion[OpacityChannel]+=distance;
channel_distortion[CompositeChannels]+=distance;
}
- if (((channel & IndexChannel) != 0) &&
- (image->colorspace == CMYKColorspace))
- {
- distance=QuantumScale*fabs(GetPixelIndex(indexes+x)-(double)
- GetPixelIndex(reconstruct_indexes+x));
- channel_distortion[BlackChannel]+=distance;
- channel_distortion[CompositeChannels]+=distance;
- }
- p++;
- q++;
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(reconstruct_image);
}
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp critical (MagickCore_GetMeanAbsoluteError)
@@ -735,11 +703,7 @@
reconstruct_view=AcquireCacheView(reconstruct_image);
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const IndexPacket
- *restrict indexes,
- *restrict reconstruct_indexes;
-
- register const PixelPacket
+ register const Quantum
*restrict p,
*restrict q;
@@ -749,13 +713,11 @@
p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
q=GetCacheViewVirtualPixels(reconstruct_view,0,y,reconstruct_image->columns,
1,exception);
- if ((p == (const PixelPacket *) NULL) || (q == (const PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (const Quantum *) NULL))
{
status=MagickFalse;
break;
}
- indexes=GetCacheViewVirtualIndexQueue(image_view);
- reconstruct_indexes=GetCacheViewVirtualIndexQueue(reconstruct_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
MagickRealType
@@ -764,14 +726,16 @@
if ((channel & OpacityChannel) != 0)
{
if (image->matte != MagickFalse)
- alpha=(MagickRealType) (QuantumScale*(GetPixelAlpha(p)));
+ alpha=(MagickRealType) (QuantumScale*(
+ GetPixelAlpha(reconstruct_image,p)));
if (reconstruct_image->matte != MagickFalse)
- beta=(MagickRealType) (QuantumScale*GetPixelAlpha(q));
+ beta=(MagickRealType) (QuantumScale*
+ GetPixelAlpha(reconstruct_image,q));
}
if ((channel & RedChannel) != 0)
{
- distance=fabs(alpha*GetPixelRed(p)-beta*
- GetPixelRed(q));
+ distance=fabs(alpha*GetPixelRed(image,p)-beta*
+ GetPixelRed(reconstruct_image,q));
distortion[RedChannel]+=distance;
distortion[CompositeChannels]+=distance;
mean_error+=distance*distance;
@@ -781,8 +745,8 @@
}
if ((channel & GreenChannel) != 0)
{
- distance=fabs(alpha*GetPixelGreen(p)-beta*
- GetPixelGreen(q));
+ distance=fabs(alpha*GetPixelGreen(image,p)-beta*
+ GetPixelGreen(reconstruct_image,q));
distortion[GreenChannel]+=distance;
distortion[CompositeChannels]+=distance;
mean_error+=distance*distance;
@@ -792,8 +756,8 @@
}
if ((channel & BlueChannel) != 0)
{
- distance=fabs(alpha*GetPixelBlue(p)-beta*
- GetPixelBlue(q));
+ distance=fabs(alpha*GetPixelBlue(image,p)-beta*
+ GetPixelBlue(reconstruct_image,q));
distortion[BlueChannel]+=distance;
distortion[CompositeChannels]+=distance;
mean_error+=distance*distance;
@@ -801,11 +765,24 @@
maximum_error=distance;
area++;
}
+ if (((channel & BlackChannel) != 0) &&
+ (image->colorspace == CMYKColorspace) &&
+ (reconstruct_image->colorspace == CMYKColorspace))
+ {
+ distance=fabs(alpha*GetPixelBlack(image,p)-beta*
+ GetPixelBlack(reconstruct_image,q));
+ distortion[BlackChannel]+=distance;
+ distortion[CompositeChannels]+=distance;
+ mean_error+=distance*distance;
+ if (distance > maximum_error)
+ maximum_error=distance;
+ area++;
+ }
if (((channel & OpacityChannel) != 0) &&
(image->matte != MagickFalse))
{
- distance=fabs((double) GetPixelOpacity(p)-
- GetPixelOpacity(q));
+ distance=fabs((double) GetPixelAlpha(image,p)-
+ GetPixelAlpha(reconstruct_image,q));
distortion[OpacityChannel]+=distance;
distortion[CompositeChannels]+=distance;
mean_error+=distance*distance;
@@ -813,21 +790,8 @@
maximum_error=distance;
area++;
}
- if (((channel & IndexChannel) != 0) &&
- (image->colorspace == CMYKColorspace) &&
- (reconstruct_image->colorspace == CMYKColorspace))
- {
- distance=fabs(alpha*GetPixelIndex(indexes+x)-beta*
- GetPixelIndex(reconstruct_indexes+x));
- distortion[BlackChannel]+=distance;
- distortion[CompositeChannels]+=distance;
- mean_error+=distance*distance;
- if (distance > maximum_error)
- maximum_error=distance;
- area++;
- }
- p++;
- q++;
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(reconstruct_image);
}
}
reconstruct_view=DestroyCacheView(reconstruct_view);
@@ -866,11 +830,7 @@
double
channel_distortion[CompositeChannels+1];
- register const IndexPacket
- *restrict indexes,
- *restrict reconstruct_indexes;
-
- register const PixelPacket
+ register const Quantum
*restrict p,
*restrict q;
@@ -883,13 +843,11 @@
p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
q=GetCacheViewVirtualPixels(reconstruct_view,0,y,
reconstruct_image->columns,1,exception);
- if ((p == (const PixelPacket *) NULL) || (q == (const PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (const Quantum *) NULL))
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewVirtualIndexQueue(image_view);
- reconstruct_indexes=GetCacheViewVirtualIndexQueue(reconstruct_view);
(void) ResetMagickMemory(channel_distortion,0,sizeof(channel_distortion));
for (x=0; x < (ssize_t) image->columns; x++)
{
@@ -898,44 +856,44 @@
if ((channel & RedChannel) != 0)
{
- distance=QuantumScale*(GetPixelRed(p)-(MagickRealType)
- GetPixelRed(q));
+ distance=QuantumScale*(GetPixelRed(image,p)-(MagickRealType)
+ GetPixelRed(reconstruct_image,q));
channel_distortion[RedChannel]+=distance*distance;
channel_distortion[CompositeChannels]+=distance*distance;
}
if ((channel & GreenChannel) != 0)
{
- distance=QuantumScale*(GetPixelGreen(p)-(MagickRealType)
- GetPixelGreen(q));
+ distance=QuantumScale*(GetPixelGreen(image,p)-(MagickRealType)
+ GetPixelGreen(reconstruct_image,q));
channel_distortion[GreenChannel]+=distance*distance;
channel_distortion[CompositeChannels]+=distance*distance;
}
if ((channel & BlueChannel) != 0)
{
- distance=QuantumScale*(GetPixelBlue(p)-(MagickRealType)
- GetPixelBlue(q));
+ distance=QuantumScale*(GetPixelBlue(image,p)-(MagickRealType)
+ GetPixelBlue(reconstruct_image,q));
channel_distortion[BlueChannel]+=distance*distance;
channel_distortion[CompositeChannels]+=distance*distance;
}
+ if (((channel & BlackChannel) != 0) &&
+ (image->colorspace == CMYKColorspace) &&
+ (reconstruct_image->colorspace == CMYKColorspace))
+ {
+ distance=QuantumScale*(GetPixelBlack(image,p)-(MagickRealType)
+ GetPixelBlack(reconstruct_image,q));
+ channel_distortion[BlackChannel]+=distance*distance;
+ channel_distortion[CompositeChannels]+=distance*distance;
+ }
if (((channel & OpacityChannel) != 0) &&
(image->matte != MagickFalse))
{
- distance=QuantumScale*(GetPixelOpacity(p)-(MagickRealType)
- GetPixelOpacity(q));
+ distance=QuantumScale*(GetPixelAlpha(image,p)-(MagickRealType)
+ GetPixelAlpha(reconstruct_image,q));
channel_distortion[OpacityChannel]+=distance*distance;
channel_distortion[CompositeChannels]+=distance*distance;
}
- if (((channel & IndexChannel) != 0) &&
- (image->colorspace == CMYKColorspace) &&
- (reconstruct_image->colorspace == CMYKColorspace))
- {
- distance=QuantumScale*(GetPixelIndex(indexes+x)-
- (MagickRealType) GetPixelIndex(reconstruct_indexes+x));
- channel_distortion[BlackChannel]+=distance*distance;
- channel_distortion[CompositeChannels]+=distance*distance;
- }
- p++;
- q++;
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(reconstruct_image);
}
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp critical (MagickCore_GetMeanSquaredError)
@@ -994,11 +952,7 @@
reconstruct_view=AcquireCacheView(reconstruct_image);
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const IndexPacket
- *restrict indexes,
- *restrict reconstruct_indexes;
-
- register const PixelPacket
+ register const Quantum
*restrict p,
*restrict q;
@@ -1010,43 +964,43 @@
p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
q=GetCacheViewVirtualPixels(reconstruct_view,0,y,reconstruct_image->columns,
1,exception);
- if ((p == (const PixelPacket *) NULL) || (q == (const PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (const Quantum *) NULL))
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewVirtualIndexQueue(image_view);
- reconstruct_indexes=GetCacheViewVirtualIndexQueue(reconstruct_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
if ((channel & RedChannel) != 0)
- distortion[RedChannel]+=area*QuantumScale*(GetPixelRed(p)-
- image_statistics[RedChannel].mean)*(GetPixelRed(q)-
+ distortion[RedChannel]+=area*QuantumScale*(GetPixelRed(image,p)-
+ image_statistics[RedChannel].mean)*(
+ GetPixelRed(reconstruct_image,q)-
reconstruct_statistics[RedChannel].mean);
if ((channel & GreenChannel) != 0)
- distortion[GreenChannel]+=area*QuantumScale*(GetPixelGreen(p)-
- image_statistics[GreenChannel].mean)*(GetPixelGreen(q)-
+ distortion[GreenChannel]+=area*QuantumScale*(GetPixelGreen(image,p)-
+ image_statistics[GreenChannel].mean)*(
+ GetPixelGreen(reconstruct_image,q)-
reconstruct_statistics[GreenChannel].mean);
if ((channel & BlueChannel) != 0)
- distortion[BlueChannel]+=area*QuantumScale*(GetPixelBlue(p)-
- image_statistics[BlueChannel].mean)*(GetPixelBlue(q)-
+ distortion[BlueChannel]+=area*QuantumScale*(GetPixelBlue(image,p)-
+ image_statistics[BlueChannel].mean)*(
+ GetPixelBlue(reconstruct_image,q)-
reconstruct_statistics[BlueChannel].mean);
- if (((channel & OpacityChannel) != 0) &&
- (image->matte != MagickFalse))
- distortion[OpacityChannel]+=area*QuantumScale*(
- GetPixelOpacity(p)-image_statistics[OpacityChannel].mean)*
- (GetPixelOpacity(q)-
- reconstruct_statistics[OpacityChannel].mean);
- if (((channel & IndexChannel) != 0) &&
+ if (((channel & BlackChannel) != 0) &&
(image->colorspace == CMYKColorspace) &&
(reconstruct_image->colorspace == CMYKColorspace))
- distortion[BlackChannel]+=area*QuantumScale*(
- GetPixelIndex(indexes+x)-
+ distortion[BlackChannel]+=area*QuantumScale*(GetPixelBlack(image,p)-
image_statistics[OpacityChannel].mean)*(
- GetPixelIndex(reconstruct_indexes+x)-
+ GetPixelBlack(reconstruct_image,q)-
reconstruct_statistics[OpacityChannel].mean);
- p++;
- q++;
+ if (((channel & OpacityChannel) != 0) &&
+ (image->matte != MagickFalse))
+ distortion[OpacityChannel]+=area*QuantumScale*(GetPixelAlpha(image,p)-
+ image_statistics[OpacityChannel].mean)*
+ (GetPixelAlpha(reconstruct_image,q)-
+ reconstruct_statistics[OpacityChannel].mean);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(image);
}
if (image->progress_monitor != (MagickProgressMonitor) NULL)
{
@@ -1087,7 +1041,7 @@
if (((channel & OpacityChannel) != 0) && (image->matte != MagickFalse))
distortion[CompositeChannels]+=distortion[OpacityChannel]*
distortion[OpacityChannel];
- if (((channel & IndexChannel) != 0) &&
+ if (((channel & BlackChannel) != 0) &&
(image->colorspace == CMYKColorspace))
distortion[CompositeChannels]+=distortion[BlackChannel]*
distortion[BlackChannel];
@@ -1128,11 +1082,7 @@
double
channel_distortion[CompositeChannels+1];
- register const IndexPacket
- *restrict indexes,
- *restrict reconstruct_indexes;
-
- register const PixelPacket
+ register const Quantum
*restrict p,
*restrict q;
@@ -1145,13 +1095,11 @@
p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
q=GetCacheViewVirtualPixels(reconstruct_view,0,y,
reconstruct_image->columns,1,exception);
- if ((p == (const PixelPacket *) NULL) || (q == (const PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (const Quantum *) NULL))
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewVirtualIndexQueue(image_view);
- reconstruct_indexes=GetCacheViewVirtualIndexQueue(reconstruct_view);
(void) ResetMagickMemory(channel_distortion,0,sizeof(channel_distortion));
for (x=0; x < (ssize_t) image->columns; x++)
{
@@ -1160,8 +1108,8 @@
if ((channel & RedChannel) != 0)
{
- distance=QuantumScale*fabs(GetPixelRed(p)-(double)
- GetPixelRed(q));
+ distance=QuantumScale*fabs(GetPixelRed(image,p)-(double)
+ GetPixelRed(reconstruct_image,q));
if (distance > channel_distortion[RedChannel])
channel_distortion[RedChannel]=distance;
if (distance > channel_distortion[CompositeChannels])
@@ -1169,8 +1117,8 @@
}
if ((channel & GreenChannel) != 0)
{
- distance=QuantumScale*fabs(GetPixelGreen(p)-(double)
- GetPixelGreen(q));
+ distance=QuantumScale*fabs(GetPixelGreen(image,p)-(double)
+ GetPixelGreen(reconstruct_image,q));
if (distance > channel_distortion[GreenChannel])
channel_distortion[GreenChannel]=distance;
if (distance > channel_distortion[CompositeChannels])
@@ -1178,36 +1126,36 @@
}
if ((channel & BlueChannel) != 0)
{
- distance=QuantumScale*fabs(GetPixelBlue(p)-(double)
- GetPixelBlue(q));
+ distance=QuantumScale*fabs(GetPixelBlue(image,p)-(double)
+ GetPixelBlue(reconstruct_image,q));
if (distance > channel_distortion[BlueChannel])
channel_distortion[BlueChannel]=distance;
if (distance > channel_distortion[CompositeChannels])
channel_distortion[CompositeChannels]=distance;
}
+ if (((channel & BlackChannel) != 0) &&
+ (image->colorspace == CMYKColorspace) &&
+ (reconstruct_image->colorspace == CMYKColorspace))
+ {
+ distance=QuantumScale*fabs(GetPixelBlack(image,p)-(double)
+ GetPixelBlack(reconstruct_image,q));
+ if (distance > channel_distortion[BlackChannel])
+ channel_distortion[BlackChannel]=distance;
+ if (distance > channel_distortion[CompositeChannels])
+ channel_distortion[CompositeChannels]=distance;
+ }
if (((channel & OpacityChannel) != 0) &&
(image->matte != MagickFalse))
{
- distance=QuantumScale*fabs(GetPixelOpacity(p)-(double)
- GetPixelOpacity(q));
+ distance=QuantumScale*fabs(GetPixelAlpha(image,p)-(double)
+ GetPixelAlpha(reconstruct_image,q));
if (distance > channel_distortion[OpacityChannel])
channel_distortion[OpacityChannel]=distance;
if (distance > channel_distortion[CompositeChannels])
channel_distortion[CompositeChannels]=distance;
}
- if (((channel & IndexChannel) != 0) &&
- (image->colorspace == CMYKColorspace) &&
- (reconstruct_image->colorspace == CMYKColorspace))
- {
- distance=QuantumScale*fabs(GetPixelIndex(indexes+x)-(double)
- GetPixelIndex(reconstruct_indexes+x));
- if (distance > channel_distortion[BlackChannel])
- channel_distortion[BlackChannel]=distance;
- if (distance > channel_distortion[CompositeChannels])
- channel_distortion[CompositeChannels]=distance;
- }
- p++;
- q++;
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(image);
}
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp critical (MagickCore_GetPeakAbsoluteError)
@@ -1243,7 +1191,7 @@
(image->matte != MagickFalse))
distortion[OpacityChannel]=20.0*log10((double) 1.0/sqrt(
distortion[OpacityChannel]));
- if (((channel & IndexChannel) != 0) &&
+ if (((channel & BlackChannel) != 0) &&
(image->colorspace == CMYKColorspace))
distortion[BlackChannel]=20.0*log10((double) 1.0/sqrt(
distortion[BlackChannel]));
@@ -1267,12 +1215,12 @@
distortion[GreenChannel]=sqrt(distortion[GreenChannel]);
if ((channel & BlueChannel) != 0)
distortion[BlueChannel]=sqrt(distortion[BlueChannel]);
+ if (((channel & BlackChannel) != 0) &&
+ (image->colorspace == CMYKColorspace))
+ distortion[BlackChannel]=sqrt(distortion[BlackChannel]);
if (((channel & OpacityChannel) != 0) &&
(image->matte != MagickFalse))
distortion[OpacityChannel]=sqrt(distortion[OpacityChannel]);
- if (((channel & IndexChannel) != 0) &&
- (image->colorspace == CMYKColorspace))
- distortion[BlackChannel]=sqrt(distortion[BlackChannel]);
distortion[CompositeChannels]=sqrt(distortion[CompositeChannels]);
return(status);
}
@@ -1598,11 +1546,7 @@
reconstruct_view=AcquireCacheView(reconstruct_image);
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const IndexPacket
- *restrict indexes,
- *restrict reconstruct_indexes;
-
- register const PixelPacket
+ register const Quantum
*restrict p,
*restrict q;
@@ -1612,31 +1556,29 @@
p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
q=GetCacheViewVirtualPixels(reconstruct_view,0,y,reconstruct_image->columns,
1,exception);
- if ((p == (const PixelPacket *) NULL) || (q == (const PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (const Quantum *) NULL))
break;
- indexes=GetCacheViewVirtualIndexQueue(image_view);
- reconstruct_indexes=GetCacheViewVirtualIndexQueue(reconstruct_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
MagickRealType
distance;
- distance=fabs(GetPixelRed(p)-(double)
- GetPixelRed(q));
+ distance=fabs(GetPixelRed(image,p)-(double)
+ GetPixelRed(reconstruct_image,q));
mean_error_per_pixel+=distance;
mean_error+=distance*distance;
if (distance > maximum_error)
maximum_error=distance;
area++;
- distance=fabs(GetPixelGreen(p)-(double)
- GetPixelGreen(q));
+ distance=fabs(GetPixelGreen(image,p)-(double)
+ GetPixelGreen(reconstruct_image,q));
mean_error_per_pixel+=distance;
mean_error+=distance*distance;
if (distance > maximum_error)
maximum_error=distance;
area++;
- distance=fabs(GetPixelBlue(p)-(double)
- GetPixelBlue(q));
+ distance=fabs(GetPixelBlue(image,p)-(double)
+ GetPixelBlue(reconstruct_image,q));
mean_error_per_pixel+=distance;
mean_error+=distance*distance;
if (distance > maximum_error)
@@ -1644,8 +1586,8 @@
area++;
if (image->matte != MagickFalse)
{
- distance=fabs(GetPixelOpacity(p)-(double)
- GetPixelOpacity(q));
+ distance=fabs(GetPixelAlpha(image,p)-(double)
+ GetPixelAlpha(reconstruct_image,q));
mean_error_per_pixel+=distance;
mean_error+=distance*distance;
if (distance > maximum_error)
@@ -1655,16 +1597,16 @@
if ((image->colorspace == CMYKColorspace) &&
(reconstruct_image->colorspace == CMYKColorspace))
{
- distance=fabs(GetPixelIndex(indexes+x)-(double)
- GetPixelIndex(reconstruct_indexes+x));
+ distance=fabs(GetPixelBlack(image,p)-(double)
+ GetPixelBlack(reconstruct_image,q));
mean_error_per_pixel+=distance;
mean_error+=distance*distance;
if (distance > maximum_error)
maximum_error=distance;
area++;
}
- p++;
- q++;
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(reconstruct_image);
}
}
reconstruct_view=DestroyCacheView(reconstruct_view);
@@ -1752,11 +1694,7 @@
reconstruct_view=AcquireCacheView(reconstruct_image);
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const IndexPacket
- *restrict indexes,
- *restrict reconstruct_indexes;
-
- register const PixelPacket
+ register const Quantum
*restrict p,
*restrict q;
@@ -1768,35 +1706,38 @@
p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
q=GetCacheViewVirtualPixels(reconstruct_view,0,y,reconstruct_image->columns,
1,exception);
- if ((p == (const PixelPacket *) NULL) || (q == (const PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (const Quantum *) NULL))
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewVirtualIndexQueue(image_view);
- reconstruct_indexes=GetCacheViewVirtualIndexQueue(reconstruct_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
- distortion+=area*QuantumScale*(GetPixelRed(p)-
- image_statistics[RedChannel].mean)*(GetPixelRed(q)-
+ distortion+=area*QuantumScale*(GetPixelRed(image,p)-
+ image_statistics[RedChannel].mean)*(
+ GetPixelRed(reconstruct_image,q)-
reconstruct_statistics[RedChannel].mean);
- distortion+=area*QuantumScale*(GetPixelGreen(p)-
- image_statistics[GreenChannel].mean)*(GetPixelGreen(q)-
+ distortion+=area*QuantumScale*(GetPixelGreen(image,p)-
+ image_statistics[GreenChannel].mean)*(
+ GetPixelGreen(reconstruct_image,q)-
reconstruct_statistics[GreenChannel].mean);
- distortion+=area*QuantumScale*(GetPixelBlue(p)-
- image_statistics[BlueChannel].mean)*(q->blue-
+ distortion+=area*QuantumScale*(GetPixelBlue(image,p)-
+ GetPixelBlue(reconstruct_image,q)-
+ image_statistics[BlueChannel].mean)*(
reconstruct_statistics[BlueChannel].mean);
- if (image->matte != MagickFalse)
- distortion+=area*QuantumScale*(GetPixelOpacity(p)-
- image_statistics[OpacityChannel].mean)*(GetPixelOpacity(q)-
- reconstruct_statistics[OpacityChannel].mean);
if ((image->colorspace == CMYKColorspace) &&
(reconstruct_image->colorspace == CMYKColorspace))
- distortion+=area*QuantumScale*(GetPixelIndex(indexes+x)-
- image_statistics[BlackChannel].mean)*(GetPixelIndex(
- reconstruct_indexes+x)-reconstruct_statistics[BlackChannel].mean);
- p++;
- q++;
+ distortion+=area*QuantumScale*(GetPixelBlack(image,p)-
+ image_statistics[BlackChannel].mean)*(
+ GetPixelBlack(reconstruct_image,q)-
+ reconstruct_statistics[BlackChannel].mean);
+ if (image->matte != MagickFalse)
+ distortion+=area*QuantumScale*(GetPixelAlpha(image,p)-
+ image_statistics[OpacityChannel].mean)*(
+ GetPixelAlpha(reconstruct_image,q)-
+ reconstruct_statistics[OpacityChannel].mean);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(reconstruct_image);
}
}
reconstruct_view=DestroyCacheView(reconstruct_view);
@@ -1909,14 +1850,14 @@
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(similarity_view,0,y,similarity_image->columns,
1,exception);
- if (q == (const PixelPacket *) NULL)
+ if (q == (Quantum *) NULL)
{
status=MagickFalse;
continue;
@@ -1934,11 +1875,11 @@
offset->x=x;
offset->y=y;
}
- SetPixelRed(q,ClampToQuantum(QuantumRange-QuantumRange*
- similarity));
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- q++;
+ SetPixelRed(similarity_image,ClampToQuantum(QuantumRange-
+ QuantumRange*similarity),q);
+ SetPixelGreen(similarity_image,GetPixelRed(image,q),q);
+ SetPixelBlue(similarity_image,GetPixelRed(image,q),q);
+ q+=GetPixelChannels(similarity_image);
}
if (SyncCacheViewAuthenticPixels(similarity_view,exception) == MagickFalse)
status=MagickFalse;
diff --git a/magick/compare.h b/MagickCore/compare.h
similarity index 97%
rename from magick/compare.h
rename to MagickCore/compare.h
index a0439d2..bccb133 100644
--- a/magick/compare.h
+++ b/MagickCore/compare.h
@@ -22,7 +22,7 @@
extern "C" {
#endif
-#include "magick/image.h"
+#include "MagickCore/image.h"
typedef enum
{
diff --git a/MagickCore/composite-private.h b/MagickCore/composite-private.h
new file mode 100644
index 0000000..745c617
--- /dev/null
+++ b/MagickCore/composite-private.h
@@ -0,0 +1,177 @@
+/*
+ Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization
+ dedicated to making software imaging solutions freely available.
+
+ You may not use this file except in compliance with the License.
+ obtain a copy of the License at
+
+ http://www.imagemagick.org/script/license.php
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ MagickCore image composite private methods.
+*/
+#ifndef _MAGICKCORE_COMPOSITE_PRIVATE_H
+#define _MAGICKCORE_COMPOSITE_PRIVATE_H
+
+#if defined(__cplusplus) || defined(c_plusplus)
+extern "C" {
+#endif
+
+/*
+ ImageMagick Alpha Composite Inline Methods (special export)
+*/
+
+#include "MagickCore/color.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/pixel-accessor.h"
+
+static inline MagickRealType MagickOver_(const MagickRealType p,
+ const MagickRealType alpha,const MagickRealType q,const MagickRealType beta)
+{
+ MagickRealType
+ Da,
+ Sa;
+
+ Sa=QuantumScale*alpha;
+ Da=QuantumScale*beta;
+ return(Sa*p-Sa*Da*q+Da*q);
+}
+
+static inline void CompositePixelOver(const Image *image,const PixelPacket *p,
+ const MagickRealType alpha,const Quantum *q,const MagickRealType beta,
+ Quantum *composite)
+{
+ MagickRealType
+ Da,
+ gamma,
+ Sa;
+
+ /*
+ Compose pixel p over pixel q with the given opacities.
+ */
+ if (alpha == TransparentAlpha)
+ {
+ if (composite != q)
+ {
+ SetPixelRed(image,GetPixelRed(image,q),composite);
+ SetPixelGreen(image,GetPixelGreen(image,q),composite);
+ SetPixelBlue(image,GetPixelBlue(image,q),composite);
+ SetPixelAlpha(image,GetPixelAlpha(image,q),composite);
+ }
+ return;
+ }
+ Sa=QuantumScale*alpha;
+ Da=QuantumScale*beta,
+ gamma=Sa*(-Da)+Sa+Da;
+#if !defined(MAGICKCORE_HDRI_SUPPORT)
+ SetPixelAlpha(image,(Quantum) (QuantumRange*gamma+0.5),composite);
+ gamma=1.0/(gamma <= MagickEpsilon ? 1.0 : gamma);
+ SetPixelRed(image,(Quantum) (gamma*MagickOver_((MagickRealType) p->red,
+ alpha,(MagickRealType) GetPixelRed(image,q),beta)+0.5),composite);
+ SetPixelGreen(image,(Quantum) (gamma*MagickOver_((MagickRealType) p->green,
+ alpha,(MagickRealType) GetPixelGreen(image,q),beta)+0.5),composite);
+ SetPixelBlue(image,(Quantum) (gamma*MagickOver_((MagickRealType) p->blue,
+ alpha,(MagickRealType) GetPixelBlue(image,q),beta)+0.5),composite);
+#else
+ SetPixelAlpha(image,QuantumRange*gamma,composite);
+ gamma=1.0/(gamma <= MagickEpsilon ? 1.0 : gamma);
+ SetPixelRed(image,(Quantum) (gamma*MagickOver_((MagickRealType) p->red,
+ alpha,(MagickRealType) GetPixelRed(image,q),beta)),composite);
+ SetPixelGreen(image,(Quantum) (gamma*MagickOver_((MagickRealType) p->green,
+ alpha,(MagickRealType) GetPixelGreen(image,q),beta)),composite);
+ SetPixelBlue(image,(Quantum) (gamma*MagickOver_((MagickRealType) p->blue,
+ alpha,(MagickRealType) GetPixelBlue(image,q),beta)),composite);
+#endif
+}
+
+static inline void CompositePixelInfoOver(const PixelInfo *p,
+ const MagickRealType alpha,const PixelInfo *q,const MagickRealType beta,
+ PixelInfo *composite)
+{
+ MagickRealType
+ Da,
+ gamma,
+ Sa;
+
+ /*
+ Compose pixel p over pixel q with the given opacities.
+ */
+ if (alpha == OpaqueAlpha)
+ {
+ *composite=(*p);
+ return;
+ }
+ Sa=QuantumScale*alpha;
+ Da=QuantumScale*beta,
+ gamma=Sa*(-Da)+Sa+Da;
+ composite->alpha=(MagickRealType) QuantumRange*gamma;
+ gamma=1.0/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma);
+ composite->red=gamma*MagickOver_(p->red,alpha,q->red,beta);
+ composite->green=gamma*MagickOver_(p->green,alpha,q->green,beta);
+ composite->blue=gamma*MagickOver_(p->blue,alpha,q->blue,beta);
+ if (q->colorspace == CMYKColorspace)
+ composite->black=gamma*MagickOver_(p->black,alpha,q->black,beta);
+}
+
+static inline MagickRealType RoundToUnity(const MagickRealType value)
+{
+ return(value < 0.0 ? 0.0 : (value > 1.0) ? 1.0 : value);
+}
+
+static inline void CompositePixelInfoPlus(const PixelInfo *p,
+ const MagickRealType alpha,const PixelInfo *q,const MagickRealType beta,
+ PixelInfo *composite)
+{
+ MagickRealType
+ Da,
+ gamma,
+ Sa;
+
+ /*
+ Add two pixels with the given opacities.
+ */
+ Sa=QuantumScale*alpha;
+ Da=QuantumScale*beta;
+ gamma=RoundToUnity(Sa+Da); /* 'Plus' blending -- not 'Over' blending */
+ composite->alpha=(MagickRealType) QuantumRange*gamma;
+ gamma=1.0/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma);
+ composite->red=gamma*(Sa*p->red+Da*q->red);
+ composite->green=gamma*(Sa*p->green+Da*q->green);
+ composite->blue=gamma*(Sa*p->blue+Da*q->blue);
+ if (q->colorspace == CMYKColorspace)
+ composite->black=gamma*(Sa*p->black+Da*q->black);
+}
+
+static inline void CompositePixelInfoAreaBlend(const PixelInfo *p,
+ const MagickRealType alpha,const PixelInfo *q,const MagickRealType beta,
+ const MagickRealType area,PixelInfo *composite)
+{
+ /*
+ Blend pixel colors p and q by the amount given and area.
+ */
+ CompositePixelInfoPlus(p,(MagickRealType) (1.0-area)*alpha,q,(MagickRealType)
+ (area*beta),composite);
+}
+
+static inline void CompositePixelInfoBlend(const PixelInfo *p,
+ const MagickRealType alpha,const PixelInfo *q,const MagickRealType beta,
+ PixelInfo *composite)
+{
+ /*
+ Blend pixel colors p and q by the amount given.
+ */
+ CompositePixelInfoPlus(p,(MagickRealType) (alpha*p->alpha),q,(MagickRealType)
+ (beta*q->alpha),composite);
+}
+
+#if defined(__cplusplus) || defined(c_plusplus)
+}
+#endif
+
+#endif
diff --git a/MagickCore/composite.c b/MagickCore/composite.c
new file mode 100644
index 0000000..428d827
--- /dev/null
+++ b/MagickCore/composite.c
@@ -0,0 +1,2922 @@
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% %
+% %
+% %
+% CCCC OOO M M PPPP OOO SSSSS IIIII TTTTT EEEEE %
+% C O O MM MM P P O O SS I T E %
+% C O O M M M PPPP O O SSS I T EEE %
+% C O O M M P O O SS I T E %
+% CCCC OOO M M P OOO SSSSS IIIII T EEEEE %
+% %
+% %
+% MagickCore Image Composite Methods %
+% %
+% Software Design %
+% John Cristy %
+% July 1992 %
+% %
+% %
+% Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization %
+% dedicated to making software imaging solutions freely available. %
+% %
+% You may not use this file except in compliance with the License. You may %
+% obtain a copy of the License at %
+% %
+% http://www.imagemagick.org/script/license.php %
+% %
+% Unless required by applicable law or agreed to in writing, software %
+% distributed under the License is distributed on an "AS IS" BASIS, %
+% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. %
+% See the License for the specific language governing permissions and %
+% limitations under the License. %
+% %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%
+%
+*/
+
+/*
+ Include declarations.
+*/
+#include "MagickCore/studio.h"
+#include "MagickCore/artifact.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/cache-view.h"
+#include "MagickCore/client.h"
+#include "MagickCore/color.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/colorspace-private.h"
+#include "MagickCore/composite.h"
+#include "MagickCore/composite-private.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/draw.h"
+#include "MagickCore/fx.h"
+#include "MagickCore/gem.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/log.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/option.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/property.h"
+#include "MagickCore/quantum.h"
+#include "MagickCore/resample.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/thread-private.h"
+#include "MagickCore/utility.h"
+#include "MagickCore/version.h"
+
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% %
+% %
+% %
+% C o m p o s i t e I m a g e C h a n n e l %
+% %
+% %
+% %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% CompositeImageChannel() returns the second image composited onto the first
+% at the specified offset, using the specified composite method.
+%
+% The format of the CompositeImageChannel method is:
+%
+% MagickBooleanType CompositeImage(Image *image,
+% const CompositeOperator compose,Image *composite_image,
+% const ssize_t x_offset,const ssize_t y_offset)
+% MagickBooleanType CompositeImageChannel(Image *image,
+% const ChannelType channel,const CompositeOperator compose,
+% Image *composite_image,const ssize_t x_offset,const ssize_t y_offset)
+%
+% A description of each parameter follows:
+%
+% o image: the destination image, modified by he composition
+%
+% o channel: the channel.
+%
+% o compose: This operator affects how the composite is applied to
+% the image. The operators and how they are utilized are listed here
+% http://www.w3.org/TR/SVG12/#compositing.
+%
+% o composite_image: the composite (source) image.
+%
+% o x_offset: the column offset of the composited image.
+%
+% o y_offset: the row offset of the composited image.
+%
+% Extra Controls from Image meta-data in 'composite_image' (artifacts)
+%
+% o "compose:args"
+% A string containing extra numerical arguments for specific compose
+% methods, generally expressed as a 'geometry' or a comma separated list
+% of numbers.
+%
+% Compose methods needing such arguments include "BlendCompositeOp" and
+% "DisplaceCompositeOp".
+%
+% o "compose:outside-overlay"
+% Modify how the composition is to effect areas not directly covered
+% by the 'composite_image' at the offset given. Normally this is
+% dependant on the 'compose' method, especially Duff-Porter methods.
+%
+% If set to "false" then disable all normal handling of pixels not
+% covered by the composite_image. Typically used for repeated tiling
+% of the composite_image by the calling API.
+%
+% Previous to IM v6.5.3-3 this was called "modify-outside-overlay"
+%
+*/
+
+static inline double MagickMin(const double x,const double y)
+{
+ if (x < y)
+ return(x);
+ return(y);
+}
+static inline double MagickMax(const double x,const double y)
+{
+ if (x > y)
+ return(x);
+ return(y);
+}
+
+/*
+ Programmers notes on SVG specification.
+
+ A Composition is defined by...
+ Color Function : f(Sc,Dc) where Sc and Dc are the normizalized colors
+ Blending areas : X = 1 for area of overlap ie: f(Sc,Dc)
+ Y = 1 for source preserved
+ Z = 1 for destination preserved
+
+ Conversion to transparency (then optimized)
+ Dca' = f(Sc, Dc)*Sa*Da + Y*Sca*(1-Da) + Z*Dca*(1-Sa)
+ Da' = X*Sa*Da + Y*Sa*(1-Da) + Z*Da*(1-Sa)
+
+ Where...
+ Sca = Sc*Sa normalized Source color divided by Source alpha
+ Dca = Dc*Da normalized Dest color divided by Dest alpha
+ Dc' = Dca'/Da' the desired color value for this channel.
+
+ Da' in in the follow formula as 'gamma' The resulting alpla value.
+
+ Most functions use a blending mode of over (X=1,Y=1,Z=1)
+ this results in the following optimizations...
+ gamma = Sa+Da-Sa*Da;
+ gamma = 1 - QuantiumScale*alpha * QuantiumScale*beta;
+ opacity = QuantiumScale*alpha*beta; // over blend, optimized 1-Gamma
+
+ The above SVG definitions also definate that Mathematical Composition
+ methods should use a 'Over' blending mode for Alpha Channel.
+ It however was not applied for composition modes of 'Plus', 'Minus',
+ the modulus versions of 'Add' and 'Subtract'.
+
+ Mathematical operator changes to be applied from IM v6.7...
+
+ 1/ Modulus modes 'Add' and 'Subtract' are obsoleted and renamed
+ 'ModulusAdd' and 'ModulusSubtract' for clarity.
+
+ 2/ All mathematical compositions work as per the SVG specification
+ with regard to blending. This now includes 'ModulusAdd' and
+ 'ModulusSubtract'.
+
+ 3/ When the special channel flag 'sync' (syncronize channel updates)
+ is turned off (enabled by default) then mathematical compositions are
+ only performed on the channels specified, and are applied
+ independantally of each other. In other words the mathematics is
+ performed as 'pure' mathematical operations, rather than as image
+ operations.
+*/
+
+static inline MagickRealType Atop(const MagickRealType p,
+ const MagickRealType Sa,const MagickRealType q,
+ const MagickRealType magick_unused(Da))
+{
+ return(p*Sa+q*(1.0-Sa)); /* Da optimized out, Da/gamma => 1.0 */
+}
+
+static inline void CompositeAtop(const PixelInfo *p,const PixelInfo *q,
+ PixelInfo *composite)
+{
+ MagickRealType
+ Sa;
+
+ Sa=QuantumScale*p->alpha; /* simplify and speed up equations */
+ composite->alpha=q->alpha; /* optimized Da = 1.0-Gamma */
+ composite->red=Atop(p->red,Sa,q->red,1.0);
+ composite->green=Atop(p->green,Sa,q->green,1.0);
+ composite->blue=Atop(p->blue,Sa,q->blue,1.0);
+ if (q->colorspace == CMYKColorspace)
+ composite->black=Atop(p->black,Sa,q->black,1.0);
+}
+
+/*
+ What is this Composition method for? Can't find any specification!
+ WARNING this is not doing correct 'over' blend handling (Anthony Thyssen).
+*/
+static inline void CompositeBumpmap(const PixelInfo *p,const PixelInfo *q,
+ PixelInfo *composite)
+{
+ MagickRealType
+ intensity;
+
+ intensity=(MagickRealType) GetPixelInfoIntensity(p);
+ composite->red=QuantumScale*intensity*q->red;
+ composite->green=QuantumScale*intensity*q->green;
+ composite->blue=QuantumScale*intensity*q->blue;
+ composite->alpha=(MagickRealType) QuantumScale*intensity*p->alpha;
+ if (q->colorspace == CMYKColorspace)
+ composite->black=QuantumScale*intensity*q->black;
+}
+
+static inline void CompositeClear(const PixelInfo *q,PixelInfo *composite)
+{
+ composite->alpha=(MagickRealType) TransparentAlpha;
+ composite->red=0.0;
+ composite->green=0.0;
+ composite->blue=0.0;
+ if (q->colorspace == CMYKColorspace)
+ composite->black=0.0;
+}
+
+static MagickRealType ColorBurn(const MagickRealType Sca,
+ const MagickRealType Sa, const MagickRealType Dca,const MagickRealType Da)
+{
+ if ((fabs(Sca) < MagickEpsilon) && (fabs(Dca-Da) < MagickEpsilon))
+ return(Sa*Da+Dca*(1.0-Sa));
+ if (Sca < MagickEpsilon)
+ return(Dca*(1.0-Sa));
+ return(Sa*Da-Sa*MagickMin(Da,(Da-Dca)*Sa/Sca)+Sca*(1.0-Da)+Dca*(1.0-Sa));
+}
+
+static inline void CompositeColorBurn(const PixelInfo *p,const PixelInfo *q,
+ PixelInfo *composite)
+{
+ MagickRealType
+ Da,
+ gamma,
+ Sa;
+
+ Sa=QuantumScale*p->alpha; /* simplify and speed up equations */
+ Da=QuantumScale*q->alpha;
+ gamma=RoundToUnity(Sa+Da-Sa*Da); /* over blend, as per SVG doc */
+ composite->alpha=(MagickRealType) QuantumRange*gamma;
+ gamma=QuantumRange/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma);
+ composite->red=gamma*ColorBurn(QuantumScale*p->red*Sa,Sa,QuantumScale*
+ q->red*Da,Da);
+ composite->green=gamma*ColorBurn(QuantumScale*p->green*Sa,Sa,QuantumScale*
+ q->green*Da,Da);
+ composite->blue=gamma*ColorBurn(QuantumScale*p->blue*Sa,Sa,QuantumScale*
+ q->blue*Da,Da);
+ if (q->colorspace == CMYKColorspace)
+ composite->black=gamma*ColorBurn(QuantumScale*p->black*Sa,Sa,QuantumScale*
+ q->black*Da,Da);
+}
+
+
+static MagickRealType ColorDodge(const MagickRealType Sca,
+ const MagickRealType Sa,const MagickRealType Dca,const MagickRealType Da)
+{
+ /*
+ Working from first principles using the original formula:
+
+ f(Sc,Dc) = Dc/(1-Sc)
+
+ This works correctly! Looks like the 2004 SVG model was right but just
+ required a extra condition for correct handling.
+ */
+ if ((fabs(Sca-Sa) < MagickEpsilon) && (fabs(Dca) < MagickEpsilon))
+ return(Sca*(1.0-Da)+Dca*(1.0-Sa));
+ if (fabs(Sca-Sa) < MagickEpsilon)
+ return(Sa*Da+Sca*(1.0-Da)+Dca*(1.0-Sa));
+ return(Dca*Sa*Sa/(Sa-Sca)+Sca*(1.0-Da)+Dca*(1.0-Sa));
+}
+
+static inline void CompositeColorDodge(const PixelInfo *p,const PixelInfo *q,
+ PixelInfo *composite)
+{
+ MagickRealType
+ Da,
+ gamma,
+ Sa;
+
+ Sa=QuantumScale*p->alpha; /* simplify and speed up equations */
+ Da=QuantumScale*q->alpha;
+ gamma=RoundToUnity(Sa+Da-Sa*Da); /* over blend, as per SVG doc */
+ composite->alpha=(MagickRealType) QuantumRange*gamma;
+ gamma=QuantumRange/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma);
+ composite->red=gamma*ColorDodge(QuantumScale*p->red*Sa,Sa,QuantumScale*
+ q->red*Da,Da);
+ composite->green=gamma*ColorDodge(QuantumScale*p->green*Sa,Sa,QuantumScale*
+ q->green*Da,Da);
+ composite->blue=gamma*ColorDodge(QuantumScale*p->blue*Sa,Sa,QuantumScale*
+ q->blue*Da,Da);
+ if (q->colorspace == CMYKColorspace)
+ composite->black=gamma*ColorDodge(QuantumScale*p->black*Sa,Sa,QuantumScale*
+ q->black*Da,Da);
+}
+
+static inline MagickRealType Darken(const MagickRealType p,
+ const MagickRealType alpha,const MagickRealType q,const MagickRealType beta)
+{
+ if (p < q)
+ return(MagickOver_(p,alpha,q,beta)); /* src-over */
+ return(MagickOver_(q,beta,p,alpha)); /* dst-over */
+}
+
+static inline void CompositeDarken(const PixelInfo *p,const PixelInfo *q,
+ const ChannelType channel,PixelInfo *composite)
+{
+ MagickRealType
+ gamma;
+
+ /*
+ Darken is equivalent to a 'Minimum' method OR a greyscale version of a
+ binary 'Or' OR the 'Intersection' of pixel sets.
+ */
+ if ((channel & SyncChannels) == 0)
+ {
+ /*
+ Handle channels as separate grayscale channels.
+ */
+ if ((channel & RedChannel) != 0)
+ composite->red=MagickMin(p->red,q->red);
+ if ((channel & GreenChannel) != 0)
+ composite->green=MagickMin(p->green,q->green);
+ if ((channel & BlueChannel) != 0)
+ composite->blue=MagickMin(p->blue,q->blue);
+ if ((channel & BlackChannel) != 0 &&
+ (q->colorspace == CMYKColorspace))
+ composite->black=MagickMin(p->black,q->black);
+ if ((channel & AlphaChannel) != 0)
+ composite->alpha=MagickMax(p->alpha,q->alpha);
+ return;
+ }
+ composite->alpha=QuantumScale*p->alpha*q->alpha; /* Over Blend */
+ gamma=1.0-QuantumScale*composite->alpha;
+ gamma=1.0/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma);
+ composite->red=gamma*Darken(p->red,p->alpha,q->red,q->alpha);
+ composite->green=gamma*Darken(p->green,p->alpha,q->green,q->alpha);
+ composite->blue=gamma*Darken(p->blue,p->alpha,q->blue,q->alpha);
+ if (q->colorspace == CMYKColorspace)
+ composite->black=gamma*Darken(p->black,p->alpha,q->black,q->alpha);
+}
+
+static inline void CompositeDarkenIntensity(const PixelInfo *p,
+ const PixelInfo *q,const ChannelType channel,PixelInfo *composite)
+{
+ MagickRealType
+ Da,
+ Sa;
+
+ /*
+ Select the pixel based on the intensity level.
+ If 'Sync' flag select whole pixel based on alpha weighted intensity.
+ Otherwise use intensity only, but restrict copy according to channel.
+ */
+ if ((channel & SyncChannels) == 0)
+ {
+ MagickBooleanType
+ from_p;
+
+ from_p=GetPixelInfoIntensity(p) < GetPixelInfoIntensity(q) ? MagickTrue :
+ MagickFalse;
+ if ((channel & RedChannel) != 0)
+ composite->red=from_p != MagickFalse ? p->red : q->red;
+ if ((channel & GreenChannel) != 0)
+ composite->green=from_p != MagickFalse ? p->green : q->green;
+ if ((channel & BlueChannel) != 0)
+ composite->blue=from_p != MagickFalse ? p->blue : q->blue;
+ if (((channel & BlackChannel) != 0) &&
+ (q->colorspace == CMYKColorspace))
+ composite->black=from_p != MagickFalse ? p->black : q->black;
+ if ((channel & AlphaChannel) != 0)
+ composite->alpha=from_p != MagickFalse ? p->alpha : q->alpha;
+ return;
+ }
+ Sa=QuantumScale*p->alpha;
+ Da=QuantumScale*q->alpha;
+ *composite=(Sa*GetPixelInfoIntensity(p) < Da*GetPixelInfoIntensity(q)) ?
+ *p : *q;
+}
+
+static inline MagickRealType Difference(const MagickRealType p,
+ const MagickRealType Sa,const MagickRealType q,const MagickRealType Da)
+{
+ /*
+ Optimized by Multipling by QuantumRange (taken from gamma).
+ */
+ return(Sa*p+Da*q-Sa*Da*2.0*MagickMin(p,q));
+}
+
+static inline void CompositeDifference(const PixelInfo *p,
+ const PixelInfo *q,const ChannelType channel,PixelInfo *composite)
+{
+ MagickRealType
+ Da,
+ gamma,
+ Sa;
+
+ Sa=QuantumScale*p->alpha; /* simplify and speed up equations */
+ Da=QuantumScale*q->alpha;
+ if ((channel & SyncChannels) == 0)
+ {
+ /*
+ Handle channels as separate grayscale channels.
+ */
+ if ((channel & RedChannel) != 0)
+ composite->red=fabs((double) (p->red-q->red));
+ if ((channel & GreenChannel) != 0)
+ composite->green=fabs((double) (p->green-q->green));
+ if ((channel & BlueChannel) != 0)
+ composite->blue=fabs((double) (p->blue-q->blue));
+ if (((channel & BlackChannel) != 0) &&
+ (q->colorspace == CMYKColorspace))
+ composite->black=fabs((double) (p->black-q->black));
+ if ((channel & AlphaChannel) != 0)
+ composite->alpha=fabs((double) (p->alpha-q->alpha));
+ return;
+ }
+ gamma=RoundToUnity(Sa+Da-Sa*Da); /* over blend, as per SVG doc */
+ composite->alpha=(MagickRealType) QuantumRange*gamma;
+ gamma=1.0/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma);
+ composite->red=gamma*Difference(p->red,Sa,q->red,Da);
+ composite->green=gamma*Difference(p->green,Sa,q->green,Da);
+ composite->blue=gamma*Difference(p->blue,Sa,q->blue,Da);
+ if (q->colorspace == CMYKColorspace)
+ composite->black=gamma*Difference(p->black,Sa,q->black,Da);
+}
+
+static MagickRealType Divide(const MagickRealType Sca,const MagickRealType Sa,
+ const MagickRealType Dca,const MagickRealType Da)
+{
+ /*
+ Divide Source by Destination
+
+ f(Sc,Dc) = Sc / Dc
+
+ But with appropriate handling for special case of Dc == 0 specifically
+ so that f(Black,Black)=Black and f(non-Black,Black)=White.
+ It is however also important to correctly do 'over' alpha blending which
+ is why the formula becomes so complex.
+ */
+ if ((fabs(Sca) < MagickEpsilon) && (fabs(Dca) < MagickEpsilon))
+ return(Sca*(1.0-Da)+Dca*(1.0-Sa));
+ if (fabs(Dca) < MagickEpsilon)
+ return(Sa*Da+Sca*(1.0-Da)+Dca*(1.0-Sa));
+ return(Sca*Da*Da/Dca+Sca*(1.0-Da)+Dca*(1.0-Sa));
+}
+
+static inline void CompositeDivide(const PixelInfo *p,const PixelInfo *q,
+ const ChannelType channel,PixelInfo *composite)
+{
+ MagickRealType
+ Da,
+ gamma,
+ Sa;
+
+ Sa=QuantumScale*p->alpha; /* simplify and speed up equations */
+ Da=QuantumScale*q->alpha;
+ if ((channel & SyncChannels) == 0)
+ {
+ /*
+ Handle channels as separate grayscale channels.
+ */
+ if ((channel & RedChannel) != 0)
+ composite->red=QuantumRange*Divide(QuantumScale*p->red,1.0,
+ QuantumScale*q->red,1.0);
+ if ((channel & GreenChannel) != 0)
+ composite->green=QuantumRange*Divide(QuantumScale*p->green,1.0,
+ QuantumScale*q->green,1.0);
+ if ((channel & BlueChannel) != 0)
+ composite->blue=QuantumRange*Divide(QuantumScale*p->blue,1.0,
+ QuantumScale*q->blue,1.0);
+ if (((channel & BlackChannel) != 0) &&
+ (q->colorspace == CMYKColorspace))
+ composite->black=QuantumRange*Divide(QuantumScale*p->black,1.0,
+ QuantumScale*q->black,1.0);
+ if ((channel & AlphaChannel) != 0)
+ composite->alpha=QuantumRange*(1.0-Divide(Sa,1.0,Da,1.0));
+ return;
+ }
+ gamma=RoundToUnity(Sa+Da-Sa*Da); /* over blend, as per SVG doc */
+ composite->alpha=(MagickRealType) QuantumRange*gamma;
+ gamma=QuantumRange/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma);
+ composite->red=gamma*Divide(QuantumScale*p->red*Sa,Sa,QuantumScale*
+ q->red*Da,Da);
+ composite->green=gamma*Divide(QuantumScale*p->green*Sa,Sa,QuantumScale*
+ q->green*Da,Da);
+ composite->blue=gamma*Divide(QuantumScale*p->blue*Sa,Sa,QuantumScale*
+ q->blue*Da,Da);
+ if (q->colorspace == CMYKColorspace)
+ composite->black=gamma*Divide(QuantumScale*p->black*Sa,Sa,QuantumScale*
+ q->black*Da,Da);
+}
+
+static MagickRealType Exclusion(const MagickRealType Sca,
+ const MagickRealType Sa,const MagickRealType Dca,const MagickRealType Da)
+{
+ return(Sca*Da+Dca*Sa-2.0*Sca*Dca+Sca*(1.0-Da)+Dca*(1.0-Sa));
+}
+
+static inline void CompositeExclusion(const PixelInfo *p,const PixelInfo *q,
+ const ChannelType channel,PixelInfo *composite)
+{
+ MagickRealType
+ gamma,
+ Sa,
+ Da;
+
+ Sa=QuantumScale*p->alpha; /* simplify and speed up equations */
+ Da=QuantumScale*q->alpha;
+ if ((channel & SyncChannels) == 0)
+ {
+ /*
+ Handle channels as separate grayscale channels.
+ */
+ if ((channel & RedChannel) != 0)
+ composite->red=QuantumRange*Exclusion(QuantumScale*p->red,1.0,
+ QuantumScale*q->red,1.0);
+ if ((channel & GreenChannel) != 0)
+ composite->green=QuantumRange*Exclusion(QuantumScale*p->green,1.0,
+ QuantumScale*q->green,1.0);
+ if ((channel & BlueChannel) != 0)
+ composite->blue=QuantumRange*Exclusion(QuantumScale*p->blue,1.0,
+ QuantumScale*q->blue,1.0);
+ if (((channel & BlackChannel) != 0) &&
+ (q->colorspace == CMYKColorspace))
+ composite->black=QuantumRange*Exclusion(QuantumScale*p->black,1.0,
+ QuantumScale*q->black,1.0);
+ if ((channel & AlphaChannel) != 0)
+ composite->alpha=QuantumRange*(1.0-Exclusion(Sa,1.0,Da,1.0));
+ return;
+ }
+ gamma=RoundToUnity(Sa+Da-Sa*Da); /* over blend, as per SVG doc */
+ composite->alpha=(MagickRealType) QuantumRange*gamma;
+ gamma=QuantumRange/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma);
+ composite->red=gamma*Exclusion(QuantumScale*p->red*Sa,Sa,QuantumScale*
+ q->red*Da,Da);
+ composite->green=gamma*Exclusion(QuantumScale*p->green*Sa,Sa,QuantumScale*
+ q->green*Da,Da);
+ composite->blue=gamma*Exclusion(QuantumScale*p->blue*Sa,Sa,QuantumScale*
+ q->blue*Da,Da);
+ if (q->colorspace == CMYKColorspace)
+ composite->black=gamma*Exclusion(QuantumScale*p->black*Sa,Sa,
+ QuantumScale*q->black*Da,Da);
+}
+
+static MagickRealType HardLight(const MagickRealType Sca,
+ const MagickRealType Sa,const MagickRealType Dca,const MagickRealType Da)
+{
+ if ((2.0*Sca) < Sa)
+ return(2.0*Sca*Dca+Sca*(1.0-Da)+Dca*(1.0-Sa));
+ return(Sa*Da-2.0*(Da-Dca)*(Sa-Sca)+Sca*(1.0-Da)+Dca*(1.0-Sa));
+}
+
+static inline void CompositeHardLight(const PixelInfo *p,const PixelInfo *q,
+ PixelInfo *composite)
+{
+ MagickRealType
+ Da,
+ gamma,
+ Sa;
+
+ Sa=QuantumScale*p->alpha; /* simplify and speed up equations */
+ Da=QuantumScale*q->alpha;
+ gamma=RoundToUnity(Sa+Da-Sa*Da); /* over blend, as per SVG doc */
+ composite->alpha=(MagickRealType) QuantumRange*gamma;
+ gamma=QuantumRange/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma);
+ composite->red=gamma*HardLight(QuantumScale*p->red*Sa,Sa,QuantumScale*
+ q->red*Da,Da);
+ composite->green=gamma*HardLight(QuantumScale*p->green*Sa,Sa,QuantumScale*
+ q->green*Da,Da);
+ composite->blue=gamma*HardLight(QuantumScale*p->blue*Sa,Sa,QuantumScale*
+ q->blue*Da,Da);
+ if (q->colorspace == CMYKColorspace)
+ composite->black=gamma*HardLight(QuantumScale*p->black*Sa,Sa,QuantumScale*
+ q->black*Da,Da);
+}
+
+static void CompositeHSB(const MagickRealType red,const MagickRealType green,
+ const MagickRealType blue,double *hue,double *saturation,double *brightness)
+{
+ MagickRealType
+ delta,
+ max,
+ min;
+
+ /*
+ Convert RGB to HSB colorspace.
+ */
+ assert(hue != (double *) NULL);
+ assert(saturation != (double *) NULL);
+ assert(brightness != (double *) NULL);
+ max=(red > green ? red : green);
+ if (blue > max)
+ max=blue;
+ min=(red < green ? red : green);
+ if (blue < min)
+ min=blue;
+ *hue=0.0;
+ *saturation=0.0;
+ *brightness=(double) (QuantumScale*max);
+ if (max == 0.0)
+ return;
+ *saturation=(double) (1.0-min/max);
+ delta=max-min;
+ if (delta == 0.0)
+ return;
+ if (red == max)
+ *hue=(double) ((green-blue)/delta);
+ else
+ if (green == max)
+ *hue=(double) (2.0+(blue-red)/delta);
+ else
+ if (blue == max)
+ *hue=(double) (4.0+(red-green)/delta);
+ *hue/=6.0;
+ if (*hue < 0.0)
+ *hue+=1.0;
+}
+
+static inline MagickRealType In(const MagickRealType p,const MagickRealType Sa,
+ const MagickRealType magick_unused(q),const MagickRealType Da)
+{
+ return(Sa*p*Da);
+}
+
+static inline void CompositeIn(const PixelInfo *p,const PixelInfo *q,
+ PixelInfo *composite)
+{
+ MagickRealType
+ gamma,
+ Sa,
+ Da;
+
+ Sa=QuantumScale*p->alpha; /* simplify and speed up equations */
+ Da=QuantumScale*q->alpha;
+ gamma=Sa*Da;
+ composite->alpha=(MagickRealType) QuantumRange*gamma;
+ gamma=1.0/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma);
+ composite->red=gamma*In(p->red,Sa,q->red,Da);
+ composite->green=gamma*In(p->green,Sa,q->green,Da);
+ composite->blue=gamma*In(p->blue,Sa,q->blue,Da);
+ if (q->colorspace == CMYKColorspace)
+ composite->black=gamma*In(p->black,Sa,q->black,Da);
+}
+
+static inline MagickRealType Lighten(const MagickRealType p,
+ const MagickRealType alpha,const MagickRealType q,const MagickRealType beta)
+{
+ if (p > q)
+ return(MagickOver_(p,alpha,q,beta)); /* src-over */
+ return(MagickOver_(q,beta,p,alpha)); /* dst-over */
+}
+
+static inline void CompositeLighten(const PixelInfo *p,const PixelInfo *q,
+ const ChannelType channel,PixelInfo *composite)
+{
+ MagickRealType
+ gamma;
+
+ /*
+ Lighten is also equvalent to a 'Maximum' method OR a greyscale version of a
+ binary 'And' OR the 'Union' of pixel sets.
+ */
+ if ((channel & SyncChannels) == 0)
+ {
+ /*
+ Handle channels as separate grayscale channels
+ */
+ if ((channel & RedChannel) != 0)
+ composite->red=MagickMax(p->red,q->red);
+ if ((channel & GreenChannel) != 0)
+ composite->green=MagickMax(p->green,q->green);
+ if ((channel & BlueChannel) != 0)
+ composite->blue=MagickMax(p->blue,q->blue);
+ if (((channel & BlackChannel) != 0) &&
+ (q->colorspace == CMYKColorspace))
+ composite->black=MagickMax(p->black,q->black);
+ if ((channel & AlphaChannel) != 0)
+ composite->alpha=MagickMin(p->alpha,q->alpha);
+ return;
+ }
+ composite->alpha=QuantumScale*p->alpha*q->alpha; /* Over Blend */
+ gamma=1.0-QuantumScale*composite->alpha;
+ gamma=1.0/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma);
+ composite->red=gamma*Lighten(p->red,p->alpha,q->red,q->alpha);
+ composite->green=gamma*Lighten(p->green,p->alpha,q->green,q->alpha);
+ composite->blue=gamma*Lighten(p->blue,p->alpha,q->blue,q->alpha);
+ if (q->colorspace == CMYKColorspace)
+ composite->black=gamma*Lighten(p->black,p->alpha,q->black,q->alpha);
+}
+
+static inline void CompositeLightenIntensity(const PixelInfo *p,
+ const PixelInfo *q,const ChannelType channel,PixelInfo *composite)
+{
+ MagickRealType
+ Da,
+ Sa;
+
+ /*
+ Select the pixel based on the intensity level.
+ If 'Sync' flag select whole pixel based on alpha weighted intensity.
+ Otherwise use Intenisty only, but restrict copy according to channel.
+ */
+ if ((channel & SyncChannels) == 0)
+ {
+ MagickBooleanType
+ from_p;
+
+ from_p=GetPixelInfoIntensity(p) > GetPixelInfoIntensity(q) ? MagickTrue :
+ MagickFalse;
+ if ((channel & RedChannel) != 0)
+ composite->red=from_p != MagickFalse ? p->red : q->red;
+ if ((channel & GreenChannel) != 0)
+ composite->green=from_p != MagickFalse ? p->green : q->green;
+ if ((channel & BlueChannel) != 0)
+ composite->blue=from_p != MagickFalse ? p->blue : q->blue;
+ if (((channel & BlackChannel) != 0) &&
+ (q->colorspace == CMYKColorspace))
+ composite->black=from_p != MagickFalse ? p->black : q->black;
+ if ((channel & AlphaChannel) != 0)
+ composite->alpha=from_p != MagickFalse ? p->alpha : q->alpha;
+ return;
+ }
+ Sa=QuantumScale*p->alpha;
+ Da=QuantumScale*q->alpha;
+ *composite=(Sa*GetPixelInfoIntensity(p) > Da*GetPixelInfoIntensity(q)) ?
+ *p : *q;
+}
+
+static inline void CompositeLinearDodge(const PixelInfo *p,const PixelInfo *q,
+ PixelInfo *composite)
+{
+ MagickRealType
+ Da,
+ gamma,
+ Sa;
+
+ Sa=QuantumScale*p->alpha; /* simplify and speed up equations */
+ Da=QuantumScale*q->alpha;
+ gamma=RoundToUnity(Sa+Da-Sa*Da); /* over blend, as per SVG doc */
+ composite->alpha=(MagickRealType) QuantumRange*gamma;
+ gamma=1.0/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma);
+ composite->red=gamma*(p->red*Sa+q->red*Da);
+ composite->green=gamma*(p->green*Sa+q->green*Da);
+ composite->blue=gamma*(p->blue*Sa+q->blue*Da);
+ if (q->colorspace == CMYKColorspace)
+ composite->black=gamma*(p->black*Sa+q->black*Da);
+}
+
+
+static inline MagickRealType LinearBurn(const MagickRealType Sca,
+ const MagickRealType Sa,const MagickRealType Dca,const MagickRealType Da)
+{
+ /*
+ LinearBurn: as defined by Abode Photoshop, according to
+ http://www.simplefilter.de/en/basics/mixmods.html is:
+
+ f(Sc,Dc) = Sc + Dc - 1
+ */
+ return(Sca+Dca-Sa*Da);
+}
+
+static inline void CompositeLinearBurn(const PixelInfo *p,const PixelInfo *q,
+ PixelInfo *composite)
+{
+ MagickRealType
+ Da,
+ gamma,
+ Sa;
+
+ Sa=QuantumScale*p->alpha; /* simplify and speed up equations */
+ Da=QuantumScale*q->alpha;
+ gamma=RoundToUnity(Sa+Da-Sa*Da); /* over blend, as per SVG doc */
+ composite->alpha=(MagickRealType) QuantumRange*gamma;
+ gamma=QuantumRange/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma);
+ composite->red=gamma*LinearBurn(QuantumScale*p->red*Sa,Sa,QuantumScale*
+ q->red*Da,Da);
+ composite->green=gamma*LinearBurn(QuantumScale*p->green*Sa,Sa,QuantumScale*
+ q->green*Da,Da);
+ composite->blue=gamma*LinearBurn(QuantumScale*p->blue*Sa,Sa,QuantumScale*
+ q->blue*Da,Da);
+ if (q->colorspace == CMYKColorspace)
+ composite->black=gamma*LinearBurn(QuantumScale*p->black*Sa,Sa,QuantumScale*
+ q->black*Da,Da);
+}
+
+static inline MagickRealType LinearLight(const MagickRealType Sca,
+ const MagickRealType Sa,const MagickRealType Dca,const MagickRealType Da)
+{
+ /*
+ LinearLight: as defined by Abode Photoshop, according to
+ http://www.simplefilter.de/en/basics/mixmods.html is:
+
+ f(Sc,Dc) = Dc + 2*Sc - 1
+ */
+ return((Sca-Sa)*Da+Sca+Dca);
+}
+
+static inline void CompositeLinearLight(const PixelInfo *p,const PixelInfo *q,
+ PixelInfo *composite)
+{
+ MagickRealType
+ Da,
+ gamma,
+ Sa;
+
+ Sa=QuantumScale*p->alpha; /* simplify and speed up equations */
+ Da=QuantumScale*q->alpha;
+ gamma=RoundToUnity(Sa+Da-Sa*Da); /* over blend, as per SVG doc */
+ composite->alpha=(MagickRealType) QuantumRange*gamma;
+ gamma=QuantumRange/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma);
+ composite->red=gamma*LinearLight(QuantumScale*p->red*Sa,Sa,QuantumScale*
+ q->red*Da,Da);
+ composite->green=gamma*LinearLight(QuantumScale*p->green*Sa,Sa,QuantumScale*
+ q->green*Da,Da);
+ composite->blue=gamma*LinearLight(QuantumScale*p->blue*Sa,Sa,QuantumScale*
+ q->blue*Da,Da);
+ if (q->colorspace == CMYKColorspace)
+ composite->black=gamma*LinearLight(QuantumScale*p->black*Sa,Sa,QuantumScale*
+ q->black*Da,Da);
+}
+
+static inline MagickRealType Mathematics(const MagickRealType Sca,
+ const MagickRealType Sa,const MagickRealType Dca,const MagickRealType Da,
+ const GeometryInfo *geometry_info)
+{
+ MagickRealType
+ gamma;
+
+ /*
+ 'Mathematics' a free form user control mathematical composition is defined
+ as...
+
+ f(Sc,Dc) = A*Sc*Dc + B*Sc + C*Dc + D
+
+ Where the arguments A,B,C,D are (currently) passed to composite as
+ a command separated 'geometry' string in "compose:args" image artifact.
+
+ A = a->rho, B = a->sigma, C = a->xi, D = a->psi
+
+ Applying the SVG transparency formula (see above), we get...
+
+ Dca' = Sa*Da*f(Sc,Dc) + Sca*(1.0-Da) + Dca*(1.0-Sa)
+
+ Dca' = A*Sca*Dca + B*Sca*Da + C*Dca*Sa + D*Sa*Da + Sca*(1.0-Da) +
+ Dca*(1.0-Sa)
+ */
+ gamma=geometry_info->rho*Sca*Dca+geometry_info->sigma*Sca*Da+
+ geometry_info->xi*Dca*Sa+geometry_info->psi*Sa*Da+Sca*(1.0-Da)+
+ Dca*(1.0-Sa);
+ return(gamma);
+}
+
+static inline void CompositeMathematics(const PixelInfo *p,const PixelInfo *q,
+ const ChannelType channel, const GeometryInfo *args, PixelInfo *composite)
+{
+ MagickRealType
+ Da,
+ gamma,
+ Sa;
+
+ Sa=QuantumScale*p->alpha; /* ??? - AT */
+ Da=QuantumScale*q->alpha;
+ if ((channel & SyncChannels) == 0)
+ {
+ /*
+ Handle channels as separate grayscale channels.
+ */
+ if ((channel & RedChannel) != 0)
+ composite->red=QuantumRange*Mathematics(QuantumScale*p->red,1.0,
+ QuantumScale*q->red,1.0,args);
+ if ((channel & GreenChannel) != 0)
+ composite->green=QuantumRange*Mathematics(QuantumScale*p->green,1.0,
+ QuantumScale*q->green,1.0,args);
+ if ((channel & BlueChannel) != 0)
+ composite->blue=QuantumRange*Mathematics(QuantumScale*p->blue,1.0,
+ QuantumScale*q->blue,1.0,args);
+ if (((channel & BlackChannel) != 0) &&
+ (q->colorspace == CMYKColorspace))
+ composite->black=QuantumRange*Mathematics(QuantumScale*p->black,1.0,
+ QuantumScale*q->black,1.0,args);
+ if ((channel & AlphaChannel) != 0)
+ composite->alpha=QuantumRange*(1.0-Mathematics(Sa,1.0,Da,1.0,args));
+ return;
+ }
+ gamma=RoundToUnity(Sa+Da-Sa*Da); /* over blend, as per SVG doc */
+ composite->alpha=(MagickRealType) QuantumRange*gamma;
+ gamma=QuantumRange/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma);
+ composite->red=gamma*Mathematics(QuantumScale*p->red*Sa,Sa,QuantumScale*
+ q->red*Da,Da,args);
+ composite->green=gamma*Mathematics(QuantumScale*p->green*Sa,Sa,
+ QuantumScale*q->green*Da,Da,args);
+ composite->blue=gamma*Mathematics(QuantumScale*p->blue*Sa,Sa,QuantumScale*
+ q->blue*Da,Da,args);
+ if (q->colorspace == CMYKColorspace)
+ composite->black=gamma*Mathematics(QuantumScale*p->black*Sa,Sa,
+ QuantumScale*q->black*Da,Da,args);
+}
+
+static inline void CompositePlus(const PixelInfo *p,const PixelInfo *q,
+ const ChannelType channel,PixelInfo *composite)
+{
+ /*
+ NOTE: "Plus" does not use 'over' alpha-blending but uses a special
+ 'plus' form of alph-blending. It is the ONLY mathematical operator to
+ do this. this is what makes it different to the otherwise equivalent
+ "LinearDodge" composition method.
+
+ Note however that color channels are still effected by the alpha channel
+ as a result of the blending, making it just as useless for independant
+ channel maths, just like all other mathematical composition methods.
+
+ As such the removal of the 'sync' flag, is still a usful convention.
+
+ The CompositePixelInfoPlus() function is defined in
+ "composite-private.h" so it can also be used for Image Blending.
+ */
+ if ((channel & SyncChannels) == 0)
+ {
+ /*
+ Handle channels as separate grayscale channels.
+ */
+ if ((channel & RedChannel) != 0)
+ composite->red=p->red+q->red;
+ if ((channel & GreenChannel) != 0)
+ composite->green=p->green+q->green;
+ if ((channel & BlueChannel) != 0)
+ composite->blue=p->blue+q->blue;
+ if (((channel & BlackChannel) != 0) &&
+ (q->colorspace == CMYKColorspace))
+ composite->black=p->black+q->black;
+ if ((channel & AlphaChannel) != 0)
+ composite->alpha=p->alpha+q->alpha-QuantumRange;
+ return;
+ }
+ CompositePixelInfoPlus(p,p->alpha,q,q->alpha,composite);
+}
+
+static inline MagickRealType Minus(const MagickRealType Sca,
+ const MagickRealType Sa,const MagickRealType Dca,
+ const MagickRealType magick_unused(Da))
+{
+ /*
+ Minus Source from Destination
+
+ f(Sc,Dc) = Sc - Dc
+ */
+ return(Sca+Dca-2.0*Dca*Sa);
+}
+
+static inline void CompositeMinus(const PixelInfo *p,const PixelInfo *q,
+ const ChannelType channel,PixelInfo *composite)
+{
+ MagickRealType
+ Da,
+ gamma,
+ Sa;
+
+ Sa=QuantumScale*p->alpha; /* simplify and speed up equations */
+ Da=QuantumScale*q->alpha;
+ if ((channel & SyncChannels) == 0)
+ {
+ /*
+ Handle channels as separate grayscale channels.
+ */
+ if ((channel & RedChannel) != 0)
+ composite->red=p->red-q->red;
+ if ((channel & GreenChannel) != 0)
+ composite->green=p->green-q->green;
+ if ((channel & BlueChannel) != 0)
+ composite->blue=p->blue-q->blue;
+ if (((channel & BlackChannel) != 0) &&
+ (q->colorspace == CMYKColorspace))
+ composite->black=p->black-q->black;
+ if ((channel & AlphaChannel) != 0)
+ composite->alpha=QuantumRange*(1.0-(Sa-Da));
+ return;
+ }
+ gamma=RoundToUnity(Sa+Da-Sa*Da); /* over blend, as per SVG doc */
+ composite->alpha=(MagickRealType) QuantumRange*gamma;
+ gamma=1.0/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma);
+ composite->red=gamma*Minus(p->red*Sa,Sa,q->red*Da,Da);
+ composite->green=gamma*Minus(p->green*Sa,Sa,q->green*Da,Da);
+ composite->blue=gamma*Minus(p->blue*Sa,Sa,q->blue*Da,Da);
+ if (q->colorspace == CMYKColorspace)
+ composite->black=gamma*Minus(p->black*Sa,Sa,q->black*Da,Da);
+}
+
+static inline MagickRealType ModulusAdd(const MagickRealType p,
+ const MagickRealType Sa,const MagickRealType q, const MagickRealType Da)
+{
+ MagickRealType
+ pixel;
+
+ pixel=p+q;
+ if (pixel > QuantumRange)
+ pixel-=(QuantumRange+1.0);
+ return(pixel*Sa*Da+p*Sa*(1.0-Da)+q*Da*(1.0-Sa));
+}
+
+static inline void CompositeModulusAdd(const PixelInfo *p,const PixelInfo *q,
+ const ChannelType channel,PixelInfo *composite)
+{
+ MagickRealType
+ Da,
+ gamma,
+ Sa;
+
+ if ((channel & SyncChannels) == 0)
+ {
+ /*
+ Handle channels as separate grayscale channels.
+ */
+ if ((channel & RedChannel) != 0)
+ composite->red=ModulusAdd(p->red,1.0,q->red,1.0);
+ if ((channel & GreenChannel) != 0)
+ composite->green=ModulusAdd(p->green,1.0,q->green,1.0);
+ if ((channel & BlueChannel) != 0)
+ composite->blue=ModulusAdd(p->blue,1.0,q->blue,1.0);
+ if (((channel & BlackChannel) != 0) &&
+ (q->colorspace == CMYKColorspace))
+ composite->black=ModulusAdd(p->black,1.0,q->black,1.0);
+ if ((channel & AlphaChannel) != 0)
+ composite->alpha=ModulusAdd(p->alpha,1.0,q->alpha,1.0);
+ return;
+ }
+ Sa=QuantumScale*p->alpha; /* simplify and speed up equations */
+ Da=QuantumScale*q->alpha;
+ gamma=RoundToUnity(Sa+Da-Sa*Da); /* over blend, as per SVG doc */
+ composite->alpha=(MagickRealType) QuantumRange*gamma;
+ gamma=1.0/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma);
+ composite->red=ModulusAdd(p->red,Sa,q->red,Da);
+ composite->green=ModulusAdd(p->green,Sa,q->green,Da);
+ composite->blue=ModulusAdd(p->blue,Sa,q->blue,Da);
+ if (q->colorspace == CMYKColorspace)
+ composite->black=ModulusAdd(p->black,Sa,q->black,Da);
+}
+
+static inline MagickRealType ModulusSubtract(const MagickRealType p,
+ const MagickRealType Sa,const MagickRealType q, const MagickRealType Da)
+{
+ MagickRealType
+ pixel;
+
+ pixel=p-q;
+ if (pixel < 0.0)
+ pixel+=(QuantumRange+1.0);
+ return(pixel*Sa*Da+p*Sa*(1.0-Da)+q*Da*(1.0-Sa));
+}
+
+static inline void CompositeModulusSubtract(const PixelInfo *p,
+ const PixelInfo *q, const ChannelType channel,PixelInfo *composite)
+{
+ MagickRealType
+ Da,
+ gamma,
+ Sa;
+
+ if ((channel & SyncChannels) == 0)
+ {
+ /*
+ Handle channels as separate grayscale channels,
+ */
+ if ((channel & RedChannel) != 0)
+ composite->red=ModulusSubtract(p->red,1.0,q->red,1.0);
+ if ((channel & GreenChannel) != 0)
+ composite->green=ModulusSubtract(p->green,1.0,q->green,1.0);
+ if ((channel & BlueChannel) != 0)
+ composite->blue=ModulusSubtract(p->blue,1.0,q->blue,1.0);
+ if (((channel & BlackChannel) != 0) &&
+ (q->colorspace == CMYKColorspace))
+ composite->black=ModulusSubtract(p->black,1.0,q->black,1.0);
+ if ((channel & AlphaChannel) != 0)
+ composite->alpha=ModulusSubtract(p->alpha,1.0,q->alpha,1.0);
+ return;
+ }
+ Sa=QuantumScale*p->alpha; /* simplify and speed up equations */
+ Da=QuantumScale*q->alpha;
+ gamma = RoundToUnity(Sa+Da-Sa*Da);
+ composite->alpha=(MagickRealType) QuantumRange*gamma;
+ gamma=1.0/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma);
+ composite->red=ModulusSubtract(p->red,Sa,q->red,Da);
+ composite->green=ModulusSubtract(p->green,Sa,q->green,Da);
+ composite->blue=ModulusSubtract(p->blue,Sa,q->blue,Da);
+ if (q->colorspace == CMYKColorspace)
+ composite->black=ModulusSubtract(p->black,Sa,q->black,Da);
+}
+
+static inline MagickRealType Multiply(const MagickRealType Sca,
+ const MagickRealType Sa,const MagickRealType Dca,const MagickRealType Da)
+{
+ return(Sca*Dca+Sca*(1.0-Da)+Dca*(1.0-Sa));
+}
+
+static inline void CompositeMultiply(const PixelInfo *p,const PixelInfo *q,
+ const ChannelType channel,PixelInfo *composite)
+{
+ MagickRealType
+ Da,
+ gamma,
+ Sa;
+
+ Sa=QuantumScale*p->alpha; /* simplify and speed up equations */
+ Da=QuantumScale*q->alpha;
+ if ((channel & SyncChannels) == 0)
+ {
+ /*
+ Handle channels as separate grayscale channels.
+ */
+ if ((channel & RedChannel) != 0)
+ composite->red=QuantumScale*p->red*q->red;
+ if ((channel & GreenChannel) != 0)
+ composite->green=QuantumScale*p->green*q->green;
+ if ((channel & BlueChannel) != 0)
+ composite->blue=QuantumScale*p->blue*q->blue;
+ if (((channel & BlackChannel) != 0) &&
+ (q->colorspace == CMYKColorspace))
+ composite->black=QuantumScale*p->black*q->black;
+ if ((channel & AlphaChannel) != 0)
+ composite->alpha=QuantumRange*(1.0-Sa*Da);
+ return;
+ }
+ gamma=RoundToUnity(Sa+Da-Sa*Da); /* over blend, as per SVG doc */
+ composite->alpha=(MagickRealType) QuantumRange*gamma;
+ gamma=QuantumRange/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma);
+ composite->red=gamma*Multiply(QuantumScale*p->red*Sa,Sa,QuantumScale*
+ q->red*Da,Da);
+ composite->green=gamma*Multiply(QuantumScale*p->green*Sa,Sa,QuantumScale*
+ q->green*Da,Da);
+ composite->blue=gamma*Multiply(QuantumScale*p->blue*Sa,Sa,QuantumScale*
+ q->blue*Da,Da);
+ if (q->colorspace == CMYKColorspace)
+ composite->black=gamma*Multiply(QuantumScale*p->black*Sa,Sa,
+ QuantumScale*q->black*Da,Da);
+}
+
+static inline MagickRealType Out(const MagickRealType p,const MagickRealType Sa,
+ const MagickRealType magick_unused(q),const MagickRealType Da)
+{
+ return(Sa*p*(1.0-Da));
+}
+
+static inline void CompositeOut(const PixelInfo *p,const PixelInfo *q,
+ PixelInfo *composite)
+{
+ MagickRealType
+ Sa,
+ Da,
+ gamma;
+
+ Sa=QuantumScale*p->alpha; /* simplify and speed up equations */
+ Da=QuantumScale*q->alpha;
+ gamma=Sa*(1.0-Da);
+ composite->alpha=(MagickRealType) QuantumRange*gamma;
+ gamma=1.0/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma);
+ composite->red=gamma*Out(p->red,Sa,q->red,Da);
+ composite->green=gamma*Out(p->green,Sa,q->green,Da);
+ composite->blue=gamma*Out(p->blue,Sa,q->blue,Da);
+ if (q->colorspace == CMYKColorspace)
+ composite->black=gamma*Out(p->black,Sa,q->black,Da);
+}
+
+static MagickRealType PegtopLight(const MagickRealType Sca,
+ const MagickRealType Sa,const MagickRealType Dca,const MagickRealType Da)
+{
+ /*
+ PegTop: A Soft-Light alternative: A continuous version of the Softlight
+ function, producing very similar results.
+
+ f(Sc,Dc) = Dc^2*(1-2*Sc) + 2*Sc*Dc
+
+ See http://www.pegtop.net/delphi/articles/blendmodes/softlight.htm.
+ */
+ if (fabs(Da) < MagickEpsilon)
+ return(Sca);
+ return(Dca*Dca*(Sa-2.0*Sca)/Da+Sca*(2.0*Dca+1.0-Da)+Dca*(1.0-Sa));
+}
+
+static inline void CompositePegtopLight(const PixelInfo *p,const PixelInfo *q,
+ PixelInfo *composite)
+{
+ MagickRealType
+ Da,
+ gamma,
+ Sa;
+
+ Sa=QuantumScale*p->alpha; /* simplify and speed up equations */
+ Da=QuantumScale*q->alpha;
+ gamma=RoundToUnity(Sa+Da-Sa*Da); /* over blend, as per SVG doc */
+ composite->alpha=(MagickRealType) QuantumRange*gamma;
+ gamma=QuantumRange/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma);
+ composite->red=gamma*PegtopLight(QuantumScale*p->red*Sa,Sa,QuantumScale*
+ q->red*Da,Da);
+ composite->green=gamma*PegtopLight(QuantumScale*p->green*Sa,Sa,QuantumScale*
+ q->green*Da,Da);
+ composite->blue=gamma*PegtopLight(QuantumScale*p->blue*Sa,Sa,QuantumScale*
+ q->blue*Da,Da);
+ if (q->colorspace == CMYKColorspace)
+ composite->black=gamma*PegtopLight(QuantumScale*p->black*Sa,Sa,QuantumScale*
+ q->black*Da,Da);
+}
+
+static MagickRealType PinLight(const MagickRealType Sca,const MagickRealType Sa,
+ const MagickRealType Dca,const MagickRealType Da)
+{
+ /*
+ PinLight: A Photoshop 7 composition method
+ http://www.simplefilter.de/en/basics/mixmods.html
+
+ f(Sc,Dc) = Dc<2*Sc-1 ? 2*Sc-1 : Dc>2*Sc ? 2*Sc : Dc
+ */
+ if (Dca*Sa < Da*(2.0*Sca-Sa))
+ return(Sca*(Da+1.0)-Sa*Da+Dca*(1.0-Sa));
+ if ((Dca*Sa) > (2.0*Sca*Da))
+ return(Sca*Da+Sca+Dca*(1.0-Sa));
+ return(Sca*(1.0-Da)+Dca);
+}
+
+static inline void CompositePinLight(const PixelInfo *p,const PixelInfo *q,
+ PixelInfo *composite)
+{
+ MagickRealType
+ Da,
+ gamma,
+ Sa;
+
+ Sa=QuantumScale*p->alpha; /* simplify and speed up equations */
+ Da=QuantumScale*q->alpha;
+ gamma=RoundToUnity(Sa+Da-Sa*Da); /* over blend, as per SVG doc */
+ composite->alpha=(MagickRealType) QuantumRange*gamma;
+ gamma=QuantumRange/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma);
+ composite->red=gamma*PinLight(QuantumScale*p->red*Sa,Sa,QuantumScale*
+ q->red*Da,Da);
+ composite->green=gamma*PinLight(QuantumScale*p->green*Sa,Sa,QuantumScale*
+ q->green*Da,Da);
+ composite->blue=gamma*PinLight(QuantumScale*p->blue*Sa,Sa,QuantumScale*
+ q->blue*Da,Da);
+ if (q->colorspace == CMYKColorspace)
+ composite->black=gamma*PinLight(QuantumScale*p->black*Sa,Sa,QuantumScale*
+ q->black*Da,Da);
+}
+
+static inline MagickRealType Screen(const MagickRealType Sca,
+ const MagickRealType Dca)
+{
+ /*
+ Screen: A negated multiply
+ f(Sc,Dc) = 1.0-(1.0-Sc)*(1.0-Dc)
+ */
+ return(Sca+Dca-Sca*Dca);
+}
+
+static inline void CompositeScreen(const PixelInfo *p,const PixelInfo *q,
+ const ChannelType channel,PixelInfo *composite)
+{
+ MagickRealType
+ Da,
+ gamma,
+ Sa;
+
+ Sa=QuantumScale*p->alpha; /* simplify and speed up equations */
+ Da=QuantumScale*q->alpha;
+ if ((channel & SyncChannels) == 0)
+ {
+ /*
+ Handle channels as separate grayscale channels.
+ */
+ if ((channel & RedChannel) != 0)
+ composite->red=QuantumRange*Screen(QuantumScale*p->red,
+ QuantumScale*q->red);
+ if ((channel & GreenChannel) != 0)
+ composite->green=QuantumRange*Screen(QuantumScale*p->green,
+ QuantumScale*q->green);
+ if ((channel & BlueChannel) != 0)
+ composite->blue=QuantumRange*Screen(QuantumScale*p->blue,
+ QuantumScale*q->blue);
+ if (((channel & BlackChannel) != 0) &&
+ (q->colorspace == CMYKColorspace))
+ composite->black=QuantumRange*Screen(QuantumScale*p->black,
+ QuantumScale*q->black);
+ if ((channel & AlphaChannel) != 0)
+ composite->alpha=QuantumRange*(1.0-Screen(Sa,Da));
+ return;
+ }
+ gamma=RoundToUnity(Sa+Da-Sa*Da); /* over blend, as per SVG doc */
+ composite->alpha=(MagickRealType) QuantumRange*gamma;
+ Sa*=QuantumScale; Da*=QuantumScale; /* optimization */
+ gamma=QuantumRange/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma);
+ composite->red=gamma*Screen(p->red*Sa,q->red*Da);
+ composite->green=gamma*Screen(p->green*Sa,q->green*Da);
+ composite->blue=gamma*Screen(p->blue*Sa,q->blue*Da);
+ if (q->colorspace == CMYKColorspace)
+ composite->black=gamma*Screen(p->black*Sa,q->black*Da);
+}
+
+static MagickRealType SoftLight(const MagickRealType Sca,
+ const MagickRealType Sa,const MagickRealType Dca,const MagickRealType Da)
+{
+ MagickRealType
+ alpha,
+ beta;
+
+ /*
+ New specification: March 2009 SVG specification.
+ */
+ alpha=Dca/Da;
+ if ((2.0*Sca) < Sa)
+ return(Dca*(Sa+(2.0*Sca-Sa)*(1.0-alpha))+Sca*(1.0-Da)+Dca*(1.0-Sa));
+ if (((2.0*Sca) > Sa) && ((4.0*Dca) <= Da))
+ {
+ beta=Dca*Sa+Da*(2.0*Sca-Sa)*(4.0*alpha*(4.0*alpha+1.0)*(alpha-1.0)+7.0*
+ alpha)+Sca*(1.0-Da)+Dca*(1.0-Sa);
+ return(beta);
+ }
+ beta=Dca*Sa+Da*(2.0*Sca-Sa)*(pow(alpha,0.5)-alpha)+Sca*(1.0-Da)+Dca*(1.0-Sa);
+ return(beta);
+}
+
+static inline void CompositeSoftLight(const PixelInfo *p,const PixelInfo *q,
+ PixelInfo *composite)
+{
+ MagickRealType
+ Da,
+ gamma,
+ Sa;
+
+ Sa=QuantumScale*p->alpha; /* simplify and speed up equations */
+ Da=QuantumScale*q->alpha;
+ gamma=RoundToUnity(Sa+Da-Sa*Da); /* over blend, as per SVG doc */
+ composite->alpha=(MagickRealType) QuantumRange*gamma;
+ gamma=QuantumRange/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma);
+ composite->red=gamma*SoftLight(QuantumScale*p->red*Sa,Sa,QuantumScale*
+ q->red*Da,Da);
+ composite->green=gamma*SoftLight(QuantumScale*p->green*Sa,Sa,QuantumScale*
+ q->green*Da,Da);
+ composite->blue=gamma*SoftLight(QuantumScale*p->blue*Sa,Sa,QuantumScale*
+ q->blue*Da,Da);
+ if (q->colorspace == CMYKColorspace)
+ composite->black=gamma*SoftLight(QuantumScale*p->black*Sa,Sa,QuantumScale*
+ q->black*Da,Da);
+}
+
+static inline MagickRealType Threshold(const MagickRealType p,
+ const MagickRealType q,const MagickRealType threshold,
+ const MagickRealType amount)
+{
+ MagickRealType
+ delta;
+
+ /*
+ Multiply difference by amount, if differance larger than threshold???
+ What use this is is completely unknown. The Opacity calculation appears to
+ be inverted -- Anthony Thyssen
+
+ Deprecated.
+ */
+ delta=p-q;
+ if ((MagickRealType) fabs((double) (2.0*delta)) < threshold)
+ return(q);
+ return(q+delta*amount);
+}
+
+static inline void CompositeThreshold(const PixelInfo *p,const PixelInfo *q,
+ const MagickRealType threshold,const MagickRealType amount,
+ PixelInfo *composite)
+{
+ composite->red=Threshold(p->red,q->red,threshold,amount);
+ composite->green=Threshold(p->green,q->green,threshold,amount);
+ composite->blue=Threshold(p->blue,q->blue,threshold,amount);
+ composite->alpha=Threshold(p->alpha,q->alpha,threshold,amount);
+ if (q->colorspace == CMYKColorspace)
+ composite->black=Threshold(p->black,q->black,threshold,amount);
+}
+
+
+static MagickRealType VividLight(const MagickRealType Sca,
+ const MagickRealType Sa,const MagickRealType Dca,const MagickRealType Da)
+{
+ /*
+ VividLight: A Photoshop 7 composition method. See
+ http://www.simplefilter.de/en/basics/mixmods.html.
+
+ f(Sc,Dc) = (2*Sc < 1) ? 1-(1-Dc)/(2*Sc) : Dc/(2*(1-Sc))
+ */
+ if ((fabs(Sa) < MagickEpsilon) || (fabs(Sca-Sa) < MagickEpsilon))
+ return(Sa*Da+Sca*(1.0-Da)+Dca*(1.0-Sa));
+ if ((2.0*Sca) <= Sa)
+ return(Sa*(Da+Sa*(Dca-Da)/(2.0*Sca))+Sca*(1.0-Da)+Dca*(1.0-Sa));
+ return(Dca*Sa*Sa/(2.0*(Sa-Sca))+Sca*(1.0-Da)+Dca*(1.0-Sa));
+}
+
+static inline void CompositeVividLight(const PixelInfo *p,const PixelInfo *q,
+ PixelInfo *composite)
+{
+ MagickRealType
+ Da,
+ gamma,
+ Sa;
+
+ Sa=QuantumScale*p->alpha; /* simplify and speed up equations */
+ Da=QuantumScale*q->alpha;
+ gamma=RoundToUnity(Sa+Da-Sa*Da); /* over blend, as per SVG doc */
+ composite->alpha=(MagickRealType) QuantumRange*gamma;
+ gamma=QuantumRange/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma);
+ composite->red=gamma*VividLight(QuantumScale*p->red*Sa,Sa,QuantumScale*
+ q->red*Da,Da);
+ composite->green=gamma*VividLight(QuantumScale*p->green*Sa,Sa,QuantumScale*
+ q->green*Da,Da);
+ composite->blue=gamma*VividLight(QuantumScale*p->blue*Sa,Sa,QuantumScale*
+ q->blue*Da,Da);
+ if (q->colorspace == CMYKColorspace)
+ composite->black=gamma*VividLight(QuantumScale*p->black*Sa,Sa,QuantumScale*
+ q->black*Da,Da);
+}
+
+static MagickRealType Xor(const MagickRealType Sca,const MagickRealType Sa,
+ const MagickRealType Dca,const MagickRealType Da)
+{
+ return(Sca*(1.0-Da)+Dca*(1.0-Sa));
+}
+
+static inline void CompositeXor(const PixelInfo *p,const PixelInfo *q,
+ PixelInfo *composite)
+{
+ MagickRealType
+ Da,
+ gamma,
+ Sa;
+
+ Sa=QuantumScale*p->alpha; /* simplify and speed up equations */
+ Da=QuantumScale*q->alpha;
+ gamma=Sa+Da-2.0*Sa*Da; /* Xor blend mode X=0,Y=1,Z=1 */
+ composite->alpha=(MagickRealType) QuantumRange*gamma;
+ gamma=1.0/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma);
+ composite->red=gamma*Xor(p->red*Sa,Sa,q->red*Da,Da);
+ composite->green=gamma*Xor(p->green*Sa,Sa,q->green*Da,Da);
+ composite->blue=gamma*Xor(p->blue*Sa,Sa,q->blue*Da,Da);
+ if (q->colorspace == CMYKColorspace)
+ composite->black=gamma*Xor(p->black*Sa,Sa,q->black*Da,Da);
+}
+
+static void HSBComposite(const double hue,const double saturation,
+ const double brightness,MagickRealType *red,MagickRealType *green,
+ MagickRealType *blue)
+{
+ MagickRealType
+ f,
+ h,
+ p,
+ q,
+ t;
+
+ /*
+ Convert HSB to RGB colorspace.
+ */
+ assert(red != (MagickRealType *) NULL);
+ assert(green != (MagickRealType *) NULL);
+ assert(blue != (MagickRealType *) NULL);
+ if (saturation == 0.0)
+ {
+ *red=(MagickRealType) QuantumRange*brightness;
+ *green=(*red);
+ *blue=(*red);
+ return;
+ }
+ h=6.0*(hue-floor(hue));
+ f=h-floor((double) h);
+ p=brightness*(1.0-saturation);
+ q=brightness*(1.0-saturation*f);
+ t=brightness*(1.0-saturation*(1.0-f));
+ switch ((int) h)
+ {
+ case 0:
+ default:
+ {
+ *red=(MagickRealType) QuantumRange*brightness;
+ *green=(MagickRealType) QuantumRange*t;
+ *blue=(MagickRealType) QuantumRange*p;
+ break;
+ }
+ case 1:
+ {
+ *red=(MagickRealType) QuantumRange*q;
+ *green=(MagickRealType) QuantumRange*brightness;
+ *blue=(MagickRealType) QuantumRange*p;
+ break;
+ }
+ case 2:
+ {
+ *red=(MagickRealType) QuantumRange*p;
+ *green=(MagickRealType) QuantumRange*brightness;
+ *blue=(MagickRealType) QuantumRange*t;
+ break;
+ }
+ case 3:
+ {
+ *red=(MagickRealType) QuantumRange*p;
+ *green=(MagickRealType) QuantumRange*q;
+ *blue=(MagickRealType) QuantumRange*brightness;
+ break;
+ }
+ case 4:
+ {
+ *red=(MagickRealType) QuantumRange*t;
+ *green=(MagickRealType) QuantumRange*p;
+ *blue=(MagickRealType) QuantumRange*brightness;
+ break;
+ }
+ case 5:
+ {
+ *red=(MagickRealType) QuantumRange*brightness;
+ *green=(MagickRealType) QuantumRange*p;
+ *blue=(MagickRealType) QuantumRange*q;
+ break;
+ }
+ }
+}
+
+MagickExport MagickBooleanType CompositeImage(Image *image,
+ const CompositeOperator compose,const Image *composite_image,
+ const ssize_t x_offset,const ssize_t y_offset)
+{
+ MagickBooleanType
+ status;
+
+ status=CompositeImageChannel(image,DefaultChannels,compose,composite_image,
+ x_offset,y_offset);
+ return(status);
+}
+
+MagickExport MagickBooleanType CompositeImageChannel(Image *image,
+ const ChannelType channel,const CompositeOperator compose,
+ const Image *composite_image,const ssize_t x_offset,const ssize_t y_offset)
+{
+#define CompositeImageTag "Composite/Image"
+
+ CacheView
+ *composite_view,
+ *image_view;
+
+ const char
+ *value;
+
+ double
+ sans;
+
+ ExceptionInfo
+ *exception;
+
+ GeometryInfo
+ geometry_info;
+
+ Image
+ *destination_image;
+
+ MagickBooleanType
+ modify_outside_overlay,
+ status;
+
+ MagickOffsetType
+ progress;
+
+ PixelInfo
+ zero;
+
+ MagickRealType
+ amount,
+ destination_dissolve,
+ midpoint,
+ percent_brightness,
+ percent_saturation,
+ source_dissolve,
+ threshold;
+
+ MagickStatusType
+ flags;
+
+ ssize_t
+ y;
+
+ /*
+ Prepare composite image.
+ */
+ assert(image != (Image *) NULL);
+ assert(image->signature == MagickSignature);
+ if (image->debug != MagickFalse)
+ (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
+ assert(composite_image != (Image *) NULL);
+ assert(composite_image->signature == MagickSignature);
+ if (SetImageStorageClass(image,DirectClass) == MagickFalse)
+ return(MagickFalse);
+ GetPixelInfo(image,&zero);
+ destination_image=(Image *) NULL;
+ amount=0.5;
+ destination_dissolve=1.0;
+ modify_outside_overlay=MagickFalse;
+ percent_brightness=100.0;
+ percent_saturation=100.0;
+ source_dissolve=1.0;
+ threshold=0.05f;
+ switch (compose)
+ {
+ case ClearCompositeOp:
+ case SrcCompositeOp:
+ case InCompositeOp:
+ case SrcInCompositeOp:
+ case OutCompositeOp:
+ case SrcOutCompositeOp:
+ case DstInCompositeOp:
+ case DstAtopCompositeOp:
+ {
+ /*
+ Modify destination outside the overlaid region.
+ */
+ modify_outside_overlay=MagickTrue;
+ break;
+ }
+ case CopyCompositeOp:
+ {
+ if ((x_offset < 0) || (y_offset < 0))
+ break;
+ if ((x_offset+(ssize_t) composite_image->columns) >= (ssize_t) image->columns)
+ break;
+ if ((y_offset+(ssize_t) composite_image->rows) >= (ssize_t) image->rows)
+ break;
+ status=MagickTrue;
+ exception=(&image->exception);
+ image_view=AcquireCacheView(image);
+ composite_view=AcquireCacheView(composite_image);
+#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#pragma omp parallel for schedule(dynamic,4) shared(status)
+#endif
+ for (y=0; y < (ssize_t) composite_image->rows; y++)
+ {
+ MagickBooleanType
+ sync;
+
+ register const Quantum
+ *p;
+
+ register Quantum
+ *q;
+
+ register ssize_t
+ x;
+
+ if (status == MagickFalse)
+ continue;
+ p=GetCacheViewVirtualPixels(composite_view,0,y,composite_image->columns,
+ 1,exception);
+ q=GetCacheViewAuthenticPixels(image_view,x_offset,y+y_offset,
+ composite_image->columns,1,exception);
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
+ {
+ status=MagickFalse;
+ continue;
+ }
+ for (x=0; x < (ssize_t) composite_image->columns; x++)
+ {
+ SetPixelRed(image,GetPixelRed(composite_image,p),q);
+ SetPixelGreen(image,GetPixelGreen(composite_image,p),q);
+ SetPixelBlue(image,GetPixelBlue(composite_image,p),q);
+ SetPixelAlpha(image,GetPixelAlpha(composite_image,p),q);
+ if (image->colorspace == CMYKColorspace)
+ SetPixelBlack(image,GetPixelBlack(composite_image,p),q);
+ p+=GetPixelChannels(composite_image);
+ q+=GetPixelChannels(image);
+ }
+ sync=SyncCacheViewAuthenticPixels(image_view,exception);
+ if (sync == MagickFalse)
+ status=MagickFalse;
+ if (image->progress_monitor != (MagickProgressMonitor) NULL)
+ {
+ MagickBooleanType
+ proceed;
+
+#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#pragma omp critical (MagickCore_CompositeImage)
+#endif
+ proceed=SetImageProgress(image,CompositeImageTag,
+ (MagickOffsetType) y,image->rows);
+ if (proceed == MagickFalse)
+ status=MagickFalse;
+ }
+ }
+ composite_view=DestroyCacheView(composite_view);
+ image_view=DestroyCacheView(image_view);
+ return(status);
+ }
+ case CopyOpacityCompositeOp:
+ case ChangeMaskCompositeOp:
+ {
+ /*
+ Modify destination outside the overlaid region and require an alpha
+ channel to exist, to add transparency.
+ */
+ if (image->matte == MagickFalse)
+ (void) SetImageAlphaChannel(image,OpaqueAlphaChannel);
+ modify_outside_overlay=MagickTrue;
+ break;
+ }
+ case BlurCompositeOp:
+ {
+ CacheView
+ *composite_view,
+ *destination_view;
+
+ PixelInfo
+ pixel;
+
+ MagickRealType
+ angle_range,
+ angle_start,
+ height,
+ width;
+
+ ResampleFilter
+ *resample_filter;
+
+ SegmentInfo
+ blur;
+
+ /*
+ Blur Image dictated by an overlay gradient map: X = red_channel;
+ Y = green_channel; compose:args = x_scale[,y_scale[,angle]].
+ */
+ destination_image=CloneImage(image,image->columns,image->rows,MagickTrue,
+ &image->exception);
+ if (destination_image == (Image *) NULL)
+ return(MagickFalse);
+ /*
+ Determine the horizontal and vertical maximim blur.
+ */
+ SetGeometryInfo(&geometry_info);
+ flags=NoValue;
+ value=GetImageArtifact(composite_image,"compose:args");
+ if (value != (char *) NULL)
+ flags=ParseGeometry(value,&geometry_info);
+ if ((flags & WidthValue) == 0 )
+ {
+ destination_image=DestroyImage(destination_image);
+ return(MagickFalse);
+ }
+ width=geometry_info.rho;
+ height=geometry_info.sigma;
+ blur.x1=geometry_info.rho;
+ blur.x2=0.0;
+ blur.y1=0.0;
+ blur.y2=geometry_info.sigma;
+ angle_start=0.0;
+ angle_range=0.0;
+ if ((flags & HeightValue) == 0)
+ blur.y2=blur.x1;
+ if ((flags & XValue) != 0 )
+ {
+ MagickRealType
+ angle;
+
+ angle=DegreesToRadians(geometry_info.xi);
+ blur.x1=width*cos(angle);
+ blur.x2=width*sin(angle);
+ blur.y1=(-height*sin(angle));
+ blur.y2=height*cos(angle);
+ }
+ if ((flags & YValue) != 0 )
+ {
+ angle_start=DegreesToRadians(geometry_info.xi);
+ angle_range=DegreesToRadians(geometry_info.psi)-angle_start;
+ }
+ /*
+ Blur Image by resampling.
+ */
+ pixel=zero;
+ exception=(&image->exception);
+ resample_filter=AcquireResampleFilter(image,&image->exception);
+ SetResampleFilter(resample_filter,CubicFilter,2.0);
+ destination_view=AcquireCacheView(destination_image);
+ composite_view=AcquireCacheView(composite_image);
+ for (y=0; y < (ssize_t) composite_image->rows; y++)
+ {
+ MagickBooleanType
+ sync;
+
+ register const Quantum
+ *restrict p;
+
+ register Quantum
+ *restrict q;
+
+ register ssize_t
+ x;
+
+ if (((y+y_offset) < 0) || ((y+y_offset) >= (ssize_t) image->rows))
+ continue;
+ p=GetCacheViewVirtualPixels(composite_view,0,y,composite_image->columns,
+ 1,exception);
+ q=QueueCacheViewAuthenticPixels(destination_view,0,y,
+ destination_image->columns,1,&image->exception);
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
+ break;
+ for (x=0; x < (ssize_t) composite_image->columns; x++)
+ {
+ if (((x_offset+x) < 0) || ((x_offset+x) >= (ssize_t) image->columns))
+ {
+ p+=GetPixelChannels(composite_image);
+ continue;
+ }
+ if (fabs(angle_range) > MagickEpsilon)
+ {
+ MagickRealType
+ angle;
+
+ angle=angle_start+angle_range*QuantumScale*
+ GetPixelBlue(composite_image,p);
+ blur.x1=width*cos(angle);
+ blur.x2=width*sin(angle);
+ blur.y1=(-height*sin(angle));
+ blur.y2=height*cos(angle);
+ }
+ ScaleResampleFilter(resample_filter,blur.x1*QuantumScale*
+ GetPixelRed(composite_image,p),blur.y1*QuantumScale*
+ GetPixelGreen(composite_image,p),blur.x2*QuantumScale*
+ GetPixelRed(composite_image,p),blur.y2*QuantumScale*
+ GetPixelGreen(composite_image,p));
+ (void) ResamplePixelColor(resample_filter,(double) x_offset+x,
+ (double) y_offset+y,&pixel);
+ SetPixelPixelInfo(destination_image,&pixel,q);
+ p+=GetPixelChannels(composite_image);
+ q+=GetPixelChannels(destination_image);
+ }
+ sync=SyncCacheViewAuthenticPixels(destination_view,exception);
+ if (sync == MagickFalse)
+ break;
+ }
+ resample_filter=DestroyResampleFilter(resample_filter);
+ composite_view=DestroyCacheView(composite_view);
+ destination_view=DestroyCacheView(destination_view);
+ composite_image=destination_image;
+ break;
+ }
+ case DisplaceCompositeOp:
+ case DistortCompositeOp:
+ {
+ CacheView
+ *composite_view,
+ *destination_view,
+ *image_view;
+
+ PixelInfo
+ pixel;
+
+ MagickRealType
+ horizontal_scale,
+ vertical_scale;
+
+ PointInfo
+ center,
+ offset;
+
+ /*
+ Displace/Distort based on overlay gradient map:
+ X = red_channel; Y = green_channel;
+ compose:args = x_scale[,y_scale[,center.x,center.y]]
+ */
+ destination_image=CloneImage(image,image->columns,image->rows,MagickTrue,
+ &image->exception);
+ if (destination_image == (Image *) NULL)
+ return(MagickFalse);
+ SetGeometryInfo(&geometry_info);
+ flags=NoValue;
+ value=GetImageArtifact(composite_image,"compose:args");
+ if (value != (char *) NULL)
+ flags=ParseGeometry(value,&geometry_info);
+ if ((flags & (WidthValue|HeightValue)) == 0 )
+ {
+ if ((flags & AspectValue) == 0)
+ {
+ horizontal_scale=(MagickRealType) (composite_image->columns-1.0)/
+ 2.0;
+ vertical_scale=(MagickRealType) (composite_image->rows-1.0)/2.0;
+ }
+ else
+ {
+ horizontal_scale=(MagickRealType) (image->columns-1.0)/2.0;
+ vertical_scale=(MagickRealType) (image->rows-1.0)/2.0;
+ }
+ }
+ else
+ {
+ horizontal_scale=geometry_info.rho;
+ vertical_scale=geometry_info.sigma;
+ if ((flags & PercentValue) != 0)
+ {
+ if ((flags & AspectValue) == 0)
+ {
+ horizontal_scale*=(composite_image->columns-1.0)/200.0;
+ vertical_scale*=(composite_image->rows-1.0)/200.0;
+ }
+ else
+ {
+ horizontal_scale*=(image->columns-1.0)/200.0;
+ vertical_scale*=(image->rows-1.0)/200.0;
+ }
+ }
+ if ((flags & HeightValue) == 0)
+ vertical_scale=horizontal_scale;
+ }
+ /*
+ Determine fixed center point for absolute distortion map
+ Absolute distort ==
+ Displace offset relative to a fixed absolute point
+ Select that point according to +X+Y user inputs.
+ default = center of overlay image
+ arg flag '!' = locations/percentage relative to background image
+ */
+ center.x=(MagickRealType) x_offset;
+ center.y=(MagickRealType) y_offset;
+ if (compose == DistortCompositeOp)
+ {
+ if ((flags & XValue) == 0)
+ if ((flags & AspectValue) == 0)
+ center.x=(MagickRealType) x_offset+(composite_image->columns-1)/
+ 2.0;
+ else
+ center.x=((MagickRealType) image->columns-1)/2.0;
+ else
+ if ((flags & AspectValue) == 0)
+ center.x=(MagickRealType) x_offset+geometry_info.xi;
+ else
+ center.x=geometry_info.xi;
+ if ((flags & YValue) == 0)
+ if ((flags & AspectValue) == 0)
+ center.y=(MagickRealType) y_offset+(composite_image->rows-1)/2.0;
+ else
+ center.y=((MagickRealType) image->rows-1)/2.0;
+ else
+ if ((flags & AspectValue) == 0)
+ center.y=(MagickRealType) y_offset+geometry_info.psi;
+ else
+ center.y=geometry_info.psi;
+ }
+ /*
+ Shift the pixel offset point as defined by the provided,
+ displacement/distortion map. -- Like a lens...
+ */
+ pixel=zero;
+ exception=(&image->exception);
+ image_view=AcquireCacheView(image);
+ destination_view=AcquireCacheView(destination_image);
+ composite_view=AcquireCacheView(composite_image);
+ for (y=0; y < (ssize_t) composite_image->rows; y++)
+ {
+ MagickBooleanType
+ sync;
+
+ register const Quantum
+ *restrict p;
+
+ register Quantum
+ *restrict q;
+
+ register ssize_t
+ x;
+
+ if (((y+y_offset) < 0) || ((y+y_offset) >= (ssize_t) image->rows))
+ continue;
+ p=GetCacheViewVirtualPixels(composite_view,0,y,composite_image->columns,
+ 1,exception);
+ q=QueueCacheViewAuthenticPixels(destination_view,0,y,
+ destination_image->columns,1,&image->exception);
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
+ break;
+ for (x=0; x < (ssize_t) composite_image->columns; x++)
+ {
+ if (((x_offset+x) < 0) || ((x_offset+x) >= (ssize_t) image->columns))
+ {
+ p+=GetPixelChannels(composite_image);
+ continue;
+ }
+ /*
+ Displace the offset.
+ */
+ offset.x=(horizontal_scale*(GetPixelRed(composite_image,p)-
+ (((MagickRealType) QuantumRange+1.0)/2.0)))/(((MagickRealType)
+ QuantumRange+1.0)/2.0)+center.x+((compose == DisplaceCompositeOp) ?
+ x : 0);
+ offset.y=(vertical_scale*(GetPixelGreen(composite_image,p)-
+ (((MagickRealType) QuantumRange+1.0)/2.0)))/(((MagickRealType)
+ QuantumRange+1.0)/2.0)+center.y+((compose == DisplaceCompositeOp) ?
+ y : 0);
+ (void) InterpolatePixelInfo(image,image_view,
+ UndefinedInterpolatePixel,(double) offset.x,(double) offset.y,
+ &pixel,exception);
+ /*
+ Mask with the 'invalid pixel mask' in alpha channel.
+ */
+ pixel.alpha=(MagickRealType) QuantumRange*(1.0-(1.0-QuantumScale*
+ pixel.alpha)*(1.0-QuantumScale*
+ GetPixelAlpha(composite_image,p)));
+ SetPixelPixelInfo(destination_image,&pixel,q);
+ p+=GetPixelChannels(composite_image);
+ q+=GetPixelChannels(destination_image);
+ }
+ sync=SyncCacheViewAuthenticPixels(destination_view,exception);
+ if (sync == MagickFalse)
+ break;
+ }
+ destination_view=DestroyCacheView(destination_view);
+ composite_view=DestroyCacheView(composite_view);
+ image_view=DestroyCacheView(image_view);
+ composite_image=destination_image;
+ break;
+ }
+ case DissolveCompositeOp:
+ {
+ /*
+ Geometry arguments to dissolve factors.
+ */
+ value=GetImageArtifact(composite_image,"compose:args");
+ if (value != (char *) NULL)
+ {
+ flags=ParseGeometry(value,&geometry_info);
+ source_dissolve=geometry_info.rho/100.0;
+ destination_dissolve=1.0;
+ if ((source_dissolve-MagickEpsilon) < 0.0)
+ source_dissolve=0.0;
+ if ((source_dissolve+MagickEpsilon) > 1.0)
+ {
+ destination_dissolve=2.0-source_dissolve;
+ source_dissolve=1.0;
+ }
+ if ((flags & SigmaValue) != 0)
+ destination_dissolve=geometry_info.sigma/100.0;
+ if ((destination_dissolve-MagickEpsilon) < 0.0)
+ destination_dissolve=0.0;
+ modify_outside_overlay=MagickTrue;
+ if ((destination_dissolve+MagickEpsilon) > 1.0 )
+ {
+ destination_dissolve=1.0;
+ modify_outside_overlay=MagickFalse;
+ }
+ }
+ break;
+ }
+ case BlendCompositeOp:
+ {
+ value=GetImageArtifact(composite_image,"compose:args");
+ if (value != (char *) NULL)
+ {
+ flags=ParseGeometry(value,&geometry_info);
+ source_dissolve=geometry_info.rho/100.0;
+ destination_dissolve=1.0-source_dissolve;
+ if ((flags & SigmaValue) != 0)
+ destination_dissolve=geometry_info.sigma/100.0;
+ modify_outside_overlay=MagickTrue;
+ if ((destination_dissolve+MagickEpsilon) > 1.0)
+ modify_outside_overlay=MagickFalse;
+ }
+ break;
+ }
+ case MathematicsCompositeOp:
+ {
+ /*
+ Just collect the values from "compose:args", setting.
+ Unused values are set to zero automagically.
+
+ Arguments are normally a comma separated list, so this probably should
+ be changed to some 'general comma list' parser, (with a minimum
+ number of values)
+ */
+ SetGeometryInfo(&geometry_info);
+ value=GetImageArtifact(composite_image,"compose:args");
+ if (value != (char *) NULL)
+ (void) ParseGeometry(value,&geometry_info);
+ break;
+ }
+ case ModulateCompositeOp:
+ {
+ /*
+ Determine the brightness and saturation scale.
+ */
+ value=GetImageArtifact(composite_image,"compose:args");
+ if (value != (char *) NULL)
+ {
+ flags=ParseGeometry(value,&geometry_info);
+ percent_brightness=geometry_info.rho;
+ if ((flags & SigmaValue) != 0)
+ percent_saturation=geometry_info.sigma;
+ }
+ break;
+ }
+ case ThresholdCompositeOp:
+ {
+ /*
+ Determine the amount and threshold.
+ */
+ value=GetImageArtifact(composite_image,"compose:args");
+ if (value != (char *) NULL)
+ {
+ flags=ParseGeometry(value,&geometry_info);
+ amount=geometry_info.rho;
+ threshold=geometry_info.sigma;
+ if ((flags & SigmaValue) == 0)
+ threshold=0.05f;
+ }
+ threshold*=QuantumRange;
+ break;
+ }
+ default:
+ break;
+ }
+ value=GetImageArtifact(composite_image,"compose:outside-overlay");
+ if (value != (const char *) NULL)
+ modify_outside_overlay=IsMagickTrue(value);
+ /*
+ Composite image.
+ */
+ status=MagickTrue;
+ progress=0;
+ midpoint=((MagickRealType) QuantumRange+1.0)/2;
+ GetPixelInfo(composite_image,&zero);
+ exception=(&image->exception);
+ image_view=AcquireCacheView(image);
+ composite_view=AcquireCacheView(composite_image);
+#if defined(MAGICKCORE_OPENMP_SUPPORT)
+ #pragma omp parallel for schedule(dynamic,4) shared(progress,status)
+#endif
+ for (y=0; y < (ssize_t) image->rows; y++)
+ {
+ const Quantum
+ *pixels;
+
+ double
+ brightness,
+ hue,
+ saturation;
+
+ PixelInfo
+ composite,
+ destination,
+ source;
+
+ register const Quantum
+ *restrict p;
+
+ register Quantum
+ *restrict q;
+
+ register ssize_t
+ x;
+
+ if (status == MagickFalse)
+ continue;
+ if (modify_outside_overlay == MagickFalse)
+ {
+ if (y < y_offset)
+ continue;
+ if ((y-y_offset) >= (ssize_t) composite_image->rows)
+ continue;
+ }
+ /*
+ If pixels is NULL, y is outside overlay region.
+ */
+ pixels=(Quantum *) NULL;
+ p=(Quantum *) NULL;
+ if ((y >= y_offset) && ((y-y_offset) < (ssize_t) composite_image->rows))
+ {
+ p=GetCacheViewVirtualPixels(composite_view,0,y-y_offset,
+ composite_image->columns,1,exception);
+ if (p == (const Quantum *) NULL)
+ {
+ status=MagickFalse;
+ continue;
+ }
+ pixels=p;
+ if (x_offset < 0)
+ p-=x_offset*GetPixelChannels(composite_image);
+ }
+ q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
+ if (q == (const Quantum *) NULL)
+ {
+ status=MagickFalse;
+ continue;
+ }
+ source=zero;
+ destination=zero;
+ hue=0.0;
+ saturation=0.0;
+ brightness=0.0;
+ for (x=0; x < (ssize_t) image->columns; x++)
+ {
+ if (modify_outside_overlay == MagickFalse)
+ {
+ if (x < x_offset)
+ {
+ q+=GetPixelChannels(image);
+ continue;
+ }
+ if ((x-x_offset) >= (ssize_t) composite_image->columns)
+ break;
+ }
+ destination.red=(MagickRealType) GetPixelRed(image,q);
+ destination.green=(MagickRealType) GetPixelGreen(image,q);
+ destination.blue=(MagickRealType) GetPixelBlue(image,q);
+ if (image->colorspace == CMYKColorspace)
+ destination.black=(MagickRealType) GetPixelBlack(image,q);
+ if (image->colorspace == CMYKColorspace)
+ {
+ destination.red=(MagickRealType) QuantumRange-destination.red;
+ destination.green=(MagickRealType) QuantumRange-destination.green;
+ destination.blue=(MagickRealType) QuantumRange-destination.blue;
+ destination.black=(MagickRealType) QuantumRange-destination.black;
+ }
+ if (image->matte != MagickFalse)
+ destination.alpha=(MagickRealType) GetPixelAlpha(image,q);
+ /*
+ Handle destination modifications outside overlaid region.
+ */
+ composite=destination;
+ if ((pixels == (Quantum *) NULL) || (x < x_offset) ||
+ ((x-x_offset) >= (ssize_t) composite_image->columns))
+ {
+ switch (compose)
+ {
+ case DissolveCompositeOp:
+ case BlendCompositeOp:
+ {
+ composite.alpha=destination_dissolve*(composite.alpha);
+ break;
+ }
+ case ClearCompositeOp:
+ case SrcCompositeOp:
+ {
+ CompositeClear(&destination,&composite);
+ break;
+ }
+ case InCompositeOp:
+ case SrcInCompositeOp:
+ case OutCompositeOp:
+ case SrcOutCompositeOp:
+ case DstInCompositeOp:
+ case DstAtopCompositeOp:
+ case CopyOpacityCompositeOp:
+ case ChangeMaskCompositeOp:
+ {
+ composite.alpha=(MagickRealType) TransparentAlpha;
+ break;
+ }
+ default:
+ {
+ (void) GetOneVirtualMagickPixel(composite_image,x-x_offset,y-
+ y_offset,&composite,exception);
+ break;
+ }
+ }
+ if (image->colorspace == CMYKColorspace)
+ {
+ composite.red=(MagickRealType) QuantumRange-composite.red;
+ composite.green=(MagickRealType) QuantumRange-composite.green;
+ composite.blue=(MagickRealType) QuantumRange-composite.blue;
+ composite.black=(MagickRealType) QuantumRange-composite.black;
+ }
+ SetPixelRed(image,ClampToQuantum(composite.red),q);
+ SetPixelGreen(image,ClampToQuantum(composite.green),q);
+ SetPixelBlue(image,ClampToQuantum(composite.blue),q);
+ if (image->matte != MagickFalse)
+ SetPixelAlpha(image,ClampToQuantum(composite.alpha),q);
+ if (image->colorspace == CMYKColorspace)
+ SetPixelBlack(image,ClampToQuantum(composite.black),q);
+ q+=GetPixelChannels(image);
+ continue;
+ }
+ /*
+ Handle normal overlay of source onto destination.
+ */
+ source.red=(MagickRealType) GetPixelRed(composite_image,p);
+ source.green=(MagickRealType) GetPixelGreen(composite_image,p);
+ source.blue=(MagickRealType) GetPixelBlue(composite_image,p);
+ if (composite_image->colorspace == CMYKColorspace)
+ source.black=(MagickRealType) GetPixelBlack(composite_image,p);
+ if (composite_image->colorspace == CMYKColorspace)
+ {
+ source.red=(MagickRealType) QuantumRange-source.red;
+ source.green=(MagickRealType) QuantumRange-source.green;
+ source.blue=(MagickRealType) QuantumRange-source.blue;
+ source.black=(MagickRealType) QuantumRange-source.black;
+ }
+ if (composite_image->matte != MagickFalse)
+ source.alpha=(MagickRealType) GetPixelAlpha(composite_image,p);
+ /*
+ Porter-Duff compositions.
+ */
+ switch (compose)
+ {
+ case ClearCompositeOp:
+ {
+ CompositeClear(&destination,&composite);
+ break;
+ }
+ case SrcCompositeOp:
+ case CopyCompositeOp:
+ case ReplaceCompositeOp:
+ {
+ composite=source;
+ break;
+ }
+ case NoCompositeOp:
+ case DstCompositeOp:
+ break;
+ case OverCompositeOp:
+ case SrcOverCompositeOp:
+ {
+ CompositePixelInfoOver(&source,source.alpha,&destination,
+ destination.alpha,&composite);
+ break;
+ }
+ case DstOverCompositeOp:
+ {
+ CompositePixelInfoOver(&destination,destination.alpha,&source,
+ source.alpha,&composite);
+ break;
+ }
+ case SrcInCompositeOp:
+ case InCompositeOp:
+ {
+ CompositeIn(&source,&destination,&composite);
+ break;
+ }
+ case DstInCompositeOp:
+ {
+ CompositeIn(&destination,&source,&composite);
+ break;
+ }
+ case OutCompositeOp:
+ case SrcOutCompositeOp:
+ {
+ CompositeOut(&source,&destination,&composite);
+ break;
+ }
+ case DstOutCompositeOp:
+ {
+ CompositeOut(&destination,&source,&composite);
+ break;
+ }
+ case AtopCompositeOp:
+ case SrcAtopCompositeOp:
+ {
+ CompositeAtop(&source,&destination,&composite);
+ break;
+ }
+ case DstAtopCompositeOp:
+ {
+ CompositeAtop(&destination,&source,&composite);
+ break;
+ }
+ case XorCompositeOp:
+ {
+ CompositeXor(&source,&destination,&composite);
+ break;
+ }
+ case PlusCompositeOp:
+ {
+ CompositePlus(&source,&destination,channel,&composite);
+ break;
+ }
+ case MinusDstCompositeOp:
+ {
+ CompositeMinus(&source,&destination,channel,&composite);
+ break;
+ }
+ case MinusSrcCompositeOp:
+ {
+ CompositeMinus(&destination,&source,channel,&composite);
+ break;
+ }
+ case ModulusAddCompositeOp:
+ {
+ CompositeModulusAdd(&source,&destination,channel,&composite);
+ break;
+ }
+ case ModulusSubtractCompositeOp:
+ {
+ CompositeModulusSubtract(&source,&destination,channel,&composite);
+ break;
+ }
+ case DifferenceCompositeOp:
+ {
+ CompositeDifference(&source,&destination,channel,&composite);
+ break;
+ }
+ case ExclusionCompositeOp:
+ {
+ CompositeExclusion(&source,&destination,channel,&composite);
+ break;
+ }
+ case MultiplyCompositeOp:
+ {
+ CompositeMultiply(&source,&destination,channel,&composite);
+ break;
+ }
+ case ScreenCompositeOp:
+ {
+ CompositeScreen(&source,&destination,channel,&composite);
+ break;
+ }
+ case DivideDstCompositeOp:
+ {
+ CompositeDivide(&source,&destination,channel,&composite);
+ break;
+ }
+ case DivideSrcCompositeOp:
+ {
+ CompositeDivide(&destination,&source,channel,&composite);
+ break;
+ }
+ case DarkenCompositeOp:
+ {
+ CompositeDarken(&source,&destination,channel,&composite);
+ break;
+ }
+ case LightenCompositeOp:
+ {
+ CompositeLighten(&source,&destination,channel,&composite);
+ break;
+ }
+ case DarkenIntensityCompositeOp:
+ {
+ CompositeDarkenIntensity(&source,&destination,channel,&composite);
+ break;
+ }
+ case LightenIntensityCompositeOp:
+ {
+ CompositeLightenIntensity(&source,&destination,channel,&composite);
+ break;
+ }
+ case MathematicsCompositeOp:
+ {
+ CompositeMathematics(&source,&destination,channel,&geometry_info,
+ &composite);
+ break;
+ }
+ case ColorDodgeCompositeOp:
+ {
+ CompositeColorDodge(&source,&destination,&composite);
+ break;
+ }
+ case ColorBurnCompositeOp:
+ {
+ CompositeColorBurn(&source,&destination,&composite);
+ break;
+ }
+ case LinearDodgeCompositeOp:
+ {
+ CompositeLinearDodge(&source,&destination,&composite);
+ break;
+ }
+ case LinearBurnCompositeOp:
+ {
+ CompositeLinearBurn(&source,&destination,&composite);
+ break;
+ }
+ case HardLightCompositeOp:
+ {
+ CompositeHardLight(&source,&destination,&composite);
+ break;
+ }
+ case OverlayCompositeOp:
+ {
+ CompositeHardLight(&destination,&source,&composite);
+ break;
+ }
+ case SoftLightCompositeOp:
+ {
+ CompositeSoftLight(&source,&destination,&composite);
+ break;
+ }
+ case LinearLightCompositeOp:
+ {
+ CompositeLinearLight(&source,&destination,&composite);
+ break;
+ }
+ case PegtopLightCompositeOp:
+ {
+ CompositePegtopLight(&source,&destination,&composite);
+ break;
+ }
+ case VividLightCompositeOp:
+ {
+ CompositeVividLight(&source,&destination,&composite);
+ break;
+ }
+ case PinLightCompositeOp:
+ {
+ CompositePinLight(&source,&destination,&composite);
+ break;
+ }
+ case ChangeMaskCompositeOp:
+ {
+ if ((composite.alpha > ((MagickRealType) QuantumRange/2.0)) ||
+ (IsFuzzyEquivalencePixelInfo(&source,&destination) != MagickFalse))
+ composite.alpha=(MagickRealType) TransparentAlpha;
+ else
+ composite.alpha=(MagickRealType) OpaqueAlpha;
+ break;
+ }
+ case BumpmapCompositeOp:
+ {
+ if (source.alpha == TransparentAlpha)
+ break;
+ CompositeBumpmap(&source,&destination,&composite);
+ break;
+ }
+ case DissolveCompositeOp:
+ {
+ CompositePixelInfoOver(&source,source_dissolve*source.alpha,
+ &destination,(MagickRealType) (destination_dissolve*
+ destination.alpha),&composite);
+ break;
+ }
+ case BlendCompositeOp:
+ {
+ CompositePixelInfoBlend(&source,source_dissolve,&destination,
+ destination_dissolve,&composite);
+ break;
+ }
+ case ThresholdCompositeOp:
+ {
+ CompositeThreshold(&source,&destination,threshold,amount,&composite);
+ break;
+ }
+ case ModulateCompositeOp:
+ {
+ ssize_t
+ offset;
+
+ if (source.alpha == TransparentAlpha)
+ break;
+ offset=(ssize_t) (GetPixelInfoIntensity(&source)-midpoint);
+ if (offset == 0)
+ break;
+ CompositeHSB(destination.red,destination.green,destination.blue,&hue,
+ &saturation,&brightness);
+ brightness+=(0.01*percent_brightness*offset)/midpoint;
+ saturation*=0.01*percent_saturation;
+ HSBComposite(hue,saturation,brightness,&composite.red,
+ &composite.green,&composite.blue);
+ break;
+ }
+ case HueCompositeOp:
+ {
+ if (source.alpha == TransparentAlpha)
+ break;
+ if (destination.alpha == TransparentAlpha)
+ {
+ composite=source;
+ break;
+ }
+ CompositeHSB(destination.red,destination.green,destination.blue,&hue,
+ &saturation,&brightness);
+ CompositeHSB(source.red,source.green,source.blue,&hue,&sans,&sans);
+ HSBComposite(hue,saturation,brightness,&composite.red,
+ &composite.green,&composite.blue);
+ if (source.alpha < destination.alpha)
+ composite.alpha=source.alpha;
+ break;
+ }
+ case SaturateCompositeOp:
+ {
+ if (source.alpha == TransparentAlpha)
+ break;
+ if (destination.alpha == TransparentAlpha)
+ {
+ composite=source;
+ break;
+ }
+ CompositeHSB(destination.red,destination.green,destination.blue,&hue,
+ &saturation,&brightness);
+ CompositeHSB(source.red,source.green,source.blue,&sans,&saturation,
+ &sans);
+ HSBComposite(hue,saturation,brightness,&composite.red,
+ &composite.green,&composite.blue);
+ if (source.alpha < destination.alpha)
+ composite.alpha=source.alpha;
+ break;
+ }
+ case LuminizeCompositeOp:
+ {
+ if (source.alpha == TransparentAlpha)
+ break;
+ if (destination.alpha == TransparentAlpha)
+ {
+ composite=source;
+ break;
+ }
+ CompositeHSB(destination.red,destination.green,destination.blue,&hue,
+ &saturation,&brightness);
+ CompositeHSB(source.red,source.green,source.blue,&sans,&sans,
+ &brightness);
+ HSBComposite(hue,saturation,brightness,&composite.red,
+ &composite.green,&composite.blue);
+ if (source.alpha < destination.alpha)
+ composite.alpha=source.alpha;
+ break;
+ }
+ case ColorizeCompositeOp:
+ {
+ if (source.alpha == TransparentAlpha)
+ break;
+ if (destination.alpha == TransparentAlpha)
+ {
+ composite=source;
+ break;
+ }
+ CompositeHSB(destination.red,destination.green,destination.blue,&sans,
+ &sans,&brightness);
+ CompositeHSB(source.red,source.green,source.blue,&hue,&saturation,
+ &sans);
+ HSBComposite(hue,saturation,brightness,&composite.red,
+ &composite.green,&composite.blue);
+ if (source.alpha < destination.alpha)
+ composite.alpha=source.alpha;
+ break;
+ }
+ case CopyRedCompositeOp:
+ case CopyCyanCompositeOp:
+ {
+ composite.red=source.red;
+ break;
+ }
+ case CopyGreenCompositeOp:
+ case CopyMagentaCompositeOp:
+ {
+ composite.green=source.green;
+ break;
+ }
+ case CopyBlueCompositeOp:
+ case CopyYellowCompositeOp:
+ {
+ composite.blue=source.blue;
+ break;
+ }
+ case CopyOpacityCompositeOp:
+ {
+ if (source.matte == MagickFalse)
+ {
+ composite.alpha=(MagickRealType) GetPixelInfoIntensity(&source);
+ break;
+ }
+ composite.alpha=source.alpha;
+ break;
+ }
+ case CopyBlackCompositeOp:
+ {
+ if (source.colorspace != CMYKColorspace)
+ ConvertRGBToCMYK(&source);
+ composite.black=source.black;
+ break;
+ }
+ case BlurCompositeOp:
+ case DisplaceCompositeOp:
+ case DistortCompositeOp:
+ {
+ composite=source;
+ break;
+ }
+ default:
+ break;
+ }
+ if (image->colorspace == CMYKColorspace)
+ {
+ composite.red=(MagickRealType) QuantumRange-composite.red;
+ composite.green=(MagickRealType) QuantumRange-composite.green;
+ composite.blue=(MagickRealType) QuantumRange-composite.blue;
+ composite.black=(MagickRealType) QuantumRange-composite.black;
+ }
+ SetPixelRed(image,ClampToQuantum(composite.red),q);
+ SetPixelGreen(image,ClampToQuantum(composite.green),q);
+ SetPixelBlue(image,ClampToQuantum(composite.blue),q);
+ if (image->colorspace == CMYKColorspace)
+ SetPixelBlack(image,ClampToQuantum(composite.black),q);
+ SetPixelAlpha(image,ClampToQuantum(composite.alpha),q);
+ p+=GetPixelChannels(composite_image);
+ if (p >= (pixels+composite_image->columns*GetPixelChannels(composite_image)))
+ p=pixels;
+ q+=GetPixelChannels(image);
+ }
+ if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
+ status=MagickFalse;
+ if (image->progress_monitor != (MagickProgressMonitor) NULL)
+ {
+ MagickBooleanType
+ proceed;
+
+#if defined(MAGICKCORE_OPENMP_SUPPORT)
+ #pragma omp critical (MagickCore_CompositeImageChannel)
+#endif
+ proceed=SetImageProgress(image,CompositeImageTag,progress++,
+ image->rows);
+ if (proceed == MagickFalse)
+ status=MagickFalse;
+ }
+ }
+ composite_view=DestroyCacheView(composite_view);
+ image_view=DestroyCacheView(image_view);
+ if (destination_image != (Image * ) NULL)
+ destination_image=DestroyImage(destination_image);
+ return(status);
+}
+
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% %
+% %
+% %
+% T e x t u r e I m a g e %
+% %
+% %
+% %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% TextureImage() repeatedly tiles the texture image across and down the image
+% canvas.
+%
+% The format of the TextureImage method is:
+%
+% MagickBooleanType TextureImage(Image *image,const Image *texture)
+%
+% A description of each parameter follows:
+%
+% o image: the image.
+%
+% o texture: This image is the texture to layer on the background.
+%
+*/
+MagickExport MagickBooleanType TextureImage(Image *image,const Image *texture)
+{
+#define TextureImageTag "Texture/Image"
+
+ CacheView
+ *image_view,
+ *texture_view;
+
+ ExceptionInfo
+ *exception;
+
+ MagickBooleanType
+ status;
+
+ ssize_t
+ y;
+
+ assert(image != (Image *) NULL);
+ if (image->debug != MagickFalse)
+ (void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
+ assert(image->signature == MagickSignature);
+ if (texture == (const Image *) NULL)
+ return(MagickFalse);
+ (void) SetImageVirtualPixelMethod(texture,TileVirtualPixelMethod);
+ if (SetImageStorageClass(image,DirectClass) == MagickFalse)
+ return(MagickFalse);
+ status=MagickTrue;
+ if ((image->compose != CopyCompositeOp) &&
+ ((image->compose != OverCompositeOp) || (image->matte != MagickFalse) ||
+ (texture->matte != MagickFalse)))
+ {
+ /*
+ Tile texture onto the image background.
+ */
+#if defined(MAGICKCORE_OPENMP_SUPPORT)
+ #pragma omp parallel for schedule(dynamic,4) shared(status) omp_throttle(1)
+#endif
+ for (y=0; y < (ssize_t) image->rows; y+=(ssize_t) texture->rows)
+ {
+ register ssize_t
+ x;
+
+ if (status == MagickFalse)
+ continue;
+ for (x=0; x < (ssize_t) image->columns; x+=(ssize_t) texture->columns)
+ {
+ MagickBooleanType
+ thread_status;
+
+ thread_status=CompositeImage(image,image->compose,texture,x+
+ texture->tile_offset.x,y+texture->tile_offset.y);
+ if (thread_status == MagickFalse)
+ {
+ status=thread_status;
+ break;
+ }
+ }
+ if (image->progress_monitor != (MagickProgressMonitor) NULL)
+ {
+ MagickBooleanType
+ proceed;
+
+#if defined(MAGICKCORE_OPENMP_SUPPORT)
+ #pragma omp critical (MagickCore_TextureImage)
+#endif
+ proceed=SetImageProgress(image,TextureImageTag,(MagickOffsetType)
+ y,image->rows);
+ if (proceed == MagickFalse)
+ status=MagickFalse;
+ }
+ }
+ (void) SetImageProgress(image,TextureImageTag,(MagickOffsetType)
+ image->rows,image->rows);
+ return(status);
+ }
+ /*
+ Tile texture onto the image background (optimized).
+ */
+ status=MagickTrue;
+ exception=(&image->exception);
+ image_view=AcquireCacheView(image);
+ texture_view=AcquireCacheView(texture);
+#if defined(MAGICKCORE_OPENMP_SUPPORT)
+ #pragma omp parallel for schedule(dynamic,4) shared(status) omp_throttle(1)
+#endif
+ for (y=0; y < (ssize_t) image->rows; y++)
+ {
+ MagickBooleanType
+ sync;
+
+ register const Quantum
+ *p,
+ *pixels;
+
+ register ssize_t
+ x;
+
+ register Quantum
+ *q;
+
+ size_t
+ width;
+
+ if (status == MagickFalse)
+ continue;
+ pixels=GetCacheViewVirtualPixels(texture_view,texture->tile_offset.x,(y+
+ texture->tile_offset.y) % texture->rows,texture->columns,1,exception);
+ q=QueueCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
+ exception);
+ if ((pixels == (const Quantum *) NULL) || (q == (Quantum *) NULL))
+ {
+ status=MagickFalse;
+ continue;
+ }
+ for (x=0; x < (ssize_t) image->columns; x+=(ssize_t) texture->columns)
+ {
+ register ssize_t
+ i;
+
+ p=pixels;
+ width=texture->columns;
+ if ((x+(ssize_t) width) > (ssize_t) image->columns)
+ width=image->columns-x;
+ for (i=0; i < (ssize_t) width; i++)
+ {
+ SetPixelRed(image,GetPixelRed(texture,p),q);
+ SetPixelGreen(image,GetPixelGreen(texture,p),q);
+ SetPixelBlue(image,GetPixelBlue(texture,p),q);
+ SetPixelAlpha(image,GetPixelAlpha(texture,p),q);
+ if ((image->colorspace == CMYKColorspace) &&
+ (texture->colorspace == CMYKColorspace))
+ SetPixelBlack(image,GetPixelBlack(texture,p),q);
+ p+=GetPixelChannels(texture);
+ q+=GetPixelChannels(image);
+ }
+ }
+ sync=SyncCacheViewAuthenticPixels(image_view,exception);
+ if (sync == MagickFalse)
+ status=MagickFalse;
+ if (image->progress_monitor != (MagickProgressMonitor) NULL)
+ {
+ MagickBooleanType
+ proceed;
+
+#if defined(MAGICKCORE_OPENMP_SUPPORT)
+ #pragma omp critical (MagickCore_TextureImage)
+#endif
+ proceed=SetImageProgress(image,TextureImageTag,(MagickOffsetType) y,
+ image->rows);
+ if (proceed == MagickFalse)
+ status=MagickFalse;
+ }
+ }
+ texture_view=DestroyCacheView(texture_view);
+ image_view=DestroyCacheView(image_view);
+ return(status);
+}
diff --git a/magick/composite.h b/MagickCore/composite.h
similarity index 82%
rename from magick/composite.h
rename to MagickCore/composite.h
index 4373c25..6808094 100644
--- a/magick/composite.h
+++ b/MagickCore/composite.h
@@ -24,11 +24,9 @@
typedef enum
{
- UndefinedCompositeOp,
- NoCompositeOp,
- ModulusAddCompositeOp,
AtopCompositeOp,
BlendCompositeOp,
+ BlurCompositeOp,
BumpmapCompositeOp,
ChangeMaskCompositeOp,
ClearCompositeOp,
@@ -45,27 +43,41 @@
CopyRedCompositeOp,
CopyYellowCompositeOp,
DarkenCompositeOp,
+ DarkenIntensityCompositeOp,
+ DifferenceCompositeOp,
+ DisplaceCompositeOp,
+ DissolveCompositeOp,
+ DistortCompositeOp,
+ DivideDstCompositeOp,
+ DivideSrcCompositeOp,
DstAtopCompositeOp,
DstCompositeOp,
DstInCompositeOp,
DstOutCompositeOp,
DstOverCompositeOp,
- DifferenceCompositeOp,
- DisplaceCompositeOp,
- DissolveCompositeOp,
ExclusionCompositeOp,
HardLightCompositeOp,
HueCompositeOp,
InCompositeOp,
LightenCompositeOp,
+ LightenIntensityCompositeOp,
+ LinearBurnCompositeOp,
+ LinearDodgeCompositeOp,
LinearLightCompositeOp,
LuminizeCompositeOp,
+ MathematicsCompositeOp,
MinusDstCompositeOp,
+ MinusSrcCompositeOp,
ModulateCompositeOp,
+ ModulusAddCompositeOp,
+ ModulusSubtractCompositeOp,
MultiplyCompositeOp,
+ NoCompositeOp,
OutCompositeOp,
OverCompositeOp,
OverlayCompositeOp,
+ PegtopLightCompositeOp,
+ PinLightCompositeOp,
PlusCompositeOp,
ReplaceCompositeOp,
SaturateCompositeOp,
@@ -76,36 +88,12 @@
SrcInCompositeOp,
SrcOutCompositeOp,
SrcOverCompositeOp,
- ModulusSubtractCompositeOp,
ThresholdCompositeOp,
- XorCompositeOp,
- /* These are new operators, added after the above was last sorted.
- * The list should be re-sorted only when a new library version is
- * created.
- */
- DivideDstCompositeOp,
- DistortCompositeOp,
- BlurCompositeOp,
- PegtopLightCompositeOp,
+ UndefinedCompositeOp,
VividLightCompositeOp,
- PinLightCompositeOp,
- LinearDodgeCompositeOp,
- LinearBurnCompositeOp,
- MathematicsCompositeOp,
- DivideSrcCompositeOp,
- MinusSrcCompositeOp,
- DarkenIntensityCompositeOp,
- LightenIntensityCompositeOp
+ XorCompositeOp
} CompositeOperator;
-/* Depreciated (renamed) Method Names for backward compatibility
- * However the CompositeOp value has not changed, just renamed.
- */
-#define AddCompositeOp ModulusAddCompositeOp
-#define SubtractCompositeOp ModulusSubtractCompositeOp
-#define MinusCompositeOp MinusDstCompositeOp
-#define DivideCompositeOp DivideDstCompositeOp
-
extern MagickExport MagickBooleanType
CompositeImage(Image *,const CompositeOperator,const Image *,const ssize_t,
const ssize_t),
diff --git a/magick/compress.c b/MagickCore/compress.c
similarity index 96%
rename from magick/compress.c
rename to MagickCore/compress.c
index 313bd68..6e735ed 100644
--- a/magick/compress.c
+++ b/MagickCore/compress.c
@@ -40,23 +40,24 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/color-private.h"
-#include "magick/cache.h"
-#include "magick/compress.h"
-#include "magick/constitute.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/option.h"
-#include "magick/resource_.h"
-#include "magick/string_.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/compress.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/option.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/string_.h"
#if defined(MAGICKCORE_TIFF_DELEGATE)
#if defined(MAGICKCORE_HAVE_TIFFCONF_H)
#include "tiffconf.h"
@@ -429,17 +430,14 @@
**mb_hash,
**mw_hash;
- IndexPacket
- index;
-
int
byte;
MagickBooleanType
proceed;
- register IndexPacket
- *indexes;
+ Quantum
+ index;
register ssize_t
i;
@@ -513,7 +511,7 @@
image_view=AcquireCacheView(image);
for (y=0; ((y < (ssize_t) image->rows) && (null_lines < 3)); )
{
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -631,14 +629,14 @@
*/
p=scanline;
q=QueueCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
- index=(IndexPacket) (*p++);
- SetPixelIndex(indexes+x,index);
- SetPixelRGBO(q,image->colormap+(ssize_t) index);
+ index=(Quantum) (*p++);
+ SetPixelIndex(image,index,q);
+ SetPixelPacket(image,image->colormap+(ssize_t) index,q);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
break;
@@ -735,7 +733,7 @@
i,
x;
- register const PixelPacket
+ register const Quantum
*p;
register unsigned char
@@ -804,13 +802,13 @@
for (y=0; y < (ssize_t) huffman_image->rows; y++)
{
p=GetVirtualPixels(huffman_image,0,y,huffman_image->columns,1,exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) huffman_image->columns; x++)
{
- *q++=(unsigned char) (PixelIntensity(p) >= ((MagickRealType)
- QuantumRange/2.0) ? 0 : 1);
- p++;
+ *q++=(unsigned char) (GetPixelIntensity(huffman_image,p) >=
+ ((MagickRealType) QuantumRange/2.0) ? 0 : 1);
+ p+=GetPixelChannels(huffman_image);
}
/*
Huffman encode scanline.
diff --git a/magick/compress.h b/MagickCore/compress.h
similarity index 85%
rename from magick/compress.h
rename to MagickCore/compress.h
index 02a20ec..313ee3b 100644
--- a/magick/compress.h
+++ b/MagickCore/compress.h
@@ -25,27 +25,27 @@
typedef enum
{
UndefinedCompression,
- NoCompression,
+ B44ACompression,
+ B44Compression,
BZipCompression,
DXT1Compression,
DXT3Compression,
DXT5Compression,
FaxCompression,
Group4Compression,
+ JBIG1Compression, /* ISO/IEC std 11544 / ITU-T rec T.82 */
+ JBIG2Compression, /* ISO/IEC std 14492 / ITU-T rec T.88 */
+ JPEG2000Compression, /* ISO/IEC std 15444-1 */
JPEGCompression,
- JPEG2000Compression, /* ISO/IEC std 15444-1 */
LosslessJPEGCompression,
+ LZMACompression, /* Lempel-Ziv-Markov chain algorithm */
LZWCompression,
- RLECompression,
- ZipCompression,
- ZipSCompression,
+ NoCompression,
PizCompression,
Pxr24Compression,
- B44Compression,
- B44ACompression,
- LZMACompression, /* Lempel-Ziv-Markov chain algorithm */
- JBIG1Compression, /* ISO/IEC std 11544 / ITU-T rec T.82 */
- JBIG2Compression /* ISO/IEC std 14492 / ITU-T rec T.88 */
+ RLECompression,
+ ZipCompression,
+ ZipSCompression
} CompressionType;
typedef struct _Ascii85Info
diff --git a/magick/config.h_vms b/MagickCore/config.h_vms
similarity index 100%
rename from magick/config.h_vms
rename to MagickCore/config.h_vms
diff --git a/magick/configure.c b/MagickCore/configure.c
similarity index 98%
rename from magick/configure.c
rename to MagickCore/configure.c
index b8a53ef..b9b2bee 100644
--- a/magick/configure.c
+++ b/MagickCore/configure.c
@@ -39,20 +39,20 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/client.h"
-#include "magick/configure.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/hashmap.h"
-#include "magick/log.h"
-#include "magick/memory_.h"
-#include "magick/semaphore.h"
-#include "magick/string_.h"
-#include "magick/token.h"
-#include "magick/utility.h"
-#include "magick/xml-tree.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/client.h"
+#include "MagickCore/configure.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/hashmap.h"
+#include "MagickCore/log.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/semaphore.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/token.h"
+#include "MagickCore/utility.h"
+#include "MagickCore/xml-tree.h"
/*
Define declarations.
diff --git a/magick/configure.h b/MagickCore/configure.h
similarity index 93%
rename from magick/configure.h
rename to MagickCore/configure.h
index 2ad11f8..79caa28 100644
--- a/magick/configure.h
+++ b/MagickCore/configure.h
@@ -22,7 +22,7 @@
extern "C" {
#endif
-#include "magick/hashmap.h"
+#include "MagickCore/hashmap.h"
typedef struct _ConfigureInfo
{
@@ -35,10 +35,6 @@
exempt,
stealth;
- struct _ConfigureInfo
- *previous,
- *next; /* deprecated, use GetConfigureInfoList() */
-
size_t
signature;
} ConfigureInfo;
diff --git a/magick/constitute.c b/MagickCore/constitute.c
similarity index 96%
rename from magick/constitute.c
rename to MagickCore/constitute.c
index 9d08c37..d6c9070 100644
--- a/magick/constitute.c
+++ b/MagickCore/constitute.c
@@ -39,39 +39,40 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/cache.h"
-#include "magick/client.h"
-#include "magick/constitute.h"
-#include "magick/delegate.h"
-#include "magick/geometry.h"
-#include "magick/identify.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/option.h"
-#include "magick/pixel.h"
-#include "magick/policy.h"
-#include "magick/profile.h"
-#include "magick/property.h"
-#include "magick/quantum.h"
-#include "magick/resize.h"
-#include "magick/resource_.h"
-#include "magick/semaphore.h"
-#include "magick/statistic.h"
-#include "magick/stream.h"
-#include "magick/string_.h"
-#include "magick/string-private.h"
-#include "magick/timer.h"
-#include "magick/transform.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/client.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/delegate.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/identify.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/option.h"
+#include "MagickCore/pixel.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/policy.h"
+#include "MagickCore/profile.h"
+#include "MagickCore/property.h"
+#include "MagickCore/quantum.h"
+#include "MagickCore/resize.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/semaphore.h"
+#include "MagickCore/statistic.h"
+#include "MagickCore/stream.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/string-private.h"
+#include "MagickCore/timer.h"
+#include "MagickCore/transform.h"
+#include "MagickCore/utility.h"
static SemaphoreInfo
*constitute_semaphore = (SemaphoreInfo *) NULL;
@@ -748,19 +749,9 @@
profile=GetImageProfile(next,"icc");
if (profile == (const StringInfo *) NULL)
profile=GetImageProfile(next,"icm");
- if (profile != (const StringInfo *) NULL)
- {
- next->color_profile.length=GetStringInfoLength(profile);
- next->color_profile.info=GetStringInfoDatum(profile);
- }
profile=GetImageProfile(next,"iptc");
if (profile == (const StringInfo *) NULL)
profile=GetImageProfile(next,"8bim");
- if (profile != (const StringInfo *) NULL)
- {
- next->iptc_profile.length=GetStringInfoLength(profile);
- next->iptc_profile.info=GetStringInfoDatum(profile);
- }
(void) FormatMagickTime(GetBlobProperties(next)->st_mtime,MaxTextExtent,
timestamp);
(void) SetImageProperty(next,"date:modify",timestamp);
@@ -1220,7 +1211,7 @@
}
if ((LocaleCompare(write_info->magick,"info") != 0) &&
(write_info->verbose != MagickFalse))
- (void) IdentifyImage(image,stderr,MagickFalse);
+ (void) IdentifyImage(image,stdout,MagickFalse);
write_info=DestroyImageInfo(write_info);
return(status);
}
diff --git a/magick/constitute.h b/MagickCore/constitute.h
similarity index 100%
rename from magick/constitute.h
rename to MagickCore/constitute.h
diff --git a/magick/decorate.c b/MagickCore/decorate.c
similarity index 68%
rename from magick/decorate.c
rename to MagickCore/decorate.c
index 1595437..2ca3369 100644
--- a/magick/decorate.c
+++ b/MagickCore/decorate.c
@@ -40,22 +40,23 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/cache-view.h"
-#include "magick/color-private.h"
-#include "magick/colorspace-private.h"
-#include "magick/composite.h"
-#include "magick/decorate.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/pixel-private.h"
-#include "magick/quantum.h"
-#include "magick/thread-private.h"
-#include "magick/transform.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/cache-view.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colorspace-private.h"
+#include "MagickCore/composite.h"
+#include "MagickCore/decorate.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantum.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/thread-private.h"
+#include "MagickCore/transform.h"
/*
Define declarations.
@@ -177,7 +178,7 @@
MagickOffsetType
progress;
- MagickPixelPacket
+ PixelInfo
accentuate,
border,
highlight,
@@ -225,7 +226,7 @@
frame_image=DestroyImage(frame_image);
return((Image *) NULL);
}
- if (frame_image->matte_color.opacity != OpaqueOpacity)
+ if (frame_image->matte_color.alpha != OpaqueAlpha)
frame_image->matte=MagickTrue;
frame_image->page=image->page;
if ((image->page.width != 0) && (image->page.height != 0))
@@ -236,43 +237,40 @@
/*
Initialize 3D effects color.
*/
- GetMagickPixelPacket(frame_image,&interior);
- SetMagickPixelPacket(frame_image,&image->border_color,(IndexPacket *) NULL,
- &interior);
- GetMagickPixelPacket(frame_image,&matte);
+ GetPixelInfo(frame_image,&interior);
+ SetPixelInfoPacket(frame_image,&image->border_color,&interior);
+ GetPixelInfo(frame_image,&matte);
matte.colorspace=RGBColorspace;
- SetMagickPixelPacket(frame_image,&image->matte_color,(IndexPacket *) NULL,
- &matte);
- GetMagickPixelPacket(frame_image,&border);
+ SetPixelInfoPacket(frame_image,&image->matte_color,&matte);
+ GetPixelInfo(frame_image,&border);
border.colorspace=RGBColorspace;
- SetMagickPixelPacket(frame_image,&image->border_color,(IndexPacket *) NULL,
- &border);
- GetMagickPixelPacket(frame_image,&accentuate);
+ SetPixelInfoPacket(frame_image,&image->border_color,&border);
+ GetPixelInfo(frame_image,&accentuate);
accentuate.red=(MagickRealType) (QuantumScale*((QuantumRange-
AccentuateModulate)*matte.red+(QuantumRange*AccentuateModulate)));
accentuate.green=(MagickRealType) (QuantumScale*((QuantumRange-
AccentuateModulate)*matte.green+(QuantumRange*AccentuateModulate)));
accentuate.blue=(MagickRealType) (QuantumScale*((QuantumRange-
AccentuateModulate)*matte.blue+(QuantumRange*AccentuateModulate)));
- accentuate.opacity=matte.opacity;
- GetMagickPixelPacket(frame_image,&highlight);
+ accentuate.alpha=matte.alpha;
+ GetPixelInfo(frame_image,&highlight);
highlight.red=(MagickRealType) (QuantumScale*((QuantumRange-
HighlightModulate)*matte.red+(QuantumRange*HighlightModulate)));
highlight.green=(MagickRealType) (QuantumScale*((QuantumRange-
HighlightModulate)*matte.green+(QuantumRange*HighlightModulate)));
highlight.blue=(MagickRealType) (QuantumScale*((QuantumRange-
HighlightModulate)*matte.blue+(QuantumRange*HighlightModulate)));
- highlight.opacity=matte.opacity;
- GetMagickPixelPacket(frame_image,&shadow);
+ highlight.alpha=matte.alpha;
+ GetPixelInfo(frame_image,&shadow);
shadow.red=QuantumScale*matte.red*ShadowModulate;
shadow.green=QuantumScale*matte.green*ShadowModulate;
shadow.blue=QuantumScale*matte.blue*ShadowModulate;
- shadow.opacity=matte.opacity;
- GetMagickPixelPacket(frame_image,&trough);
+ shadow.alpha=matte.alpha;
+ GetPixelInfo(frame_image,&trough);
trough.red=QuantumScale*matte.red*TroughModulate;
trough.green=QuantumScale*matte.green*TroughModulate;
trough.blue=QuantumScale*matte.blue*TroughModulate;
- trough.opacity=matte.opacity;
+ trough.alpha=matte.alpha;
if (image->colorspace == CMYKColorspace)
{
ConvertRGBToCMYK(&interior);
@@ -291,13 +289,10 @@
frame_info->inner_bevel);
if (height != 0)
{
- register IndexPacket
- *restrict frame_indexes;
-
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
/*
@@ -305,8 +300,7 @@
*/
q=QueueCacheViewAuthenticPixels(frame_view,0,0,frame_image->columns,
height,exception);
- frame_indexes=GetCacheViewAuthenticIndexQueue(frame_view);
- if (q != (PixelPacket *) NULL)
+ if (q != (Quantum *) NULL)
{
/*
Draw top of ornamental border.
@@ -316,84 +310,73 @@
for (x=0; x < (ssize_t) (frame_image->columns-y); x++)
{
if (x < y)
- SetPixelPacket(frame_image,&highlight,q,frame_indexes);
+ SetPixelPixelInfo(frame_image,&highlight,q);
else
- SetPixelPacket(frame_image,&accentuate,q,frame_indexes);
- q++;
- frame_indexes++;
+ SetPixelPixelInfo(frame_image,&accentuate,q);
+ q+=GetPixelChannels(frame_image);
}
for ( ; x < (ssize_t) frame_image->columns; x++)
{
- SetPixelPacket(frame_image,&shadow,q,frame_indexes);
- q++;
- frame_indexes++;
+ SetPixelPixelInfo(frame_image,&shadow,q);
+ q+=GetPixelChannels(frame_image);
}
}
for (y=0; y < (ssize_t) (frame_info->y-bevel_width); y++)
{
for (x=0; x < (ssize_t) frame_info->outer_bevel; x++)
{
- SetPixelPacket(frame_image,&highlight,q,frame_indexes);
- q++;
- frame_indexes++;
+ SetPixelPixelInfo(frame_image,&highlight,q);
+ q+=GetPixelChannels(frame_image);
}
width=frame_image->columns-2*frame_info->outer_bevel;
for (x=0; x < (ssize_t) width; x++)
{
- SetPixelPacket(frame_image,&matte,q,frame_indexes);
- q++;
- frame_indexes++;
+ SetPixelPixelInfo(frame_image,&matte,q);
+ q+=GetPixelChannels(frame_image);
}
for (x=0; x < (ssize_t) frame_info->outer_bevel; x++)
{
- SetPixelPacket(frame_image,&shadow,q,frame_indexes);
- q++;
- frame_indexes++;
+ SetPixelPixelInfo(frame_image,&shadow,q);
+ q+=GetPixelChannels(frame_image);
}
}
for (y=0; y < (ssize_t) frame_info->inner_bevel; y++)
{
for (x=0; x < (ssize_t) frame_info->outer_bevel; x++)
{
- SetPixelPacket(frame_image,&highlight,q,frame_indexes);
- q++;
- frame_indexes++;
+ SetPixelPixelInfo(frame_image,&highlight,q);
+ q+=GetPixelChannels(frame_image);
}
for (x=0; x < (ssize_t) (frame_info->x-bevel_width); x++)
{
- SetPixelPacket(frame_image,&matte,q,frame_indexes);
- q++;
- frame_indexes++;
+ SetPixelPixelInfo(frame_image,&matte,q);
+ q+=GetPixelChannels(frame_image);
}
width=image->columns+((size_t) frame_info->inner_bevel << 1)-
y;
for (x=0; x < (ssize_t) width; x++)
{
if (x < y)
- SetPixelPacket(frame_image,&shadow,q,frame_indexes);
+ SetPixelPixelInfo(frame_image,&shadow,q);
else
- SetPixelPacket(frame_image,&trough,q,frame_indexes);
- q++;
- frame_indexes++;
+ SetPixelPixelInfo(frame_image,&trough,q);
+ q+=GetPixelChannels(frame_image);
}
for ( ; x < (ssize_t) (image->columns+2*frame_info->inner_bevel); x++)
{
- SetPixelPacket(frame_image,&highlight,q,frame_indexes);
- q++;
- frame_indexes++;
+ SetPixelPixelInfo(frame_image,&highlight,q);
+ q+=GetPixelChannels(frame_image);
}
width=frame_info->width-frame_info->x-image->columns-bevel_width;
for (x=0; x < (ssize_t) width; x++)
{
- SetPixelPacket(frame_image,&matte,q,frame_indexes);
- q++;
- frame_indexes++;
+ SetPixelPixelInfo(frame_image,&matte,q);
+ q+=GetPixelChannels(frame_image);
}
for (x=0; x < (ssize_t) frame_info->outer_bevel; x++)
{
- SetPixelPacket(frame_image,&shadow,q,frame_indexes);
- q++;
- frame_indexes++;
+ SetPixelPixelInfo(frame_image,&shadow,q);
+ q+=GetPixelChannels(frame_image);
}
}
(void) SyncCacheViewAuthenticPixels(frame_view,exception);
@@ -407,13 +390,10 @@
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- register IndexPacket
- *restrict frame_indexes;
-
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
/*
@@ -423,29 +403,25 @@
continue;
q=QueueCacheViewAuthenticPixels(frame_view,0,frame_info->y+y,
frame_image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- frame_indexes=GetCacheViewAuthenticIndexQueue(frame_view);
for (x=0; x < (ssize_t) frame_info->outer_bevel; x++)
{
- SetPixelPacket(frame_image,&highlight,q,frame_indexes);
- q++;
- frame_indexes++;
+ SetPixelPixelInfo(frame_image,&highlight,q);
+ q+=GetPixelChannels(frame_image);
}
for (x=0; x < (ssize_t) (frame_info->x-bevel_width); x++)
{
- SetPixelPacket(frame_image,&matte,q,frame_indexes);
- q++;
- frame_indexes++;
+ SetPixelPixelInfo(frame_image,&matte,q);
+ q+=GetPixelChannels(frame_image);
}
for (x=0; x < (ssize_t) frame_info->inner_bevel; x++)
{
- SetPixelPacket(frame_image,&shadow,q,frame_indexes);
- q++;
- frame_indexes++;
+ SetPixelPixelInfo(frame_image,&shadow,q);
+ q+=GetPixelChannels(frame_image);
}
/*
Set frame interior to interior color.
@@ -454,53 +430,47 @@
((image->compose != OverCompositeOp) || (image->matte != MagickFalse)))
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelPacket(frame_image,&interior,q,frame_indexes);
- q++;
- frame_indexes++;
+ SetPixelPixelInfo(frame_image,&interior,q);
+ q+=GetPixelChannels(frame_image);
}
else
{
- register const IndexPacket
- *indexes;
-
- register const PixelPacket
+ register const Quantum
*p;
p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewVirtualIndexQueue(image_view);
- (void) CopyMagickMemory(q,p,image->columns*sizeof(*p));
- if ((image->colorspace == CMYKColorspace) &&
- (frame_image->colorspace == CMYKColorspace))
- {
- (void) CopyMagickMemory(frame_indexes,indexes,image->columns*
- sizeof(*indexes));
- frame_indexes+=image->columns;
- }
- q+=image->columns;
+ for (x=0; x < (ssize_t) image->columns; x++)
+ {
+ SetPixelRed(frame_image,GetPixelRed(image,p),q);
+ SetPixelGreen(frame_image,GetPixelGreen(image,p),q);
+ SetPixelBlue(frame_image,GetPixelBlue(image,p),q);
+ if (image->colorspace == CMYKColorspace)
+ SetPixelBlack(frame_image,GetPixelBlack(image,p),q);
+ SetPixelAlpha(frame_image,GetPixelAlpha(image,p),q);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(frame_image);
+ }
}
for (x=0; x < (ssize_t) frame_info->inner_bevel; x++)
{
- SetPixelPacket(frame_image,&highlight,q,frame_indexes);
- q++;
- frame_indexes++;
+ SetPixelPixelInfo(frame_image,&highlight,q);
+ q+=GetPixelChannels(frame_image);
}
width=frame_info->width-frame_info->x-image->columns-bevel_width;
for (x=0; x < (ssize_t) width; x++)
{
- SetPixelPacket(frame_image,&matte,q,frame_indexes);
- q++;
- frame_indexes++;
+ SetPixelPixelInfo(frame_image,&matte,q);
+ q+=GetPixelChannels(frame_image);
}
for (x=0; x < (ssize_t) frame_info->outer_bevel; x++)
{
- SetPixelPacket(frame_image,&shadow,q,frame_indexes);
- q++;
- frame_indexes++;
+ SetPixelPixelInfo(frame_image,&shadow,q);
+ q+=GetPixelChannels(frame_image);
}
if (SyncCacheViewAuthenticPixels(frame_view,exception) == MagickFalse)
status=MagickFalse;
@@ -521,13 +491,10 @@
frame_info->y-image->rows-bevel_width+frame_info->outer_bevel);
if (height != 0)
{
- register IndexPacket
- *restrict frame_indexes;
-
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
/*
@@ -535,53 +502,46 @@
*/
q=QueueCacheViewAuthenticPixels(frame_view,0,(ssize_t) (frame_image->rows-
height),frame_image->columns,height,exception);
- if (q != (PixelPacket *) NULL)
+ if (q != (Quantum *) NULL)
{
/*
Draw bottom of ornamental border.
*/
- frame_indexes=GetCacheViewAuthenticIndexQueue(frame_view);
for (y=frame_info->inner_bevel-1; y >= 0; y--)
{
for (x=0; x < (ssize_t) frame_info->outer_bevel; x++)
{
- SetPixelPacket(frame_image,&highlight,q,frame_indexes);
- q++;
- frame_indexes++;
+ SetPixelPixelInfo(frame_image,&highlight,q);
+ q+=GetPixelChannels(frame_image);
}
for (x=0; x < (ssize_t) (frame_info->x-bevel_width); x++)
{
- SetPixelPacket(frame_image,&matte,q,frame_indexes);
- q++;
- frame_indexes++;
+ SetPixelPixelInfo(frame_image,&matte,q);
+ q+=GetPixelChannels(frame_image);
}
for (x=0; x < y; x++)
{
- SetPixelPacket(frame_image,&shadow,q,frame_indexes);
- q++;
- frame_indexes++;
+ SetPixelPixelInfo(frame_image,&shadow,q);
+ q+=GetPixelChannels(frame_image);
}
for ( ; x < (ssize_t) (image->columns+2*frame_info->inner_bevel); x++)
{
if (x >= (ssize_t) (image->columns+2*frame_info->inner_bevel-y))
- SetPixelPacket(frame_image,&highlight,q,frame_indexes);
+ SetPixelPixelInfo(frame_image,&highlight,q);
else
- SetPixelPacket(frame_image,&accentuate,q,frame_indexes);
- q++;
- frame_indexes++;
+ SetPixelPixelInfo(frame_image,&accentuate,q);
+ q+=GetPixelChannels(frame_image);
}
width=frame_info->width-frame_info->x-image->columns-bevel_width;
for (x=0; x < (ssize_t) width; x++)
{
- SetPixelPacket(frame_image,&matte,q,frame_indexes);
- q++;
- frame_indexes++;
+ SetPixelPixelInfo(frame_image,&matte,q);
+ q+=GetPixelChannels(frame_image);
}
for (x=0; x < (ssize_t) frame_info->outer_bevel; x++)
{
- SetPixelPacket(frame_image,&shadow,q,frame_indexes);
- q++;
- frame_indexes++;
+ SetPixelPixelInfo(frame_image,&shadow,q);
+ q+=GetPixelChannels(frame_image);
}
}
height=frame_info->height-frame_info->y-image->rows-bevel_width;
@@ -589,40 +549,35 @@
{
for (x=0; x < (ssize_t) frame_info->outer_bevel; x++)
{
- SetPixelPacket(frame_image,&highlight,q,frame_indexes);
- q++;
- frame_indexes++;
+ SetPixelPixelInfo(frame_image,&highlight,q);
+ q+=GetPixelChannels(frame_image);
}
width=frame_image->columns-2*frame_info->outer_bevel;
for (x=0; x < (ssize_t) width; x++)
{
- SetPixelPacket(frame_image,&matte,q,frame_indexes);
- q++;
- frame_indexes++;
+ SetPixelPixelInfo(frame_image,&matte,q);
+ q+=GetPixelChannels(frame_image);
}
for (x=0; x < (ssize_t) frame_info->outer_bevel; x++)
{
- SetPixelPacket(frame_image,&shadow,q,frame_indexes);
- q++;
- frame_indexes++;
+ SetPixelPixelInfo(frame_image,&shadow,q);
+ q+=GetPixelChannels(frame_image);
}
}
for (y=frame_info->outer_bevel-1; y >= 0; y--)
{
for (x=0; x < y; x++)
{
- SetPixelPacket(frame_image,&highlight,q,frame_indexes);
- q++;
- frame_indexes++;
+ SetPixelPixelInfo(frame_image,&highlight,q);
+ q+=GetPixelChannels(frame_image);
}
for ( ; x < (ssize_t) frame_image->columns; x++)
{
if (x >= (ssize_t) (frame_image->columns-y))
- SetPixelPacket(frame_image,&shadow,q,frame_indexes);
+ SetPixelPixelInfo(frame_image,&shadow,q);
else
- SetPixelPacket(frame_image,&trough,q,frame_indexes);
- q++;
- frame_indexes++;
+ SetPixelPixelInfo(frame_image,&trough,q);
+ q+=GetPixelChannels(frame_image);
}
}
(void) SyncCacheViewAuthenticPixels(frame_view,exception);
@@ -734,55 +689,55 @@
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
for (x=0; x < y; x++)
{
- SetPixelRed(q,ClampToQuantum(QuantumScale*((MagickRealType)
- GetPixelRed(q)*HighlightFactor+(MagickRealType) foreground*
- (QuantumRange-HighlightFactor))));
- SetPixelGreen(q,ClampToQuantum(QuantumScale*((MagickRealType)
- GetPixelGreen(q)*HighlightFactor+(MagickRealType) foreground*
- (QuantumRange-HighlightFactor))));
- SetPixelBlue(q,ClampToQuantum(QuantumScale*((MagickRealType)
- GetPixelBlue(q)*HighlightFactor+(MagickRealType) foreground*
- (QuantumRange-HighlightFactor))));
- q++;
+ SetPixelRed(image,ClampToQuantum(QuantumScale*((MagickRealType)
+ GetPixelRed(image,q)*HighlightFactor+(MagickRealType) foreground*
+ (QuantumRange-HighlightFactor))),q);
+ SetPixelGreen(image,ClampToQuantum(QuantumScale*((MagickRealType)
+ GetPixelGreen(image,q)*HighlightFactor+(MagickRealType) foreground*
+ (QuantumRange-HighlightFactor))),q);
+ SetPixelBlue(image,ClampToQuantum(QuantumScale*((MagickRealType)
+ GetPixelBlue(image,q)*HighlightFactor+(MagickRealType) foreground*
+ (QuantumRange-HighlightFactor))),q);
+ q+=GetPixelChannels(image);
}
for ( ; x < (ssize_t) (image->columns-y); x++)
{
- SetPixelRed(q,ClampToQuantum(QuantumScale*((MagickRealType)
- GetPixelRed(q)*AccentuateFactor+(MagickRealType) foreground*
- (QuantumRange-AccentuateFactor))));
- SetPixelGreen(q,ClampToQuantum(QuantumScale*((MagickRealType)
- GetPixelGreen(q)*AccentuateFactor+(MagickRealType) foreground*
- (QuantumRange-AccentuateFactor))));
- SetPixelBlue(q,ClampToQuantum(QuantumScale*((MagickRealType)
- GetPixelBlue(q)*AccentuateFactor+(MagickRealType) foreground*
- (QuantumRange-AccentuateFactor))));
- q++;
+ SetPixelRed(image,ClampToQuantum(QuantumScale*((MagickRealType)
+ GetPixelRed(image,q)*AccentuateFactor+(MagickRealType) foreground*
+ (QuantumRange-AccentuateFactor))),q);
+ SetPixelGreen(image,ClampToQuantum(QuantumScale*((MagickRealType)
+ GetPixelGreen(image,q)*AccentuateFactor+(MagickRealType) foreground*
+ (QuantumRange-AccentuateFactor))),q);
+ SetPixelBlue(image,ClampToQuantum(QuantumScale*((MagickRealType)
+ GetPixelBlue(image,q)*AccentuateFactor+(MagickRealType) foreground*
+ (QuantumRange-AccentuateFactor))),q);
+ q+=GetPixelChannels(image);
}
for ( ; x < (ssize_t) image->columns; x++)
{
- SetPixelRed(q,ClampToQuantum(QuantumScale*((MagickRealType)
- GetPixelRed(q)*ShadowFactor+(MagickRealType) background*
- (QuantumRange-ShadowFactor))));
- SetPixelGreen(q,ClampToQuantum(QuantumScale*((MagickRealType)
- GetPixelGreen(q)*ShadowFactor+(MagickRealType) background*
- (QuantumRange-ShadowFactor))));
- SetPixelBlue(q,ClampToQuantum(QuantumScale*((MagickRealType)
- GetPixelBlue(q)*ShadowFactor+(MagickRealType) background*
- (QuantumRange-ShadowFactor))));
- q++;
+ SetPixelRed(image,ClampToQuantum(QuantumScale*((MagickRealType)
+ GetPixelRed(image,q)*ShadowFactor+(MagickRealType) background*
+ (QuantumRange-ShadowFactor))),q);
+ SetPixelGreen(image,ClampToQuantum(QuantumScale*((MagickRealType)
+ GetPixelGreen(image,q)*ShadowFactor+(MagickRealType) background*
+ (QuantumRange-ShadowFactor))),q);
+ SetPixelBlue(image,ClampToQuantum(QuantumScale*((MagickRealType)
+ GetPixelBlue(image,q)*ShadowFactor+(MagickRealType) background*
+ (QuantumRange-ShadowFactor))),q);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -804,44 +759,44 @@
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
for (x=0; x < (ssize_t) raise_info->width; x++)
{
- SetPixelRed(q,ClampToQuantum(QuantumScale*((MagickRealType)
- GetPixelRed(q)*HighlightFactor+(MagickRealType) foreground*
- (QuantumRange-HighlightFactor))));
- SetPixelGreen(q,ClampToQuantum(QuantumScale*((MagickRealType)
- GetPixelGreen(q)*HighlightFactor+(MagickRealType) foreground*
- (QuantumRange-HighlightFactor))));
- SetPixelBlue(q,ClampToQuantum(QuantumScale*((MagickRealType)
- GetPixelBlue(q)*HighlightFactor+(MagickRealType) foreground*
- (QuantumRange-HighlightFactor))));
- q++;
+ SetPixelRed(image,ClampToQuantum(QuantumScale*((MagickRealType)
+ GetPixelRed(image,q)*HighlightFactor+(MagickRealType) foreground*
+ (QuantumRange-HighlightFactor))),q);
+ SetPixelGreen(image,ClampToQuantum(QuantumScale*((MagickRealType)
+ GetPixelGreen(image,q)*HighlightFactor+(MagickRealType) foreground*
+ (QuantumRange-HighlightFactor))),q);
+ SetPixelBlue(image,ClampToQuantum(QuantumScale*((MagickRealType)
+ GetPixelBlue(image,q)*HighlightFactor+(MagickRealType) foreground*
+ (QuantumRange-HighlightFactor))),q);
+ q+=GetPixelChannels(image);
}
for ( ; x < (ssize_t) (image->columns-raise_info->width); x++)
- q++;
+ q+=GetPixelChannels(image);
for ( ; x < (ssize_t) image->columns; x++)
{
- SetPixelRed(q,ClampToQuantum(QuantumScale*((MagickRealType)
- GetPixelRed(q)*ShadowFactor+(MagickRealType) background*
- (QuantumRange-ShadowFactor))));
- SetPixelGreen(q,ClampToQuantum(QuantumScale*((MagickRealType)
- GetPixelGreen(q)*ShadowFactor+(MagickRealType) background*
- (QuantumRange-ShadowFactor))));
- SetPixelBlue(q,ClampToQuantum(QuantumScale*((MagickRealType)
- GetPixelBlue(q)*ShadowFactor+(MagickRealType) background*
- (QuantumRange-ShadowFactor))));
- q++;
+ SetPixelRed(image,ClampToQuantum(QuantumScale*((MagickRealType)
+ GetPixelRed(image,q)*ShadowFactor+(MagickRealType) background*
+ (QuantumRange-ShadowFactor))),q);
+ SetPixelGreen(image,ClampToQuantum(QuantumScale*((MagickRealType)
+ GetPixelGreen(image,q)*ShadowFactor+(MagickRealType) background*
+ (QuantumRange-ShadowFactor))),q);
+ SetPixelBlue(image,ClampToQuantum(QuantumScale*((MagickRealType)
+ GetPixelBlue(image,q)*ShadowFactor+(MagickRealType) background*
+ (QuantumRange-ShadowFactor))),q);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -863,55 +818,55 @@
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
for (x=0; x < (ssize_t) (image->rows-y); x++)
{
- SetPixelRed(q,ClampToQuantum(QuantumScale*((MagickRealType)
- GetPixelRed(q)*HighlightFactor+(MagickRealType) foreground*
- (QuantumRange-HighlightFactor))));
- SetPixelGreen(q,ClampToQuantum(QuantumScale*((MagickRealType)
- GetPixelGreen(q)*HighlightFactor+(MagickRealType) foreground*
- (QuantumRange-HighlightFactor))));
- SetPixelBlue(q,ClampToQuantum(QuantumScale*((MagickRealType)
- GetPixelBlue(q)*HighlightFactor+(MagickRealType) foreground*
- (QuantumRange-HighlightFactor))));
- q++;
+ SetPixelRed(image,ClampToQuantum(QuantumScale*((MagickRealType)
+ GetPixelRed(image,q)*HighlightFactor+(MagickRealType) foreground*
+ (QuantumRange-HighlightFactor))),q);
+ SetPixelGreen(image,ClampToQuantum(QuantumScale*((MagickRealType)
+ GetPixelGreen(image,q)*HighlightFactor+(MagickRealType) foreground*
+ (QuantumRange-HighlightFactor))),q);
+ SetPixelBlue(image,ClampToQuantum(QuantumScale*((MagickRealType)
+ GetPixelBlue(image,q)*HighlightFactor+(MagickRealType) foreground*
+ (QuantumRange-HighlightFactor))),q);
+ q+=GetPixelChannels(image);
}
for ( ; x < (ssize_t) (image->columns-(image->rows-y)); x++)
{
- SetPixelRed(q,ClampToQuantum(QuantumScale*((MagickRealType)
- GetPixelRed(q)*TroughFactor+(MagickRealType) background*
- (QuantumRange-TroughFactor))));
- SetPixelGreen(q,ClampToQuantum(QuantumScale*((MagickRealType)
- GetPixelGreen(q)*TroughFactor+(MagickRealType) background*
- (QuantumRange-TroughFactor))));
- SetPixelBlue(q,ClampToQuantum(QuantumScale*((MagickRealType)
- GetPixelBlue(q)*TroughFactor+(MagickRealType) background*
- (QuantumRange-TroughFactor))));
- q++;
+ SetPixelRed(image,ClampToQuantum(QuantumScale*((MagickRealType)
+ GetPixelRed(image,q)*TroughFactor+(MagickRealType) background*
+ (QuantumRange-TroughFactor))),q);
+ SetPixelGreen(image,ClampToQuantum(QuantumScale*((MagickRealType)
+ GetPixelGreen(image,q)*TroughFactor+(MagickRealType) background*
+ (QuantumRange-TroughFactor))),q);
+ SetPixelBlue(image,ClampToQuantum(QuantumScale*((MagickRealType)
+ GetPixelBlue(image,q)*TroughFactor+(MagickRealType) background*
+ (QuantumRange-TroughFactor))),q);
+ q+=GetPixelChannels(image);
}
for ( ; x < (ssize_t) image->columns; x++)
{
- SetPixelRed(q,ClampToQuantum(QuantumScale*((MagickRealType)
- GetPixelRed(q)*ShadowFactor+(MagickRealType) background*
- (QuantumRange-ShadowFactor))));
- SetPixelGreen(q,ClampToQuantum(QuantumScale*((MagickRealType)
- GetPixelGreen(q)*ShadowFactor+(MagickRealType) background*
- (QuantumRange-ShadowFactor))));
- SetPixelBlue(q,ClampToQuantum(QuantumScale*((MagickRealType)
- GetPixelBlue(q)*ShadowFactor+(MagickRealType) background*
- (QuantumRange-ShadowFactor))));
- q++;
+ SetPixelRed(image,ClampToQuantum(QuantumScale*((MagickRealType)
+ GetPixelRed(image,q)*ShadowFactor+(MagickRealType) background*
+ (QuantumRange-ShadowFactor))),q);
+ SetPixelGreen(image,ClampToQuantum(QuantumScale*((MagickRealType)
+ GetPixelGreen(image,q)*ShadowFactor+(MagickRealType) background*
+ (QuantumRange-ShadowFactor))),q);
+ SetPixelBlue(image,ClampToQuantum(QuantumScale*((MagickRealType)
+ GetPixelBlue(image,q)*ShadowFactor+(MagickRealType) background*
+ (QuantumRange-ShadowFactor))),q);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
diff --git a/magick/decorate.h b/MagickCore/decorate.h
similarity index 97%
rename from magick/decorate.h
rename to MagickCore/decorate.h
index 93f29e2..a9d5ea9 100644
--- a/magick/decorate.h
+++ b/MagickCore/decorate.h
@@ -22,6 +22,8 @@
extern "C" {
#endif
+#include <MagickCore/image.h>
+
typedef struct _FrameInfo
{
size_t
diff --git a/magick/delegate-private.h b/MagickCore/delegate-private.h
similarity index 100%
rename from magick/delegate-private.h
rename to MagickCore/delegate-private.h
diff --git a/magick/delegate.c b/MagickCore/delegate.c
similarity index 98%
rename from magick/delegate.c
rename to MagickCore/delegate.c
index ec04398..a0884f2 100644
--- a/magick/delegate.c
+++ b/MagickCore/delegate.c
@@ -45,25 +45,25 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/property.h"
-#include "magick/blob.h"
-#include "magick/client.h"
-#include "magick/configure.h"
-#include "magick/constitute.h"
-#include "magick/delegate.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/hashmap.h"
-#include "magick/list.h"
-#include "magick/memory_.h"
-#include "magick/policy.h"
-#include "magick/resource_.h"
-#include "magick/semaphore.h"
-#include "magick/string_.h"
-#include "magick/token.h"
-#include "magick/utility.h"
-#include "magick/xml-tree.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/property.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/client.h"
+#include "MagickCore/configure.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/delegate.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/hashmap.h"
+#include "MagickCore/list.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/policy.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/semaphore.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/token.h"
+#include "MagickCore/utility.h"
+#include "MagickCore/xml-tree.h"
/*
Define declarations.
diff --git a/magick/delegate.h b/MagickCore/delegate.h
similarity index 95%
rename from magick/delegate.h
rename to MagickCore/delegate.h
index 1483598..daf7f8a 100644
--- a/magick/delegate.h
+++ b/MagickCore/delegate.h
@@ -38,10 +38,6 @@
spawn,
stealth;
- struct _DelegateInfo
- *previous,
- *next; /* deprecated, use GetDelegateInfoList() */
-
size_t
signature;
} DelegateInfo;
diff --git a/MagickCore/deprecate.c b/MagickCore/deprecate.c
new file mode 100644
index 0000000..1cc7b3c
--- /dev/null
+++ b/MagickCore/deprecate.c
@@ -0,0 +1,93 @@
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% %
+% %
+% %
+% DDDD EEEEE PPPP RRRR EEEEE CCCC AAA TTTTT EEEEE %
+% D D E P P R R E C A A T E %
+% D D EEE PPPPP RRRR EEE C AAAAA T EEE %
+% D D E P R R E C A A T E %
+% DDDD EEEEE P R R EEEEE CCCC A A T EEEEE %
+% %
+% %
+% MagickCore Deprecated Methods %
+% %
+% Software Design %
+% John Cristy %
+% October 2002 %
+% %
+% %
+% Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization %
+% dedicated to making software imaging solutions freely available. %
+% %
+% You may not use this file except in compliance with the License. You may %
+% obtain a copy of the License at %
+% %
+% http://www.imagemagick.org/script/license.php %
+% %
+% Unless required by applicable law or agreed to in writing, software %
+% distributed under the License is distributed on an "AS IS" BASIS, %
+% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. %
+% See the License for the specific language governing permissions and %
+% limitations under the License. %
+% %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%
+%
+*/
+
+/*
+ Include declarations.
+*/
+#include "MagickCore/studio.h"
+#include "MagickCore/property.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/cache-view.h"
+#include "MagickCore/client.h"
+#include "MagickCore/color.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colormap.h"
+#include "MagickCore/colormap-private.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/composite.h"
+#include "MagickCore/composite-private.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/draw.h"
+#include "MagickCore/draw-private.h"
+#include "MagickCore/effect.h"
+#include "MagickCore/enhance.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/fx.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/identify.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/log.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/morphology.h"
+#include "MagickCore/paint.h"
+#include "MagickCore/pixel.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantize.h"
+#include "MagickCore/random_.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/semaphore.h"
+#include "MagickCore/segment.h"
+#include "MagickCore/splay-tree.h"
+#include "MagickCore/statistic.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/threshold.h"
+#include "MagickCore/transform.h"
+#include "MagickCore/utility.h"
+
+#if !defined(MAGICKCORE_EXCLUDE_DEPRECATED)
+
+#endif
diff --git a/magick/accelerate.h b/MagickCore/deprecate.h
similarity index 73%
copy from magick/accelerate.h
copy to MagickCore/deprecate.h
index c575667..15a1006 100644
--- a/magick/accelerate.h
+++ b/MagickCore/deprecate.h
@@ -1,32 +1,30 @@
/*
Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization
dedicated to making software imaging solutions freely available.
-
+
You may not use this file except in compliance with the License.
obtain a copy of the License at
-
+
http://www.imagemagick.org/script/license.php
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
- MagickCore acceleration methods.
+ MagickCore deprecated methods.
*/
-#ifndef _MAGICKCORE_ACCELERATE_H
-#define _MAGICKCORE_ACCELERATE_H
+#ifndef _MAGICKCORE_DEPRECATE_H
+#define _MAGICKCORE_DEPRECATE_H
#if defined(__cplusplus) || defined(c_plusplus)
extern "C" {
#endif
-#include <magick/morphology.h>
+#if !defined(MAGICKCORE_EXCLUDE_DEPRECATED)
-extern MagickExport MagickBooleanType
- AccelerateConvolveImage(const Image *,const KernelInfo *,Image *,
- ExceptionInfo *);
+#endif
#if defined(__cplusplus) || defined(c_plusplus)
}
diff --git a/magick/display-private.h b/MagickCore/display-private.h
similarity index 96%
rename from magick/display-private.h
rename to MagickCore/display-private.h
index 0704ec1..86b3348 100644
--- a/magick/display-private.h
+++ b/MagickCore/display-private.h
@@ -23,7 +23,7 @@
#endif
#if defined(MAGICKCORE_X11_DELEGATE)
-#include "magick/xwindow-private.h"
+#include "MagickCore/xwindow-private.h"
extern MagickExport Image
*XDisplayImage(Display *,XResourceInfo *,char **,int,Image **,size_t *);
diff --git a/magick/display.c b/MagickCore/display.c
similarity index 98%
rename from magick/display.c
rename to MagickCore/display.c
index 254ca8f..4291e8e 100644
--- a/magick/display.c
+++ b/MagickCore/display.c
@@ -39,54 +39,55 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/artifact.h"
-#include "magick/blob.h"
-#include "magick/cache.h"
-#include "magick/client.h"
-#include "magick/color.h"
-#include "magick/colorspace.h"
-#include "magick/composite.h"
-#include "magick/constitute.h"
-#include "magick/decorate.h"
-#include "magick/delegate.h"
-#include "magick/display.h"
-#include "magick/display-private.h"
-#include "magick/draw.h"
-#include "magick/effect.h"
-#include "magick/enhance.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/fx.h"
-#include "magick/geometry.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/log.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/montage.h"
-#include "magick/option.h"
-#include "magick/paint.h"
-#include "magick/pixel.h"
-#include "magick/pixel-private.h"
-#include "magick/PreRvIcccm.h"
-#include "magick/property.h"
-#include "magick/quantum.h"
-#include "magick/resize.h"
-#include "magick/resource_.h"
-#include "magick/shear.h"
-#include "magick/segment.h"
-#include "magick/string_.h"
-#include "magick/string-private.h"
-#include "magick/transform.h"
-#include "magick/threshold.h"
-#include "magick/utility.h"
-#include "magick/version.h"
-#include "magick/widget.h"
-#include "magick/xwindow-private.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/artifact.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/client.h"
+#include "MagickCore/color.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/composite.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/decorate.h"
+#include "MagickCore/delegate.h"
+#include "MagickCore/display.h"
+#include "MagickCore/display-private.h"
+#include "MagickCore/draw.h"
+#include "MagickCore/effect.h"
+#include "MagickCore/enhance.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/fx.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/log.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/montage.h"
+#include "MagickCore/option.h"
+#include "MagickCore/paint.h"
+#include "MagickCore/pixel.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/PreRvIcccm.h"
+#include "MagickCore/property.h"
+#include "MagickCore/quantum.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/resize.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/shear.h"
+#include "MagickCore/segment.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/string-private.h"
+#include "MagickCore/transform.h"
+#include "MagickCore/threshold.h"
+#include "MagickCore/utility.h"
+#include "MagickCore/version.h"
+#include "MagickCore/widget.h"
+#include "MagickCore/xwindow-private.h"
#if defined(MAGICKCORE_X11_DELEGATE)
/*
@@ -3308,7 +3309,7 @@
y,
y_offset;
- register PixelPacket
+ register Quantum
*q;
register ssize_t
@@ -3711,11 +3712,11 @@
return(MagickFalse);
q=GetCacheViewAuthenticPixels(image_view,(ssize_t)x_offset,
(ssize_t)y_offset,1,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (Quantum *) NULL)
break;
- q->red=ScaleShortToQuantum(color.red);
- q->green=ScaleShortToQuantum(color.green);
- q->blue=ScaleShortToQuantum(color.blue);
+ SetPixelRed(*image,ScaleShortToQuantum(color.red),q);
+ SetPixelGreen(*image,ScaleShortToQuantum(color.green),q);
+ SetPixelBlue(*image,ScaleShortToQuantum(color.blue),q);
(void) SyncCacheViewAuthenticPixels(image_view,
&(*image)->exception);
break;
@@ -3723,6 +3724,7 @@
case ReplaceMethod:
{
PixelPacket
+ pixel,
target;
/*
@@ -3736,17 +3738,21 @@
{
q=GetCacheViewAuthenticPixels(image_view,0,(ssize_t) y,
(*image)->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (Quantum *) NULL)
break;
for (x=0; x < (int) (*image)->columns; x++)
{
- if (IsColorSimilar(*image,q,&target))
+ GetPixelPacket(*image,q,&pixel);
+ if (IsFuzzyEquivalencePixelPacket(*image,&pixel,&target))
{
- q->red=ScaleShortToQuantum(color.red);
- q->green=ScaleShortToQuantum(color.green);
- q->blue=ScaleShortToQuantum(color.blue);
+ SetPixelRed(*image,ScaleShortToQuantum(
+ color.red),q);
+ SetPixelGreen(*image,ScaleShortToQuantum(
+ color.green),q);
+ SetPixelBlue(*image,ScaleShortToQuantum(
+ color.blue),q);
}
- q++;
+ q+=GetPixelChannels(*image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
break;
@@ -3755,9 +3761,10 @@
else
{
for (i=0; i < (ssize_t) (*image)->colors; i++)
- if (IsColorSimilar(*image,(*image)->colormap+i,&target))
+ if (IsFuzzyEquivalencePixelPacket(*image,(*image)->colormap+i,&target))
{
- (*image)->colormap[i].red=ScaleShortToQuantum(color.red);
+ (*image)->colormap[i].red=ScaleShortToQuantum(
+ color.red);
(*image)->colormap[i].green=ScaleShortToQuantum(
color.green);
(*image)->colormap[i].blue=ScaleShortToQuantum(
@@ -3773,7 +3780,7 @@
DrawInfo
*draw_info;
- MagickPixelPacket
+ PixelInfo
target;
/*
@@ -3811,14 +3818,14 @@
{
q=QueueCacheViewAuthenticPixels(image_view,0,(ssize_t) y,
(*image)->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (Quantum *) NULL)
break;
for (x=0; x < (int) (*image)->columns; x++)
{
- q->red=ScaleShortToQuantum(color.red);
- q->green=ScaleShortToQuantum(color.green);
- q->blue=ScaleShortToQuantum(color.blue);
- q++;
+ SetPixelRed(*image,ScaleShortToQuantum(color.red),q);
+ SetPixelGreen(*image,ScaleShortToQuantum(color.green),q);
+ SetPixelBlue(*image,ScaleShortToQuantum(color.blue),q);
+ q+=GetPixelChannels(*image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
break;
@@ -4282,7 +4289,7 @@
register int
x;
- register PixelPacket
+ register Quantum
*q;
/*
@@ -4300,12 +4307,12 @@
{
q=GetCacheViewAuthenticPixels(image_view,0,(ssize_t) y,image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (Quantum *) NULL)
break;
for (x=0; x < (int) image->columns; x++)
{
- q->opacity=opacity;
- q++;
+ SetPixelAlpha(image,opacity,q);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
break;
@@ -4594,7 +4601,7 @@
crop_info,
highlight_info;
- register PixelPacket
+ register Quantum
*q;
unsigned int
@@ -5318,12 +5325,12 @@
{
q=GetCacheViewAuthenticPixels(image_view,crop_info.x,y+crop_info.y,
crop_info.width,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (Quantum *) NULL)
break;
for (x=0; x < (int) crop_info.width; x++)
{
- q->opacity=(Quantum) TransparentOpacity;
- q++;
+ SetPixelAlpha(image,TransparentAlpha,q);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
break;
@@ -9600,7 +9607,7 @@
register int
i;
- register PixelPacket
+ register Quantum
*q;
unsigned int
@@ -9750,8 +9757,8 @@
break;
if (entry != 5)
{
- (*image)->fuzz=SiPrefixToDouble(FuzzMenu[entry],1.0*QuantumRange+
- 1.0);
+ (*image)->fuzz=SiPrefixToDouble(FuzzMenu[entry],1.0*
+ QuantumRange+1.0);
break;
}
(void) CopyMagickString(fuzz,"20%",MaxTextExtent);
@@ -9787,10 +9794,10 @@
if (entry != 2)
{
(void) FormatLocaleString(matte,MaxTextExtent,QuantumFormat,
- OpaqueOpacity);
+ OpaqueAlpha);
if (LocaleCompare(MatteMenu[entry],"Transparent") == 0)
(void) FormatLocaleString(matte,MaxTextExtent,QuantumFormat,
- (Quantum) TransparentOpacity);
+ (Quantum) TransparentAlpha);
break;
}
(void) FormatLocaleString(message,MaxTextExtent,
@@ -9971,12 +9978,12 @@
x=0;
y=0;
if (windows->image.crop_geometry != (char *) NULL)
- (void) XParseGeometry(windows->image.crop_geometry,&x,&y,
- &width,&height);
- x_offset=(int)
- (width*(windows->image.x+x_offset)/windows->image.ximage->width+x);
- y_offset=(int)
- (height*(windows->image.y+y_offset)/windows->image.ximage->height+y);
+ (void) XParseGeometry(windows->image.crop_geometry,&x,&y,&width,
+ &height);
+ x_offset=(int) (width*(windows->image.x+x_offset)/
+ windows->image.ximage->width+x);
+ y_offset=(int) (height*(windows->image.y+y_offset)/
+ windows->image.ximage->height+y);
if ((x_offset < 0) || (y_offset < 0))
continue;
if ((x_offset >= (int) (*image)->columns) ||
@@ -9997,15 +10004,16 @@
*/
q=GetCacheViewAuthenticPixels(image_view,(ssize_t) x_offset,
(ssize_t) y_offset,1,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (Quantum *) NULL)
break;
- q->opacity=(Quantum) StringToLong(matte);
+ SetPixelAlpha(*image,(Quantum) StringToLong(matte),q);
(void) SyncCacheViewAuthenticPixels(image_view,exception);
break;
}
case ReplaceMethod:
{
PixelPacket
+ pixel,
target;
/*
@@ -10017,13 +10025,14 @@
{
q=GetCacheViewAuthenticPixels(image_view,0,(ssize_t) y,
(*image)->columns,1,&(*image)->exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (Quantum *) NULL)
break;
for (x=0; x < (int) (*image)->columns; x++)
{
- if (IsColorSimilar(*image,q,&target))
- q->opacity=(Quantum) StringToLong(matte);
- q++;
+ GetPixelPacket(*image,q,&pixel);
+ if (IsFuzzyEquivalencePixelPacket(*image,&pixel,&target))
+ SetPixelAlpha(*image,(Quantum) StringToLong(matte),q);
+ q+=GetPixelChannels(*image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
break;
@@ -10036,7 +10045,7 @@
DrawInfo
*draw_info;
- MagickPixelPacket
+ PixelInfo
target;
/*
@@ -10046,16 +10055,16 @@
(ssize_t) y_offset,&target,exception);
if (method == FillToBorderMethod)
{
- target.red=(MagickRealType)
- ScaleShortToQuantum(border_color.red);
- target.green=(MagickRealType)
- ScaleShortToQuantum(border_color.green);
- target.blue=(MagickRealType)
- ScaleShortToQuantum(border_color.blue);
+ target.red=(MagickRealType) ScaleShortToQuantum(
+ border_color.red);
+ target.green=(MagickRealType) ScaleShortToQuantum(
+ border_color.green);
+ target.blue=(MagickRealType) ScaleShortToQuantum(
+ border_color.blue);
}
draw_info=CloneDrawInfo(resource_info->image_info,
(DrawInfo *) NULL);
- draw_info->fill.opacity=ClampToQuantum(InterpretLocaleValue(matte,
+ draw_info->fill.alpha=ClampToQuantum(InterpretLocaleValue(matte,
(char **) NULL));
(void) FloodfillPaintImage(*image,OpacityChannel,draw_info,&target,
(ssize_t) x_offset,(ssize_t) y_offset,
@@ -10074,17 +10083,17 @@
{
q=QueueCacheViewAuthenticPixels(image_view,0,(ssize_t) y,
(*image)->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (Quantum *) NULL)
break;
for (x=0; x < (int) (*image)->columns; x++)
{
- q->opacity=(Quantum) StringToLong(matte);
- q++;
+ SetPixelAlpha(*image,(Quantum) StringToLong(matte),q);
+ q+=GetPixelChannels(*image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
break;
}
- if (StringToLong(matte) == OpaqueOpacity)
+ if (StringToLong(matte) == (long) OpaqueAlpha)
(*image)->matte=MagickFalse;
break;
}
@@ -13088,7 +13097,7 @@
register int
j;
- register PixelPacket
+ register Quantum
*s;
/*
@@ -13122,10 +13131,13 @@
{
s=GetCacheViewAuthenticPixels(image_view,(ssize_t) x_offset,(ssize_t)
y_offset+i,width,1,exception);
- if (s == (PixelPacket *) NULL)
+ if (s == (Quantum *) NULL)
break;
for (j=0; j < (int) width; j++)
- *s++=pixel;
+ {
+ SetPixelPacket(image,&pixel,s);
+ s+=GetPixelChannels(image);
+ }
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
break;
}
diff --git a/magick/display.h b/MagickCore/display.h
similarity index 100%
rename from magick/display.h
rename to MagickCore/display.h
diff --git a/magick/distort.c b/MagickCore/distort.c
similarity index 96%
rename from magick/distort.c
rename to MagickCore/distort.c
index e585e75..e2e170c 100644
--- a/magick/distort.c
+++ b/MagickCore/distort.c
@@ -40,34 +40,34 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/artifact.h"
-#include "magick/cache.h"
-#include "magick/cache-view.h"
-#include "magick/colorspace-private.h"
-#include "magick/composite-private.h"
-#include "magick/distort.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/gem.h"
-#include "magick/hashmap.h"
-#include "magick/image.h"
-#include "magick/list.h"
-#include "magick/matrix.h"
-#include "magick/memory_.h"
-#include "magick/monitor-private.h"
-#include "magick/option.h"
-#include "magick/pixel.h"
-#include "magick/pixel-private.h"
-#include "magick/resample.h"
-#include "magick/resample-private.h"
-#include "magick/registry.h"
-#include "magick/semaphore.h"
-#include "magick/string_.h"
-#include "magick/string-private.h"
-#include "magick/thread-private.h"
-#include "magick/token.h"
-#include "magick/transform.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/artifact.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/cache-view.h"
+#include "MagickCore/colorspace-private.h"
+#include "MagickCore/composite-private.h"
+#include "MagickCore/distort.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/gem.h"
+#include "MagickCore/hashmap.h"
+#include "MagickCore/image.h"
+#include "MagickCore/list.h"
+#include "MagickCore/matrix.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/option.h"
+#include "MagickCore/pixel.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/resample.h"
+#include "MagickCore/resample-private.h"
+#include "MagickCore/registry.h"
+#include "MagickCore/semaphore.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/string-private.h"
+#include "MagickCore/thread-private.h"
+#include "MagickCore/token.h"
+#include "MagickCore/transform.h"
/*
Numerous internal routines for image distortions.
@@ -1246,10 +1246,10 @@
/* image is curved around cylinder, so FOV angle (in radians)
* scales directly to image X coordinate, according to its radius.
*/
- coeff[1] = image->columns/coeff[0];
+ coeff[1] = (double) image->columns/coeff[0];
else
/* radius is distance away from an image with this angular FOV */
- coeff[1] = image->columns / ( 2 * tan(coeff[0]/2) );
+ coeff[1] = (double) image->columns / ( 2 * tan(coeff[0]/2) );
coeff[2] = (double)(image->columns)/2.0+image->page.x;
coeff[3] = (double)(image->rows)/2.0+image->page.y;
@@ -1635,6 +1635,7 @@
assert(exception != (ExceptionInfo *) NULL);
assert(exception->signature == MagickSignature);
+
/*
Handle Special Compound Distortions
*/
@@ -1831,11 +1832,11 @@
* center, or pixel edge. This allows for reversibility of the
* distortion */
geometry.x = geometry.y = 0;
- geometry.width = ceil( 2.0*coeff[1]*tan(coeff[0]/2.0) );
- geometry.height = ceil( 2.0*coeff[3]/cos(coeff[0]/2.0) );
+ geometry.width = (size_t) ceil( 2.0*coeff[1]*tan(coeff[0]/2.0) );
+ geometry.height = (size_t) ceil( 2.0*coeff[3]/cos(coeff[0]/2.0) );
/* correct center of distortion relative to new size */
- coeff[4] = geometry.width/2.0;
- coeff[5] = geometry.height/2.0;
+ coeff[4] = (double) geometry.width/2.0;
+ coeff[5] = (double) geometry.height/2.0;
fix_bounds = MagickFalse;
break;
}
@@ -1844,15 +1845,14 @@
/* direct calculation center is either pixel center, or pixel edge
* so as to allow reversibility of the image distortion */
geometry.x = geometry.y = 0;
- geometry.width = ceil(coeff[0]*coeff[1]); /* FOV * radius */
- geometry.height = 2*coeff[3]; /* input image height */
+ geometry.width = (size_t) ceil(coeff[0]*coeff[1]); /* FOV * radius */
+ geometry.height = (size_t) (2*coeff[3]); /* input image height */
/* correct center of distortion relative to new size */
- coeff[4] = geometry.width/2.0;
- coeff[5] = geometry.height/2.0;
+ coeff[4] = (double) geometry.width/2.0;
+ coeff[5] = (double) geometry.height/2.0;
fix_bounds = MagickFalse;
break;
}
-
case ShepardsDistortion:
case BilinearForwardDistortion:
case BilinearReverseDistortion:
@@ -1880,7 +1880,7 @@
geometry.height=(size_t) ceil(max.y-geometry.y+0.5);
}
- } /* end bestfit destination image calculations */
+ } /* end bestfit destination image calculations */
/* The user provided a 'viewport' expert option which may
overrides some parts of the current output image geometry.
@@ -2141,7 +2141,6 @@
coeff[3] );
(void) FormatLocaleFile(stderr, " %s' \\\n", lookup);
break;
- break;
}
case BarrelDistortion:
case BarrelInverseDistortion:
@@ -2219,7 +2218,7 @@
}
distort_image->page.x=geometry.x;
distort_image->page.y=geometry.y;
- if (distort_image->background_color.opacity != OpaqueOpacity)
+ if (distort_image->background_color.alpha != OpaqueAlpha)
distort_image->matte=MagickTrue;
{ /* ----- MAIN CODE -----
@@ -2234,7 +2233,7 @@
MagickOffsetType
progress;
- MagickPixelPacket
+ PixelInfo
zero;
ResampleFilter
@@ -2245,7 +2244,7 @@
status=MagickTrue;
progress=0;
- GetMagickPixelPacket(distort_image,&zero);
+ GetPixelInfo(distort_image,&zero);
resample_filter=AcquireResampleFilterThreadSet(image,
UndefinedVirtualPixelMethod,MagickFalse,exception);
distort_view=AcquireCacheView(distort_image);
@@ -2263,7 +2262,7 @@
MagickBooleanType
sync;
- MagickPixelPacket
+ PixelInfo
pixel, /* pixel color to assign to distorted image */
invalid; /* the color to assign when distort result is invalid */
@@ -2271,23 +2270,19 @@
d,
s; /* transform destination image x,y to source image x,y */
- register IndexPacket
- *restrict indexes;
-
register ssize_t
i;
- register PixelPacket
+ register Quantum
*restrict q;
q=QueueCacheViewAuthenticPixels(distort_view,0,j,distort_image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewAuthenticIndexQueue(distort_view);
pixel=zero;
/* Define constant scaling vectors for Affine Distortions
@@ -2311,9 +2306,8 @@
*/
validity = 1.0;
- GetMagickPixelPacket(distort_image,&invalid);
- SetMagickPixelPacket(distort_image,&distort_image->matte_color,
- (IndexPacket *) NULL, &invalid);
+ GetPixelInfo(distort_image,&invalid);
+ SetPixelInfoPacket(distort_image,&distort_image->matte_color,&invalid);
if (distort_image->colorspace == CMYKColorspace)
ConvertRGBToCMYK(&invalid); /* what about other color spaces? */
@@ -2534,7 +2528,7 @@
/* is pixel valid - horizon of a infinite Virtual-Pixel Plane
* (see Anthony Thyssen's personal note) */
- validity = (coeff[1]*MagickPI2 - fabs(d.x))/output_scaling + 0.5;
+ validity = (double) (coeff[1]*MagickPI2 - fabs(d.x))/output_scaling + 0.5;
if ( validity > 0.0 ) {
double cx,tx;
@@ -2547,7 +2541,7 @@
ScaleFilter( resample_filter[id],
cx*cx, 0.0, s.y*cx/coeff[1], cx );
#if 1
-/*if ( i == 0 && j == 0 ) {*/
+/*if ( i == 0 && j == 0 )*/
if ( d.x == 0.5 && d.y == 0.5 ) {
fprintf(stderr, "x=%lf y=%lf u=%lf v=%lf\n", d.x*coeff[1], d.y, s.x, s.y);
fprintf(stderr, "radius = %lf phi = %lf validity = %lf\n",
@@ -2651,7 +2645,7 @@
if ( validity <= 0.0 ) {
/* result of distortion is an invalid pixel - don't resample */
- SetPixelPacket(distort_image,&invalid,q,indexes);
+ SetPixelPixelInfo(distort_image,&invalid,q);
}
else {
/* resample the source image to find its correct color */
@@ -2660,13 +2654,12 @@
if ( validity < 1.0 ) {
/* Do a blend of sample color and invalid pixel */
/* should this be a 'Blend', or an 'Over' compose */
- MagickPixelCompositeBlend(&pixel,validity,&invalid,(1.0-validity),
+ CompositePixelInfoBlend(&pixel,validity,&invalid,(1.0-validity),
&pixel);
}
- SetPixelPacket(distort_image,&pixel,q,indexes);
+ SetPixelPixelInfo(distort_image,&pixel,q);
}
- q++;
- indexes++;
+ q+=GetPixelChannels(distort_image);
}
sync=SyncCacheViewAuthenticPixels(distort_view,exception);
if (sync == MagickFalse)
@@ -2776,8 +2769,8 @@
if ( channel & RedChannel ) number_colors++;
if ( channel & GreenChannel ) number_colors++;
if ( channel & BlueChannel ) number_colors++;
- if ( channel & IndexChannel ) number_colors++;
- if ( channel & OpacityChannel ) number_colors++;
+ if ( channel & AlphaChannel ) number_colors++;
+ if ( channel & BlackChannel ) number_colors++;
/*
Convert input arguments into mapping coefficients, this this case
@@ -2821,10 +2814,10 @@
if ( channel & BlueChannel )
(void) FormatLocaleFile(stderr, " -channel B -fx '%+lf*i %+lf*j %+lf' \\\n",
coeff[x], coeff[x+1], coeff[x+2]),x+=3;
- if ( channel & IndexChannel )
+ if ( channel & BlackChannel )
(void) FormatLocaleFile(stderr, " -channel K -fx '%+lf*i %+lf*j %+lf' \\\n",
coeff[x], coeff[x+1], coeff[x+2]),x+=3;
- if ( channel & OpacityChannel )
+ if ( channel & AlphaChannel )
(void) FormatLocaleFile(stderr, " -channel A -fx '%+lf*i %+lf*j %+lf' \\\n",
coeff[x], coeff[x+1], coeff[x+2]),x+=3;
break;
@@ -2845,11 +2838,11 @@
(void) FormatLocaleFile(stderr, " -channel B -fx '%+lf*i %+lf*j %+lf*i*j %+lf;\n",
coeff[ x ], coeff[x+1],
coeff[x+2], coeff[x+3]),x+=4;
- if ( channel & IndexChannel )
+ if ( channel & BlackChannel )
(void) FormatLocaleFile(stderr, " -channel K -fx '%+lf*i %+lf*j %+lf*i*j %+lf;\n",
coeff[ x ], coeff[x+1],
coeff[x+2], coeff[x+3]),x+=4;
- if ( channel & OpacityChannel )
+ if ( channel & AlphaChannel )
(void) FormatLocaleFile(stderr, " -channel A -fx '%+lf*i %+lf*j %+lf*i*j %+lf;\n",
coeff[ x ], coeff[x+1],
coeff[x+2], coeff[x+3]),x+=4;
@@ -2900,30 +2893,26 @@
MagickBooleanType
sync;
- MagickPixelPacket
+ PixelInfo
pixel; /* pixel to assign to distorted image */
- register IndexPacket
- *restrict indexes;
-
register ssize_t
i;
- register PixelPacket
+ register Quantum
*restrict q;
q=GetCacheViewAuthenticPixels(sparse_view,0,j,sparse_image->columns,
1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewAuthenticIndexQueue(sparse_view);
- GetMagickPixelPacket(sparse_image,&pixel);
+ GetPixelInfo(sparse_image,&pixel);
for (i=0; i < (ssize_t) image->columns; i++)
{
- SetMagickPixelPacket(image,q,indexes,&pixel);
+ SetPixelInfo(image,q,&pixel);
switch (sparse_method)
{
case BarycentricColorInterpolate:
@@ -2938,11 +2927,11 @@
if ( channel & BlueChannel )
pixel.blue = coeff[x]*i +coeff[x+1]*j
+coeff[x+2], x+=3;
- if ( channel & IndexChannel )
- pixel.index = coeff[x]*i +coeff[x+1]*j
+ if ( channel & AlphaChannel )
+ pixel.alpha = coeff[x]*i +coeff[x+1]*j
+coeff[x+2], x+=3;
- if ( channel & OpacityChannel )
- pixel.opacity = coeff[x]*i +coeff[x+1]*j
+ if ( channel & BlackChannel )
+ pixel.black = coeff[x]*i +coeff[x+1]*j
+coeff[x+2], x+=3;
break;
}
@@ -2958,11 +2947,11 @@
if ( channel & BlueChannel )
pixel.blue = coeff[x]*i + coeff[x+1]*j +
coeff[x+2]*i*j + coeff[x+3], x+=4;
- if ( channel & IndexChannel )
- pixel.index = coeff[x]*i + coeff[x+1]*j +
+ if ( channel & AlphaChannel )
+ pixel.alpha = coeff[x]*i + coeff[x+1]*j +
coeff[x+2]*i*j + coeff[x+3], x+=4;
- if ( channel & OpacityChannel )
- pixel.opacity = coeff[x]*i + coeff[x+1]*j +
+ if ( channel & BlackChannel )
+ pixel.black = coeff[x]*i + coeff[x+1]*j +
coeff[x+2]*i*j + coeff[x+3], x+=4;
break;
}
@@ -2977,8 +2966,8 @@
if ( channel & RedChannel ) pixel.red = 0.0;
if ( channel & GreenChannel ) pixel.green = 0.0;
if ( channel & BlueChannel ) pixel.blue = 0.0;
- if ( channel & IndexChannel ) pixel.index = 0.0;
- if ( channel & OpacityChannel ) pixel.opacity = 0.0;
+ if ( channel & BlackChannel ) pixel.black = 0.0;
+ if ( channel & AlphaChannel ) pixel.alpha = 0.0;
denominator = 0.0;
for(k=0; k<number_arguments; k+=2+number_colors) {
register ssize_t x=(ssize_t) k+2;
@@ -2994,17 +2983,17 @@
pixel.green += arguments[x++]*weight;
if ( channel & BlueChannel )
pixel.blue += arguments[x++]*weight;
- if ( channel & IndexChannel )
- pixel.index += arguments[x++]*weight;
- if ( channel & OpacityChannel )
- pixel.opacity += arguments[x++]*weight;
+ if ( channel & AlphaChannel )
+ pixel.alpha += arguments[x++]*weight;
+ if ( channel & BlackChannel )
+ pixel.black += arguments[x++]*weight;
denominator += weight;
}
if ( channel & RedChannel ) pixel.red /= denominator;
if ( channel & GreenChannel ) pixel.green /= denominator;
if ( channel & BlueChannel ) pixel.blue /= denominator;
- if ( channel & IndexChannel ) pixel.index /= denominator;
- if ( channel & OpacityChannel ) pixel.opacity /= denominator;
+ if ( channel & AlphaChannel ) pixel.alpha /= denominator;
+ if ( channel & BlackChannel ) pixel.black /= denominator;
break;
}
case VoronoiColorInterpolate:
@@ -3024,8 +3013,8 @@
if ( channel & RedChannel ) pixel.red = arguments[x++];
if ( channel & GreenChannel ) pixel.green = arguments[x++];
if ( channel & BlueChannel ) pixel.blue = arguments[x++];
- if ( channel & IndexChannel ) pixel.index = arguments[x++];
- if ( channel & OpacityChannel ) pixel.opacity = arguments[x++];
+ if ( channel & AlphaChannel ) pixel.alpha = arguments[x++];
+ if ( channel & BlackChannel ) pixel.black = arguments[x++];
minimum = distance;
}
}
@@ -3036,11 +3025,10 @@
if ( channel & RedChannel ) pixel.red *= QuantumRange;
if ( channel & GreenChannel ) pixel.green *= QuantumRange;
if ( channel & BlueChannel ) pixel.blue *= QuantumRange;
- if ( channel & IndexChannel ) pixel.index *= QuantumRange;
- if ( channel & OpacityChannel ) pixel.opacity *= QuantumRange;
- SetPixelPacket(sparse_image,&pixel,q,indexes);
- q++;
- indexes++;
+ if ( channel & BlackChannel ) pixel.black *= QuantumRange;
+ if ( channel & AlphaChannel ) pixel.alpha *= QuantumRange;
+ SetPixelPixelInfo(sparse_image,&pixel,q);
+ q+=GetPixelChannels(sparse_image);
}
sync=SyncCacheViewAuthenticPixels(sparse_view,exception);
if (sync == MagickFalse)
diff --git a/magick/distort.h b/MagickCore/distort.h
similarity index 100%
rename from magick/distort.h
rename to MagickCore/distort.h
diff --git a/magick/draw-private.h b/MagickCore/draw-private.h
similarity index 92%
rename from magick/draw-private.h
rename to MagickCore/draw-private.h
index d3381cc..1489e25 100644
--- a/magick/draw-private.h
+++ b/MagickCore/draw-private.h
@@ -22,9 +22,9 @@
extern "C" {
#endif
-#include "magick/cache.h"
-#include "magick/image.h"
-#include "magick/memory_.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/image.h"
+#include "MagickCore/memory_.h"
static inline MagickBooleanType GetFillColor(const DrawInfo *draw_info,
const ssize_t x,const ssize_t y,PixelPacket *pixel)
@@ -48,7 +48,7 @@
x+pattern->tile_offset.x,y+pattern->tile_offset.y,pixel,
&pattern->exception);
if (pattern->matte == MagickFalse)
- pixel->opacity=OpaqueOpacity;
+ pixel->alpha=OpaqueAlpha;
return(status);
}
@@ -74,7 +74,7 @@
x+pattern->tile_offset.x,y+pattern->tile_offset.y,pixel,
&pattern->exception);
if (pattern->matte == MagickFalse)
- pixel->opacity=OpaqueOpacity;
+ pixel->alpha=OpaqueAlpha;
return(status);
}
diff --git a/magick/draw.c b/MagickCore/draw.c
similarity index 96%
rename from magick/draw.c
rename to MagickCore/draw.c
index 13a1e68..7cf06c6 100644
--- a/magick/draw.c
+++ b/MagickCore/draw.c
@@ -45,40 +45,40 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/annotate.h"
-#include "magick/artifact.h"
-#include "magick/blob.h"
-#include "magick/cache.h"
-#include "magick/cache-view.h"
-#include "magick/color.h"
-#include "magick/composite.h"
-#include "magick/composite-private.h"
-#include "magick/constitute.h"
-#include "magick/draw.h"
-#include "magick/draw-private.h"
-#include "magick/enhance.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/gem.h"
-#include "magick/geometry.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/log.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/option.h"
-#include "magick/paint.h"
-#include "magick/pixel-private.h"
-#include "magick/property.h"
-#include "magick/resample.h"
-#include "magick/resample-private.h"
-#include "magick/string_.h"
-#include "magick/string-private.h"
-#include "magick/thread-private.h"
-#include "magick/token.h"
-#include "magick/transform.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/annotate.h"
+#include "MagickCore/artifact.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/cache-view.h"
+#include "MagickCore/color.h"
+#include "MagickCore/composite.h"
+#include "MagickCore/composite-private.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/draw.h"
+#include "MagickCore/draw-private.h"
+#include "MagickCore/enhance.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/gem.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/log.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/option.h"
+#include "MagickCore/paint.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/property.h"
+#include "MagickCore/resample.h"
+#include "MagickCore/resample-private.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/string-private.h"
+#include "MagickCore/thread-private.h"
+#include "MagickCore/token.h"
+#include "MagickCore/transform.h"
+#include "MagickCore/utility.h"
/*
Define declarations.
@@ -256,11 +256,6 @@
if (draw_info->fill_pattern != (Image *) NULL)
clone_info->fill_pattern=CloneImage(draw_info->fill_pattern,0,0,MagickTrue,
&draw_info->fill_pattern->exception);
- else
- if (draw_info->tile != (Image *) NULL)
- clone_info->fill_pattern=CloneImage(draw_info->tile,0,0,MagickTrue,
- &draw_info->tile->exception);
- clone_info->tile=NewImageList(); /* tile is deprecated */
if (draw_info->stroke_pattern != (Image *) NULL)
clone_info->stroke_pattern=CloneImage(draw_info->stroke_pattern,0,0,
MagickTrue,&draw_info->stroke_pattern->exception);
@@ -333,7 +328,7 @@
clone_info->bounds=draw_info->bounds;
clone_info->clip_units=draw_info->clip_units;
clone_info->render=draw_info->render;
- clone_info->opacity=draw_info->opacity;
+ clone_info->alpha=draw_info->alpha;
clone_info->element_reference=draw_info->element_reference;
clone_info->debug=IsEventLogging();
return(clone_info);
@@ -823,8 +818,6 @@
draw_info->text=DestroyString(draw_info->text);
if (draw_info->geometry != (char *) NULL)
draw_info->geometry=DestroyString(draw_info->geometry);
- if (draw_info->tile != (Image *) NULL)
- draw_info->tile=DestroyImage(draw_info->tile);
if (draw_info->fill_pattern != (Image *) NULL)
draw_info->fill_pattern=DestroyImage(draw_info->fill_pattern);
if (draw_info->stroke_pattern != (Image *) NULL)
@@ -1097,7 +1090,7 @@
MagickBooleanType
status;
- MagickPixelPacket
+ PixelInfo
zero;
PointInfo
@@ -1163,7 +1156,7 @@
edge.x2=MagickMin(max.x,(double) image->columns-1.0);
edge.y2=MagickMin(max.y,(double) image->rows-1.0);
inverse_affine=InverseAffineMatrix(affine);
- GetMagickPixelPacket(image,&zero);
+ GetPixelInfo(image,&zero);
exception=(&image->exception);
image_view=AcquireCacheView(image);
source_view=AcquireCacheView(source);
@@ -1172,20 +1165,17 @@
#endif
for (y=(ssize_t) ceil(edge.y1-0.5); y <= (ssize_t) floor(edge.y2+0.5); y++)
{
- MagickPixelPacket
+ PixelInfo
composite,
pixel;
PointInfo
point;
- register IndexPacket
- *restrict indexes;
-
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
SegmentInfo
@@ -1200,9 +1190,8 @@
q=GetCacheViewAuthenticPixels(image_view,(ssize_t) ceil(inverse_edge.x1-
0.5),y,(size_t) ((ssize_t) floor(inverse_edge.x2+0.5)-(ssize_t) floor(
inverse_edge.x1+0.5)+1),1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (Quantum *) NULL)
continue;
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
pixel=zero;
composite=zero;
x_offset=0;
@@ -1212,14 +1201,14 @@
inverse_affine.tx;
point.y=(double) x*inverse_affine.rx+y*inverse_affine.sy+
inverse_affine.ty;
- (void) InterpolateMagickPixelPacket(source,source_view,
- UndefinedInterpolatePixel,point.x,point.y,&pixel,exception);
- SetMagickPixelPacket(image,q,indexes+x_offset,&composite);
- MagickPixelCompositeOver(&pixel,pixel.opacity,&composite,
- composite.opacity,&composite);
- SetPixelPacket(image,&composite,q,indexes+x_offset);
+ (void) InterpolatePixelInfo(source,source_view,UndefinedInterpolatePixel,
+ point.x,point.y,&pixel,exception);
+ SetPixelInfo(image,q,&composite);
+ CompositePixelInfoOver(&pixel,pixel.alpha,&composite,composite.alpha,
+ &composite);
+ SetPixelPixelInfo(image,&composite,q);
x_offset++;
- q++;
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -1432,7 +1421,7 @@
}
(void) QueryColorDatabase("#00000000",&image->clip_mask->background_color,
&image->exception);
- image->clip_mask->background_color.opacity=(Quantum) TransparentOpacity;
+ image->clip_mask->background_color.alpha=(Quantum) TransparentAlpha;
(void) SetImageBackgroundColor(image->clip_mask);
if (image->debug != MagickFalse)
(void) LogMagickEvent(DrawEvent,GetMagickModule(),"\nbegin clip-path %s",
@@ -2012,7 +2001,7 @@
{
GetMagickToken(q,&q,token);
factor=strchr(token,'%') != (char *) NULL ? 0.01 : 1.0;
- graphic_context[n]->fill.opacity=ClampToQuantum((MagickRealType)
+ graphic_context[n]->fill.alpha=ClampToQuantum((MagickRealType)
QuantumRange*(1.0-factor*InterpretLocaleValue(token,
(char **) NULL)));
break;
@@ -2215,11 +2204,11 @@
{
GetMagickToken(q,&q,token);
factor=strchr(token,'%') != (char *) NULL ? 0.01 : 1.0;
- graphic_context[n]->opacity=ClampToQuantum((MagickRealType)
- QuantumRange*(1.0-((1.0-QuantumScale*graphic_context[n]->opacity)*
+ graphic_context[n]->alpha=ClampToQuantum((MagickRealType)
+ QuantumRange*(1.0-((1.0-QuantumScale*graphic_context[n]->alpha)*
factor*InterpretLocaleValue(token,(char **) NULL))));
- graphic_context[n]->fill.opacity=graphic_context[n]->opacity;
- graphic_context[n]->stroke.opacity=graphic_context[n]->opacity;
+ graphic_context[n]->fill.alpha=graphic_context[n]->alpha;
+ graphic_context[n]->stroke.alpha=graphic_context[n]->alpha;
break;
}
status=MagickFalse;
@@ -2639,7 +2628,7 @@
{
GetMagickToken(q,&q,token);
factor=strchr(token,'%') != (char *) NULL ? 0.01 : 1.0;
- graphic_context[n]->stroke.opacity=ClampToQuantum((MagickRealType)
+ graphic_context[n]->stroke.alpha=ClampToQuantum((MagickRealType)
QuantumRange*(1.0-factor*InterpretLocaleValue(token,
(char **) NULL)));
break;
@@ -3244,7 +3233,7 @@
MagickBooleanType
status;
- MagickPixelPacket
+ PixelInfo
zero;
MagickRealType
@@ -3275,14 +3264,14 @@
bounding_box=gradient->bounding_box;
status=MagickTrue;
exception=(&image->exception);
- GetMagickPixelPacket(image,&zero);
+ GetPixelInfo(image,&zero);
image_view=AcquireCacheView(image);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(dynamic,4) shared(status)
#endif
for (y=bounding_box.y; y < (ssize_t) bounding_box.height; y++)
{
- MagickPixelPacket
+ PixelInfo
composite,
pixel;
@@ -3290,28 +3279,24 @@
alpha,
offset;
- register IndexPacket
- *restrict indexes;
+ register Quantum
+ *restrict q;
register ssize_t
i,
x;
- register PixelPacket
- *restrict q;
-
ssize_t
j;
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
pixel=zero;
composite=zero;
offset=GetStopColorOffset(gradient,0,y);
@@ -3319,7 +3304,7 @@
offset/=length;
for (x=bounding_box.x; x < (ssize_t) bounding_box.width; x++)
{
- SetMagickPixelPacket(image,q,indexes+x,&pixel);
+ SetPixelInfo(image,q,&pixel);
switch (gradient->spread)
{
case UndefinedSpread:
@@ -3346,7 +3331,7 @@
i--;
alpha=(offset-gradient->stops[i].offset)/
(gradient->stops[j].offset-gradient->stops[i].offset);
- MagickPixelCompositeBlend(&gradient->stops[i].color,1.0-alpha,
+ CompositePixelInfoBlend(&gradient->stops[i].color,1.0-alpha,
&gradient->stops[j].color,alpha,&composite);
}
break;
@@ -3380,7 +3365,7 @@
i--;
alpha=(offset-gradient->stops[i].offset)/
(gradient->stops[j].offset-gradient->stops[i].offset);
- MagickPixelCompositeBlend(&gradient->stops[i].color,1.0-alpha,
+ CompositePixelInfoBlend(&gradient->stops[i].color,1.0-alpha,
&gradient->stops[j].color,alpha,&composite);
}
break;
@@ -3417,8 +3402,8 @@
repeat=gradient->radius-fmod(-repeat,gradient->radius);
else
repeat=fmod(offset,gradient->radius);
- antialias=repeat+1.0 > gradient->radius ?
- MagickTrue : MagickFalse;
+ antialias=repeat+1.0 > gradient->radius ? MagickTrue :
+ MagickFalse;
offset=repeat/gradient->radius;
}
}
@@ -3445,16 +3430,16 @@
i=0;
j=(ssize_t) gradient->number_stops-1L;
}
- MagickPixelCompositeBlend(&gradient->stops[i].color,1.0-alpha,
+ CompositePixelInfoBlend(&gradient->stops[i].color,1.0-alpha,
&gradient->stops[j].color,alpha,&composite);
}
break;
}
}
- MagickPixelCompositeOver(&composite,composite.opacity,&pixel,
- pixel.opacity,&pixel);
- SetPixelPacket(image,&pixel,q,indexes+x);
- q++;
+ CompositePixelInfoOver(&composite,composite.alpha,&pixel,pixel.alpha,
+ &pixel);
+ SetPixelPixelInfo(image,&pixel,q);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -3624,7 +3609,7 @@
return(polygon_info);
}
-static MagickRealType GetOpacityPixel(PolygonInfo *polygon_info,
+static MagickRealType GetPixelOpacity(PolygonInfo *polygon_info,
const MagickRealType mid,const MagickBooleanType fill,
const FillRule fill_rule,const double x,const double y,
MagickRealType *stroke_opacity)
@@ -3893,10 +3878,13 @@
MagickBooleanType
sync;
+ PixelPacket
+ pixel;
+
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
if (status == MagickFalse)
@@ -3904,7 +3892,7 @@
x=start;
q=GetCacheViewAuthenticPixels(image_view,x,y,(size_t) (stop-x+1),
1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (Quantum *) NULL)
{
status=MagickFalse;
continue;
@@ -3913,8 +3901,11 @@
{
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,q);
- q++;
+ {
+ (void) GetStrokeColor(draw_info,x,y,&pixel);
+ SetPixelPacket(image,&pixel,q);
+ }
+ q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
if (sync == MagickFalse)
@@ -3948,7 +3939,7 @@
fill_color,
stroke_color;
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -3958,7 +3949,7 @@
continue;
q=GetCacheViewAuthenticPixels(image_view,start,y,(size_t) (stop-
start+1),1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (Quantum *) NULL)
{
status=MagickFalse;
continue;
@@ -3968,7 +3959,7 @@
/*
Fill and/or stroke.
*/
- fill_opacity=GetOpacityPixel(polygon_info[id],mid,fill,
+ fill_opacity=GetPixelOpacity(polygon_info[id],mid,fill,
draw_info->fill_rule,(double) x,(double) y,&stroke_opacity);
if (draw_info->stroke_antialias == MagickFalse)
{
@@ -3976,16 +3967,14 @@
stroke_opacity=stroke_opacity > 0.25 ? 1.0 : 0.0;
}
(void) GetFillColor(draw_info,x,y,&fill_color);
- fill_opacity=(MagickRealType) (QuantumRange-fill_opacity*(QuantumRange-
- fill_color.opacity));
- MagickCompositeOver(&fill_color,fill_opacity,q,(MagickRealType)
- q->opacity,q);
+ fill_opacity=fill_opacity*fill_color.alpha;
+ CompositePixelOver(image,&fill_color,fill_opacity,q,(MagickRealType)
+ GetPixelAlpha(image,q),q);
(void) GetStrokeColor(draw_info,x,y,&stroke_color);
- stroke_opacity=(MagickRealType) (QuantumRange-stroke_opacity*
- (QuantumRange-stroke_color.opacity));
- MagickCompositeOver(&stroke_color,stroke_opacity,q,(MagickRealType)
- q->opacity,q);
- q++;
+ stroke_opacity=stroke_opacity*stroke_color.alpha;
+ CompositePixelOver(image,&stroke_color,stroke_opacity,q,(MagickRealType)
+ GetPixelAlpha(image,q),q);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -4167,7 +4156,7 @@
PixelPacket
fill_color;
- PixelPacket
+ register Quantum
*q;
if ((y < 0) || (y >= (ssize_t) image->rows))
@@ -4175,11 +4164,11 @@
if ((x < 0) || (x >= (ssize_t) image->columns))
break;
q=GetCacheViewAuthenticPixels(image_view,x,y,1,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (Quantum *) NULL)
break;
(void) GetFillColor(draw_info,x,y,&fill_color);
- MagickCompositeOver(&fill_color,(MagickRealType) fill_color.opacity,q,
- (MagickRealType) q->opacity,q);
+ CompositePixelOver(image,&fill_color,(MagickRealType) fill_color.alpha,q,
+ (MagickRealType) GetPixelAlpha(image,q),q);
(void) SyncCacheViewAuthenticPixels(image_view,exception);
break;
}
@@ -4191,12 +4180,16 @@
default:
{
PixelPacket
+ pixel;
+
+ register Quantum
*q;
q=GetCacheViewAuthenticPixels(image_view,x,y,1,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (Quantum *) NULL)
break;
- (void) GetFillColor(draw_info,x,y,q);
+ (void) GetFillColor(draw_info,x,y,&pixel);
+ SetPixelPacket(image,&pixel,q);
(void) SyncCacheViewAuthenticPixels(image_view,exception);
break;
}
@@ -4206,27 +4199,30 @@
sync;
PixelPacket
+ pixel,
target;
(void) GetOneCacheViewVirtualPixel(image_view,x,y,&target,exception);
for (y=0; y < (ssize_t) image->rows; y++)
{
- register PixelPacket
+ register Quantum
*restrict q;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- if (IsColorSimilar(image,q,&target) == MagickFalse)
+ GetPixelPacket(image,q,&pixel);
+ if (IsFuzzyEquivalencePixelPacket(image,&pixel,&target) == MagickFalse)
{
- q++;
+ q+=GetPixelChannels(image);
continue;
}
- (void) GetFillColor(draw_info,x,y,q);
- q++;
+ (void) GetFillColor(draw_info,x,y,&pixel);
+ SetPixelAlpha(image,pixel.alpha,q);
+ q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
if (sync == MagickFalse)
@@ -4237,7 +4233,7 @@
case FloodfillMethod:
case FillToBorderMethod:
{
- MagickPixelPacket
+ PixelInfo
target;
(void) GetOneVirtualMagickPixel(image,x,y,&target,exception);
@@ -4257,9 +4253,12 @@
MagickBooleanType
sync;
+ PixelPacket
+ pixel;
+
for (y=0; y < (ssize_t) image->rows; y++)
{
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -4267,12 +4266,13 @@
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- (void) GetFillColor(draw_info,x,y,q);
- q++;
+ (void) GetFillColor(draw_info,x,y,&pixel);
+ SetPixelPacket(image,&pixel,q);
+ q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
if (sync == MagickFalse)
@@ -4295,14 +4295,14 @@
PixelPacket
pixel;
- PixelPacket
+ register Quantum
*q;
q=GetCacheViewAuthenticPixels(image_view,x,y,1,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (Quantum *) NULL)
break;
(void) GetFillColor(draw_info,x,y,&pixel);
- SetPixelOpacity(q,pixel.opacity);
+ SetPixelAlpha(image,pixel.alpha,q);
(void) SyncCacheViewAuthenticPixels(image_view,exception);
break;
}
@@ -4318,7 +4318,7 @@
(void) GetOneCacheViewVirtualPixel(image_view,x,y,&target,exception);
for (y=0; y < (ssize_t) image->rows; y++)
{
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -4326,18 +4326,19 @@
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- if (IsColorSimilar(image,q,&target) == MagickFalse)
+ GetPixelPacket(image,q,&pixel);
+ if (IsFuzzyEquivalencePixelPacket(image,&pixel,&target) == MagickFalse)
{
- q++;
+ q+=GetPixelChannels(image);
continue;
}
(void) GetFillColor(draw_info,x,y,&pixel);
- SetPixelOpacity(q,pixel.opacity);
- q++;
+ SetPixelAlpha(image,pixel.alpha,q);
+ q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
if (sync == MagickFalse)
@@ -4348,7 +4349,7 @@
case FloodfillMethod:
case FillToBorderMethod:
{
- MagickPixelPacket
+ PixelInfo
target;
(void) GetOneVirtualMagickPixel(image,x,y,&target,exception);
@@ -4373,7 +4374,7 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -4381,13 +4382,13 @@
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
(void) GetFillColor(draw_info,x,y,&pixel);
- SetPixelOpacity(q,pixel.opacity);
- q++;
+ SetPixelAlpha(image,pixel.alpha,q);
+ q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
if (sync == MagickFalse)
@@ -4473,8 +4474,8 @@
}
if (composite_image->matte == MagickFalse)
(void) SetImageAlphaChannel(composite_image,OpaqueAlphaChannel);
- if (draw_info->opacity != OpaqueOpacity)
- (void) SetImageOpacity(composite_image,draw_info->opacity);
+ if (draw_info->alpha != OpaqueAlpha)
+ (void) SetImageOpacity(composite_image,draw_info->alpha);
SetGeometry(image,&geometry);
image->gravity=draw_info->gravity;
geometry.x=x;
@@ -4511,14 +4512,14 @@
if ((draw_info->dash_pattern != (double *) NULL) &&
(draw_info->dash_pattern[0] != 0.0) &&
((scale*draw_info->stroke_width) > MagickEpsilon) &&
- (draw_info->stroke.opacity != (Quantum) TransparentOpacity))
+ (draw_info->stroke.alpha != (Quantum) TransparentAlpha))
{
/*
Draw dash polygon.
*/
clone_info=CloneDrawInfo((ImageInfo *) NULL,draw_info);
clone_info->stroke_width=0.0;
- clone_info->stroke.opacity=(Quantum) TransparentOpacity;
+ clone_info->stroke.alpha=(Quantum) TransparentAlpha;
status=DrawPolygonPrimitive(image,clone_info,primitive_info);
clone_info=DestroyDrawInfo(clone_info);
(void) DrawDashPolygon(draw_info,primitive_info,image);
@@ -4526,7 +4527,7 @@
}
mid=ExpandAffine(&draw_info->affine)*draw_info->stroke_width/2.0;
if ((mid > 1.0) &&
- (draw_info->stroke.opacity != (Quantum) TransparentOpacity))
+ (draw_info->stroke.alpha != (Quantum) TransparentAlpha))
{
MagickBooleanType
closed_path;
@@ -4550,7 +4551,7 @@
}
clone_info=CloneDrawInfo((ImageInfo *) NULL,draw_info);
clone_info->stroke_width=0.0;
- clone_info->stroke.opacity=(Quantum) TransparentOpacity;
+ clone_info->stroke.alpha=(Quantum) TransparentAlpha;
status=DrawPolygonPrimitive(image,clone_info,primitive_info);
clone_info=DestroyDrawInfo(clone_info);
status|=DrawStrokePolygon(image,draw_info,primitive_info);
@@ -4641,7 +4642,7 @@
" begin draw-stroke-polygon");
clone_info=CloneDrawInfo((ImageInfo *) NULL,draw_info);
clone_info->fill=draw_info->stroke;
- clone_info->stroke.opacity=(Quantum) TransparentOpacity;
+ clone_info->stroke.alpha=(Quantum) TransparentAlpha;
clone_info->stroke_width=0.0;
clone_info->fill_rule=NonZeroRule;
status=MagickTrue;
@@ -4746,7 +4747,7 @@
(void) QueryColorDatabase("#FFF0",&draw_info->stroke,exception);
draw_info->stroke_antialias=clone_info->antialias;
draw_info->stroke_width=1.0;
- draw_info->opacity=OpaqueOpacity;
+ draw_info->alpha=OpaqueAlpha;
draw_info->fill_rule=EvenOddRule;
draw_info->linecap=ButtCap;
draw_info->linejoin=MiterJoin;
@@ -4760,7 +4761,7 @@
draw_info->pointsize=12.0;
if (clone_info->pointsize != 0.0)
draw_info->pointsize=clone_info->pointsize;
- draw_info->undercolor.opacity=(Quantum) TransparentOpacity;
+ draw_info->undercolor.alpha=(Quantum) TransparentAlpha;
draw_info->border_color=clone_info->border_color;
draw_info->compose=OverCompositeOp;
if (clone_info->server_name != (char *) NULL)
diff --git a/magick/draw.h b/MagickCore/draw.h
similarity index 96%
rename from magick/draw.h
rename to MagickCore/draw.h
index 1ec23ff..66e80aa 100644
--- a/magick/draw.h
+++ b/MagickCore/draw.h
@@ -22,10 +22,10 @@
extern "C" {
#endif
-#include "magick/geometry.h"
-#include "magick/image.h"
-#include "magick/pixel.h"
-#include "magick/type.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/image.h"
+#include "MagickCore/pixel.h"
+#include "MagickCore/type.h"
typedef enum
{
@@ -143,7 +143,7 @@
typedef struct _StopInfo
{
- MagickPixelPacket
+ PixelInfo
color;
MagickRealType
@@ -229,7 +229,6 @@
Image
*fill_pattern,
- *tile,
*stroke_pattern;
MagickBooleanType
@@ -309,7 +308,7 @@
clip_units;
Quantum
- opacity;
+ alpha;
MagickBooleanType
render;
diff --git a/magick/effect.c b/MagickCore/effect.c
similarity index 80%
rename from magick/effect.c
rename to MagickCore/effect.c
index 668be14..5de76f8 100644
--- a/magick/effect.c
+++ b/MagickCore/effect.c
@@ -40,49 +40,50 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/accelerate.h"
-#include "magick/blob.h"
-#include "magick/cache-view.h"
-#include "magick/color.h"
-#include "magick/color-private.h"
-#include "magick/colorspace.h"
-#include "magick/constitute.h"
-#include "magick/decorate.h"
-#include "magick/draw.h"
-#include "magick/enhance.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/effect.h"
-#include "magick/fx.h"
-#include "magick/gem.h"
-#include "magick/geometry.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/log.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/montage.h"
-#include "magick/morphology.h"
-#include "magick/paint.h"
-#include "magick/pixel-private.h"
-#include "magick/property.h"
-#include "magick/quantize.h"
-#include "magick/quantum.h"
-#include "magick/random_.h"
-#include "magick/random-private.h"
-#include "magick/resample.h"
-#include "magick/resample-private.h"
-#include "magick/resize.h"
-#include "magick/resource_.h"
-#include "magick/segment.h"
-#include "magick/shear.h"
-#include "magick/signature-private.h"
-#include "magick/string_.h"
-#include "magick/thread-private.h"
-#include "magick/transform.h"
-#include "magick/threshold.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/accelerate.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/cache-view.h"
+#include "MagickCore/color.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/decorate.h"
+#include "MagickCore/draw.h"
+#include "MagickCore/enhance.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/effect.h"
+#include "MagickCore/fx.h"
+#include "MagickCore/gem.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/log.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/montage.h"
+#include "MagickCore/morphology.h"
+#include "MagickCore/paint.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/property.h"
+#include "MagickCore/quantize.h"
+#include "MagickCore/quantum.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/random_.h"
+#include "MagickCore/random-private.h"
+#include "MagickCore/resample.h"
+#include "MagickCore/resample-private.h"
+#include "MagickCore/resize.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/segment.h"
+#include "MagickCore/shear.h"
+#include "MagickCore/signature-private.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/thread-private.h"
+#include "MagickCore/transform.h"
+#include "MagickCore/threshold.h"
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -162,7 +163,7 @@
MagickOffsetType
progress;
- MagickPixelPacket
+ PixelInfo
bias;
register ssize_t
@@ -263,8 +264,8 @@
*/
status=MagickTrue;
progress=0;
- GetMagickPixelPacket(image,&bias);
- SetMagickPixelPacketBias(image,&bias);
+ GetPixelInfo(image,&bias);
+ SetPixelInfoBias(image,&bias);
image_view=AcquireCacheView(image);
edge_view=AcquireCacheView(edge_image);
blur_view=AcquireCacheView(blur_image);
@@ -273,17 +274,11 @@
#endif
for (y=0; y < (ssize_t) blur_image->rows; y++)
{
- register const IndexPacket
- *restrict indexes;
-
- register const PixelPacket
+ register const Quantum
*restrict p,
*restrict r;
- register IndexPacket
- *restrict blur_indexes;
-
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -294,15 +289,14 @@
r=GetCacheViewVirtualPixels(edge_view,0,y,edge_image->columns,1,exception);
q=QueueCacheViewAuthenticPixels(blur_view,0,y,blur_image->columns,1,
exception);
- if ((r == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
+ if ((r == (const Quantum *) NULL) || (q == (const Quantum *) NULL))
{
status=MagickFalse;
continue;
}
- blur_indexes=GetCacheViewAuthenticIndexQueue(blur_view);
for (x=0; x < (ssize_t) blur_image->columns; x++)
{
- MagickPixelPacket
+ PixelInfo
pixel;
MagickRealType
@@ -318,7 +312,8 @@
v;
gamma=0.0;
- i=(ssize_t) ceil((double) width*QuantumScale*PixelIntensity(r)-0.5);
+ i=(ssize_t) ceil((double) width*QuantumScale*
+ GetPixelIntensity(edge_image,r)-0.5);
if (i < 0)
i=0;
else
@@ -328,9 +323,8 @@
i--;
p=GetCacheViewVirtualPixels(image_view,x-((ssize_t) (width-i)/2L),y-
(ssize_t) ((width-i)/2L),width-i,width-i,exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetCacheViewVirtualIndexQueue(image_view);
pixel=bias;
k=kernel[i];
for (v=0; v < (ssize_t) (width-i); v++)
@@ -338,39 +332,39 @@
for (u=0; u < (ssize_t) (width-i); u++)
{
alpha=1.0;
- if (((channel & OpacityChannel) != 0) &&
+ if (((channel & AlphaChannel) != 0) &&
(image->matte != MagickFalse))
- alpha=(MagickRealType) (QuantumScale*GetPixelAlpha(p));
+ alpha=(MagickRealType) (QuantumScale*GetPixelAlpha(image,p));
if ((channel & RedChannel) != 0)
- pixel.red+=(*k)*alpha*GetPixelRed(p);
+ pixel.red+=(*k)*alpha*GetPixelRed(image,p);
if ((channel & GreenChannel) != 0)
- pixel.green+=(*k)*alpha*GetPixelGreen(p);
+ pixel.green+=(*k)*alpha*GetPixelGreen(image,p);
if ((channel & BlueChannel) != 0)
- pixel.blue+=(*k)*alpha*GetPixelBlue(p);
- if ((channel & OpacityChannel) != 0)
- pixel.opacity+=(*k)*GetPixelOpacity(p);
- if (((channel & IndexChannel) != 0) &&
+ pixel.blue+=(*k)*alpha*GetPixelBlue(image,p);
+ if (((channel & BlackChannel) != 0) &&
(image->colorspace == CMYKColorspace))
- pixel.index+=(*k)*alpha*GetPixelIndex(indexes+x+(width-i)*v+u);
+ pixel.black+=(*k)*alpha*GetPixelBlack(image,p);
+ if ((channel & AlphaChannel) != 0)
+ pixel.alpha+=(*k)*GetPixelAlpha(image,p);
gamma+=(*k)*alpha;
k++;
- p++;
+ p+=GetPixelChannels(image);
}
}
gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
if ((channel & RedChannel) != 0)
- SetPixelRed(q,ClampToQuantum(gamma*pixel.red));
+ SetPixelRed(blur_image,ClampToQuantum(gamma*pixel.red),q);
if ((channel & GreenChannel) != 0)
- SetPixelGreen(q,ClampToQuantum(gamma*pixel.green));
+ SetPixelGreen(blur_image,ClampToQuantum(gamma*pixel.green),q);
if ((channel & BlueChannel) != 0)
- SetPixelBlue(q,ClampToQuantum(gamma*pixel.blue));
- if ((channel & OpacityChannel) != 0)
- SetPixelOpacity(q,ClampToQuantum(pixel.opacity));
- if (((channel & IndexChannel) != 0) &&
+ SetPixelBlue(blur_image,ClampToQuantum(gamma*pixel.blue),q);
+ if (((channel & BlackChannel) != 0) &&
(image->colorspace == CMYKColorspace))
- SetPixelIndex(blur_indexes+x,ClampToQuantum(gamma*pixel.index));
- q++;
- r++;
+ SetPixelBlack(blur_image,ClampToQuantum(gamma*pixel.black),q);
+ if ((channel & AlphaChannel) != 0)
+ SetPixelAlpha(blur_image,ClampToQuantum(pixel.alpha),q);
+ q+=GetPixelChannels(blur_image);
+ r+=GetPixelChannels(edge_image);
}
if (SyncCacheViewAuthenticPixels(blur_view,exception) == MagickFalse)
status=MagickFalse;
@@ -479,7 +473,7 @@
MagickOffsetType
progress;
- MagickPixelPacket
+ PixelInfo
bias;
register ssize_t
@@ -580,8 +574,8 @@
*/
status=MagickTrue;
progress=0;
- GetMagickPixelPacket(image,&bias);
- SetMagickPixelPacketBias(image,&bias);
+ GetPixelInfo(image,&bias);
+ SetPixelInfoBias(image,&bias);
image_view=AcquireCacheView(image);
edge_view=AcquireCacheView(edge_image);
sharp_view=AcquireCacheView(sharp_image);
@@ -590,17 +584,11 @@
#endif
for (y=0; y < (ssize_t) sharp_image->rows; y++)
{
- register const IndexPacket
- *restrict indexes;
-
- register const PixelPacket
+ register const Quantum
*restrict p,
*restrict r;
- register IndexPacket
- *restrict sharp_indexes;
-
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -611,15 +599,14 @@
r=GetCacheViewVirtualPixels(edge_view,0,y,edge_image->columns,1,exception);
q=QueueCacheViewAuthenticPixels(sharp_view,0,y,sharp_image->columns,1,
exception);
- if ((r == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
+ if ((r == (const Quantum *) NULL) || (q == (Quantum *) NULL))
{
status=MagickFalse;
continue;
}
- sharp_indexes=GetCacheViewAuthenticIndexQueue(sharp_view);
for (x=0; x < (ssize_t) sharp_image->columns; x++)
{
- MagickPixelPacket
+ PixelInfo
pixel;
MagickRealType
@@ -635,8 +622,8 @@
v;
gamma=0.0;
- i=(ssize_t) ceil((double) width*(QuantumRange-QuantumScale*
- PixelIntensity(r))-0.5);
+ i=(ssize_t) ceil((double) width*QuantumScale*
+ GetPixelIntensity(edge_image,r)-0.5);
if (i < 0)
i=0;
else
@@ -646,9 +633,8 @@
i--;
p=GetCacheViewVirtualPixels(image_view,x-((ssize_t) (width-i)/2L),y-
(ssize_t) ((width-i)/2L),width-i,width-i,exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetCacheViewVirtualIndexQueue(image_view);
k=kernel[i];
pixel=bias;
for (v=0; v < (ssize_t) (width-i); v++)
@@ -656,39 +642,39 @@
for (u=0; u < (ssize_t) (width-i); u++)
{
alpha=1.0;
- if (((channel & OpacityChannel) != 0) &&
+ if (((channel & AlphaChannel) != 0) &&
(image->matte != MagickFalse))
- alpha=(MagickRealType) (QuantumScale*GetPixelAlpha(p));
+ alpha=(MagickRealType) (QuantumScale*GetPixelAlpha(image,p));
if ((channel & RedChannel) != 0)
- pixel.red+=(*k)*alpha*GetPixelRed(p);
+ pixel.red+=(*k)*alpha*GetPixelRed(image,p);
if ((channel & GreenChannel) != 0)
- pixel.green+=(*k)*alpha*GetPixelGreen(p);
+ pixel.green+=(*k)*alpha*GetPixelGreen(image,p);
if ((channel & BlueChannel) != 0)
- pixel.blue+=(*k)*alpha*GetPixelBlue(p);
- if ((channel & OpacityChannel) != 0)
- pixel.opacity+=(*k)*GetPixelOpacity(p);
- if (((channel & IndexChannel) != 0) &&
+ pixel.blue+=(*k)*alpha*GetPixelBlue(image,p);
+ if (((channel & BlackChannel) != 0) &&
(image->colorspace == CMYKColorspace))
- pixel.index+=(*k)*alpha*GetPixelIndex(indexes+x+(width-i)*v+u);
+ pixel.black+=(*k)*alpha*GetPixelBlack(image,p);
+ if ((channel & AlphaChannel) != 0)
+ pixel.alpha+=(*k)*GetPixelAlpha(image,p);
gamma+=(*k)*alpha;
k++;
- p++;
+ p+=GetPixelChannels(image);
}
}
gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
if ((channel & RedChannel) != 0)
- SetPixelRed(q,ClampToQuantum(gamma*pixel.red));
+ SetPixelRed(sharp_image,ClampToQuantum(gamma*pixel.red),q);
if ((channel & GreenChannel) != 0)
- SetPixelGreen(q,ClampToQuantum(gamma*pixel.green));
+ SetPixelGreen(sharp_image,ClampToQuantum(gamma*pixel.green),q);
if ((channel & BlueChannel) != 0)
- SetPixelBlue(q,ClampToQuantum(gamma*pixel.blue));
- if ((channel & OpacityChannel) != 0)
- SetPixelOpacity(q,ClampToQuantum(pixel.opacity));
- if (((channel & IndexChannel) != 0) &&
+ SetPixelBlue(sharp_image,ClampToQuantum(gamma*pixel.blue),q);
+ if (((channel & BlackChannel) != 0) &&
(image->colorspace == CMYKColorspace))
- SetPixelIndex(sharp_indexes+x,ClampToQuantum(gamma*pixel.index));
- q++;
- r++;
+ SetPixelBlack(sharp_image,ClampToQuantum(gamma*pixel.black),q);
+ if ((channel & AlphaChannel) != 0)
+ SetPixelAlpha(sharp_image,ClampToQuantum(pixel.alpha),q);
+ q+=GetPixelChannels(sharp_image);
+ r+=GetPixelChannels(edge_image);
}
if (SyncCacheViewAuthenticPixels(sharp_view,exception) == MagickFalse)
status=MagickFalse;
@@ -828,7 +814,7 @@
MagickOffsetType
progress;
- MagickPixelPacket
+ PixelInfo
bias;
register ssize_t
@@ -897,8 +883,8 @@
*/
status=MagickTrue;
progress=0;
- GetMagickPixelPacket(image,&bias);
- SetMagickPixelPacketBias(image,&bias);
+ GetPixelInfo(image,&bias);
+ SetPixelInfoBias(image,&bias);
image_view=AcquireCacheView(image);
blur_view=AcquireCacheView(blur_image);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
@@ -906,16 +892,10 @@
#endif
for (y=0; y < (ssize_t) blur_image->rows; y++)
{
- register const IndexPacket
- *restrict indexes;
-
- register const PixelPacket
+ register const Quantum
*restrict p;
- register IndexPacket
- *restrict blur_indexes;
-
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -927,22 +907,20 @@
image->columns+width,1,exception);
q=GetCacheViewAuthenticPixels(blur_view,0,y,blur_image->columns,1,
exception);
- if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewVirtualIndexQueue(image_view);
- blur_indexes=GetCacheViewAuthenticIndexQueue(blur_view);
for (x=0; x < (ssize_t) blur_image->columns; x++)
{
- MagickPixelPacket
+ PixelInfo
pixel;
register const double
*restrict k;
- register const PixelPacket
+ register const Quantum
*restrict kernel_pixels;
register ssize_t
@@ -951,49 +929,38 @@
pixel=bias;
k=kernel;
kernel_pixels=p;
- if (((channel & OpacityChannel) == 0) || (image->matte == MagickFalse))
+ if (((channel & AlphaChannel) == 0) || (image->matte == MagickFalse))
{
for (i=0; i < (ssize_t) width; i++)
{
- pixel.red+=(*k)*GetPixelRed(kernel_pixels);
- pixel.green+=(*k)*GetPixelGreen(kernel_pixels);
- pixel.blue+=(*k)*GetPixelBlue(kernel_pixels);
+ pixel.red+=(*k)*GetPixelRed(image,kernel_pixels);
+ pixel.green+=(*k)*GetPixelGreen(image,kernel_pixels);
+ pixel.blue+=(*k)*GetPixelBlue(image,kernel_pixels);
+ if (image->colorspace == CMYKColorspace)
+ pixel.black+=(*k)*GetPixelBlack(image,kernel_pixels);
k++;
- kernel_pixels++;
+ kernel_pixels+=GetPixelChannels(image);
}
if ((channel & RedChannel) != 0)
- SetPixelRed(q,ClampToQuantum(pixel.red));
+ SetPixelRed(blur_image,ClampToQuantum(pixel.red),q);
if ((channel & GreenChannel) != 0)
- SetPixelGreen(q,ClampToQuantum(pixel.green));
+ SetPixelGreen(blur_image,ClampToQuantum(pixel.green),q);
if ((channel & BlueChannel) != 0)
- SetPixelBlue(q,ClampToQuantum(pixel.blue));
- if ((channel & OpacityChannel) != 0)
+ SetPixelBlue(blur_image,ClampToQuantum(pixel.blue),q);
+ if (((channel & BlackChannel) != 0) &&
+ (blur_image->colorspace == CMYKColorspace))
+ SetPixelBlack(blur_image,ClampToQuantum(pixel.black),q);
+ if ((channel & AlphaChannel) != 0)
{
k=kernel;
kernel_pixels=p;
for (i=0; i < (ssize_t) width; i++)
{
- pixel.opacity+=(*k)*GetPixelOpacity(kernel_pixels);
+ pixel.alpha+=(*k)*GetPixelAlpha(image,kernel_pixels);
k++;
- kernel_pixels++;
+ kernel_pixels+=GetPixelChannels(image);
}
- SetPixelOpacity(q,ClampToQuantum(pixel.opacity));
- }
- if (((channel & IndexChannel) != 0) &&
- (image->colorspace == CMYKColorspace))
- {
- register const IndexPacket
- *restrict kernel_indexes;
-
- k=kernel;
- kernel_indexes=indexes;
- for (i=0; i < (ssize_t) width; i++)
- {
- pixel.index+=(*k)*GetPixelIndex(kernel_indexes);
- k++;
- kernel_indexes++;
- }
- SetPixelIndex(blur_indexes+x,ClampToQuantum(pixel.index));
+ SetPixelAlpha(blur_image,ClampToQuantum(pixel.alpha),q);
}
}
else
@@ -1005,57 +972,42 @@
gamma=0.0;
for (i=0; i < (ssize_t) width; i++)
{
- alpha=(MagickRealType) (QuantumScale*GetPixelAlpha(kernel_pixels));
- pixel.red+=(*k)*alpha*GetPixelRed(kernel_pixels);
- pixel.green+=(*k)*alpha*GetPixelGreen(kernel_pixels);
- pixel.blue+=(*k)*alpha*GetPixelBlue(kernel_pixels);
+ alpha=(MagickRealType) (QuantumScale*
+ GetPixelAlpha(image,kernel_pixels));
+ pixel.red+=(*k)*alpha*GetPixelRed(image,kernel_pixels);
+ pixel.green+=(*k)*alpha*GetPixelGreen(image,kernel_pixels);
+ pixel.blue+=(*k)*alpha*GetPixelBlue(image,kernel_pixels);
+ if (image->colorspace == CMYKColorspace)
+ pixel.black+=(*k)*alpha*GetPixelBlack(image,kernel_pixels);
gamma+=(*k)*alpha;
k++;
- kernel_pixels++;
+ kernel_pixels+=GetPixelChannels(image);
}
gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
if ((channel & RedChannel) != 0)
- SetPixelRed(q,ClampToQuantum(gamma*pixel.red));
+ SetPixelRed(blur_image,ClampToQuantum(gamma*pixel.red),q);
if ((channel & GreenChannel) != 0)
- SetPixelGreen(q,ClampToQuantum(gamma*pixel.green));
+ SetPixelGreen(blur_image,ClampToQuantum(gamma*pixel.green),q);
if ((channel & BlueChannel) != 0)
- SetPixelBlue(q,ClampToQuantum(gamma*pixel.blue));
- if ((channel & OpacityChannel) != 0)
+ SetPixelBlue(blur_image,ClampToQuantum(gamma*pixel.blue),q);
+ if (((channel & BlackChannel) != 0) &&
+ (blur_image->colorspace == CMYKColorspace))
+ SetPixelBlack(blur_image,ClampToQuantum(gamma*pixel.black),q);
+ if ((channel & AlphaChannel) != 0)
{
k=kernel;
kernel_pixels=p;
for (i=0; i < (ssize_t) width; i++)
{
- pixel.opacity+=(*k)*GetPixelOpacity(kernel_pixels);
+ pixel.alpha+=(*k)*GetPixelAlpha(image,kernel_pixels);
k++;
- kernel_pixels++;
+ kernel_pixels+=GetPixelChannels(image);
}
- SetPixelOpacity(q,ClampToQuantum(pixel.opacity));
- }
- if (((channel & IndexChannel) != 0) &&
- (image->colorspace == CMYKColorspace))
- {
- register const IndexPacket
- *restrict kernel_indexes;
-
- k=kernel;
- kernel_pixels=p;
- kernel_indexes=indexes;
- for (i=0; i < (ssize_t) width; i++)
- {
- alpha=(MagickRealType) (QuantumScale*
- GetPixelAlpha(kernel_pixels));
- pixel.index+=(*k)*alpha*(*kernel_indexes);
- k++;
- kernel_pixels++;
- kernel_indexes++;
- }
- SetPixelIndex(blur_indexes+x,ClampToQuantum(gamma*pixel.index));
+ SetPixelAlpha(blur_image,ClampToQuantum(pixel.alpha),q);
}
}
- indexes++;
- p++;
- q++;
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(blur_image);
}
if (SyncCacheViewAuthenticPixels(blur_view,exception) == MagickFalse)
status=MagickFalse;
@@ -1085,16 +1037,10 @@
#endif
for (x=0; x < (ssize_t) blur_image->columns; x++)
{
- register const IndexPacket
- *restrict indexes;
-
- register const PixelPacket
+ register const Quantum
*restrict p;
- register IndexPacket
- *restrict blur_indexes;
-
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -1105,22 +1051,20 @@
p=GetCacheViewVirtualPixels(image_view,x,-((ssize_t) width/2L),1,
image->rows+width,exception);
q=GetCacheViewAuthenticPixels(blur_view,x,0,1,blur_image->rows,exception);
- if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewVirtualIndexQueue(image_view);
- blur_indexes=GetCacheViewAuthenticIndexQueue(blur_view);
for (y=0; y < (ssize_t) blur_image->rows; y++)
{
- MagickPixelPacket
+ PixelInfo
pixel;
register const double
*restrict k;
- register const PixelPacket
+ register const Quantum
*restrict kernel_pixels;
register ssize_t
@@ -1129,49 +1073,38 @@
pixel=bias;
k=kernel;
kernel_pixels=p;
- if (((channel & OpacityChannel) == 0) || (image->matte == MagickFalse))
+ if (((channel & AlphaChannel) == 0) || (blur_image->matte == MagickFalse))
{
for (i=0; i < (ssize_t) width; i++)
{
- pixel.red+=(*k)*GetPixelRed(kernel_pixels);
- pixel.green+=(*k)*GetPixelGreen(kernel_pixels);
- pixel.blue+=(*k)*GetPixelBlue(kernel_pixels);
+ pixel.red+=(*k)*GetPixelRed(blur_image,kernel_pixels);
+ pixel.green+=(*k)*GetPixelGreen(blur_image,kernel_pixels);
+ pixel.blue+=(*k)*GetPixelBlue(blur_image,kernel_pixels);
+ if (blur_image->colorspace == CMYKColorspace)
+ pixel.black+=(*k)*GetPixelBlack(blur_image,kernel_pixels);
k++;
- kernel_pixels++;
+ kernel_pixels+=GetPixelChannels(blur_image);
}
if ((channel & RedChannel) != 0)
- SetPixelRed(q,ClampToQuantum(pixel.red));
+ SetPixelRed(blur_image,ClampToQuantum(pixel.red),q);
if ((channel & GreenChannel) != 0)
- SetPixelGreen(q,ClampToQuantum(pixel.green));
+ SetPixelGreen(blur_image,ClampToQuantum(pixel.green),q);
if ((channel & BlueChannel) != 0)
- SetPixelBlue(q,ClampToQuantum(pixel.blue));
- if ((channel & OpacityChannel) != 0)
+ SetPixelBlue(blur_image,ClampToQuantum(pixel.blue),q);
+ if (((channel & BlackChannel) != 0) &&
+ (blur_image->colorspace == CMYKColorspace))
+ SetPixelBlack(blur_image,ClampToQuantum(pixel.black),q);
+ if ((channel & AlphaChannel) != 0)
{
k=kernel;
kernel_pixels=p;
for (i=0; i < (ssize_t) width; i++)
{
- pixel.opacity+=(*k)*GetPixelOpacity(kernel_pixels);
+ pixel.alpha+=(*k)*GetPixelAlpha(blur_image,kernel_pixels);
k++;
- kernel_pixels++;
+ kernel_pixels+=GetPixelChannels(blur_image);
}
- SetPixelOpacity(q,ClampToQuantum(pixel.opacity));
- }
- if (((channel & IndexChannel) != 0) &&
- (image->colorspace == CMYKColorspace))
- {
- register const IndexPacket
- *restrict kernel_indexes;
-
- k=kernel;
- kernel_indexes=indexes;
- for (i=0; i < (ssize_t) width; i++)
- {
- pixel.index+=(*k)*GetPixelIndex(kernel_indexes);
- k++;
- kernel_indexes++;
- }
- SetPixelIndex(blur_indexes+y,ClampToQuantum(pixel.index));
+ SetPixelAlpha(blur_image,ClampToQuantum(pixel.alpha),q);
}
}
else
@@ -1184,61 +1117,45 @@
for (i=0; i < (ssize_t) width; i++)
{
alpha=(MagickRealType) (QuantumScale*
- GetPixelAlpha(kernel_pixels));
- pixel.red+=(*k)*alpha*GetPixelRed(kernel_pixels);
- pixel.green+=(*k)*alpha*GetPixelGreen(kernel_pixels);
- pixel.blue+=(*k)*alpha*GetPixelBlue(kernel_pixels);
+ GetPixelAlpha(blur_image,kernel_pixels));
+ pixel.red+=(*k)*alpha*GetPixelRed(blur_image,kernel_pixels);
+ pixel.green+=(*k)*alpha*GetPixelGreen(blur_image,kernel_pixels);
+ pixel.blue+=(*k)*alpha*GetPixelBlue(blur_image,kernel_pixels);
+ if (blur_image->colorspace == CMYKColorspace)
+ pixel.black+=(*k)*alpha*GetPixelBlack(blur_image,kernel_pixels);
gamma+=(*k)*alpha;
k++;
- kernel_pixels++;
+ kernel_pixels+=GetPixelChannels(blur_image);
}
gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
if ((channel & RedChannel) != 0)
- SetPixelRed(q,ClampToQuantum(gamma*pixel.red));
+ SetPixelRed(blur_image,ClampToQuantum(gamma*pixel.red),q);
if ((channel & GreenChannel) != 0)
- SetPixelGreen(q,ClampToQuantum(gamma*pixel.green));
+ SetPixelGreen(blur_image,ClampToQuantum(gamma*pixel.green),q);
if ((channel & BlueChannel) != 0)
- SetPixelBlue(q,ClampToQuantum(gamma*pixel.blue));
- if ((channel & OpacityChannel) != 0)
+ SetPixelBlue(blur_image,ClampToQuantum(gamma*pixel.blue),q);
+ if (((channel & BlackChannel) != 0) &&
+ (blur_image->colorspace == CMYKColorspace))
+ SetPixelBlack(blur_image,ClampToQuantum(gamma*pixel.black),q);
+ if ((channel & AlphaChannel) != 0)
{
k=kernel;
kernel_pixels=p;
for (i=0; i < (ssize_t) width; i++)
{
- pixel.opacity+=(*k)*GetPixelOpacity(kernel_pixels);
+ pixel.alpha+=(*k)*GetPixelAlpha(blur_image,kernel_pixels);
k++;
- kernel_pixels++;
+ kernel_pixels+=GetPixelChannels(blur_image);
}
- SetPixelOpacity(q,ClampToQuantum(pixel.opacity));
- }
- if (((channel & IndexChannel) != 0) &&
- (image->colorspace == CMYKColorspace))
- {
- register const IndexPacket
- *restrict kernel_indexes;
-
- k=kernel;
- kernel_pixels=p;
- kernel_indexes=indexes;
- for (i=0; i < (ssize_t) width; i++)
- {
- alpha=(MagickRealType) (QuantumScale*
- GetPixelAlpha(kernel_pixels));
- pixel.index+=(*k)*alpha*(*kernel_indexes);
- k++;
- kernel_pixels++;
- kernel_indexes++;
- }
- SetPixelIndex(blur_indexes+y,ClampToQuantum(gamma*pixel.index));
+ SetPixelAlpha(blur_image,ClampToQuantum(pixel.alpha),q);
}
}
- indexes++;
- p++;
- q++;
+ p+=GetPixelChannels(blur_image);
+ q+=GetPixelChannels(blur_image);
}
if (SyncCacheViewAuthenticPixels(blur_view,exception) == MagickFalse)
status=MagickFalse;
- if (image->progress_monitor != (MagickProgressMonitor) NULL)
+ if (blur_image->progress_monitor != (MagickProgressMonitor) NULL)
{
MagickBooleanType
proceed;
@@ -1246,8 +1163,8 @@
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp critical (MagickCore_BlurImageChannel)
#endif
- proceed=SetImageProgress(image,BlurImageTag,progress++,blur_image->rows+
- blur_image->columns);
+ proceed=SetImageProgress(blur_image,BlurImageTag,progress++,
+ blur_image->rows+blur_image->columns);
if (proceed == MagickFalse)
status=MagickFalse;
}
@@ -1328,7 +1245,7 @@
MagickOffsetType
progress;
- MagickPixelPacket
+ PixelInfo
bias;
MagickRealType
@@ -1417,8 +1334,8 @@
*/
status=MagickTrue;
progress=0;
- GetMagickPixelPacket(image,&bias);
- SetMagickPixelPacketBias(image,&bias);
+ GetPixelInfo(image,&bias);
+ SetPixelInfoBias(image,&bias);
image_view=AcquireCacheView(image);
convolve_view=AcquireCacheView(convolve_image);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
@@ -1429,16 +1346,10 @@
MagickBooleanType
sync;
- register const IndexPacket
- *restrict indexes;
-
- register const PixelPacket
+ register const Quantum
*restrict p;
- register IndexPacket
- *restrict convolve_indexes;
-
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -1450,22 +1361,20 @@
(width/2L),image->columns+width,width,exception);
q=GetCacheViewAuthenticPixels(convolve_view,0,y,convolve_image->columns,1,
exception);
- if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewVirtualIndexQueue(image_view);
- convolve_indexes=GetCacheViewAuthenticIndexQueue(convolve_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
- MagickPixelPacket
+ PixelInfo
pixel;
register const double
*restrict k;
- register const PixelPacket
+ register const Quantum
*restrict kernel_pixels;
register ssize_t
@@ -1477,26 +1386,35 @@
pixel=bias;
k=normal_kernel;
kernel_pixels=p;
- if (((channel & OpacityChannel) == 0) || (image->matte == MagickFalse))
+ if (((channel & AlphaChannel) == 0) || (image->matte == MagickFalse))
{
for (v=0; v < (ssize_t) width; v++)
{
for (u=0; u < (ssize_t) width; u++)
{
- pixel.red+=(*k)*kernel_pixels[u].red;
- pixel.green+=(*k)*kernel_pixels[u].green;
- pixel.blue+=(*k)*kernel_pixels[u].blue;
+ pixel.red+=(*k)*GetPixelRed(image,kernel_pixels+u*
+ GetPixelChannels(image));
+ pixel.green+=(*k)*GetPixelGreen(image,kernel_pixels+u*
+ GetPixelChannels(image));
+ pixel.blue+=(*k)*GetPixelBlue(image,kernel_pixels+u*
+ GetPixelChannels(image));
+ if (image->colorspace == CMYKColorspace)
+ pixel.black+=(*k)*GetPixelBlack(image,kernel_pixels+u*
+ GetPixelChannels(image));
k++;
}
- kernel_pixels+=image->columns+width;
+ kernel_pixels+=(image->columns+width)*GetPixelChannels(image);
}
if ((channel & RedChannel) != 0)
- SetPixelRed(q,ClampToQuantum(pixel.red));
+ SetPixelRed(convolve_image,ClampToQuantum(pixel.red),q);
if ((channel & GreenChannel) != 0)
- SetPixelGreen(q,ClampToQuantum(pixel.green));
+ SetPixelGreen(convolve_image,ClampToQuantum(pixel.green),q);
if ((channel & BlueChannel) != 0)
- SetPixelBlue(q,ClampToQuantum(pixel.blue));
- if ((channel & OpacityChannel) != 0)
+ SetPixelBlue(convolve_image,ClampToQuantum(pixel.blue),q);
+ if (((channel & BlackChannel) != 0) &&
+ (image->colorspace == CMYKColorspace))
+ SetPixelBlack(convolve_image,ClampToQuantum(pixel.black),q);
+ if ((channel & AlphaChannel) != 0)
{
k=normal_kernel;
kernel_pixels=p;
@@ -1504,31 +1422,14 @@
{
for (u=0; u < (ssize_t) width; u++)
{
- pixel.opacity+=(*k)*kernel_pixels[u].opacity;
+ pixel.alpha+=(*k)*GetPixelAlpha(image,kernel_pixels+u*
+ GetPixelChannels(image));
k++;
}
- kernel_pixels+=image->columns+width;
+ kernel_pixels+=(image->columns+width)*
+ GetPixelChannels(image);
}
- SetPixelOpacity(q,ClampToQuantum(pixel.opacity));
- }
- if (((channel & IndexChannel) != 0) &&
- (image->colorspace == CMYKColorspace))
- {
- register const IndexPacket
- *restrict kernel_indexes;
-
- k=normal_kernel;
- kernel_indexes=indexes;
- for (v=0; v < (ssize_t) width; v++)
- {
- for (u=0; u < (ssize_t) width; u++)
- {
- pixel.index+=(*k)*GetPixelIndex(kernel_indexes+u);
- k++;
- }
- kernel_indexes+=image->columns+width;
- }
- SetPixelIndex(convolve_indexes+x,ClampToQuantum(pixel.index));
+ SetPixelAlpha(convolve_image,ClampToQuantum(pixel.alpha),q);
}
}
else
@@ -1542,67 +1443,51 @@
{
for (u=0; u < (ssize_t) width; u++)
{
- alpha=(MagickRealType) (QuantumScale*(QuantumRange-
- kernel_pixels[u].opacity));
- pixel.red+=(*k)*alpha*kernel_pixels[u].red;
- pixel.green+=(*k)*alpha*kernel_pixels[u].green;
- pixel.blue+=(*k)*alpha*kernel_pixels[u].blue;
+ alpha=(MagickRealType) (QuantumScale*GetPixelAlpha(image,
+ kernel_pixels+u*GetPixelChannels(image)));
+ pixel.red+=(*k)*alpha*GetPixelRed(image,kernel_pixels+u*
+ GetPixelChannels(image));
+ pixel.green+=(*k)*alpha*GetPixelGreen(image,kernel_pixels+u*
+ GetPixelChannels(image));
+ pixel.blue+=(*k)*alpha*GetPixelBlue(image,kernel_pixels+u*
+ GetPixelChannels(image));
+ if (image->colorspace == CMYKColorspace)
+ pixel.black+=(*k)*alpha*GetPixelBlack(image,kernel_pixels+u*
+ GetPixelChannels(image));
gamma+=(*k)*alpha;
k++;
}
- kernel_pixels+=image->columns+width;
+ kernel_pixels+=(image->columns+width)*GetPixelChannels(image);
}
gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
if ((channel & RedChannel) != 0)
- SetPixelRed(q,ClampToQuantum(gamma*pixel.red));
+ SetPixelRed(convolve_image,ClampToQuantum(gamma*pixel.red),q);
if ((channel & GreenChannel) != 0)
- SetPixelGreen(q,ClampToQuantum(gamma*pixel.green));
+ SetPixelGreen(convolve_image,ClampToQuantum(gamma*pixel.green),q);
if ((channel & BlueChannel) != 0)
- SetPixelBlue(q,ClampToQuantum(gamma*pixel.blue));
- if ((channel & OpacityChannel) != 0)
- {
- k=normal_kernel;
- kernel_pixels=p;
- for (v=0; v < (ssize_t) width; v++)
- {
- for (u=0; u < (ssize_t) width; u++)
- {
- pixel.opacity+=(*k)*GetPixelOpacity(kernel_pixels+u);
- k++;
- }
- kernel_pixels+=image->columns+width;
- }
- SetPixelOpacity(q,ClampToQuantum(pixel.opacity));
- }
- if (((channel & IndexChannel) != 0) &&
+ SetPixelBlue(convolve_image,ClampToQuantum(gamma*pixel.blue),q);
+ if (((channel & BlackChannel) != 0) &&
(image->colorspace == CMYKColorspace))
+ SetPixelBlack(convolve_image,ClampToQuantum(gamma*pixel.black),q);
+ if ((channel & AlphaChannel) != 0)
{
- register const IndexPacket
- *restrict kernel_indexes;
-
k=normal_kernel;
kernel_pixels=p;
- kernel_indexes=indexes;
for (v=0; v < (ssize_t) width; v++)
{
for (u=0; u < (ssize_t) width; u++)
{
- alpha=(MagickRealType) (QuantumScale*(QuantumRange-
- kernel_pixels[u].opacity));
- pixel.index+=(*k)*alpha*GetPixelIndex(
- kernel_indexes+u);
+ pixel.alpha+=(*k)*GetPixelAlpha(image,kernel_pixels+u);
k++;
}
- kernel_pixels+=image->columns+width;
- kernel_indexes+=image->columns+width;
+ kernel_pixels+=(image->columns+width)*
+ GetPixelChannels(image);
}
- SetPixelIndex(convolve_indexes+x,ClampToQuantum(gamma*
- pixel.index));
+ SetPixelAlpha(convolve_image,ClampToQuantum(pixel.alpha),q);
}
}
- indexes++;
- p++;
- q++;
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(convolve_image);
}
sync=SyncCacheViewAuthenticPixels(convolve_view,exception);
if (sync == MagickFalse)
@@ -1847,29 +1732,25 @@
j=(ssize_t) image->columns+2;
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const IndexPacket
- *restrict indexes;
-
- register const PixelPacket
+ register const Quantum
*restrict p;
p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetCacheViewVirtualIndexQueue(image_view);
j++;
for (x=0; x < (ssize_t) image->columns; x++)
{
switch (i)
{
- case 0: pixel[j]=GetPixelRed(p); break;
- case 1: pixel[j]=GetPixelGreen(p); break;
- case 2: pixel[j]=GetPixelBlue(p); break;
- case 3: pixel[j]=GetPixelOpacity(p); break;
- case 4: pixel[j]=GetPixelBlack(indexes+x); break;
+ case 0: pixel[j]=GetPixelRed(image,p); break;
+ case 1: pixel[j]=GetPixelGreen(image,p); break;
+ case 2: pixel[j]=GetPixelBlue(image,p); break;
+ case 3: pixel[j]=GetPixelAlpha(image,p); break;
+ case 4: pixel[j]=GetPixelBlack(image,p); break;
default: break;
}
- p++;
+ p+=GetPixelChannels(image);
j++;
}
j++;
@@ -1888,30 +1769,26 @@
MagickBooleanType
sync;
- register IndexPacket
- *restrict indexes;
-
- register PixelPacket
+ register Quantum
*restrict q;
q=GetCacheViewAuthenticPixels(despeckle_view,0,y,despeckle_image->columns,
1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
j++;
for (x=0; x < (ssize_t) image->columns; x++)
{
switch (i)
{
- case 0: SetPixelRed(q,pixel[j]); break;
- case 1: SetPixelGreen(q,pixel[j]); break;
- case 2: SetPixelBlue(q,pixel[j]); break;
- case 3: SetPixelOpacity(q,pixel[j]); break;
- case 4: SetPixelIndex(indexes+x,pixel[j]); break;
+ case 0: SetPixelRed(despeckle_image,pixel[j],q); break;
+ case 1: SetPixelGreen(despeckle_image,pixel[j],q); break;
+ case 2: SetPixelBlue(despeckle_image,pixel[j],q); break;
+ case 3: SetPixelAlpha(despeckle_image,pixel[j],q); break;
+ case 4: SetPixelBlack(despeckle_image,pixel[j],q); break;
default: break;
}
- q++;
+ q+=GetPixelChannels(despeckle_image);
j++;
}
sync=SyncCacheViewAuthenticPixels(despeckle_view,exception);
@@ -2152,7 +2029,7 @@
MagickOffsetType
progress;
- MagickPixelPacket
+ PixelInfo
bias;
ssize_t
@@ -2218,8 +2095,8 @@
*/
status=MagickTrue;
progress=0;
- GetMagickPixelPacket(image,&bias);
- SetMagickPixelPacketBias(image,&bias);
+ GetPixelInfo(image,&bias);
+ SetPixelInfoBias(image,&bias);
image_view=AcquireCacheView(image);
filter_view=AcquireCacheView(filter_image);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
@@ -2230,16 +2107,10 @@
MagickBooleanType
sync;
- register const IndexPacket
- *restrict indexes;
-
- register const PixelPacket
+ register const Quantum
*restrict p;
- register IndexPacket
- *restrict filter_indexes;
-
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -2252,22 +2123,20 @@
kernel->height,exception);
q=GetCacheViewAuthenticPixels(filter_view,0,y,filter_image->columns,1,
exception);
- if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewVirtualIndexQueue(image_view);
- filter_indexes=GetCacheViewAuthenticIndexQueue(filter_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
- MagickPixelPacket
+ PixelInfo
pixel;
register const double
*restrict k;
- register const PixelPacket
+ register const Quantum
*restrict kernel_pixels;
register ssize_t
@@ -2279,26 +2148,36 @@
pixel=bias;
k=kernel->values;
kernel_pixels=p;
- if (((channel & OpacityChannel) == 0) || (image->matte == MagickFalse))
+ if (((channel & AlphaChannel) == 0) || (image->matte == MagickFalse))
{
for (v=0; v < (ssize_t) kernel->width; v++)
{
for (u=0; u < (ssize_t) kernel->height; u++)
{
- pixel.red+=(*k)*kernel_pixels[u].red;
- pixel.green+=(*k)*kernel_pixels[u].green;
- pixel.blue+=(*k)*kernel_pixels[u].blue;
+ pixel.red+=(*k)*GetPixelRed(image,kernel_pixels+u*
+ GetPixelChannels(image));
+ pixel.green+=(*k)*GetPixelGreen(image,kernel_pixels+u*
+ GetPixelChannels(image));
+ pixel.blue+=(*k)*GetPixelBlue(image,kernel_pixels+u*
+ GetPixelChannels(image));
+ if (image->colorspace == CMYKColorspace)
+ pixel.black+=(*k)*GetPixelBlack(image,kernel_pixels+u*
+ GetPixelChannels(image));
k++;
}
- kernel_pixels+=image->columns+kernel->width;
+ kernel_pixels+=(image->columns+kernel->width)*
+ GetPixelChannels(image);
}
if ((channel & RedChannel) != 0)
- SetPixelRed(q,ClampToQuantum(pixel.red));
+ SetPixelRed(filter_image,ClampToQuantum(pixel.red),q);
if ((channel & GreenChannel) != 0)
- SetPixelGreen(q,ClampToQuantum(pixel.green));
+ SetPixelGreen(filter_image,ClampToQuantum(pixel.green),q);
if ((channel & BlueChannel) != 0)
- SetPixelBlue(q,ClampToQuantum(pixel.blue));
- if ((channel & OpacityChannel) != 0)
+ SetPixelBlue(filter_image,ClampToQuantum(pixel.blue),q);
+ if (((channel & BlackChannel) != 0) &&
+ (image->colorspace == CMYKColorspace))
+ SetPixelBlack(filter_image,ClampToQuantum(pixel.black),q);
+ if ((channel & AlphaChannel) != 0)
{
k=kernel->values;
kernel_pixels=p;
@@ -2306,31 +2185,14 @@
{
for (u=0; u < (ssize_t) kernel->height; u++)
{
- pixel.opacity+=(*k)*kernel_pixels[u].opacity;
+ pixel.alpha+=(*k)*GetPixelRed(image,kernel_pixels+u*
+ GetPixelChannels(image));
k++;
}
- kernel_pixels+=image->columns+kernel->width;
+ kernel_pixels+=(image->columns+kernel->width)*
+ GetPixelChannels(image);
}
- SetPixelOpacity(q,ClampToQuantum(pixel.opacity));
- }
- if (((channel & IndexChannel) != 0) &&
- (image->colorspace == CMYKColorspace))
- {
- register const IndexPacket
- *restrict kernel_indexes;
-
- k=kernel->values;
- kernel_indexes=indexes;
- for (v=0; v < (ssize_t) kernel->width; v++)
- {
- for (u=0; u < (ssize_t) kernel->height; u++)
- {
- pixel.index+=(*k)*GetPixelIndex(kernel_indexes+u);
- k++;
- }
- kernel_indexes+=image->columns+kernel->width;
- }
- SetPixelIndex(filter_indexes+x,ClampToQuantum(pixel.index));
+ SetPixelAlpha(filter_image,ClampToQuantum(pixel.alpha),q);
}
}
else
@@ -2344,65 +2206,53 @@
{
for (u=0; u < (ssize_t) kernel->height; u++)
{
- alpha=(MagickRealType) (QuantumScale*(QuantumRange-
- GetPixelOpacity(kernel_pixels+u)));
- pixel.red+=(*k)*alpha*GetPixelRed(kernel_pixels+u);
- pixel.green+=(*k)*alpha*GetPixelGreen(kernel_pixels+u);
- pixel.blue+=(*k)*alpha*GetPixelBlue(kernel_pixels+u);
+ alpha=(MagickRealType) (QuantumScale*GetPixelAlpha(image,
+ kernel_pixels+u*GetPixelChannels(image)));
+ pixel.red+=(*k)*alpha*GetPixelRed(image,kernel_pixels+u*
+ GetPixelChannels(image));
+ pixel.green+=(*k)*alpha*GetPixelGreen(image,kernel_pixels+u*
+ GetPixelChannels(image));
+ pixel.blue+=(*k)*alpha*GetPixelBlue(image,kernel_pixels+u*
+ GetPixelChannels(image));
+ if (image->colorspace == CMYKColorspace)
+ pixel.black+=(*k)*alpha*GetPixelBlack(image,kernel_pixels+u*
+ GetPixelChannels(image));
gamma+=(*k)*alpha;
k++;
}
- kernel_pixels+=image->columns+kernel->width;
+ kernel_pixels+=(image->columns+kernel->width);
+ GetPixelChannels(image);
}
gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
if ((channel & RedChannel) != 0)
- SetPixelRed(q,ClampToQuantum(gamma*pixel.red));
+ SetPixelRed(filter_image,ClampToQuantum(gamma*pixel.red),q);
if ((channel & GreenChannel) != 0)
- SetPixelGreen(q,ClampToQuantum(gamma*pixel.green));
+ SetPixelGreen(filter_image,ClampToQuantum(gamma*pixel.green),q);
if ((channel & BlueChannel) != 0)
- SetPixelBlue(q,ClampToQuantum(gamma*pixel.blue));
- if ((channel & OpacityChannel) != 0)
- {
- k=kernel->values;
- kernel_pixels=p;
- for (v=0; v < (ssize_t) kernel->width; v++)
- {
- for (u=0; u < (ssize_t) kernel->height; u++)
- {
- pixel.opacity+=(*k)*GetPixelOpacity(kernel_pixels+u);
- k++;
- }
- kernel_pixels+=image->columns+kernel->width;
- }
- SetPixelOpacity(q,ClampToQuantum(pixel.opacity));
- }
- if (((channel & IndexChannel) != 0) &&
+ SetPixelBlue(filter_image,ClampToQuantum(gamma*pixel.blue),q);
+ if (((channel & BlackChannel) != 0) &&
(image->colorspace == CMYKColorspace))
+ SetPixelBlack(filter_image,ClampToQuantum(gamma*pixel.black),q);
+ if ((channel & AlphaChannel) != 0)
{
- register const IndexPacket
- *restrict kernel_indexes;
-
k=kernel->values;
kernel_pixels=p;
- kernel_indexes=indexes;
for (v=0; v < (ssize_t) kernel->width; v++)
{
for (u=0; u < (ssize_t) kernel->height; u++)
{
- alpha=(MagickRealType) (QuantumScale*(QuantumRange-
- kernel_pixels[u].opacity));
- pixel.index+=(*k)*alpha*GetPixelIndex(kernel_indexes+u);
+ pixel.alpha+=(*k)*GetPixelAlpha(image,kernel_pixels+u*
+ GetPixelChannels(image));
k++;
}
- kernel_pixels+=image->columns+kernel->width;
- kernel_indexes+=image->columns+kernel->width;
+ kernel_pixels+=(image->columns+kernel->width)*
+ GetPixelChannels(image);
}
- SetPixelIndex(filter_indexes+x,ClampToQuantum(gamma*pixel.index));
+ SetPixelAlpha(filter_image,ClampToQuantum(pixel.alpha),q);
}
}
- indexes++;
- p++;
- q++;
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(filter_image);
}
sync=SyncCacheViewAuthenticPixels(filter_view,exception);
if (sync == MagickFalse)
@@ -2626,7 +2476,7 @@
MagickOffsetType
progress;
- MagickPixelPacket
+ PixelInfo
bias;
OffsetInfo
@@ -2686,7 +2536,7 @@
*/
status=MagickTrue;
progress=0;
- GetMagickPixelPacket(image,&bias);
+ GetPixelInfo(image,&bias);
image_view=AcquireCacheView(image);
blur_view=AcquireCacheView(blur_image);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
@@ -2694,10 +2544,7 @@
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- register IndexPacket
- *restrict blur_indexes;
-
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -2707,23 +2554,19 @@
continue;
q=GetCacheViewAuthenticPixels(blur_view,0,y,blur_image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- blur_indexes=GetCacheViewAuthenticIndexQueue(blur_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
- MagickPixelPacket
+ PixelInfo
qixel;
PixelPacket
pixel;
- register const IndexPacket
- *restrict indexes;
-
register double
*restrict k;
@@ -2732,7 +2575,7 @@
k=kernel;
qixel=bias;
- if (((channel & OpacityChannel) == 0) || (image->matte == MagickFalse))
+ if (((channel & AlphaChannel) == 0) || (image->matte == MagickFalse))
{
for (i=0; i < (ssize_t) width; i++)
{
@@ -2741,25 +2584,27 @@
qixel.red+=(*k)*pixel.red;
qixel.green+=(*k)*pixel.green;
qixel.blue+=(*k)*pixel.blue;
- qixel.opacity+=(*k)*pixel.opacity;
+ qixel.alpha+=(*k)*pixel.alpha;
if (image->colorspace == CMYKColorspace)
- {
- indexes=GetCacheViewVirtualIndexQueue(image_view);
- qixel.index+=(*k)*(*indexes);
- }
+ qixel.black+=(*k)*pixel.black;
k++;
}
if ((channel & RedChannel) != 0)
- SetPixelRed(q,ClampToQuantum(qixel.red));
+ SetPixelRed(blur_image,
+ ClampToQuantum(qixel.red),q);
if ((channel & GreenChannel) != 0)
- SetPixelGreen(q,ClampToQuantum(qixel.green));
+ SetPixelGreen(blur_image,
+ ClampToQuantum(qixel.green),q);
if ((channel & BlueChannel) != 0)
- SetPixelBlue(q,ClampToQuantum(qixel.blue));
- if ((channel & OpacityChannel) != 0)
- SetPixelOpacity(q,ClampToQuantum(qixel.opacity));
- if (((channel & IndexChannel) != 0) &&
+ SetPixelBlue(blur_image,
+ ClampToQuantum(qixel.blue),q);
+ if (((channel & BlackChannel) != 0) &&
(image->colorspace == CMYKColorspace))
- SetPixelIndex(blur_indexes+x,ClampToQuantum(qixel.index));
+ SetPixelBlack(blur_image,
+ ClampToQuantum(qixel.black),q);
+ if ((channel & AlphaChannel) != 0)
+ SetPixelAlpha(blur_image,
+ ClampToQuantum(qixel.alpha),q);
}
else
{
@@ -2773,33 +2618,35 @@
{
(void) GetOneCacheViewVirtualPixel(image_view,x+offset[i].x,y+
offset[i].y,&pixel,exception);
- alpha=(MagickRealType) (QuantumScale*GetPixelAlpha(&pixel));
+ alpha=(MagickRealType) (QuantumScale*pixel.alpha);
qixel.red+=(*k)*alpha*pixel.red;
qixel.green+=(*k)*alpha*pixel.green;
qixel.blue+=(*k)*alpha*pixel.blue;
- qixel.opacity+=(*k)*pixel.opacity;
+ qixel.alpha+=(*k)*pixel.alpha;
if (image->colorspace == CMYKColorspace)
- {
- indexes=GetCacheViewVirtualIndexQueue(image_view);
- qixel.index+=(*k)*alpha*GetPixelIndex(indexes);
- }
+ qixel.black+=(*k)*alpha*pixel.black;
gamma+=(*k)*alpha;
k++;
}
gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
if ((channel & RedChannel) != 0)
- SetPixelRed(q,ClampToQuantum(gamma*qixel.red));
+ SetPixelRed(blur_image,
+ ClampToQuantum(gamma*qixel.red),q);
if ((channel & GreenChannel) != 0)
- SetPixelGreen(q,ClampToQuantum(gamma*qixel.green));
+ SetPixelGreen(blur_image,
+ ClampToQuantum(gamma*qixel.green),q);
if ((channel & BlueChannel) != 0)
- SetPixelBlue(q,ClampToQuantum(gamma*qixel.blue));
- if ((channel & OpacityChannel) != 0)
- SetPixelOpacity(q,ClampToQuantum(qixel.opacity));
- if (((channel & IndexChannel) != 0) &&
+ SetPixelBlue(blur_image,
+ ClampToQuantum(gamma*qixel.blue),q);
+ if (((channel & BlackChannel) != 0) &&
(image->colorspace == CMYKColorspace))
- SetPixelIndex(blur_indexes+x,ClampToQuantum(gamma*qixel.index));
+ SetPixelBlack(blur_image,
+ ClampToQuantum(gamma*qixel.black),q);
+ if ((channel & AlphaChannel) != 0)
+ SetPixelAlpha(blur_image,
+ ClampToQuantum(qixel.alpha),q);
}
- q++;
+ q+=GetPixelChannels(blur_image);
}
if (SyncCacheViewAuthenticPixels(blur_view,exception) == MagickFalse)
status=MagickFalse;
@@ -3407,7 +3254,7 @@
MagickOffsetType
progress;
- MagickPixelPacket
+ PixelInfo
bias;
MagickRealType
@@ -3473,7 +3320,7 @@
*/
status=MagickTrue;
progress=0;
- GetMagickPixelPacket(image,&bias);
+ GetPixelInfo(image,&bias);
image_view=AcquireCacheView(image);
blur_view=AcquireCacheView(blur_image);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
@@ -3481,13 +3328,7 @@
#endif
for (y=0; y < (ssize_t) blur_image->rows; y++)
{
- register const IndexPacket
- *restrict indexes;
-
- register IndexPacket
- *restrict blur_indexes;
-
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -3497,15 +3338,14 @@
continue;
q=GetCacheViewAuthenticPixels(blur_view,0,y,blur_image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- blur_indexes=GetCacheViewAuthenticIndexQueue(blur_view);
for (x=0; x < (ssize_t) blur_image->columns; x++)
{
- MagickPixelPacket
+ PixelInfo
qixel;
MagickRealType
@@ -3540,7 +3380,7 @@
}
normalize=0.0;
qixel=bias;
- if (((channel & OpacityChannel) == 0) || (image->matte == MagickFalse))
+ if (((channel & AlphaChannel) == 0) || (image->matte == MagickFalse))
{
for (i=0; i < (ssize_t) n; i+=(ssize_t) step)
{
@@ -3551,27 +3391,29 @@
qixel.red+=pixel.red;
qixel.green+=pixel.green;
qixel.blue+=pixel.blue;
- qixel.opacity+=pixel.opacity;
if (image->colorspace == CMYKColorspace)
- {
- indexes=GetCacheViewVirtualIndexQueue(image_view);
- qixel.index+=(*indexes);
- }
+ qixel.black+=pixel.black;
+ qixel.alpha+=pixel.alpha;
normalize+=1.0;
}
normalize=1.0/(fabs((double) normalize) <= MagickEpsilon ? 1.0 :
normalize);
if ((channel & RedChannel) != 0)
- SetPixelRed(q,ClampToQuantum(normalize*qixel.red));
+ SetPixelRed(blur_image,
+ ClampToQuantum(normalize*qixel.red),q);
if ((channel & GreenChannel) != 0)
- SetPixelGreen(q,ClampToQuantum(normalize*qixel.green));
+ SetPixelGreen(blur_image,
+ ClampToQuantum(normalize*qixel.green),q);
if ((channel & BlueChannel) != 0)
- SetPixelBlue(q,ClampToQuantum(normalize*qixel.blue));
- if ((channel & OpacityChannel) != 0)
- SetPixelOpacity(q,ClampToQuantum(normalize*qixel.opacity));
- if (((channel & IndexChannel) != 0) &&
+ SetPixelBlue(blur_image,
+ ClampToQuantum(normalize*qixel.blue),q);
+ if (((channel & BlackChannel) != 0) &&
(image->colorspace == CMYKColorspace))
- SetPixelIndex(blur_indexes+x,ClampToQuantum(normalize*qixel.index));
+ SetPixelBlack(blur_image,
+ ClampToQuantum(normalize*qixel.black),q);
+ if ((channel & AlphaChannel) != 0)
+ SetPixelAlpha(blur_image,
+ ClampToQuantum(normalize*qixel.alpha),q);
}
else
{
@@ -3587,17 +3429,13 @@
(blur_center.x+center.x*cos_theta[i]-center.y*sin_theta[i]+0.5),
(ssize_t) (blur_center.y+center.x*sin_theta[i]+center.y*
cos_theta[i]+0.5),&pixel,exception);
- alpha=(MagickRealType) (QuantumScale*
- GetPixelAlpha(&pixel));
+ alpha=(MagickRealType) (QuantumScale*pixel.alpha);
qixel.red+=alpha*pixel.red;
qixel.green+=alpha*pixel.green;
qixel.blue+=alpha*pixel.blue;
- qixel.opacity+=pixel.opacity;
+ qixel.alpha+=pixel.alpha;
if (image->colorspace == CMYKColorspace)
- {
- indexes=GetCacheViewVirtualIndexQueue(image_view);
- qixel.index+=alpha*(*indexes);
- }
+ qixel.black+=alpha*pixel.black;
gamma+=alpha;
normalize+=1.0;
}
@@ -3605,18 +3443,23 @@
normalize=1.0/(fabs((double) normalize) <= MagickEpsilon ? 1.0 :
normalize);
if ((channel & RedChannel) != 0)
- SetPixelRed(q,ClampToQuantum(gamma*qixel.red));
+ SetPixelRed(blur_image,
+ ClampToQuantum(gamma*qixel.red),q);
if ((channel & GreenChannel) != 0)
- SetPixelGreen(q,ClampToQuantum(gamma*qixel.green));
+ SetPixelGreen(blur_image,
+ ClampToQuantum(gamma*qixel.green),q);
if ((channel & BlueChannel) != 0)
- SetPixelBlue(q,ClampToQuantum(gamma*qixel.blue));
- if ((channel & OpacityChannel) != 0)
- SetPixelOpacity(q,ClampToQuantum(normalize*qixel.opacity));
- if (((channel & IndexChannel) != 0) &&
+ SetPixelBlue(blur_image,
+ ClampToQuantum(gamma*qixel.blue),q);
+ if (((channel & BlackChannel) != 0) &&
(image->colorspace == CMYKColorspace))
- SetPixelIndex(blur_indexes+x,ClampToQuantum(gamma*qixel.index));
+ SetPixelBlack(blur_image,
+ ClampToQuantum(gamma*qixel.black),q);
+ if ((channel & AlphaChannel) != 0)
+ SetPixelAlpha(blur_image,
+ ClampToQuantum(normalize*qixel.alpha),q);
}
- q++;
+ q+=GetPixelChannels(blur_image);
}
if (SyncCacheViewAuthenticPixels(blur_view,exception) == MagickFalse)
status=MagickFalse;
@@ -3683,14 +3526,6 @@
%
*/
-static inline MagickBooleanType SelectiveContrast(const PixelPacket *p,
- const PixelPacket *q,const double threshold)
-{
- if (fabs(PixelIntensity(p)-PixelIntensity(q)) < threshold)
- return(MagickTrue);
- return(MagickFalse);
-}
-
MagickExport Image *SelectiveBlurImage(const Image *image,const double radius,
const double sigma,const double threshold,ExceptionInfo *exception)
{
@@ -3724,7 +3559,7 @@
MagickOffsetType
progress;
- MagickPixelPacket
+ PixelInfo
bias;
register ssize_t
@@ -3806,8 +3641,8 @@
*/
status=MagickTrue;
progress=0;
- GetMagickPixelPacket(image,&bias);
- SetMagickPixelPacketBias(image,&bias);
+ GetPixelInfo(image,&bias);
+ SetPixelInfoBias(image,&bias);
image_view=AcquireCacheView(image);
blur_view=AcquireCacheView(blur_image);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
@@ -3815,22 +3650,19 @@
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
+ double
+ contrast;
+
MagickBooleanType
sync;
MagickRealType
gamma;
- register const IndexPacket
- *restrict indexes;
-
- register const PixelPacket
+ register const Quantum
*restrict p;
- register IndexPacket
- *restrict blur_indexes;
-
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -3842,16 +3674,14 @@
(width/2L),image->columns+width,width,exception);
q=GetCacheViewAuthenticPixels(blur_view,0,y,blur_image->columns,1,
exception);
- if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewVirtualIndexQueue(image_view);
- blur_indexes=GetCacheViewAuthenticIndexQueue(blur_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
- MagickPixelPacket
+ PixelInfo
pixel;
register const double
@@ -3868,17 +3698,25 @@
k=kernel;
gamma=0.0;
j=0;
- if (((channel & OpacityChannel) == 0) || (image->matte == MagickFalse))
+ if (((channel & AlphaChannel) == 0) || (image->matte == MagickFalse))
{
for (v=0; v < (ssize_t) width; v++)
{
for (u=0; u < (ssize_t) width; u++)
{
- if (SelectiveContrast(p+u+j,q,threshold) != MagickFalse)
+ contrast=GetPixelIntensity(image,p+(u+j)*GetPixelChannels(image))-
+ (double) GetPixelIntensity(blur_image,q);
+ if (fabs(contrast) < threshold)
{
- pixel.red+=(*k)*GetPixelRed(p+u+j);
- pixel.green+=(*k)*GetPixelGreen(p+u+j);
- pixel.blue+=(*k)*GetPixelBlue(p+u+j);
+ pixel.red+=(*k)*
+ GetPixelRed(image,p+(u+j)*GetPixelChannels(image));
+ pixel.green+=(*k)*
+ GetPixelGreen(image,p+(u+j)*GetPixelChannels(image));
+ pixel.blue+=(*k)*
+ GetPixelBlue(image,p+(u+j)*GetPixelChannels(image));
+ if (image->colorspace == CMYKColorspace)
+ pixel.black+=(*k)*
+ GetPixelBlack(image,p+(u+j)*GetPixelChannels(image));
gamma+=(*k);
k++;
}
@@ -3889,13 +3727,16 @@
{
gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
if ((channel & RedChannel) != 0)
- SetPixelRed(q,ClampToQuantum(gamma*pixel.red));
+ SetPixelRed(blur_image,ClampToQuantum(gamma*pixel.red),q);
if ((channel & GreenChannel) != 0)
- SetPixelGreen(q,ClampToQuantum(gamma*pixel.green));
+ SetPixelGreen(blur_image,ClampToQuantum(gamma*pixel.green),q);
if ((channel & BlueChannel) != 0)
- SetPixelBlue(q,ClampToQuantum(gamma*pixel.blue));
+ SetPixelBlue(blur_image,ClampToQuantum(gamma*pixel.blue),q);
+ if (((channel & BlackChannel) != 0) &&
+ (image->colorspace == CMYKColorspace))
+ SetPixelBlack(blur_image,ClampToQuantum(gamma*pixel.black),q);
}
- if ((channel & OpacityChannel) != 0)
+ if ((channel & AlphaChannel) != 0)
{
gamma=0.0;
j=0;
@@ -3903,9 +3744,13 @@
{
for (u=0; u < (ssize_t) width; u++)
{
- if (SelectiveContrast(p+u+j,q,threshold) != MagickFalse)
+ contrast=GetPixelIntensity(image,p+(u+j)*
+ GetPixelChannels(image))-(double)
+ GetPixelIntensity(blur_image,q);
+ if (fabs(contrast) < threshold)
{
- pixel.opacity+=(*k)*(p+u+j)->opacity;
+ pixel.alpha+=(*k)*
+ GetPixelAlpha(image,p+(u+j)*GetPixelChannels(image));
gamma+=(*k);
k++;
}
@@ -3916,33 +3761,7 @@
{
gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 :
gamma);
- SetPixelOpacity(q,ClampToQuantum(gamma*pixel.opacity));
- }
- }
- if (((channel & IndexChannel) != 0) &&
- (image->colorspace == CMYKColorspace))
- {
- gamma=0.0;
- j=0;
- for (v=0; v < (ssize_t) width; v++)
- {
- for (u=0; u < (ssize_t) width; u++)
- {
- if (SelectiveContrast(p+u+j,q,threshold) != MagickFalse)
- {
- pixel.index+=(*k)*GetPixelIndex(indexes+x+u+j);
- gamma+=(*k);
- k++;
- }
- }
- j+=(ssize_t) (image->columns+width);
- }
- if (gamma != 0.0)
- {
- gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 :
- gamma);
- SetPixelIndex(blur_indexes+x,ClampToQuantum(gamma*
- pixel.index));
+ SetPixelAlpha(blur_image,ClampToQuantum(gamma*pixel.alpha),q);
}
}
}
@@ -3955,13 +3774,24 @@
{
for (u=0; u < (ssize_t) width; u++)
{
- if (SelectiveContrast(p+u+j,q,threshold) != MagickFalse)
+ contrast=GetPixelIntensity(image,p+(u+j)*
+ GetPixelChannels(image))-(double)
+ GetPixelIntensity(blur_image,q);
+ if (fabs(contrast) < threshold)
{
- alpha=(MagickRealType) (QuantumScale*GetPixelAlpha(p+u+j));
- pixel.red+=(*k)*alpha*GetPixelRed(p+u+j);
- pixel.green+=(*k)*alpha*GetPixelGreen(p+u+j);
- pixel.blue+=(*k)*alpha*GetPixelBlue(p+u+j);
- pixel.opacity+=(*k)*GetPixelOpacity(p+u+j);
+ alpha=(MagickRealType) (QuantumScale*
+ GetPixelAlpha(image,p+(u+j)*GetPixelChannels(image)));
+ pixel.red+=(*k)*alpha*
+ GetPixelRed(image,p+(u+j)*GetPixelChannels(image));
+ pixel.green+=(*k)*alpha*GetPixelGreen(image,p+(u+j)*
+ GetPixelChannels(image));
+ pixel.blue+=(*k)*alpha*GetPixelBlue(image,p+(u+j)*
+ GetPixelChannels(image));
+ pixel.alpha+=(*k)*GetPixelAlpha(image,p+(u+j)*
+ GetPixelChannels(image));
+ if (image->colorspace == CMYKColorspace)
+ pixel.black+=(*k)*GetPixelBlack(image,p+(u+j)*
+ GetPixelChannels(image));
gamma+=(*k)*alpha;
k++;
}
@@ -3972,13 +3802,16 @@
{
gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
if ((channel & RedChannel) != 0)
- SetPixelRed(q,ClampToQuantum(gamma*pixel.red));
+ SetPixelRed(blur_image,ClampToQuantum(gamma*pixel.red),q);
if ((channel & GreenChannel) != 0)
- SetPixelGreen(q,ClampToQuantum(gamma*pixel.green));
+ SetPixelGreen(blur_image,ClampToQuantum(gamma*pixel.green),q);
if ((channel & BlueChannel) != 0)
- SetPixelBlue(q,ClampToQuantum(gamma*pixel.blue));
+ SetPixelBlue(blur_image,ClampToQuantum(gamma*pixel.blue),q);
+ if (((channel & BlackChannel) != 0) &&
+ (image->colorspace == CMYKColorspace))
+ SetPixelBlack(blur_image,ClampToQuantum(gamma*pixel.black),q);
}
- if ((channel & OpacityChannel) != 0)
+ if ((channel & AlphaChannel) != 0)
{
gamma=0.0;
j=0;
@@ -3986,9 +3819,13 @@
{
for (u=0; u < (ssize_t) width; u++)
{
- if (SelectiveContrast(p+u+j,q,threshold) != MagickFalse)
+ contrast=GetPixelIntensity(image,p+(u+j)*
+ GetPixelChannels(image))-(double)
+ GetPixelIntensity(blur_image,q);
+ if (fabs(contrast) < threshold)
{
- pixel.opacity+=(*k)*GetPixelOpacity(p+u+j);
+ pixel.alpha+=(*k)*
+ GetPixelAlpha(image,p+(u+j)*GetPixelChannels(image));
gamma+=(*k);
k++;
}
@@ -3999,40 +3836,12 @@
{
gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 :
gamma);
- SetPixelOpacity(q,ClampToQuantum(pixel.opacity));
- }
- }
- if (((channel & IndexChannel) != 0) &&
- (image->colorspace == CMYKColorspace))
- {
- gamma=0.0;
- j=0;
- for (v=0; v < (ssize_t) width; v++)
- {
- for (u=0; u < (ssize_t) width; u++)
- {
- if (SelectiveContrast(p+u+j,q,threshold) != MagickFalse)
- {
- alpha=(MagickRealType) (QuantumScale*
- GetPixelAlpha(p+u+j));
- pixel.index+=(*k)*alpha*GetPixelIndex(indexes+x+u+j);
- gamma+=(*k);
- k++;
- }
- }
- j+=(ssize_t) (image->columns+width);
- }
- if (gamma != 0.0)
- {
- gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 :
- gamma);
- SetPixelIndex(blur_indexes+x,ClampToQuantum(gamma*
- pixel.index));
+ SetPixelAlpha(blur_image,ClampToQuantum(pixel.alpha),q);
}
}
}
- p++;
- q++;
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(blur_image);
}
sync=SyncCacheViewAuthenticPixels(blur_view,exception);
if (sync == MagickFalse)
@@ -4162,13 +3971,13 @@
PrimaryInfo
normal;
- register const PixelPacket
+ register const Quantum
*restrict p,
*restrict s0,
*restrict s1,
*restrict s2;
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -4179,7 +3988,7 @@
p=GetCacheViewVirtualPixels(image_view,-1,y-1,image->columns+2,3,exception);
q=QueueCacheViewAuthenticPixels(shade_view,0,y,shade_image->columns,1,
exception);
- if ((p == (PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
{
status=MagickFalse;
continue;
@@ -4188,20 +3997,26 @@
Shade this row of pixels.
*/
normal.z=2.0*(double) QuantumRange; /* constant Z of surface normal */
- s0=p+1;
- s1=s0+image->columns+2;
- s2=s1+image->columns+2;
+ s0=p+GetPixelChannels(image);
+ s1=s0+(image->columns+2)*GetPixelChannels(image);
+ s2=s1+(image->columns+2)*GetPixelChannels(image);
for (x=0; x < (ssize_t) image->columns; x++)
{
/*
Determine the surface normal and compute shading.
*/
- normal.x=(double) (PixelIntensity(s0-1)+PixelIntensity(s1-1)+
- PixelIntensity(s2-1)-PixelIntensity(s0+1)-PixelIntensity(s1+1)-
- PixelIntensity(s2+1));
- normal.y=(double) (PixelIntensity(s2-1)+PixelIntensity(s2)+
- PixelIntensity(s2+1)-PixelIntensity(s0-1)-PixelIntensity(s0)-
- PixelIntensity(s0+1));
+ normal.x=(double) (GetPixelIntensity(image,s0-GetPixelChannels(image))+
+ GetPixelIntensity(image,s1-GetPixelChannels(image))+
+ GetPixelIntensity(image,s2-GetPixelChannels(image))-
+ GetPixelIntensity(image,s0+GetPixelChannels(image))-
+ GetPixelIntensity(image,s1+GetPixelChannels(image))-
+ GetPixelIntensity(image,s2+GetPixelChannels(image)));
+ normal.y=(double) (GetPixelIntensity(image,s2-GetPixelChannels(image))+
+ GetPixelIntensity(image,s2)+
+ GetPixelIntensity(image,s2+GetPixelChannels(image))-
+ GetPixelIntensity(image,s0-GetPixelChannels(image))-
+ GetPixelIntensity(image,s0)-
+ GetPixelIntensity(image,s0+GetPixelChannels(image)));
if ((normal.x == 0.0) && (normal.y == 0.0))
shade=light.z;
else
@@ -4218,21 +4033,24 @@
}
if (gray != MagickFalse)
{
- SetPixelRed(q,shade);
- SetPixelGreen(q,shade);
- SetPixelBlue(q,shade);
+ SetPixelRed(shade_image,ClampToQuantum(shade),q);
+ SetPixelGreen(shade_image,ClampToQuantum(shade),q);
+ SetPixelBlue(shade_image,ClampToQuantum(shade),q);
}
else
{
- SetPixelRed(q,ClampToQuantum(QuantumScale*shade*GetPixelRed(s1)));
- SetPixelGreen(q,ClampToQuantum(QuantumScale*shade*GetPixelGreen(s1)));
- SetPixelBlue(q,ClampToQuantum(QuantumScale*shade*GetPixelBlue(s1)));
+ SetPixelRed(shade_image,ClampToQuantum(QuantumScale*shade*
+ GetPixelRed(image,s1)),q);
+ SetPixelGreen(shade_image,ClampToQuantum(QuantumScale*shade*
+ GetPixelGreen(image,s1)),q);
+ SetPixelBlue(shade_image,ClampToQuantum(QuantumScale*shade*
+ GetPixelBlue(image,s1)),q);
}
- q->opacity=s1->opacity;
- s0++;
- s1++;
- s2++;
- q++;
+ SetPixelAlpha(shade_image,GetPixelAlpha(image,s1),q);
+ s0+=GetPixelChannels(image);
+ s1+=GetPixelChannels(image);
+ s2+=GetPixelChannels(image);
+ q+=GetPixelChannels(shade_image);
}
if (SyncCacheViewAuthenticPixels(shade_view,exception) == MagickFalse)
status=MagickFalse;
@@ -4406,7 +4224,7 @@
MagickOffsetType
progress;
- MagickPixelPacket
+ PixelInfo
bias;
RandomInfo
@@ -4442,7 +4260,7 @@
*/
status=MagickTrue;
progress=0;
- GetMagickPixelPacket(spread_image,&bias);
+ GetPixelInfo(spread_image,&bias);
width=GetOptimalKernelWidth1D(radius,0.5);
random_info=AcquireRandomInfoThreadSet();
image_view=AcquireCacheView(image);
@@ -4455,13 +4273,10 @@
const int
id = GetOpenMPThreadId();
- MagickPixelPacket
+ PixelInfo
pixel;
- register IndexPacket
- *restrict indexes;
-
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -4471,21 +4286,20 @@
continue;
q=QueueCacheViewAuthenticPixels(spread_view,0,y,spread_image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewAuthenticIndexQueue(spread_view);
pixel=bias;
for (x=0; x < (ssize_t) spread_image->columns; x++)
{
- (void) InterpolateMagickPixelPacket(image,image_view,
+ (void) InterpolatePixelInfo(image,image_view,
UndefinedInterpolatePixel,(double) x+width*(GetPseudoRandomValue(
random_info[id])-0.5),(double) y+width*(GetPseudoRandomValue(
random_info[id])-0.5),&pixel,exception);
- SetPixelPacket(spread_image,&pixel,q,indexes+x);
- q++;
+ SetPixelPixelInfo(spread_image,&pixel,q);
+ q+=GetPixelChannels(spread_image);
}
if (SyncCacheViewAuthenticPixels(spread_view,exception) == MagickFalse)
status=MagickFalse;
@@ -4717,9 +4531,9 @@
} while (level-- > 0);
}
-static MagickPixelPacket GetMaximumPixelList(PixelList *pixel_list)
+static PixelInfo GetMaximumPixelList(PixelList *pixel_list)
{
- MagickPixelPacket
+ PixelInfo
pixel;
register SkipList
@@ -4756,18 +4570,18 @@
} while (count < (ssize_t) pixel_list->length);
channels[channel]=(unsigned short) maximum;
}
- GetMagickPixelPacket((const Image *) NULL,&pixel);
+ GetPixelInfo((const Image *) NULL,&pixel);
pixel.red=(MagickRealType) ScaleShortToQuantum(channels[0]);
pixel.green=(MagickRealType) ScaleShortToQuantum(channels[1]);
pixel.blue=(MagickRealType) ScaleShortToQuantum(channels[2]);
- pixel.opacity=(MagickRealType) ScaleShortToQuantum(channels[3]);
- pixel.index=(MagickRealType) ScaleShortToQuantum(channels[4]);
+ pixel.alpha=(MagickRealType) ScaleShortToQuantum(channels[3]);
+ pixel.black=(MagickRealType) ScaleShortToQuantum(channels[4]);
return(pixel);
}
-static MagickPixelPacket GetMeanPixelList(PixelList *pixel_list)
+static PixelInfo GetMeanPixelList(PixelList *pixel_list)
{
- MagickPixelPacket
+ PixelInfo
pixel;
MagickRealType
@@ -4806,18 +4620,18 @@
sum/=pixel_list->length;
channels[channel]=(unsigned short) sum;
}
- GetMagickPixelPacket((const Image *) NULL,&pixel);
+ GetPixelInfo((const Image *) NULL,&pixel);
pixel.red=(MagickRealType) ScaleShortToQuantum(channels[0]);
pixel.green=(MagickRealType) ScaleShortToQuantum(channels[1]);
pixel.blue=(MagickRealType) ScaleShortToQuantum(channels[2]);
- pixel.opacity=(MagickRealType) ScaleShortToQuantum(channels[3]);
- pixel.index=(MagickRealType) ScaleShortToQuantum(channels[4]);
+ pixel.black=(MagickRealType) ScaleShortToQuantum(channels[4]);
+ pixel.alpha=(MagickRealType) ScaleShortToQuantum(channels[3]);
return(pixel);
}
-static MagickPixelPacket GetMedianPixelList(PixelList *pixel_list)
+static PixelInfo GetMedianPixelList(PixelList *pixel_list)
{
- MagickPixelPacket
+ PixelInfo
pixel;
register SkipList
@@ -4850,18 +4664,18 @@
} while (count <= (ssize_t) (pixel_list->length >> 1));
channels[channel]=(unsigned short) color;
}
- GetMagickPixelPacket((const Image *) NULL,&pixel);
+ GetPixelInfo((const Image *) NULL,&pixel);
pixel.red=(MagickRealType) ScaleShortToQuantum(channels[0]);
pixel.green=(MagickRealType) ScaleShortToQuantum(channels[1]);
pixel.blue=(MagickRealType) ScaleShortToQuantum(channels[2]);
- pixel.opacity=(MagickRealType) ScaleShortToQuantum(channels[3]);
- pixel.index=(MagickRealType) ScaleShortToQuantum(channels[4]);
+ pixel.black=(MagickRealType) ScaleShortToQuantum(channels[4]);
+ pixel.alpha=(MagickRealType) ScaleShortToQuantum(channels[3]);
return(pixel);
}
-static MagickPixelPacket GetMinimumPixelList(PixelList *pixel_list)
+static PixelInfo GetMinimumPixelList(PixelList *pixel_list)
{
- MagickPixelPacket
+ PixelInfo
pixel;
register SkipList
@@ -4898,18 +4712,18 @@
} while (count < (ssize_t) pixel_list->length);
channels[channel]=(unsigned short) minimum;
}
- GetMagickPixelPacket((const Image *) NULL,&pixel);
+ GetPixelInfo((const Image *) NULL,&pixel);
pixel.red=(MagickRealType) ScaleShortToQuantum(channels[0]);
pixel.green=(MagickRealType) ScaleShortToQuantum(channels[1]);
pixel.blue=(MagickRealType) ScaleShortToQuantum(channels[2]);
- pixel.opacity=(MagickRealType) ScaleShortToQuantum(channels[3]);
- pixel.index=(MagickRealType) ScaleShortToQuantum(channels[4]);
+ pixel.black=(MagickRealType) ScaleShortToQuantum(channels[4]);
+ pixel.alpha=(MagickRealType) ScaleShortToQuantum(channels[3]);
return(pixel);
}
-static MagickPixelPacket GetModePixelList(PixelList *pixel_list)
+static PixelInfo GetModePixelList(PixelList *pixel_list)
{
- MagickPixelPacket
+ PixelInfo
pixel;
register SkipList
@@ -4951,18 +4765,18 @@
} while (count < (ssize_t) pixel_list->length);
channels[channel]=(unsigned short) mode;
}
- GetMagickPixelPacket((const Image *) NULL,&pixel);
+ GetPixelInfo((const Image *) NULL,&pixel);
pixel.red=(MagickRealType) ScaleShortToQuantum(channels[0]);
pixel.green=(MagickRealType) ScaleShortToQuantum(channels[1]);
pixel.blue=(MagickRealType) ScaleShortToQuantum(channels[2]);
- pixel.opacity=(MagickRealType) ScaleShortToQuantum(channels[3]);
- pixel.index=(MagickRealType) ScaleShortToQuantum(channels[4]);
+ pixel.black=(MagickRealType) ScaleShortToQuantum(channels[4]);
+ pixel.alpha=(MagickRealType) ScaleShortToQuantum(channels[3]);
return(pixel);
}
-static MagickPixelPacket GetNonpeakPixelList(PixelList *pixel_list)
+static PixelInfo GetNonpeakPixelList(PixelList *pixel_list)
{
- MagickPixelPacket
+ PixelInfo
pixel;
register SkipList
@@ -5005,18 +4819,18 @@
color=previous;
channels[channel]=(unsigned short) color;
}
- GetMagickPixelPacket((const Image *) NULL,&pixel);
+ GetPixelInfo((const Image *) NULL,&pixel);
pixel.red=(MagickRealType) ScaleShortToQuantum(channels[0]);
pixel.green=(MagickRealType) ScaleShortToQuantum(channels[1]);
pixel.blue=(MagickRealType) ScaleShortToQuantum(channels[2]);
- pixel.opacity=(MagickRealType) ScaleShortToQuantum(channels[3]);
- pixel.index=(MagickRealType) ScaleShortToQuantum(channels[4]);
+ pixel.alpha=(MagickRealType) ScaleShortToQuantum(channels[3]);
+ pixel.black=(MagickRealType) ScaleShortToQuantum(channels[4]);
return(pixel);
}
-static MagickPixelPacket GetStandardDeviationPixelList(PixelList *pixel_list)
+static PixelInfo GetStandardDeviationPixelList(PixelList *pixel_list)
{
- MagickPixelPacket
+ PixelInfo
pixel;
MagickRealType
@@ -5063,17 +4877,17 @@
sum_squared/=pixel_list->length;
channels[channel]=(unsigned short) sqrt(sum_squared-(sum*sum));
}
- GetMagickPixelPacket((const Image *) NULL,&pixel);
+ GetPixelInfo((const Image *) NULL,&pixel);
pixel.red=(MagickRealType) ScaleShortToQuantum(channels[0]);
pixel.green=(MagickRealType) ScaleShortToQuantum(channels[1]);
pixel.blue=(MagickRealType) ScaleShortToQuantum(channels[2]);
- pixel.opacity=(MagickRealType) ScaleShortToQuantum(channels[3]);
- pixel.index=(MagickRealType) ScaleShortToQuantum(channels[4]);
+ pixel.alpha=(MagickRealType) ScaleShortToQuantum(channels[3]);
+ pixel.black=(MagickRealType) ScaleShortToQuantum(channels[4]);
return(pixel);
}
-static inline void InsertPixelList(const Image *image,const PixelPacket *pixel,
- const IndexPacket *indexes,PixelList *pixel_list)
+static inline void InsertPixelList(const Image *image,const Quantum *pixel,
+ PixelList *pixel_list)
{
size_t
signature;
@@ -5081,32 +4895,32 @@
unsigned short
index;
- index=ScaleQuantumToShort(GetPixelRed(pixel));
+ index=ScaleQuantumToShort(GetPixelRed(image,pixel));
signature=pixel_list->lists[0].nodes[index].signature;
if (signature == pixel_list->signature)
pixel_list->lists[0].nodes[index].count++;
else
AddNodePixelList(pixel_list,0,index);
- index=ScaleQuantumToShort(GetPixelGreen(pixel));
+ index=ScaleQuantumToShort(GetPixelGreen(image,pixel));
signature=pixel_list->lists[1].nodes[index].signature;
if (signature == pixel_list->signature)
pixel_list->lists[1].nodes[index].count++;
else
AddNodePixelList(pixel_list,1,index);
- index=ScaleQuantumToShort(GetPixelBlue(pixel));
+ index=ScaleQuantumToShort(GetPixelBlue(image,pixel));
signature=pixel_list->lists[2].nodes[index].signature;
if (signature == pixel_list->signature)
pixel_list->lists[2].nodes[index].count++;
else
AddNodePixelList(pixel_list,2,index);
- index=ScaleQuantumToShort(GetPixelOpacity(pixel));
+ index=ScaleQuantumToShort(GetPixelAlpha(image,pixel));
signature=pixel_list->lists[3].nodes[index].signature;
if (signature == pixel_list->signature)
pixel_list->lists[3].nodes[index].count++;
else
AddNodePixelList(pixel_list,3,index);
if (image->colorspace == CMYKColorspace)
- index=ScaleQuantumToShort(GetPixelIndex(indexes));
+ index=ScaleQuantumToShort(GetPixelBlack(image,pixel));
signature=pixel_list->lists[4].nodes[index].signature;
if (signature == pixel_list->signature)
pixel_list->lists[4].nodes[index].count++;
@@ -5229,16 +5043,10 @@
const int
id = GetOpenMPThreadId();
- register const IndexPacket
- *restrict indexes;
-
- register const PixelPacket
+ register const Quantum
*restrict p;
- register IndexPacket
- *restrict statistic_indexes;
-
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -5250,22 +5058,17 @@
(ssize_t) (StatisticHeight/2L),image->columns+StatisticWidth,
StatisticHeight,exception);
q=QueueCacheViewAuthenticPixels(statistic_view,0,y,statistic_image->columns, 1,exception);
- if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewVirtualIndexQueue(image_view);
- statistic_indexes=GetCacheViewAuthenticIndexQueue(statistic_view);
for (x=0; x < (ssize_t) statistic_image->columns; x++)
{
- MagickPixelPacket
+ PixelInfo
pixel;
- register const IndexPacket
- *restrict s;
-
- register const PixelPacket
+ register const Quantum
*restrict r;
register ssize_t
@@ -5273,23 +5076,20 @@
v;
r=p;
- s=indexes+x;
ResetPixelList(pixel_list[id]);
for (v=0; v < (ssize_t) StatisticHeight; v++)
{
for (u=0; u < (ssize_t) StatisticWidth; u++)
- InsertPixelList(image,r+u,s+u,pixel_list[id]);
- r+=image->columns+StatisticWidth;
- s+=image->columns+StatisticWidth;
+ InsertPixelList(image,r+u*GetPixelChannels(image),pixel_list[id]);
+ r+=(image->columns+StatisticWidth)*GetPixelChannels(image);
}
- GetMagickPixelPacket(image,&pixel);
- SetMagickPixelPacket(image,p+StatisticWidth*StatisticHeight/2,indexes+
- StatisticWidth*StatisticHeight/2+x,&pixel);
+ GetPixelInfo(image,&pixel);
+ SetPixelInfo(image,p+StatisticWidth*StatisticHeight/2,&pixel);
switch (type)
{
case GradientStatistic:
{
- MagickPixelPacket
+ PixelInfo
maximum,
minimum;
@@ -5298,9 +5098,9 @@
pixel.red=MagickAbsoluteValue(maximum.red-minimum.red);
pixel.green=MagickAbsoluteValue(maximum.green-minimum.green);
pixel.blue=MagickAbsoluteValue(maximum.blue-minimum.blue);
- pixel.opacity=MagickAbsoluteValue(maximum.opacity-minimum.opacity);
+ pixel.alpha=MagickAbsoluteValue(maximum.alpha-minimum.alpha);
if (image->colorspace == CMYKColorspace)
- pixel.index=MagickAbsoluteValue(maximum.index-minimum.index);
+ pixel.black=MagickAbsoluteValue(maximum.black-minimum.black);
break;
}
case MaximumStatistic:
@@ -5341,19 +5141,24 @@
}
}
if ((channel & RedChannel) != 0)
- SetPixelRed(q,ClampToQuantum(pixel.red));
+ SetPixelRed(statistic_image,
+ ClampToQuantum(pixel.red),q);
if ((channel & GreenChannel) != 0)
- SetPixelGreen(q,ClampToQuantum(pixel.green));
+ SetPixelGreen(statistic_image,
+ ClampToQuantum(pixel.green),q);
if ((channel & BlueChannel) != 0)
- SetPixelBlue(q,ClampToQuantum(pixel.blue));
- if (((channel & OpacityChannel) != 0) &&
- (image->matte != MagickFalse))
- SetPixelOpacity(q,ClampToQuantum(pixel.opacity));
- if (((channel & IndexChannel) != 0) &&
+ SetPixelBlue(statistic_image,
+ ClampToQuantum(pixel.blue),q);
+ if (((channel & BlackChannel) != 0) &&
(image->colorspace == CMYKColorspace))
- SetPixelIndex(statistic_indexes+x,ClampToQuantum(pixel.index));
- p++;
- q++;
+ SetPixelBlack(statistic_image,
+ ClampToQuantum(pixel.black),q);
+ if (((channel & AlphaChannel) != 0) &&
+ (image->matte != MagickFalse))
+ SetPixelAlpha(statistic_image,
+ ClampToQuantum(pixel.alpha),q);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(statistic_image);
}
if (SyncCacheViewAuthenticPixels(statistic_view,exception) == MagickFalse)
status=MagickFalse;
@@ -5453,7 +5258,7 @@
MagickOffsetType
progress;
- MagickPixelPacket
+ PixelInfo
bias;
MagickRealType
@@ -5476,7 +5281,7 @@
*/
status=MagickTrue;
progress=0;
- GetMagickPixelPacket(image,&bias);
+ GetPixelInfo(image,&bias);
image_view=AcquireCacheView(image);
unsharp_view=AcquireCacheView(unsharp_image);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
@@ -5484,19 +5289,13 @@
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- MagickPixelPacket
+ PixelInfo
pixel;
- register const IndexPacket
- *restrict indexes;
-
- register const PixelPacket
+ register const Quantum
*restrict p;
- register IndexPacket
- *restrict unsharp_indexes;
-
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -5507,66 +5306,80 @@
p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
q=GetCacheViewAuthenticPixels(unsharp_view,0,y,unsharp_image->columns,1,
exception);
- if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewVirtualIndexQueue(image_view);
- unsharp_indexes=GetCacheViewAuthenticIndexQueue(unsharp_view);
pixel=bias;
for (x=0; x < (ssize_t) image->columns; x++)
{
if ((channel & RedChannel) != 0)
{
- pixel.red=GetPixelRed(p)-(MagickRealType) GetPixelRed(q);
+ pixel.red=GetPixelRed(image,p)-(MagickRealType) GetPixelRed(image,q);
if (fabs(2.0*pixel.red) < quantum_threshold)
- pixel.red=(MagickRealType) GetPixelRed(p);
+ pixel.red=(MagickRealType) GetPixelRed(image,p);
else
- pixel.red=(MagickRealType) GetPixelRed(p)+(pixel.red*amount);
- SetPixelRed(q,ClampToQuantum(pixel.red));
+ pixel.red=(MagickRealType) GetPixelRed(image,p)+(pixel.red*amount);
+ SetPixelRed(unsharp_image,ClampToQuantum(pixel.red),q);
}
if ((channel & GreenChannel) != 0)
{
- pixel.green=GetPixelGreen(p)-(MagickRealType) q->green;
+ pixel.green=GetPixelGreen(image,p)-
+ (MagickRealType) GetPixelGreen(image,q);
if (fabs(2.0*pixel.green) < quantum_threshold)
- pixel.green=(MagickRealType) GetPixelGreen(p);
+ pixel.green=(MagickRealType)
+ GetPixelGreen(image,p);
else
- pixel.green=(MagickRealType) GetPixelGreen(p)+(pixel.green*amount);
- SetPixelGreen(q,ClampToQuantum(pixel.green));
+ pixel.green=(MagickRealType)
+ GetPixelGreen(image,p)+
+ (pixel.green*amount);
+ SetPixelGreen(unsharp_image,
+ ClampToQuantum(pixel.green),q);
}
if ((channel & BlueChannel) != 0)
{
- pixel.blue=GetPixelBlue(p)-(MagickRealType) q->blue;
+ pixel.blue=GetPixelBlue(image,p)-
+ (MagickRealType) GetPixelBlue(image,q);
if (fabs(2.0*pixel.blue) < quantum_threshold)
- pixel.blue=(MagickRealType) GetPixelBlue(p);
+ pixel.blue=(MagickRealType)
+ GetPixelBlue(image,p);
else
- pixel.blue=(MagickRealType) GetPixelBlue(p)+(pixel.blue*amount);
- SetPixelBlue(q,ClampToQuantum(pixel.blue));
+ pixel.blue=(MagickRealType)
+ GetPixelBlue(image,p)+(pixel.blue*amount);
+ SetPixelBlue(unsharp_image,
+ ClampToQuantum(pixel.blue),q);
}
- if ((channel & OpacityChannel) != 0)
- {
- pixel.opacity=GetPixelOpacity(p)-(MagickRealType) q->opacity;
- if (fabs(2.0*pixel.opacity) < quantum_threshold)
- pixel.opacity=(MagickRealType) GetPixelOpacity(p);
- else
- pixel.opacity=GetPixelOpacity(p)+(pixel.opacity*amount);
- SetPixelOpacity(q,ClampToQuantum(pixel.opacity));
- }
- if (((channel & IndexChannel) != 0) &&
+ if (((channel & BlackChannel) != 0) &&
(image->colorspace == CMYKColorspace))
{
- pixel.index=GetPixelIndex(indexes+x)-(MagickRealType)
- GetPixelIndex(unsharp_indexes+x);
- if (fabs(2.0*pixel.index) < quantum_threshold)
- pixel.index=(MagickRealType) GetPixelIndex(indexes+x);
+ pixel.black=GetPixelBlack(image,p)-
+ (MagickRealType) GetPixelBlack(image,q);
+ if (fabs(2.0*pixel.black) < quantum_threshold)
+ pixel.black=(MagickRealType)
+ GetPixelBlack(image,p);
else
- pixel.index=(MagickRealType) GetPixelIndex(indexes+x)+
- (pixel.index*amount);
- SetPixelIndex(unsharp_indexes+x,ClampToQuantum(pixel.index));
+ pixel.black=(MagickRealType)
+ GetPixelBlack(image,p)+(pixel.black*
+ amount);
+ SetPixelBlack(unsharp_image,
+ ClampToQuantum(pixel.black),q);
}
- p++;
- q++;
+ if ((channel & AlphaChannel) != 0)
+ {
+ pixel.alpha=GetPixelAlpha(image,p)-
+ (MagickRealType) GetPixelAlpha(image,q);
+ if (fabs(2.0*pixel.alpha) < quantum_threshold)
+ pixel.alpha=(MagickRealType)
+ GetPixelAlpha(image,p);
+ else
+ pixel.alpha=GetPixelAlpha(image,p)+
+ (pixel.alpha*amount);
+ SetPixelAlpha(unsharp_image,
+ ClampToQuantum(pixel.alpha),q);
+ }
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(unsharp_image);
}
if (SyncCacheViewAuthenticPixels(unsharp_view,exception) == MagickFalse)
status=MagickFalse;
diff --git a/magick/effect.h b/MagickCore/effect.h
similarity index 98%
rename from magick/effect.h
rename to MagickCore/effect.h
index 5ddf926..d41ce88 100644
--- a/magick/effect.h
+++ b/MagickCore/effect.h
@@ -22,7 +22,7 @@
extern "C" {
#endif
-#include <magick/morphology.h>
+#include <MagickCore/morphology.h>
typedef enum
{
diff --git a/magick/enhance.c b/MagickCore/enhance.c
similarity index 84%
rename from magick/enhance.c
rename to MagickCore/enhance.c
index 6320a6e..bff00db 100644
--- a/magick/enhance.c
+++ b/MagickCore/enhance.c
@@ -40,38 +40,38 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/artifact.h"
-#include "magick/cache.h"
-#include "magick/cache-view.h"
-#include "magick/color.h"
-#include "magick/color-private.h"
-#include "magick/colorspace.h"
-#include "magick/composite-private.h"
-#include "magick/enhance.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/fx.h"
-#include "magick/gem.h"
-#include "magick/geometry.h"
-#include "magick/histogram.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/option.h"
-#include "magick/pixel-private.h"
-#include "magick/quantum.h"
-#include "magick/quantum-private.h"
-#include "magick/resample.h"
-#include "magick/resample-private.h"
-#include "magick/statistic.h"
-#include "magick/string_.h"
-#include "magick/string-private.h"
-#include "magick/thread-private.h"
-#include "magick/token.h"
-#include "magick/xml-tree.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/artifact.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/cache-view.h"
+#include "MagickCore/color.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/composite-private.h"
+#include "MagickCore/enhance.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/fx.h"
+#include "MagickCore/gem.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/histogram.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/option.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantum.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/resample.h"
+#include "MagickCore/resample-private.h"
+#include "MagickCore/statistic.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/string-private.h"
+#include "MagickCore/thread-private.h"
+#include "MagickCore/token.h"
+#include "MagickCore/xml-tree.h"
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -115,9 +115,12 @@
status;
double
- mean,sans,gamma,logmean;
+ gamma,
+ log_mean,
+ mean,
+ sans;
- logmean=log(0.5);
+ log_mean=log(0.5);
if ((channel & SyncChannels) != 0 )
{
@@ -125,56 +128,55 @@
Apply gamma correction equally accross all given channels
*/
(void) GetImageChannelMean(image,channel,&mean,&sans,&image->exception);
- gamma=log(mean*QuantumScale)/logmean;
- return LevelImageChannel(image, channel,
- 0.0, (double)QuantumRange, gamma);
+ gamma=log(mean*QuantumScale)/log_mean;
+ return(LevelImageChannel(image,channel,0.0,(double)QuantumRange,gamma));
}
/*
- auto-gamma each channel separateally
+ Auto-gamma each channel separately.
*/
- status = MagickTrue;
+ status=MagickTrue;
if ((channel & RedChannel) != 0)
{
(void) GetImageChannelMean(image,RedChannel,&mean,&sans,
&image->exception);
- gamma=log(mean*QuantumScale)/logmean;
- status = status && LevelImageChannel(image, RedChannel,
- 0.0, (double)QuantumRange, gamma);
+ gamma=log(mean*QuantumScale)/log_mean;
+ status=status && LevelImageChannel(image,RedChannel,0.0,(double)
+ QuantumRange, gamma);
}
if ((channel & GreenChannel) != 0)
{
(void) GetImageChannelMean(image,GreenChannel,&mean,&sans,
&image->exception);
- gamma=log(mean*QuantumScale)/logmean;
- status = status && LevelImageChannel(image, GreenChannel,
- 0.0, (double)QuantumRange, gamma);
+ gamma=log(mean*QuantumScale)/log_mean;
+ status=status && LevelImageChannel(image,GreenChannel,0.0,(double)
+ QuantumRange,gamma);
}
if ((channel & BlueChannel) != 0)
{
(void) GetImageChannelMean(image,BlueChannel,&mean,&sans,
&image->exception);
- gamma=log(mean*QuantumScale)/logmean;
- status = status && LevelImageChannel(image, BlueChannel,
- 0.0, (double)QuantumRange, gamma);
+ gamma=log(mean*QuantumScale)/log_mean;
+ status=status && LevelImageChannel(image,BlueChannel,0.0,(double)
+ QuantumRange,gamma);
+ }
+ if (((channel & BlackChannel) != 0) &&
+ (image->colorspace == CMYKColorspace))
+ {
+ (void) GetImageChannelMean(image,BlackChannel,&mean,&sans,
+ &image->exception);
+ gamma=log(mean*QuantumScale)/log_mean;
+ status=status && LevelImageChannel(image,BlackChannel,0.0,(double)
+ QuantumRange,gamma);
}
if (((channel & OpacityChannel) != 0) &&
(image->matte == MagickTrue))
{
(void) GetImageChannelMean(image,OpacityChannel,&mean,&sans,
&image->exception);
- gamma=log(mean*QuantumScale)/logmean;
- status = status && LevelImageChannel(image, OpacityChannel,
- 0.0, (double)QuantumRange, gamma);
- }
- if (((channel & IndexChannel) != 0) &&
- (image->colorspace == CMYKColorspace))
- {
- (void) GetImageChannelMean(image,IndexChannel,&mean,&sans,
- &image->exception);
- gamma=log(mean*QuantumScale)/logmean;
- status = status && LevelImageChannel(image, IndexChannel,
- 0.0, (double)QuantumRange, gamma);
+ gamma=log(mean*QuantumScale)/log_mean;
+ status=status && LevelImageChannel(image,OpacityChannel,0.0,(double)
+ QuantumRange,gamma);
}
return(status != 0 ? MagickTrue : MagickFalse);
}
@@ -642,7 +644,7 @@
double
luma;
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -651,22 +653,22 @@
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
for (x=0; x < (ssize_t) image->columns; x++)
{
- luma=0.2126*GetPixelRed(q)+0.7152*GetPixelGreen(q)+
- 0.0722*GetPixelBlue(q);
- SetPixelRed(q,ClampToQuantum(luma+color_correction.saturation*
- (cdl_map[ScaleQuantumToMap(GetPixelRed(q))].red-luma)));
- SetPixelGreen(q,ClampToQuantum(luma+color_correction.saturation*
- (cdl_map[ScaleQuantumToMap(GetPixelGreen(q))].green-luma)));
- SetPixelBlue(q,ClampToQuantum(luma+color_correction.saturation*
- (cdl_map[ScaleQuantumToMap(GetPixelBlue(q))].blue-luma)));
- q++;
+ luma=0.2126*GetPixelRed(image,q)+0.7152*GetPixelGreen(image,q)+0.0722*
+ GetPixelBlue(image,q);
+ SetPixelRed(image,ClampToQuantum(luma+color_correction.saturation*
+ (cdl_map[ScaleQuantumToMap(GetPixelRed(image,q))].red-luma)),q);
+ SetPixelGreen(image,ClampToQuantum(luma+color_correction.saturation*
+ (cdl_map[ScaleQuantumToMap(GetPixelGreen(image,q))].green-luma)),q);
+ SetPixelBlue(image,ClampToQuantum(luma+color_correction.saturation*
+ (cdl_map[ScaleQuantumToMap(GetPixelBlue(image,q))].blue-luma)),q);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -742,6 +744,11 @@
MagickExport MagickBooleanType ClutImageChannel(Image *image,
const ChannelType channel,const Image *clut_image)
{
+#define ClampAlphaPixelComponent(pixel) ClampToQuantum((pixel)->alpha)
+#define ClampBlackPixelComponent(pixel) ClampToQuantum((pixel)->black)
+#define ClampBluePixelComponent(pixel) ClampToQuantum((pixel)->blue)
+#define ClampGreenPixelComponent(pixel) ClampToQuantum((pixel)->green)
+#define ClampRedPixelComponent(pixel) ClampToQuantum((pixel)->red)
#define ClutImageTag "Clut/Image"
CacheView
@@ -757,7 +764,7 @@
MagickOffsetType
progress;
- MagickPixelPacket
+ PixelInfo
*clut_map;
register ssize_t
@@ -775,9 +782,9 @@
assert(clut_image->signature == MagickSignature);
if (SetImageStorageClass(image,DirectClass) == MagickFalse)
return(MagickFalse);
- clut_map=(MagickPixelPacket *) AcquireQuantumMemory(MaxMap+1UL,
+ clut_map=(PixelInfo *) AcquireQuantumMemory(MaxMap+1UL,
sizeof(*clut_map));
- if (clut_map == (MagickPixelPacket *) NULL)
+ if (clut_map == (PixelInfo *) NULL)
ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed",
image->filename);
/*
@@ -793,8 +800,8 @@
#endif
for (i=0; i <= (ssize_t) MaxMap; i++)
{
- GetMagickPixelPacket(clut_image,clut_map+i);
- (void) InterpolateMagickPixelPacket(clut_image,clut_view,
+ GetPixelInfo(clut_image,clut_map+i);
+ (void) InterpolatePixelInfo(clut_image,clut_view,
UndefinedInterpolatePixel,QuantumScale*i*(clut_image->columns-adjust),
QuantumScale*i*(clut_image->rows-adjust),clut_map+i,exception);
}
@@ -805,13 +812,10 @@
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- MagickPixelPacket
+ PixelInfo
pixel;
- register IndexPacket
- *restrict indexes;
-
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -820,43 +824,42 @@
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
- GetMagickPixelPacket(image,&pixel);
+ GetPixelInfo(image,&pixel);
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetMagickPixelPacket(image,q,indexes+x,&pixel);
+ SetPixelInfo(image,q,&pixel);
if ((channel & RedChannel) != 0)
- SetPixelRed(q,ClampPixelRed(clut_map+
- ScaleQuantumToMap(GetPixelRed(q))));
+ SetPixelRed(image,ClampRedPixelComponent(clut_map+
+ ScaleQuantumToMap(GetPixelRed(image,q))),q);
if ((channel & GreenChannel) != 0)
- SetPixelGreen(q,ClampPixelGreen(clut_map+
- ScaleQuantumToMap(GetPixelGreen(q))));
+ SetPixelGreen(image,ClampGreenPixelComponent(clut_map+
+ ScaleQuantumToMap(GetPixelGreen(image,q))),q);
if ((channel & BlueChannel) != 0)
- SetPixelBlue(q,ClampPixelBlue(clut_map+
- ScaleQuantumToMap(GetPixelBlue(q))));
+ SetPixelBlue(image,ClampBluePixelComponent(clut_map+
+ ScaleQuantumToMap(GetPixelBlue(image,q))),q);
+ if (((channel & BlackChannel) != 0) &&
+ (image->colorspace == CMYKColorspace))
+ SetPixelBlack(image,ClampBlackPixelComponent(clut_map+
+ ScaleQuantumToMap(GetPixelBlack(image,q))),q);
if ((channel & OpacityChannel) != 0)
{
if (clut_image->matte == MagickFalse)
- SetPixelAlpha(q,MagickPixelIntensityToQuantum(clut_map+
- ScaleQuantumToMap((Quantum) GetPixelAlpha(q))));
+ SetPixelAlpha(image,GetPixelInfoIntensity(clut_map+
+ ScaleQuantumToMap((Quantum) GetPixelAlpha(image,q))),q);
else
if (image->matte == MagickFalse)
- SetPixelOpacity(q,ClampPixelOpacity(clut_map+
- ScaleQuantumToMap((Quantum) MagickPixelIntensity(&pixel))));
+ SetPixelAlpha(image,ClampAlphaPixelComponent(clut_map+
+ ScaleQuantumToMap((Quantum) GetPixelInfoIntensity(&pixel))),q);
else
- SetPixelOpacity(q,ClampPixelOpacity(
- clut_map+ScaleQuantumToMap(GetPixelOpacity(q))));
+ SetPixelAlpha(image,ClampAlphaPixelComponent(clut_map+
+ ScaleQuantumToMap(GetPixelAlpha(image,q))),q);
}
- if (((channel & IndexChannel) != 0) &&
- (image->colorspace == CMYKColorspace))
- SetPixelIndex(indexes+x,ClampToQuantum((clut_map+(ssize_t)
- GetPixelIndex(indexes+x))->index));
- q++;
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -874,7 +877,7 @@
}
}
image_view=DestroyCacheView(image_view);
- clut_map=(MagickPixelPacket *) RelinquishMagickMemory(clut_map);
+ clut_map=(PixelInfo *) RelinquishMagickMemory(clut_map);
if ((clut_image->matte != MagickFalse) && ((channel & OpacityChannel) != 0))
(void) SetImageAlphaChannel(image,ActivateAlphaChannel);
return(status);
@@ -992,7 +995,7 @@
green,
red;
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -1001,21 +1004,21 @@
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
for (x=0; x < (ssize_t) image->columns; x++)
{
- red=GetPixelRed(q);
- green=GetPixelGreen(q);
- blue=GetPixelBlue(q);
+ red=GetPixelRed(image,q);
+ green=GetPixelGreen(image,q);
+ blue=GetPixelBlue(image,q);
Contrast(sign,&red,&green,&blue);
- SetPixelRed(q,red);
- SetPixelGreen(q,green);
- SetPixelBlue(q,blue);
- q++;
+ SetPixelRed(image,red,q);
+ SetPixelGreen(image,green,q);
+ SetPixelBlue(image,blue,q);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -1136,7 +1139,7 @@
MagickOffsetType
progress;
- MagickPixelPacket
+ PixelInfo
black,
*histogram,
*stretch_map,
@@ -1155,12 +1158,12 @@
assert(image->signature == MagickSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
- histogram=(MagickPixelPacket *) AcquireQuantumMemory(MaxMap+1UL,
+ histogram=(PixelInfo *) AcquireQuantumMemory(MaxMap+1UL,
sizeof(*histogram));
- stretch_map=(MagickPixelPacket *) AcquireQuantumMemory(MaxMap+1UL,
+ stretch_map=(PixelInfo *) AcquireQuantumMemory(MaxMap+1UL,
sizeof(*stretch_map));
- if ((histogram == (MagickPixelPacket *) NULL) ||
- (stretch_map == (MagickPixelPacket *) NULL))
+ if ((histogram == (PixelInfo *) NULL) ||
+ (stretch_map == (PixelInfo *) NULL))
ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed",
image->filename);
/*
@@ -1172,53 +1175,48 @@
image_view=AcquireCacheView(image);
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
- register IndexPacket
- *restrict indexes;
-
register ssize_t
x;
if (status == MagickFalse)
continue;
p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
if (channel == DefaultChannels)
for (x=0; x < (ssize_t) image->columns; x++)
{
Quantum
intensity;
- intensity=PixelIntensityToQuantum(p);
+ intensity=GetPixelIntensity(image,p);
histogram[ScaleQuantumToMap(intensity)].red++;
histogram[ScaleQuantumToMap(intensity)].green++;
histogram[ScaleQuantumToMap(intensity)].blue++;
- histogram[ScaleQuantumToMap(intensity)].index++;
- p++;
+ histogram[ScaleQuantumToMap(intensity)].black++;
+ p+=GetPixelChannels(image);
}
else
for (x=0; x < (ssize_t) image->columns; x++)
{
if ((channel & RedChannel) != 0)
- histogram[ScaleQuantumToMap(GetPixelRed(p))].red++;
+ histogram[ScaleQuantumToMap(GetPixelRed(image,p))].red++;
if ((channel & GreenChannel) != 0)
- histogram[ScaleQuantumToMap(GetPixelGreen(p))].green++;
+ histogram[ScaleQuantumToMap(GetPixelGreen(image,p))].green++;
if ((channel & BlueChannel) != 0)
- histogram[ScaleQuantumToMap(GetPixelBlue(p))].blue++;
- if ((channel & OpacityChannel) != 0)
- histogram[ScaleQuantumToMap(GetPixelOpacity(p))].opacity++;
- if (((channel & IndexChannel) != 0) &&
+ histogram[ScaleQuantumToMap(GetPixelBlue(image,p))].blue++;
+ if (((channel & BlackChannel) != 0) &&
(image->colorspace == CMYKColorspace))
- histogram[ScaleQuantumToMap(GetPixelIndex(
- indexes+x))].index++;
- p++;
+ histogram[ScaleQuantumToMap(GetPixelBlack(image,p))].black++;
+ if ((channel & OpacityChannel) != 0)
+ histogram[ScaleQuantumToMap(GetPixelAlpha(image,p))].alpha++;
+ p+=GetPixelChannels(image);
}
}
/*
@@ -1287,49 +1285,49 @@
}
white.blue=(MagickRealType) i;
}
- black.opacity=0.0;
- white.opacity=MaxRange(QuantumRange);
+ black.alpha=0.0;
+ white.alpha=MaxRange(QuantumRange);
if ((channel & OpacityChannel) != 0)
{
intensity=0.0;
for (i=0; i <= (ssize_t) MaxMap; i++)
{
- intensity+=histogram[i].opacity;
+ intensity+=histogram[i].alpha;
if (intensity > black_point)
break;
}
- black.opacity=(MagickRealType) i;
+ black.alpha=(MagickRealType) i;
intensity=0.0;
for (i=(ssize_t) MaxMap; i != 0; i--)
{
- intensity+=histogram[i].opacity;
+ intensity+=histogram[i].alpha;
if (intensity > ((double) image->columns*image->rows-white_point))
break;
}
- white.opacity=(MagickRealType) i;
+ white.alpha=(MagickRealType) i;
}
- black.index=0.0;
- white.index=MaxRange(QuantumRange);
- if (((channel & IndexChannel) != 0) && (image->colorspace == CMYKColorspace))
+ black.black=0.0;
+ white.black=MaxRange(QuantumRange);
+ if (((channel & BlackChannel) != 0) && (image->colorspace == CMYKColorspace))
{
intensity=0.0;
for (i=0; i <= (ssize_t) MaxMap; i++)
{
- intensity+=histogram[i].index;
+ intensity+=histogram[i].black;
if (intensity > black_point)
break;
}
- black.index=(MagickRealType) i;
+ black.black=(MagickRealType) i;
intensity=0.0;
for (i=(ssize_t) MaxMap; i != 0; i--)
{
- intensity+=histogram[i].index;
+ intensity+=histogram[i].black;
if (intensity > ((double) image->columns*image->rows-white_point))
break;
}
- white.index=(MagickRealType) i;
+ white.black=(MagickRealType) i;
}
- histogram=(MagickPixelPacket *) RelinquishMagickMemory(histogram);
+ histogram=(PixelInfo *) RelinquishMagickMemory(histogram);
/*
Stretch the histogram to create the stretched image mapping.
*/
@@ -1379,36 +1377,36 @@
}
if ((channel & OpacityChannel) != 0)
{
- if (i < (ssize_t) black.opacity)
- stretch_map[i].opacity=0.0;
+ if (i < (ssize_t) black.alpha)
+ stretch_map[i].alpha=0.0;
else
- if (i > (ssize_t) white.opacity)
- stretch_map[i].opacity=(MagickRealType) QuantumRange;
+ if (i > (ssize_t) white.alpha)
+ stretch_map[i].alpha=(MagickRealType) QuantumRange;
else
- if (black.opacity != white.opacity)
- stretch_map[i].opacity=(MagickRealType) ScaleMapToQuantum(
- (MagickRealType) (MaxMap*(i-black.opacity)/(white.opacity-
- black.opacity)));
+ if (black.alpha != white.alpha)
+ stretch_map[i].alpha=(MagickRealType) ScaleMapToQuantum(
+ (MagickRealType) (MaxMap*(i-black.alpha)/(white.alpha-
+ black.alpha)));
}
- if (((channel & IndexChannel) != 0) &&
+ if (((channel & BlackChannel) != 0) &&
(image->colorspace == CMYKColorspace))
{
- if (i < (ssize_t) black.index)
- stretch_map[i].index=0.0;
+ if (i < (ssize_t) black.black)
+ stretch_map[i].black=0.0;
else
- if (i > (ssize_t) white.index)
- stretch_map[i].index=(MagickRealType) QuantumRange;
+ if (i > (ssize_t) white.black)
+ stretch_map[i].black=(MagickRealType) QuantumRange;
else
- if (black.index != white.index)
- stretch_map[i].index=(MagickRealType) ScaleMapToQuantum(
- (MagickRealType) (MaxMap*(i-black.index)/(white.index-
- black.index)));
+ if (black.black != white.black)
+ stretch_map[i].black=(MagickRealType) ScaleMapToQuantum(
+ (MagickRealType) (MaxMap*(i-black.black)/(white.black-
+ black.black)));
}
}
/*
Stretch the image.
*/
- if (((channel & OpacityChannel) != 0) || (((channel & IndexChannel) != 0) &&
+ if (((channel & OpacityChannel) != 0) || (((channel & BlackChannel) != 0) &&
(image->colorspace == CMYKColorspace)))
image->storage_class=DirectClass;
if (image->storage_class == PseudoClass)
@@ -1441,9 +1439,9 @@
}
if ((channel & OpacityChannel) != 0)
{
- if (black.opacity != white.opacity)
- image->colormap[i].opacity=ClampToQuantum(stretch_map[
- ScaleQuantumToMap(image->colormap[i].opacity)].opacity);
+ if (black.alpha != white.alpha)
+ image->colormap[i].alpha=ClampToQuantum(stretch_map[
+ ScaleQuantumToMap(image->colormap[i].alpha)].alpha);
}
}
}
@@ -1457,10 +1455,7 @@
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- register IndexPacket
- *restrict indexes;
-
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -1469,46 +1464,45 @@
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
if ((channel & RedChannel) != 0)
{
if (black.red != white.red)
- SetPixelRed(q,ClampToQuantum(stretch_map[
- ScaleQuantumToMap(GetPixelRed(q))].red));
+ SetPixelRed(image,ClampToQuantum(stretch_map[ScaleQuantumToMap(
+ GetPixelRed(image,q))].red),q);
}
if ((channel & GreenChannel) != 0)
{
if (black.green != white.green)
- SetPixelGreen(q,ClampToQuantum(stretch_map[
- ScaleQuantumToMap(GetPixelGreen(q))].green));
+ SetPixelGreen(image,ClampToQuantum(stretch_map[ScaleQuantumToMap(
+ GetPixelGreen(image,q))].green),q);
}
if ((channel & BlueChannel) != 0)
{
if (black.blue != white.blue)
- SetPixelBlue(q,ClampToQuantum(stretch_map[
- ScaleQuantumToMap(GetPixelBlue(q))].blue));
+ SetPixelBlue(image,ClampToQuantum(stretch_map[ScaleQuantumToMap(
+ GetPixelBlue(image,q))].blue),q);
+ }
+ if (((channel & BlackChannel) != 0) &&
+ (image->colorspace == CMYKColorspace))
+ {
+ if (black.black != white.black)
+ SetPixelBlack(image,ClampToQuantum(stretch_map[ScaleQuantumToMap(
+ GetPixelBlack(image,q))].black),q);
}
if ((channel & OpacityChannel) != 0)
{
- if (black.opacity != white.opacity)
- SetPixelOpacity(q,ClampToQuantum(stretch_map[
- ScaleQuantumToMap(GetPixelOpacity(q))].opacity));
+ if (black.alpha != white.alpha)
+ SetPixelAlpha(image,ClampToQuantum(stretch_map[ScaleQuantumToMap(
+ GetPixelAlpha(image,q))].alpha),q);
}
- if (((channel & IndexChannel) != 0) &&
- (image->colorspace == CMYKColorspace))
- {
- if (black.index != white.index)
- SetPixelIndex(indexes+x,ClampToQuantum(stretch_map[
- ScaleQuantumToMap(GetPixelIndex(indexes+x))].index));
- }
- q++;
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -1527,7 +1521,7 @@
}
}
image_view=DestroyCacheView(image_view);
- stretch_map=(MagickPixelPacket *) RelinquishMagickMemory(stretch_map);
+ stretch_map=(PixelInfo *) RelinquishMagickMemory(stretch_map);
return(status);
}
@@ -1559,30 +1553,30 @@
MagickExport Image *EnhanceImage(const Image *image,ExceptionInfo *exception)
{
#define Enhance(weight) \
- mean=((MagickRealType) GetPixelRed(r)+pixel.red)/2; \
- distance=(MagickRealType) GetPixelRed(r)-(MagickRealType) pixel.red; \
+ mean=((MagickRealType) GetPixelRed(image,r)+pixel.red)/2; \
+ distance=(MagickRealType) GetPixelRed(image,r)-(MagickRealType) pixel.red; \
distance_squared=QuantumScale*(2.0*((MagickRealType) QuantumRange+1.0)+ \
mean)*distance*distance; \
- mean=((MagickRealType) GetPixelGreen(r)+pixel.green)/2; \
- distance=(MagickRealType) GetPixelGreen(r)-(MagickRealType) \
- pixel.green; \
+ mean=((MagickRealType) GetPixelGreen(image,r)+pixel.green)/2; \
+ distance=(MagickRealType) GetPixelGreen(image,r)- \
+ (MagickRealType) pixel.green; \
distance_squared+=4.0*distance*distance; \
- mean=((MagickRealType) GetPixelBlue(r)+pixel.blue)/2; \
- distance=(MagickRealType) GetPixelBlue(r)-(MagickRealType) \
- pixel.blue; \
+ mean=((MagickRealType) GetPixelBlue(image,r)+pixel.blue)/2; \
+ distance=(MagickRealType) GetPixelBlue(image,r)- \
+ (MagickRealType) pixel.blue; \
distance_squared+=QuantumScale*(3.0*((MagickRealType) \
QuantumRange+1.0)-1.0-mean)*distance*distance; \
- mean=((MagickRealType) r->opacity+pixel.opacity)/2; \
- distance=(MagickRealType) r->opacity-(MagickRealType) pixel.opacity; \
+ mean=((MagickRealType) GetPixelAlpha(image,r)+pixel.alpha)/2; \
+ distance=(MagickRealType) GetPixelAlpha(image,r)-(MagickRealType) pixel.alpha; \
distance_squared+=QuantumScale*(3.0*((MagickRealType) \
QuantumRange+1.0)-1.0-mean)*distance*distance; \
if (distance_squared < ((MagickRealType) QuantumRange*(MagickRealType) \
QuantumRange/25.0f)) \
{ \
- aggregate.red+=(weight)*GetPixelRed(r); \
- aggregate.green+=(weight)*GetPixelGreen(r); \
- aggregate.blue+=(weight)*GetPixelBlue(r); \
- aggregate.opacity+=(weight)*GetPixelOpacity(r); \
+ aggregate.red+=(weight)*GetPixelRed(image,r); \
+ aggregate.green+=(weight)*GetPixelGreen(image,r); \
+ aggregate.blue+=(weight)*GetPixelBlue(image,r); \
+ aggregate.alpha+=(weight)*GetPixelAlpha(image,r); \
total_weight+=(weight); \
} \
r++;
@@ -1601,7 +1595,7 @@
MagickOffsetType
progress;
- MagickPixelPacket
+ PixelInfo
zero;
ssize_t
@@ -1641,10 +1635,10 @@
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -1658,14 +1652,14 @@
p=GetCacheViewVirtualPixels(image_view,-2,y-2,image->columns+4,5,exception);
q=QueueCacheViewAuthenticPixels(enhance_view,0,y,enhance_image->columns,1,
exception);
- if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
{
status=MagickFalse;
continue;
}
for (x=0; x < (ssize_t) image->columns; x++)
{
- MagickPixelPacket
+ PixelInfo
aggregate;
MagickRealType
@@ -1677,7 +1671,7 @@
PixelPacket
pixel;
- register const PixelPacket
+ register const Quantum
*restrict r;
/*
@@ -1686,7 +1680,7 @@
aggregate=zero;
total_weight=0.0;
r=p+2*(image->columns+4)+2;
- pixel=(*r);
+ GetPixelPacket(image,r,&pixel);
r=p;
Enhance(5.0); Enhance(8.0); Enhance(10.0); Enhance(8.0); Enhance(5.0);
r=p+(image->columns+4);
@@ -1697,14 +1691,16 @@
Enhance(8.0); Enhance(20.0); Enhance(40.0); Enhance(20.0); Enhance(8.0);
r=p+4*(image->columns+4);
Enhance(5.0); Enhance(8.0); Enhance(10.0); Enhance(8.0); Enhance(5.0);
- SetPixelRed(q,(aggregate.red+(total_weight/2)-1)/total_weight);
- SetPixelGreen(q,(aggregate.green+(total_weight/2)-1)/
- total_weight);
- SetPixelBlue(q,(aggregate.blue+(total_weight/2)-1)/total_weight);
- SetPixelOpacity(q,(aggregate.opacity+(total_weight/2)-1)/
- total_weight);
- p++;
- q++;
+ SetPixelRed(enhance_image,(Quantum) ((aggregate.red+
+ (total_weight/2)-1)/total_weight),q);
+ SetPixelGreen(enhance_image,(Quantum) ((aggregate.green+
+ (total_weight/2)-1)/total_weight),q);
+ SetPixelBlue(enhance_image,(Quantum) ((aggregate.blue+
+ (total_weight/2)-1)/total_weight),q);
+ SetPixelAlpha(enhance_image,(Quantum) ((aggregate.alpha+
+ (total_weight/2)-1)/total_weight),q);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(enhance_image);
}
if (SyncCacheViewAuthenticPixels(enhance_view,exception) == MagickFalse)
status=MagickFalse;
@@ -1775,7 +1771,7 @@
MagickOffsetType
progress;
- MagickPixelPacket
+ PixelInfo
black,
*equalize_map,
*histogram,
@@ -1796,21 +1792,21 @@
assert(image->signature == MagickSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
- equalize_map=(MagickPixelPacket *) AcquireQuantumMemory(MaxMap+1UL,
+ equalize_map=(PixelInfo *) AcquireQuantumMemory(MaxMap+1UL,
sizeof(*equalize_map));
- histogram=(MagickPixelPacket *) AcquireQuantumMemory(MaxMap+1UL,
+ histogram=(PixelInfo *) AcquireQuantumMemory(MaxMap+1UL,
sizeof(*histogram));
- map=(MagickPixelPacket *) AcquireQuantumMemory(MaxMap+1UL,sizeof(*map));
- if ((equalize_map == (MagickPixelPacket *) NULL) ||
- (histogram == (MagickPixelPacket *) NULL) ||
- (map == (MagickPixelPacket *) NULL))
+ map=(PixelInfo *) AcquireQuantumMemory(MaxMap+1UL,sizeof(*map));
+ if ((equalize_map == (PixelInfo *) NULL) ||
+ (histogram == (PixelInfo *) NULL) ||
+ (map == (PixelInfo *) NULL))
{
- if (map != (MagickPixelPacket *) NULL)
- map=(MagickPixelPacket *) RelinquishMagickMemory(map);
- if (histogram != (MagickPixelPacket *) NULL)
- histogram=(MagickPixelPacket *) RelinquishMagickMemory(histogram);
- if (equalize_map != (MagickPixelPacket *) NULL)
- equalize_map=(MagickPixelPacket *) RelinquishMagickMemory(equalize_map);
+ if (map != (PixelInfo *) NULL)
+ map=(PixelInfo *) RelinquishMagickMemory(map);
+ if (histogram != (PixelInfo *) NULL)
+ histogram=(PixelInfo *) RelinquishMagickMemory(histogram);
+ if (equalize_map != (PixelInfo *) NULL)
+ equalize_map=(PixelInfo *) RelinquishMagickMemory(equalize_map);
ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed",
image->filename);
}
@@ -1821,33 +1817,29 @@
exception=(&image->exception);
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const IndexPacket
- *restrict indexes;
-
- register const PixelPacket
+ register const Quantum
*restrict p;
register ssize_t
x;
p=GetVirtualPixels(image,0,y,image->columns,1,exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetVirtualIndexQueue(image);
for (x=0; x < (ssize_t) image->columns; x++)
{
if ((channel & RedChannel) != 0)
- histogram[ScaleQuantumToMap(GetPixelRed(p))].red++;
+ histogram[ScaleQuantumToMap(GetPixelRed(image,p))].red++;
if ((channel & GreenChannel) != 0)
- histogram[ScaleQuantumToMap(GetPixelGreen(p))].green++;
+ histogram[ScaleQuantumToMap(GetPixelGreen(image,p))].green++;
if ((channel & BlueChannel) != 0)
- histogram[ScaleQuantumToMap(GetPixelBlue(p))].blue++;
- if ((channel & OpacityChannel) != 0)
- histogram[ScaleQuantumToMap(GetPixelOpacity(p))].opacity++;
- if (((channel & IndexChannel) != 0) &&
+ histogram[ScaleQuantumToMap(GetPixelBlue(image,p))].blue++;
+ if (((channel & BlackChannel) != 0) &&
(image->colorspace == CMYKColorspace))
- histogram[ScaleQuantumToMap(GetPixelIndex(indexes+x))].index++;
- p++;
+ histogram[ScaleQuantumToMap(GetPixelBlack(image,p))].black++;
+ if ((channel & OpacityChannel) != 0)
+ histogram[ScaleQuantumToMap(GetPixelAlpha(image,p))].alpha++;
+ p+=GetPixelChannels(image);
}
}
/*
@@ -1862,11 +1854,11 @@
intensity.green+=histogram[i].green;
if ((channel & BlueChannel) != 0)
intensity.blue+=histogram[i].blue;
- if ((channel & OpacityChannel) != 0)
- intensity.opacity+=histogram[i].opacity;
- if (((channel & IndexChannel) != 0) &&
+ if (((channel & BlackChannel) != 0) &&
(image->colorspace == CMYKColorspace))
- intensity.index+=histogram[i].index;
+ intensity.black+=histogram[i].black;
+ if ((channel & OpacityChannel) != 0)
+ intensity.alpha+=histogram[i].alpha;
map[i]=intensity;
}
black=map[0];
@@ -1886,18 +1878,18 @@
if (((channel & BlueChannel) != 0) && (white.blue != black.blue))
equalize_map[i].blue=(MagickRealType) ScaleMapToQuantum((MagickRealType)
((MaxMap*(map[i].blue-black.blue))/(white.blue-black.blue)));
- if (((channel & OpacityChannel) != 0) && (white.opacity != black.opacity))
- equalize_map[i].opacity=(MagickRealType) ScaleMapToQuantum(
- (MagickRealType) ((MaxMap*(map[i].opacity-black.opacity))/
- (white.opacity-black.opacity)));
- if ((((channel & IndexChannel) != 0) &&
+ if ((((channel & BlackChannel) != 0) &&
(image->colorspace == CMYKColorspace)) &&
- (white.index != black.index))
- equalize_map[i].index=(MagickRealType) ScaleMapToQuantum((MagickRealType)
- ((MaxMap*(map[i].index-black.index))/(white.index-black.index)));
+ (white.black != black.black))
+ equalize_map[i].black=(MagickRealType) ScaleMapToQuantum((MagickRealType)
+ ((MaxMap*(map[i].black-black.black))/(white.black-black.black)));
+ if (((channel & OpacityChannel) != 0) && (white.alpha != black.alpha))
+ equalize_map[i].alpha=(MagickRealType) ScaleMapToQuantum(
+ (MagickRealType) ((MaxMap*(map[i].alpha-black.alpha))/
+ (white.alpha-black.alpha)));
}
- histogram=(MagickPixelPacket *) RelinquishMagickMemory(histogram);
- map=(MagickPixelPacket *) RelinquishMagickMemory(map);
+ histogram=(PixelInfo *) RelinquishMagickMemory(histogram);
+ map=(PixelInfo *) RelinquishMagickMemory(map);
if (image->storage_class == PseudoClass)
{
/*
@@ -1918,9 +1910,9 @@
image->colormap[i].blue=ClampToQuantum(equalize_map[
ScaleQuantumToMap(image->colormap[i].blue)].blue);
if (((channel & OpacityChannel) != 0) &&
- (white.opacity != black.opacity))
- image->colormap[i].opacity=ClampToQuantum(equalize_map[
- ScaleQuantumToMap(image->colormap[i].opacity)].opacity);
+ (white.alpha != black.alpha))
+ image->colormap[i].alpha=ClampToQuantum(equalize_map[
+ ScaleQuantumToMap(image->colormap[i].alpha)].alpha);
}
}
/*
@@ -1935,10 +1927,7 @@
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- register IndexPacket
- *restrict indexes;
-
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -1947,32 +1936,31 @@
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
if (((channel & RedChannel) != 0) && (white.red != black.red))
- SetPixelRed(q,ClampToQuantum(equalize_map[
- ScaleQuantumToMap(GetPixelRed(q))].red));
+ SetPixelRed(image,ClampToQuantum(equalize_map[
+ ScaleQuantumToMap(GetPixelRed(image,q))].red),q);
if (((channel & GreenChannel) != 0) && (white.green != black.green))
- SetPixelGreen(q,ClampToQuantum(equalize_map[
- ScaleQuantumToMap(GetPixelGreen(q))].green));
+ SetPixelGreen(image,ClampToQuantum(equalize_map[
+ ScaleQuantumToMap(GetPixelGreen(image,q))].green),q);
if (((channel & BlueChannel) != 0) && (white.blue != black.blue))
- SetPixelBlue(q,ClampToQuantum(equalize_map[
- ScaleQuantumToMap(GetPixelBlue(q))].blue));
- if (((channel & OpacityChannel) != 0) && (white.opacity != black.opacity))
- SetPixelOpacity(q,ClampToQuantum(equalize_map[
- ScaleQuantumToMap(GetPixelOpacity(q))].opacity));
- if ((((channel & IndexChannel) != 0) &&
+ SetPixelBlue(image,ClampToQuantum(equalize_map[
+ ScaleQuantumToMap(GetPixelBlue(image,q))].blue),q);
+ if ((((channel & BlackChannel) != 0) &&
(image->colorspace == CMYKColorspace)) &&
- (white.index != black.index))
- SetPixelIndex(indexes+x,ClampToQuantum(equalize_map[
- ScaleQuantumToMap(GetPixelIndex(indexes+x))].index));
- q++;
+ (white.black != black.black))
+ SetPixelBlack(image,ClampToQuantum(equalize_map[
+ ScaleQuantumToMap(GetPixelBlack(image,q))].black),q);
+ if (((channel & OpacityChannel) != 0) && (white.alpha != black.alpha))
+ SetPixelAlpha(image,ClampToQuantum(equalize_map[
+ ScaleQuantumToMap(GetPixelAlpha(image,q))].alpha),q);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -1990,7 +1978,7 @@
}
}
image_view=DestroyCacheView(image_view);
- equalize_map=(MagickPixelPacket *) RelinquishMagickMemory(equalize_map);
+ equalize_map=(PixelInfo *) RelinquishMagickMemory(equalize_map);
return(status);
}
@@ -2036,7 +2024,7 @@
GeometryInfo
geometry_info;
- MagickPixelPacket
+ PixelInfo
gamma;
MagickStatusType
@@ -2138,15 +2126,8 @@
image->colormap[i].blue=gamma_map[
ScaleQuantumToMap(image->colormap[i].blue)];
if ((channel & OpacityChannel) != 0)
- {
- if (image->matte == MagickFalse)
- image->colormap[i].opacity=gamma_map[
- ScaleQuantumToMap(image->colormap[i].opacity)];
- else
- image->colormap[i].opacity=(Quantum) QuantumRange-
- gamma_map[ScaleQuantumToMap((Quantum) (QuantumRange-
- image->colormap[i].opacity))];
- }
+ image->colormap[i].alpha=gamma_map[
+ ScaleQuantumToMap(image->colormap[i].alpha)];
}
}
/*
@@ -2161,10 +2142,7 @@
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- register IndexPacket
- *restrict indexes;
-
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -2173,51 +2151,50 @@
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
if (channel == DefaultChannels)
{
- SetPixelRed(q,gamma_map[ScaleQuantumToMap(
- GetPixelRed(q))]);
- SetPixelGreen(q,gamma_map[ScaleQuantumToMap(
- GetPixelGreen(q))]);
- SetPixelBlue(q,gamma_map[ScaleQuantumToMap(
- GetPixelBlue(q))]);
+ SetPixelRed(image,gamma_map[
+ ScaleQuantumToMap(GetPixelRed(image,q))],q);
+ SetPixelGreen(image,gamma_map[
+ ScaleQuantumToMap(GetPixelGreen(image,q))],q);
+ SetPixelBlue(image,gamma_map[ScaleQuantumToMap(
+ GetPixelBlue(image,q))],q);
}
else
{
if ((channel & RedChannel) != 0)
- SetPixelRed(q,gamma_map[ScaleQuantumToMap(
- GetPixelRed(q))]);
+ SetPixelRed(image,gamma_map[ScaleQuantumToMap(
+ GetPixelRed(image,q))],q);
if ((channel & GreenChannel) != 0)
- SetPixelGreen(q,gamma_map[ScaleQuantumToMap(
- GetPixelGreen(q))]);
+ SetPixelGreen(image,gamma_map[
+ ScaleQuantumToMap(GetPixelGreen(image,q))],q);
if ((channel & BlueChannel) != 0)
- SetPixelBlue(q,gamma_map[ScaleQuantumToMap(
- GetPixelBlue(q))]);
+ SetPixelBlue(image,gamma_map[
+ ScaleQuantumToMap(GetPixelBlue(image,q))],q);
if ((channel & OpacityChannel) != 0)
{
if (image->matte == MagickFalse)
- SetPixelOpacity(q,gamma_map[ScaleQuantumToMap(
- GetPixelOpacity(q))]);
+ SetPixelAlpha(image,gamma_map[
+ ScaleQuantumToMap(GetPixelAlpha(image,q))],q);
else
- SetPixelAlpha(q,gamma_map[ScaleQuantumToMap((Quantum)
- GetPixelAlpha(q))]);
+ SetPixelAlpha(image,gamma_map[
+ ScaleQuantumToMap(GetPixelAlpha(image,q))],q);
}
}
- q++;
+ q+=GetPixelChannels(image);
}
- if (((channel & IndexChannel) != 0) &&
+ if (((channel & BlackChannel) != 0) &&
(image->colorspace == CMYKColorspace))
for (x=0; x < (ssize_t) image->columns; x++)
- SetPixelIndex(indexes+x,gamma_map[ScaleQuantumToMap(
- GetPixelIndex(indexes+x))]);
+ SetPixelBlack(image,gamma_map[ScaleQuantumToMap(
+ GetPixelBlack(image,q))],q);
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
if (image->progress_monitor != (MagickProgressMonitor) NULL)
@@ -2316,7 +2293,7 @@
MagickOffsetType
progress;
- MagickPixelPacket
+ PixelInfo
zero;
size_t
@@ -2347,7 +2324,7 @@
level*=level;
cube_size=level*level;
width=(double) hald_image->columns;
- GetMagickPixelPacket(hald_image,&zero);
+ GetPixelInfo(hald_image,&zero);
exception=(&image->exception);
image_view=AcquireCacheView(image);
hald_view=AcquireCacheView(hald_image);
@@ -2362,17 +2339,14 @@
HaldInfo
point;
- MagickPixelPacket
+ PixelInfo
pixel,
pixel1,
pixel2,
pixel3,
pixel4;
- register IndexPacket
- *restrict indexes;
-
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -2381,12 +2355,11 @@
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewAuthenticIndexQueue(hald_view);
pixel=zero;
pixel1=zero;
pixel2=zero;
@@ -2394,44 +2367,49 @@
pixel4=zero;
for (x=0; x < (ssize_t) image->columns; x++)
{
- point.x=QuantumScale*(level-1.0)*GetPixelRed(q);
- point.y=QuantumScale*(level-1.0)*GetPixelGreen(q);
- point.z=QuantumScale*(level-1.0)*GetPixelBlue(q);
+ point.x=QuantumScale*(level-1.0)*GetPixelRed(image,q);
+ point.y=QuantumScale*(level-1.0)*GetPixelGreen(image,q);
+ point.z=QuantumScale*(level-1.0)*GetPixelBlue(image,q);
offset=point.x+level*floor(point.y)+cube_size*floor(point.z);
point.x-=floor(point.x);
point.y-=floor(point.y);
point.z-=floor(point.z);
- (void) InterpolateMagickPixelPacket(image,hald_view,
+ (void) InterpolatePixelInfo(image,hald_view,
UndefinedInterpolatePixel,fmod(offset,width),floor(offset/width),
&pixel1,exception);
- (void) InterpolateMagickPixelPacket(image,hald_view,
+ (void) InterpolatePixelInfo(image,hald_view,
UndefinedInterpolatePixel,fmod(offset+level,width),floor((offset+level)/
width),&pixel2,exception);
- MagickPixelCompositeAreaBlend(&pixel1,pixel1.opacity,&pixel2,
- pixel2.opacity,point.y,&pixel3);
+ CompositePixelInfoAreaBlend(&pixel1,pixel1.alpha,&pixel2,
+ pixel2.alpha,point.y,&pixel3);
offset+=cube_size;
- (void) InterpolateMagickPixelPacket(image,hald_view,
+ (void) InterpolatePixelInfo(image,hald_view,
UndefinedInterpolatePixel,fmod(offset,width),floor(offset/width),
&pixel1,exception);
- (void) InterpolateMagickPixelPacket(image,hald_view,
+ (void) InterpolatePixelInfo(image,hald_view,
UndefinedInterpolatePixel,fmod(offset+level,width),floor((offset+level)/
width),&pixel2,exception);
- MagickPixelCompositeAreaBlend(&pixel1,pixel1.opacity,&pixel2,
- pixel2.opacity,point.y,&pixel4);
- MagickPixelCompositeAreaBlend(&pixel3,pixel3.opacity,&pixel4,
- pixel4.opacity,point.z,&pixel);
+ CompositePixelInfoAreaBlend(&pixel1,pixel1.alpha,&pixel2,
+ pixel2.alpha,point.y,&pixel4);
+ CompositePixelInfoAreaBlend(&pixel3,pixel3.alpha,&pixel4,
+ pixel4.alpha,point.z,&pixel);
if ((channel & RedChannel) != 0)
- SetPixelRed(q,ClampToQuantum(pixel.red));
+ SetPixelRed(image,
+ ClampToQuantum(pixel.red),q);
if ((channel & GreenChannel) != 0)
- SetPixelGreen(q,ClampToQuantum(pixel.green));
+ SetPixelGreen(image,
+ ClampToQuantum(pixel.green),q);
if ((channel & BlueChannel) != 0)
- SetPixelBlue(q,ClampToQuantum(pixel.blue));
- if (((channel & OpacityChannel) != 0) && (image->matte != MagickFalse))
- SetPixelOpacity(q,ClampToQuantum(pixel.opacity));
- if (((channel & IndexChannel) != 0) &&
+ SetPixelBlue(image,
+ ClampToQuantum(pixel.blue),q);
+ if (((channel & BlackChannel) != 0) &&
(image->colorspace == CMYKColorspace))
- SetPixelIndex(indexes+x,ClampToQuantum(pixel.index));
- q++;
+ SetPixelBlack(image,
+ ClampToQuantum(pixel.black),q);
+ if (((channel & OpacityChannel) != 0) && (image->matte != MagickFalse))
+ SetPixelAlpha(image,
+ ClampToQuantum(pixel.alpha),q);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -2633,7 +2611,7 @@
if ((channel & BlueChannel) != 0)
image->colormap[i].blue=LevelQuantum(image->colormap[i].blue);
if ((channel & OpacityChannel) != 0)
- image->colormap[i].opacity=LevelQuantum(image->colormap[i].opacity);
+ image->colormap[i].alpha=LevelQuantum(image->colormap[i].alpha);
}
/*
Level image.
@@ -2647,10 +2625,7 @@
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- register IndexPacket
- *restrict indexes;
-
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -2659,28 +2634,31 @@
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
if ((channel & RedChannel) != 0)
- SetPixelRed(q,LevelQuantum(GetPixelRed(q)));
+ SetPixelRed(image,LevelQuantum(
+ GetPixelRed(image,q)),q);
if ((channel & GreenChannel) != 0)
- SetPixelGreen(q,LevelQuantum(GetPixelGreen(q)));
+ SetPixelGreen(image,
+ LevelQuantum(GetPixelGreen(image,q)),q);
if ((channel & BlueChannel) != 0)
- SetPixelBlue(q,LevelQuantum(GetPixelBlue(q)));
+ SetPixelBlue(image,
+ LevelQuantum(GetPixelBlue(image,q)),q);
if (((channel & OpacityChannel) != 0) &&
(image->matte == MagickTrue))
- SetPixelAlpha(q,LevelQuantum(GetPixelAlpha(q)));
- if (((channel & IndexChannel) != 0) &&
+ SetPixelAlpha(image,
+ LevelQuantum(GetPixelAlpha(image,q)),q);
+ if (((channel & BlackChannel) != 0) &&
(image->colorspace == CMYKColorspace))
- SetPixelIndex(indexes+x,LevelQuantum(
- GetPixelIndex(indexes+x)));
- q++;
+ SetPixelBlack(image,
+ LevelQuantum(GetPixelBlack(image,q)),q);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -2805,7 +2783,7 @@
if ((channel & BlueChannel) != 0)
image->colormap[i].blue=LevelizeValue(image->colormap[i].blue);
if ((channel & OpacityChannel) != 0)
- image->colormap[i].opacity=LevelizeValue(image->colormap[i].opacity);
+ image->colormap[i].alpha=LevelizeValue(image->colormap[i].alpha);
}
/*
Level image.
@@ -2819,10 +2797,7 @@
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- register IndexPacket
- *restrict indexes;
-
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -2831,28 +2806,26 @@
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
if ((channel & RedChannel) != 0)
- SetPixelRed(q,LevelizeValue(GetPixelRed(q)));
+ SetPixelRed(image,LevelizeValue(GetPixelRed(image,q)),q);
if ((channel & GreenChannel) != 0)
- SetPixelGreen(q,LevelizeValue(GetPixelGreen(q)));
+ SetPixelGreen(image,LevelizeValue(GetPixelGreen(image,q)),q);
if ((channel & BlueChannel) != 0)
- SetPixelBlue(q,LevelizeValue(GetPixelBlue(q)));
+ SetPixelBlue(image,LevelizeValue(GetPixelBlue(image,q)),q);
+ if (((channel & BlackChannel) != 0) &&
+ (image->colorspace == CMYKColorspace))
+ SetPixelBlack(image,LevelizeValue(GetPixelBlack(image,q)),q);
if (((channel & OpacityChannel) != 0) &&
(image->matte == MagickTrue))
- SetPixelOpacity(q,LevelizeValue(GetPixelOpacity(q)));
- if (((channel & IndexChannel) != 0) &&
- (image->colorspace == CMYKColorspace))
- SetPixelIndex(indexes+x,LevelizeValue(
- GetPixelIndex(indexes+x)));
- q++;
+ SetPixelAlpha(image,LevelizeValue(GetPixelAlpha(image,q)),q);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -2898,11 +2871,11 @@
% The format of the LevelColorsImageChannel method is:
%
% MagickBooleanType LevelColorsImage(Image *image,
-% const MagickPixelPacket *black_color,
-% const MagickPixelPacket *white_color,const MagickBooleanType invert)
+% const PixelInfo *black_color,
+% const PixelInfo *white_color,const MagickBooleanType invert)
% MagickBooleanType LevelColorsImageChannel(Image *image,
-% const ChannelType channel,const MagickPixelPacket *black_color,
-% const MagickPixelPacket *white_color,const MagickBooleanType invert)
+% const ChannelType channel,const PixelInfo *black_color,
+% const PixelInfo *white_color,const MagickBooleanType invert)
%
% A description of each parameter follows:
%
@@ -2919,7 +2892,7 @@
*/
MagickExport MagickBooleanType LevelColorsImage(Image *image,
- const MagickPixelPacket *black_color,const MagickPixelPacket *white_color,
+ const PixelInfo *black_color,const PixelInfo *white_color,
const MagickBooleanType invert)
{
MagickBooleanType
@@ -2931,8 +2904,8 @@
}
MagickExport MagickBooleanType LevelColorsImageChannel(Image *image,
- const ChannelType channel,const MagickPixelPacket *black_color,
- const MagickPixelPacket *white_color,const MagickBooleanType invert)
+ const ChannelType channel,const PixelInfo *black_color,
+ const PixelInfo *white_color,const MagickBooleanType invert)
{
MagickStatusType
status;
@@ -2956,14 +2929,14 @@
if ((channel & BlueChannel) != 0)
status|=LevelImageChannel(image,BlueChannel,
black_color->blue,white_color->blue,(double) 1.0);
+ if (((channel & BlackChannel) != 0) &&
+ (image->colorspace == CMYKColorspace))
+ status|=LevelImageChannel(image,BlackChannel,
+ black_color->black,white_color->black,(double) 1.0);
if (((channel & OpacityChannel) != 0) &&
(image->matte == MagickTrue))
status|=LevelImageChannel(image,OpacityChannel,
- black_color->opacity,white_color->opacity,(double) 1.0);
- if (((channel & IndexChannel) != 0) &&
- (image->colorspace == CMYKColorspace))
- status|=LevelImageChannel(image,IndexChannel,
- black_color->index,white_color->index,(double) 1.0);
+ black_color->alpha,white_color->alpha,(double) 1.0);
}
else
{
@@ -2976,14 +2949,14 @@
if ((channel & BlueChannel) != 0)
status|=LevelizeImageChannel(image,BlueChannel,
black_color->blue,white_color->blue,(double) 1.0);
+ if (((channel & BlackChannel) != 0) &&
+ (image->colorspace == CMYKColorspace))
+ status|=LevelizeImageChannel(image,BlackChannel,
+ black_color->black,white_color->black,(double) 1.0);
if (((channel & OpacityChannel) != 0) &&
(image->matte == MagickTrue))
status|=LevelizeImageChannel(image,OpacityChannel,
- black_color->opacity,white_color->opacity,(double) 1.0);
- if (((channel & IndexChannel) != 0) &&
- (image->colorspace == CMYKColorspace))
- status|=LevelizeImageChannel(image,IndexChannel,
- black_color->index,white_color->index,(double) 1.0);
+ black_color->alpha,white_color->alpha,(double) 1.0);
}
return(status == 0 ? MagickFalse : MagickTrue);
}
@@ -3053,19 +3026,19 @@
exception=(&image->exception);
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
register ssize_t
x;
p=GetVirtualPixels(image,0,y,image->columns,1,exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=(ssize_t) image->columns-1; x >= 0; x--)
{
- histogram[ScaleQuantumToMap(PixelIntensityToQuantum(p))]++;
- p++;
+ histogram[ScaleQuantumToMap(GetPixelIntensity(image,p))]++;
+ p+=GetPixelChannels(image);
}
}
/*
@@ -3310,7 +3283,7 @@
green,
red;
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -3319,16 +3292,16 @@
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
for (x=0; x < (ssize_t) image->columns; x++)
{
- red=GetPixelRed(q);
- green=GetPixelGreen(q);
- blue=GetPixelBlue(q);
+ red=GetPixelRed(image,q);
+ green=GetPixelGreen(image,q);
+ blue=GetPixelBlue(image,q);
switch (colorspace)
{
case HSBColorspace:
@@ -3351,10 +3324,10 @@
break;
}
}
- SetPixelRed(q,red);
- SetPixelGreen(q,green);
- SetPixelBlue(q,blue);
- q++;
+ SetPixelRed(image,red,q);
+ SetPixelGreen(image,green,q);
+ SetPixelBlue(image,blue,q);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -3485,10 +3458,7 @@
MagickBooleanType
sync;
- register IndexPacket
- *restrict indexes;
-
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -3498,34 +3468,31 @@
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
- if ((GetPixelRed(q) != GetPixelGreen(q)) ||
- (GetPixelGreen(q) != GetPixelBlue(q)))
+ if ((GetPixelRed(image,q) != GetPixelGreen(image,q)) ||
+ (GetPixelGreen(image,q) != GetPixelBlue(image,q)))
{
- q++;
+ q+=GetPixelChannels(image);
continue;
}
if ((channel & RedChannel) != 0)
- SetPixelRed(q,QuantumRange-GetPixelRed(q));
+ SetPixelRed(image,QuantumRange-GetPixelRed(image,q),q);
if ((channel & GreenChannel) != 0)
- SetPixelGreen(q,QuantumRange-GetPixelGreen(q));
+ SetPixelGreen(image,QuantumRange-GetPixelGreen(image,q),q);
if ((channel & BlueChannel) != 0)
- SetPixelBlue(q,QuantumRange-GetPixelBlue(q));
- if ((channel & OpacityChannel) != 0)
- SetPixelOpacity(q,QuantumRange-
- GetPixelOpacity(q));
- if (((channel & IndexChannel) != 0) &&
+ SetPixelBlue(image,QuantumRange-GetPixelBlue(image,q),q);
+ if (((channel & BlackChannel) != 0) &&
(image->colorspace == CMYKColorspace))
- SetPixelIndex(indexes+x,QuantumRange-
- GetPixelIndex(indexes+x));
- q++;
+ SetPixelBlack(image,QuantumRange-GetPixelBlack(image,q),q);
+ if ((channel & OpacityChannel) != 0)
+ SetPixelAlpha(image,QuantumRange-GetPixelAlpha(image,q),q);
+ q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
if (sync == MagickFalse)
@@ -3555,10 +3522,7 @@
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- register IndexPacket
- *restrict indexes;
-
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -3567,27 +3531,25 @@
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
if ((channel & RedChannel) != 0)
- SetPixelRed(q,QuantumRange-GetPixelRed(q));
+ SetPixelRed(image,QuantumRange-GetPixelRed(image,q),q);
if ((channel & GreenChannel) != 0)
- SetPixelGreen(q,QuantumRange-GetPixelGreen(q));
+ SetPixelGreen(image,QuantumRange-GetPixelGreen(image,q),q);
if ((channel & BlueChannel) != 0)
- SetPixelBlue(q,QuantumRange-GetPixelBlue(q));
- if ((channel & OpacityChannel) != 0)
- SetPixelOpacity(q,QuantumRange-GetPixelOpacity(q));
- if (((channel & IndexChannel) != 0) &&
+ SetPixelBlue(image,QuantumRange-GetPixelBlue(image,q),q);
+ if (((channel & BlackChannel) != 0) &&
(image->colorspace == CMYKColorspace))
- SetPixelIndex(indexes+x,QuantumRange-
- GetPixelIndex(indexes+x));
- q++;
+ SetPixelBlack(image,QuantumRange-GetPixelBlack(image,q),q);
+ if ((channel & OpacityChannel) != 0)
+ SetPixelAlpha(image,QuantumRange-GetPixelAlpha(image,q),q);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -3808,8 +3770,8 @@
image->colormap[i].blue=ClampToQuantum(sigmoidal_map[
ScaleQuantumToMap(image->colormap[i].blue)]);
if ((channel & OpacityChannel) != 0)
- image->colormap[i].opacity=ClampToQuantum(sigmoidal_map[
- ScaleQuantumToMap(image->colormap[i].opacity)]);
+ image->colormap[i].alpha=ClampToQuantum(sigmoidal_map[
+ ScaleQuantumToMap(image->colormap[i].alpha)]);
}
}
/*
@@ -3824,10 +3786,7 @@
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- register IndexPacket
- *restrict indexes;
-
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -3836,31 +3795,30 @@
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
if ((channel & RedChannel) != 0)
- SetPixelRed(q,ClampToQuantum(sigmoidal_map[ScaleQuantumToMap(
- GetPixelRed(q))]));
+ SetPixelRed(image,ClampToQuantum(sigmoidal_map[ScaleQuantumToMap(
+ GetPixelRed(image,q))]),q);
if ((channel & GreenChannel) != 0)
- SetPixelGreen(q,ClampToQuantum(sigmoidal_map[ScaleQuantumToMap(
- GetPixelGreen(q))]));
+ SetPixelGreen(image,ClampToQuantum(sigmoidal_map[ScaleQuantumToMap(
+ GetPixelGreen(image,q))]),q);
if ((channel & BlueChannel) != 0)
- SetPixelBlue(q,ClampToQuantum(sigmoidal_map[ScaleQuantumToMap(
- GetPixelBlue(q))]));
- if ((channel & OpacityChannel) != 0)
- SetPixelOpacity(q,ClampToQuantum(sigmoidal_map[
- ScaleQuantumToMap(GetPixelOpacity(q))]));
- if (((channel & IndexChannel) != 0) &&
+ SetPixelBlue(image,ClampToQuantum(sigmoidal_map[ScaleQuantumToMap(
+ GetPixelBlue(image,q))]),q);
+ if (((channel & BlackChannel) != 0) &&
(image->colorspace == CMYKColorspace))
- SetPixelIndex(indexes+x,ClampToQuantum(sigmoidal_map[
- ScaleQuantumToMap(GetPixelIndex(indexes+x))]));
- q++;
+ SetPixelBlack(image,ClampToQuantum(sigmoidal_map[ScaleQuantumToMap(
+ GetPixelBlack(image,q))]),q);
+ if ((channel & OpacityChannel) != 0)
+ SetPixelAlpha(image,ClampToQuantum(sigmoidal_map[ScaleQuantumToMap(
+ GetPixelAlpha(image,q))]),q);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
diff --git a/magick/enhance.h b/MagickCore/enhance.h
similarity index 92%
rename from magick/enhance.h
rename to MagickCore/enhance.h
index ad3e9c9..fb5d39b 100644
--- a/magick/enhance.h
+++ b/MagickCore/enhance.h
@@ -49,10 +49,10 @@
LevelizeImage(Image *,const double,const double,const double),
LevelizeImageChannel(Image *,const ChannelType,const double,const double,
const double),
- LevelColorsImage(Image *,const MagickPixelPacket *,const MagickPixelPacket *,
+ LevelColorsImage(Image *,const PixelInfo *,const PixelInfo *,
const MagickBooleanType),
- LevelColorsImageChannel(Image *,const ChannelType,const MagickPixelPacket *,
- const MagickPixelPacket *,const MagickBooleanType),
+ LevelColorsImageChannel(Image *,const ChannelType,const PixelInfo *,
+ const PixelInfo *,const MagickBooleanType),
LinearStretchImage(Image *,const double,const double),
ModulateImage(Image *,const char *),
NegateImage(Image *,const MagickBooleanType),
diff --git a/magick/exception-private.h b/MagickCore/exception-private.h
similarity index 97%
rename from magick/exception-private.h
rename to MagickCore/exception-private.h
index 558c60b..8fef7e9 100644
--- a/magick/exception-private.h
+++ b/MagickCore/exception-private.h
@@ -22,8 +22,8 @@
extern "C" {
#endif
-#include "magick/log.h"
-#include "magick/string_.h"
+#include "MagickCore/log.h"
+#include "MagickCore/string_.h"
#define ThrowBinaryException(severity,tag,context) \
{ \
diff --git a/magick/exception.c b/MagickCore/exception.c
similarity index 98%
rename from magick/exception.c
rename to MagickCore/exception.c
index 57dc25e..509a585 100644
--- a/magick/exception.c
+++ b/MagickCore/exception.c
@@ -40,17 +40,17 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/client.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/hashmap.h"
-#include "magick/locale_.h"
-#include "magick/log.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/string_.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/client.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/hashmap.h"
+#include "MagickCore/locale_.h"
+#include "MagickCore/log.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/utility.h"
/*
Forward declarations.
diff --git a/magick/exception.h b/MagickCore/exception.h
similarity index 98%
rename from magick/exception.h
rename to MagickCore/exception.h
index c288653..de24d7e 100644
--- a/magick/exception.h
+++ b/MagickCore/exception.h
@@ -23,7 +23,7 @@
#endif
#include <stdarg.h>
-#include "magick/semaphore.h"
+#include "MagickCore/semaphore.h"
typedef enum
{
diff --git a/magick/feature.c b/MagickCore/feature.c
similarity index 76%
rename from magick/feature.c
rename to MagickCore/feature.c
index 6605ba4..f2b54f4 100644
--- a/magick/feature.c
+++ b/MagickCore/feature.c
@@ -40,54 +40,54 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/property.h"
-#include "magick/animate.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/cache-private.h"
-#include "magick/cache-view.h"
-#include "magick/client.h"
-#include "magick/color.h"
-#include "magick/color-private.h"
-#include "magick/colorspace.h"
-#include "magick/colorspace-private.h"
-#include "magick/composite.h"
-#include "magick/composite-private.h"
-#include "magick/compress.h"
-#include "magick/constitute.h"
-#include "magick/deprecate.h"
-#include "magick/display.h"
-#include "magick/draw.h"
-#include "magick/enhance.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/feature.h"
-#include "magick/gem.h"
-#include "magick/geometry.h"
-#include "magick/list.h"
-#include "magick/image-private.h"
-#include "magick/magic.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/module.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/option.h"
-#include "magick/paint.h"
-#include "magick/pixel-private.h"
-#include "magick/profile.h"
-#include "magick/quantize.h"
-#include "magick/random_.h"
-#include "magick/segment.h"
-#include "magick/semaphore.h"
-#include "magick/signature-private.h"
-#include "magick/string_.h"
-#include "magick/thread-private.h"
-#include "magick/timer.h"
-#include "magick/utility.h"
-#include "magick/version.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/property.h"
+#include "MagickCore/animate.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/cache-private.h"
+#include "MagickCore/cache-view.h"
+#include "MagickCore/client.h"
+#include "MagickCore/color.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/colorspace-private.h"
+#include "MagickCore/composite.h"
+#include "MagickCore/composite-private.h"
+#include "MagickCore/compress.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/display.h"
+#include "MagickCore/draw.h"
+#include "MagickCore/enhance.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/feature.h"
+#include "MagickCore/gem.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/list.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/magic.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/option.h"
+#include "MagickCore/paint.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/profile.h"
+#include "MagickCore/quantize.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/random_.h"
+#include "MagickCore/segment.h"
+#include "MagickCore/semaphore.h"
+#include "MagickCore/signature-private.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/thread-private.h"
+#include "MagickCore/timer.h"
+#include "MagickCore/utility.h"
+#include "MagickCore/version.h"
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -217,8 +217,8 @@
grays[i].red=(~0U);
grays[i].green=(~0U);
grays[i].blue=(~0U);
- grays[i].opacity=(~0U);
- grays[i].index=(~0U);
+ grays[i].alpha=(~0U);
+ grays[i].black=(~0U);
}
status=MagickTrue;
image_view=AcquireCacheView(image);
@@ -227,10 +227,7 @@
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const IndexPacket
- *restrict indexes;
-
- register const PixelPacket
+ register const Quantum
*restrict p;
register ssize_t
@@ -239,27 +236,26 @@
if (status == MagickFalse)
continue;
p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewVirtualIndexQueue(image_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
- grays[ScaleQuantumToMap(GetPixelRed(p))].red=
- ScaleQuantumToMap(GetPixelRed(p));
- grays[ScaleQuantumToMap(GetPixelGreen(p))].green=
- ScaleQuantumToMap(GetPixelGreen(p));
- grays[ScaleQuantumToMap(GetPixelBlue(p))].blue=
- ScaleQuantumToMap(GetPixelBlue(p));
+ grays[ScaleQuantumToMap(GetPixelRed(image,p))].red=
+ ScaleQuantumToMap(GetPixelRed(image,p));
+ grays[ScaleQuantumToMap(GetPixelGreen(image,p))].green=
+ ScaleQuantumToMap(GetPixelGreen(image,p));
+ grays[ScaleQuantumToMap(GetPixelBlue(image,p))].blue=
+ ScaleQuantumToMap(GetPixelBlue(image,p));
if (image->colorspace == CMYKColorspace)
- grays[ScaleQuantumToMap(GetPixelIndex(indexes+x))].index=
- ScaleQuantumToMap(GetPixelIndex(indexes+x));
+ grays[ScaleQuantumToMap(GetPixelBlack(image,p))].black=
+ ScaleQuantumToMap(GetPixelBlack(image,p));
if (image->matte != MagickFalse)
- grays[ScaleQuantumToMap(GetPixelOpacity(p))].opacity=
- ScaleQuantumToMap(GetPixelOpacity(p));
- p++;
+ grays[ScaleQuantumToMap(GetPixelAlpha(image,p))].alpha=
+ ScaleQuantumToMap(GetPixelAlpha(image,p));
+ p+=GetPixelChannels(image);
}
}
image_view=DestroyCacheView(image_view);
@@ -274,17 +270,17 @@
for (i=0; i <= (ssize_t) MaxMap; i++)
{
if (grays[i].red != ~0U)
- grays[(ssize_t) gray.red++].red=grays[i].red;
+ grays[gray.red++].red=grays[i].red;
if (grays[i].green != ~0U)
- grays[(ssize_t) gray.green++].green=grays[i].green;
+ grays[gray.green++].green=grays[i].green;
if (grays[i].blue != ~0U)
- grays[(ssize_t) gray.blue++].blue=grays[i].blue;
+ grays[gray.blue++].blue=grays[i].blue;
if (image->colorspace == CMYKColorspace)
- if (grays[i].index != ~0U)
- grays[(ssize_t) gray.index++].index=grays[i].index;
+ if (grays[i].black != ~0U)
+ grays[gray.black++].black=grays[i].black;
if (image->matte != MagickFalse)
- if (grays[i].opacity != ~0U)
- grays[(ssize_t) gray.opacity++].opacity=grays[i].opacity;
+ if (grays[i].alpha != ~0U)
+ grays[gray.alpha++].alpha=grays[i].alpha;
}
/*
Allocate spatial dependence matrix.
@@ -295,11 +291,11 @@
if (gray.blue > number_grays)
number_grays=gray.blue;
if (image->colorspace == CMYKColorspace)
- if (gray.index > number_grays)
- number_grays=gray.index;
+ if (gray.black > number_grays)
+ number_grays=gray.black;
if (image->matte != MagickFalse)
- if (gray.opacity > number_grays)
- number_grays=gray.opacity;
+ if (gray.alpha > number_grays)
+ number_grays=gray.alpha;
cooccurrence=(ChannelStatistics **) AcquireQuantumMemory(number_grays,
sizeof(*cooccurrence));
density_x=(ChannelStatistics *) AcquireQuantumMemory(2*(number_grays+1),
@@ -402,10 +398,7 @@
image_view=AcquireCacheView(image);
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const IndexPacket
- *restrict indexes;
-
- register const PixelPacket
+ register const Quantum
*restrict p;
register ssize_t
@@ -421,14 +414,12 @@
continue;
p=GetCacheViewVirtualPixels(image_view,-(ssize_t) distance,y,image->columns+
2*distance,distance+1,exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewVirtualIndexQueue(image_view);
- p+=distance;
- indexes+=distance;
+ p+=distance*GetPixelChannels(image);;
for (x=0; x < (ssize_t) image->columns; x++)
{
for (i=0; i < 4; i++)
@@ -471,25 +462,25 @@
}
u=0;
v=0;
- while (grays[u].red != ScaleQuantumToMap(GetPixelRed(p)))
+ while (grays[u].red != ScaleQuantumToMap(GetPixelRed(image,p)))
u++;
- while (grays[v].red != ScaleQuantumToMap(GetPixelRed(p+offset)))
+ while (grays[v].red != ScaleQuantumToMap(GetPixelRed(image,p+offset*GetPixelChannels(image))))
v++;
cooccurrence[u][v].direction[i].red++;
cooccurrence[v][u].direction[i].red++;
u=0;
v=0;
- while (grays[u].green != ScaleQuantumToMap(GetPixelGreen(p)))
+ while (grays[u].green != ScaleQuantumToMap(GetPixelGreen(image,p)))
u++;
- while (grays[v].green != ScaleQuantumToMap(GetPixelGreen(p+offset)))
+ while (grays[v].green != ScaleQuantumToMap(GetPixelGreen(image,p+offset*GetPixelChannels(image))))
v++;
cooccurrence[u][v].direction[i].green++;
cooccurrence[v][u].direction[i].green++;
u=0;
v=0;
- while (grays[u].blue != ScaleQuantumToMap(GetPixelBlue(p)))
+ while (grays[u].blue != ScaleQuantumToMap(GetPixelBlue(image,p)))
u++;
- while (grays[v].blue != ScaleQuantumToMap((p+offset)->blue))
+ while (grays[v].blue != ScaleQuantumToMap(GetPixelBlue(image,p+offset*GetPixelChannels(image))))
v++;
cooccurrence[u][v].direction[i].blue++;
cooccurrence[v][u].direction[i].blue++;
@@ -497,26 +488,26 @@
{
u=0;
v=0;
- while (grays[u].index != ScaleQuantumToMap(GetPixelIndex(indexes+x)))
+ while (grays[u].black != ScaleQuantumToMap(GetPixelBlack(image,p)))
u++;
- while (grays[v].index != ScaleQuantumToMap(GetPixelIndex(indexes+x+offset)))
+ while (grays[v].black != ScaleQuantumToMap(GetPixelBlack(image,p+offset*GetPixelChannels(image))))
v++;
- cooccurrence[u][v].direction[i].index++;
- cooccurrence[v][u].direction[i].index++;
+ cooccurrence[u][v].direction[i].black++;
+ cooccurrence[v][u].direction[i].black++;
}
if (image->matte != MagickFalse)
{
u=0;
v=0;
- while (grays[u].opacity != ScaleQuantumToMap(GetPixelOpacity(p)))
+ while (grays[u].alpha != ScaleQuantumToMap(GetPixelAlpha(image,p)))
u++;
- while (grays[v].opacity != ScaleQuantumToMap((p+offset)->opacity))
+ while (grays[v].alpha != ScaleQuantumToMap(GetPixelAlpha(image,p+offset*GetPixelChannels(image))))
v++;
- cooccurrence[u][v].direction[i].opacity++;
- cooccurrence[v][u].direction[i].opacity++;
+ cooccurrence[u][v].direction[i].alpha++;
+ cooccurrence[v][u].direction[i].alpha++;
}
}
- p++;
+ p+=GetPixelChannels(image);
}
}
grays=(LongPixelPacket *) RelinquishMagickMemory(grays);
@@ -592,9 +583,9 @@
cooccurrence[x][y].direction[i].green*=normalize;
cooccurrence[x][y].direction[i].blue*=normalize;
if (image->colorspace == CMYKColorspace)
- cooccurrence[x][y].direction[i].index*=normalize;
+ cooccurrence[x][y].direction[i].black*=normalize;
if (image->matte != MagickFalse)
- cooccurrence[x][y].direction[i].opacity*=normalize;
+ cooccurrence[x][y].direction[i].alpha*=normalize;
}
}
}
@@ -630,12 +621,12 @@
cooccurrence[x][y].direction[i].blue;
if (image->colorspace == CMYKColorspace)
channel_features[BlackChannel].angular_second_moment[i]+=
- cooccurrence[x][y].direction[i].index*
- cooccurrence[x][y].direction[i].index;
+ cooccurrence[x][y].direction[i].black*
+ cooccurrence[x][y].direction[i].black;
if (image->matte != MagickFalse)
channel_features[OpacityChannel].angular_second_moment[i]+=
- cooccurrence[x][y].direction[i].opacity*
- cooccurrence[x][y].direction[i].opacity;
+ cooccurrence[x][y].direction[i].alpha*
+ cooccurrence[x][y].direction[i].alpha;
/*
Correlation: measure of linear-dependencies in the image.
*/
@@ -643,20 +634,20 @@
sum[y].direction[i].green+=cooccurrence[x][y].direction[i].green;
sum[y].direction[i].blue+=cooccurrence[x][y].direction[i].blue;
if (image->colorspace == CMYKColorspace)
- sum[y].direction[i].index+=cooccurrence[x][y].direction[i].index;
+ sum[y].direction[i].black+=cooccurrence[x][y].direction[i].black;
if (image->matte != MagickFalse)
- sum[y].direction[i].opacity+=cooccurrence[x][y].direction[i].opacity;
+ sum[y].direction[i].alpha+=cooccurrence[x][y].direction[i].alpha;
correlation.direction[i].red+=x*y*cooccurrence[x][y].direction[i].red;
correlation.direction[i].green+=x*y*
cooccurrence[x][y].direction[i].green;
correlation.direction[i].blue+=x*y*
cooccurrence[x][y].direction[i].blue;
if (image->colorspace == CMYKColorspace)
- correlation.direction[i].index+=x*y*
- cooccurrence[x][y].direction[i].index;
+ correlation.direction[i].black+=x*y*
+ cooccurrence[x][y].direction[i].black;
if (image->matte != MagickFalse)
- correlation.direction[i].opacity+=x*y*
- cooccurrence[x][y].direction[i].opacity;
+ correlation.direction[i].alpha+=x*y*
+ cooccurrence[x][y].direction[i].alpha;
/*
Inverse Difference Moment.
*/
@@ -667,11 +658,11 @@
channel_features[BlueChannel].inverse_difference_moment[i]+=
cooccurrence[x][y].direction[i].blue/((y-x)*(y-x)+1);
if (image->colorspace == CMYKColorspace)
- channel_features[IndexChannel].inverse_difference_moment[i]+=
- cooccurrence[x][y].direction[i].index/((y-x)*(y-x)+1);
+ channel_features[BlackChannel].inverse_difference_moment[i]+=
+ cooccurrence[x][y].direction[i].black/((y-x)*(y-x)+1);
if (image->matte != MagickFalse)
channel_features[OpacityChannel].inverse_difference_moment[i]+=
- cooccurrence[x][y].direction[i].opacity/((y-x)*(y-x)+1);
+ cooccurrence[x][y].direction[i].alpha/((y-x)*(y-x)+1);
/*
Sum average.
*/
@@ -682,11 +673,11 @@
density_xy[y+x+2].direction[i].blue+=
cooccurrence[x][y].direction[i].blue;
if (image->colorspace == CMYKColorspace)
- density_xy[y+x+2].direction[i].index+=
- cooccurrence[x][y].direction[i].index;
+ density_xy[y+x+2].direction[i].black+=
+ cooccurrence[x][y].direction[i].black;
if (image->matte != MagickFalse)
- density_xy[y+x+2].direction[i].opacity+=
- cooccurrence[x][y].direction[i].opacity;
+ density_xy[y+x+2].direction[i].alpha+=
+ cooccurrence[x][y].direction[i].alpha;
/*
Entropy.
*/
@@ -700,34 +691,34 @@
cooccurrence[x][y].direction[i].blue*
log10(cooccurrence[x][y].direction[i].blue+MagickEpsilon);
if (image->colorspace == CMYKColorspace)
- channel_features[IndexChannel].entropy[i]-=
- cooccurrence[x][y].direction[i].index*
- log10(cooccurrence[x][y].direction[i].index+MagickEpsilon);
+ channel_features[BlackChannel].entropy[i]-=
+ cooccurrence[x][y].direction[i].black*
+ log10(cooccurrence[x][y].direction[i].black+MagickEpsilon);
if (image->matte != MagickFalse)
channel_features[OpacityChannel].entropy[i]-=
- cooccurrence[x][y].direction[i].opacity*
- log10(cooccurrence[x][y].direction[i].opacity+MagickEpsilon);
+ cooccurrence[x][y].direction[i].alpha*
+ log10(cooccurrence[x][y].direction[i].alpha+MagickEpsilon);
/*
Information Measures of Correlation.
*/
density_x[x].direction[i].red+=cooccurrence[x][y].direction[i].red;
density_x[x].direction[i].green+=cooccurrence[x][y].direction[i].green;
density_x[x].direction[i].blue+=cooccurrence[x][y].direction[i].blue;
- if (image->colorspace == CMYKColorspace)
- density_x[x].direction[i].index+=
- cooccurrence[x][y].direction[i].index;
if (image->matte != MagickFalse)
- density_x[x].direction[i].opacity+=
- cooccurrence[x][y].direction[i].opacity;
+ density_x[x].direction[i].alpha+=
+ cooccurrence[x][y].direction[i].alpha;
+ if (image->colorspace == CMYKColorspace)
+ density_x[x].direction[i].black+=
+ cooccurrence[x][y].direction[i].black;
density_y[y].direction[i].red+=cooccurrence[x][y].direction[i].red;
density_y[y].direction[i].green+=cooccurrence[x][y].direction[i].green;
density_y[y].direction[i].blue+=cooccurrence[x][y].direction[i].blue;
if (image->colorspace == CMYKColorspace)
- density_y[y].direction[i].index+=
- cooccurrence[x][y].direction[i].index;
+ density_y[y].direction[i].black+=
+ cooccurrence[x][y].direction[i].black;
if (image->matte != MagickFalse)
- density_y[y].direction[i].opacity+=
- cooccurrence[x][y].direction[i].opacity;
+ density_y[y].direction[i].alpha+=
+ cooccurrence[x][y].direction[i].alpha;
}
mean.direction[i].red+=y*sum[y].direction[i].red;
sum_squares.direction[i].red+=y*y*sum[y].direction[i].red;
@@ -737,13 +728,13 @@
sum_squares.direction[i].blue+=y*y*sum[y].direction[i].blue;
if (image->colorspace == CMYKColorspace)
{
- mean.direction[i].index+=y*sum[y].direction[i].index;
- sum_squares.direction[i].index+=y*y*sum[y].direction[i].index;
+ mean.direction[i].black+=y*sum[y].direction[i].black;
+ sum_squares.direction[i].black+=y*y*sum[y].direction[i].black;
}
if (image->matte != MagickFalse)
{
- mean.direction[i].opacity+=y*sum[y].direction[i].opacity;
- sum_squares.direction[i].opacity+=y*y*sum[y].direction[i].opacity;
+ mean.direction[i].alpha+=y*sum[y].direction[i].alpha;
+ sum_squares.direction[i].alpha+=y*y*sum[y].direction[i].alpha;
}
}
/*
@@ -768,19 +759,19 @@
sum_squares.direction[i].blue-(mean.direction[i].blue*
mean.direction[i].blue)));
if (image->colorspace == CMYKColorspace)
- channel_features[IndexChannel].correlation[i]=
- (correlation.direction[i].index-mean.direction[i].index*
- mean.direction[i].index)/(sqrt(sum_squares.direction[i].index-
- (mean.direction[i].index*mean.direction[i].index))*sqrt(
- sum_squares.direction[i].index-(mean.direction[i].index*
- mean.direction[i].index)));
+ channel_features[BlackChannel].correlation[i]=
+ (correlation.direction[i].black-mean.direction[i].black*
+ mean.direction[i].black)/(sqrt(sum_squares.direction[i].black-
+ (mean.direction[i].black*mean.direction[i].black))*sqrt(
+ sum_squares.direction[i].black-(mean.direction[i].black*
+ mean.direction[i].black)));
if (image->matte != MagickFalse)
channel_features[OpacityChannel].correlation[i]=
- (correlation.direction[i].opacity-mean.direction[i].opacity*
- mean.direction[i].opacity)/(sqrt(sum_squares.direction[i].opacity-
- (mean.direction[i].opacity*mean.direction[i].opacity))*sqrt(
- sum_squares.direction[i].opacity-(mean.direction[i].opacity*
- mean.direction[i].opacity)));
+ (correlation.direction[i].alpha-mean.direction[i].alpha*
+ mean.direction[i].alpha)/(sqrt(sum_squares.direction[i].alpha-
+ (mean.direction[i].alpha*mean.direction[i].alpha))*sqrt(
+ sum_squares.direction[i].alpha-(mean.direction[i].alpha*
+ mean.direction[i].alpha)));
}
/*
Compute more texture features.
@@ -805,11 +796,11 @@
channel_features[BlueChannel].sum_average[i]+=
x*density_xy[x].direction[i].blue;
if (image->colorspace == CMYKColorspace)
- channel_features[IndexChannel].sum_average[i]+=
- x*density_xy[x].direction[i].index;
+ channel_features[BlackChannel].sum_average[i]+=
+ x*density_xy[x].direction[i].black;
if (image->matte != MagickFalse)
channel_features[OpacityChannel].sum_average[i]+=
- x*density_xy[x].direction[i].opacity;
+ x*density_xy[x].direction[i].alpha;
/*
Sum entropy.
*/
@@ -823,13 +814,13 @@
density_xy[x].direction[i].blue*
log10(density_xy[x].direction[i].blue+MagickEpsilon);
if (image->colorspace == CMYKColorspace)
- channel_features[IndexChannel].sum_entropy[i]-=
- density_xy[x].direction[i].index*
- log10(density_xy[x].direction[i].index+MagickEpsilon);
+ channel_features[BlackChannel].sum_entropy[i]-=
+ density_xy[x].direction[i].black*
+ log10(density_xy[x].direction[i].black+MagickEpsilon);
if (image->matte != MagickFalse)
channel_features[OpacityChannel].sum_entropy[i]-=
- density_xy[x].direction[i].opacity*
- log10(density_xy[x].direction[i].opacity+MagickEpsilon);
+ density_xy[x].direction[i].alpha*
+ log10(density_xy[x].direction[i].alpha+MagickEpsilon);
/*
Sum variance.
*/
@@ -846,15 +837,15 @@
(x-channel_features[BlueChannel].sum_entropy[i])*
density_xy[x].direction[i].blue;
if (image->colorspace == CMYKColorspace)
- channel_features[IndexChannel].sum_variance[i]+=
- (x-channel_features[IndexChannel].sum_entropy[i])*
- (x-channel_features[IndexChannel].sum_entropy[i])*
- density_xy[x].direction[i].index;
+ channel_features[BlackChannel].sum_variance[i]+=
+ (x-channel_features[BlackChannel].sum_entropy[i])*
+ (x-channel_features[BlackChannel].sum_entropy[i])*
+ density_xy[x].direction[i].black;
if (image->matte != MagickFalse)
channel_features[OpacityChannel].sum_variance[i]+=
(x-channel_features[OpacityChannel].sum_entropy[i])*
(x-channel_features[OpacityChannel].sum_entropy[i])*
- density_xy[x].direction[i].opacity;
+ density_xy[x].direction[i].alpha;
}
}
/*
@@ -885,12 +876,12 @@
variance.direction[i].blue+=(y-mean.direction[i].blue+1)*
(y-mean.direction[i].blue+1)*cooccurrence[x][y].direction[i].blue;
if (image->colorspace == CMYKColorspace)
- variance.direction[i].index+=(y-mean.direction[i].index+1)*
- (y-mean.direction[i].index+1)*cooccurrence[x][y].direction[i].index;
+ variance.direction[i].black+=(y-mean.direction[i].black+1)*
+ (y-mean.direction[i].black+1)*cooccurrence[x][y].direction[i].black;
if (image->matte != MagickFalse)
- variance.direction[i].opacity+=(y-mean.direction[i].opacity+1)*
- (y-mean.direction[i].opacity+1)*
- cooccurrence[x][y].direction[i].opacity;
+ variance.direction[i].alpha+=(y-mean.direction[i].alpha+1)*
+ (y-mean.direction[i].alpha+1)*
+ cooccurrence[x][y].direction[i].alpha;
/*
Sum average / Difference Variance.
*/
@@ -901,11 +892,11 @@
density_xy[MagickAbsoluteValue(y-x)].direction[i].blue+=
cooccurrence[x][y].direction[i].blue;
if (image->colorspace == CMYKColorspace)
- density_xy[MagickAbsoluteValue(y-x)].direction[i].index+=
- cooccurrence[x][y].direction[i].index;
+ density_xy[MagickAbsoluteValue(y-x)].direction[i].black+=
+ cooccurrence[x][y].direction[i].black;
if (image->matte != MagickFalse)
- density_xy[MagickAbsoluteValue(y-x)].direction[i].opacity+=
- cooccurrence[x][y].direction[i].opacity;
+ density_xy[MagickAbsoluteValue(y-x)].direction[i].alpha+=
+ cooccurrence[x][y].direction[i].alpha;
/*
Information Measures of Correlation.
*/
@@ -916,12 +907,12 @@
entropy_xy.direction[i].blue-=cooccurrence[x][y].direction[i].blue*
log10(cooccurrence[x][y].direction[i].blue+MagickEpsilon);
if (image->colorspace == CMYKColorspace)
- entropy_xy.direction[i].index-=cooccurrence[x][y].direction[i].index*
- log10(cooccurrence[x][y].direction[i].index+MagickEpsilon);
+ entropy_xy.direction[i].black-=cooccurrence[x][y].direction[i].black*
+ log10(cooccurrence[x][y].direction[i].black+MagickEpsilon);
if (image->matte != MagickFalse)
- entropy_xy.direction[i].opacity-=
- cooccurrence[x][y].direction[i].opacity*log10(
- cooccurrence[x][y].direction[i].opacity+MagickEpsilon);
+ entropy_xy.direction[i].alpha-=
+ cooccurrence[x][y].direction[i].alpha*log10(
+ cooccurrence[x][y].direction[i].alpha+MagickEpsilon);
entropy_xy1.direction[i].red-=(cooccurrence[x][y].direction[i].red*
log10(density_x[x].direction[i].red*density_y[y].direction[i].red+
MagickEpsilon));
@@ -932,14 +923,14 @@
log10(density_x[x].direction[i].blue*density_y[y].direction[i].blue+
MagickEpsilon));
if (image->colorspace == CMYKColorspace)
- entropy_xy1.direction[i].index-=(
- cooccurrence[x][y].direction[i].index*log10(
- density_x[x].direction[i].index*density_y[y].direction[i].index+
+ entropy_xy1.direction[i].black-=(
+ cooccurrence[x][y].direction[i].black*log10(
+ density_x[x].direction[i].black*density_y[y].direction[i].black+
MagickEpsilon));
if (image->matte != MagickFalse)
- entropy_xy1.direction[i].opacity-=(
- cooccurrence[x][y].direction[i].opacity*log10(
- density_x[x].direction[i].opacity*density_y[y].direction[i].opacity+
+ entropy_xy1.direction[i].alpha-=(
+ cooccurrence[x][y].direction[i].alpha*log10(
+ density_x[x].direction[i].alpha*density_y[y].direction[i].alpha+
MagickEpsilon));
entropy_xy2.direction[i].red-=(density_x[x].direction[i].red*
density_y[y].direction[i].red*log10(density_x[x].direction[i].red*
@@ -951,14 +942,14 @@
density_y[y].direction[i].blue*log10(density_x[x].direction[i].blue*
density_y[y].direction[i].blue+MagickEpsilon));
if (image->colorspace == CMYKColorspace)
- entropy_xy2.direction[i].index-=(density_x[x].direction[i].index*
- density_y[y].direction[i].index*log10(
- density_x[x].direction[i].index*density_y[y].direction[i].index+
+ entropy_xy2.direction[i].black-=(density_x[x].direction[i].black*
+ density_y[y].direction[i].black*log10(
+ density_x[x].direction[i].black*density_y[y].direction[i].black+
MagickEpsilon));
if (image->matte != MagickFalse)
- entropy_xy2.direction[i].opacity-=(density_x[x].direction[i].opacity*
- density_y[y].direction[i].opacity*log10(
- density_x[x].direction[i].opacity*density_y[y].direction[i].opacity+
+ entropy_xy2.direction[i].alpha-=(density_x[x].direction[i].alpha*
+ density_y[y].direction[i].alpha*log10(
+ density_x[x].direction[i].alpha*density_y[y].direction[i].alpha+
MagickEpsilon));
}
}
@@ -970,10 +961,10 @@
variance.direction[i].blue;
if (image->colorspace == CMYKColorspace)
channel_features[RedChannel].variance_sum_of_squares[i]=
- variance.direction[i].index;
+ variance.direction[i].black;
if (image->matte != MagickFalse)
channel_features[RedChannel].variance_sum_of_squares[i]=
- variance.direction[i].opacity;
+ variance.direction[i].alpha;
}
/*
Compute more texture features.
@@ -997,9 +988,9 @@
variance.direction[i].green+=density_xy[x].direction[i].green;
variance.direction[i].blue+=density_xy[x].direction[i].blue;
if (image->colorspace == CMYKColorspace)
- variance.direction[i].index+=density_xy[x].direction[i].index;
+ variance.direction[i].black+=density_xy[x].direction[i].black;
if (image->matte != MagickFalse)
- variance.direction[i].opacity+=density_xy[x].direction[i].opacity;
+ variance.direction[i].alpha+=density_xy[x].direction[i].alpha;
sum_squares.direction[i].red+=density_xy[x].direction[i].red*
density_xy[x].direction[i].red;
sum_squares.direction[i].green+=density_xy[x].direction[i].green*
@@ -1007,11 +998,11 @@
sum_squares.direction[i].blue+=density_xy[x].direction[i].blue*
density_xy[x].direction[i].blue;
if (image->colorspace == CMYKColorspace)
- sum_squares.direction[i].index+=density_xy[x].direction[i].index*
- density_xy[x].direction[i].index;
+ sum_squares.direction[i].black+=density_xy[x].direction[i].black*
+ density_xy[x].direction[i].black;
if (image->matte != MagickFalse)
- sum_squares.direction[i].opacity+=density_xy[x].direction[i].opacity*
- density_xy[x].direction[i].opacity;
+ sum_squares.direction[i].alpha+=density_xy[x].direction[i].alpha*
+ density_xy[x].direction[i].alpha;
/*
Difference entropy.
*/
@@ -1025,13 +1016,13 @@
density_xy[x].direction[i].blue*
log10(density_xy[x].direction[i].blue+MagickEpsilon);
if (image->colorspace == CMYKColorspace)
- channel_features[IndexChannel].difference_entropy[i]-=
- density_xy[x].direction[i].index*
- log10(density_xy[x].direction[i].index+MagickEpsilon);
+ channel_features[BlackChannel].difference_entropy[i]-=
+ density_xy[x].direction[i].black*
+ log10(density_xy[x].direction[i].black+MagickEpsilon);
if (image->matte != MagickFalse)
channel_features[OpacityChannel].difference_entropy[i]-=
- density_xy[x].direction[i].opacity*
- log10(density_xy[x].direction[i].opacity+MagickEpsilon);
+ density_xy[x].direction[i].alpha*
+ log10(density_xy[x].direction[i].alpha+MagickEpsilon);
/*
Information Measures of Correlation.
*/
@@ -1042,11 +1033,11 @@
entropy_x.direction[i].blue-=(density_x[x].direction[i].blue*
log10(density_x[x].direction[i].blue+MagickEpsilon));
if (image->colorspace == CMYKColorspace)
- entropy_x.direction[i].index-=(density_x[x].direction[i].index*
- log10(density_x[x].direction[i].index+MagickEpsilon));
+ entropy_x.direction[i].black-=(density_x[x].direction[i].black*
+ log10(density_x[x].direction[i].black+MagickEpsilon));
if (image->matte != MagickFalse)
- entropy_x.direction[i].opacity-=(density_x[x].direction[i].opacity*
- log10(density_x[x].direction[i].opacity+MagickEpsilon));
+ entropy_x.direction[i].alpha-=(density_x[x].direction[i].alpha*
+ log10(density_x[x].direction[i].alpha+MagickEpsilon));
entropy_y.direction[i].red-=(density_y[x].direction[i].red*
log10(density_y[x].direction[i].red+MagickEpsilon));
entropy_y.direction[i].green-=(density_y[x].direction[i].green*
@@ -1054,11 +1045,11 @@
entropy_y.direction[i].blue-=(density_y[x].direction[i].blue*
log10(density_y[x].direction[i].blue+MagickEpsilon));
if (image->colorspace == CMYKColorspace)
- entropy_y.direction[i].index-=(density_y[x].direction[i].index*
- log10(density_y[x].direction[i].index+MagickEpsilon));
+ entropy_y.direction[i].black-=(density_y[x].direction[i].black*
+ log10(density_y[x].direction[i].black+MagickEpsilon));
if (image->matte != MagickFalse)
- entropy_y.direction[i].opacity-=(density_y[x].direction[i].opacity*
- log10(density_y[x].direction[i].opacity+MagickEpsilon));
+ entropy_y.direction[i].alpha-=(density_y[x].direction[i].alpha*
+ log10(density_y[x].direction[i].alpha+MagickEpsilon));
}
/*
Difference variance.
@@ -1075,15 +1066,15 @@
(((double) number_grays*number_grays*sum_squares.direction[i].blue)-
(variance.direction[i].blue*variance.direction[i].blue))/
((double) number_grays*number_grays*number_grays*number_grays);
+ if (image->colorspace == CMYKColorspace)
+ channel_features[BlackChannel].difference_variance[i]=
+ (((double) number_grays*number_grays*sum_squares.direction[i].black)-
+ (variance.direction[i].black*variance.direction[i].black))/
+ ((double) number_grays*number_grays*number_grays*number_grays);
if (image->matte != MagickFalse)
channel_features[OpacityChannel].difference_variance[i]=
- (((double) number_grays*number_grays*sum_squares.direction[i].opacity)-
- (variance.direction[i].opacity*variance.direction[i].opacity))/
- ((double) number_grays*number_grays*number_grays*number_grays);
- if (image->colorspace == CMYKColorspace)
- channel_features[IndexChannel].difference_variance[i]=
- (((double) number_grays*number_grays*sum_squares.direction[i].index)-
- (variance.direction[i].index*variance.direction[i].index))/
+ (((double) number_grays*number_grays*sum_squares.direction[i].alpha)-
+ (variance.direction[i].alpha*variance.direction[i].alpha))/
((double) number_grays*number_grays*number_grays*number_grays);
/*
Information Measures of Correlation.
@@ -1101,15 +1092,15 @@
(entropy_x.direction[i].blue > entropy_y.direction[i].blue ?
entropy_x.direction[i].blue : entropy_y.direction[i].blue);
if (image->colorspace == CMYKColorspace)
- channel_features[IndexChannel].measure_of_correlation_1[i]=
- (entropy_xy.direction[i].index-entropy_xy1.direction[i].index)/
- (entropy_x.direction[i].index > entropy_y.direction[i].index ?
- entropy_x.direction[i].index : entropy_y.direction[i].index);
+ channel_features[BlackChannel].measure_of_correlation_1[i]=
+ (entropy_xy.direction[i].black-entropy_xy1.direction[i].black)/
+ (entropy_x.direction[i].black > entropy_y.direction[i].black ?
+ entropy_x.direction[i].black : entropy_y.direction[i].black);
if (image->matte != MagickFalse)
channel_features[OpacityChannel].measure_of_correlation_1[i]=
- (entropy_xy.direction[i].opacity-entropy_xy1.direction[i].opacity)/
- (entropy_x.direction[i].opacity > entropy_y.direction[i].opacity ?
- entropy_x.direction[i].opacity : entropy_y.direction[i].opacity);
+ (entropy_xy.direction[i].alpha-entropy_xy1.direction[i].alpha)/
+ (entropy_x.direction[i].alpha > entropy_y.direction[i].alpha ?
+ entropy_x.direction[i].alpha : entropy_y.direction[i].alpha);
channel_features[RedChannel].measure_of_correlation_2[i]=
(sqrt(fabs(1.0-exp(-2.0*(entropy_xy2.direction[i].red-
entropy_xy.direction[i].red)))));
@@ -1120,13 +1111,13 @@
(sqrt(fabs(1.0-exp(-2.0*(entropy_xy2.direction[i].blue-
entropy_xy.direction[i].blue)))));
if (image->colorspace == CMYKColorspace)
- channel_features[IndexChannel].measure_of_correlation_2[i]=
- (sqrt(fabs(1.0-exp(-2.0*(entropy_xy2.direction[i].index-
- entropy_xy.direction[i].index)))));
+ channel_features[BlackChannel].measure_of_correlation_2[i]=
+ (sqrt(fabs(1.0-exp(-2.0*(entropy_xy2.direction[i].black-
+ entropy_xy.direction[i].black)))));
if (image->matte != MagickFalse)
channel_features[OpacityChannel].measure_of_correlation_2[i]=
- (sqrt(fabs(1.0-exp(-2.0*(entropy_xy2.direction[i].opacity-
- entropy_xy.direction[i].opacity)))));
+ (sqrt(fabs(1.0-exp(-2.0*(entropy_xy2.direction[i].alpha-
+ entropy_xy.direction[i].alpha)))));
}
/*
Compute more texture features.
@@ -1161,10 +1152,10 @@
pixel.direction[i].green+=cooccurrence[x][y].direction[i].green;
pixel.direction[i].blue+=cooccurrence[x][y].direction[i].blue;
if (image->colorspace == CMYKColorspace)
- pixel.direction[i].index+=cooccurrence[x][y].direction[i].index;
+ pixel.direction[i].black+=cooccurrence[x][y].direction[i].black;
if (image->matte != MagickFalse)
- pixel.direction[i].opacity+=
- cooccurrence[x][y].direction[i].opacity;
+ pixel.direction[i].alpha+=
+ cooccurrence[x][y].direction[i].alpha;
}
/*
Maximum Correlation Coefficient.
@@ -1179,15 +1170,15 @@
cooccurrence[y][x].direction[i].blue/density_x[z].direction[i].blue/
density_y[x].direction[i].blue;
if (image->colorspace == CMYKColorspace)
- Q[z][y].direction[i].index+=cooccurrence[z][x].direction[i].index*
- cooccurrence[y][x].direction[i].index/
- density_x[z].direction[i].index/density_y[x].direction[i].index;
+ Q[z][y].direction[i].black+=cooccurrence[z][x].direction[i].black*
+ cooccurrence[y][x].direction[i].black/
+ density_x[z].direction[i].black/density_y[x].direction[i].black;
if (image->matte != MagickFalse)
- Q[z][y].direction[i].opacity+=
- cooccurrence[z][x].direction[i].opacity*
- cooccurrence[y][x].direction[i].opacity/
- density_x[z].direction[i].opacity/
- density_y[x].direction[i].opacity;
+ Q[z][y].direction[i].alpha+=
+ cooccurrence[z][x].direction[i].alpha*
+ cooccurrence[y][x].direction[i].alpha/
+ density_x[z].direction[i].alpha/
+ density_y[x].direction[i].alpha;
}
}
channel_features[RedChannel].contrast[i]+=z*z*pixel.direction[i].red;
@@ -1195,10 +1186,10 @@
channel_features[BlueChannel].contrast[i]+=z*z*pixel.direction[i].blue;
if (image->colorspace == CMYKColorspace)
channel_features[BlackChannel].contrast[i]+=z*z*
- pixel.direction[i].index;
+ pixel.direction[i].black;
if (image->matte != MagickFalse)
channel_features[OpacityChannel].contrast[i]+=z*z*
- pixel.direction[i].opacity;
+ pixel.direction[i].alpha;
}
/*
Maximum Correlation Coefficient.
@@ -1211,7 +1202,7 @@
channel_features[BlueChannel].maximum_correlation_coefficient[i]=
sqrt((double) -1.0);
if (image->colorspace == CMYKColorspace)
- channel_features[IndexChannel].maximum_correlation_coefficient[i]=
+ channel_features[BlackChannel].maximum_correlation_coefficient[i]=
sqrt((double) -1.0);
if (image->matte != MagickFalse)
channel_features[OpacityChannel].maximum_correlation_coefficient[i]=
diff --git a/magick/feature.h b/MagickCore/feature.h
similarity index 100%
rename from magick/feature.h
rename to MagickCore/feature.h
diff --git a/magick/fourier.c b/MagickCore/fourier.c
similarity index 88%
rename from magick/fourier.c
rename to MagickCore/fourier.c
index 142e774..b7fbf67 100644
--- a/magick/fourier.c
+++ b/MagickCore/fourier.c
@@ -42,18 +42,20 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/cache.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/fourier.h"
-#include "magick/log.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/property.h"
-#include "magick/quantum-private.h"
-#include "magick/thread-private.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/attribute.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/fourier.h"
+#include "MagickCore/log.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/property.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/thread-private.h"
#if defined(MAGICKCORE_FFTW_DELEGATE)
#if defined(MAGICKCORE_HAVE_COMPLEX_H)
#include <complex.h>
@@ -232,13 +234,10 @@
MagickBooleanType
status;
- register IndexPacket
- *indexes;
-
register ssize_t
x;
- register PixelPacket
+ register Quantum
*q;
ssize_t
@@ -295,9 +294,8 @@
{
q=GetCacheViewAuthenticPixels(magnitude_view,0L,y,fourier_info->height,1UL,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetCacheViewAuthenticIndexQueue(magnitude_view);
for (x=0L; x < (ssize_t) fourier_info->width; x++)
{
switch (fourier_info->channel)
@@ -305,43 +303,43 @@
case RedChannel:
default:
{
- SetPixelRed(q,ClampToQuantum(QuantumRange*
- magnitude_source[i]));
+ SetPixelRed(magnitude_image,ClampToQuantum(QuantumRange*
+ magnitude_source[i]),q);
break;
}
case GreenChannel:
{
- SetPixelGreen(q,ClampToQuantum(QuantumRange*
- magnitude_source[i]));
+ SetPixelGreen(magnitude_image,ClampToQuantum(QuantumRange*
+ magnitude_source[i]),q);
break;
}
case BlueChannel:
{
- SetPixelBlue(q,ClampToQuantum(QuantumRange*
- magnitude_source[i]));
+ SetPixelBlue(magnitude_image,ClampToQuantum(QuantumRange*
+ magnitude_source[i]),q);
break;
}
- case OpacityChannel:
+ case BlackChannel:
{
- SetPixelOpacity(q,ClampToQuantum(QuantumRange*
- magnitude_source[i]));
+ SetPixelBlack(magnitude_image,ClampToQuantum(QuantumRange*
+ magnitude_source[i]),q);
break;
}
- case IndexChannel:
+ case AlphaChannel:
{
- SetPixelIndex(indexes+x,ClampToQuantum(QuantumRange*
- magnitude_source[i]));
+ SetPixelAlpha(magnitude_image,ClampToQuantum(QuantumRange*
+ magnitude_source[i]),q);
break;
}
case GrayChannels:
{
- SetPixelGray(q,ClampToQuantum(QuantumRange*
- magnitude_source[i]));
+ SetPixelGray(magnitude_image,ClampToQuantum(QuantumRange*
+ magnitude_source[i]),q);
break;
}
}
i++;
- q++;
+ q+=GetPixelChannels(magnitude_image);
}
status=SyncCacheViewAuthenticPixels(magnitude_view,exception);
if (status == MagickFalse)
@@ -352,9 +350,8 @@
{
q=GetCacheViewAuthenticPixels(phase_view,0L,y,fourier_info->height,1UL,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetCacheViewAuthenticIndexQueue(phase_view);
for (x=0L; x < (ssize_t) fourier_info->width; x++)
{
switch (fourier_info->channel)
@@ -362,42 +359,43 @@
case RedChannel:
default:
{
- SetPixelRed(q,ClampToQuantum(QuantumRange*
- phase_source[i]));
+ SetPixelRed(phase_image,ClampToQuantum(QuantumRange*
+ phase_source[i]),q);
break;
}
case GreenChannel:
{
- SetPixelGreen(q,ClampToQuantum(QuantumRange*
- phase_source[i]));
+ SetPixelGreen(phase_image,ClampToQuantum(QuantumRange*
+ phase_source[i]),q);
break;
}
case BlueChannel:
{
- SetPixelBlue(q,ClampToQuantum(QuantumRange*
- phase_source[i]));
+ SetPixelBlue(phase_image,ClampToQuantum(QuantumRange*
+ phase_source[i]),q);
break;
}
- case OpacityChannel:
+ case BlackChannel:
{
- SetPixelOpacity(q,ClampToQuantum(QuantumRange*
- phase_source[i]));
+ SetPixelBlack(phase_image,ClampToQuantum(QuantumRange*
+ phase_source[i]),q);
break;
}
- case IndexChannel:
+ case AlphaChannel:
{
- SetPixelIndex(indexes+x,ClampToQuantum(QuantumRange*
- phase_source[i]));
+ SetPixelAlpha(phase_image,ClampToQuantum(QuantumRange*
+ phase_source[i]),q);
break;
}
case GrayChannels:
{
- SetPixelGray(q,ClampToQuantum(QuantumRange*phase_source[i]));
+ SetPixelGray(phase_image,ClampToQuantum(QuantumRange*
+ phase_source[i]),q);
break;
}
}
i++;
- q++;
+ q+=GetPixelChannels(phase_image);
}
status=SyncCacheViewAuthenticPixels(phase_view,exception);
if (status == MagickFalse)
@@ -426,10 +424,7 @@
fftw_plan
fftw_r2c_plan;
- register const IndexPacket
- *indexes;
-
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
@@ -458,9 +453,8 @@
{
p=GetCacheViewVirtualPixels(image_view,0L,y,fourier_info->width,1UL,
exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetCacheViewVirtualIndexQueue(image_view);
for (x=0L; x < (ssize_t) fourier_info->width; x++)
{
switch (fourier_info->channel)
@@ -468,37 +462,37 @@
case RedChannel:
default:
{
- source[i]=QuantumScale*GetPixelRed(p);
+ source[i]=QuantumScale*GetPixelRed(image,p);
break;
}
case GreenChannel:
{
- source[i]=QuantumScale*GetPixelGreen(p);
+ source[i]=QuantumScale*GetPixelGreen(image,p);
break;
}
case BlueChannel:
{
- source[i]=QuantumScale*GetPixelBlue(p);
+ source[i]=QuantumScale*GetPixelBlue(image,p);
break;
}
- case OpacityChannel:
+ case BlackChannel:
{
- source[i]=QuantumScale*GetPixelOpacity(p);
+ source[i]=QuantumScale*GetPixelBlack(image,p);
break;
}
- case IndexChannel:
+ case AlphaChannel:
{
- source[i]=QuantumScale*GetPixelIndex(indexes+x);
+ source[i]=QuantumScale*GetPixelAlpha(image,p);
break;
}
case GrayChannels:
{
- source[i]=QuantumScale*GetPixelGray(p);
+ source[i]=QuantumScale*GetPixelGray(image,p);
break;
}
}
i++;
- p++;
+ p+=GetPixelChannels(image);
}
}
image_view=DestroyCacheView(image_view);
@@ -678,7 +672,7 @@
AppendImageToList(&fourier_image,magnitude_image);
AppendImageToList(&fourier_image,phase_image);
status=MagickTrue;
- is_gray=IsGrayImage(image,exception);
+ is_gray=IsImageGray(image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel sections
#endif
@@ -735,9 +729,9 @@
thread_status;
thread_status=MagickTrue;
- if (image->matte != MagickFalse)
+ if (image->colorspace == CMYKColorspace)
thread_status=ForwardFourierTransformChannel(image,
- OpacityChannel,modulus,fourier_image,exception);
+ BlackChannel,modulus,fourier_image,exception);
if (thread_status == MagickFalse)
status=thread_status;
}
@@ -749,9 +743,9 @@
thread_status;
thread_status=MagickTrue;
- if (image->colorspace == CMYKColorspace)
+ if (image->matte != MagickFalse)
thread_status=ForwardFourierTransformChannel(image,
- IndexChannel,modulus,fourier_image,exception);
+ AlphaChannel,modulus,fourier_image,exception);
if (thread_status == MagickFalse)
status=thread_status;
}
@@ -842,10 +836,7 @@
MagickBooleanType
status;
- register const IndexPacket
- *indexes;
-
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
@@ -883,9 +874,8 @@
{
p=GetCacheViewVirtualPixels(magnitude_view,0L,y,fourier_info->width,1UL,
exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetCacheViewAuthenticIndexQueue(magnitude_view);
for (x=0L; x < (ssize_t) fourier_info->width; x++)
{
switch (fourier_info->channel)
@@ -893,37 +883,37 @@
case RedChannel:
default:
{
- magnitude_source[i]=QuantumScale*GetPixelRed(p);
+ magnitude_source[i]=QuantumScale*GetPixelRed(magnitude_image,p);
break;
}
case GreenChannel:
{
- magnitude_source[i]=QuantumScale*GetPixelGreen(p);
+ magnitude_source[i]=QuantumScale*GetPixelGreen(magnitude_image,p);
break;
}
case BlueChannel:
{
- magnitude_source[i]=QuantumScale*GetPixelBlue(p);
+ magnitude_source[i]=QuantumScale*GetPixelBlue(magnitude_image,p);
break;
}
- case OpacityChannel:
+ case BlackChannel:
{
- magnitude_source[i]=QuantumScale*GetPixelOpacity(p);
+ magnitude_source[i]=QuantumScale*GetPixelBlack(magnitude_image,p);
break;
}
- case IndexChannel:
+ case AlphaChannel:
{
- magnitude_source[i]=QuantumScale*GetPixelIndex(indexes+x);
+ magnitude_source[i]=QuantumScale*GetPixelAlpha(magnitude_image,p);
break;
}
case GrayChannels:
{
- magnitude_source[i]=QuantumScale*GetPixelGray(p);
+ magnitude_source[i]=QuantumScale*GetPixelGray(magnitude_image,p);
break;
}
}
i++;
- p++;
+ p+=GetPixelChannels(magnitude_image);
}
}
i=0L;
@@ -932,9 +922,8 @@
{
p=GetCacheViewVirtualPixels(phase_view,0,y,fourier_info->width,1,
exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetCacheViewAuthenticIndexQueue(phase_view);
for (x=0L; x < (ssize_t) fourier_info->width; x++)
{
switch (fourier_info->channel)
@@ -942,37 +931,37 @@
case RedChannel:
default:
{
- phase_source[i]=QuantumScale*GetPixelRed(p);
+ phase_source[i]=QuantumScale*GetPixelRed(phase_image,p);
break;
}
case GreenChannel:
{
- phase_source[i]=QuantumScale*GetPixelGreen(p);
+ phase_source[i]=QuantumScale*GetPixelGreen(phase_image,p);
break;
}
case BlueChannel:
{
- phase_source[i]=QuantumScale*GetPixelBlue(p);
+ phase_source[i]=QuantumScale*GetPixelBlue(phase_image,p);
break;
}
- case OpacityChannel:
+ case BlackChannel:
{
- phase_source[i]=QuantumScale*GetPixelOpacity(p);
+ phase_source[i]=QuantumScale*GetPixelBlack(phase_image,p);
break;
}
- case IndexChannel:
+ case AlphaChannel:
{
- phase_source[i]=QuantumScale*GetPixelIndex(indexes+x);
+ phase_source[i]=QuantumScale*GetPixelAlpha(phase_image,p);
break;
}
case GrayChannels:
{
- phase_source[i]=QuantumScale*GetPixelGray(p);
+ phase_source[i]=QuantumScale*GetPixelGray(phase_image,p);
break;
}
}
i++;
- p++;
+ p+=GetPixelChannels(phase_image);
}
}
if (fourier_info->modulus != MagickFalse)
@@ -1062,10 +1051,7 @@
fftw_plan
fftw_c2r_plan;
- register IndexPacket
- *indexes;
-
- register PixelPacket
+ register Quantum
*q;
register ssize_t
@@ -1100,9 +1086,8 @@
break;
q=GetCacheViewAuthenticPixels(image_view,0L,y,fourier_info->width >
image->columns ? image->columns : fourier_info->width,1UL,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
for (x=0L; x < (ssize_t) fourier_info->width; x++)
{
switch (fourier_info->channel)
@@ -1110,38 +1095,37 @@
case RedChannel:
default:
{
- SetPixelRed(q,ClampToQuantum(QuantumRange*source[i]));
+ SetPixelRed(image,ClampToQuantum(QuantumRange*source[i]),q);
break;
}
case GreenChannel:
{
- SetPixelGreen(q,ClampToQuantum(QuantumRange*source[i]));
+ SetPixelGreen(image,ClampToQuantum(QuantumRange*source[i]),q);
break;
}
case BlueChannel:
{
- SetPixelBlue(q,ClampToQuantum(QuantumRange*source[i]));
+ SetPixelBlue(image,ClampToQuantum(QuantumRange*source[i]),q);
break;
}
- case OpacityChannel:
+ case BlackChannel:
{
- SetPixelOpacity(q,ClampToQuantum(QuantumRange*source[i]));
+ SetPixelBlack(image,ClampToQuantum(QuantumRange*source[i]),q);
break;
}
- case IndexChannel:
+ case AlphaChannel:
{
- SetPixelIndex(indexes+x,ClampToQuantum(QuantumRange*
- source[i]));
+ SetPixelAlpha(image,ClampToQuantum(QuantumRange*source[i]),q);
break;
}
case GrayChannels:
{
- SetPixelGray(q,ClampToQuantum(QuantumRange*source[i]));
+ SetPixelGray(image,ClampToQuantum(QuantumRange*source[i]),q);
break;
}
}
i++;
- q++;
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
break;
@@ -1262,9 +1246,9 @@
status;
status=MagickTrue;
- is_gray=IsGrayImage(magnitude_image,exception);
+ is_gray=IsImageGray(magnitude_image,exception);
if (is_gray != MagickFalse)
- is_gray=IsGrayImage(phase_image,exception);
+ is_gray=IsImageGray(phase_image,exception);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel sections
#endif
@@ -1321,9 +1305,9 @@
thread_status;
thread_status=MagickTrue;
- if (magnitude_image->matte != MagickFalse)
+ if (magnitude_image->colorspace == CMYKColorspace)
thread_status=InverseFourierTransformChannel(magnitude_image,
- phase_image,OpacityChannel,modulus,fourier_image,exception);
+ phase_image,BlackChannel,modulus,fourier_image,exception);
if (thread_status == MagickFalse)
status=thread_status;
}
@@ -1335,9 +1319,9 @@
thread_status;
thread_status=MagickTrue;
- if (magnitude_image->colorspace == CMYKColorspace)
+ if (magnitude_image->matte != MagickFalse)
thread_status=InverseFourierTransformChannel(magnitude_image,
- phase_image,IndexChannel,modulus,fourier_image,exception);
+ phase_image,AlphaChannel,modulus,fourier_image,exception);
if (thread_status == MagickFalse)
status=thread_status;
}
diff --git a/magick/fourier.h b/MagickCore/fourier.h
similarity index 100%
rename from magick/fourier.h
rename to MagickCore/fourier.h
diff --git a/magick/fx-private.h b/MagickCore/fx-private.h
similarity index 100%
rename from magick/fx-private.h
rename to MagickCore/fx-private.h
diff --git a/magick/fx.c b/MagickCore/fx.c
similarity index 90%
rename from magick/fx.c
rename to MagickCore/fx.c
index e5a6913..4fbdb30 100644
--- a/magick/fx.c
+++ b/MagickCore/fx.c
@@ -40,52 +40,53 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/annotate.h"
-#include "magick/artifact.h"
-#include "magick/attribute.h"
-#include "magick/cache.h"
-#include "magick/cache-view.h"
-#include "magick/color.h"
-#include "magick/color-private.h"
-#include "magick/composite.h"
-#include "magick/decorate.h"
-#include "magick/draw.h"
-#include "magick/effect.h"
-#include "magick/enhance.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/fx.h"
-#include "magick/fx-private.h"
-#include "magick/gem.h"
-#include "magick/geometry.h"
-#include "magick/layer.h"
-#include "magick/list.h"
-#include "magick/log.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/option.h"
-#include "magick/pixel-private.h"
-#include "magick/property.h"
-#include "magick/quantum.h"
-#include "magick/quantum-private.h"
-#include "magick/random_.h"
-#include "magick/random-private.h"
-#include "magick/resample.h"
-#include "magick/resample-private.h"
-#include "magick/resize.h"
-#include "magick/shear.h"
-#include "magick/splay-tree.h"
-#include "magick/statistic.h"
-#include "magick/string_.h"
-#include "magick/string-private.h"
-#include "magick/thread-private.h"
-#include "magick/transform.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/annotate.h"
+#include "MagickCore/artifact.h"
+#include "MagickCore/attribute.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/cache-view.h"
+#include "MagickCore/color.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/composite.h"
+#include "MagickCore/decorate.h"
+#include "MagickCore/draw.h"
+#include "MagickCore/effect.h"
+#include "MagickCore/enhance.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/fx.h"
+#include "MagickCore/fx-private.h"
+#include "MagickCore/gem.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/layer.h"
+#include "MagickCore/list.h"
+#include "MagickCore/log.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/option.h"
+#include "MagickCore/pixel.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/property.h"
+#include "MagickCore/quantum.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/random_.h"
+#include "MagickCore/random-private.h"
+#include "MagickCore/resample.h"
+#include "MagickCore/resample-private.h"
+#include "MagickCore/resize.h"
+#include "MagickCore/shear.h"
+#include "MagickCore/splay-tree.h"
+#include "MagickCore/statistic.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/string-private.h"
+#include "MagickCore/thread-private.h"
+#include "MagickCore/transform.h"
+#include "MagickCore/utility.h"
/*
Define declarations.
@@ -384,19 +385,13 @@
MagickBooleanType
sync;
- register const IndexPacket
- *restrict indexes;
-
- register const PixelPacket
+ register const Quantum
*restrict p;
- register IndexPacket
- *restrict noise_indexes;
-
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
if (status == MagickFalse)
@@ -404,34 +399,31 @@
p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
q=GetCacheViewAuthenticPixels(noise_view,0,y,noise_image->columns,1,
exception);
- if ((p == (PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewVirtualIndexQueue(image_view);
- noise_indexes=GetCacheViewAuthenticIndexQueue(noise_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
if ((channel & RedChannel) != 0)
- SetPixelRed(q,ClampToQuantum(GenerateDifferentialNoise(
- random_info[id],GetPixelRed(p),noise_type,attenuate)));
+ SetPixelRed(noise_image,ClampToQuantum(GenerateDifferentialNoise(
+ random_info[id],GetPixelRed(image,p),noise_type,attenuate)),q);
if ((channel & GreenChannel) != 0)
- SetPixelGreen(q,ClampToQuantum(GenerateDifferentialNoise(
- random_info[id],GetPixelGreen(p),noise_type,attenuate)));
+ SetPixelGreen(noise_image,ClampToQuantum(GenerateDifferentialNoise(
+ random_info[id],GetPixelGreen(image,p),noise_type,attenuate)),q);
if ((channel & BlueChannel) != 0)
- SetPixelBlue(q,ClampToQuantum(GenerateDifferentialNoise(
- random_info[id],GetPixelBlue(p),noise_type,attenuate)));
- if ((channel & OpacityChannel) != 0)
- SetPixelOpacity(q,ClampToQuantum(GenerateDifferentialNoise(
- random_info[id],GetPixelOpacity(p),noise_type,attenuate)));
- if (((channel & IndexChannel) != 0) &&
+ SetPixelBlue(noise_image,ClampToQuantum(GenerateDifferentialNoise(
+ random_info[id],GetPixelBlue(image,p),noise_type,attenuate)),q);
+ if (((channel & BlackChannel) != 0) &&
(image->colorspace == CMYKColorspace))
- SetPixelIndex(noise_indexes+x,ClampToQuantum(
- GenerateDifferentialNoise(random_info[id],GetPixelIndex(
- indexes+x),noise_type,attenuate)));
- p++;
- q++;
+ SetPixelBlack(noise_image,ClampToQuantum(GenerateDifferentialNoise(
+ random_info[id],GetPixelBlack(image,p),noise_type,attenuate)),q);
+ if ((channel & AlphaChannel) != 0)
+ SetPixelAlpha(noise_image,ClampToQuantum(GenerateDifferentialNoise(
+ random_info[id],GetPixelAlpha(image,p),noise_type,attenuate)),q);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(noise_image);
}
sync=SyncCacheViewAuthenticPixels(noise_view,exception);
if (sync == MagickFalse)
@@ -541,19 +533,19 @@
MagickBooleanType
sync;
- MagickPixelPacket
+ PixelInfo
pixel;
Quantum
quantum;
- register const PixelPacket
+ register const Quantum
*restrict p;
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
if (status == MagickFalse)
@@ -561,34 +553,34 @@
p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
q=QueueCacheViewAuthenticPixels(shift_view,0,y,shift_image->columns,1,
exception);
- if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
{
status=MagickFalse;
continue;
}
for (x=0; x < (ssize_t) image->columns; x++)
{
- quantum=GetPixelRed(p);
- if (GetPixelGreen(p) < quantum)
- quantum=GetPixelGreen(p);
- if (GetPixelBlue(p) < quantum)
- quantum=GetPixelBlue(p);
- pixel.red=0.5*(GetPixelRed(p)+factor*quantum);
- pixel.green=0.5*(GetPixelGreen(p)+factor*quantum);
- pixel.blue=0.5*(GetPixelBlue(p)+factor*quantum);
- quantum=GetPixelRed(p);
- if (GetPixelGreen(p) > quantum)
- quantum=GetPixelGreen(p);
- if (GetPixelBlue(p) > quantum)
- quantum=GetPixelBlue(p);
+ quantum=GetPixelRed(image,p);
+ if (GetPixelGreen(image,p) < quantum)
+ quantum=GetPixelGreen(image,p);
+ if (GetPixelBlue(image,p) < quantum)
+ quantum=GetPixelBlue(image,p);
+ pixel.red=0.5*(GetPixelRed(image,p)+factor*quantum);
+ pixel.green=0.5*(GetPixelGreen(image,p)+factor*quantum);
+ pixel.blue=0.5*(GetPixelBlue(image,p)+factor*quantum);
+ quantum=GetPixelRed(image,p);
+ if (GetPixelGreen(image,p) > quantum)
+ quantum=GetPixelGreen(image,p);
+ if (GetPixelBlue(image,p) > quantum)
+ quantum=GetPixelBlue(image,p);
pixel.red=0.5*(pixel.red+factor*quantum);
pixel.green=0.5*(pixel.green+factor*quantum);
pixel.blue=0.5*(pixel.blue+factor*quantum);
- SetPixelRed(q,ClampToQuantum(pixel.red));
- SetPixelGreen(q,ClampToQuantum(pixel.green));
- SetPixelBlue(q,ClampToQuantum(pixel.blue));
- p++;
- q++;
+ SetPixelRed(shift_image,ClampToQuantum(pixel.red),q);
+ SetPixelGreen(shift_image,ClampToQuantum(pixel.green),q);
+ SetPixelBlue(shift_image,ClampToQuantum(pixel.blue),q);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(shift_image);
}
sync=SyncCacheViewAuthenticPixels(shift_view,exception);
if (sync == MagickFalse)
@@ -731,7 +723,7 @@
MagickOffsetType
progress;
- MagickPixelPacket
+ PixelInfo
pixel;
MagickStatusType
@@ -768,13 +760,13 @@
pixel.red=geometry_info.rho;
pixel.green=geometry_info.rho;
pixel.blue=geometry_info.rho;
- pixel.opacity=(MagickRealType) OpaqueOpacity;
+ pixel.alpha=(MagickRealType) OpaqueAlpha;
if ((flags & SigmaValue) != 0)
pixel.green=geometry_info.sigma;
if ((flags & XiValue) != 0)
pixel.blue=geometry_info.xi;
if ((flags & PsiValue) != 0)
- pixel.opacity=geometry_info.psi;
+ pixel.alpha=geometry_info.psi;
/*
Colorize DirectClass image.
*/
@@ -790,13 +782,13 @@
MagickBooleanType
sync;
- register const PixelPacket
+ register const Quantum
*restrict p;
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
if (status == MagickFalse)
@@ -804,23 +796,23 @@
p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
q=QueueCacheViewAuthenticPixels(colorize_view,0,y,colorize_image->columns,1,
exception);
- if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
{
status=MagickFalse;
continue;
}
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelRed(q,((GetPixelRed(p)*(100.0-pixel.red)+
- colorize.red*pixel.red)/100.0));
- SetPixelGreen(q,((GetPixelGreen(p)*(100.0-pixel.green)+
- colorize.green*pixel.green)/100.0));
- SetPixelBlue(q,((GetPixelBlue(p)*(100.0-pixel.blue)+
- colorize.blue*pixel.blue)/100.0));
- SetPixelOpacity(q,((GetPixelOpacity(p)*(100.0-
- pixel.opacity)+colorize.opacity*pixel.opacity)/100.0));
- p++;
- q++;
+ SetPixelRed(colorize_image,ClampToQuantum((GetPixelRed(image,p)*
+ (100.0-pixel.red)+colorize.red*pixel.red)/100.0),q);
+ SetPixelGreen(colorize_image,ClampToQuantum((GetPixelGreen(image,p)*
+ (100.0-pixel.green)+colorize.green*pixel.green)/100.0),q);
+ SetPixelBlue(colorize_image,ClampToQuantum((GetPixelBlue(image,p)*
+ (100.0-pixel.blue)+colorize.blue*pixel.blue)/100.0),q);
+ SetPixelAlpha(colorize_image,ClampToQuantum((GetPixelAlpha(image,p)*
+ (100.0-pixel.alpha)+colorize.alpha*pixel.alpha)/100.0),q);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(colorize_image);
}
sync=SyncCacheViewAuthenticPixels(colorize_view,exception);
if (sync == MagickFalse)
@@ -983,33 +975,25 @@
MagickRealType
pixel;
- register const IndexPacket
- *restrict indexes;
-
- register const PixelPacket
+ register const Quantum
*restrict p;
+ register Quantum
+ *restrict q;
+
register ssize_t
x;
- register IndexPacket
- *restrict color_indexes;
-
- register PixelPacket
- *restrict q;
-
if (status == MagickFalse)
continue;
p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
q=GetCacheViewAuthenticPixels(color_view,0,y,color_image->columns,1,
exception);
- if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewVirtualIndexQueue(image_view);
- color_indexes=GetCacheViewAuthenticIndexQueue(color_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
register ssize_t
@@ -1021,34 +1005,34 @@
height=color_matrix->height > 6 ? 6UL : color_matrix->height;
for (v=0; v < (ssize_t) height; v++)
{
- pixel=ColorMatrix[v][0]*GetPixelRed(p)+ColorMatrix[v][1]*
- GetPixelGreen(p)+ColorMatrix[v][2]*GetPixelBlue(p);
- if (image->matte != MagickFalse)
- pixel+=ColorMatrix[v][3]*(QuantumRange-GetPixelOpacity(p));
+ pixel=ColorMatrix[v][0]*GetPixelRed(image,p)+ColorMatrix[v][1]*
+ GetPixelGreen(image,p)+ColorMatrix[v][2]*GetPixelBlue(image,p);
if (image->colorspace == CMYKColorspace)
- pixel+=ColorMatrix[v][4]*GetPixelIndex(indexes+x);
+ pixel+=ColorMatrix[v][3]*GetPixelBlack(image,p);
+ if (image->matte != MagickFalse)
+ pixel+=ColorMatrix[v][4]*GetPixelAlpha(image,p);
pixel+=QuantumRange*ColorMatrix[v][5];
switch (v)
{
- case 0: SetPixelRed(q,ClampToQuantum(pixel)); break;
- case 1: SetPixelGreen(q,ClampToQuantum(pixel)); break;
- case 2: SetPixelBlue(q,ClampToQuantum(pixel)); break;
+ case 0: SetPixelRed(color_image,ClampToQuantum(pixel),q); break;
+ case 1: SetPixelGreen(color_image,ClampToQuantum(pixel),q); break;
+ case 2: SetPixelBlue(color_image,ClampToQuantum(pixel),q); break;
case 3:
{
- if (image->matte != MagickFalse)
- SetPixelAlpha(q,ClampToQuantum(pixel));
+ if (image->colorspace == CMYKColorspace)
+ SetPixelBlack(color_image,ClampToQuantum(pixel),q);
break;
}
case 4:
{
- if (image->colorspace == CMYKColorspace)
- SetPixelIndex(color_indexes+x,ClampToQuantum(pixel));
+ if (image->matte != MagickFalse)
+ SetPixelAlpha(color_image,ClampToQuantum(pixel),q);
break;
}
}
}
- p++;
- q++;
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(color_image);
}
if (SyncCacheViewAuthenticPixels(color_view,exception) == MagickFalse)
status=MagickFalse;
@@ -1338,7 +1322,7 @@
Image
*image;
- MagickPixelPacket
+ PixelInfo
pixel;
MagickRealType
@@ -1471,8 +1455,8 @@
"NoSuchImage","`%s'",expression);
return(0.0);
}
- GetMagickPixelPacket(image,&pixel);
- (void) InterpolateMagickPixelPacket(image,fx_info->view[i],image->interpolate,
+ GetPixelInfo(image,&pixel);
+ (void) InterpolatePixelInfo(image,fx_info->view[i],image->interpolate,
point.x,point.y,&pixel,exception);
if ((strlen(p) > 2) &&
(LocaleCompare(p,"intensity") != 0) &&
@@ -1498,12 +1482,11 @@
if ((strlen(name) > 2) &&
(GetValueFromSplayTree(fx_info->symbols,name) == (const char *) NULL))
{
- MagickPixelPacket
+ PixelInfo
*color;
- color=(MagickPixelPacket *) GetValueFromSplayTree(fx_info->colors,
- name);
- if (color != (MagickPixelPacket *) NULL)
+ color=(PixelInfo *) GetValueFromSplayTree(fx_info->colors,name);
+ if (color != (PixelInfo *) NULL)
{
pixel=(*color);
p+=strlen(name);
@@ -1512,7 +1495,7 @@
if (QueryMagickColor(name,&pixel,fx_info->exception) != MagickFalse)
{
(void) AddValueToSplayTree(fx_info->colors,ConstantString(name),
- CloneMagickPixelPacket(&pixel));
+ ClonePixelInfo(&pixel));
p+=strlen(name);
}
}
@@ -1526,17 +1509,7 @@
case RedChannel: return(QuantumScale*pixel.red);
case GreenChannel: return(QuantumScale*pixel.green);
case BlueChannel: return(QuantumScale*pixel.blue);
- case OpacityChannel:
- {
- MagickRealType
- alpha;
-
- if (pixel.matte == MagickFalse)
- return(1.0);
- alpha=(MagickRealType) (QuantumScale*GetPixelAlpha(&pixel));
- return(alpha);
- }
- case IndexChannel:
+ case BlackChannel:
{
if (image->colorspace != CMYKColorspace)
{
@@ -1545,11 +1518,21 @@
image->filename);
return(0.0);
}
- return(QuantumScale*pixel.index);
+ return(QuantumScale*pixel.black);
+ }
+ case AlphaChannel:
+ {
+ MagickRealType
+ alpha;
+
+ if (pixel.matte == MagickFalse)
+ return(1.0);
+ alpha=(MagickRealType) (QuantumScale*pixel.alpha);
+ return(alpha);
}
case DefaultChannels:
{
- return(QuantumScale*MagickPixelIntensityToQuantum(&pixel));
+ return(QuantumScale*GetPixelInfoIntensity(&pixel));
}
default:
break;
@@ -1564,7 +1547,7 @@
case 'a':
{
if (LocaleCompare(symbol,"a") == 0)
- return((MagickRealType) (QuantumScale*GetPixelAlpha(&pixel)));
+ return((MagickRealType) (QuantumScale*pixel.alpha));
break;
}
case 'B':
@@ -1613,7 +1596,7 @@
return(0.0);
return(channel_info.psi);
}
- case OpacityChannel:
+ case AlphaChannel:
{
if ((flags & ChiValue) == 0)
return(0.0);
@@ -1642,18 +1625,18 @@
return(0.0);
return(channel_info.xi);
}
- case OpacityChannel:
- {
- if ((flags & PsiValue) == 0)
- return(0.0);
- return(channel_info.psi);
- }
- case IndexChannel:
+ case BlackChannel:
{
if ((flags & ChiValue) == 0)
return(0.0);
return(channel_info.chi);
}
+ case AlphaChannel:
+ {
+ if ((flags & PsiValue) == 0)
+ return(0.0);
+ return(channel_info.psi);
+ }
default:
return(0.0);
}
@@ -1691,7 +1674,7 @@
image->filename);
return(0.0);
}
- return(QuantumScale*pixel.index);
+ return(QuantumScale*pixel.black);
}
break;
}
@@ -1729,7 +1712,7 @@
if (LocaleCompare(symbol,"image.resolution.y") == 0)
return(image->y_resolution);
if (LocaleCompare(symbol,"intensity") == 0)
- return(QuantumScale*MagickPixelIntensityToQuantum(&pixel));
+ return(QuantumScale*GetPixelInfoIntensity(&pixel));
if (LocaleCompare(symbol,"i") == 0)
return((MagickRealType) x);
break;
@@ -1789,7 +1772,7 @@
case 'o':
{
if (LocaleCompare(symbol,"o") == 0)
- return(QuantumScale*pixel.opacity);
+ return(QuantumScale*pixel.alpha);
break;
}
case 'P':
@@ -2461,7 +2444,7 @@
case CyanChannel: type="cyan"; break;
case MagentaChannel: type="magenta"; break;
case YellowChannel: type="yellow"; break;
- case OpacityChannel: type="opacity"; break;
+ case AlphaChannel: type="opacity"; break;
case BlackChannel: type="black"; break;
default: type="unknown"; break;
}
@@ -2471,7 +2454,7 @@
case RedChannel: type="red"; break;
case GreenChannel: type="green"; break;
case BlueChannel: type="blue"; break;
- case OpacityChannel: type="opacity"; break;
+ case AlphaChannel: type="opacity"; break;
default: type="unknown"; break;
}
(void) CopyMagickString(subexpression,expression+6,MaxTextExtent);
@@ -3012,24 +2995,20 @@
MagickRealType
alpha;
- register IndexPacket
- *restrict fx_indexes;
-
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(fx_view,0,y,fx_image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- fx_indexes=GetCacheViewAuthenticIndexQueue(fx_view);
alpha=0.0;
for (x=0; x < (ssize_t) fx_image->columns; x++)
{
@@ -3037,43 +3016,39 @@
{
(void) FxEvaluateChannelExpression(fx_info[id],RedChannel,x,y,
&alpha,exception);
- SetPixelRed(q,ClampToQuantum((MagickRealType) QuantumRange*
- alpha));
+ SetPixelRed(fx_image,ClampToQuantum((MagickRealType) QuantumRange*
+ alpha),q);
}
if ((channel & GreenChannel) != 0)
{
(void) FxEvaluateChannelExpression(fx_info[id],GreenChannel,x,y,
&alpha,exception);
- SetPixelGreen(q,ClampToQuantum((MagickRealType) QuantumRange*
- alpha));
+ SetPixelGreen(fx_image,ClampToQuantum((MagickRealType) QuantumRange*
+ alpha),q);
}
if ((channel & BlueChannel) != 0)
{
(void) FxEvaluateChannelExpression(fx_info[id],BlueChannel,x,y,
&alpha,exception);
- SetPixelBlue(q,ClampToQuantum((MagickRealType) QuantumRange*
- alpha));
+ SetPixelBlue(fx_image,ClampToQuantum((MagickRealType) QuantumRange*
+ alpha),q);
}
- if ((channel & OpacityChannel) != 0)
- {
- (void) FxEvaluateChannelExpression(fx_info[id],OpacityChannel,x,y,
- &alpha,exception);
- if (image->matte == MagickFalse)
- SetPixelOpacity(q,ClampToQuantum((MagickRealType)
- QuantumRange*alpha));
- else
- SetPixelOpacity(q,ClampToQuantum((MagickRealType)
- (QuantumRange-QuantumRange*alpha)));
- }
- if (((channel & IndexChannel) != 0) &&
+ if (((channel & BlackChannel) != 0) &&
(fx_image->colorspace == CMYKColorspace))
{
- (void) FxEvaluateChannelExpression(fx_info[id],IndexChannel,x,y,
+ (void) FxEvaluateChannelExpression(fx_info[id],BlackChannel,x,y,
&alpha,exception);
- SetPixelIndex(fx_indexes+x,ClampToQuantum((MagickRealType)
- QuantumRange*alpha));
+ SetPixelBlack(fx_image,ClampToQuantum((MagickRealType) QuantumRange*
+ alpha),q);
}
- q++;
+ if ((channel & AlphaChannel) != 0)
+ {
+ (void) FxEvaluateChannelExpression(fx_info[id],AlphaChannel,x,y,
+ &alpha,exception);
+ SetPixelAlpha(fx_image,ClampToQuantum((MagickRealType) QuantumRange*
+ alpha),q);
+ }
+ q+=GetPixelChannels(fx_image);
}
if (SyncCacheViewAuthenticPixels(fx_view,exception) == MagickFalse)
status=MagickFalse;
@@ -3149,7 +3124,7 @@
MagickOffsetType
progress;
- MagickPixelPacket
+ PixelInfo
zero;
MagickRealType
@@ -3180,7 +3155,7 @@
implode_image=DestroyImage(implode_image);
return((Image *) NULL);
}
- if (implode_image->background_color.opacity != OpaqueOpacity)
+ if (implode_image->background_color.alpha != OpaqueAlpha)
implode_image->matte=MagickTrue;
/*
Compute scaling factor.
@@ -3203,7 +3178,7 @@
*/
status=MagickTrue;
progress=0;
- GetMagickPixelPacket(implode_image,&zero);
+ GetPixelInfo(implode_image,&zero);
image_view=AcquireCacheView(image);
implode_view=AcquireCacheView(implode_image);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
@@ -3211,7 +3186,7 @@
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- MagickPixelPacket
+ PixelInfo
pixel;
MagickRealType
@@ -3220,25 +3195,21 @@
PointInfo
delta;
- register IndexPacket
- *restrict implode_indexes;
-
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(implode_view,0,y,implode_image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- implode_indexes=GetCacheViewAuthenticIndexQueue(implode_view);
delta.y=scale.y*(double) (y-center.y);
pixel=zero;
for (x=0; x < (ssize_t) image->columns; x++)
@@ -3260,13 +3231,13 @@
if (distance > 0.0)
factor=pow(sin((double) (MagickPI*sqrt((double) distance)/
radius/2)),-amount);
- (void) InterpolateMagickPixelPacket(image,image_view,
+ (void) InterpolatePixelInfo(image,image_view,
UndefinedInterpolatePixel,(double) (factor*delta.x/scale.x+
center.x),(double) (factor*delta.y/scale.y+center.y),&pixel,
exception);
- SetPixelPacket(implode_image,&pixel,q,implode_indexes+x);
+ SetPixelPixelInfo(implode_image,&pixel,q);
}
- q++;
+ q+=GetPixelChannels(implode_image);
}
if (SyncCacheViewAuthenticPixels(implode_view,exception) == MagickFalse)
status=MagickFalse;
@@ -3438,13 +3409,13 @@
MagickBooleanType
sync;
- register const PixelPacket
+ register const Quantum
*restrict p;
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
if (status == MagickFalse)
@@ -3453,23 +3424,28 @@
exception);
q=GetCacheViewAuthenticPixels(morph_view,0,y,morph_images->columns,1,
exception);
- if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
{
status=MagickFalse;
continue;
}
for (x=0; x < (ssize_t) morph_images->columns; x++)
{
- SetPixelRed(q,ClampToQuantum(alpha*
- GetPixelRed(q)+beta*GetPixelRed(p)));
- SetPixelGreen(q,ClampToQuantum(alpha*
- GetPixelGreen(q)+beta*GetPixelGreen(p)));
- SetPixelBlue(q,ClampToQuantum(alpha*
- GetPixelBlue(q)+beta*GetPixelBlue(p)));
- SetPixelOpacity(q,ClampToQuantum(alpha*
- GetPixelOpacity(q)+beta*GetPixelOpacity(p)));
- p++;
- q++;
+ SetPixelRed(morph_images,ClampToQuantum(alpha*
+ GetPixelRed(morph_images,q)+beta*GetPixelRed(morph_image,p)),q);
+ SetPixelGreen(morph_images,ClampToQuantum(alpha*
+ GetPixelGreen(morph_images,q)+beta*GetPixelGreen(morph_image,p)),q);
+ SetPixelBlue(morph_images,ClampToQuantum(alpha*
+ GetPixelBlue(morph_images,q)+beta*GetPixelBlue(morph_image,p)),q);
+ SetPixelAlpha(morph_images,ClampToQuantum(alpha*
+ GetPixelAlpha(morph_images,q)+beta*GetPixelAlpha(morph_image,p)),q);
+ if ((morph_image->colorspace == CMYKColorspace) &&
+ (morph_images->colorspace == CMYKColorspace))
+ SetPixelBlack(morph_images,ClampToQuantum(alpha*
+ GetPixelBlack(morph_images,q)+beta*GetPixelBlack(morph_image,p)),
+ q);
+ p+=GetPixelChannels(morph_image);
+ q+=GetPixelChannels(morph_images);
}
sync=SyncCacheViewAuthenticPixels(morph_view,exception);
if (sync == MagickFalse)
@@ -3625,7 +3601,7 @@
plasma=(MagickRealType) QuantumRange/(2.0*attenuate);
if ((segment->x1 != (double) x_mid) || (segment->x2 != (double) x_mid))
{
- register PixelPacket
+ register Quantum
*restrict q;
/*
@@ -3637,14 +3613,14 @@
(void) GetOneCacheViewVirtualPixel(image_view,x,(ssize_t)
ceil(segment->y2-0.5),&v,exception);
q=QueueCacheViewAuthenticPixels(image_view,x,y_mid,1,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
return(MagickTrue);
- SetPixelRed(q,PlasmaPixel(random_info,(MagickRealType)
- (u.red+v.red)/2.0,plasma));
- SetPixelGreen(q,PlasmaPixel(random_info,(MagickRealType)
- (u.green+v.green)/2.0,plasma));
- SetPixelBlue(q,PlasmaPixel(random_info,(MagickRealType)
- (u.blue+v.blue)/2.0,plasma));
+ SetPixelRed(image,PlasmaPixel(random_info,(MagickRealType)
+ (u.red+v.red)/2.0,plasma),q);
+ SetPixelGreen(image,PlasmaPixel(random_info,(MagickRealType)
+ (u.green+v.green)/2.0,plasma),q);
+ SetPixelBlue(image,PlasmaPixel(random_info,(MagickRealType)
+ (u.blue+v.blue)/2.0,plasma),q);
(void) SyncCacheViewAuthenticPixels(image_view,exception);
if (segment->x1 != segment->x2)
{
@@ -3657,14 +3633,14 @@
(void) GetOneCacheViewVirtualPixel(image_view,x,(ssize_t)
ceil(segment->y2-0.5),&v,exception);
q=QueueCacheViewAuthenticPixels(image_view,x,y_mid,1,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
return(MagickTrue);
- SetPixelRed(q,PlasmaPixel(random_info,(MagickRealType)
- (u.red+v.red)/2.0,plasma));
- SetPixelGreen(q,PlasmaPixel(random_info,(MagickRealType)
- (u.green+v.green)/2.0,plasma));
- SetPixelBlue(q,PlasmaPixel(random_info,(MagickRealType)
- (u.blue+v.blue)/2.0,plasma));
+ SetPixelRed(image,PlasmaPixel(random_info,(MagickRealType)
+ (u.red+v.red)/2.0,plasma),q);
+ SetPixelGreen(image,PlasmaPixel(random_info,(MagickRealType)
+ (u.green+v.green)/2.0,plasma),q);
+ SetPixelBlue(image,PlasmaPixel(random_info,(MagickRealType)
+ (u.blue+v.blue)/2.0,plasma),q);
(void) SyncCacheViewAuthenticPixels(image_view,exception);
}
}
@@ -3672,7 +3648,7 @@
{
if ((segment->x1 != (double) x_mid) || (segment->y2 != (double) y_mid))
{
- register PixelPacket
+ register Quantum
*restrict q;
/*
@@ -3684,19 +3660,19 @@
(void) GetOneCacheViewVirtualPixel(image_view,(ssize_t)
ceil(segment->x2-0.5),y,&v,exception);
q=QueueCacheViewAuthenticPixels(image_view,x_mid,y,1,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
return(MagickTrue);
- SetPixelRed(q,PlasmaPixel(random_info,(MagickRealType)
- (u.red+v.red)/2.0,plasma));
- SetPixelGreen(q,PlasmaPixel(random_info,(MagickRealType)
- (u.green+v.green)/2.0,plasma));
- SetPixelBlue(q,PlasmaPixel(random_info,(MagickRealType)
- (u.blue+v.blue)/2.0,plasma));
+ SetPixelRed(image,PlasmaPixel(random_info,(MagickRealType)
+ (u.red+v.red)/2.0,plasma),q);
+ SetPixelGreen(image,PlasmaPixel(random_info,(MagickRealType)
+ (u.green+v.green)/2.0,plasma),q);
+ SetPixelBlue(image,PlasmaPixel(random_info,(MagickRealType)
+ (u.blue+v.blue)/2.0,plasma),q);
(void) SyncCacheViewAuthenticPixels(image_view,exception);
}
if (segment->y1 != segment->y2)
{
- register PixelPacket
+ register Quantum
*restrict q;
/*
@@ -3708,20 +3684,20 @@
(void) GetOneCacheViewVirtualPixel(image_view,(ssize_t)
ceil(segment->x2-0.5),y,&v,exception);
q=QueueCacheViewAuthenticPixels(image_view,x_mid,y,1,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
return(MagickTrue);
- SetPixelRed(q,PlasmaPixel(random_info,(MagickRealType)
- (u.red+v.red)/2.0,plasma));
- SetPixelGreen(q,PlasmaPixel(random_info,(MagickRealType)
- (u.green+v.green)/2.0,plasma));
- SetPixelBlue(q,PlasmaPixel(random_info,(MagickRealType)
- (u.blue+v.blue)/2.0,plasma));
+ SetPixelRed(image,PlasmaPixel(random_info,(MagickRealType)
+ (u.red+v.red)/2.0,plasma),q);
+ SetPixelGreen(image,PlasmaPixel(random_info,(MagickRealType)
+ (u.green+v.green)/2.0,plasma),q);
+ SetPixelBlue(image,PlasmaPixel(random_info,(MagickRealType)
+ (u.blue+v.blue)/2.0,plasma),q);
(void) SyncCacheViewAuthenticPixels(image_view,exception);
}
}
if ((segment->x1 != segment->x2) || (segment->y1 != segment->y2))
{
- register PixelPacket
+ register Quantum
*restrict q;
/*
@@ -3734,14 +3710,14 @@
y=(ssize_t) ceil(segment->y2-0.5);
(void) GetOneCacheViewVirtualPixel(image_view,x,y,&v,exception);
q=QueueCacheViewAuthenticPixels(image_view,x_mid,y_mid,1,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
return(MagickTrue);
- SetPixelRed(q,PlasmaPixel(random_info,(MagickRealType)
- (u.red+v.red)/2.0,plasma));
- SetPixelGreen(q,PlasmaPixel(random_info,(MagickRealType)
- (u.green+v.green)/2.0,plasma));
- SetPixelBlue(q,PlasmaPixel(random_info,(MagickRealType)
- (u.blue+v.blue)/2.0,plasma));
+ SetPixelRed(image,PlasmaPixel(random_info,(MagickRealType)
+ (u.red+v.red)/2.0,plasma),q);
+ SetPixelGreen(image,PlasmaPixel(random_info,(MagickRealType)
+ (u.green+v.green)/2.0,plasma),q);
+ SetPixelBlue(image,PlasmaPixel(random_info,(MagickRealType)
+ (u.blue+v.blue)/2.0,plasma),q);
(void) SyncCacheViewAuthenticPixels(image_view,exception);
}
if (((segment->x2-segment->x1) < 3.0) && ((segment->y2-segment->y1) < 3.0))
@@ -4041,13 +4017,13 @@
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
if (status == MagickFalse)
@@ -4055,7 +4031,7 @@
p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
q=QueueCacheViewAuthenticPixels(sepia_view,0,y,sepia_image->columns,1,
exception);
- if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
{
status=MagickFalse;
continue;
@@ -4066,22 +4042,22 @@
intensity,
tone;
- intensity=(MagickRealType) PixelIntensityToQuantum(p);
+ intensity=(MagickRealType) GetPixelIntensity(image,p);
tone=intensity > threshold ? (MagickRealType) QuantumRange : intensity+
(MagickRealType) QuantumRange-threshold;
- SetPixelRed(q,ClampToQuantum(tone));
+ SetPixelRed(sepia_image,ClampToQuantum(tone),q);
tone=intensity > (7.0*threshold/6.0) ? (MagickRealType) QuantumRange :
intensity+(MagickRealType) QuantumRange-7.0*threshold/6.0;
- SetPixelGreen(q,ClampToQuantum(tone));
+ SetPixelGreen(sepia_image,ClampToQuantum(tone),q);
tone=intensity < (threshold/6.0) ? 0 : intensity-threshold/6.0;
- SetPixelBlue(q,ClampToQuantum(tone));
+ SetPixelBlue(sepia_image,ClampToQuantum(tone),q);
tone=threshold/7.0;
- if ((MagickRealType) GetPixelGreen(q) < tone)
- SetPixelGreen(q,ClampToQuantum(tone));
- if ((MagickRealType) GetPixelBlue(q) < tone)
- SetPixelBlue(q,ClampToQuantum(tone));
- p++;
- q++;
+ if ((MagickRealType) GetPixelGreen(image,q) < tone)
+ SetPixelGreen(sepia_image,ClampToQuantum(tone),q);
+ if ((MagickRealType) GetPixelBlue(image,q) < tone)
+ SetPixelBlue(sepia_image,ClampToQuantum(tone),q);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(sepia_image);
}
if (SyncCacheViewAuthenticPixels(sepia_view,exception) == MagickFalse)
status=MagickFalse;
@@ -4149,7 +4125,7 @@
#define ShadowImageTag "Shadow/Image"
CacheView
- *image_view;
+ *border_view;
Image
*border_image,
@@ -4195,7 +4171,7 @@
*/
status=MagickTrue;
progress=0;
- image_view=AcquireCacheView(border_image);
+ border_view=AcquireCacheView(border_image);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(dynamic,4) shared(progress,status)
#endif
@@ -4204,33 +4180,33 @@
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
if (status == MagickFalse)
continue;
- q=GetCacheViewAuthenticPixels(image_view,0,y,border_image->columns,1,
+ q=GetCacheViewAuthenticPixels(border_view,0,y,border_image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
for (x=0; x < (ssize_t) border_image->columns; x++)
{
- SetPixelRed(q,border_image->background_color.red);
- SetPixelGreen(q,border_image->background_color.green);
- SetPixelBlue(q,border_image->background_color.blue);
+ SetPixelRed(border_image,border_image->background_color.red,q);
+ SetPixelGreen(border_image,border_image->background_color.green,q);
+ SetPixelBlue(border_image,border_image->background_color.blue,q);
if (border_image->matte == MagickFalse)
- SetPixelOpacity(q,border_image->background_color.opacity);
+ SetPixelAlpha(border_image,border_image->background_color.alpha,q);
else
- SetPixelOpacity(q,ClampToQuantum((MagickRealType)
- (QuantumRange-GetPixelAlpha(q)*opacity/100.0)));
- q++;
+ SetPixelAlpha(border_image,ClampToQuantum((MagickRealType)
+ (GetPixelAlpha(border_image,q)*opacity/100.0)),q);
+ q+=GetPixelChannels(border_image);
}
- if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
+ if (SyncCacheViewAuthenticPixels(border_view,exception) == MagickFalse)
status=MagickFalse;
- if (image->progress_monitor != (MagickProgressMonitor) NULL)
+ if (border_image->progress_monitor != (MagickProgressMonitor) NULL)
{
MagickBooleanType
proceed;
@@ -4238,13 +4214,13 @@
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp critical (MagickCore_ShadowImage)
#endif
- proceed=SetImageProgress(image,ShadowImageTag,progress++,
+ proceed=SetImageProgress(border_image,ShadowImageTag,progress++,
border_image->rows);
if (proceed == MagickFalse)
status=MagickFalse;
}
}
- image_view=DestroyCacheView(image_view);
+ border_view=DestroyCacheView(border_view);
shadow_image=BlurImageChannel(border_image,AlphaChannel,0.0,sigma,exception);
border_image=DestroyImage(border_image);
if (shadow_image == (Image *) NULL)
@@ -4312,7 +4288,7 @@
MagickBooleanType
status;
- MagickPixelPacket
+ PixelInfo
zero;
RandomInfo
@@ -4329,7 +4305,7 @@
if (random_image == (Image *) NULL)
return((Image *) NULL);
status=MagickTrue;
- GetMagickPixelPacket(random_image,&zero);
+ GetPixelInfo(random_image,&zero);
random_info=AcquireRandomInfoThreadSet();
random_view=AcquireCacheView(random_image);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
@@ -4340,28 +4316,24 @@
const int
id = GetOpenMPThreadId();
- MagickPixelPacket
+ PixelInfo
pixel;
- register IndexPacket
- *restrict indexes;
-
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
if (status == MagickFalse)
continue;
q=QueueCacheViewAuthenticPixels(random_view,0,y,random_image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewAuthenticIndexQueue(random_view);
pixel=zero;
for (x=0; x < (ssize_t) random_image->columns; x++)
{
@@ -4370,9 +4342,9 @@
pixel.green=pixel.red;
pixel.blue=pixel.red;
if (image->colorspace == CMYKColorspace)
- pixel.index=pixel.red;
- SetPixelPacket(random_image,&pixel,q,indexes+x);
- q++;
+ pixel.black=pixel.red;
+ SetPixelPixelInfo(random_image,&pixel,q);
+ q+=GetPixelChannels(random_image);
}
if (SyncCacheViewAuthenticPixels(random_view,exception) == MagickFalse)
status=MagickFalse;
@@ -4501,27 +4473,27 @@
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
for (x=0; x < (ssize_t) image->columns; x++)
{
- if ((MagickRealType) GetPixelRed(q) > threshold)
- SetPixelRed(q,QuantumRange-GetPixelRed(q));
- if ((MagickRealType) GetPixelGreen(q) > threshold)
- SetPixelGreen(q,QuantumRange-GetPixelGreen(q));
- if ((MagickRealType) GetPixelBlue(q) > threshold)
- SetPixelBlue(q,QuantumRange-GetPixelBlue(q));
- q++;
+ if ((MagickRealType) GetPixelRed(image,q) > threshold)
+ SetPixelRed(image,QuantumRange-GetPixelRed(image,q),q);
+ if ((MagickRealType) GetPixelGreen(image,q) > threshold)
+ SetPixelGreen(image,QuantumRange-GetPixelGreen(image,q),q);
+ if ((MagickRealType) GetPixelBlue(image,q) > threshold)
+ SetPixelBlue(image,QuantumRange-GetPixelBlue(image,q),q);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -4575,7 +4547,7 @@
ExceptionInfo *exception)
{
#define GetBit(alpha,i) ((((size_t) (alpha) >> (size_t) (i)) & 0x01) != 0)
-#define SetBit(alpha,i,set) (alpha)=(Quantum) ((set) != 0 ? (size_t) (alpha) \
+#define SetBit(alpha,i,set) (Quantum) ((set) != 0 ? (size_t) (alpha) \
| (one << (size_t) (i)) : (size_t) (alpha) & ~(one << (size_t) (i)))
#define SteganoImageTag "Stegano/Image"
@@ -4595,7 +4567,7 @@
PixelPacket
pixel;
- register PixelPacket
+ register Quantum
*q;
register ssize_t
@@ -4656,26 +4628,26 @@
q=GetCacheViewAuthenticPixels(stegano_view,k % (ssize_t)
stegano_image->columns,k/(ssize_t) stegano_image->columns,1,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
switch (c)
{
case 0:
{
- SetBit(GetPixelRed(q),j,GetBit(PixelIntensityToQuantum(
- &pixel),i));
+ SetPixelRed(image,SetBit(GetPixelRed(image,q),j,GetBit(
+ GetPixelPacketIntensity(&pixel),i)),q);
break;
}
case 1:
{
- SetBit(GetPixelGreen(q),j,GetBit(PixelIntensityToQuantum(
- &pixel),i));
+ SetPixelGreen(image,SetBit(GetPixelGreen(image,q),j,GetBit(
+ GetPixelPacketIntensity(&pixel),i)),q);
break;
}
case 2:
{
- SetBit(GetPixelBlue(q),j,GetBit(PixelIntensityToQuantum(
- &pixel),i));
+ SetPixelBlue(image,SetBit(GetPixelBlue(image,q),j,GetBit(
+ GetPixelPacketIntensity(&pixel),i)),q);
break;
}
}
@@ -4810,30 +4782,31 @@
status=MagickTrue;
for (y=0; y < (ssize_t) stereo_image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p,
*restrict q;
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict r;
p=GetVirtualPixels(left_image,-x_offset,y-y_offset,image->columns,1,
exception);
q=GetVirtualPixels(right_image,0,y,right_image->columns,1,exception);
r=QueueAuthenticPixels(stereo_image,0,y,stereo_image->columns,1,exception);
- if ((p == (PixelPacket *) NULL) || (q == (PixelPacket *) NULL) ||
- (r == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) ||
+ (q == (const Quantum *) NULL) || (r == (Quantum *) NULL))
break;
for (x=0; x < (ssize_t) stereo_image->columns; x++)
{
- SetPixelRed(r,GetPixelRed(p));
- SetPixelGreen(r,GetPixelGreen(q));
- SetPixelBlue(r,GetPixelBlue(q));
- SetPixelOpacity(r,(GetPixelOpacity(p)+q->opacity)/2);
- p++;
+ SetPixelRed(image,GetPixelRed(left_image,p),r);
+ SetPixelGreen(image,GetPixelGreen(left_image,q),r);
+ SetPixelBlue(image,GetPixelBlue(left_image,q),r);
+ SetPixelAlpha(image,(GetPixelAlpha(left_image,p)+
+ GetPixelAlpha(left_image,q))/2,r);
+ p+=GetPixelChannels(left_image);
q++;
r++;
}
@@ -4905,7 +4878,7 @@
MagickOffsetType
progress;
- MagickPixelPacket
+ PixelInfo
zero;
MagickRealType
@@ -4936,7 +4909,7 @@
swirl_image=DestroyImage(swirl_image);
return((Image *) NULL);
}
- if (swirl_image->background_color.opacity != OpaqueOpacity)
+ if (swirl_image->background_color.alpha != OpaqueAlpha)
swirl_image->matte=MagickTrue;
/*
Compute scaling factor.
@@ -4957,7 +4930,7 @@
*/
status=MagickTrue;
progress=0;
- GetMagickPixelPacket(swirl_image,&zero);
+ GetPixelInfo(swirl_image,&zero);
image_view=AcquireCacheView(image);
swirl_view=AcquireCacheView(swirl_image);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
@@ -4965,7 +4938,7 @@
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- MagickPixelPacket
+ PixelInfo
pixel;
MagickRealType
@@ -4974,25 +4947,21 @@
PointInfo
delta;
- register IndexPacket
- *restrict swirl_indexes;
-
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(swirl_view,0,y,swirl_image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- swirl_indexes=GetCacheViewAuthenticIndexQueue(swirl_view);
delta.y=scale.y*(double) (y-center.y);
pixel=zero;
for (x=0; x < (ssize_t) image->columns; x++)
@@ -5015,13 +4984,13 @@
factor=1.0-sqrt((double) distance)/radius;
sine=sin((double) (degrees*factor*factor));
cosine=cos((double) (degrees*factor*factor));
- (void) InterpolateMagickPixelPacket(image,image_view,
+ (void) InterpolatePixelInfo(image,image_view,
UndefinedInterpolatePixel,(double) ((cosine*delta.x-sine*delta.y)/
scale.x+center.x),(double) ((sine*delta.x+cosine*delta.y)/scale.y+
center.y),&pixel,exception);
- SetPixelPacket(swirl_image,&pixel,q,swirl_indexes+x);
+ SetPixelPixelInfo(swirl_image,&pixel,q);
}
- q++;
+ q+=GetPixelChannels(swirl_image);
}
if (SyncCacheViewAuthenticPixels(swirl_view,exception) == MagickFalse)
status=MagickFalse;
@@ -5097,7 +5066,7 @@
MagickOffsetType
progress;
- MagickPixelPacket
+ PixelInfo
color_vector,
pixel;
@@ -5141,15 +5110,15 @@
else
pixel.blue=pixel.red;
if ((flags & PsiValue) != 0)
- pixel.opacity=geometry_info.psi;
+ pixel.alpha=geometry_info.psi;
else
- pixel.opacity=(MagickRealType) OpaqueOpacity;
+ pixel.alpha=(MagickRealType) OpaqueAlpha;
color_vector.red=(MagickRealType) (pixel.red*tint.red/100.0-
- PixelIntensity(&tint));
+ GetPixelPacketIntensity(&tint));
color_vector.green=(MagickRealType) (pixel.green*tint.green/100.0-
- PixelIntensity(&tint));
+ GetPixelPacketIntensity(&tint));
color_vector.blue=(MagickRealType) (pixel.blue*tint.blue/100.0-
- PixelIntensity(&tint));
+ GetPixelPacketIntensity(&tint));
/*
Tint image.
*/
@@ -5162,10 +5131,10 @@
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -5176,34 +5145,34 @@
p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
q=QueueCacheViewAuthenticPixels(tint_view,0,y,tint_image->columns,1,
exception);
- if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
{
status=MagickFalse;
continue;
}
for (x=0; x < (ssize_t) image->columns; x++)
{
- MagickPixelPacket
+ PixelInfo
pixel;
MagickRealType
weight;
- weight=QuantumScale*GetPixelRed(p)-0.5;
- pixel.red=(MagickRealType) GetPixelRed(p)+color_vector.red*(1.0-(4.0*
- (weight*weight)));
- SetPixelRed(q,ClampToQuantum(pixel.red));
- weight=QuantumScale*GetPixelGreen(p)-0.5;
- pixel.green=(MagickRealType) GetPixelGreen(p)+color_vector.green*(1.0-(4.0*
- (weight*weight)));
- SetPixelGreen(q,ClampToQuantum(pixel.green));
- weight=QuantumScale*GetPixelBlue(p)-0.5;
- pixel.blue=(MagickRealType) GetPixelBlue(p)+color_vector.blue*(1.0-(4.0*
- (weight*weight)));
- SetPixelBlue(q,ClampToQuantum(pixel.blue));
- SetPixelOpacity(q,GetPixelOpacity(p));
- p++;
- q++;
+ weight=QuantumScale*GetPixelRed(image,p)-0.5;
+ pixel.red=(MagickRealType) GetPixelRed(image,p)+color_vector.red*
+ (1.0-(4.0*(weight*weight)));
+ SetPixelRed(tint_image,ClampToQuantum(pixel.red),q);
+ weight=QuantumScale*GetPixelGreen(image,p)-0.5;
+ pixel.green=(MagickRealType) GetPixelGreen(image,p)+color_vector.green*
+ (1.0-(4.0*(weight*weight)));
+ SetPixelGreen(tint_image,ClampToQuantum(pixel.green),q);
+ weight=QuantumScale*GetPixelBlue(image,p)-0.5;
+ pixel.blue=(MagickRealType) GetPixelBlue(image,p)+color_vector.blue*
+ (1.0-(4.0*(weight*weight)));
+ SetPixelBlue(tint_image,ClampToQuantum(pixel.blue),q);
+ SetPixelAlpha(tint_image,GetPixelAlpha(image,p),q);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(tint_image);
}
if (SyncCacheViewAuthenticPixels(tint_view,exception) == MagickFalse)
status=MagickFalse;
@@ -5370,7 +5339,7 @@
MagickOffsetType
progress;
- MagickPixelPacket
+ PixelInfo
zero;
MagickRealType
@@ -5401,7 +5370,7 @@
wave_image=DestroyImage(wave_image);
return((Image *) NULL);
}
- if (wave_image->background_color.opacity != OpaqueOpacity)
+ if (wave_image->background_color.alpha != OpaqueAlpha)
wave_image->matte=MagickTrue;
/*
Allocate sine map.
@@ -5421,7 +5390,7 @@
*/
status=MagickTrue;
progress=0;
- GetMagickPixelPacket(wave_image,&zero);
+ GetPixelInfo(wave_image,&zero);
image_view=AcquireCacheView(image);
wave_view=AcquireCacheView(wave_image);
(void) SetCacheViewVirtualPixelMethod(image_view,
@@ -5431,13 +5400,10 @@
#endif
for (y=0; y < (ssize_t) wave_image->rows; y++)
{
- MagickPixelPacket
+ PixelInfo
pixel;
- register IndexPacket
- *restrict indexes;
-
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -5447,20 +5413,19 @@
continue;
q=QueueCacheViewAuthenticPixels(wave_view,0,y,wave_image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewAuthenticIndexQueue(wave_view);
pixel=zero;
for (x=0; x < (ssize_t) wave_image->columns; x++)
{
- (void) InterpolateMagickPixelPacket(image,image_view,
+ (void) InterpolatePixelInfo(image,image_view,
UndefinedInterpolatePixel,(double) x,(double) (y-sine_map[x]),&pixel,
exception);
- SetPixelPacket(wave_image,&pixel,q,indexes+x);
- q++;
+ SetPixelPixelInfo(wave_image,&pixel,q);
+ q+=GetPixelChannels(wave_image);
}
if (SyncCacheViewAuthenticPixels(wave_view,exception) == MagickFalse)
status=MagickFalse;
diff --git a/magick/fx.h b/MagickCore/fx.h
similarity index 98%
rename from magick/fx.h
rename to MagickCore/fx.h
index 33992b3..67f6e55 100644
--- a/magick/fx.h
+++ b/MagickCore/fx.h
@@ -22,7 +22,7 @@
extern "C" {
#endif
-#include "magick/draw.h"
+#include "MagickCore/draw.h"
typedef enum
{
diff --git a/magick/gem.c b/MagickCore/gem.c
similarity index 97%
rename from magick/gem.c
rename to MagickCore/gem.c
index f2cd994..cf479c1 100644
--- a/magick/gem.c
+++ b/MagickCore/gem.c
@@ -40,20 +40,21 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/color-private.h"
-#include "magick/draw.h"
-#include "magick/gem.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/log.h"
-#include "magick/memory_.h"
-#include "magick/pixel-private.h"
-#include "magick/quantum.h"
-#include "magick/random_.h"
-#include "magick/resize.h"
-#include "magick/transform.h"
-#include "magick/signature-private.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/draw.h"
+#include "MagickCore/gem.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/log.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantum.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/random_.h"
+#include "MagickCore/resize.h"
+#include "MagickCore/transform.h"
+#include "MagickCore/signature-private.h"
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/magick/gem.h b/MagickCore/gem.h
similarity index 96%
rename from magick/gem.h
rename to MagickCore/gem.h
index d7a1d6c..27796f9 100644
--- a/magick/gem.h
+++ b/MagickCore/gem.h
@@ -22,8 +22,8 @@
extern "C" {
#endif
-#include <magick/fx.h>
-#include <magick/random_.h>
+#include <MagickCore/fx.h>
+#include <MagickCore/random_.h>
extern MagickExport double
ExpandAffine(const AffineMatrix *),
diff --git a/magick/geometry.c b/MagickCore/geometry.c
similarity index 98%
rename from magick/geometry.c
rename to MagickCore/geometry.c
index 49909f6..01a95cf 100644
--- a/magick/geometry.c
+++ b/MagickCore/geometry.c
@@ -39,16 +39,16 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/constitute.h"
-#include "magick/draw.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/geometry.h"
-#include "magick/memory_.h"
-#include "magick/string_.h"
-#include "magick/string-private.h"
-#include "magick/token.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/draw.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/string-private.h"
+#include "MagickCore/token.h"
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/magick/geometry.h b/MagickCore/geometry.h
similarity index 100%
rename from magick/geometry.h
rename to MagickCore/geometry.h
diff --git a/magick/hashmap.c b/MagickCore/hashmap.c
similarity index 99%
rename from magick/hashmap.c
rename to MagickCore/hashmap.c
index fc67c70..c2b20ba 100644
--- a/magick/hashmap.c
+++ b/MagickCore/hashmap.c
@@ -42,14 +42,14 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/hashmap.h"
-#include "magick/memory_.h"
-#include "magick/semaphore.h"
-#include "magick/signature-private.h"
-#include "magick/string_.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/hashmap.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/semaphore.h"
+#include "MagickCore/signature-private.h"
+#include "MagickCore/string_.h"
/*
Typedef declarations.
diff --git a/magick/hashmap.h b/MagickCore/hashmap.h
similarity index 100%
rename from magick/hashmap.h
rename to MagickCore/hashmap.h
diff --git a/magick/histogram.c b/MagickCore/histogram.c
similarity index 87%
rename from magick/histogram.c
rename to MagickCore/histogram.c
index 72888f1..1d2e5bc 100644
--- a/magick/histogram.c
+++ b/MagickCore/histogram.c
@@ -40,26 +40,26 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/cache-view.h"
-#include "magick/color-private.h"
-#include "magick/enhance.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/hashmap.h"
-#include "magick/histogram.h"
-#include "magick/image.h"
-#include "magick/list.h"
-#include "magick/memory_.h"
-#include "magick/monitor-private.h"
-#include "magick/pixel-private.h"
-#include "magick/prepress.h"
-#include "magick/quantize.h"
-#include "magick/registry.h"
-#include "magick/semaphore.h"
-#include "magick/splay-tree.h"
-#include "magick/statistic.h"
-#include "magick/string_.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/cache-view.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/enhance.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/hashmap.h"
+#include "MagickCore/histogram.h"
+#include "MagickCore/image.h"
+#include "MagickCore/list.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/prepress.h"
+#include "MagickCore/quantize.h"
+#include "MagickCore/registry.h"
+#include "MagickCore/semaphore.h"
+#include "MagickCore/splay-tree.h"
+#include "MagickCore/statistic.h"
+#include "MagickCore/string_.h"
/*
Define declarations.
@@ -75,7 +75,7 @@
struct _NodeInfo
*child[16];
- ColorPacket
+ PixelPacket
*list;
MagickSizeType
@@ -157,7 +157,7 @@
*/
static inline size_t ColorToNodeId(const Image *image,
- const MagickPixelPacket *pixel,size_t index)
+ const PixelInfo *pixel,size_t index)
{
size_t
id;
@@ -167,7 +167,7 @@
((ScaleQuantumToChar(ClampToQuantum(pixel->green)) >> index) & 0x01) << 1 |
((ScaleQuantumToChar(ClampToQuantum(pixel->blue)) >> index) & 0x01) << 2);
if (image->matte != MagickFalse)
- id|=((ScaleQuantumToChar(ClampToQuantum(pixel->opacity)) >> index) &
+ id|=((ScaleQuantumToChar(ClampToQuantum(pixel->alpha)) >> index) &
0x01) << 3;
return(id);
}
@@ -186,17 +186,14 @@
MagickBooleanType
proceed;
- MagickPixelPacket
+ PixelInfo
pixel,
target;
NodeInfo
*node_info;
- register const IndexPacket
- *indexes;
-
- register const PixelPacket
+ register const Quantum
*p;
register size_t
@@ -225,15 +222,14 @@
ResourceLimitError,"MemoryAllocationFailed","`%s'",image->filename);
return(cube_info);
}
- GetMagickPixelPacket(image,&pixel);
- GetMagickPixelPacket(image,&target);
+ GetPixelInfo(image,&pixel);
+ GetPixelInfo(image,&target);
image_view=AcquireCacheView(image);
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetCacheViewVirtualIndexQueue(image_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
/*
@@ -243,7 +239,7 @@
index=MaxTreeDepth-1;
for (level=1; level < MaxTreeDepth; level++)
{
- SetMagickPixelPacket(image,p,indexes+x,&pixel);
+ SetPixelInfo(image,p,&pixel);
id=ColorToNodeId(image,&pixel,index);
if (node_info->child[id] == (NodeInfo *) NULL)
{
@@ -261,9 +257,8 @@
}
for (i=0; i < (ssize_t) node_info->number_unique; i++)
{
- SetMagickPixelPacket(image,&node_info->list[i].pixel,
- &node_info->list[i].index,&target);
- if (IsMagickColorEqual(&pixel,&target) != MagickFalse)
+ SetPixelInfoPacket(image,&node_info->list[i],&target);
+ if (IsPixelInfoEquivalent(&pixel,&target) != MagickFalse)
break;
}
if (i < (ssize_t) node_info->number_unique)
@@ -271,27 +266,29 @@
else
{
if (node_info->number_unique == 0)
- node_info->list=(ColorPacket *) AcquireMagickMemory(
+ node_info->list=(PixelPacket *) AcquireMagickMemory(
sizeof(*node_info->list));
else
- node_info->list=(ColorPacket *) ResizeQuantumMemory(node_info->list,
+ node_info->list=(PixelPacket *) ResizeQuantumMemory(node_info->list,
(size_t) (i+1),sizeof(*node_info->list));
- if (node_info->list == (ColorPacket *) NULL)
+ if (node_info->list == (PixelPacket *) NULL)
{
(void) ThrowMagickException(exception,GetMagickModule(),
ResourceLimitError,"MemoryAllocationFailed","`%s'",
image->filename);
return(0);
}
- node_info->list[i].pixel=(*p);
- if ((image->colorspace == CMYKColorspace) ||
- (image->storage_class == PseudoClass))
- node_info->list[i].index=GetPixelIndex(indexes+x);
+ node_info->list[i].red=GetPixelRed(image,p);
+ node_info->list[i].green=GetPixelGreen(image,p);
+ node_info->list[i].blue=GetPixelBlue(image,p);
+ if (image->colorspace == CMYKColorspace)
+ node_info->list[i].black=GetPixelBlack(image,p);
+ node_info->list[i].alpha=GetPixelAlpha(image,p);
node_info->list[i].count=1;
node_info->number_unique++;
cube_info->colors++;
}
- p++;
+ p+=GetPixelChannels(image);
}
proceed=SetImageProgress(image,EvaluateImageTag,(MagickOffsetType) y,
image->rows);
@@ -320,7 +317,7 @@
% The format of the DefineImageHistogram method is:
%
% DefineImageHistogram(const Image *image,NodeInfo *node_info,
-% ColorPacket **unique_colors)
+% PixelPacket **unique_colors)
%
% A description of each parameter follows.
%
@@ -333,7 +330,7 @@
%
*/
static void DefineImageHistogram(const Image *image,NodeInfo *node_info,
- ColorPacket **histogram)
+ PixelPacket **histogram)
{
register ssize_t
i;
@@ -350,14 +347,17 @@
DefineImageHistogram(image,node_info->child[i],histogram);
if (node_info->level == (MaxTreeDepth-1))
{
- register ColorPacket
+ register PixelPacket
*p;
p=node_info->list;
for (i=0; i < (ssize_t) node_info->number_unique; i++)
{
- (*histogram)->pixel=p->pixel;
- (*histogram)->index=p->index;
+ (*histogram)->red=p->red;
+ (*histogram)->green=p->green;
+ (*histogram)->blue=p->blue;
+ (*histogram)->black=p->black;
+ (*histogram)->alpha=p->alpha;
(*histogram)->count=p->count;
(*histogram)++;
p++;
@@ -449,8 +449,8 @@
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 != (ColorPacket *) NULL)
- node_info->list=(ColorPacket *) RelinquishMagickMemory(node_info->list);
+ if (node_info->list != (PixelPacket *) NULL)
+ node_info->list=(PixelPacket *) RelinquishMagickMemory(node_info->list);
}
/*
@@ -523,28 +523,28 @@
% o exception: return any errors or warnings in this structure.
%
*/
-MagickExport ColorPacket *GetImageHistogram(const Image *image,
+MagickExport PixelPacket *GetImageHistogram(const Image *image,
size_t *number_colors,ExceptionInfo *exception)
{
- ColorPacket
+ PixelPacket
*histogram;
CubeInfo
*cube_info;
*number_colors=0;
- histogram=(ColorPacket *) NULL;
+ histogram=(PixelPacket *) NULL;
cube_info=ClassifyImageColors(image,exception);
if (cube_info != (CubeInfo *) NULL)
{
- histogram=(ColorPacket *) AcquireQuantumMemory((size_t) cube_info->colors,
+ histogram=(PixelPacket *) AcquireQuantumMemory((size_t) cube_info->colors,
sizeof(*histogram));
- if (histogram == (ColorPacket *) NULL)
+ if (histogram == (PixelPacket *) NULL)
(void) ThrowMagickException(exception,GetMagickModule(),
ResourceLimitError,"MemoryAllocationFailed","`%s'",image->filename);
else
{
- ColorPacket
+ PixelPacket
*root;
*number_colors=cube_info->colors;
@@ -646,14 +646,11 @@
CubeInfo
*cube_info;
- MagickPixelPacket
+ PixelInfo
pixel,
target;
- register const IndexPacket
- *indexes;
-
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
@@ -691,15 +688,14 @@
ResourceLimitError,"MemoryAllocationFailed","`%s'",image->filename);
return(MagickFalse);
}
- GetMagickPixelPacket(image,&pixel);
- GetMagickPixelPacket(image,&target);
+ GetPixelInfo(image,&pixel);
+ GetPixelInfo(image,&target);
image_view=AcquireCacheView(image);
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetCacheViewVirtualIndexQueue(image_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
/*
@@ -709,7 +705,7 @@
index=MaxTreeDepth-1;
for (level=1; level < MaxTreeDepth; level++)
{
- SetMagickPixelPacket(image,p,indexes+x,&pixel);
+ SetPixelInfo(image,p,&pixel);
id=ColorToNodeId(image,&pixel,index);
if (node_info->child[id] == (NodeInfo *) NULL)
{
@@ -729,9 +725,8 @@
break;
for (i=0; i < (ssize_t) node_info->number_unique; i++)
{
- SetMagickPixelPacket(image,&node_info->list[i].pixel,
- &node_info->list[i].index,&target);
- if (IsMagickColorEqual(&pixel,&target) != MagickFalse)
+ SetPixelInfoPacket(image,&node_info->list[i],&target);
+ if (IsPixelInfoEquivalent(&pixel,&target) != MagickFalse)
break;
}
if (i < (ssize_t) node_info->number_unique)
@@ -742,29 +737,31 @@
Add this unique color to the color list.
*/
if (node_info->number_unique == 0)
- node_info->list=(ColorPacket *) AcquireMagickMemory(
+ node_info->list=(PixelPacket *) AcquireMagickMemory(
sizeof(*node_info->list));
else
- node_info->list=(ColorPacket *) ResizeQuantumMemory(node_info->list,
+ node_info->list=(PixelPacket *) ResizeQuantumMemory(node_info->list,
(size_t) (i+1),sizeof(*node_info->list));
- if (node_info->list == (ColorPacket *) NULL)
+ if (node_info->list == (PixelPacket *) NULL)
{
(void) ThrowMagickException(exception,GetMagickModule(),
ResourceLimitError,"MemoryAllocationFailed","`%s'",
image->filename);
break;
}
- node_info->list[i].pixel=(*p);
- if ((image->colorspace == CMYKColorspace) ||
- (image->storage_class == PseudoClass))
- node_info->list[i].index=GetPixelIndex(indexes+x);
+ node_info->list[i].red=GetPixelRed(image,p);
+ node_info->list[i].green=GetPixelGreen(image,p);
+ node_info->list[i].blue=GetPixelBlue(image,p);
+ if (image->colorspace == CMYKColorspace)
+ node_info->list[i].black=GetPixelBlack(image,p);
+ node_info->list[i].alpha=GetPixelAlpha(image,p);
node_info->list[i].count=1;
node_info->number_unique++;
cube_info->colors++;
if (cube_info->colors > MaximumUniqueColors)
break;
}
- p++;
+ p+=GetPixelChannels(image);
}
if (x < (ssize_t) image->columns)
break;
@@ -809,14 +806,11 @@
CubeInfo
*cube_info;
- MagickPixelPacket
+ PixelInfo
pixel,
target;
- register const IndexPacket
- *indexes;
-
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
@@ -854,15 +848,14 @@
ResourceLimitError,"MemoryAllocationFailed","`%s'",image->filename);
return(MagickFalse);
}
- GetMagickPixelPacket(image,&pixel);
- GetMagickPixelPacket(image,&target);
+ GetPixelInfo(image,&pixel);
+ GetPixelInfo(image,&target);
image_view=AcquireCacheView(image);
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetCacheViewVirtualIndexQueue(image_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
/*
@@ -872,7 +865,7 @@
index=MaxTreeDepth-1;
for (level=1; level < MaxTreeDepth; level++)
{
- SetMagickPixelPacket(image,p,indexes+x,&pixel);
+ SetPixelInfo(image,p,&pixel);
id=ColorToNodeId(image,&pixel,index);
if (node_info->child[id] == (NodeInfo *) NULL)
{
@@ -892,9 +885,8 @@
break;
for (i=0; i < (ssize_t) node_info->number_unique; i++)
{
- SetMagickPixelPacket(image,&node_info->list[i].pixel,
- &node_info->list[i].index,&target);
- if (IsMagickColorEqual(&pixel,&target) != MagickFalse)
+ SetPixelInfoPacket(image,&node_info->list[i],&target);
+ if (IsPixelInfoEquivalent(&pixel,&target) != MagickFalse)
break;
}
if (i < (ssize_t) node_info->number_unique)
@@ -905,29 +897,31 @@
Add this unique color to the color list.
*/
if (node_info->number_unique == 0)
- node_info->list=(ColorPacket *) AcquireMagickMemory(
+ node_info->list=(PixelPacket *) AcquireMagickMemory(
sizeof(*node_info->list));
else
- node_info->list=(ColorPacket *) ResizeQuantumMemory(node_info->list,
+ node_info->list=(PixelPacket *) ResizeQuantumMemory(node_info->list,
(size_t) (i+1),sizeof(*node_info->list));
- if (node_info->list == (ColorPacket *) NULL)
+ if (node_info->list == (PixelPacket *) NULL)
{
(void) ThrowMagickException(exception,GetMagickModule(),
ResourceLimitError,"MemoryAllocationFailed","`%s'",
image->filename);
break;
}
- node_info->list[i].pixel=(*p);
- if ((image->colorspace == CMYKColorspace) ||
- (image->storage_class == PseudoClass))
- node_info->list[i].index=GetPixelIndex(indexes+x);
+ node_info->list[i].red=GetPixelRed(image,p);
+ node_info->list[i].green=GetPixelGreen(image,p);
+ node_info->list[i].blue=GetPixelBlue(image,p);
+ if (image->colorspace == CMYKColorspace)
+ node_info->list[i].black=GetPixelBlack(image,p);
+ node_info->list[i].alpha=GetPixelAlpha(image,p);
node_info->list[i].count=1;
node_info->number_unique++;
cube_info->colors++;
if (cube_info->colors > 256)
break;
}
- p++;
+ p+=GetPixelChannels(image);
}
if (x < (ssize_t) image->columns)
break;
@@ -1038,6 +1032,16 @@
if (fabs(min-max) >= MagickEpsilon)
status&=LevelImageChannel(image,BlueChannel,min,max,1.0);
}
+ if (((channel & BlackChannel) != 0) &&
+ (image->colorspace == CMYKColorspace))
+ {
+ (void) GetImageChannelRange(image,BlackChannel,&min,&max,
+ &image->exception);
+ min+=black_value;
+ max-=white_value;
+ if (fabs(min-max) >= MagickEpsilon)
+ status&=LevelImageChannel(image,BlackChannel,min,max,1.0);
+ }
if (((channel & OpacityChannel) != 0) &&
(image->matte == MagickTrue))
{
@@ -1048,16 +1052,6 @@
if (fabs(min-max) >= MagickEpsilon)
status&=LevelImageChannel(image,OpacityChannel,min,max,1.0);
}
- if (((channel & IndexChannel) != 0) &&
- (image->colorspace == CMYKColorspace))
- {
- (void) GetImageChannelRange(image,IndexChannel,&min,&max,
- &image->exception);
- min+=black_value;
- max-=white_value;
- if (fabs(min-max) >= MagickEpsilon)
- status&=LevelImageChannel(image,IndexChannel,min,max,1.0);
- }
return(status != 0 ? MagickTrue : MagickFalse);
}
@@ -1095,18 +1089,18 @@
static int HistogramCompare(const void *x,const void *y)
{
- const ColorPacket
+ const PixelPacket
*color_1,
*color_2;
- color_1=(const ColorPacket *) x;
- color_2=(const ColorPacket *) y;
- if (color_2->pixel.red != color_1->pixel.red)
- return((int) color_1->pixel.red-(int) color_2->pixel.red);
- if (color_2->pixel.green != color_1->pixel.green)
- return((int) color_1->pixel.green-(int) color_2->pixel.green);
- if (color_2->pixel.blue != color_1->pixel.blue)
- return((int) color_1->pixel.blue-(int) color_2->pixel.blue);
+ color_1=(const PixelPacket *) x;
+ color_2=(const PixelPacket *) y;
+ if (color_2->red != color_1->red)
+ return((int) color_1->red-(int) color_2->red);
+ if (color_2->green != color_1->green)
+ return((int) color_1->green-(int) color_2->green);
+ if (color_2->blue != color_1->blue)
+ return((int) color_1->blue-(int) color_2->blue);
return((int) color_2->count-(int) color_1->count);
}
@@ -1124,16 +1118,16 @@
hex[MaxTextExtent],
tuple[MaxTextExtent];
- ColorPacket
+ PixelPacket
*histogram;
MagickBooleanType
status;
- MagickPixelPacket
+ PixelInfo
pixel;
- register ColorPacket
+ register PixelPacket
*p;
register ssize_t
@@ -1155,16 +1149,16 @@
return(number_colors);
}
histogram=GetImageHistogram(image,&number_colors,exception);
- if (histogram == (ColorPacket *) NULL)
+ if (histogram == (PixelPacket *) NULL)
return(number_colors);
qsort((void *) histogram,(size_t) number_colors,sizeof(*histogram),
HistogramCompare);
- GetMagickPixelPacket(image,&pixel);
+ GetPixelInfo(image,&pixel);
p=histogram;
status=MagickTrue;
for (i=0; i < (ssize_t) number_colors; i++)
{
- SetMagickPixelPacket(image,&p->pixel,&p->index,&pixel);
+ SetPixelInfoPacket(image,p,&pixel);
(void) CopyMagickString(tuple,"(",MaxTextExtent);
ConcatenateColorComponent(&pixel,RedChannel,X11Compliance,tuple);
(void) ConcatenateMagickString(tuple,",",MaxTextExtent);
@@ -1174,7 +1168,7 @@
if (pixel.colorspace == CMYKColorspace)
{
(void) ConcatenateMagickString(tuple,",",MaxTextExtent);
- ConcatenateColorComponent(&pixel,IndexChannel,X11Compliance,tuple);
+ ConcatenateColorComponent(&pixel,BlackChannel,X11Compliance,tuple);
}
if (pixel.matte != MagickFalse)
{
@@ -1199,7 +1193,7 @@
p++;
}
(void) fflush(file);
- histogram=(ColorPacket *) RelinquishMagickMemory(histogram);
+ histogram=(PixelPacket *) RelinquishMagickMemory(histogram);
if (status == MagickFalse)
return(0);
return(number_colors);
@@ -1254,13 +1248,10 @@
node_info->child[i],exception);
if (node_info->level == (MaxTreeDepth-1))
{
- register ColorPacket
+ register PixelPacket
*p;
- register IndexPacket
- *restrict indexes;
-
- register PixelPacket
+ register Quantum
*restrict q;
status=MagickTrue;
@@ -1269,12 +1260,14 @@
{
q=QueueCacheViewAuthenticPixels(unique_view,cube_info->x,0,1,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
continue;
- indexes=GetCacheViewAuthenticIndexQueue(unique_view);
- *q=p->pixel;
+ SetPixelRed(unique_image,p->red,q);
+ SetPixelGreen(unique_image,p->green,q);
+ SetPixelBlue(unique_image,p->blue,q);
+ SetPixelAlpha(unique_image,p->alpha,q);
if (unique_image->colorspace == CMYKColorspace)
- *indexes=p->index;
+ SetPixelBlack(unique_image,p->black,q);
if (SyncCacheViewAuthenticPixels(unique_view,exception) == MagickFalse)
break;
cube_info->x++;
diff --git a/magick/histogram.h b/MagickCore/histogram.h
similarity index 88%
rename from magick/histogram.h
rename to MagickCore/histogram.h
index 49f611c..a4151b5 100644
--- a/magick/histogram.h
+++ b/MagickCore/histogram.h
@@ -22,19 +22,7 @@
extern "C" {
#endif
-typedef struct _ColorPacket
-{
- PixelPacket
- pixel;
-
- IndexPacket
- index;
-
- MagickSizeType
- count;
-} ColorPacket;
-
-extern MagickExport ColorPacket
+extern MagickExport PixelPacket
*GetImageHistogram(const Image *,size_t *,ExceptionInfo *);
extern MagickExport Image
diff --git a/magick/identify.c b/MagickCore/identify.c
similarity index 92%
rename from magick/identify.c
rename to MagickCore/identify.c
index 334115f..6aa59e1 100644
--- a/magick/identify.c
+++ b/MagickCore/identify.c
@@ -42,57 +42,57 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/annotate.h"
-#include "magick/artifact.h"
-#include "magick/attribute.h"
-#include "magick/blob.h"
-#include "magick/cache.h"
-#include "magick/client.h"
-#include "magick/coder.h"
-#include "magick/color.h"
-#include "magick/configure.h"
-#include "magick/constitute.h"
-#include "magick/decorate.h"
-#include "magick/delegate.h"
-#include "magick/draw.h"
-#include "magick/effect.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/feature.h"
-#include "magick/gem.h"
-#include "magick/geometry.h"
-#include "magick/histogram.h"
-#include "magick/identify.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/locale_.h"
-#include "magick/log.h"
-#include "magick/magic.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/module.h"
-#include "magick/monitor.h"
-#include "magick/montage.h"
-#include "magick/option.h"
-#include "magick/pixel-private.h"
-#include "magick/prepress.h"
-#include "magick/profile.h"
-#include "magick/property.h"
-#include "magick/quantize.h"
-#include "magick/quantum.h"
-#include "magick/random_.h"
-#include "magick/registry.h"
-#include "magick/resize.h"
-#include "magick/resource_.h"
-#include "magick/signature.h"
-#include "magick/statistic.h"
-#include "magick/string_.h"
-#include "magick/string-private.h"
-#include "magick/timer.h"
-#include "magick/utility.h"
-#include "magick/version.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/annotate.h"
+#include "MagickCore/artifact.h"
+#include "MagickCore/attribute.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/client.h"
+#include "MagickCore/coder.h"
+#include "MagickCore/color.h"
+#include "MagickCore/configure.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/decorate.h"
+#include "MagickCore/delegate.h"
+#include "MagickCore/draw.h"
+#include "MagickCore/effect.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/feature.h"
+#include "MagickCore/gem.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/histogram.h"
+#include "MagickCore/identify.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/locale_.h"
+#include "MagickCore/log.h"
+#include "MagickCore/magic.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/montage.h"
+#include "MagickCore/option.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/prepress.h"
+#include "MagickCore/profile.h"
+#include "MagickCore/property.h"
+#include "MagickCore/quantize.h"
+#include "MagickCore/quantum.h"
+#include "MagickCore/random_.h"
+#include "MagickCore/registry.h"
+#include "MagickCore/resize.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/signature.h"
+#include "MagickCore/statistic.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/string-private.h"
+#include "MagickCore/timer.h"
+#include "MagickCore/utility.h"
+#include "MagickCore/version.h"
#if defined(MAGICKCORE_LCMS_DELEGATE)
#if defined(MAGICKCORE_HAVE_LCMS_LCMS2_H)
#include <lcms/lcms2.h>
@@ -217,21 +217,6 @@
ssize_t
n;
- if (channel == AlphaChannel)
- {
- n=FormatLocaleFile(file,StatisticsFormat,name,ClampToQuantum(scale*
- (QuantumRange-channel_statistics[channel].maxima)),
- (QuantumRange-channel_statistics[channel].maxima)/(double) QuantumRange,
- ClampToQuantum(scale*(QuantumRange-channel_statistics[channel].minima)),
- (QuantumRange-channel_statistics[channel].minima)/(double) QuantumRange,
- scale*(QuantumRange-channel_statistics[channel].mean),(QuantumRange-
- channel_statistics[channel].mean)/(double) QuantumRange,scale*
- channel_statistics[channel].standard_deviation,
- channel_statistics[channel].standard_deviation/(double) QuantumRange,
- channel_statistics[channel].kurtosis,
- channel_statistics[channel].skewness);
- return(n);
- }
n=FormatLocaleFile(file,StatisticsFormat,name,ClampToQuantum(scale*
channel_statistics[channel].minima),channel_statistics[channel].minima/
(double) QuantumRange,ClampToQuantum(scale*
@@ -271,9 +256,6 @@
const MagickInfo
*magick_info;
- const PixelPacket
- *pixels;
-
double
elapsed_time,
user_time;
@@ -287,6 +269,9 @@
MagickBooleanType
ping;
+ register const Quantum
+ *p;
+
register ssize_t
i,
x;
@@ -378,9 +363,9 @@
Display verbose info about the image.
*/
exception=AcquireExceptionInfo();
- pixels=GetVirtualPixels(image,0,0,1,1,exception);
+ p=GetVirtualPixels(image,0,0,1,1,exception);
exception=DestroyExceptionInfo(exception);
- ping=pixels == (const PixelPacket *) NULL ? MagickTrue : MagickFalse;
+ ping=p == (const Quantum *) NULL ? MagickTrue : MagickFalse;
type=GetImageType(image,&image->exception);
(void) SignatureImage(image);
(void) FormatLocaleFile(file,"Image: %s\n",image->filename);
@@ -456,7 +441,7 @@
(void) FormatLocaleFile(file," Depth: %.20g/%.20g-bit\n",(double)
image->depth,(double) depth);
(void) FormatLocaleFile(file," Channel depth:\n");
- if (IsGrayImage(image,&image->exception) != MagickFalse)
+ if (IsImageGray(image,&image->exception) != MagickFalse)
colorspace=GRAYColorspace;
switch (colorspace)
{
@@ -590,25 +575,20 @@
x=0;
if (image->matte != MagickFalse)
{
- register const IndexPacket
- *indexes;
-
- register const PixelPacket
+ register const Quantum
*p;
- p=(PixelPacket *) NULL;
- indexes=(IndexPacket *) NULL;
+ p=(const Quantum *) NULL;
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetVirtualIndexQueue(image);
for (x=0; x < (ssize_t) image->columns; x++)
{
- if (GetPixelOpacity(p) == (Quantum) TransparentOpacity)
+ if (GetPixelAlpha(image,p) == (Quantum) TransparentAlpha)
break;
- p++;
+ p+=GetPixelChannels(image);
}
if (x < (ssize_t) image->columns)
break;
@@ -618,11 +598,11 @@
char
tuple[MaxTextExtent];
- MagickPixelPacket
+ PixelInfo
pixel;
- GetMagickPixelPacket(image,&pixel);
- SetMagickPixelPacket(image,p,indexes+x,&pixel);
+ GetPixelInfo(image,&pixel);
+ SetPixelInfo(image,p,&pixel);
(void) QueryMagickColorname(image,&pixel,SVGCompliance,tuple,
&image->exception);
(void) FormatLocaleFile(file," Alpha: %s ",tuple);
@@ -654,17 +634,17 @@
hex[MaxTextExtent],
tuple[MaxTextExtent];
- MagickPixelPacket
+ PixelInfo
pixel;
register PixelPacket
*restrict p;
- GetMagickPixelPacket(image,&pixel);
+ GetPixelInfo(image,&pixel);
p=image->colormap;
for (i=0; i < (ssize_t) image->colors; i++)
{
- SetMagickPixelPacket(image,p,(IndexPacket *) NULL,&pixel);
+ SetPixelInfoPacket(image,p,&pixel);
(void) CopyMagickString(tuple,"(",MaxTextExtent);
ConcatenateColorComponent(&pixel,RedChannel,X11Compliance,tuple);
(void) ConcatenateMagickString(tuple,",",MaxTextExtent);
@@ -674,7 +654,7 @@
if (pixel.colorspace == CMYKColorspace)
{
(void) ConcatenateMagickString(tuple,",",MaxTextExtent);
- ConcatenateColorComponent(&pixel,IndexChannel,X11Compliance,
+ ConcatenateColorComponent(&pixel,BlackChannel,X11Compliance,
tuple);
}
if (pixel.matte != MagickFalse)
diff --git a/magick/identify.h b/MagickCore/identify.h
similarity index 100%
rename from magick/identify.h
rename to MagickCore/identify.h
diff --git a/magick/image-private.h b/MagickCore/image-private.h
similarity index 94%
rename from magick/image-private.h
rename to MagickCore/image-private.h
index cbc78f8..49cbfb6 100644
--- a/magick/image-private.h
+++ b/MagickCore/image-private.h
@@ -22,13 +22,11 @@
extern "C" {
#endif
-#define MagickPI 3.14159265358979323846264338327950288419716939937510L
#define Magick2PI 6.28318530717958647692528676655900576839433879875020L
#define MagickPI2 1.57079632679489661923132169163975144209858469968755L
#define MagickSQ1_2 0.70710678118654752440084436210484903928483593768847L
#define MagickSQ2 1.41421356237309504880168872420969807856967187537695L
#define MagickSQ2PI 2.50662827463100024161235523934010416269302368164062L
-#define QuantumScale ((double) 1.0/(double) QuantumRange)
#define UndefinedTicksPerSecond 100L
#define UndefinedCompressionQuality 0UL
diff --git a/magick/image-view.c b/MagickCore/image-view.c
similarity index 95%
rename from magick/image-view.c
rename to MagickCore/image-view.c
index b4fedce..4d33f66 100644
--- a/magick/image-view.c
+++ b/MagickCore/image-view.c
@@ -45,11 +45,11 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/MagickCore.h"
-#include "magick/exception-private.h"
-#include "magick/monitor-private.h"
-#include "magick/thread-private.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/MagickCore.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/thread-private.h"
/*
Typedef declarations.
@@ -253,32 +253,32 @@
MagickBooleanType
sync;
- register const PixelPacket
+ register const Quantum
*restrict duplex_pixels,
*restrict pixels;
- register PixelPacket
+ register Quantum
*restrict destination_pixels;
if (status == MagickFalse)
continue;
pixels=GetCacheViewVirtualPixels(source->view,source->extent.x,y,
source->extent.width,1,source->exception);
- if (pixels == (const PixelPacket *) NULL)
+ if (pixels == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
duplex_pixels=GetCacheViewVirtualPixels(duplex->view,duplex->extent.x,y,
duplex->extent.width,1,duplex->exception);
- if (duplex_pixels == (const PixelPacket *) NULL)
+ if (duplex_pixels == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
destination_pixels=GetCacheViewAuthenticPixels(destination->view,
destination->extent.x,y,destination->extent.width,1,exception);
- if (destination_pixels == (PixelPacket *) NULL)
+ if (destination_pixels == (Quantum *) NULL)
{
status=MagickFalse;
continue;
@@ -314,29 +314,31 @@
% %
% %
% %
-% G e t I m a g e V i e w A u t h e n t i c I n d e x e s %
+% G e t I m a g e V i e w A u t h e n t i c M e t a c o n t e n t %
% %
% %
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% GetImageViewAuthenticIndexes() returns the image view authentic indexes.
+% GetImageViewAuthenticMetacontent() returns the image view authentic
+% meta-content.
%
% The format of the GetImageViewAuthenticPixels method is:
%
-% IndexPacket *GetImageViewAuthenticIndexes(const ImageView *image_view)
+% void *GetImageViewAuthenticMetacontent(
+% const ImageView *image_view)
%
% A description of each parameter follows:
%
% o image_view: the image view.
%
*/
-MagickExport IndexPacket *GetImageViewAuthenticIndexes(
+MagickExport void *GetImageViewAuthenticMetacontent(
const ImageView *image_view)
{
assert(image_view != (ImageView *) NULL);
assert(image_view->signature == MagickSignature);
- return(GetCacheViewAuthenticIndexQueue(image_view->view));
+ return(GetCacheViewAuthenticMetacontent(image_view->view));
}
/*
@@ -354,14 +356,14 @@
%
% The format of the GetImageViewAuthenticPixels method is:
%
-% PixelPacket *GetImageViewAuthenticPixels(const ImageView *image_view)
+% Quantum *GetImageViewAuthenticPixels(const ImageView *image_view)
%
% A description of each parameter follows:
%
% o image_view: the image view.
%
*/
-MagickExport PixelPacket *GetImageViewAuthenticPixels(
+MagickExport Quantum *GetImageViewAuthenticPixels(
const ImageView *image_view)
{
assert(image_view != (ImageView *) NULL);
@@ -556,14 +558,14 @@
const int
id = GetOpenMPThreadId();
- register const PixelPacket
+ register const Quantum
*pixels;
if (status == MagickFalse)
continue;
pixels=GetCacheViewVirtualPixels(source->view,source->extent.x,y,
source->extent.width,1,source->exception);
- if (pixels == (const PixelPacket *) NULL)
+ if (pixels == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
@@ -592,17 +594,18 @@
% %
% %
% %
-% G e t I m a g e V i e w V i r t u a l I n d e x e s %
+% G e t I m a g e V i e w V i r t u a l M e t a c o n t e n t %
% %
% %
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% GetImageViewVirtualIndexes() returns the image view virtual indexes.
+% GetImageViewVirtualMetacontent() returns the image view virtual
+% meta-content.
%
-% The format of the GetImageViewVirtualIndexes method is:
+% The format of the GetImageViewVirtualMetacontent method is:
%
-% const IndexPacket *GetImageViewVirtualIndexes(
+% const void *GetImageViewVirtualMetacontent(
% const ImageView *image_view)
%
% A description of each parameter follows:
@@ -610,12 +613,12 @@
% o image_view: the image view.
%
*/
-MagickExport const IndexPacket *GetImageViewVirtualIndexes(
+MagickExport const void *GetImageViewVirtualMetacontent(
const ImageView *image_view)
{
assert(image_view != (ImageView *) NULL);
assert(image_view->signature == MagickSignature);
- return(GetCacheViewVirtualIndexQueue(image_view->view));
+ return(GetCacheViewVirtualMetacontent(image_view->view));
}
/*
@@ -633,14 +636,14 @@
%
% The format of the GetImageViewVirtualPixels method is:
%
-% const PixelPacket *GetImageViewVirtualPixels(const ImageView *image_view)
+% const Quantum *GetImageViewVirtualPixels(const ImageView *image_view)
%
% A description of each parameter follows:
%
% o image_view: the image view.
%
*/
-MagickExport const PixelPacket *GetImageViewVirtualPixels(
+MagickExport const Quantum *GetImageViewVirtualPixels(
const ImageView *image_view)
{
assert(image_view != (ImageView *) NULL);
@@ -897,14 +900,14 @@
MagickBooleanType
sync;
- register PixelPacket
+ register Quantum
*restrict pixels;
if (status == MagickFalse)
continue;
pixels=GetCacheViewAuthenticPixels(destination->view,destination->extent.x,
y,destination->extent.width,1,exception);
- if (pixels == (PixelPacket *) NULL)
+ if (pixels == (Quantum *) NULL)
{
InheritException(destination->exception,GetCacheViewException(
destination->view));
@@ -1061,24 +1064,24 @@
MagickBooleanType
sync;
- register const PixelPacket
+ register const Quantum
*restrict pixels;
- register PixelPacket
+ register Quantum
*restrict destination_pixels;
if (status == MagickFalse)
continue;
pixels=GetCacheViewVirtualPixels(source->view,source->extent.x,y,
source->extent.width,1,source->exception);
- if (pixels == (const PixelPacket *) NULL)
+ if (pixels == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
destination_pixels=GetCacheViewAuthenticPixels(destination->view,
destination->extent.x,y,destination->extent.width,1,exception);
- if (destination_pixels == (PixelPacket *) NULL)
+ if (destination_pixels == (Quantum *) NULL)
{
status=MagickFalse;
continue;
@@ -1188,14 +1191,14 @@
const int
id = GetOpenMPThreadId();
- register PixelPacket
+ register Quantum
*restrict pixels;
if (status == MagickFalse)
continue;
pixels=GetCacheViewAuthenticPixels(source->view,source->extent.x,y,
source->extent.width,1,exception);
- if (pixels == (PixelPacket *) NULL)
+ if (pixels == (Quantum *) NULL)
{
InheritException(source->exception,GetCacheViewException(source->view));
status=MagickFalse;
diff --git a/magick/image-view.h b/MagickCore/image-view.h
similarity index 90%
rename from magick/image-view.h
rename to MagickCore/image-view.h
index 665c824..351ee87 100644
--- a/magick/image-view.h
+++ b/MagickCore/image-view.h
@@ -37,12 +37,12 @@
extern MagickExport char
*GetImageViewException(const ImageView *,ExceptionType *);
-extern MagickExport const IndexPacket
- *GetImageViewVirtualIndexes(const ImageView *);
-
-extern MagickExport const PixelPacket
+extern MagickExport const Quantum
*GetImageViewVirtualPixels(const ImageView *);
+extern MagickExport const void
+ *GetImageViewVirtualMetacontent(const ImageView *);
+
extern MagickExport Image
*GetImageViewImage(const ImageView *);
@@ -53,9 +53,6 @@
*NewImageViewRegion(Image *,const ssize_t,const ssize_t,const size_t,
const size_t);
-extern MagickExport IndexPacket
- *GetImageViewAuthenticIndexes(const ImageView *);
-
extern MagickExport MagickBooleanType
DuplexTransferImageViewIterator(ImageView *,ImageView *,ImageView *,
DuplexTransferImageViewMethod,void *),
@@ -66,7 +63,7 @@
void *),
UpdateImageViewIterator(ImageView *,UpdateImageViewMethod,void *);
-extern MagickExport PixelPacket
+extern MagickExport Quantum
*GetImageViewAuthenticPixels(const ImageView *);
extern MagickExport RectangleInfo
@@ -76,6 +73,9 @@
SetImageViewDescription(ImageView *,const char *),
SetImageViewThreads(ImageView *,const size_t);
+extern MagickExport void
+ *GetImageViewAuthenticMetacontent(const ImageView *);
+
#if defined(__cplusplus) || defined(c_plusplus)
}
#endif
diff --git a/magick/image.c b/MagickCore/image.c
similarity index 91%
rename from magick/image.c
rename to MagickCore/image.c
index 584d7dd..e4913ad 100644
--- a/magick/image.c
+++ b/MagickCore/image.c
@@ -40,60 +40,60 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/animate.h"
-#include "magick/artifact.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/cache-private.h"
-#include "magick/cache-view.h"
-#include "magick/client.h"
-#include "magick/color.h"
-#include "magick/color-private.h"
-#include "magick/colormap.h"
-#include "magick/colorspace.h"
-#include "magick/colorspace-private.h"
-#include "magick/composite.h"
-#include "magick/composite-private.h"
-#include "magick/compress.h"
-#include "magick/constitute.h"
-#include "magick/deprecate.h"
-#include "magick/display.h"
-#include "magick/draw.h"
-#include "magick/enhance.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/gem.h"
-#include "magick/geometry.h"
-#include "magick/histogram.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magic.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/module.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/option.h"
-#include "magick/paint.h"
-#include "magick/pixel-private.h"
-#include "magick/profile.h"
-#include "magick/property.h"
-#include "magick/quantize.h"
-#include "magick/random_.h"
-#include "magick/segment.h"
-#include "magick/semaphore.h"
-#include "magick/signature-private.h"
-#include "magick/statistic.h"
-#include "magick/string_.h"
-#include "magick/string-private.h"
-#include "magick/thread-private.h"
-#include "magick/threshold.h"
-#include "magick/timer.h"
-#include "magick/utility.h"
-#include "magick/version.h"
-#include "magick/xwindow-private.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/animate.h"
+#include "MagickCore/artifact.h"
+#include "MagickCore/attribute.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/cache-private.h"
+#include "MagickCore/cache-view.h"
+#include "MagickCore/client.h"
+#include "MagickCore/color.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colormap.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/colorspace-private.h"
+#include "MagickCore/composite.h"
+#include "MagickCore/composite-private.h"
+#include "MagickCore/compress.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/display.h"
+#include "MagickCore/draw.h"
+#include "MagickCore/enhance.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/gem.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/histogram.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magic.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/option.h"
+#include "MagickCore/paint.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/profile.h"
+#include "MagickCore/property.h"
+#include "MagickCore/quantize.h"
+#include "MagickCore/random_.h"
+#include "MagickCore/segment.h"
+#include "MagickCore/semaphore.h"
+#include "MagickCore/signature-private.h"
+#include "MagickCore/statistic.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/string-private.h"
+#include "MagickCore/thread-private.h"
+#include "MagickCore/threshold.h"
+#include "MagickCore/timer.h"
+#include "MagickCore/utility.h"
+#include "MagickCore/version.h"
+#include "MagickCore/xwindow-private.h"
/*
Constant declaration.
@@ -185,6 +185,7 @@
GetTimerInfo(&image->timer);
image->ping=MagickFalse;
image->cache=AcquirePixelCache(0);
+ image->component_map=AcquirePixelComponentMap();
image->blob=CloneBlobInfo((BlobInfo *) NULL);
image->debug=IsEventLogging();
image->reference_count=1;
@@ -512,16 +513,10 @@
MagickBooleanType
sync;
- register const IndexPacket
- *restrict indexes;
-
- register const PixelPacket
+ register const Quantum
*restrict p;
- register IndexPacket
- *restrict append_indexes;
-
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -532,26 +527,24 @@
p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
q=QueueCacheViewAuthenticPixels(append_view,x_offset,y+y_offset,
image->columns,1,exception);
- if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewVirtualIndexQueue(image_view);
- append_indexes=GetCacheViewAuthenticIndexQueue(append_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelRed(q,GetPixelRed(p));
- SetPixelGreen(q,GetPixelGreen(p));
- SetPixelBlue(q,GetPixelBlue(p));
- SetPixelOpacity(q,OpaqueOpacity);
- if (image->matte != MagickFalse)
- SetPixelOpacity(q,GetPixelOpacity(p));
+ SetPixelRed(append_image,GetPixelRed(image,p),q);
+ SetPixelGreen(append_image,GetPixelGreen(image,p),q);
+ SetPixelBlue(append_image,GetPixelBlue(image,p),q);
if ((image->colorspace == CMYKColorspace) &&
(append_image->colorspace == CMYKColorspace))
- SetPixelIndex(append_indexes+x,GetPixelIndex(indexes+x));
- p++;
- q++;
+ SetPixelBlack(append_image,GetPixelBlack(image,p),q);
+ SetPixelAlpha(append_image,OpaqueAlpha,q);
+ if (image->matte != MagickFalse)
+ SetPixelAlpha(append_image,GetPixelAlpha(image,p),q);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(append_image);
}
sync=SyncCacheViewAuthenticPixels(append_view,exception);
if (sync == MagickFalse)
@@ -780,7 +773,8 @@
(void) ResetMagickMemory(clone_image,0,sizeof(*clone_image));
clone_image->signature=MagickSignature;
clone_image->storage_class=image->storage_class;
- clone_image->channels=image->channels;
+ clone_image->pixel_channels=image->pixel_channels;
+ clone_image->metacontent_extent=image->metacontent_extent;
clone_image->colorspace=image->colorspace;
clone_image->matte=image->matte;
clone_image->columns=image->columns;
@@ -811,6 +805,7 @@
clone_image->magick_columns=image->magick_columns;
clone_image->magick_rows=image->magick_rows;
clone_image->type=image->type;
+ clone_image->component_map=ClonePixelComponentMap(image->component_map);
(void) CopyMagickString(clone_image->magick_filename,image->magick_filename,
MaxTextExtent);
(void) CopyMagickString(clone_image->magick,image->magick,MaxTextExtent);
@@ -934,7 +929,6 @@
(void) CloneString(&clone_info->density,image_info->density);
clone_info->pointsize=image_info->pointsize;
clone_info->fuzz=image_info->fuzz;
- clone_info->pen=image_info->pen;
clone_info->background_color=image_info->background_color;
clone_info->border_color=image_info->border_color;
clone_info->matte_color=image_info->matte_color;
@@ -971,8 +965,6 @@
(void) CopyMagickString(clone_info->zero,image_info->zero,MaxTextExtent);
(void) CopyMagickString(clone_info->filename,image_info->filename,
MaxTextExtent);
- clone_info->subimage=image_info->scene; /* deprecated */
- clone_info->subrange=image_info->number_scenes; /* deprecated */
clone_info->channel=image_info->channel;
clone_info->debug=IsEventLogging();
clone_info->signature=image_info->signature;
@@ -1053,7 +1045,7 @@
combine_image=DestroyImage(combine_image);
return((Image *) NULL);
}
- if ((channel & OpacityChannel) != 0)
+ if ((channel & AlphaChannel) != 0)
combine_image->matte=MagickTrue;
(void) SetImageBackgroundColor(combine_image);
/*
@@ -1070,13 +1062,13 @@
const Image
*next;
- PixelPacket
+ Quantum
*pixels;
- register const PixelPacket
+ register const Quantum
*restrict p;
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -1086,7 +1078,7 @@
continue;
pixels=GetCacheViewAuthenticPixels(combine_view,0,y,combine_image->columns,
1,exception);
- if (pixels == (PixelPacket *) NULL)
+ if (pixels == (Quantum *) NULL)
{
status=MagickFalse;
continue;
@@ -1096,13 +1088,13 @@
{
image_view=AcquireCacheView(next);
p=GetCacheViewVirtualPixels(image_view,0,y,next->columns,1,exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
continue;
q=pixels;
for (x=0; x < (ssize_t) combine_image->columns; x++)
{
- SetPixelRed(q,PixelIntensityToQuantum(p));
- p++;
+ SetPixelRed(image,GetPixelIntensity(image,p),q);
+ p+=GetPixelChannels(image);
q++;
}
image_view=DestroyCacheView(image_view);
@@ -1112,13 +1104,13 @@
{
image_view=AcquireCacheView(next);
p=GetCacheViewVirtualPixels(image_view,0,y,next->columns,1,exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
continue;
q=pixels;
for (x=0; x < (ssize_t) combine_image->columns; x++)
{
- SetPixelGreen(q,PixelIntensityToQuantum(p));
- p++;
+ SetPixelGreen(image,GetPixelIntensity(image,p),q);
+ p+=GetPixelChannels(image);
q++;
}
image_view=DestroyCacheView(image_view);
@@ -1128,49 +1120,47 @@
{
image_view=AcquireCacheView(next);
p=GetCacheViewVirtualPixels(image_view,0,y,next->columns,1,exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
continue;
q=pixels;
for (x=0; x < (ssize_t) combine_image->columns; x++)
{
- SetPixelBlue(q,PixelIntensityToQuantum(p));
- p++;
+ SetPixelBlue(image,GetPixelIntensity(image,p),q);
+ p+=GetPixelChannels(image);
q++;
}
image_view=DestroyCacheView(image_view);
next=GetNextImageInList(next);
}
- if (((channel & OpacityChannel) != 0) && (next != (Image *) NULL))
- {
- image_view=AcquireCacheView(next);
- p=GetCacheViewVirtualPixels(image_view,0,y,next->columns,1,exception);
- if (p == (const PixelPacket *) NULL)
- continue;
- q=pixels;
- for (x=0; x < (ssize_t) combine_image->columns; x++)
- {
- SetPixelOpacity(q,PixelIntensityToQuantum(p));
- p++;
- q++;
- }
- image_view=DestroyCacheView(image_view);
- next=GetNextImageInList(next);
- }
- if (((channel & IndexChannel) != 0) &&
+ if (((channel & BlackChannel) != 0) &&
(image->colorspace == CMYKColorspace) && (next != (Image *) NULL))
{
- IndexPacket
- *indexes;
-
image_view=AcquireCacheView(next);
p=GetCacheViewVirtualPixels(image_view,0,y,next->columns,1,exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
continue;
- indexes=GetCacheViewAuthenticIndexQueue(combine_view);
+ q=pixels;
for (x=0; x < (ssize_t) combine_image->columns; x++)
{
- SetPixelIndex(indexes+x,PixelIntensityToQuantum(p));
- p++;
+ SetPixelBlack(image,GetPixelIntensity(image,p),q);
+ p+=GetPixelChannels(image);
+ q++;
+ }
+ image_view=DestroyCacheView(image_view);
+ next=GetNextImageInList(next);
+ }
+ if (((channel & AlphaChannel) != 0) && (next != (Image *) NULL))
+ {
+ image_view=AcquireCacheView(next);
+ p=GetCacheViewVirtualPixels(image_view,0,y,next->columns,1,exception);
+ if (p == (const Quantum *) NULL)
+ continue;
+ q=pixels;
+ for (x=0; x < (ssize_t) combine_image->columns; x++)
+ {
+ SetPixelAlpha(image,GetPixelIntensity(image,p),q);
+ p+=GetPixelChannels(image);
+ q++;
}
image_view=DestroyCacheView(image_view);
next=GetNextImageInList(next);
@@ -1241,6 +1231,7 @@
Destroy image.
*/
DestroyImagePixels(image);
+ image->component_map=DestroyPixelComponentMap(image->component_map);
if (image->clip_mask != (Image *) NULL)
image->clip_mask=DestroyImage(image->clip_mask);
if (image->mask != (Image *) NULL)
@@ -1599,38 +1590,6 @@
% %
% %
% %
-% G e t I m a g e C h a n n e l s %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% GetImageChannels() returns the number of pixel channels associated with the
-% specified image.
-%
-% The format of the GetChannels method is:
-%
-% size_t GetImageChannels(Image *image)
-%
-% A description of each parameter follows:
-%
-% o image: the image.
-%
-*/
-MagickExport size_t GetImageChannels(Image *image)
-{
- assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
- if (image->debug != MagickFalse)
- (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
- return(image->channels);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
+ G e t I m a g e R e f e r e n c e C o u n t %
% %
% %
@@ -1899,7 +1858,7 @@
MagickBooleanType
status;
- MagickPixelPacket
+ PixelInfo
zero;
ssize_t
@@ -1910,20 +1869,17 @@
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
status=MagickTrue;
- GetMagickPixelPacket(image,&zero);
+ GetPixelInfo(image,&zero);
image_view=AcquireCacheView(image);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(dynamic,4) shared(status)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- MagickPixelPacket
+ PixelInfo
pixel;
- register const IndexPacket
- *indexes;
-
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
@@ -1932,16 +1888,15 @@
if (status == MagickFalse)
continue;
p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewVirtualIndexQueue(image_view);
pixel=zero;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetMagickPixelPacket(image,p,indexes+x,&pixel);
+ SetPixelInfo(image,p,&pixel);
if ((pixel.red < 0.0) || (pixel.red > QuantumRange) ||
(pixel.red != (QuantumAny) pixel.red))
break;
@@ -1951,19 +1906,19 @@
if ((pixel.blue < 0.0) || (pixel.blue > QuantumRange) ||
(pixel.blue != (QuantumAny) pixel.blue))
break;
- if (pixel.matte != MagickFalse)
- {
- if ((pixel.opacity < 0.0) || (pixel.opacity > QuantumRange) ||
- (pixel.opacity != (QuantumAny) pixel.opacity))
- break;
- }
if (pixel.colorspace == CMYKColorspace)
{
- if ((pixel.index < 0.0) || (pixel.index > QuantumRange) ||
- (pixel.index != (QuantumAny) pixel.index))
+ if ((pixel.black < 0.0) || (pixel.black > QuantumRange) ||
+ (pixel.black != (QuantumAny) pixel.black))
break;
}
- p++;
+ if (pixel.matte != MagickFalse)
+ {
+ if ((pixel.alpha < 0.0) || (pixel.alpha > QuantumRange) ||
+ (pixel.alpha != (QuantumAny) pixel.alpha))
+ break;
+ }
+ p+=GetPixelChannels(image);
}
if (x < (ssize_t) image->columns)
status=MagickFalse;
@@ -2125,7 +2080,7 @@
%
% Image *NewMagickImage(const ImageInfo *image_info,
% const size_t width,const size_t height,
-% const MagickPixelPacket *background)
+% const PixelInfo *background)
%
% A description of each parameter follows:
%
@@ -2140,7 +2095,7 @@
*/
MagickExport Image *NewMagickImage(const ImageInfo *image_info,
const size_t width,const size_t height,
- const MagickPixelPacket *background)
+ const PixelInfo *background)
{
CacheView
*image_view;
@@ -2161,7 +2116,7 @@
if (image_info->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
assert(image_info->signature == MagickSignature);
- assert(background != (const MagickPixelPacket *) NULL);
+ assert(background != (const PixelInfo *) NULL);
image=AcquireImage(image_info);
image->columns=width;
image->rows=height;
@@ -2177,10 +2132,7 @@
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- register IndexPacket
- *restrict indexes;
-
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -2189,16 +2141,15 @@
if (status == MagickFalse)
continue;
q=QueueCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelPacket(image,background,q,indexes+x);
- q++;
+ SetPixelPixelInfo(image,background,q);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -2338,7 +2289,7 @@
% o image: the image.
%
% o channel: Identify which channel to extract: RedChannel, GreenChannel,
-% BlueChannel, OpacityChannel, CyanChannel, MagentaChannel,
+% BlueChannel, AlphaChannel, CyanChannel, MagentaChannel,
% YellowChannel, or BlackChannel.
%
*/
@@ -2382,10 +2333,7 @@
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- register IndexPacket
- *restrict indexes;
-
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -2394,21 +2342,20 @@
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
switch (channel)
{
case RedChannel:
{
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- q++;
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ q+=GetPixelChannels(image);
}
break;
}
@@ -2416,9 +2363,9 @@
{
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelRed(q,GetPixelGreen(q));
- SetPixelBlue(q,GetPixelGreen(q));
- q++;
+ SetPixelRed(image,GetPixelGreen(image,q),q);
+ SetPixelBlue(image,GetPixelGreen(image,q),q);
+ q+=GetPixelChannels(image);
}
break;
}
@@ -2426,20 +2373,20 @@
{
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelRed(q,GetPixelBlue(q));
- SetPixelGreen(q,GetPixelBlue(q));
- q++;
+ SetPixelRed(image,GetPixelBlue(image,q),q);
+ SetPixelGreen(image,GetPixelBlue(image,q),q);
+ q+=GetPixelChannels(image);
}
break;
}
- case OpacityChannel:
+ case AlphaChannel:
{
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelRed(q,GetPixelOpacity(q));
- SetPixelGreen(q,GetPixelOpacity(q));
- SetPixelBlue(q,GetPixelOpacity(q));
- q++;
+ SetPixelRed(image,GetPixelAlpha(image,q),q);
+ SetPixelGreen(image,GetPixelAlpha(image,q),q);
+ SetPixelBlue(image,GetPixelAlpha(image,q),q);
+ q+=GetPixelChannels(image);
}
break;
}
@@ -2450,10 +2397,10 @@
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelRed(q,GetPixelIndex(indexes+x));
- SetPixelGreen(q,GetPixelIndex(indexes+x));
- SetPixelBlue(q,GetPixelIndex(indexes+x));
- q++;
+ SetPixelRed(image,GetPixelBlack(image,q),q);
+ SetPixelGreen(image,GetPixelBlack(image,q),q);
+ SetPixelBlue(image,GetPixelBlack(image,q),q);
+ q+=GetPixelChannels(image);
}
break;
}
@@ -2461,10 +2408,10 @@
{
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelRed(q,GetPixelAlpha(q));
- SetPixelGreen(q,GetPixelAlpha(q));
- SetPixelBlue(q,GetPixelAlpha(q));
- q++;
+ SetPixelRed(image,GetPixelAlpha(image,q),q);
+ SetPixelGreen(image,GetPixelAlpha(image,q),q);
+ SetPixelBlue(image,GetPixelAlpha(image,q),q);
+ q+=GetPixelChannels(image);
}
break;
}
@@ -2472,8 +2419,8 @@
{
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelAlpha(q,PixelIntensityToQuantum(q));
- q++;
+ SetPixelAlpha(image,GetPixelIntensity(image,q),q);
+ q+=GetPixelChannels(image);
}
break;
}
@@ -2526,7 +2473,7 @@
% o image: the image.
%
% o channel: Identify which channels to extract: RedChannel, GreenChannel,
-% BlueChannel, OpacityChannel, CyanChannel, MagentaChannel,
+% BlueChannel, AlphaChannel, CyanChannel, MagentaChannel,
% YellowChannel, or BlackChannel.
%
% o exception: return any errors or warnings in this structure.
@@ -2568,10 +2515,10 @@
(void) SeparateImageChannel(separate_image,BlackChannel);
AppendImageToList(&images,separate_image);
}
- if ((channel & OpacityChannel) != 0)
+ if ((channel & AlphaChannel) != 0)
{
separate_image=CloneImage(image,0,0,MagickTrue,exception);
- (void) SeparateImageChannel(separate_image,OpacityChannel);
+ (void) SeparateImageChannel(separate_image,AlphaChannel);
AppendImageToList(&images,separate_image);
}
return(images);
@@ -2602,8 +2549,8 @@
%
% o alpha_type: The alpha channel type: ActivateAlphaChannel,
% CopyAlphaChannel, DeactivateAlphaChannel, ExtractAlphaChannel,
-% OpaqueAlphaChannel, ResetAlphaChannel, SetAlphaChannel,
-% ShapeAlphaChannel, and TransparentAlphaChannel.
+% OpaqueAlphaChannel, SetAlphaChannel, ShapeAlphaChannel, and
+% TransparentAlphaChannel.
%
*/
MagickExport MagickBooleanType SetImageAlphaChannel(Image *image,
@@ -2632,13 +2579,10 @@
ExceptionInfo
*exception;
- IndexPacket
- index;
-
MagickBooleanType
status;
- MagickPixelPacket
+ PixelInfo
background;
PixelPacket
@@ -2654,13 +2598,11 @@
break;
if (SetImageStorageClass(image,DirectClass) == MagickFalse)
break;
- GetMagickPixelPacket(image,&background);
- SetMagickPixelPacket(image,&image->background_color,(const IndexPacket *)
- NULL,&background);
+ GetPixelInfo(image,&background);
+ SetPixelInfoPacket(image,&image->background_color,&background);
if (image->colorspace == CMYKColorspace)
ConvertRGBToCMYK(&background);
- index=0;
- SetPixelPacket(image,&background,&pixel,&index);
+ SetPacketPixelInfo(image,&background,&pixel);
status=MagickTrue;
exception=(&image->exception);
image_view=AcquireCacheView(image);
@@ -2669,10 +2611,7 @@
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- register IndexPacket
- *restrict indexes;
-
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -2682,27 +2621,23 @@
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
for (x=0; x < (ssize_t) image->columns; x++)
{
- if (q->opacity == TransparentOpacity)
+ if (GetPixelAlpha(image,q) == TransparentAlpha)
{
- SetPixelRed(q,pixel.red);
- SetPixelGreen(q,pixel.green);
- SetPixelBlue(q,pixel.blue);
+ SetPixelRed(image,pixel.red,q);
+ SetPixelGreen(image,pixel.green,q);
+ SetPixelBlue(image,pixel.blue,q);
+ if (image->colorspace == CMYKColorspace)
+ SetPixelBlack(image,pixel.black,q);
}
- q++;
+ q+=GetPixelChannels(image);
}
- if (image->colorspace == CMYKColorspace)
- {
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
- for (x=0; x < (ssize_t) image->columns; x++)
- SetPixelIndex(indexes+x,index);
- }
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
}
@@ -2725,15 +2660,14 @@
image->matte=MagickTrue; /* make sure transparency is now on! */
if (alpha_type == ShapeAlphaChannel)
{
- MagickPixelPacket
+ PixelInfo
background;
/*
Reset all color channels to background color.
*/
- GetMagickPixelPacket(image,&background);
- SetMagickPixelPacket(image,&(image->background_color),(IndexPacket *)
- NULL,&background);
+ GetPixelInfo(image,&background);
+ SetPixelInfoPacket(image,&(image->background_color),&background);
(void) LevelColorsImage(image,&background,&background,MagickTrue);
}
break;
@@ -2744,16 +2678,15 @@
image->matte=MagickFalse;
break;
}
- case ResetAlphaChannel: /* deprecated */
case OpaqueAlphaChannel:
{
- status=SetImageOpacity(image,OpaqueOpacity);
+ status=SetImageOpacity(image,OpaqueAlpha);
image->matte=MagickTrue;
break;
}
case TransparentAlphaChannel:
{
- status=SetImageOpacity(image,TransparentOpacity);
+ status=SetImageOpacity(image,TransparentAlpha);
image->matte=MagickTrue;
break;
}
@@ -2761,7 +2694,7 @@
{
if (image->matte == MagickFalse)
{
- status=SetImageOpacity(image,OpaqueOpacity);
+ status=SetImageOpacity(image,OpaqueAlpha);
image->matte=MagickTrue;
}
break;
@@ -2804,13 +2737,10 @@
ExceptionInfo
*exception;
- IndexPacket
- index;
-
MagickBooleanType
status;
- MagickPixelPacket
+ PixelInfo
background;
PixelPacket
@@ -2825,24 +2755,23 @@
assert(image->signature == MagickSignature);
if (SetImageStorageClass(image,DirectClass) == MagickFalse)
return(MagickFalse);
- if (image->background_color.opacity != OpaqueOpacity)
+ if (image->background_color.alpha != OpaqueAlpha)
image->matte=MagickTrue;
- GetMagickPixelPacket(image,&background);
- SetMagickPixelPacket(image,&image->background_color,(const IndexPacket *)
- NULL,&background);
+ GetPixelInfo(image,&background);
+ SetPixelInfoPacket(image,&image->background_color,&background);
if (image->colorspace == CMYKColorspace)
ConvertRGBToCMYK(&background);
- index=0;
- SetPixelPacket(image,&background,&pixel,&index);
+ SetPacketPixelInfo(image,&background,&pixel);
/*
Set image background color.
*/
status=MagickTrue;
+ pixel.black=0;
exception=(&image->exception);
image_view=AcquireCacheView(image);
for (y=0; y < (ssize_t) image->rows; y++)
{
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -2851,22 +2780,18 @@
if (status == MagickFalse)
continue;
q=QueueCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
for (x=0; x < (ssize_t) image->columns; x++)
- *q++=pixel;
- if (image->colorspace == CMYKColorspace)
- {
- register IndexPacket
- *restrict indexes;
-
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
- for (x=0; x < (ssize_t) image->columns; x++)
- SetPixelIndex(indexes+x,index);
- }
+ {
+ SetPixelPacket(image,&pixel,q);
+ if (image->colorspace == CMYKColorspace)
+ SetPixelBlack(image,pixel.black,q);
+ q+=GetPixelChannels(image);
+ }
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
}
@@ -2879,38 +2804,6 @@
% %
% %
% %
-% S e t I m a g e C h a n n e l s %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% SetImageChannels() sets the number of pixels channels associated with the
-% image.
-%
-% The format of the SetImageChannels method is:
-%
-% MagickBooleanType SetImageChannels(Image *image,const size_t channels)
-%
-% A description of each parameter follows:
-%
-% o image: the image.
-%
-% o channels: The number of pixel channels.
-%
-*/
-MagickExport MagickBooleanType SetImageChannels(Image *image,
- const size_t channels)
-{
- image->channels=channels;
- return(MagickTrue);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
% S e t I m a g e C o l o r %
% %
% %
@@ -2922,7 +2815,7 @@
% The format of the SetImageColor method is:
%
% MagickBooleanType SetImageColor(Image *image,
-% const MagickPixelPacket *color)
+% const PixelInfo *color)
%
% A description of each parameter follows:
%
@@ -2932,7 +2825,7 @@
%
*/
MagickExport MagickBooleanType SetImageColor(Image *image,
- const MagickPixelPacket *color)
+ const PixelInfo *color)
{
CacheView
*image_view;
@@ -2950,7 +2843,7 @@
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
assert(image->signature == MagickSignature);
- assert(color != (const MagickPixelPacket *) NULL);
+ assert(color != (const PixelInfo *) NULL);
image->colorspace=color->colorspace;
image->matte=color->matte;
image->fuzz=color->fuzz;
@@ -2963,10 +2856,7 @@
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- register IndexPacket
- *restrict indexes;
-
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -2975,16 +2865,15 @@
if (status == MagickFalse)
continue;
q=QueueCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelPacket(image,color,q,indexes+x);
- q++;
+ SetPixelPixelInfo(image,color,q);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -3039,7 +2928,7 @@
%
% SetImageClipMask() associates a clip path with the image. The clip path
% must be the same dimensions as the image. Set any pixel component of
-% the clip path to TransparentOpacity to prevent that corresponding image
+% the clip path to TransparentAlpha to prevent that corresponding image
% pixel component from being updated when SyncAuthenticPixels() is applied.
%
% The format of the SetImageClipMask method is:
@@ -3234,8 +3123,6 @@
p=q;
}
image_info->number_scenes-=image_info->scene-1;
- image_info->subimage=image_info->scene;
- image_info->subrange=image_info->number_scenes;
}
}
}
@@ -3619,7 +3506,7 @@
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
assert(image->signature == MagickSignature);
- image->matte=opacity != OpaqueOpacity ? MagickTrue : MagickFalse;
+ image->matte=opacity != OpaqueAlpha ? MagickTrue : MagickFalse;
status=MagickTrue;
exception=(&image->exception);
image_view=AcquireCacheView(image);
@@ -3628,7 +3515,7 @@
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -3637,15 +3524,15 @@
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelOpacity(q,opacity);
- q++;
+ SetPixelAlpha(image,opacity,q);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -3711,9 +3598,9 @@
{
case BilevelType:
{
- if (IsGrayImage(image,&image->exception) == MagickFalse)
+ if (IsImageGray(image,&image->exception) == MagickFalse)
status=TransformImageColorspace(image,GRAYColorspace);
- if (IsMonochromeImage(image,&image->exception) == MagickFalse)
+ if (IsImageMonochrome(image,&image->exception) == MagickFalse)
{
quantize_info=AcquireQuantizeInfo(image_info);
quantize_info->number_colors=2;
@@ -3726,14 +3613,14 @@
}
case GrayscaleType:
{
- if (IsGrayImage(image,&image->exception) == MagickFalse)
+ if (IsImageGray(image,&image->exception) == MagickFalse)
status=TransformImageColorspace(image,GRAYColorspace);
image->matte=MagickFalse;
break;
}
case GrayscaleMatteType:
{
- if (IsGrayImage(image,&image->exception) == MagickFalse)
+ if (IsImageGray(image,&image->exception) == MagickFalse)
status=TransformImageColorspace(image,GRAYColorspace);
if (image->matte == MagickFalse)
(void) SetImageAlphaChannel(image,OpaqueAlphaChannel);
@@ -3919,7 +3806,7 @@
left_geometry,
right_geometry;
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
@@ -3950,8 +3837,8 @@
for (x=(ssize_t) left_image->columns-1; x > 0; x--)
{
p=GetCacheViewVirtualPixels(left_view,x,left_geometry.y+y,1,1,exception);
- if ((p == (const PixelPacket *) NULL) ||
- (GetPixelOpacity(p) != TransparentOpacity) ||
+ if ((p == (const Quantum *) NULL) ||
+ (GetPixelAlpha(left_image,p) != TransparentAlpha) ||
((left_image->columns-x-1) >= gap))
break;
}
@@ -3960,8 +3847,9 @@
{
p=GetCacheViewVirtualPixels(right_view,x,right_geometry.y+y,1,1,
exception);
- if ((p == (const PixelPacket *) NULL) ||
- (GetPixelOpacity(p) != TransparentOpacity) || ((x+i) >= (ssize_t) gap))
+ if ((p == (const Quantum *) NULL) ||
+ (GetPixelAlpha(right_image,p) != TransparentAlpha) ||
+ ((x+i) >= (ssize_t) gap))
break;
}
if ((x+i) < (ssize_t) gap)
@@ -3989,7 +3877,7 @@
bottom_geometry,
top_geometry;
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
@@ -4020,8 +3908,9 @@
for (y=(ssize_t) top_image->rows-1; y > 0; y--)
{
p=GetCacheViewVirtualPixels(top_view,top_geometry.x+x,y,1,1,exception);
- if ((p == (const PixelPacket *) NULL) ||
- (GetPixelOpacity(p) != TransparentOpacity) || ((top_image->rows-y-1) >= gap))
+ if ((p == (const Quantum *) NULL) ||
+ (GetPixelAlpha(top_image,p) != TransparentAlpha) ||
+ ((top_image->rows-y-1) >= gap))
break;
}
i=(ssize_t) top_image->rows-y-1;
@@ -4029,8 +3918,9 @@
{
p=GetCacheViewVirtualPixels(bottom_view,bottom_geometry.x+x,y,1,1,
exception);
- if ((p == (const PixelPacket *) NULL) ||
- (GetPixelOpacity(p) != TransparentOpacity) || ((y+i) >= (ssize_t) gap))
+ if ((p == (const Quantum *) NULL) ||
+ (GetPixelAlpha(bottom_image,p) != TransparentAlpha) ||
+ ((y+i) >= (ssize_t) gap))
break;
}
if ((y+i) < (ssize_t) gap)
@@ -4232,13 +4122,13 @@
%
*/
-static inline IndexPacket PushColormapIndex(Image *image,
+static inline Quantum PushColormapIndex(Image *image,
const size_t index,MagickBooleanType *range_exception)
{
if (index < image->colors)
- return((IndexPacket) index);
+ return((Quantum) index);
*range_exception=MagickTrue;
- return((IndexPacket) 0);
+ return((Quantum) 0);
}
MagickExport MagickBooleanType SyncImage(Image *image)
@@ -4271,13 +4161,10 @@
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- IndexPacket
+ Quantum
index;
- register IndexPacket
- *restrict indexes;
-
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -4286,21 +4173,17 @@
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
- index=PushColormapIndex(image,(size_t) GetPixelIndex(indexes+x),
+ index=PushColormapIndex(image,(size_t) GetPixelIndex(image,q),
&range_exception);
- if (image->matte == MagickFalse)
- SetPixelRGB(q,image->colormap+(ssize_t) index)
- else
- SetPixelRGBO(q,image->colormap+(ssize_t) index);
- q++;
+ SetPixelPacket(image,image->colormap+(ssize_t) index,q);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
diff --git a/magick/image.h b/MagickCore/image.h
similarity index 87%
rename from magick/image.h
rename to MagickCore/image.h
index 9638c45..0c99204 100644
--- a/magick/image.h
+++ b/MagickCore/image.h
@@ -1,12 +1,12 @@
/*
Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization
dedicated to making software imaging solutions freely available.
-
+
You may not use this file except in compliance with the License.
obtain a copy of the License at
-
+
http://www.imagemagick.org/script/license.php
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -22,10 +22,10 @@
extern "C" {
#endif
-#include <magick/color.h>
+#include <MagickCore/color.h>
-#define OpaqueOpacity ((Quantum) 0UL)
-#define TransparentOpacity ((Quantum) QuantumRange)
+#define OpaqueAlpha ((Quantum) QuantumRange)
+#define TransparentAlpha ((Quantum) 0UL)
typedef enum
{
@@ -36,7 +36,6 @@
DeactivateAlphaChannel,
ExtractAlphaChannel,
OpaqueAlphaChannel,
- ResetAlphaChannel, /* deprecated */
SetAlphaChannel,
ShapeAlphaChannel,
TransparentAlphaChannel
@@ -125,25 +124,25 @@
white_point;
} ChromaticityInfo;
-#include "magick/blob.h"
-#include "magick/colorspace.h"
-#include "magick/cache-view.h"
-#include "magick/color.h"
-#include "magick/composite.h"
-#include "magick/compress.h"
-#include "magick/effect.h"
-#include "magick/geometry.h"
-#include "magick/layer.h"
-#include "magick/locale_.h"
-#include "magick/monitor.h"
-#include "magick/pixel.h"
-#include "magick/profile.h"
-#include "magick/quantum.h"
-#include "magick/resample.h"
-#include "magick/resize.h"
-#include "magick/semaphore.h"
-#include "magick/stream.h"
-#include "magick/timer.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/cache-view.h"
+#include "MagickCore/color.h"
+#include "MagickCore/composite.h"
+#include "MagickCore/compress.h"
+#include "MagickCore/effect.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/layer.h"
+#include "MagickCore/locale_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/pixel.h"
+#include "MagickCore/profile.h"
+#include "MagickCore/quantum.h"
+#include "MagickCore/resample.h"
+#include "MagickCore/resize.h"
+#include "MagickCore/semaphore.h"
+#include "MagickCore/stream.h"
+#include "MagickCore/timer.h"
struct _Image
{
@@ -207,12 +206,11 @@
RectangleInfo
page, /* virtual canvas size and offset of image */
- extract_info,
- tile_info; /* deprecated */
+ extract_info;
double
bias,
- blur, /* deprecated */
+ blur,
fuzz; /* current color fuzz attribute */
FilterTypes
@@ -250,63 +248,6 @@
ssize_t
start_loop;
- ErrorInfo
- error;
-
- TimerInfo
- timer;
-
- MagickProgressMonitor
- progress_monitor;
-
- void
- *client_data,
- *cache,
- *attributes; /* deprecated */
-
- Ascii85Info
- *ascii85;
-
- BlobInfo
- *blob;
-
- char
- filename[MaxTextExtent], /* images input filename */
- magick_filename[MaxTextExtent],
- magick[MaxTextExtent];
-
- size_t
- magick_columns,
- magick_rows;
-
- ExceptionInfo
- exception; /* Error handling report */
-
- MagickBooleanType
- debug; /* debug output attribute */
-
- volatile ssize_t
- reference_count;
-
- SemaphoreInfo
- *semaphore;
-
- ProfileInfo
- color_profile,
- iptc_profile,
- *generic_profile;
-
- size_t
- generic_profiles; /* this & ProfileInfo is deprecated */
-
- size_t
- signature;
-
- struct _Image
- *previous, /* Image sequence list links */
- *list,
- *next;
-
InterpolatePixelMethod
interpolate; /* Interpolation of color for between pixel lookups */
@@ -339,7 +280,66 @@
ping;
size_t
- channels;
+ pixel_channels,
+ metacontent_extent;
+
+ PixelComponentMap
+ *component_map;
+
+ void
+ *cache;
+
+ ErrorInfo
+ error;
+
+ TimerInfo
+ timer;
+
+ MagickProgressMonitor
+ progress_monitor;
+
+ void
+ *client_data;
+
+ Ascii85Info
+ *ascii85;
+
+ ProfileInfo
+ color_profile,
+ iptc_profile,
+ *generic_profile;
+
+ char
+ filename[MaxTextExtent], /* images input filename */
+ magick_filename[MaxTextExtent],
+ magick[MaxTextExtent];
+
+ size_t
+ magick_columns,
+ magick_rows;
+
+ BlobInfo
+ *blob;
+
+ ExceptionInfo
+ exception; /* Error handling report */
+
+ MagickBooleanType
+ debug; /* debug output attribute */
+
+ volatile ssize_t
+ reference_count;
+
+ SemaphoreInfo
+ *semaphore;
+
+ struct _Image
+ *previous, /* Image sequence list links */
+ *list,
+ *next;
+
+ size_t
+ signature;
};
struct _ImageInfo
@@ -425,12 +425,21 @@
ChannelType
channel;
- Image
- *attributes; /* deprecated */
-
void
*options;
+ VirtualPixelMethod
+ virtual_pixel_method;
+
+ PixelPacket
+ transparent_color;
+
+ void
+ *profile;
+
+ MagickBooleanType
+ synchronize;
+
MagickProgressMonitor
progress_monitor;
@@ -459,30 +468,8 @@
MagickBooleanType
debug;
- char
- *tile; /* deprecated */
-
- size_t
- subimage, /* deprecated */
- subrange; /* deprecated */
-
- PixelPacket
- pen; /* deprecated */
-
size_t
signature;
-
- VirtualPixelMethod
- virtual_pixel_method;
-
- PixelPacket
- transparent_color;
-
- void
- *profile;
-
- MagickBooleanType
- synchronize;
};
extern MagickExport ExceptionType
@@ -501,7 +488,7 @@
*GetImageClipMask(const Image *,ExceptionInfo *),
*GetImageMask(const Image *,ExceptionInfo *),
*NewMagickImage(const ImageInfo *,const size_t,const size_t,
- const MagickPixelPacket *),
+ const PixelInfo *),
*ReferenceImage(Image *),
*SeparateImages(const Image *,const ChannelType,ExceptionInfo *),
*SmushImages(const Image *,const MagickBooleanType,const ssize_t,
@@ -527,12 +514,11 @@
SetImageAlphaChannel(Image *,const AlphaChannelType),
SetImageBackgroundColor(Image *),
SetImageClipMask(Image *,const Image *),
- SetImageColor(Image *,const MagickPixelPacket *),
+ SetImageColor(Image *,const PixelInfo *),
SetImageExtent(Image *,const size_t,const size_t),
SetImageInfo(ImageInfo *,const unsigned int,ExceptionInfo *),
SetImageMask(Image *,const Image *),
SetImageOpacity(Image *,const Quantum),
- SetImageChannels(Image *,const size_t),
SetImageStorageClass(Image *,const ClassType),
SetImageType(Image *,const ImageType),
StripImage(Image *),
@@ -546,9 +532,6 @@
extern MagickExport ssize_t
GetImageReferenceCount(Image *);
-extern MagickExport size_t
- GetImageChannels(Image *);
-
extern MagickExport VirtualPixelMethod
GetImageVirtualPixelMethod(const Image *),
SetImageVirtualPixelMethod(const Image *,const VirtualPixelMethod);
diff --git a/magick/layer.c b/MagickCore/layer.c
similarity index 92%
rename from magick/layer.c
rename to MagickCore/layer.c
index 5cba077..b4e440d 100644
--- a/magick/layer.c
+++ b/MagickCore/layer.c
@@ -37,31 +37,31 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/artifact.h"
-#include "magick/cache.h"
-#include "magick/color.h"
-#include "magick/color-private.h"
-#include "magick/composite.h"
-#include "magick/effect.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/geometry.h"
-#include "magick/image.h"
-#include "magick/layer.h"
-#include "magick/list.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/option.h"
-#include "magick/pixel-private.h"
-#include "magick/property.h"
-#include "magick/profile.h"
-#include "magick/resource_.h"
-#include "magick/resize.h"
-#include "magick/statistic.h"
-#include "magick/string_.h"
-#include "magick/transform.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/artifact.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/color.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/composite.h"
+#include "MagickCore/effect.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/image.h"
+#include "MagickCore/layer.h"
+#include "MagickCore/list.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/option.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/property.h"
+#include "MagickCore/profile.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/resize.h"
+#include "MagickCore/statistic.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/transform.h"
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -111,16 +111,16 @@
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
q=GetAuthenticPixels(image,bounds->x,bounds->y+y,bounds->width,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) bounds->width; x++)
{
- q->opacity=(Quantum) TransparentOpacity;
- q++;
+ SetPixelAlpha(image,TransparentAlpha,q);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -167,7 +167,7 @@
register ssize_t
x;
- register const PixelPacket
+ register const Quantum
*p,
*q;
@@ -187,14 +187,14 @@
exception);
q=GetVirtualPixels(image2,bounds->x,bounds->y+y,bounds->width,1,
exception);
- if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
for (x=0; x < (ssize_t) bounds->width; x++)
{
- if ((GetPixelOpacity(p) <= (Quantum) (QuantumRange/2)) &&
- (q->opacity > (Quantum) (QuantumRange/2)))
+ if ((GetPixelAlpha(image1,p) <= (Quantum) (QuantumRange/2)) &&
+ (GetPixelAlpha(image1,q) > (Quantum) (QuantumRange/2)))
break;
- p++;
+ p+=GetPixelChannels(image1);
q++;
}
if (x < (ssize_t) bounds->width)
@@ -278,7 +278,7 @@
return((Image *) NULL);
coalesce_image->page=bounds;
coalesce_image->dispose=NoneDispose;
- coalesce_image->background_color.opacity=(Quantum) TransparentOpacity;
+ coalesce_image->background_color.alpha=(Quantum) TransparentAlpha;
(void) SetImageBackgroundColor(coalesce_image);
/*
Coalesce rest of the images.
@@ -411,7 +411,7 @@
dispose_image->page.x=0;
dispose_image->page.y=0;
dispose_image->dispose=NoneDispose;
- dispose_image->background_color.opacity=(Quantum) TransparentOpacity;
+ dispose_image->background_color.alpha=(Quantum) TransparentAlpha;
(void) SetImageBackgroundColor(dispose_image);
dispose_images=NewImageList();
for ( ; curr != (Image *) NULL; curr=GetNextImageInList(curr))
@@ -514,7 +514,7 @@
% The format of the ComparePixels method is:
%
% MagickBooleanType *ComparePixels(const ImageLayerMethod method,
-% const MagickPixelPacket *p,const MagickPixelPacket *q)
+% const PixelInfo *p,const PixelInfo *q)
%
% A description of each parameter follows:
%
@@ -526,7 +526,7 @@
*/
static MagickBooleanType ComparePixels(const ImageLayerMethod method,
- const MagickPixelPacket *p,const MagickPixelPacket *q)
+ const PixelInfo *p,const PixelInfo *q)
{
MagickRealType
o1,
@@ -536,10 +536,10 @@
Any change in pixel values
*/
if (method == CompareAnyLayer)
- return((MagickBooleanType)(IsMagickColorSimilar(p,q) == MagickFalse));
+ return((MagickBooleanType)(IsFuzzyEquivalencePixelInfo(p,q) == MagickFalse));
- o1 = (p->matte != MagickFalse) ? GetPixelOpacity(p) : OpaqueOpacity;
- o2 = (q->matte != MagickFalse) ? q->opacity : OpaqueOpacity;
+ o1 = (p->matte != MagickFalse) ? p->alpha : OpaqueAlpha;
+ o2 = (q->matte != MagickFalse) ? q->alpha : OpaqueAlpha;
/*
Pixel goes from opaque to transprency
@@ -555,7 +555,7 @@
{
if (o2 > ((MagickRealType) QuantumRange/2.0))
return MagickFalse;
- return((MagickBooleanType) (IsMagickColorSimilar(p,q) == MagickFalse));
+ return((MagickBooleanType) (IsFuzzyEquivalencePixelInfo(p,q) == MagickFalse));
}
return(MagickFalse);
}
@@ -586,8 +586,8 @@
%
% A description of each parameter follows:
%
-% o method: What differences to look for. Must be one of
-% CompareAnyLayer, CompareClearLayer, CompareOverlayLayer.
+% o method: What differences to look for. Must be one of CompareAnyLayer,
+% CompareClearLayer, CompareOverlayLayer.
%
% o image1, image2: the two images to compare.
%
@@ -601,15 +601,11 @@
RectangleInfo
bounds;
- MagickPixelPacket
+ PixelInfo
pixel1,
pixel2;
- register const IndexPacket
- *indexes1,
- *indexes2;
-
- register const PixelPacket
+ register const Quantum
*p,
*q;
@@ -619,33 +615,25 @@
ssize_t
y;
-#if 0
- /* only same sized images can be compared */
- assert(image1->columns == image2->columns);
- assert(image1->rows == image2->rows);
-#endif
-
/*
- Set bounding box of the differences between images
+ Set bounding box of the differences between images.
*/
- GetMagickPixelPacket(image1,&pixel1);
- GetMagickPixelPacket(image2,&pixel2);
+ GetPixelInfo(image1,&pixel1);
+ GetPixelInfo(image2,&pixel2);
for (x=0; x < (ssize_t) image1->columns; x++)
{
p=GetVirtualPixels(image1,x,0,1,image1->rows,exception);
q=GetVirtualPixels(image2,x,0,1,image2->rows,exception);
- if ((p == (const PixelPacket *) NULL) ||
- (q == (const PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) ||
+ (q == (const Quantum *) NULL))
break;
- indexes1=GetVirtualIndexQueue(image1);
- indexes2=GetVirtualIndexQueue(image2);
for (y=0; y < (ssize_t) image1->rows; y++)
{
- SetMagickPixelPacket(image1,p,indexes1+x,&pixel1);
- SetMagickPixelPacket(image2,q,indexes2+x,&pixel2);
+ SetPixelInfo(image1,p,&pixel1);
+ SetPixelInfo(image2,q,&pixel2);
if (ComparePixels(method,&pixel1,&pixel2))
break;
- p++;
+ p+=GetPixelChannels(image1);
q++;
}
if (y < (ssize_t) image1->rows)
@@ -667,18 +655,16 @@
{
p=GetVirtualPixels(image1,x,0,1,image1->rows,exception);
q=GetVirtualPixels(image2,x,0,1,image2->rows,exception);
- if ((p == (const PixelPacket *) NULL) ||
- (q == (const PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) ||
+ (q == (const Quantum *) NULL))
break;
- indexes1=GetVirtualIndexQueue(image1);
- indexes2=GetVirtualIndexQueue(image2);
for (y=0; y < (ssize_t) image1->rows; y++)
{
- SetMagickPixelPacket(image1,p,indexes1+x,&pixel1);
- SetMagickPixelPacket(image2,q,indexes2+x,&pixel2);
+ SetPixelInfo(image1,p,&pixel1);
+ SetPixelInfo(image2,q,&pixel2);
if (ComparePixels(method,&pixel1,&pixel2))
break;
- p++;
+ p+=GetPixelChannels(image1);
q++;
}
if (y < (ssize_t) image1->rows)
@@ -689,18 +675,16 @@
{
p=GetVirtualPixels(image1,0,y,image1->columns,1,exception);
q=GetVirtualPixels(image2,0,y,image2->columns,1,exception);
- if ((p == (const PixelPacket *) NULL) ||
- (q == (const PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) ||
+ (q == (const Quantum *) NULL))
break;
- indexes1=GetVirtualIndexQueue(image1);
- indexes2=GetVirtualIndexQueue(image2);
for (x=0; x < (ssize_t) image1->columns; x++)
{
- SetMagickPixelPacket(image1,p,indexes1+x,&pixel1);
- SetMagickPixelPacket(image2,q,indexes2+x,&pixel2);
+ SetPixelInfo(image1,p,&pixel1);
+ SetPixelInfo(image2,q,&pixel2);
if (ComparePixels(method,&pixel1,&pixel2))
break;
- p++;
+ p+=GetPixelChannels(image1);
q++;
}
if (x < (ssize_t) image1->columns)
@@ -711,18 +695,16 @@
{
p=GetVirtualPixels(image1,0,y,image1->columns,1,exception);
q=GetVirtualPixels(image2,0,y,image2->columns,1,exception);
- if ((p == (const PixelPacket *) NULL) ||
- (q == (const PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) ||
+ (q == (const Quantum *) NULL))
break;
- indexes1=GetVirtualIndexQueue(image1);
- indexes2=GetVirtualIndexQueue(image2);
for (x=0; x < (ssize_t) image1->columns; x++)
{
- SetMagickPixelPacket(image1,p,indexes1+x,&pixel1);
- SetMagickPixelPacket(image2,q,indexes2+x,&pixel2);
+ SetPixelInfo(image1,p,&pixel1);
+ SetPixelInfo(image2,q,&pixel2);
if (ComparePixels(method,&pixel1,&pixel2))
break;
- p++;
+ p+=GetPixelChannels(image1);
q++;
}
if (x < (ssize_t) image1->columns)
@@ -814,7 +796,7 @@
bounds=(RectangleInfo *) RelinquishMagickMemory(bounds);
return((Image *) NULL);
}
- image_a->background_color.opacity=(Quantum) TransparentOpacity;
+ image_a->background_color.alpha=(Quantum) TransparentAlpha;
(void) SetImageBackgroundColor(image_a);
image_a->page=next->page;
image_a->page.x=0;
@@ -883,41 +865,6 @@
% %
% %
% %
-% D e c o n s t r u c t I m a g e s %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% DeconstructImages() compares each image with the next in a sequence and
-% returns the minimum bounding region of all differences from the first image.
-%
-% This function is deprecated in favor of the more universal
-% CompareImageLayers() function.
-%
-% The format of the DeconstructImages method is:
-%
-% Image *DeconstructImages(const Image *images, ExceptionInfo *exception)
-%
-% A description of each parameter follows:
-%
-% o image: the image.
-%
-% o exception: return any errors or warnings in this structure.
-%
-*/
-
-MagickExport Image *DeconstructImages(const Image *images,
- ExceptionInfo *exception)
-{
- return(CompareImageLayers(images,CompareAnyLayer,exception));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
+ O p t i m i z e L a y e r F r a m e s %
% %
% %
@@ -935,18 +882,18 @@
%
% The format of the OptimizeLayerFrames method is:
%
-% static Image *OptimizeLayerFrames(const Image *image,
-% const ImageLayerMethod method, ExceptionInfo *exception)
+% Image *OptimizeLayerFrames(const Image *image,
+% const ImageLayerMethod method, ExceptionInfo *exception)
%
% A description of each parameter follows:
%
% o image: the image.
%
% o method: the layers technique to optimize with. Must be one of...
-% OptimizeImageLayer, or OptimizePlusLayer. The Plus form allows
-% the addition of extra 'zero delay' frames to clear pixels from
-% the previous frame, and the removal of frames that done change,
-% merging the delay times together.
+% OptimizeImageLayer, or OptimizePlusLayer. The Plus form allows
+% the addition of extra 'zero delay' frames to clear pixels from
+% the previous frame, and the removal of frames that done change,
+% merging the delay times together.
%
% o exception: return any errors or warnings in this structure.
%
@@ -1056,7 +1003,7 @@
prev_image->page.y=0;
prev_image->dispose=NoneDispose;
- prev_image->background_color.opacity=(Quantum) TransparentOpacity;
+ prev_image->background_color.alpha=(Quantum) TransparentAlpha;
(void) SetImageBackgroundColor(prev_image);
/*
Figure out the area of overlay of the first frame
@@ -1540,7 +1487,7 @@
dispose_image->page.x=0;
dispose_image->page.y=0;
dispose_image->dispose=NoneDispose;
- dispose_image->background_color.opacity=(Quantum) TransparentOpacity;
+ dispose_image->background_color.alpha=(Quantum) TransparentAlpha;
(void) SetImageBackgroundColor(dispose_image);
while ( next != (Image *) NULL )
diff --git a/magick/layer.h b/MagickCore/layer.h
similarity index 96%
rename from magick/layer.h
rename to MagickCore/layer.h
index 28129f4..9da131c 100644
--- a/magick/layer.h
+++ b/MagickCore/layer.h
@@ -22,6 +22,8 @@
extern "C" {
#endif
+#include <MagickCore/composite.h>
+
typedef enum
{
UnrecognizedDispose,
@@ -56,7 +58,6 @@
*CoalesceImages(const Image *,ExceptionInfo *),
*DisposeImages(const Image *,ExceptionInfo *),
*CompareImageLayers(const Image *,const ImageLayerMethod,ExceptionInfo *),
- *DeconstructImages(const Image *,ExceptionInfo *),
*MergeImageLayers(Image *,const ImageLayerMethod,ExceptionInfo *),
*OptimizeImageLayers(const Image *,ExceptionInfo *),
*OptimizePlusImageLayers(const Image *,ExceptionInfo *);
diff --git a/magick/list.c b/MagickCore/list.c
similarity index 99%
rename from magick/list.c
rename to MagickCore/list.c
index 98c9a85..65e2451 100644
--- a/magick/list.c
+++ b/MagickCore/list.c
@@ -40,14 +40,14 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/list.h"
-#include "magick/memory_.h"
-#include "magick/string_.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/string_.h"
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/magick/list.h b/MagickCore/list.h
similarity index 100%
rename from magick/list.h
rename to MagickCore/list.h
diff --git a/magick/locale.c b/MagickCore/locale.c
similarity index 98%
rename from magick/locale.c
rename to MagickCore/locale.c
index b131ec4..3e87b1e 100644
--- a/magick/locale.c
+++ b/MagickCore/locale.c
@@ -39,22 +39,22 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/client.h"
-#include "magick/configure.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/hashmap.h"
-#include "magick/locale_.h"
-#include "magick/log.h"
-#include "magick/memory_.h"
-#include "magick/semaphore.h"
-#include "magick/splay-tree.h"
-#include "magick/string_.h"
-#include "magick/token.h"
-#include "magick/utility.h"
-#include "magick/xml-tree.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/client.h"
+#include "MagickCore/configure.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/hashmap.h"
+#include "MagickCore/locale_.h"
+#include "MagickCore/log.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/semaphore.h"
+#include "MagickCore/splay-tree.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/token.h"
+#include "MagickCore/utility.h"
+#include "MagickCore/xml-tree.h"
/*
Define declarations.
diff --git a/magick/locale_.h b/MagickCore/locale_.h
similarity index 94%
rename from magick/locale_.h
rename to MagickCore/locale_.h
index 96a32c7..98ee0fc 100644
--- a/magick/locale_.h
+++ b/MagickCore/locale_.h
@@ -22,7 +22,7 @@
extern "C" {
#endif
-#include "magick/hashmap.h"
+#include "MagickCore/hashmap.h"
typedef struct _LocaleInfo
{
@@ -34,10 +34,6 @@
MagickBooleanType
stealth;
- struct _LocaleInfo
- *previous,
- *next; /* deprecated, use GetLocaleInfoList() */
-
size_t
signature;
} LocaleInfo;
diff --git a/magick/log.c b/MagickCore/log.c
similarity index 98%
rename from magick/log.c
rename to MagickCore/log.c
index 9bbc4be..494a70c 100644
--- a/magick/log.c
+++ b/MagickCore/log.c
@@ -39,26 +39,26 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/client.h"
-#include "magick/configure.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/hashmap.h"
-#include "magick/log.h"
-#include "magick/memory_.h"
-#include "magick/option.h"
-#include "magick/semaphore.h"
-#include "magick/timer.h"
-#include "magick/string_.h"
-#include "magick/string-private.h"
-#include "magick/token.h"
-#include "magick/thread_.h"
-#include "magick/thread-private.h"
-#include "magick/utility.h"
-#include "magick/version.h"
-#include "magick/xml-tree.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/client.h"
+#include "MagickCore/configure.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/hashmap.h"
+#include "MagickCore/log.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/option.h"
+#include "MagickCore/semaphore.h"
+#include "MagickCore/timer.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/string-private.h"
+#include "MagickCore/token.h"
+#include "MagickCore/thread_.h"
+#include "MagickCore/thread-private.h"
+#include "MagickCore/utility.h"
+#include "MagickCore/version.h"
+#include "MagickCore/xml-tree.h"
/*
Define declarations.
diff --git a/magick/log.h b/MagickCore/log.h
similarity index 98%
rename from magick/log.h
rename to MagickCore/log.h
index 94de877..0323476 100644
--- a/magick/log.h
+++ b/MagickCore/log.h
@@ -23,7 +23,7 @@
#endif
#include <stdarg.h>
-#include "magick/exception.h"
+#include "MagickCore/exception.h"
#if !defined(GetMagickModule)
# define GetMagickModule() __FILE__,__func__,(unsigned long) __LINE__
diff --git a/magick/mac.c b/MagickCore/mac.c
similarity index 98%
rename from magick/mac.c
rename to MagickCore/mac.c
index 6637e18..f441c36 100644
--- a/magick/mac.c
+++ b/MagickCore/mac.c
@@ -62,20 +62,20 @@
#include <Gestalt.h>
#include <TextUtils.h>
#define ColorInfo KolorInfo
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/client.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/quantum.h"
-#include "magick/string_.h"
-#include "magick/utility.h"
-#include "magick/mac.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/client.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/quantum.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/utility.h"
+#include "MagickCore/mac.h"
/*
Global declaractions.
@@ -1348,28 +1348,24 @@
*/
for (y=0; y < image->rows; y++)
{
- register IndexPacket
- *restrict indexes;
-
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
for (x=0; x < image->columns; x++)
{
GetCPixel(x,y,&Pixel);
- SetPixelRed(q,ScaleCharToQuantum(Pixel.red & 0xff));
- SetPixelGreen(q,ScaleCharToQuantum(Pixel.green & 0xff));
- SetPixelBlue(q,ScaleCharToQuantum(Pixel.blue & 0xff));
+ SetPixelRed(image,ScaleCharToQuantum(Pixel.red & 0xff),q);
+ SetPixelGreen(image,ScaleCharToQuantum(Pixel.green & 0xff),q);
+ SetPixelBlue(image,ScaleCharToQuantum(Pixel.blue & 0xff),q);
if (image->storage_class == PseudoClass)
- SetPixelIndex(indexes+x,Color2Index(&Pixel));
- q++;
+ SetPixelIndex(image,Color2Index(&Pixel),q);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
diff --git a/magick/mac.h b/MagickCore/mac.h
similarity index 100%
rename from magick/mac.h
rename to MagickCore/mac.h
diff --git a/magick/magic.c b/MagickCore/magic.c
similarity index 98%
rename from magick/magic.c
rename to MagickCore/magic.c
index 5ab04e1..71d7414 100644
--- a/magick/magic.c
+++ b/MagickCore/magic.c
@@ -39,21 +39,21 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/client.h"
-#include "magick/configure.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/hashmap.h"
-#include "magick/magic.h"
-#include "magick/memory_.h"
-#include "magick/semaphore.h"
-#include "magick/string_.h"
-#include "magick/string-private.h"
-#include "magick/token.h"
-#include "magick/utility.h"
-#include "magick/xml-tree.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/client.h"
+#include "MagickCore/configure.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/hashmap.h"
+#include "MagickCore/magic.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/semaphore.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/string-private.h"
+#include "MagickCore/token.h"
+#include "MagickCore/utility.h"
+#include "MagickCore/xml-tree.h"
/*
Define declarations.
diff --git a/magick/magic.h b/MagickCore/magic.h
similarity index 94%
rename from magick/magic.h
rename to MagickCore/magic.h
index f20a72f..8f2dd74 100644
--- a/magick/magic.h
+++ b/MagickCore/magic.h
@@ -42,10 +42,6 @@
exempt,
stealth;
- struct _MagicInfo
- *previous,
- *next; /* deprecated, use GetMagicInfoList() */
-
size_t
signature;
} MagicInfo;
diff --git a/magick/magick-config.h b/MagickCore/magick-config.h
similarity index 98%
rename from magick/magick-config.h
rename to MagickCore/magick-config.h
index 56fe561..d87175c 100644
--- a/magick/magick-config.h
+++ b/MagickCore/magick-config.h
@@ -1,7 +1,7 @@
-#ifndef _MAGICK_MAGICK_CONFIG_H
-#define _MAGICK_MAGICK_CONFIG_H 1
+#ifndef _MAGICKCORE_MAGICK_CONFIG_H
+#define _MAGICKCORE_MAGICK_CONFIG_H 1
-/* magick/magick-config.h. Generated automatically at end of configure. */
+/* MagickCore/magick-config.h. Generated automatically at end of configure. */
/* config/config.h. Generated from config.h.in by configure. */
/* config/config.h.in. Generated from configure.ac by autoheader. */
@@ -58,7 +58,7 @@
/* Directory where ImageMagick documents live. */
#ifndef MAGICKCORE_DOCUMENTATION_PATH
-#define MAGICKCORE_DOCUMENTATION_PATH "/usr/local/share/doc/ImageMagick-6.7.1//"
+#define MAGICKCORE_DOCUMENTATION_PATH "/usr/local/share/doc/ImageMagick-7.0.0//"
#endif
/* Define if you have Display Postscript */
@@ -1252,12 +1252,12 @@
/* Define to the full name and version of this package. */
#ifndef MAGICKCORE_PACKAGE_STRING
-#define MAGICKCORE_PACKAGE_STRING "ImageMagick 6.7.1"
+#define MAGICKCORE_PACKAGE_STRING "ImageMagick 7.0.0"
#endif
/* Define to the one symbol short name of this package. */
#ifndef MAGICKCORE_PACKAGE_TARNAME
-#define MAGICKCORE_PACKAGE_TARNAME "ImageMagick-6.7.1"
+#define MAGICKCORE_PACKAGE_TARNAME "ImageMagick-7.0.0"
#endif
/* Define to the home page for this package. */
@@ -1267,7 +1267,7 @@
/* Define to the version of this package. */
#ifndef MAGICKCORE_PACKAGE_VERSION
-#define MAGICKCORE_PACKAGE_VERSION "6.7.1"
+#define MAGICKCORE_PACKAGE_VERSION "7.0.0"
#endif
/* Define if you have PNG library */
@@ -1631,5 +1631,5 @@
code using `volatile' can become incorrect without. Disable with care. */
/* #undef volatile */
-/* once: _MAGICK_MAGICK_CONFIG_H */
+/* once: _MAGICKCORE_MAGICK_CONFIG_H */
#endif
diff --git a/magick/magick-type.h b/MagickCore/magick-type.h
similarity index 93%
rename from magick/magick-type.h
rename to MagickCore/magick-type.h
index bb7559e..a70527f 100644
--- a/magick/magick-type.h
+++ b/MagickCore/magick-type.h
@@ -22,7 +22,7 @@
extern "C" {
#endif
-#include "magick/magick-config.h"
+#include "MagickCore/magick-config.h"
#if !defined(MAGICKCORE_QUANTUM_DEPTH)
#define MAGICKCORE_QUANTUM_DEPTH 16
@@ -49,7 +49,7 @@
#define QuantumFormat "%g"
#else
typedef unsigned char Quantum;
-#define QuantumRange 255UL
+#define QuantumRange 255
#define QuantumFormat "%u"
#endif
#elif (MAGICKCORE_QUANTUM_DEPTH == 16)
@@ -65,7 +65,7 @@
#define QuantumFormat "%g"
#else
typedef unsigned short Quantum;
-#define QuantumRange 65535UL
+#define QuantumRange 65535
#define QuantumFormat "%u"
#endif
#elif (MAGICKCORE_QUANTUM_DEPTH == 32)
@@ -81,7 +81,7 @@
#define QuantumFormat "%g"
#else
typedef unsigned int Quantum;
-#define QuantumRange 4294967295UL
+#define QuantumRange 4294967295
#define QuantumFormat "%u"
#endif
#elif (MAGICKCORE_QUANTUM_DEPTH == 64) && defined(MAGICKCORE_HAVE_LONG_DOUBLE_WIDER)
@@ -99,6 +99,8 @@
# error "MAGICKCORE_QUANTUM_DEPTH must be one of 8, 16, 32, or 64"
#endif
#endif
+#define MagickPI 3.14159265358979323846264338327950288419716939937510L
+#define QuantumScale ((double) 1.0/(double) QuantumRange)
/*
Typedef declarations.
@@ -129,6 +131,8 @@
typedef MagickSizeType QuantumAny;
#endif
+#define MaxPixelChannels 4096
+
#if defined(macintosh)
#define ExceptionInfo MagickExceptionInfo
#endif
@@ -145,9 +149,7 @@
YellowChannel = 0x0004,
AlphaChannel = 0x0008,
OpacityChannel = 0x0008,
- MatteChannel = 0x0008, /* deprecated */
BlackChannel = 0x0020,
- IndexChannel = 0x0020,
CompositeChannels = 0x002F,
AllChannels = ~0L,
/*
diff --git a/magick/magick.c b/MagickCore/magick.c
similarity index 97%
rename from magick/magick.c
rename to MagickCore/magick.c
index 01c145d..cff452b 100644
--- a/magick/magick.c
+++ b/MagickCore/magick.c
@@ -40,45 +40,45 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/annotate.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/coder.h"
-#include "magick/client.h"
-#include "magick/coder.h"
-#include "magick/configure.h"
-#include "magick/constitute.h"
-#include "magick/delegate.h"
-#include "magick/draw.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/locale_.h"
-#include "magick/log.h"
-#include "magick/magic.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/mime.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/annotate.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/coder.h"
+#include "MagickCore/client.h"
+#include "MagickCore/coder.h"
+#include "MagickCore/configure.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/delegate.h"
+#include "MagickCore/draw.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/locale_.h"
+#include "MagickCore/log.h"
+#include "MagickCore/magic.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/mime.h"
+#include "MagickCore/module.h"
#if defined(MAGICKCORE_WINDOWS_SUPPORT)
-# include "magick/nt-feature.h"
+# include "MagickCore/nt-feature.h"
#endif
-#include "magick/random_.h"
-#include "magick/registry.h"
-#include "magick/resource_.h"
-#include "magick/policy.h"
-#include "magick/semaphore.h"
-#include "magick/semaphore-private.h"
-#include "magick/signature-private.h"
-#include "magick/splay-tree.h"
-#include "magick/string_.h"
-#include "magick/string-private.h"
-#include "magick/thread_.h"
-#include "magick/thread-private.h"
-#include "magick/token.h"
-#include "magick/utility.h"
-#include "magick/xwindow-private.h"
+#include "MagickCore/random_.h"
+#include "MagickCore/registry.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/policy.h"
+#include "MagickCore/semaphore.h"
+#include "MagickCore/semaphore-private.h"
+#include "MagickCore/signature-private.h"
+#include "MagickCore/splay-tree.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/string-private.h"
+#include "MagickCore/thread_.h"
+#include "MagickCore/thread-private.h"
+#include "MagickCore/token.h"
+#include "MagickCore/utility.h"
+#include "MagickCore/xwindow-private.h"
/*
Define declarations.
diff --git a/magick/magick.h b/MagickCore/magick.h
similarity index 96%
rename from magick/magick.h
rename to MagickCore/magick.h
index 54ae153..f5aa868 100644
--- a/magick/magick.h
+++ b/MagickCore/magick.h
@@ -85,10 +85,6 @@
MagickBooleanType
stealth;
- struct _MagickInfo
- *previous,
- *next; /* deprecated, use GetMagickInfoList() */
-
size_t
signature;
} MagickInfo;
diff --git a/magick/matrix.c b/MagickCore/matrix.c
similarity index 98%
rename from magick/matrix.c
rename to MagickCore/matrix.c
index 51bc222..db6d69c 100644
--- a/magick/matrix.c
+++ b/MagickCore/matrix.c
@@ -39,10 +39,10 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/matrix.h"
-#include "magick/memory_.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/matrix.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/utility.h"
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -315,7 +315,7 @@
% o results: the result(s) that should be generated from the given terms
% weighted by the yet-to-be-solved coefficents.
%
-% o rank: the rank or size of the dimensions of the square matrix.
+% o rank: the rank or size of the dimentions of the square matrix.
% Also the length of vectors, and number of terms being added.
%
% o number_vectors: Number of result vectors, and number or results being
diff --git a/magick/matrix.h b/MagickCore/matrix.h
similarity index 100%
rename from magick/matrix.h
rename to MagickCore/matrix.h
diff --git a/magick/memory.c b/MagickCore/memory.c
similarity index 98%
rename from magick/memory.c
rename to MagickCore/memory.c
index 9b5d1af..9762682 100644
--- a/magick/memory.c
+++ b/MagickCore/memory.c
@@ -53,14 +53,14 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/memory_.h"
-#include "magick/semaphore.h"
-#include "magick/string_.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/semaphore.h"
+#include "MagickCore/string_.h"
/*
Define declarations.
diff --git a/magick/memory_.h b/MagickCore/memory_.h
similarity index 100%
rename from magick/memory_.h
rename to MagickCore/memory_.h
diff --git a/magick/methods.h b/MagickCore/methods.h
similarity index 98%
rename from magick/methods.h
rename to MagickCore/methods.h
index 9d5b675..28c9d8b 100644
--- a/magick/methods.h
+++ b/MagickCore/methods.h
@@ -360,7 +360,7 @@
#define GaussJordanElimination PrependMagickMethod(GaussJordanElimination)
#define GenerateDifferentialNoise PrependMagickMethod(GenerateDifferentialNoise)
#define GetAffineMatrix PrependMagickMethod(GetAffineMatrix)
-#define GetAuthenticIndexQueue PrependMagickMethod(GetAuthenticIndexQueue)
+#define GetAuthenticMetacontent PrependMagickMethod(GetAuthenticMetacontent)
#define GetAuthenticPixelCacheNexus PrependMagickMethod(GetAuthenticPixelCacheNexus)
#define GetAuthenticPixelQueue PrependMagickMethod(GetAuthenticPixelQueue)
#define GetAuthenticPixels PrependMagickMethod(GetAuthenticPixels)
@@ -371,7 +371,7 @@
#define GetBlobSize PrependMagickMethod(GetBlobSize)
#define GetBlobStreamData PrependMagickMethod(GetBlobStreamData)
#define GetBlobStreamHandler PrependMagickMethod(GetBlobStreamHandler)
-#define GetCacheViewAuthenticIndexQueue PrependMagickMethod(GetCacheViewAuthenticIndexQueue)
+#define GetCacheViewAuthenticMetacontent PrependMagickMethod(GetCacheViewAuthenticMetacontent)
#define GetCacheViewAuthenticPixelQueue PrependMagickMethod(GetCacheViewAuthenticPixelQueue)
#define GetCacheViewAuthenticPixels PrependMagickMethod(GetCacheViewAuthenticPixels)
#define GetCacheViewColorspace PrependMagickMethod(GetCacheViewColorspace)
@@ -381,7 +381,7 @@
#define GetCacheViewPixels PrependMagickMethod(GetCacheViewPixels)
#define GetCacheView PrependMagickMethod(GetCacheView)
#define GetCacheViewStorageClass PrependMagickMethod(GetCacheViewStorageClass)
-#define GetCacheViewVirtualIndexQueue PrependMagickMethod(GetCacheViewVirtualIndexQueue)
+#define GetCacheViewVirtualMetacontent PrependMagickMethod(GetCacheViewVirtualMetacontent)
#define GetCacheViewVirtualPixelQueue PrependMagickMethod(GetCacheViewVirtualPixelQueue)
#define GetCacheViewVirtualPixels PrependMagickMethod(GetCacheViewVirtualPixels)
#define GetClientName PrependMagickMethod(GetClientName)
@@ -496,7 +496,7 @@
#define GetCommandOptions PrependMagickMethod(GetCommandOptions)
#define GetMagickPackageName PrependMagickMethod(GetMagickPackageName)
#define GetMagickPageSize PrependMagickMethod(GetMagickPageSize)
-#define GetMagickPixelPacket PrependMagickMethod(GetMagickPixelPacket)
+#define GetPixelInfo PrependMagickMethod(GetPixelInfo)
#define GetMagickProperty PrependMagickMethod(GetMagickProperty)
#define GetMagickQuantumDepth PrependMagickMethod(GetMagickQuantumDepth)
#define GetMagickQuantumRange PrependMagickMethod(GetMagickQuantumRange)
@@ -556,7 +556,7 @@
#define GetPixelCacheColorspace PrependMagickMethod(GetPixelCacheColorspace)
#define GetPixelCacheMethods PrependMagickMethod(GetPixelCacheMethods)
#define GetPixelCacheNexusExtent PrependMagickMethod(GetPixelCacheNexusExtent)
-#define GetPixelCacheNexusIndexes PrependMagickMethod(GetPixelCacheNexusIndexes)
+#define GetPixelCacheNexusMetacontent PrependMagickMethod(GetPixelCacheNexusMetacontent)
#define GetPixelCacheNexusPixels PrependMagickMethod(GetPixelCacheNexusPixels)
#define GetPixelCachePixels PrependMagickMethod(GetPixelCachePixels)
#define GetPixelCacheStorageClass PrependMagickMethod(GetPixelCacheStorageClass)
@@ -598,8 +598,8 @@
#define GetValueFromHashmap PrependMagickMethod(GetValueFromHashmap)
#define GetValueFromLinkedList PrependMagickMethod(GetValueFromLinkedList)
#define GetValueFromSplayTree PrependMagickMethod(GetValueFromSplayTree)
-#define GetVirtualIndexesFromNexus PrependMagickMethod(GetVirtualIndexesFromNexus)
-#define GetVirtualIndexQueue PrependMagickMethod(GetVirtualIndexQueue)
+#define GetVirtualMetacontentFromNexus PrependMagickMethod(GetVirtualMetacontentFromNexus)
+#define GetVirtualMetacontent PrependMagickMethod(GetVirtualMetacontent)
#define GetVirtualPixelQueue PrependMagickMethod(GetVirtualPixelQueue)
#define GetVirtualPixelsFromNexus PrependMagickMethod(GetVirtualPixelsFromNexus)
#define GetVirtualPixelsNexus PrependMagickMethod(GetVirtualPixelsNexus)
@@ -652,26 +652,26 @@
#define IsBlobExempt PrependMagickMethod(IsBlobExempt)
#define IsBlobSeekable PrependMagickMethod(IsBlobSeekable)
#define IsBlobTemporary PrependMagickMethod(IsBlobTemporary)
-#define IsColorSimilar PrependMagickMethod(IsColorSimilar)
+#define IsFuzzyEquivalencePixelPacket PrependMagickMethod(IsFuzzyEquivalencePixelPacket)
#define IsEventLogging PrependMagickMethod(IsEventLogging)
#define IsGeometry PrependMagickMethod(IsGeometry)
#define IsGlob PrependMagickMethod(IsGlob)
-#define IsGrayImage PrependMagickMethod(IsGrayImage)
+#define IsImageGray PrependMagickMethod(IsImageGray)
#define IsHashmapEmpty PrependMagickMethod(IsHashmapEmpty)
#define IsHighDynamicRangeImage PrependMagickMethod(IsHighDynamicRangeImage)
#define IsHistogramImage PrependMagickMethod(IsHistogramImage)
#define IsImageObject PrependMagickMethod(IsImageObject)
#define IsImagesEqual PrependMagickMethod(IsImagesEqual)
-#define IsImageSimilar PrependMagickMethod(IsImageSimilar)
+#define IsEquivalentImage PrependMagickMethod(IsEquivalentImage)
#define IsLinkedListEmpty PrependMagickMethod(IsLinkedListEmpty)
-#define IsMagickColorSimilar PrependMagickMethod(IsMagickColorSimilar)
+#define IsFuzzyEquivalencePixelInfo PrependMagickMethod(IsFuzzyEquivalencePixelInfo)
#define IsMagickConflict PrependMagickMethod(IsMagickConflict)
#define IsMagickInstantiated PrependMagickMethod(IsMagickInstantiated)
#define IsCommandOption PrependMagickMethod(IsCommandOption)
#define IsMagickTrue PrependMagickMethod(IsMagickTrue)
-#define IsMonochromeImage PrependMagickMethod(IsMonochromeImage)
-#define IsOpacitySimilar PrependMagickMethod(IsOpacitySimilar)
-#define IsOpaqueImage PrependMagickMethod(IsOpaqueImage)
+#define IsImageMonochrome PrependMagickMethod(IsImageMonochrome)
+#define IsEquivalentAlpha PrependMagickMethod(IsEquivalentAlpha)
+#define IsImageOpaque PrependMagickMethod(IsImageOpaque)
#define IsPaletteImage PrependMagickMethod(IsPaletteImage)
#define IsPathAccessible PrependMagickMethod(IsPathAccessible)
#define IsRightsAuthorized PrependMagickMethod(IsRightsAuthorized)
@@ -1363,7 +1363,7 @@
#define XGetAnnotateInfo PrependMagickMethod(XGetAnnotateInfo)
#define XGetImportInfo PrependMagickMethod(XGetImportInfo)
#define XGetMapInfo PrependMagickMethod(XGetMapInfo)
-#define XGetPixelPacket PrependMagickMethod(XGetPixelPacket)
+#define XGetPixelInfo PrependMagickMethod(XGetPixelInfo)
#define XGetResourceClass PrependMagickMethod(XGetResourceClass)
#define XGetResourceDatabase PrependMagickMethod(XGetResourceDatabase)
#define XGetResourceInfo PrependMagickMethod(XGetResourceInfo)
diff --git a/magick/mime-private.h b/MagickCore/mime-private.h
similarity index 100%
rename from magick/mime-private.h
rename to MagickCore/mime-private.h
diff --git a/magick/mime.c b/MagickCore/mime.c
similarity index 98%
rename from magick/mime.c
rename to MagickCore/mime.c
index 2fbc461..bc29e30 100644
--- a/magick/mime.c
+++ b/MagickCore/mime.c
@@ -37,22 +37,22 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/client.h"
-#include "magick/configure.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/hashmap.h"
-#include "magick/memory_.h"
-#include "magick/mime.h"
-#include "magick/mime-private.h"
-#include "magick/option.h"
-#include "magick/semaphore.h"
-#include "magick/string_.h"
-#include "magick/token.h"
-#include "magick/utility.h"
-#include "magick/xml-tree.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/client.h"
+#include "MagickCore/configure.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/hashmap.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/mime.h"
+#include "MagickCore/mime-private.h"
+#include "MagickCore/option.h"
+#include "MagickCore/semaphore.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/token.h"
+#include "MagickCore/utility.h"
+#include "MagickCore/xml-tree.h"
/*
Define declarations.
diff --git a/magick/mime.h b/MagickCore/mime.h
similarity index 100%
rename from magick/mime.h
rename to MagickCore/mime.h
diff --git a/magick/module.c b/MagickCore/module.c
similarity index 98%
rename from magick/module.c
rename to MagickCore/module.c
index 47755c1..5b1b688 100644
--- a/magick/module.c
+++ b/MagickCore/module.c
@@ -40,26 +40,26 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/coder.h"
-#include "magick/client.h"
-#include "magick/configure.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/log.h"
-#include "magick/hashmap.h"
-#include "magick/magic.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/module.h"
-#include "magick/policy.h"
-#include "magick/semaphore.h"
-#include "magick/splay-tree.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/token.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/coder.h"
+#include "MagickCore/client.h"
+#include "MagickCore/configure.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/log.h"
+#include "MagickCore/hashmap.h"
+#include "MagickCore/magic.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/policy.h"
+#include "MagickCore/semaphore.h"
+#include "MagickCore/splay-tree.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/token.h"
+#include "MagickCore/utility.h"
#if defined(MAGICKCORE_MODULES_SUPPORT)
#if defined(MAGICKCORE_LTDL_DELEGATE)
#include "ltdl.h"
diff --git a/magick/module.h b/MagickCore/module.h
similarity index 94%
rename from magick/module.h
rename to MagickCore/module.h
index 2ce067f..1f64f11 100644
--- a/magick/module.h
+++ b/MagickCore/module.h
@@ -23,7 +23,7 @@
#endif
#include <time.h>
-#include "magick/version.h"
+#include "MagickCore/version.h"
#define MagickImageCoderSignature ((size_t) \
(((MagickLibVersion) << 8) | MAGICKCORE_QUANTUM_DEPTH))
@@ -55,10 +55,6 @@
MagickBooleanType
stealth;
- struct _ModuleInfo
- *previous,
- *next; /* deprecated, use GetModuleInfoList() */
-
size_t
signature;
} ModuleInfo;
diff --git a/magick/monitor-private.h b/MagickCore/monitor-private.h
similarity index 97%
rename from magick/monitor-private.h
rename to MagickCore/monitor-private.h
index 48a661a..7eaf99e 100644
--- a/magick/monitor-private.h
+++ b/MagickCore/monitor-private.h
@@ -22,7 +22,7 @@
extern "C" {
#endif
-#include <magick/image.h>
+#include <MagickCore/image.h>
static inline MagickBooleanType SetImageProgress(const Image *image,
const char *tag,const MagickOffsetType offset,const MagickSizeType extent)
diff --git a/magick/monitor.c b/MagickCore/monitor.c
similarity index 97%
rename from magick/monitor.c
rename to MagickCore/monitor.c
index d890efd..20c4840 100644
--- a/magick/monitor.c
+++ b/MagickCore/monitor.c
@@ -40,10 +40,10 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/image.h"
-#include "magick/log.h"
-#include "magick/monitor.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/image.h"
+#include "MagickCore/log.h"
+#include "MagickCore/monitor.h"
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/magick/monitor.h b/MagickCore/monitor.h
similarity index 100%
rename from magick/monitor.h
rename to MagickCore/monitor.h
diff --git a/magick/montage.c b/MagickCore/montage.c
similarity index 96%
rename from magick/montage.c
rename to MagickCore/montage.c
index 7b63763..bebb2e3 100644
--- a/magick/montage.c
+++ b/MagickCore/montage.c
@@ -40,36 +40,36 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/annotate.h"
-#include "magick/client.h"
-#include "magick/color.h"
-#include "magick/composite.h"
-#include "magick/constitute.h"
-#include "magick/decorate.h"
-#include "magick/draw.h"
-#include "magick/effect.h"
-#include "magick/enhance.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/fx.h"
-#include "magick/gem.h"
-#include "magick/geometry.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/montage.h"
-#include "magick/option.h"
-#include "magick/quantize.h"
-#include "magick/property.h"
-#include "magick/resize.h"
-#include "magick/resource_.h"
-#include "magick/string_.h"
-#include "magick/utility.h"
-#include "magick/version.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/annotate.h"
+#include "MagickCore/client.h"
+#include "MagickCore/color.h"
+#include "MagickCore/composite.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/decorate.h"
+#include "MagickCore/draw.h"
+#include "MagickCore/effect.h"
+#include "MagickCore/enhance.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/fx.h"
+#include "MagickCore/gem.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/montage.h"
+#include "MagickCore/option.h"
+#include "MagickCore/quantize.h"
+#include "MagickCore/property.h"
+#include "MagickCore/resize.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/utility.h"
+#include "MagickCore/version.h"
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -227,8 +227,8 @@
montage_info->font=AcquireString(image_info->font);
montage_info->gravity=CenterGravity;
montage_info->pointsize=image_info->pointsize;
- montage_info->fill.opacity=OpaqueOpacity;
- montage_info->stroke.opacity=(Quantum) TransparentOpacity;
+ montage_info->fill.alpha=OpaqueAlpha;
+ montage_info->stroke.alpha=(Quantum) TransparentAlpha;
montage_info->background_color=image_info->background_color;
montage_info->border_color=image_info->border_color;
montage_info->matte_color=image_info->matte_color;
@@ -812,7 +812,7 @@
/*
Shadow image.
*/
- (void) QueryColorDatabase("#000000",&image->background_color,
+ (void) QueryColorDatabase("#00000000",&image->background_color,
exception);
shadow_image=ShadowImage(image,80.0,2.0,5,5,exception);
if (shadow_image != (Image *) NULL)
diff --git a/magick/montage.h b/MagickCore/montage.h
similarity index 100%
rename from magick/montage.h
rename to MagickCore/montage.h
diff --git a/magick/morphology-private.h b/MagickCore/morphology-private.h
similarity index 96%
rename from magick/morphology-private.h
rename to MagickCore/morphology-private.h
index 06f3495..78bc9e7 100644
--- a/magick/morphology-private.h
+++ b/MagickCore/morphology-private.h
@@ -26,7 +26,7 @@
}
#endif
-#include <magick/morphology.h>
+#include <MagickCore/morphology.h>
extern MagickExport Image
*MorphologyApply(const Image *,const ChannelType,const MorphologyMethod,
diff --git a/magick/morphology.c b/MagickCore/morphology.c
similarity index 89%
rename from magick/morphology.c
rename to MagickCore/morphology.c
index de93e7d..5f725f3 100644
--- a/magick/morphology.c
+++ b/MagickCore/morphology.c
@@ -49,35 +49,35 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/artifact.h"
-#include "magick/cache-view.h"
-#include "magick/color-private.h"
-#include "magick/enhance.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/gem.h"
-#include "magick/hashmap.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor-private.h"
-#include "magick/morphology.h"
-#include "magick/morphology-private.h"
-#include "magick/option.h"
-#include "magick/pixel-private.h"
-#include "magick/prepress.h"
-#include "magick/quantize.h"
-#include "magick/registry.h"
-#include "magick/semaphore.h"
-#include "magick/splay-tree.h"
-#include "magick/statistic.h"
-#include "magick/string_.h"
-#include "magick/string-private.h"
-#include "magick/token.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/artifact.h"
+#include "MagickCore/cache-view.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/enhance.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/gem.h"
+#include "MagickCore/hashmap.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/morphology.h"
+#include "MagickCore/morphology-private.h"
+#include "MagickCore/option.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/prepress.h"
+#include "MagickCore/quantize.h"
+#include "MagickCore/registry.h"
+#include "MagickCore/semaphore.h"
+#include "MagickCore/splay-tree.h"
+#include "MagickCore/statistic.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/string-private.h"
+#include "MagickCore/token.h"
+#include "MagickCore/utility.h"
/*
@@ -604,7 +604,7 @@
% The result is a zero-summing kernel.
%
% Blur:{radius},{sigma}[,{angle}]
-% Generates a 1-dimensional or linear gaussian blur, at the angle given
+% Generates a 1 dimensional or linear gaussian blur, at the angle given
% (current restricted to orthogonal angles). If a 'radius' is given the
% kernel is clipped to a width of 2*radius+1. Kernel can be rotated
% by a 90 degree angle.
@@ -2498,15 +2498,15 @@
** It returns the number of pixels that changed between the images
** for result convergence determination.
*/
-static ssize_t MorphologyPrimitive(const Image *image, Image *result_image,
+static ssize_t MorphologyPrimitive(const Image *image, Image *morphology_image,
const MorphologyMethod method, const ChannelType channel,
const KernelInfo *kernel,const double bias,ExceptionInfo *exception)
{
#define MorphologyTag "Morphology/Image"
CacheView
- *p_view,
- *q_view;
+ *image_view,
+ *morphology_view;
ssize_t
y, offx, offy;
@@ -2523,8 +2523,8 @@
assert(image != (Image *) NULL);
assert(image->signature == MagickSignature);
- assert(result_image != (Image *) NULL);
- assert(result_image->signature == MagickSignature);
+ assert(morphology_image != (Image *) NULL);
+ assert(morphology_image->signature == MagickSignature);
assert(kernel != (KernelInfo *) NULL);
assert(kernel->signature == MagickSignature);
assert(exception != (ExceptionInfo *) NULL);
@@ -2534,8 +2534,8 @@
changed=0;
progress=0;
- p_view=AcquireCacheView(image);
- q_view=AcquireCacheView(result_image);
+ image_view=AcquireCacheView(image);
+ morphology_view=AcquireCacheView(morphology_image);
virt_width=image->columns+kernel->width-1;
/* Some methods (including convolve) needs use a reflected kernel.
@@ -2589,18 +2589,12 @@
#endif
for (x=0; x < (ssize_t) image->columns; x++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
- register const IndexPacket
- *restrict p_indexes;
-
- register PixelPacket
+ register Quantum
*restrict q;
- register IndexPacket
- *restrict q_indexes;
-
register ssize_t
y;
@@ -2609,17 +2603,14 @@
if (status == MagickFalse)
continue;
- p=GetCacheViewVirtualPixels(p_view, x, -offy,1,
+ p=GetCacheViewVirtualPixels(image_view, x, -offy,1,
image->rows+kernel->height-1, exception);
- q=GetCacheViewAuthenticPixels(q_view,x,0,1,result_image->rows,exception);
- if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
+ q=GetCacheViewAuthenticPixels(morphology_view,x,0,1,morphology_image->rows,exception);
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
{
status=MagickFalse;
continue;
}
- p_indexes=GetCacheViewVirtualIndexQueue(p_view);
- q_indexes=GetCacheViewAuthenticIndexQueue(q_view);
-
/* offset to origin in 'p'. while 'q' points to it directly */
r = offy;
@@ -2631,29 +2622,31 @@
register const double
*restrict k;
- register const PixelPacket
+ register const Quantum
*restrict k_pixels;
- register const IndexPacket
- *restrict k_indexes;
-
- MagickPixelPacket
+ PixelInfo
result;
/* Copy input image to the output image for unused channels
* This removes need for 'cloning' a new image every iteration
*/
- *q = p[r];
+ SetPixelRed(morphology_image,GetPixelRed(image,p+r*
+ GetPixelChannels(image)),q);
+ SetPixelGreen(morphology_image,GetPixelGreen(image,p+r*
+ GetPixelChannels(image)),q);
+ SetPixelBlue(morphology_image,GetPixelBlue(image,p+r*
+ GetPixelChannels(image)),q);
if (image->colorspace == CMYKColorspace)
- SetPixelIndex(q_indexes+y,GetPixelIndex(
- p_indexes+r));
+ SetPixelBlack(morphology_image,GetPixelBlack(image,p+r*
+ GetPixelChannels(image)),q);
/* Set the bias of the weighted average output */
result.red =
result.green =
result.blue =
- result.opacity =
- result.index = bias;
+ result.alpha =
+ result.black = bias;
/* Weighted Average of pixels using reflected kernel
@@ -2664,7 +2657,6 @@
*/
k = &kernel->values[ kernel->height-1 ];
k_pixels = p;
- k_indexes = p_indexes;
if ( ((channel & SyncChannels) == 0 ) ||
(image->matte == MagickFalse) )
{ /* No 'Sync' involved.
@@ -2672,28 +2664,27 @@
*/
for (v=0; v < (ssize_t) kernel->height; v++) {
if ( IsNan(*k) ) continue;
- result.red += (*k)*GetPixelRed(k_pixels);
- result.green += (*k)*GetPixelGreen(k_pixels);
- result.blue += (*k)*GetPixelBlue(k_pixels);
- result.opacity += (*k)*GetPixelOpacity(k_pixels);
- if ( image->colorspace == CMYKColorspace)
- result.index += (*k)*(*k_indexes);
+ result.red += (*k)*GetPixelRed(image,k_pixels);
+ result.green += (*k)*GetPixelGreen(image,k_pixels);
+ result.blue += (*k)*GetPixelBlue(image,k_pixels);
+ if (image->colorspace == CMYKColorspace)
+ result.black+=(*k)*GetPixelBlack(image,k_pixels);
+ result.alpha += (*k)*GetPixelAlpha(image,k_pixels);
k--;
k_pixels++;
- k_indexes++;
}
if ((channel & RedChannel) != 0)
- SetPixelRed(q,ClampToQuantum(result.red));
+ SetPixelRed(morphology_image,ClampToQuantum(result.red),q);
if ((channel & GreenChannel) != 0)
- SetPixelGreen(q,ClampToQuantum(result.green));
+ SetPixelGreen(morphology_image,ClampToQuantum(result.green),q);
if ((channel & BlueChannel) != 0)
- SetPixelBlue(q,ClampToQuantum(result.blue));
- if ((channel & OpacityChannel) != 0
- && image->matte == MagickTrue )
- SetPixelOpacity(q,ClampToQuantum(result.opacity));
- if ((channel & IndexChannel) != 0
- && image->colorspace == CMYKColorspace)
- SetPixelIndex(q_indexes+x,ClampToQuantum(result.index));
+ SetPixelBlue(morphology_image,ClampToQuantum(result.blue),q);
+ if (((channel & BlackChannel) != 0) &&
+ (image->colorspace == CMYKColorspace))
+ SetPixelBlack(morphology_image,ClampToQuantum(result.black),q);
+ if (((channel & OpacityChannel) != 0) &&
+ (image->matte == MagickTrue))
+ SetPixelAlpha(morphology_image,ClampToQuantum(result.alpha),q);
}
else
{ /* Channel 'Sync' Flag, and Alpha Channel enabled.
@@ -2707,41 +2698,44 @@
gamma=0.0;
for (v=0; v < (ssize_t) kernel->height; v++) {
if ( IsNan(*k) ) continue;
- alpha=(*k)*(QuantumScale*(QuantumRange-GetPixelOpacity(k_pixels)));
+ alpha=(*k)*(QuantumScale*GetPixelAlpha(image,k_pixels));
gamma += alpha;
- result.red += alpha*GetPixelRed(k_pixels);
- result.green += alpha*GetPixelGreen(k_pixels);
- result.blue += alpha*GetPixelBlue(k_pixels);
- result.opacity += (*k)*GetPixelOpacity(k_pixels);
- if ( image->colorspace == CMYKColorspace)
- result.index += alpha*(*k_indexes);
+ result.red += alpha*GetPixelRed(image,k_pixels);
+ result.green += alpha*GetPixelGreen(image,k_pixels);
+ result.blue += alpha*GetPixelBlue(image,k_pixels);
+ if (image->colorspace == CMYKColorspace)
+ result.black += alpha*GetPixelBlack(image,k_pixels);
+ result.alpha += (*k)*GetPixelAlpha(image,k_pixels);
k--;
k_pixels++;
- k_indexes++;
}
/* Sync'ed channels, all channels are modified */
gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
- SetPixelRed(q,ClampToQuantum(gamma*result.red));
- SetPixelGreen(q,ClampToQuantum(gamma*result.green));
- SetPixelBlue(q,ClampToQuantum(gamma*result.blue));
- SetPixelOpacity(q,ClampToQuantum(result.opacity));
+ SetPixelRed(morphology_image,
+ ClampToQuantum(gamma*result.red),q);
+ SetPixelGreen(morphology_image,
+ ClampToQuantum(gamma*result.green),q);
+ SetPixelBlue(morphology_image,
+ ClampToQuantum(gamma*result.blue),q);
if (image->colorspace == CMYKColorspace)
- SetPixelIndex(q_indexes+x,ClampToQuantum(gamma*
- result.index));
+ SetPixelBlack(morphology_image,
+ ClampToQuantum(gamma*result.black),q);
+ SetPixelAlpha(morphology_image,
+ ClampToQuantum(result.alpha),q);
}
/* Count up changed pixels */
- if ( ( p[r].red != GetPixelRed(q))
- || ( p[r].green != GetPixelGreen(q))
- || ( p[r].blue != GetPixelBlue(q))
- || ( p[r].opacity != GetPixelOpacity(q))
- || ( image->colorspace == CMYKColorspace &&
- GetPixelIndex(p_indexes+r) != GetPixelIndex(q_indexes+x) ) )
+ if ((GetPixelRed(image,p+r) != GetPixelRed(morphology_image,q))
+ || (GetPixelGreen(image,p+r) != GetPixelGreen(morphology_image,q))
+ || (GetPixelBlue(image,p+r) != GetPixelBlue(morphology_image,q))
+ || (GetPixelAlpha(image,p+r) != GetPixelAlpha(morphology_image,q))
+ || ((image->colorspace == CMYKColorspace) &&
+ (GetPixelBlack(image,p+r) != GetPixelBlack(morphology_image,q))))
changed++; /* The pixel was changed in some way! */
- p++;
- q++;
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(morphology_image);
} /* y */
- if ( SyncCacheViewAuthenticPixels(q_view,exception) == MagickFalse)
+ if ( SyncCacheViewAuthenticPixels(morphology_view,exception) == MagickFalse)
status=MagickFalse;
if (image->progress_monitor != (MagickProgressMonitor) NULL)
{
@@ -2756,9 +2750,9 @@
status=MagickFalse;
}
} /* x */
- result_image->type=image->type;
- q_view=DestroyCacheView(q_view);
- p_view=DestroyCacheView(p_view);
+ morphology_image->type=image->type;
+ morphology_view=DestroyCacheView(morphology_view);
+ image_view=DestroyCacheView(image_view);
return(status ? (ssize_t) changed : 0);
}
@@ -2770,18 +2764,12 @@
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
- register const IndexPacket
- *restrict p_indexes;
-
- register PixelPacket
+ register Quantum
*restrict q;
- register IndexPacket
- *restrict q_indexes;
-
register ssize_t
x;
@@ -2790,18 +2778,15 @@
if (status == MagickFalse)
continue;
- p=GetCacheViewVirtualPixels(p_view, -offx, y-offy, virt_width,
+ p=GetCacheViewVirtualPixels(image_view, -offx, y-offy, virt_width,
kernel->height, exception);
- q=GetCacheViewAuthenticPixels(q_view,0,y,result_image->columns,1,
+ q=GetCacheViewAuthenticPixels(morphology_view,0,y,morphology_image->columns,1,
exception);
- if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
{
status=MagickFalse;
continue;
}
- p_indexes=GetCacheViewVirtualIndexQueue(p_view);
- q_indexes=GetCacheViewAuthenticIndexQueue(q_view);
-
/* offset to origin in 'p'. while 'q' points to it directly */
r = virt_width*offy + offx;
@@ -2816,13 +2801,10 @@
register const double
*restrict k;
- register const PixelPacket
+ register const Quantum
*restrict k_pixels;
- register const IndexPacket
- *restrict k_indexes;
-
- MagickPixelPacket
+ PixelInfo
result,
min,
max;
@@ -2830,29 +2812,35 @@
/* Copy input image to the output image for unused channels
* This removes need for 'cloning' a new image every iteration
*/
- *q = p[r];
+ SetPixelRed(morphology_image,GetPixelRed(image,p+r*
+ GetPixelChannels(image)),q);
+ SetPixelGreen(morphology_image,GetPixelGreen(image,p+r*
+ GetPixelChannels(image)),q);
+ SetPixelBlue(morphology_image,GetPixelBlue(image,p+r*
+ GetPixelChannels(image)),q);
if (image->colorspace == CMYKColorspace)
- SetPixelIndex(q_indexes+x,GetPixelIndex(p_indexes+r));
+ SetPixelBlack(morphology_image,GetPixelBlack(image,p+r*
+ GetPixelChannels(image)),q);
/* Defaults */
min.red =
min.green =
min.blue =
- min.opacity =
- min.index = (MagickRealType) QuantumRange;
+ min.alpha =
+ min.black = (MagickRealType) QuantumRange;
max.red =
max.green =
max.blue =
- max.opacity =
- max.index = (MagickRealType) 0;
+ max.alpha =
+ max.black = (MagickRealType) 0;
/* default result is the original pixel value */
- result.red = (MagickRealType) p[r].red;
- result.green = (MagickRealType) p[r].green;
- result.blue = (MagickRealType) p[r].blue;
- result.opacity = QuantumRange - (MagickRealType) p[r].opacity;
- result.index = 0.0;
- if ( image->colorspace == CMYKColorspace)
- result.index = (MagickRealType) GetPixelIndex(p_indexes+r);
+ result.red = (MagickRealType) GetPixelRed(image,p+r);
+ result.green = (MagickRealType) GetPixelGreen(image,p+r);
+ result.blue = (MagickRealType) GetPixelBlue(image,p+r);
+ result.black = 0.0;
+ if (image->colorspace == CMYKColorspace)
+ result.black = (MagickRealType) GetPixelBlack(image,p+r);
+ result.alpha=(MagickRealType) GetPixelAlpha(image,p+r);
switch (method) {
case ConvolveMorphology:
@@ -2860,8 +2848,8 @@
result.red =
result.green =
result.blue =
- result.opacity =
- result.index = bias;
+ result.alpha =
+ result.black = bias;
break;
case DilateIntensityMorphology:
case ErodeIntensityMorphology:
@@ -2894,7 +2882,6 @@
*/
k = &kernel->values[ kernel->width*kernel->height-1 ];
k_pixels = p;
- k_indexes = p_indexes;
if ( ((channel & SyncChannels) == 0 ) ||
(image->matte == MagickFalse) )
{ /* No 'Sync' involved.
@@ -2903,29 +2890,32 @@
for (v=0; v < (ssize_t) kernel->height; v++) {
for (u=0; u < (ssize_t) kernel->width; u++, k--) {
if ( IsNan(*k) ) continue;
- result.red += (*k)*k_pixels[u].red;
- result.green += (*k)*k_pixels[u].green;
- result.blue += (*k)*k_pixels[u].blue;
- result.opacity += (*k)*k_pixels[u].opacity;
- if ( image->colorspace == CMYKColorspace)
- result.index += (*k)*GetPixelIndex(k_indexes+u);
+ result.red += (*k)*
+ GetPixelRed(image,k_pixels+u*GetPixelChannels(image));
+ result.green += (*k)*
+ GetPixelGreen(image,k_pixels+u*GetPixelChannels(image));
+ result.blue += (*k)*
+ GetPixelBlue(image,k_pixels+u*GetPixelChannels(image));
+ if (image->colorspace == CMYKColorspace)
+ result.black += (*k)*
+ GetPixelBlack(image,k_pixels+u*GetPixelChannels(image));
+ result.alpha += (*k)*
+ GetPixelAlpha(image,k_pixels+u*GetPixelChannels(image));
}
- k_pixels += virt_width;
- k_indexes += virt_width;
+ k_pixels += virt_width*GetPixelChannels(image);
}
if ((channel & RedChannel) != 0)
- SetPixelRed(q,ClampToQuantum(result.red));
+ SetPixelRed(morphology_image,ClampToQuantum(result.red),q);
if ((channel & GreenChannel) != 0)
- SetPixelGreen(q,ClampToQuantum(result.green));
+ SetPixelGreen(morphology_image,ClampToQuantum(result.green),q);
if ((channel & BlueChannel) != 0)
- SetPixelBlue(q,ClampToQuantum(result.blue));
- if ((channel & OpacityChannel) != 0
- && image->matte == MagickTrue )
- SetPixelOpacity(q,ClampToQuantum(result.opacity));
- if ((channel & IndexChannel) != 0
- && image->colorspace == CMYKColorspace)
- SetPixelIndex(q_indexes+x,ClampToQuantum(
- result.index));
+ SetPixelBlue(morphology_image,ClampToQuantum(result.blue),q);
+ if (((channel & BlackChannel) != 0) &&
+ (image->colorspace == CMYKColorspace))
+ SetPixelBlack(morphology_image,ClampToQuantum(result.black),q);
+ if (((channel & OpacityChannel) != 0) &&
+ (image->matte == MagickTrue))
+ SetPixelAlpha(morphology_image,ClampToQuantum(result.alpha),q);
}
else
{ /* Channel 'Sync' Flag, and Alpha Channel enabled.
@@ -2940,28 +2930,35 @@
for (v=0; v < (ssize_t) kernel->height; v++) {
for (u=0; u < (ssize_t) kernel->width; u++, k--) {
if ( IsNan(*k) ) continue;
- alpha=(*k)*(QuantumScale*(QuantumRange-
- k_pixels[u].opacity));
+ alpha=(*k)*(QuantumScale*
+ GetPixelAlpha(image,k_pixels+u*GetPixelChannels(image)));
gamma += alpha;
- result.red += alpha*k_pixels[u].red;
- result.green += alpha*k_pixels[u].green;
- result.blue += alpha*k_pixels[u].blue;
- result.opacity += (*k)*k_pixels[u].opacity;
- if ( image->colorspace == CMYKColorspace)
- result.index+=alpha*GetPixelIndex(k_indexes+u);
+ result.red += alpha*
+ GetPixelRed(image,k_pixels+u*GetPixelChannels(image));
+ result.green += alpha*
+ GetPixelGreen(image,k_pixels+u*GetPixelChannels(image));
+ result.blue += alpha*
+ GetPixelBlue(image,k_pixels+u*GetPixelChannels(image));
+ if (image->colorspace == CMYKColorspace)
+ result.black+=alpha*
+ GetPixelBlack(image,k_pixels+u*GetPixelChannels(image));
+ result.alpha += (*k)*
+ GetPixelAlpha(image,k_pixels+u*GetPixelChannels(image));
}
- k_pixels += virt_width;
- k_indexes += virt_width;
+ k_pixels += virt_width*GetPixelChannels(image);
}
/* Sync'ed channels, all channels are modified */
gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
- SetPixelRed(q,ClampToQuantum(gamma*result.red));
- SetPixelGreen(q,ClampToQuantum(gamma*result.green));
- SetPixelBlue(q,ClampToQuantum(gamma*result.blue));
- SetPixelOpacity(q,ClampToQuantum(result.opacity));
+ SetPixelRed(morphology_image,
+ ClampToQuantum(gamma*result.red),q);
+ SetPixelGreen(morphology_image,
+ ClampToQuantum(gamma*result.green),q);
+ SetPixelBlue(morphology_image,
+ ClampToQuantum(gamma*result.blue),q);
if (image->colorspace == CMYKColorspace)
- SetPixelIndex(q_indexes+x,ClampToQuantum(gamma*
- result.index));
+ SetPixelBlack(morphology_image,
+ ClampToQuantum(gamma*result.black),q);
+ SetPixelAlpha(morphology_image,ClampToQuantum(result.alpha),q);
}
break;
@@ -2976,21 +2973,22 @@
*/
k = kernel->values;
k_pixels = p;
- k_indexes = p_indexes;
for (v=0; v < (ssize_t) kernel->height; v++) {
for (u=0; u < (ssize_t) kernel->width; u++, k++) {
if ( IsNan(*k) || (*k) < 0.5 ) continue;
- Minimize(min.red, (double) k_pixels[u].red);
- Minimize(min.green, (double) k_pixels[u].green);
- Minimize(min.blue, (double) k_pixels[u].blue);
- Minimize(min.opacity,
- QuantumRange-(double) k_pixels[u].opacity);
- if ( image->colorspace == CMYKColorspace)
- Minimize(min.index,(double) GetPixelIndex(
- k_indexes+u));
+ Minimize(min.red, (double)
+ GetPixelRed(image,k_pixels+u*GetPixelChannels(image)));
+ Minimize(min.green, (double)
+ GetPixelGreen(image,k_pixels+u*GetPixelChannels(image)));
+ Minimize(min.blue, (double)
+ GetPixelBlue(image,k_pixels+u*GetPixelChannels(image)));
+ if (image->colorspace == CMYKColorspace)
+ Minimize(min.black,(double)
+ GetPixelBlack(image,k_pixels+u*GetPixelChannels(image)));
+ Minimize(min.alpha,(double)
+ GetPixelAlpha(image,k_pixels+u*GetPixelChannels(image)));
}
- k_pixels += virt_width;
- k_indexes += virt_width;
+ k_pixels += virt_width*GetPixelChannels(image);
}
break;
@@ -3008,21 +3006,22 @@
*/
k = &kernel->values[ kernel->width*kernel->height-1 ];
k_pixels = p;
- k_indexes = p_indexes;
for (v=0; v < (ssize_t) kernel->height; v++) {
for (u=0; u < (ssize_t) kernel->width; u++, k--) {
if ( IsNan(*k) || (*k) < 0.5 ) continue;
- Maximize(max.red, (double) k_pixels[u].red);
- Maximize(max.green, (double) k_pixels[u].green);
- Maximize(max.blue, (double) k_pixels[u].blue);
- Maximize(max.opacity,
- QuantumRange-(double) k_pixels[u].opacity);
- if ( image->colorspace == CMYKColorspace)
- Maximize(max.index, (double) GetPixelIndex(
- k_indexes+u));
+ Maximize(max.red, (double)
+ GetPixelRed(image,k_pixels+u*GetPixelChannels(image)));
+ Maximize(max.green, (double)
+ GetPixelGreen(image,k_pixels+u*GetPixelChannels(image)));
+ Maximize(max.blue, (double)
+ GetPixelBlue(image,k_pixels+u*GetPixelChannels(image)));
+ if (image->colorspace == CMYKColorspace)
+ Maximize(max.black, (double)
+ GetPixelBlack(image,k_pixels+u*GetPixelChannels(image)));
+ Maximize(max.alpha,(double)
+ GetPixelAlpha(image,k_pixels+u*GetPixelChannels(image)));
}
- k_pixels += virt_width;
- k_indexes += virt_width;
+ k_pixels += virt_width*GetPixelChannels(image);
}
break;
@@ -3042,42 +3041,46 @@
*/
k = kernel->values;
k_pixels = p;
- k_indexes = p_indexes;
for (v=0; v < (ssize_t) kernel->height; v++) {
for (u=0; u < (ssize_t) kernel->width; u++, k++) {
if ( IsNan(*k) ) continue;
if ( (*k) > 0.7 )
{ /* minimim of foreground pixels */
- Minimize(min.red, (double) k_pixels[u].red);
- Minimize(min.green, (double) k_pixels[u].green);
- Minimize(min.blue, (double) k_pixels[u].blue);
- Minimize(min.opacity,
- QuantumRange-(double) k_pixels[u].opacity);
+ Minimize(min.red, (double)
+ GetPixelRed(image,k_pixels+u*GetPixelChannels(image)));
+ Minimize(min.green, (double)
+ GetPixelGreen(image,k_pixels+u*GetPixelChannels(image)));
+ Minimize(min.blue, (double)
+ GetPixelBlue(image,k_pixels+u*GetPixelChannels(image)));
if ( image->colorspace == CMYKColorspace)
- Minimize(min.index,(double) GetPixelIndex(
- k_indexes+u));
+ Minimize(min.black,(double)
+ GetPixelBlack(image,k_pixels+u*GetPixelChannels(image)));
+ Minimize(min.alpha,(double)
+ GetPixelAlpha(image,k_pixels+u*GetPixelChannels(image)));
}
else if ( (*k) < 0.3 )
{ /* maximum of background pixels */
- Maximize(max.red, (double) k_pixels[u].red);
- Maximize(max.green, (double) k_pixels[u].green);
- Maximize(max.blue, (double) k_pixels[u].blue);
- Maximize(max.opacity,
- QuantumRange-(double) k_pixels[u].opacity);
- if ( image->colorspace == CMYKColorspace)
- Maximize(max.index, (double) GetPixelIndex(
- k_indexes+u));
+ Maximize(max.red, (double)
+ GetPixelRed(image,k_pixels+u*GetPixelChannels(image)));
+ Maximize(max.green, (double)
+ GetPixelGreen(image,k_pixels+u*GetPixelChannels(image)));
+ Maximize(max.blue, (double)
+ GetPixelBlue(image,k_pixels+u*GetPixelChannels(image)));
+ if (image->colorspace == CMYKColorspace)
+ Maximize(max.black, (double)
+ GetPixelBlack(image,k_pixels+u*GetPixelChannels(image)));
+ Maximize(max.alpha,(double)
+ GetPixelAlpha(image,k_pixels+u*GetPixelChannels(image)));
}
}
- k_pixels += virt_width;
- k_indexes += virt_width;
+ k_pixels += virt_width*GetPixelChannels(image);
}
/* Pattern Match if difference is positive */
min.red -= max.red; Maximize( min.red, 0.0 );
min.green -= max.green; Maximize( min.green, 0.0 );
min.blue -= max.blue; Maximize( min.blue, 0.0 );
- min.opacity -= max.opacity; Maximize( min.opacity, 0.0 );
- min.index -= max.index; Maximize( min.index, 0.0 );
+ min.alpha -= max.alpha; Maximize( min.alpha, 0.0 );
+ min.black -= max.black; Maximize( min.black, 0.0 );
break;
case ErodeIntensityMorphology:
@@ -3091,20 +3094,18 @@
*/
k = kernel->values;
k_pixels = p;
- k_indexes = p_indexes;
for (v=0; v < (ssize_t) kernel->height; v++) {
for (u=0; u < (ssize_t) kernel->width; u++, k++) {
if ( IsNan(*k) || (*k) < 0.5 ) continue;
if ( result.red == 0.0 ||
- PixelIntensity(&(k_pixels[u])) < PixelIntensity(q) ) {
+ GetPixelIntensity(image,&(k_pixels[u])) < GetPixelIntensity(morphology_image,q) ) {
/* copy the whole pixel - no channel selection */
*q = k_pixels[u];
if ( result.red > 0.0 ) changed++;
result.red = 1.0;
}
}
- k_pixels += virt_width;
- k_indexes += virt_width;
+ k_pixels += virt_width*GetPixelChannels(image);
}
break;
@@ -3121,20 +3122,18 @@
*/
k = &kernel->values[ kernel->width*kernel->height-1 ];
k_pixels = p;
- k_indexes = p_indexes;
for (v=0; v < (ssize_t) kernel->height; v++) {
for (u=0; u < (ssize_t) kernel->width; u++, k--) {
if ( IsNan(*k) || (*k) < 0.5 ) continue; /* boolean kernel */
if ( result.red == 0.0 ||
- PixelIntensity(&(k_pixels[u])) > PixelIntensity(q) ) {
+ GetPixelIntensity(image,&(k_pixels[u])) > GetPixelIntensity(morphology_image,q) ) {
/* copy the whole pixel - no channel selection */
*q = k_pixels[u];
if ( result.red > 0.0 ) changed++;
result.red = 1.0;
}
}
- k_pixels += virt_width;
- k_indexes += virt_width;
+ k_pixels += virt_width*GetPixelChannels(image);
}
break;
#if 0
@@ -3158,20 +3157,17 @@
*/
k = &kernel->values[ kernel->width*kernel->height-1 ];
k_pixels = p;
- k_indexes = p_indexes;
for (v=0; v < (ssize_t) kernel->height; v++) {
for (u=0; u < (ssize_t) kernel->width; u++, k--) {
if ( IsNan(*k) ) continue;
Minimize(result.red, (*k)+k_pixels[u].red);
Minimize(result.green, (*k)+k_pixels[u].green);
Minimize(result.blue, (*k)+k_pixels[u].blue);
- Minimize(result.opacity, (*k)+QuantumRange-k_pixels[u].opacity);
+ Minimize(result.alpha, (*k)+k_pixels[u].alpha);
if ( image->colorspace == CMYKColorspace)
- Minimize(result.index,(*k)+GetPixelIndex(
- k_indexes+u));
+ Minimize(result.black,(*k)+GetPixelBlack(p_image,k_indexes+u));
}
- k_pixels += virt_width;
- k_indexes += virt_width;
+ k_pixels += virt_width*GetPixelChannels(image);
}
break;
#endif
@@ -3199,16 +3195,16 @@
result.red -= min.red;
result.green -= min.green;
result.blue -= min.blue;
- result.opacity -= min.opacity;
- result.index -= min.index;
+ result.alpha -= min.alpha;
+ result.black -= min.black;
break;
case ThickenMorphology:
/* Add the pattern matchs to the original */
result.red += min.red;
result.green += min.green;
result.blue += min.blue;
- result.opacity += min.opacity;
- result.index += min.index;
+ result.alpha += min.alpha;
+ result.black += min.black;
break;
default:
/* result directly calculated or assigned */
@@ -3223,31 +3219,31 @@
break; /* full pixel was directly assigned - not a channel method */
default:
if ((channel & RedChannel) != 0)
- SetPixelRed(q,ClampToQuantum(result.red));
+ SetPixelRed(morphology_image,ClampToQuantum(result.red),q);
if ((channel & GreenChannel) != 0)
- SetPixelGreen(q,ClampToQuantum(result.green));
+ SetPixelGreen(morphology_image,ClampToQuantum(result.green),q);
if ((channel & BlueChannel) != 0)
- SetPixelBlue(q,ClampToQuantum(result.blue));
- if ((channel & OpacityChannel) != 0
- && image->matte == MagickTrue )
- SetPixelAlpha(q,ClampToQuantum(result.opacity));
- if ((channel & IndexChannel) != 0
- && image->colorspace == CMYKColorspace)
- SetPixelIndex(q_indexes+x,ClampToQuantum(result.index));
+ SetPixelBlue(morphology_image,ClampToQuantum(result.blue),q);
+ if (((channel & BlackChannel) != 0) &&
+ (image->colorspace == CMYKColorspace))
+ SetPixelBlack(morphology_image,ClampToQuantum(result.black),q);
+ if (((channel & OpacityChannel) != 0) &&
+ (image->matte == MagickTrue))
+ SetPixelAlpha(morphology_image,ClampToQuantum(result.alpha),q);
break;
}
/* Count up changed pixels */
- if ( ( p[r].red != GetPixelRed(q) )
- || ( p[r].green != GetPixelGreen(q) )
- || ( p[r].blue != GetPixelBlue(q) )
- || ( p[r].opacity != GetPixelOpacity(q) )
- || ( image->colorspace == CMYKColorspace &&
- GetPixelIndex(p_indexes+r) != GetPixelIndex(q_indexes+x) ) )
+ if ((GetPixelRed(image,p+r) != GetPixelRed(morphology_image,q)) ||
+ (GetPixelGreen(image,p+r) != GetPixelGreen(morphology_image,q)) ||
+ (GetPixelBlue(image,p+r) != GetPixelBlue(morphology_image,q)) ||
+ (GetPixelAlpha(image,p+r) != GetPixelAlpha(morphology_image,q)) ||
+ ((image->colorspace == CMYKColorspace) &&
+ (GetPixelBlack(image,p+r) != GetPixelBlack(morphology_image,q))))
changed++; /* The pixel was changed in some way! */
- p++;
- q++;
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(morphology_image);
} /* x */
- if ( SyncCacheViewAuthenticPixels(q_view,exception) == MagickFalse)
+ if ( SyncCacheViewAuthenticPixels(morphology_view,exception) == MagickFalse)
status=MagickFalse;
if (image->progress_monitor != (MagickProgressMonitor) NULL)
{
@@ -3262,8 +3258,8 @@
status=MagickFalse;
}
} /* y */
- q_view=DestroyCacheView(q_view);
- p_view=DestroyCacheView(p_view);
+ morphology_view=DestroyCacheView(morphology_view);
+ image_view=DestroyCacheView(image_view);
return(status ? (ssize_t)changed : -1);
}
@@ -3339,18 +3335,12 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
- register const IndexPacket
- *restrict p_indexes;
-
- register PixelPacket
+ register Quantum
*restrict q;
- register IndexPacket
- *restrict q_indexes;
-
register ssize_t
x;
@@ -3366,16 +3356,14 @@
*/
if (status == MagickFalse)
break;
- p=GetCacheViewVirtualPixels(virt_view, -offx, y-offy, virt_width, (size_t) offy+1,
- exception);
+ p=GetCacheViewVirtualPixels(virt_view,-offx,y-offy,virt_width,(size_t)
+ offy+1,exception);
q=GetCacheViewAuthenticPixels(auth_view, 0, y, image->columns, 1,
- exception);
- if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
+ exception);
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
status=MagickFalse;
if (status == MagickFalse)
break;
- p_indexes=GetCacheViewVirtualIndexQueue(virt_view);
- q_indexes=GetCacheViewAuthenticIndexQueue(auth_view);
/* offset to origin in 'p'. while 'q' points to it directly */
r = (ssize_t) virt_width*offy + offx;
@@ -3391,53 +3379,57 @@
register const double
*restrict k;
- register const PixelPacket
+ register const Quantum
*restrict k_pixels;
- register const IndexPacket
- *restrict k_indexes;
-
- MagickPixelPacket
+ PixelInfo
result;
/* Starting Defaults */
- GetMagickPixelPacket(image,&result);
- SetMagickPixelPacket(image,q,q_indexes,&result);
+ GetPixelInfo(image,&result);
+ SetPixelInfo(image,q,&result);
if ( method != VoronoiMorphology )
- result.opacity = QuantumRange - result.opacity;
+ result.alpha = QuantumRange - result.alpha;
switch ( method ) {
case DistanceMorphology:
/* Add kernel Value and select the minimum value found. */
k = &kernel->values[ kernel->width*kernel->height-1 ];
k_pixels = p;
- k_indexes = p_indexes;
for (v=0; v <= (ssize_t) offy; v++) {
for (u=0; u < (ssize_t) kernel->width; u++, k--) {
if ( IsNan(*k) ) continue;
- Minimize(result.red, (*k)+k_pixels[u].red);
- Minimize(result.green, (*k)+k_pixels[u].green);
- Minimize(result.blue, (*k)+k_pixels[u].blue);
- Minimize(result.opacity, (*k)+QuantumRange-k_pixels[u].opacity);
- if ( image->colorspace == CMYKColorspace)
- Minimize(result.index, (*k)+GetPixelIndex(k_indexes+u));
+ Minimize(result.red, (*k)+
+ GetPixelRed(image,k_pixels+u*GetPixelChannels(image)));
+ Minimize(result.green, (*k)+
+ GetPixelGreen(image,k_pixels+u*GetPixelChannels(image)));
+ Minimize(result.blue, (*k)+
+ GetPixelBlue(image,k_pixels+u*GetPixelChannels(image)));
+ if (image->colorspace == CMYKColorspace)
+ Minimize(result.black,(*k)+
+ GetPixelBlue(image,k_pixels+u*GetPixelChannels(image)));
+ Minimize(result.alpha, (*k)+
+ GetPixelAlpha(image,k_pixels+u*GetPixelChannels(image)));
}
- k_pixels += virt_width;
- k_indexes += virt_width;
+ k_pixels += virt_width*GetPixelChannels(image);
}
/* repeat with the just processed pixels of this row */
k = &kernel->values[ kernel->width*(kernel->y+1)-1 ];
k_pixels = q-offx;
- k_indexes = q_indexes-offx;
for (u=0; u < (ssize_t) offx; u++, k--) {
if ( x+u-offx < 0 ) continue; /* off the edge! */
if ( IsNan(*k) ) continue;
- Minimize(result.red, (*k)+k_pixels[u].red);
- Minimize(result.green, (*k)+k_pixels[u].green);
- Minimize(result.blue, (*k)+k_pixels[u].blue);
- Minimize(result.opacity, (*k)+QuantumRange-k_pixels[u].opacity);
- if ( image->colorspace == CMYKColorspace)
- Minimize(result.index, (*k)+GetPixelIndex(k_indexes+u));
+ Minimize(result.red, (*k)+
+ GetPixelRed(image,k_pixels+u*GetPixelChannels(image)));
+ Minimize(result.green, (*k)+
+ GetPixelGreen(image,k_pixels+u*GetPixelChannels(image)));
+ Minimize(result.blue, (*k)+
+ GetPixelBlue(image,k_pixels+u*GetPixelChannels(image)));
+ if (image->colorspace == CMYKColorspace)
+ Minimize(result.black,(*k)+
+ GetPixelBlack(image,k_pixels+u*GetPixelChannels(image)));
+ Minimize(result.alpha,(*k)+
+ GetPixelAlpha(image,k_pixels+u*GetPixelChannels(image)));
}
break;
case VoronoiMorphology:
@@ -3448,32 +3440,29 @@
*/
k = &kernel->values[ kernel->width*kernel->height-1 ];
k_pixels = p;
- k_indexes = p_indexes;
for (v=0; v <= (ssize_t) offy; v++) {
for (u=0; u < (ssize_t) kernel->width; u++, k--) {
if ( IsNan(*k) ) continue;
- if( result.opacity > (*k)+k_pixels[u].opacity )
+ if( result.alpha > (*k)+GetPixelAlpha(image,k_pixels+u*GetPixelChannels(image)) )
{
- SetMagickPixelPacket(image,&k_pixels[u],&k_indexes[u],
+ SetPixelInfo(image,k_pixels+u*GetPixelChannels(image),
&result);
- result.opacity += *k;
+ result.alpha += *k;
}
}
- k_pixels += virt_width;
- k_indexes += virt_width;
+ k_pixels += virt_width*GetPixelChannels(image);
}
/* repeat with the just processed pixels of this row */
k = &kernel->values[ kernel->width*(kernel->y+1)-1 ];
k_pixels = q-offx;
- k_indexes = q_indexes-offx;
for (u=0; u < (ssize_t) offx; u++, k--) {
if ( x+u-offx < 0 ) continue; /* off the edge! */
if ( IsNan(*k) ) continue;
- if( result.opacity > (*k)+k_pixels[u].opacity )
+ if( result.alpha > (*k)+GetPixelAlpha(image,k_pixels+u*GetPixelChannels(image)) )
{
- SetMagickPixelPacket(image,&k_pixels[u],&k_indexes[u],
+ SetPixelInfo(image,k_pixels+u*GetPixelChannels(image),
&result);
- result.opacity += *k;
+ result.alpha += *k;
}
}
break;
@@ -3484,33 +3473,33 @@
/* Assign the resulting pixel values - Clamping Result */
switch ( method ) {
case VoronoiMorphology:
- SetPixelPacket(image,&result,q,q_indexes);
+ SetPixelPixelInfo(image,&result,q);
break;
default:
if ((channel & RedChannel) != 0)
- SetPixelRed(q,ClampToQuantum(result.red));
+ SetPixelRed(image,ClampToQuantum(result.red),q);
if ((channel & GreenChannel) != 0)
- SetPixelGreen(q,ClampToQuantum(result.green));
+ SetPixelGreen(image,ClampToQuantum(result.green),q);
if ((channel & BlueChannel) != 0)
- SetPixelBlue(q,ClampToQuantum(result.blue));
+ SetPixelBlue(image,ClampToQuantum(result.blue),q);
+ if (((channel & BlackChannel) != 0) &&
+ (image->colorspace == CMYKColorspace))
+ SetPixelBlack(image,ClampToQuantum(result.black),q);
if ((channel & OpacityChannel) != 0 && image->matte == MagickTrue )
- SetPixelAlpha(q,ClampToQuantum(result.opacity));
- if ((channel & IndexChannel) != 0
- && image->colorspace == CMYKColorspace)
- SetPixelIndex(q_indexes+x,ClampToQuantum(result.index));
+ SetPixelAlpha(image,ClampToQuantum(result.alpha),q);
break;
}
/* Count up changed pixels */
- if ( ( p[r].red != GetPixelRed(q) )
- || ( p[r].green != GetPixelGreen(q) )
- || ( p[r].blue != GetPixelBlue(q) )
- || ( p[r].opacity != GetPixelOpacity(q) )
- || ( image->colorspace == CMYKColorspace &&
- GetPixelIndex(p_indexes+r) != GetPixelIndex(q_indexes+x) ) )
+ if ((GetPixelRed(image,p+r) != GetPixelRed(image,q)) ||
+ (GetPixelGreen(image,p+r) != GetPixelGreen(image,q)) ||
+ (GetPixelBlue(image,p+r) != GetPixelBlue(image,q)) ||
+ (GetPixelAlpha(image,p+r) != GetPixelAlpha(image,q)) ||
+ ((image->colorspace == CMYKColorspace) &&
+ (GetPixelBlack(image,p+r) != GetPixelBlack(image,q))))
changed++; /* The pixel was changed in some way! */
- p++; /* increment pixel buffers */
- q++;
+ p+=GetPixelChannels(image); /* increment pixel buffers */
+ q+=GetPixelChannels(image);
} /* x */
if ( SyncCacheViewAuthenticPixels(auth_view,exception) == MagickFalse)
@@ -3525,18 +3514,12 @@
/* Do the reversed pass through the image */
for (y=(ssize_t)image->rows-1; y >= 0; y--)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
- register const IndexPacket
- *restrict p_indexes;
-
- register PixelPacket
+ register Quantum
*restrict q;
- register IndexPacket
- *restrict q_indexes;
-
register ssize_t
x;
@@ -3552,16 +3535,14 @@
** Only the bottom half of the kernel will be processes as we
** up the image.
*/
- p=GetCacheViewVirtualPixels(virt_view, -offx, y, virt_width, (size_t) kernel->y+1,
- exception);
+ p=GetCacheViewVirtualPixels(virt_view,-offx,y,virt_width,(size_t)
+ kernel->y+1,exception);
q=GetCacheViewAuthenticPixels(auth_view, 0, y, image->columns, 1,
- exception);
- if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
+ exception);
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
status=MagickFalse;
if (status == MagickFalse)
break;
- p_indexes=GetCacheViewVirtualIndexQueue(virt_view);
- q_indexes=GetCacheViewAuthenticIndexQueue(auth_view);
/* adjust positions to end of row */
p += image->columns-1;
@@ -3581,53 +3562,57 @@
register const double
*restrict k;
- register const PixelPacket
+ register const Quantum
*restrict k_pixels;
- register const IndexPacket
- *restrict k_indexes;
-
- MagickPixelPacket
+ PixelInfo
result;
/* Default - previously modified pixel */
- GetMagickPixelPacket(image,&result);
- SetMagickPixelPacket(image,q,q_indexes,&result);
+ GetPixelInfo(image,&result);
+ SetPixelInfo(image,q,&result);
if ( method != VoronoiMorphology )
- result.opacity = QuantumRange - result.opacity;
+ result.alpha = QuantumRange - result.alpha;
switch ( method ) {
case DistanceMorphology:
/* Add kernel Value and select the minimum value found. */
k = &kernel->values[ kernel->width*(kernel->y+1)-1 ];
k_pixels = p;
- k_indexes = p_indexes;
for (v=offy; v < (ssize_t) kernel->height; v++) {
for (u=0; u < (ssize_t) kernel->width; u++, k--) {
if ( IsNan(*k) ) continue;
- Minimize(result.red, (*k)+k_pixels[u].red);
- Minimize(result.green, (*k)+k_pixels[u].green);
- Minimize(result.blue, (*k)+k_pixels[u].blue);
- Minimize(result.opacity, (*k)+QuantumRange-k_pixels[u].opacity);
+ Minimize(result.red, (*k)+
+ GetPixelRed(image,k_pixels+u*GetPixelChannels(image)));
+ Minimize(result.green, (*k)+
+ GetPixelGreen(image,k_pixels+u*GetPixelChannels(image)));
+ Minimize(result.blue, (*k)+
+ GetPixelBlue(image,k_pixels+u*GetPixelChannels(image)));
if ( image->colorspace == CMYKColorspace)
- Minimize(result.index,(*k)+GetPixelIndex(k_indexes+u));
+ Minimize(result.black,(*k)+
+ GetPixelBlack(image,k_pixels+u*GetPixelChannels(image)));
+ Minimize(result.alpha, (*k)+
+ GetPixelAlpha(image,k_pixels+u*GetPixelChannels(image)));
}
- k_pixels += virt_width;
- k_indexes += virt_width;
+ k_pixels += virt_width*GetPixelChannels(image);
}
/* repeat with the just processed pixels of this row */
k = &kernel->values[ kernel->width*(kernel->y)+kernel->x-1 ];
k_pixels = q-offx;
- k_indexes = q_indexes-offx;
for (u=offx+1; u < (ssize_t) kernel->width; u++, k--) {
if ( (x+u-offx) >= (ssize_t)image->columns ) continue;
if ( IsNan(*k) ) continue;
- Minimize(result.red, (*k)+k_pixels[u].red);
- Minimize(result.green, (*k)+k_pixels[u].green);
- Minimize(result.blue, (*k)+k_pixels[u].blue);
- Minimize(result.opacity, (*k)+QuantumRange-k_pixels[u].opacity);
+ Minimize(result.red, (*k)+
+ GetPixelRed(image,k_pixels+u*GetPixelChannels(image)));
+ Minimize(result.green, (*k)+
+ GetPixelGreen(image,k_pixels+u*GetPixelChannels(image)));
+ Minimize(result.blue, (*k)+
+ GetPixelBlue(image,k_pixels+u*GetPixelChannels(image)));
if ( image->colorspace == CMYKColorspace)
- Minimize(result.index, (*k)+GetPixelIndex(k_indexes+u));
+ Minimize(result.black, (*k)+
+ GetPixelBlack(image,k_pixels+u*GetPixelChannels(image)));
+ Minimize(result.alpha, (*k)+
+ GetPixelAlpha(image,k_pixels+u*GetPixelChannels(image)));
}
break;
case VoronoiMorphology:
@@ -3638,32 +3623,29 @@
*/
k = &kernel->values[ kernel->width*(kernel->y+1)-1 ];
k_pixels = p;
- k_indexes = p_indexes;
for (v=offy; v < (ssize_t) kernel->height; v++) {
for (u=0; u < (ssize_t) kernel->width; u++, k--) {
if ( IsNan(*k) ) continue;
- if( result.opacity > (*k)+k_pixels[u].opacity )
+ if( result.alpha > (*k)+GetPixelAlpha(image,k_pixels+u*GetPixelChannels(image)) )
{
- SetMagickPixelPacket(image,&k_pixels[u],&k_indexes[u],
+ SetPixelInfo(image,k_pixels+u*GetPixelChannels(image),
&result);
- result.opacity += *k;
+ result.alpha += *k;
}
}
- k_pixels += virt_width;
- k_indexes += virt_width;
+ k_pixels += virt_width*GetPixelChannels(image);
}
/* repeat with the just processed pixels of this row */
k = &kernel->values[ kernel->width*(kernel->y)+kernel->x-1 ];
k_pixels = q-offx;
- k_indexes = q_indexes-offx;
for (u=offx+1; u < (ssize_t) kernel->width; u++, k--) {
if ( (x+u-offx) >= (ssize_t)image->columns ) continue;
if ( IsNan(*k) ) continue;
- if( result.opacity > (*k)+k_pixels[u].opacity )
+ if( result.alpha > (*k)+GetPixelAlpha(image,k_pixels+u*GetPixelChannels(image)) )
{
- SetMagickPixelPacket(image,&k_pixels[u],&k_indexes[u],
+ SetPixelInfo(image,k_pixels+u*GetPixelChannels(image),
&result);
- result.opacity += *k;
+ result.alpha += *k;
}
}
break;
@@ -3674,29 +3656,29 @@
/* Assign the resulting pixel values - Clamping Result */
switch ( method ) {
case VoronoiMorphology:
- SetPixelPacket(image,&result,q,q_indexes);
+ SetPixelPixelInfo(image,&result,q);
break;
default:
if ((channel & RedChannel) != 0)
- SetPixelRed(q,ClampToQuantum(result.red));
+ SetPixelRed(image,ClampToQuantum(result.red),q);
if ((channel & GreenChannel) != 0)
- SetPixelGreen(q,ClampToQuantum(result.green));
+ SetPixelGreen(image,ClampToQuantum(result.green),q);
if ((channel & BlueChannel) != 0)
- SetPixelBlue(q,ClampToQuantum(result.blue));
+ SetPixelBlue(image,ClampToQuantum(result.blue),q);
+ if (((channel & BlackChannel) != 0) &&
+ (image->colorspace == CMYKColorspace))
+ SetPixelBlack(image,ClampToQuantum(result.black),q);
if ((channel & OpacityChannel) != 0 && image->matte == MagickTrue )
- SetPixelAlpha(q,ClampToQuantum(result.opacity));
- if ((channel & IndexChannel) != 0
- && image->colorspace == CMYKColorspace)
- SetPixelIndex(q_indexes+x,ClampToQuantum(result.index));
+ SetPixelAlpha(image,ClampToQuantum(result.alpha),q);
break;
}
/* Count up changed pixels */
- if ( ( p[r].red != GetPixelRed(q) )
- || ( p[r].green != GetPixelGreen(q) )
- || ( p[r].blue != GetPixelBlue(q) )
- || ( p[r].opacity != GetPixelOpacity(q) )
- || ( image->colorspace == CMYKColorspace &&
- GetPixelIndex(p_indexes+r) != GetPixelIndex(q_indexes+x) ) )
+ if ( (GetPixelRed(image,p+r) != GetPixelRed(image,q))
+ || (GetPixelGreen(image,p+r) != GetPixelGreen(image,q))
+ || (GetPixelBlue(image,p+r) != GetPixelBlue(image,q))
+ || (GetPixelAlpha(image,p+r) != GetPixelAlpha(image,q))
+ || ((image->colorspace == CMYKColorspace) &&
+ (GetPixelBlack(image,p+r) != GetPixelBlack(image,q))))
changed++; /* The pixel was changed in some way! */
p--; /* go backward through pixel buffers */
@@ -4426,7 +4408,7 @@
if ( 45.0 < fmod(angle, 180.0) && fmod(angle,180.0) <= 135.0 )
{
if ( kernel->width == 1 || kernel->height == 1 )
- { /* Do a transpose of a 1-dimensional kernel,
+ { /* Do a transpose of a 1 dimensional kernel,
** which results in a fast 90 degree rotation of some type.
*/
ssize_t
diff --git a/magick/morphology.h b/MagickCore/morphology.h
similarity index 98%
rename from magick/morphology.h
rename to MagickCore/morphology.h
index f215cca..fc0e242 100644
--- a/magick/morphology.h
+++ b/MagickCore/morphology.h
@@ -22,7 +22,7 @@
extern "C" {
#endif
-#include <magick/geometry.h>
+#include <MagickCore/geometry.h>
typedef enum
{
@@ -125,7 +125,6 @@
signature;
} KernelInfo;
-
extern MagickExport KernelInfo
*AcquireKernelInfo(const char *),
*AcquireKernelBuiltIn(const KernelInfoType,const GeometryInfo *),
diff --git a/magick/nt-base.c b/MagickCore/nt-base.c
similarity index 99%
rename from magick/nt-base.c
rename to MagickCore/nt-base.c
index b9b89a6..38a00aa 100644
--- a/magick/nt-base.c
+++ b/MagickCore/nt-base.c
@@ -38,22 +38,22 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
+#include "MagickCore/studio.h"
#if defined(MAGICKCORE_WINDOWS_SUPPORT)
-#include "magick/client.h"
-#include "magick/locale_.h"
-#include "magick/log.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/resource_.h"
-#include "magick/timer.h"
-#include "magick/string_.h"
-#include "magick/utility.h"
-#include "magick/version.h"
+#include "MagickCore/client.h"
+#include "MagickCore/locale_.h"
+#include "MagickCore/log.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/timer.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/utility.h"
+#include "MagickCore/version.h"
#if defined(MAGICKCORE_LTDL_DELEGATE)
# include "ltdl.h"
#endif
-#include "magick/nt-base.h"
+#include "MagickCore/nt-base.h"
#if defined(MAGICKCORE_CIPHER_SUPPORT)
#include <ntsecapi.h>
#include <wincrypt.h>
diff --git a/magick/nt-base.h b/MagickCore/nt-base.h
similarity index 97%
rename from magick/nt-base.h
rename to MagickCore/nt-base.h
index cdf5e66..b6778ac 100644
--- a/magick/nt-base.h
+++ b/MagickCore/nt-base.h
@@ -22,9 +22,9 @@
extern "C" {
#endif
-#include "magick/delegate.h"
-#include "magick/delegate-private.h"
-#include "magick/exception.h"
+#include "MagickCore/delegate.h"
+#include "MagickCore/delegate-private.h"
+#include "MagickCore/exception.h"
#define WIN32_LEAN_AND_MEAN
#define VC_EXTRALEAN
@@ -75,10 +75,8 @@
#endif
#if !defined(access)
-#if defined(_VISUALC_) && (_MSC_VER >= 1400)
# define access(path,mode) _access_s(path,mode)
#endif
-#endif
#if !defined(chdir)
# define chdir _chdir
#endif
@@ -98,6 +96,8 @@
#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(Windows95) && \
!(defined(_MSC_VER) && (_MSC_VER < 1400)) && (__MSVCRT_VERSION__ < 0x800)
# define fseek _fseeki64
+#else
+# define fseek _fseek
#endif
#endif
#if !defined(fstat) && !defined(__BORLANDC__)
@@ -115,6 +115,8 @@
#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(Windows95) && \
!(defined(_MSC_VER) && (_MSC_VER < 1400)) && (__MSVCRT_VERSION__ < 0x800)
# define ftell _ftelli64
+#else
+# define ftell _ftell
#endif
#endif
#if !defined(ftruncate)
diff --git a/magick/nt-feature.c b/MagickCore/nt-feature.c
similarity index 94%
rename from magick/nt-feature.c
rename to MagickCore/nt-feature.c
index da34633..98391ab 100644
--- a/magick/nt-feature.c
+++ b/MagickCore/nt-feature.c
@@ -40,26 +40,26 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
+#include "MagickCore/studio.h"
#if defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__)
#define WIN32_LEAN_AND_MEAN
#define VC_EXTRALEAN
#include <windows.h>
-#include "magick/cache.h"
-#include "magick/colorspace.h"
-#include "magick/draw.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image-private.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/quantum.h"
-#include "magick/string_.h"
-#include "magick/token.h"
-#include "magick/splay-tree.h"
-#include "magick/utility.h"
-#include "magick/nt-feature.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/draw.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/quantum.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/token.h"
+#include "MagickCore/splay-tree.h"
+#include "MagickCore/utility.h"
+#include "MagickCore/nt-feature.h"
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -112,7 +112,7 @@
RectangleInfo
page;
- register const PixelPacket
+ register const Quantum
*p;
register RGBQUAD
@@ -184,7 +184,7 @@
for (y=0; y < (ssize_t) page.height; y++)
{
p=GetVirtualPixels(image,page.x,page.y+y,page.width,1,exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
#if MAGICKCORE_QUANTUM_DEPTH == 8
@@ -200,9 +200,9 @@
/* Transfer pixels, scaling to Quantum */
for( x=(ssize_t) page.width ; x> 0 ; x-- )
{
- q->rgbRed = ScaleQuantumToChar(GetPixelRed(p));
- q->rgbGreen = ScaleQuantumToChar(GetPixelGreen(p));
- q->rgbBlue = ScaleQuantumToChar(GetPixelBlue(p));
+ q->rgbRed = ScaleQuantumToChar(GetPixelRed(image,p));
+ q->rgbGreen = ScaleQuantumToChar(GetPixelGreen(image,p));
+ q->rgbBlue = ScaleQuantumToChar(GetPixelBlue(image,p));
q->rgbReserved = 0;
++q;
++p;
@@ -595,7 +595,7 @@
register ssize_t
x;
- register const PixelPacket
+ register const Quantum
*p;
register RGBQUAD
@@ -640,15 +640,15 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- q->rgbRed=ScaleQuantumToChar(GetPixelRed(p));
- q->rgbGreen=ScaleQuantumToChar(GetPixelGreen(p));
- q->rgbBlue=ScaleQuantumToChar(GetPixelBlue(p));
+ q->rgbRed=ScaleQuantumToChar(GetPixelRed(image,p));
+ q->rgbGreen=ScaleQuantumToChar(GetPixelGreen(image,p));
+ q->rgbBlue=ScaleQuantumToChar(GetPixelBlue(image,p));
q->rgbReserved=0;
- p++;
+ p+=GetPixelChannels(image);
q++;
}
}
diff --git a/magick/nt-feature.h b/MagickCore/nt-feature.h
similarity index 96%
rename from magick/nt-feature.h
rename to MagickCore/nt-feature.h
index 026004a..3a44263 100644
--- a/magick/nt-feature.h
+++ b/MagickCore/nt-feature.h
@@ -22,7 +22,7 @@
extern "C" {
#endif
-#include "magick/splay-tree.h"
+#include "MagickCore/splay-tree.h"
extern MagickExport void
*CropImageToHBITMAP(Image *,const RectangleInfo *,ExceptionInfo *),
diff --git a/magick/option.c b/MagickCore/option.c
similarity index 98%
rename from magick/option.c
rename to MagickCore/option.c
index 0145cdb..37cfb26 100644
--- a/magick/option.c
+++ b/MagickCore/option.c
@@ -40,40 +40,40 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/artifact.h"
-#include "magick/cache.h"
-#include "magick/color.h"
-#include "magick/compare.h"
-#include "magick/constitute.h"
-#include "magick/distort.h"
-#include "magick/draw.h"
-#include "magick/effect.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/fx.h"
-#include "magick/gem.h"
-#include "magick/geometry.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/layer.h"
-#include "magick/mime-private.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/montage.h"
-#include "magick/morphology.h"
-#include "magick/option.h"
-#include "magick/policy.h"
-#include "magick/property.h"
-#include "magick/quantize.h"
-#include "magick/quantum.h"
-#include "magick/resample.h"
-#include "magick/resource_.h"
-#include "magick/splay-tree.h"
-#include "magick/statistic.h"
-#include "magick/string_.h"
-#include "magick/token.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/artifact.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/color.h"
+#include "MagickCore/compare.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/distort.h"
+#include "MagickCore/draw.h"
+#include "MagickCore/effect.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/fx.h"
+#include "MagickCore/gem.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/layer.h"
+#include "MagickCore/mime-private.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/montage.h"
+#include "MagickCore/morphology.h"
+#include "MagickCore/option.h"
+#include "MagickCore/policy.h"
+#include "MagickCore/property.h"
+#include "MagickCore/quantize.h"
+#include "MagickCore/quantum.h"
+#include "MagickCore/resample.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/splay-tree.h"
+#include "MagickCore/statistic.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/token.h"
+#include "MagickCore/utility.h"
/*
ImageMagick options.
@@ -127,7 +127,6 @@
{ "Gray", GrayChannel, UndefinedOptionFlag, MagickFalse },
{ "Green", GreenChannel, UndefinedOptionFlag, MagickFalse },
{ "Hue", RedChannel, UndefinedOptionFlag, MagickFalse },
- { "Index", IndexChannel, UndefinedOptionFlag, MagickFalse },
{ "Lightness", BlueChannel, UndefinedOptionFlag, MagickFalse },
{ "Luminance", BlueChannel, UndefinedOptionFlag, MagickFalse },
{ "Luminosity", BlueChannel, DeprecateOptionFlag, MagickTrue },
@@ -794,10 +793,8 @@
{ "Src", SrcCompositeOp, UndefinedOptionFlag, MagickFalse },
{ "VividLight", VividLightCompositeOp, UndefinedOptionFlag, MagickFalse },
{ "Xor", XorCompositeOp, UndefinedOptionFlag, MagickFalse },
- { "Add", AddCompositeOp, DeprecateOptionFlag, MagickTrue },
{ "Divide", DivideDstCompositeOp, DeprecateOptionFlag, MagickTrue },
{ "Minus", MinusDstCompositeOp, DeprecateOptionFlag, MagickTrue },
- { "Subtract", SubtractCompositeOp, DeprecateOptionFlag, MagickTrue },
{ "Threshold", ThresholdCompositeOp, DeprecateOptionFlag, MagickTrue },
{ (char *) NULL, UndefinedCompositeOp, UndefinedOptionFlag, MagickFalse }
},
@@ -2204,12 +2201,6 @@
channel|=GreenChannel;
break;
}
- case 'I':
- case 'i':
- {
- channel|=IndexChannel;
- break;
- }
case 'K':
case 'k':
{
diff --git a/magick/option.h b/MagickCore/option.h
similarity index 100%
rename from magick/option.h
rename to MagickCore/option.h
diff --git a/magick/paint.c b/MagickCore/paint.c
similarity index 83%
rename from magick/paint.c
rename to MagickCore/paint.c
index 372812a..e61431f 100644
--- a/magick/paint.c
+++ b/MagickCore/paint.c
@@ -39,23 +39,23 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/color.h"
-#include "magick/color-private.h"
-#include "magick/colorspace-private.h"
-#include "magick/composite.h"
-#include "magick/composite-private.h"
-#include "magick/draw.h"
-#include "magick/draw-private.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/gem.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/paint.h"
-#include "magick/pixel-private.h"
-#include "magick/string_.h"
-#include "magick/thread-private.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/color.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colorspace-private.h"
+#include "MagickCore/composite.h"
+#include "MagickCore/composite-private.h"
+#include "MagickCore/draw.h"
+#include "MagickCore/draw-private.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/gem.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/paint.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/thread-private.h"
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -84,7 +84,7 @@
%
% MagickBooleanType FloodfillPaintImage(Image *image,
% const ChannelType channel,const DrawInfo *draw_info,
-% const MagickPixelPacket target,const ssize_t x_offset,
+% const PixelInfo target,const ssize_t x_offset,
% const ssize_t y_offset,const MagickBooleanType invert)
%
% A description of each parameter follows:
@@ -104,7 +104,7 @@
*/
MagickExport MagickBooleanType FloodfillPaintImage(Image *image,
const ChannelType channel,const DrawInfo *draw_info,
- const MagickPixelPacket *target,const ssize_t x_offset,const ssize_t y_offset,
+ const PixelInfo *target,const ssize_t x_offset,const ssize_t y_offset,
const MagickBooleanType invert)
{
#define MaxStacksize (1UL << 15)
@@ -138,7 +138,7 @@
MagickBooleanType
skip;
- MagickPixelPacket
+ PixelInfo
fill,
pixel;
@@ -201,22 +201,19 @@
s=segment_stack;
PushSegmentStack(y,x,x,1);
PushSegmentStack(y+1,x,x,-1);
- GetMagickPixelPacket(image,&fill);
- GetMagickPixelPacket(image,&pixel);
+ GetPixelInfo(image,&fill);
+ GetPixelInfo(image,&pixel);
image_view=AcquireCacheView(image);
floodplane_view=AcquireCacheView(floodplane_image);
while (s > segment_stack)
{
- register const IndexPacket
- *restrict indexes;
-
- register const PixelPacket
+ register const Quantum
*restrict p;
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
/*
@@ -233,21 +230,20 @@
p=GetCacheViewVirtualPixels(image_view,0,y,(size_t) (x1+1),1,exception);
q=GetCacheViewAuthenticPixels(floodplane_view,0,y,(size_t) (x1+1),1,
exception);
- if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
- indexes=GetCacheViewVirtualIndexQueue(image_view);
- p+=x1;
- q+=x1;
+ p+=x1*GetPixelChannels(image);
+ q+=x1*GetPixelChannels(floodplane_image);
for (x=x1; x >= 0; x--)
{
- if (q->opacity == (Quantum) TransparentOpacity)
+ if (GetPixelAlpha(image,q) == TransparentAlpha)
break;
- SetMagickPixelPacket(image,p,indexes+x,&pixel);
- if (IsMagickColorSimilar(&pixel,target) == invert)
+ SetPixelInfo(image,p,&pixel);
+ if (IsFuzzyEquivalencePixelInfo(&pixel,target) == invert)
break;
- q->opacity=(Quantum) TransparentOpacity;
- p--;
- q--;
+ SetPixelAlpha(floodplane_image,TransparentAlpha,q);
+ p-=GetPixelChannels(image);
+ q-=GetPixelChannels(floodplane_image);
}
if (SyncCacheViewAuthenticPixels(floodplane_view,exception) == MagickFalse)
break;
@@ -269,20 +265,20 @@
exception);
q=GetCacheViewAuthenticPixels(floodplane_view,x,y,
image->columns-x,1,exception);
- if ((p == (const PixelPacket *) NULL) ||
- (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) ||
+ (q == (Quantum *) NULL))
break;
- indexes=GetCacheViewVirtualIndexQueue(image_view);
for ( ; x < (ssize_t) image->columns; x++)
{
- if (q->opacity == (Quantum) TransparentOpacity)
+ if (GetPixelAlpha(image,q) == TransparentAlpha)
break;
- SetMagickPixelPacket(image,p,indexes+x,&pixel);
- if (IsMagickColorSimilar(&pixel,target) == invert)
+ SetPixelInfo(image,p,&pixel);
+ if (IsFuzzyEquivalencePixelInfo(&pixel,target) == invert)
break;
- q->opacity=(Quantum) TransparentOpacity;
- p++;
- q++;
+ SetPixelAlpha(floodplane_image,
+ TransparentAlpha,q);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(floodplane_image);
}
if (SyncCacheViewAuthenticPixels(floodplane_view,exception) == MagickFalse)
break;
@@ -299,18 +295,18 @@
exception);
q=GetCacheViewAuthenticPixels(floodplane_view,x,y,(size_t) (x2-x+1),1,
exception);
- if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) ||
+ (q == (Quantum *) NULL))
break;
- indexes=GetCacheViewVirtualIndexQueue(image_view);
for ( ; x <= x2; x++)
{
- if (q->opacity == (Quantum) TransparentOpacity)
+ if (GetPixelAlpha(image,q) == TransparentAlpha)
break;
- SetMagickPixelPacket(image,p,indexes+x,&pixel);
- if (IsMagickColorSimilar(&pixel,target) != invert)
+ SetPixelInfo(image,p,&pixel);
+ if (IsFuzzyEquivalencePixelInfo(&pixel,target) != invert)
break;
- p++;
- q++;
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(floodplane_image);
}
}
start=x;
@@ -318,16 +314,13 @@
}
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
- register IndexPacket
- *restrict indexes;
-
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
/*
@@ -336,31 +329,30 @@
p=GetCacheViewVirtualPixels(floodplane_view,0,y,image->columns,1,
exception);
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
- if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
- if (GetPixelOpacity(p) != OpaqueOpacity)
+ if (GetPixelAlpha(floodplane_image,p) != OpaqueAlpha)
{
(void) GetFillColor(draw_info,x,y,&fill_color);
- SetMagickPixelPacket(image,&fill_color,(IndexPacket *) NULL,&fill);
+ SetPixelInfoPacket(image,&fill_color,&fill);
if (image->colorspace == CMYKColorspace)
ConvertRGBToCMYK(&fill);
if ((channel & RedChannel) != 0)
- SetPixelRed(q,ClampToQuantum(fill.red));
+ SetPixelRed(image,ClampToQuantum(fill.red),q);
if ((channel & GreenChannel) != 0)
- SetPixelGreen(q,ClampToQuantum(fill.green));
+ SetPixelGreen(image,ClampToQuantum(fill.green),q);
if ((channel & BlueChannel) != 0)
- SetPixelBlue(q,ClampToQuantum(fill.blue));
- if ((channel & OpacityChannel) != 0)
- SetPixelOpacity(q,ClampToQuantum(fill.opacity));
- if (((channel & IndexChannel) != 0) &&
+ SetPixelBlue(image,ClampToQuantum(fill.blue),q);
+ if (((channel & BlackChannel) != 0) &&
(image->colorspace == CMYKColorspace))
- SetPixelIndex(indexes+x,ClampToQuantum(fill.index));
+ SetPixelBlack(image,ClampToQuantum(fill.black),q);
+ if ((channel & AlphaChannel) != 0)
+ SetPixelAlpha(image,ClampToQuantum(fill.alpha),q);
}
- p++;
- q++;
+ p+=GetPixelChannels(floodplane_image);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
break;
@@ -407,8 +399,6 @@
%
% o stop_color: the stop color.
%
-% This provides a good example of making use of the DrawGradientImage
-% function and the gradient structure in draw_info.
*/
static inline double MagickMax(const double x,const double y)
@@ -466,23 +456,20 @@
(void) ResetMagickMemory(gradient->stops,0,gradient->number_stops*
sizeof(*gradient->stops));
for (i=0; i < (ssize_t) gradient->number_stops; i++)
- GetMagickPixelPacket(image,&gradient->stops[i].color);
- SetMagickPixelPacket(image,start_color,(IndexPacket *) NULL,
- &gradient->stops[0].color);
+ GetPixelInfo(image,&gradient->stops[i].color);
+ SetPixelInfoPacket(image,start_color,&gradient->stops[0].color);
gradient->stops[0].offset=0.0;
- SetMagickPixelPacket(image,stop_color,(IndexPacket *) NULL,
- &gradient->stops[1].color);
+ SetPixelInfoPacket(image,stop_color,&gradient->stops[1].color);
gradient->stops[1].offset=1.0;
/*
Draw a gradient on the image.
*/
status=DrawGradientImage(image,draw_info);
draw_info=DestroyDrawInfo(draw_info);
- if ((start_color->opacity == OpaqueOpacity) &&
- (stop_color->opacity == OpaqueOpacity))
+ if ((start_color->alpha == OpaqueAlpha) && (stop_color->alpha == OpaqueAlpha))
image->matte=MagickFalse;
- if ((IsGrayPixel(start_color) != MagickFalse) &&
- (IsGrayPixel(stop_color) != MagickFalse))
+ if ((IsPixelPacketGray(start_color) != MagickFalse) &&
+ (IsPixelPacketGray(stop_color) != MagickFalse))
image->type=GrayscaleType;
return(status);
}
@@ -618,19 +605,13 @@
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const IndexPacket
- *restrict indexes;
-
- register const PixelPacket
+ register const Quantum
*restrict p;
- register IndexPacket
- *restrict paint_indexes;
-
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
register size_t
@@ -642,13 +623,11 @@
(width/2L),image->columns+width,width,exception);
q=QueueCacheViewAuthenticPixels(paint_view,0,y,paint_image->columns,1,
exception);
- if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewVirtualIndexQueue(image_view);
- paint_indexes=GetCacheViewAuthenticIndexQueue(paint_view);
histogram=histograms[GetOpenMPThreadId()];
for (x=0; x < (ssize_t) image->columns; x++)
{
@@ -675,7 +654,7 @@
{
for (u=0; u < (ssize_t) width; u++)
{
- k=(ssize_t) ScaleQuantumToChar(PixelIntensityToQuantum(p+u+i));
+ k=(ssize_t) ScaleQuantumToChar(GetPixelIntensity(image,p+u+i));
histogram[k]++;
if (histogram[k] > count)
{
@@ -685,12 +664,20 @@
}
i+=(ssize_t) (image->columns+width);
}
- *q=(*(p+j));
+ SetPixelRed(paint_image,GetPixelRed(image,p+j*
+ GetPixelChannels(image)),q);
+ SetPixelGreen(paint_image,GetPixelGreen(image,p+j*
+ GetPixelChannels(image)),q);
+ SetPixelBlue(paint_image,GetPixelBlue(image,p+j*
+ GetPixelChannels(image)),q);
if (image->colorspace == CMYKColorspace)
- SetPixelIndex(paint_indexes+x,GetPixelIndex(
- indexes+x+j));
- p++;
- q++;
+ SetPixelBlack(paint_image,GetPixelBlack(image,p+j*
+ GetPixelChannels(image)),q);
+ if (image->matte != MagickFalse)
+ SetPixelAlpha(paint_image,GetPixelAlpha(image,p+j*
+ GetPixelChannels(image)),q);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(paint_image);
}
if (SyncCacheViewAuthenticPixels(paint_view,exception) == MagickFalse)
status=MagickFalse;
@@ -759,15 +746,15 @@
*/
MagickExport MagickBooleanType OpaquePaintImage(Image *image,
- const MagickPixelPacket *target,const MagickPixelPacket *fill,
+ const PixelInfo *target,const PixelInfo *fill,
const MagickBooleanType invert)
{
return(OpaquePaintImageChannel(image,CompositeChannels,target,fill,invert));
}
MagickExport MagickBooleanType OpaquePaintImageChannel(Image *image,
- const ChannelType channel,const MagickPixelPacket *target,
- const MagickPixelPacket *fill,const MagickBooleanType invert)
+ const ChannelType channel,const PixelInfo *target,
+ const PixelInfo *fill,const MagickBooleanType invert)
{
#define OpaquePaintImageTag "Opaque/Image"
@@ -783,7 +770,7 @@
MagickOffsetType
progress;
- MagickPixelPacket
+ PixelInfo
zero;
ssize_t
@@ -791,8 +778,8 @@
assert(image != (Image *) NULL);
assert(image->signature == MagickSignature);
- assert(target != (MagickPixelPacket *) NULL);
- assert(fill != (MagickPixelPacket *) NULL);
+ assert(target != (PixelInfo *) NULL);
+ assert(fill != (PixelInfo *) NULL);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if (SetImageStorageClass(image,DirectClass) == MagickFalse)
@@ -803,53 +790,49 @@
status=MagickTrue;
progress=0;
exception=(&image->exception);
- GetMagickPixelPacket(image,&zero);
+ GetPixelInfo(image,&zero);
image_view=AcquireCacheView(image);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(dynamic,4) shared(progress,status)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- MagickPixelPacket
+ PixelInfo
pixel;
- register IndexPacket
- *restrict indexes;
-
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
pixel=zero;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetMagickPixelPacket(image,q,indexes+x,&pixel);
- if (IsMagickColorSimilar(&pixel,target) != invert)
+ SetPixelInfo(image,q,&pixel);
+ if (IsFuzzyEquivalencePixelInfo(&pixel,target) != invert)
{
if ((channel & RedChannel) != 0)
- SetPixelRed(q,ClampToQuantum(fill->red));
+ SetPixelRed(image,ClampToQuantum(fill->red),q);
if ((channel & GreenChannel) != 0)
- SetPixelGreen(q,ClampToQuantum(fill->green));
+ SetPixelGreen(image,ClampToQuantum(fill->green),q);
if ((channel & BlueChannel) != 0)
- SetPixelBlue(q,ClampToQuantum(fill->blue));
- if ((channel & OpacityChannel) != 0)
- SetPixelOpacity(q,ClampToQuantum(fill->opacity));
- if (((channel & IndexChannel) != 0) &&
+ SetPixelBlue(image,ClampToQuantum(fill->blue),q);
+ if (((channel & BlackChannel) != 0) &&
(image->colorspace == CMYKColorspace))
- SetPixelIndex(indexes+x,ClampToQuantum(fill->index));
+ SetPixelBlack(image,ClampToQuantum(fill->black),q);
+ if ((channel & AlphaChannel) != 0)
+ SetPixelAlpha(image,ClampToQuantum(fill->alpha),q);
}
- q++;
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -894,7 +877,7 @@
% The format of the TransparentPaintImage method is:
%
% MagickBooleanType TransparentPaintImage(Image *image,
-% const MagickPixelPacket *target,const Quantum opacity,
+% const PixelInfo *target,const Quantum opacity,
% const MagickBooleanType invert)
%
% A description of each parameter follows:
@@ -909,7 +892,7 @@
%
*/
MagickExport MagickBooleanType TransparentPaintImage(Image *image,
- const MagickPixelPacket *target,const Quantum opacity,
+ const PixelInfo *target,const Quantum opacity,
const MagickBooleanType invert)
{
#define TransparentPaintImageTag "Transparent/Image"
@@ -926,7 +909,7 @@
MagickOffsetType
progress;
- MagickPixelPacket
+ PixelInfo
zero;
ssize_t
@@ -934,7 +917,7 @@
assert(image != (Image *) NULL);
assert(image->signature == MagickSignature);
- assert(target != (MagickPixelPacket *) NULL);
+ assert(target != (PixelInfo *) NULL);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if (SetImageStorageClass(image,DirectClass) == MagickFalse)
@@ -947,41 +930,37 @@
status=MagickTrue;
progress=0;
exception=(&image->exception);
- GetMagickPixelPacket(image,&zero);
+ GetPixelInfo(image,&zero);
image_view=AcquireCacheView(image);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp parallel for schedule(dynamic,4) shared(progress,status)
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- MagickPixelPacket
+ PixelInfo
pixel;
- register IndexPacket
- *restrict indexes;
-
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
pixel=zero;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetMagickPixelPacket(image,q,indexes+x,&pixel);
- if (IsMagickColorSimilar(&pixel,target) != invert)
- q->opacity=opacity;
- q++;
+ SetPixelInfo(image,q,&pixel);
+ if (IsFuzzyEquivalencePixelInfo(&pixel,target) != invert)
+ SetPixelAlpha(image,opacity,q);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -1027,7 +1006,7 @@
% The format of the TransparentPaintImage method is:
%
% MagickBooleanType TransparentPaintImage(Image *image,
-% const MagickPixelPacket *low,const MagickPixelPacket *hight,
+% const PixelInfo *low,const PixelInfo *hight,
% const Quantum opacity,const MagickBooleanType invert)
%
% A description of each parameter follows:
@@ -1044,7 +1023,7 @@
%
*/
MagickExport MagickBooleanType TransparentPaintImageChroma(Image *image,
- const MagickPixelPacket *low,const MagickPixelPacket *high,
+ const PixelInfo *low,const PixelInfo *high,
const Quantum opacity,const MagickBooleanType invert)
{
#define TransparentPaintImageTag "Transparent/Image"
@@ -1066,14 +1045,14 @@
assert(image != (Image *) NULL);
assert(image->signature == MagickSignature);
- assert(high != (MagickPixelPacket *) NULL);
- assert(low != (MagickPixelPacket *) NULL);
+ assert(high != (PixelInfo *) NULL);
+ assert(low != (PixelInfo *) NULL);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if (SetImageStorageClass(image,DirectClass) == MagickFalse)
return(MagickFalse);
if (image->matte == MagickFalse)
- (void) SetImageAlphaChannel(image,ResetAlphaChannel);
+ (void) SetImageAlphaChannel(image,OpaqueAlphaChannel);
/*
Make image color transparent.
*/
@@ -1089,38 +1068,34 @@
MagickBooleanType
match;
- MagickPixelPacket
+ PixelInfo
pixel;
- register IndexPacket
- *restrict indexes;
-
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
- GetMagickPixelPacket(image,&pixel);
+ GetPixelInfo(image,&pixel);
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetMagickPixelPacket(image,q,indexes+x,&pixel);
+ SetPixelInfo(image,q,&pixel);
match=((pixel.red >= low->red) && (pixel.red <= high->red) &&
(pixel.green >= low->green) && (pixel.green <= high->green) &&
(pixel.blue >= low->blue) && (pixel.blue <= high->blue)) ?
MagickTrue : MagickFalse;
if (match != invert)
- q->opacity=opacity;
- q++;
+ SetPixelAlpha(image,opacity,q);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
diff --git a/magick/paint.h b/MagickCore/paint.h
similarity index 70%
rename from magick/paint.h
rename to MagickCore/paint.h
index e70a0f3..24709b9 100644
--- a/magick/paint.h
+++ b/MagickCore/paint.h
@@ -22,26 +22,26 @@
extern "C" {
#endif
-#include "magick/color.h"
-#include "magick/draw.h"
+#include "MagickCore/color.h"
+#include "MagickCore/draw.h"
extern MagickExport Image
*OilPaintImage(const Image *,const double,ExceptionInfo *);
extern MagickExport MagickBooleanType
FloodfillPaintImage(Image *,const ChannelType,const DrawInfo *,
- const MagickPixelPacket *,const ssize_t,const ssize_t,
+ const PixelInfo *,const ssize_t,const ssize_t,
const MagickBooleanType),
GradientImage(Image *,const GradientType,const SpreadMethod,
const PixelPacket *,const PixelPacket *),
- OpaquePaintImage(Image *,const MagickPixelPacket *,const MagickPixelPacket *,
+ OpaquePaintImage(Image *,const PixelInfo *,const PixelInfo *,
const MagickBooleanType),
- OpaquePaintImageChannel(Image *,const ChannelType,const MagickPixelPacket *,
- const MagickPixelPacket *,const MagickBooleanType),
- TransparentPaintImage(Image *,const MagickPixelPacket *,
+ OpaquePaintImageChannel(Image *,const ChannelType,const PixelInfo *,
+ const PixelInfo *,const MagickBooleanType),
+ TransparentPaintImage(Image *,const PixelInfo *,
const Quantum,const MagickBooleanType),
- TransparentPaintImageChroma(Image *,const MagickPixelPacket *,
- const MagickPixelPacket *,const Quantum,const MagickBooleanType);
+ TransparentPaintImageChroma(Image *,const PixelInfo *,
+ const PixelInfo *,const Quantum,const MagickBooleanType);
#if defined(__cplusplus) || defined(c_plusplus)
}
diff --git a/MagickCore/pixel-accessor.h b/MagickCore/pixel-accessor.h
new file mode 100644
index 0000000..a42b43b
--- /dev/null
+++ b/MagickCore/pixel-accessor.h
@@ -0,0 +1,511 @@
+/*
+ Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization
+ dedicated to making software imaging solutions freely available.
+
+ You may not use this file except in compliance with the License.
+ obtain a copy of the License at
+
+ http://www.imagemagick.org/script/license.php
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ MagickCore pixel accessor methods.
+*/
+#ifndef _MAGICKCORE_PIXEL_ACCESSOR_H
+#define _MAGICKCORE_PIXEL_ACCESSOR_H
+
+#if defined(__cplusplus) || defined(c_plusplus)
+extern "C" {
+#endif
+
+#include <math.h>
+#include <MagickCore/cache-view.h>
+#include <MagickCore/color.h>
+#include <MagickCore/image.h>
+
+static inline Quantum GetPixelAlpha(const Image *image,const Quantum *pixel)
+{
+ return(pixel[image->component_map[AlphaPixelComponent].component]);
+}
+
+static inline Quantum GetPixelBlack(const Image *image,const Quantum *pixel)
+{
+ return(pixel[image->component_map[BlackPixelComponent].component]);
+}
+
+static inline Quantum GetPixelBlue(const Image *image,const Quantum *pixel)
+{
+ return(pixel[image->component_map[BluePixelComponent].component]);
+}
+
+static inline Quantum GetPixelCb(const Image *image,const Quantum *pixel)
+{
+ return(pixel[image->component_map[CbPixelComponent].component]);
+}
+
+static inline size_t GetPixelChannels(const Image *image)
+{
+ return(image->pixel_channels);
+}
+
+static inline Quantum GetPixelCr(const Image *image,const Quantum *pixel)
+{
+ return(pixel[image->component_map[CrPixelComponent].component]);
+}
+
+static inline Quantum GetPixelCyan(const Image *image,const Quantum *pixel)
+{
+ return(pixel[image->component_map[CyanPixelComponent].component]);
+}
+
+static inline Quantum GetPixelGray(const Image *image,const Quantum *pixel)
+{
+ return(pixel[image->component_map[GrayPixelComponent].component]);
+}
+
+static inline Quantum GetPixelGreen(const Image *image,const Quantum *pixel)
+{
+ return(pixel[image->component_map[GreenPixelComponent].component]);
+}
+
+static inline Quantum GetPixelIndex(const Image *image,const Quantum *pixel)
+{
+ return(pixel[image->component_map[IndexPixelComponent].component]);
+}
+
+static inline Quantum GetPixelInfoIntensity(const PixelInfo *pixel_info)
+{
+#if !defined(MAGICKCORE_HDRI_SUPPORT)
+ return((Quantum) (0.299*pixel_info->red+0.587*pixel_info->green+0.114*pixel_info->blue+0.5));
+#else
+ return((Quantum) (0.299*pixel_info->red+0.587*pixel_info->green+0.114*pixel_info->blue));
+#endif
+}
+
+static inline Quantum GetPixelInfoLuminance(const PixelInfo *pixel_info)
+{
+ Quantum
+ luminance;
+
+#if !defined(MAGICKCORE_HDRI_SUPPORT)
+ luminance=(Quantum) (0.21267*pixel_info->red+0.71516*pixel_info->green+
+ 0.07217*pixel_info->blue+0.5);
+#else
+ luminance=(Quantum) (0.21267*pixel_info->red+0.71516*pixel_info->green+
+ 0.07217*pixel_info->blue);
+#endif
+ return((Quantum) luminance);
+}
+
+static inline Quantum GetPixelMagenta(const Image *image,
+ const Quantum *pixel)
+{
+ return(pixel[image->component_map[MagentaPixelComponent].component]);
+}
+
+static inline size_t GetPixelMetacontentExtent(const Image *image)
+{
+ return(image->metacontent_extent);
+}
+
+static inline Quantum GetPixelRed(const Image *image,const Quantum *pixel)
+{
+ return(pixel[image->component_map[RedPixelComponent].component]);
+}
+
+static inline void GetPixelPacket(const Image *image,const Quantum *pixel,
+ PixelPacket *packet)
+{
+ packet->red=GetPixelRed(image,pixel);
+ packet->green=GetPixelGreen(image,pixel);
+ packet->blue=GetPixelBlue(image,pixel);
+ packet->alpha=GetPixelAlpha(image,pixel);
+}
+
+static inline Quantum GetPixelPacketIntensity(const PixelPacket *pixel)
+{
+#if !defined(MAGICKCORE_HDRI_SUPPORT)
+ if ((pixel->red == pixel->green) && (pixel->green == pixel->blue))
+ return(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(pixel->red);
+ return((Quantum) (0.299*pixel->red+0.587*pixel->green+0.114*pixel->blue));
+ }
+#endif
+}
+
+static inline Quantum GetPixelY(const Image *image,const Quantum *pixel)
+{
+ return(pixel[image->component_map[YPixelComponent].component]);
+}
+
+static inline Quantum GetPixelYellow(const Image *image,
+ const Quantum *pixel)
+{
+ return(pixel[image->component_map[YellowPixelComponent].component]);
+}
+
+static inline MagickBooleanType IsPixelEquivalent(const Image *image,
+ const Quantum *p,const PixelPacket *q)
+{
+ if ((GetPixelRed(image,p) == q->red) &&
+ (GetPixelGreen(image,p) == q->green) &&
+ (GetPixelBlue(image,p) == q->blue))
+ return(MagickTrue);
+ return(MagickFalse);
+}
+
+static inline MagickBooleanType IsPixelGray(const Image *image,
+ const Quantum *pixel)
+{
+#if !defined(MAGICKCORE_HDRI_SUPPORT)
+ if ((GetPixelRed(image,pixel) == GetPixelGreen(image,pixel)) &&
+ (GetPixelGreen(image,pixel) == GetPixelBlue(image,pixel)))
+ return(MagickTrue);
+#else
+ {
+ double
+ alpha,
+ beta;
+
+ alpha=GetPixelRed(image,pixel)-(double) GetPixelGreen(image,pixel);
+ beta=GetPixelGreen(image,pixel)-(double) GetPixelBlue(image,pixel);
+ if ((fabs(alpha) <= MagickEpsilon) && (fabs(beta) <= MagickEpsilon))
+ return(MagickTrue);
+ }
+#endif
+ return(MagickFalse);
+}
+
+static inline MagickBooleanType IsPixelInfoEquivalent(const PixelInfo *p,
+ const PixelInfo *q)
+{
+#if !defined(MAGICKCORE_HDRI_SUPPORT)
+ if ((p->matte != MagickFalse) && (q->matte == MagickFalse) &&
+ (p->alpha != OpaqueAlpha))
+ return(MagickFalse);
+ if ((q->matte != MagickFalse) && (p->matte == MagickFalse) &&
+ (q->alpha != OpaqueAlpha))
+ return(MagickFalse);
+ if ((p->matte != MagickFalse) && (q->matte != MagickFalse))
+ {
+ if (p->alpha != q->alpha)
+ return(MagickFalse);
+ if (p->alpha == TransparentAlpha)
+ return(MagickTrue);
+ }
+ if (p->red != q->red)
+ return(MagickFalse);
+ if (p->green != q->green)
+ return(MagickFalse);
+ if (p->blue != q->blue)
+ return(MagickFalse);
+ if ((p->colorspace == CMYKColorspace) && (p->black != q->black))
+ return(MagickFalse);
+#else
+ if ((p->matte != MagickFalse) && (q->matte == MagickFalse) &&
+ (fabs(p->alpha-OpaqueAlpha) > 0.5))
+ return(MagickFalse);
+ if ((q->matte != MagickFalse) && (p->matte == MagickFalse) &&
+ (fabs(q->alpha-OpaqueAlpha)) > 0.5)
+ return(MagickFalse);
+ if ((p->matte != MagickFalse) && (q->matte != MagickFalse))
+ {
+ if (fabs(p->alpha-q->alpha) > 0.5)
+ return(MagickFalse);
+ if (fabs(p->alpha-TransparentAlpha) <= 0.5)
+ return(MagickTrue);
+ }
+ if (fabs(p->red-q->red) > 0.5)
+ return(MagickFalse);
+ if (fabs(p->green-q->green) > 0.5)
+ return(MagickFalse);
+ if (fabs(p->blue-q->blue) > 0.5)
+ return(MagickFalse);
+ if ((p->colorspace == CMYKColorspace) && (fabs(p->black-q->black) > 0.5))
+ return(MagickFalse);
+#endif
+ return(MagickTrue);
+}
+
+static inline MagickBooleanType IsPixelMonochrome(const Image *image,
+ const Quantum *pixel)
+{
+#if !defined(MAGICKCORE_HDRI_SUPPORT)
+ if (((GetPixelRed(image,pixel) == 0) ||
+ (GetPixelRed(image,pixel) == (Quantum) QuantumRange)) &&
+ (GetPixelRed(image,pixel) == GetPixelGreen(image,pixel)) &&
+ (GetPixelGreen(image,pixel) == GetPixelBlue(image,pixel)))
+ return(MagickTrue);
+#else
+ {
+ double
+ alpha,
+ beta;
+
+ alpha=GetPixelRed(image,pixel)-(double) GetPixelGreen(image,pixel);
+ beta=GetPixelGreen(image,pixel)-(double) GetPixelBlue(image,pixel);
+ if (((fabs(GetPixelRed(image,pixel)) <= MagickEpsilon) ||
+ (fabs(GetPixelRed(image,pixel)-QuantumRange) <= MagickEpsilon)) &&
+ (fabs(alpha) <= MagickEpsilon) && (fabs(beta) <= MagickEpsilon))
+ return(MagickTrue);
+ }
+#endif
+ 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)
+{
+#if !defined(MAGICKCORE_HDRI_SUPPORT)
+ if ((pixel->red == pixel->green) && (pixel->green == pixel->blue))
+ return(MagickTrue);
+#else
+ {
+ double
+ alpha,
+ beta;
+
+ alpha=pixel->red-(double) pixel->green;
+ beta=pixel->green-(double) pixel->blue;
+ if ((fabs(alpha) <= MagickEpsilon) && (fabs(beta) <= MagickEpsilon))
+ return(MagickTrue);
+ }
+#endif
+ return(MagickFalse);
+}
+
+static inline MagickBooleanType IsPixelPacketMonochrome(
+ const PixelPacket *pixel)
+{
+#if !defined(MAGICKCORE_HDRI_SUPPORT)
+ if (((pixel->red == 0) || (pixel->red == (Quantum) QuantumRange)) &&
+ (pixel->red == pixel->green) && (pixel->green == pixel->blue))
+ return(MagickTrue);
+#else
+ {
+ double
+ alpha,
+ beta;
+
+ alpha=pixel->red-(double) pixel->green;
+ beta=pixel->green-(double) pixel->blue;
+ if (((fabs(pixel->red) <= MagickEpsilon) ||
+ (fabs(pixel->red-QuantumRange) <= MagickEpsilon)) &&
+ (fabs(alpha) <= MagickEpsilon) && (fabs(beta) <= MagickEpsilon))
+ return(MagickTrue);
+ }
+#endif
+ return(MagickFalse);
+}
+
+static inline void SetPacketPixelInfo(const Image *image,
+ const PixelInfo *pixel_info,PixelPacket *packet)
+{
+ packet->red=ClampToQuantum(pixel_info->red);
+ packet->green=ClampToQuantum(pixel_info->green);
+ packet->blue=ClampToQuantum(pixel_info->blue);
+ packet->alpha=ClampToQuantum(pixel_info->alpha);
+ if (image->colorspace == CMYKColorspace)
+ packet->black=ClampToQuantum(pixel_info->black);
+ if (image->storage_class == PseudoClass)
+ packet->index=ClampToQuantum(pixel_info->index);
+}
+
+static inline void SetPixelAlpha(const Image *image,const Quantum alpha,
+ Quantum *pixel)
+{
+ pixel[image->component_map[AlphaPixelComponent].component]=alpha;
+}
+
+static inline void SetPixelBlack(const Image *image,const Quantum black,
+ Quantum *pixel)
+{
+ pixel[image->component_map[BlackPixelComponent].component]=black;
+}
+
+static inline void SetPixelBlue(const Image *image,const Quantum blue,
+ Quantum *pixel)
+{
+ pixel[image->component_map[BluePixelComponent].component]=blue;
+}
+
+static inline void SetPixelCb(const Image *image,const Quantum cb,
+ Quantum *pixel)
+{
+ pixel[image->component_map[CbPixelComponent].component]=cb;
+}
+
+static inline void SetPixelChannels(Image *image,const size_t channels)
+{
+ image->pixel_channels=channels;
+}
+
+static inline void SetPixelCr(const Image *image,const Quantum cr,
+ Quantum *pixel)
+{
+ pixel[image->component_map[CrPixelComponent].component]=cr;
+}
+
+static inline void SetPixelCyan(const Image *image,const Quantum cyan,
+ Quantum *pixel)
+{
+ pixel[image->component_map[CyanPixelComponent].component]=cyan;
+}
+
+static inline void SetPixelGray(const Image *image,const Quantum gray,
+ Quantum *pixel)
+{
+ pixel[image->component_map[GrayPixelComponent].component]=gray;
+}
+
+static inline void SetPixelGreen(const Image *image,const Quantum green,
+ Quantum *pixel)
+{
+ pixel[image->component_map[GreenPixelComponent].component]=green;
+}
+
+static inline void SetPixelIndex(const Image *image,const Quantum index,
+ Quantum *pixel)
+{
+ pixel[image->component_map[IndexPixelComponent].component]=index;
+}
+
+static inline void SetPixelInfo(const Image *image,const Quantum *pixel,
+ PixelInfo *pixel_info)
+{
+ pixel_info->red=(MagickRealType) GetPixelRed(image,pixel);
+ pixel_info->green=(MagickRealType) GetPixelGreen(image,pixel);
+ pixel_info->blue=(MagickRealType) GetPixelBlue(image,pixel);
+ pixel_info->alpha=(MagickRealType) GetPixelAlpha(image,pixel);
+ if (image->colorspace == CMYKColorspace)
+ pixel_info->black=(MagickRealType) GetPixelBlack(image,pixel);
+ if (image->storage_class == PseudoClass)
+ pixel_info->index=(MagickRealType) GetPixelIndex(image,pixel);
+}
+
+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)
+{
+ pixel_info->red=(MagickRealType) pixel->red;
+ pixel_info->green=(MagickRealType) pixel->green;
+ pixel_info->blue=(MagickRealType) pixel->blue;
+ pixel_info->alpha=(MagickRealType) pixel->alpha;
+ if (image->colorspace == CMYKColorspace)
+ pixel_info->black=(MagickRealType) pixel->black;
+ if (image->storage_class == PseudoClass)
+ pixel_info->index=(MagickRealType) pixel->index;
+}
+
+static inline void SetPixelMagenta(const Image *image,const Quantum magenta,
+ Quantum *pixel)
+{
+ pixel[image->component_map[MagentaPixelComponent].component]=magenta;
+}
+
+static inline void SetPixelMetacontentExtent(Image *image,const size_t extent)
+{
+ image->metacontent_extent=extent;
+}
+
+static inline void SetPixelRed(const Image *image,const Quantum red,
+ Quantum *pixel)
+{
+ pixel[image->component_map[RedPixelComponent].component]=red;
+}
+
+static inline void SetPixelPacket(const Image *image,const PixelPacket *packet,
+ Quantum *pixel)
+{
+ SetPixelRed(image,packet->red,pixel);
+ SetPixelGreen(image,packet->green,pixel);
+ SetPixelBlue(image,packet->blue,pixel);
+ SetPixelAlpha(image,packet->alpha,pixel);
+}
+
+static inline void SetPixelPixelInfo(const Image *image,
+ const PixelInfo *pixel_info,Quantum *packet)
+{
+ SetPixelRed(image,ClampToQuantum(pixel_info->red),packet);
+ SetPixelGreen(image,ClampToQuantum(pixel_info->green),packet);
+ SetPixelBlue(image,ClampToQuantum(pixel_info->blue),packet);
+ SetPixelAlpha(image,ClampToQuantum(pixel_info->alpha),packet);
+ if (image->colorspace == CMYKColorspace)
+ SetPixelBlack(image,ClampToQuantum(pixel_info->black),packet);
+}
+
+static inline void SetPixelYellow(const Image *image,const Quantum yellow,
+ Quantum *pixel)
+{
+ pixel[image->component_map[YellowPixelComponent].component]=yellow;
+}
+
+static inline void SetPixelY(const Image *image,const Quantum y,
+ Quantum *pixel)
+{
+ pixel[image->component_map[YPixelComponent].component]=y;
+}
+
+static inline Quantum GetPixelIntensity(const Image *image,
+ const Quantum *pixel)
+{
+#if !defined(MAGICKCORE_HDRI_SUPPORT)
+ if ((GetPixelRed(image,pixel) == GetPixelGreen(image,pixel)) &&
+ (GetPixelGreen(image,pixel) == GetPixelBlue(image,pixel)))
+ return(GetPixelRed(image,pixel));
+ return((Quantum) (0.299*GetPixelRed(image,pixel)+0.587*
+ GetPixelGreen(image,pixel)+0.114*GetPixelBlue(image,pixel)+0.5));
+#else
+ {
+ double
+ alpha,
+ beta;
+
+ alpha=GetPixelRed(image,pixel)-(double) GetPixelGreen(image,pixel);
+ beta=GetPixelGreen(image,pixel)-(double) GetPixelBlue(image,pixel);
+ if ((fabs(alpha) <= MagickEpsilon) && (fabs(beta) <= MagickEpsilon))
+ return(GetPixelRed(image,pixel));
+ return((Quantum) (0.299*GetPixelRed(image,pixel)+0.587*
+ GetPixelGreen(image,pixel)+0.114*GetPixelBlue(image,pixel)));
+ }
+#endif
+}
+
+#if defined(__cplusplus) || defined(c_plusplus)
+}
+#endif
+
+#endif
diff --git a/magick/pixel-private.h b/MagickCore/pixel-private.h
similarity index 100%
rename from magick/pixel-private.h
rename to MagickCore/pixel-private.h
diff --git a/MagickCore/pixel.c b/MagickCore/pixel.c
new file mode 100644
index 0000000..1661c4d
--- /dev/null
+++ b/MagickCore/pixel.c
@@ -0,0 +1,4456 @@
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% %
+% %
+% %
+% PPPP IIIII X X EEEEE L %
+% P P I X X E L %
+% PPPP I X EEE L %
+% P I X X E L %
+% P IIIII X X EEEEE LLLLL %
+% %
+% MagickCore Methods to Import/Export Pixels %
+% %
+% Software Design %
+% John Cristy %
+% October 1998 %
+% %
+% %
+% Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization %
+% dedicated to making software imaging solutions freely available. %
+% %
+% You may not use this file except in compliance with the License. You may %
+% obtain a copy of the License at %
+% %
+% http://www.imagemagick.org/script/license.php %
+% %
+% Unless required by applicable law or agreed to in writing, software %
+% distributed under the License is distributed on an "AS IS" BASIS, %
+% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. %
+% See the License for the specific language governing permissions and %
+% limitations under the License. %
+% %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%
+*/
+
+/*
+ Include declarations.
+*/
+#include "MagickCore/studio.h"
+#include "MagickCore/property.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/draw.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/delegate.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/option.h"
+#include "MagickCore/pixel.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantum.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/semaphore.h"
+#include "MagickCore/statistic.h"
+#include "MagickCore/stream.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/transform.h"
+#include "MagickCore/utility.h"
+
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% %
+% %
+% %
++ A c q u i r e P i x e l C o m p o n e n t M a p %
+% %
+% %
+% %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% AcquirePixelComponentMap() acquires a pixel component map.
+%
+% The format of the AcquirePixelComponentMap() method is:
+%
+% PixelComponentMap *AcquirePixelComponentMap(void)
+%
+*/
+MagickExport PixelComponentMap *AcquirePixelComponentMap(void)
+{
+ PixelComponentMap
+ *component_map;
+
+ register ssize_t
+ i;
+
+ component_map=(PixelComponentMap *) AcquireAlignedMemory(MaxPixelChannels,
+ sizeof(*component_map));
+ if (component_map == (PixelComponentMap *) NULL)
+ ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
+ for (i=0; i < MaxPixelChannels; i++)
+ {
+ component_map[i].component=(PixelComponent) i;
+ component_map[i].trait=UndefinedPixelTrait;
+ }
+ return(component_map);
+}
+
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% %
+% %
+% %
++ C l o n e P i x e l C o m p o n e n t M a p %
+% %
+% %
+% %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% ClonePixelComponentMap() clones a pixel component map.
+%
+% The format of the ClonePixelComponentMap() method is:
+%
+% PixelComponentMap *ClonePixelComponentMap(
+% const PixelComponentMap *component_map)
+%
+% A description of each parameter follows:
+%
+% o component_map: the pixel component map.
+%
+*/
+MagickExport PixelComponentMap *ClonePixelComponentMap(
+ const PixelComponentMap *component_map)
+{
+ PixelComponentMap
+ *clone_map;
+
+ assert(component_map != (const PixelComponentMap *) NULL);
+ clone_map=AcquirePixelComponentMap();
+ if (clone_map == (PixelComponentMap *) NULL)
+ return((PixelComponentMap *) NULL);
+ (void) CopyMagickMemory(clone_map,component_map,MaxPixelChannels*
+ sizeof(*component_map));
+ return(clone_map);
+}
+
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% %
+% %
+% %
++ C l o n e P i x e l I n f o %
+% %
+% %
+% %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% ClonePixelInfo() makes a duplicate of the given pixel info structure, or if
+% pixel info is NULL, a new one.
+%
+% The format of the ClonePixelInfo method is:
+%
+% PixelInfo *ClonePixelInfo(const PixelInfo *pixel_info)
+%
+% A description of each parameter follows:
+%
+% o pixel_info: the pixel info.
+%
+*/
+MagickExport PixelInfo *ClonePixelInfo(const PixelInfo *pixel)
+{
+ PixelInfo
+ *pixel_info;
+
+ pixel_info=(PixelInfo *) AcquireAlignedMemory(1,sizeof(*pixel_info));
+ if (pixel_info == (PixelInfo *) NULL)
+ ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
+ *pixel_info=(*pixel);
+ return(pixel_info);
+}
+
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% %
+% %
+% %
++ D e f i n e P i x e l C o m p o n e n t M a p %
+% %
+% %
+% %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% DefinePixelComponentMap() defines the pixel component map.
+%
+% The format of the DefinePixelComponentMap() method is:
+%
+% void DefinePixelComponentMap(Image *image)
+%
+% A description of each parameter follows:
+%
+% o image: the image.
+%
+*/
+MagickExport void DefinePixelComponentMap(Image *image)
+{
+ image->pixel_channels=4;
+ if (image->storage_class == PseudoClass)
+ image->pixel_channels++;
+ if (image->colorspace == CMYKColorspace)
+ image->pixel_channels++;
+}
+
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% %
+% %
+% %
++ D e s t r o y P i x e l C o m p o n e n t M a p %
+% %
+% %
+% %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% DestroyPixelComponentMap() deallocates memory associated with the pixel
+% component map.
+%
+% The format of the DestroyPixelComponentMap() method is:
+%
+% PixelComponentMap *DestroyPixelComponentMap(
+% PixelComponentMap *component_map)
+%
+% A description of each parameter follows:
+%
+% o component_map: the pixel component map.
+%
+*/
+MagickExport PixelComponentMap *DestroyPixelComponentMap(
+ PixelComponentMap *component_map)
+{
+ assert(component_map != (PixelComponentMap *) NULL);
+ return((PixelComponentMap *) RelinquishMagickMemory(component_map));
+}
+
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% %
+% %
+% %
+% E x p o r t I m a g e P i x e l s %
+% %
+% %
+% %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% ExportImagePixels() extracts pixel data from an image and returns it to you.
+% The method returns MagickTrue on success otherwise MagickFalse if an error is
+% encountered. The data is returned as char, short int, int, ssize_t, float,
+% or double in the order specified by map.
+%
+% Suppose you want to extract the first scanline of a 640x480 image as
+% character data in red-green-blue order:
+%
+% ExportImagePixels(image,0,0,640,1,"RGB",CharPixel,pixels,exception);
+%
+% The format of the ExportImagePixels method is:
+%
+% MagickBooleanType ExportImagePixels(const Image *image,
+% const ssize_t x_offset,const ssize_t y_offset,const size_t columns,
+% const size_t rows,const char *map,const StorageType type,
+% void *pixels,ExceptionInfo *exception)
+%
+% A description of each parameter follows:
+%
+% o image: the image.
+%
+% o x_offset,y_offset,columns,rows: These values define the perimeter
+% of a region of pixels you want to extract.
+%
+% o map: This string reflects the expected ordering of the pixel array.
+% It can be any combination or order of R = red, G = green, B = blue,
+% A = alpha (0 is transparent), O = opacity (0 is opaque), C = cyan,
+% Y = yellow, M = magenta, K = black, I = intensity (for grayscale),
+% P = pad.
+%
+% o type: Define the data type of the pixels. Float and double types are
+% normalized to [0..1] otherwise [0..QuantumRange]. Choose from these
+% types: CharPixel, DoublePixel, FloatPixel, IntegerPixel, LongPixel,
+% QuantumPixel, or ShortPixel.
+%
+% o pixels: This array of values contain the pixel components as defined by
+% map and type. You must preallocate this array where the expected
+% length varies depending on the values of width, height, map, and type.
+%
+% o exception: return any errors or warnings in this structure.
+%
+*/
+MagickExport MagickBooleanType ExportImagePixels(const Image *image,
+ const ssize_t x_offset,const ssize_t y_offset,const size_t columns,
+ const size_t rows,const char *map,const StorageType type,void *pixels,
+ ExceptionInfo *exception)
+{
+ QuantumType
+ *quantum_map;
+
+ register ssize_t
+ i,
+ x;
+
+ register const Quantum
+ *p;
+
+ size_t
+ length;
+
+ ssize_t
+ y;
+
+ assert(image != (Image *) NULL);
+ assert(image->signature == MagickSignature);
+ if (image->debug != MagickFalse)
+ (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
+ length=strlen(map);
+ quantum_map=(QuantumType *) AcquireQuantumMemory(length,sizeof(*quantum_map));
+ if (quantum_map == (QuantumType *) NULL)
+ {
+ (void) ThrowMagickException(exception,GetMagickModule(),
+ ResourceLimitError,"MemoryAllocationFailed","`%s'",image->filename);
+ return(MagickFalse);
+ }
+ for (i=0; i < (ssize_t) length; i++)
+ {
+ switch (map[i])
+ {
+ case 'A':
+ case 'a':
+ {
+ quantum_map[i]=AlphaQuantum;
+ break;
+ }
+ case 'B':
+ case 'b':
+ {
+ quantum_map[i]=BlueQuantum;
+ break;
+ }
+ case 'C':
+ case 'c':
+ {
+ quantum_map[i]=CyanQuantum;
+ if (image->colorspace == CMYKColorspace)
+ break;
+ quantum_map=(QuantumType *) RelinquishMagickMemory(quantum_map);
+ (void) ThrowMagickException(exception,GetMagickModule(),ImageError,
+ "ColorSeparatedImageRequired","`%s'",map);
+ return(MagickFalse);
+ }
+ case 'g':
+ case 'G':
+ {
+ quantum_map[i]=GreenQuantum;
+ break;
+ }
+ case 'I':
+ case 'i':
+ {
+ quantum_map[i]=IndexQuantum;
+ break;
+ }
+ case 'K':
+ case 'k':
+ {
+ quantum_map[i]=BlackQuantum;
+ if (image->colorspace == CMYKColorspace)
+ break;
+ quantum_map=(QuantumType *) RelinquishMagickMemory(quantum_map);
+ (void) ThrowMagickException(exception,GetMagickModule(),ImageError,
+ "ColorSeparatedImageRequired","`%s'",map);
+ return(MagickFalse);
+ }
+ case 'M':
+ case 'm':
+ {
+ quantum_map[i]=MagentaQuantum;
+ if (image->colorspace == CMYKColorspace)
+ break;
+ quantum_map=(QuantumType *) RelinquishMagickMemory(quantum_map);
+ (void) ThrowMagickException(exception,GetMagickModule(),ImageError,
+ "ColorSeparatedImageRequired","`%s'",map);
+ return(MagickFalse);
+ }
+ case 'o':
+ case 'O':
+ {
+ quantum_map[i]=OpacityQuantum;
+ break;
+ }
+ case 'P':
+ case 'p':
+ {
+ quantum_map[i]=UndefinedQuantum;
+ break;
+ }
+ case 'R':
+ case 'r':
+ {
+ quantum_map[i]=RedQuantum;
+ break;
+ }
+ case 'Y':
+ case 'y':
+ {
+ quantum_map[i]=YellowQuantum;
+ if (image->colorspace == CMYKColorspace)
+ break;
+ quantum_map=(QuantumType *) RelinquishMagickMemory(quantum_map);
+ (void) ThrowMagickException(exception,GetMagickModule(),ImageError,
+ "ColorSeparatedImageRequired","`%s'",map);
+ return(MagickFalse);
+ }
+ default:
+ {
+ quantum_map=(QuantumType *) RelinquishMagickMemory(quantum_map);
+ (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
+ "UnrecognizedPixelMap","`%s'",map);
+ return(MagickFalse);
+ }
+ }
+ }
+ switch (type)
+ {
+ case CharPixel:
+ {
+ register unsigned char
+ *q;
+
+ q=(unsigned char *) pixels;
+ if (LocaleCompare(map,"BGR") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (p == (const Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ *q++=ScaleQuantumToChar(GetPixelBlue(image,p));
+ *q++=ScaleQuantumToChar(GetPixelGreen(image,p));
+ *q++=ScaleQuantumToChar(GetPixelRed(image,p));
+ p+=GetPixelChannels(image);
+ }
+ }
+ break;
+ }
+ if (LocaleCompare(map,"BGRA") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (p == (const Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ *q++=ScaleQuantumToChar(GetPixelBlue(image,p));
+ *q++=ScaleQuantumToChar(GetPixelGreen(image,p));
+ *q++=ScaleQuantumToChar(GetPixelRed(image,p));
+ *q++=ScaleQuantumToChar(GetPixelAlpha(image,p));
+ p+=GetPixelChannels(image);
+ }
+ }
+ break;
+ }
+ if (LocaleCompare(map,"BGRP") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (p == (const Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ *q++=ScaleQuantumToChar(GetPixelBlue(image,p));
+ *q++=ScaleQuantumToChar(GetPixelGreen(image,p));
+ *q++=ScaleQuantumToChar(GetPixelRed(image,p));
+ *q++=ScaleQuantumToChar((Quantum) 0);
+ p+=GetPixelChannels(image);
+ }
+ }
+ break;
+ }
+ if (LocaleCompare(map,"I") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (p == (const Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ *q++=ScaleQuantumToChar(GetPixelIntensity(image,p));
+ p+=GetPixelChannels(image);
+ }
+ }
+ break;
+ }
+ if (LocaleCompare(map,"RGB") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (p == (const Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ *q++=ScaleQuantumToChar(GetPixelRed(image,p));
+ *q++=ScaleQuantumToChar(GetPixelGreen(image,p));
+ *q++=ScaleQuantumToChar(GetPixelBlue(image,p));
+ p+=GetPixelChannels(image);
+ }
+ }
+ break;
+ }
+ if (LocaleCompare(map,"RGBA") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (p == (const Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ *q++=ScaleQuantumToChar(GetPixelRed(image,p));
+ *q++=ScaleQuantumToChar(GetPixelGreen(image,p));
+ *q++=ScaleQuantumToChar(GetPixelBlue(image,p));
+ *q++=ScaleQuantumToChar(GetPixelAlpha(image,p));
+ p+=GetPixelChannels(image);
+ }
+ }
+ break;
+ }
+ if (LocaleCompare(map,"RGBP") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (p == (const Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ *q++=ScaleQuantumToChar(GetPixelRed(image,p));
+ *q++=ScaleQuantumToChar(GetPixelGreen(image,p));
+ *q++=ScaleQuantumToChar(GetPixelBlue(image,p));
+ *q++=ScaleQuantumToChar((Quantum) 0);
+ p+=GetPixelChannels(image);
+ }
+ }
+ break;
+ }
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (p == (const Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ for (i=0; i < (ssize_t) length; i++)
+ {
+ *q=0;
+ switch (quantum_map[i])
+ {
+ case RedQuantum:
+ case CyanQuantum:
+ {
+ *q=ScaleQuantumToChar(GetPixelRed(image,p));
+ break;
+ }
+ case GreenQuantum:
+ case MagentaQuantum:
+ {
+ *q=ScaleQuantumToChar(GetPixelGreen(image,p));
+ break;
+ }
+ case BlueQuantum:
+ case YellowQuantum:
+ {
+ *q=ScaleQuantumToChar(GetPixelBlue(image,p));
+ break;
+ }
+ case AlphaQuantum:
+ {
+ *q=ScaleQuantumToChar(GetPixelAlpha(image,p));
+ break;
+ }
+ case OpacityQuantum:
+ {
+ *q=ScaleQuantumToChar(GetPixelAlpha(image,p));
+ break;
+ }
+ case BlackQuantum:
+ {
+ if (image->colorspace == CMYKColorspace)
+ *q=ScaleQuantumToChar(GetPixelBlack(image,p));
+ break;
+ }
+ case IndexQuantum:
+ {
+ *q=ScaleQuantumToChar(GetPixelIntensity(image,p));
+ break;
+ }
+ default:
+ break;
+ }
+ q++;
+ }
+ p+=GetPixelChannels(image);
+ }
+ }
+ break;
+ }
+ case DoublePixel:
+ {
+ register double
+ *q;
+
+ q=(double *) pixels;
+ if (LocaleCompare(map,"BGR") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (p == (const Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ *q++=(double) (QuantumScale*GetPixelBlue(image,p));
+ *q++=(double) (QuantumScale*GetPixelGreen(image,p));
+ *q++=(double) (QuantumScale*GetPixelRed(image,p));
+ p+=GetPixelChannels(image);
+ }
+ }
+ break;
+ }
+ if (LocaleCompare(map,"BGRA") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (p == (const Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ *q++=(double) (QuantumScale*GetPixelBlue(image,p));
+ *q++=(double) (QuantumScale*GetPixelGreen(image,p));
+ *q++=(double) (QuantumScale*GetPixelRed(image,p));
+ *q++=(double) (QuantumScale*GetPixelAlpha(image,p));
+ p+=GetPixelChannels(image);
+ }
+ }
+ break;
+ }
+ if (LocaleCompare(map,"BGRP") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (p == (const Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ *q++=(double) (QuantumScale*GetPixelBlue(image,p));
+ *q++=(double) (QuantumScale*GetPixelGreen(image,p));
+ *q++=(double) (QuantumScale*GetPixelRed(image,p));
+ *q++=0.0;
+ p+=GetPixelChannels(image);
+ }
+ }
+ break;
+ }
+ if (LocaleCompare(map,"I") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (p == (const Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ *q++=(double) (QuantumScale*GetPixelIntensity(image,p));
+ p+=GetPixelChannels(image);
+ }
+ }
+ break;
+ }
+ if (LocaleCompare(map,"RGB") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (p == (const Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ *q++=(double) (QuantumScale*GetPixelRed(image,p));
+ *q++=(double) (QuantumScale*GetPixelGreen(image,p));
+ *q++=(double) (QuantumScale*GetPixelBlue(image,p));
+ p+=GetPixelChannels(image);
+ }
+ }
+ break;
+ }
+ if (LocaleCompare(map,"RGBA") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (p == (const Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ *q++=(double) (QuantumScale*GetPixelRed(image,p));
+ *q++=(double) (QuantumScale*GetPixelGreen(image,p));
+ *q++=(double) (QuantumScale*GetPixelBlue(image,p));
+ *q++=(double) (QuantumScale*GetPixelAlpha(image,p));
+ p+=GetPixelChannels(image);
+ }
+ }
+ break;
+ }
+ if (LocaleCompare(map,"RGBP") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (p == (const Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ *q++=(double) (QuantumScale*GetPixelRed(image,p));
+ *q++=(double) (QuantumScale*GetPixelGreen(image,p));
+ *q++=(double) (QuantumScale*GetPixelBlue(image,p));
+ *q++=0.0;
+ p+=GetPixelChannels(image);
+ }
+ }
+ break;
+ }
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (p == (const Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ for (i=0; i < (ssize_t) length; i++)
+ {
+ *q=0;
+ switch (quantum_map[i])
+ {
+ case RedQuantum:
+ case CyanQuantum:
+ {
+ *q=(double) (QuantumScale*GetPixelRed(image,p));
+ break;
+ }
+ case GreenQuantum:
+ case MagentaQuantum:
+ {
+ *q=(double) (QuantumScale*GetPixelGreen(image,p));
+ break;
+ }
+ case BlueQuantum:
+ case YellowQuantum:
+ {
+ *q=(double) (QuantumScale*GetPixelBlue(image,p));
+ break;
+ }
+ case AlphaQuantum:
+ {
+ *q=(double) (QuantumScale*GetPixelAlpha(image,p));
+ break;
+ }
+ case OpacityQuantum:
+ {
+ *q=(double) (QuantumScale*GetPixelAlpha(image,p));
+ break;
+ }
+ case BlackQuantum:
+ {
+ if (image->colorspace == CMYKColorspace)
+ *q=(double) (QuantumScale*
+ GetPixelBlack(image,p));
+ break;
+ }
+ case IndexQuantum:
+ {
+ *q=(double) (QuantumScale*GetPixelIntensity(image,p));
+ break;
+ }
+ default:
+ *q=0;
+ }
+ q++;
+ }
+ p+=GetPixelChannels(image);
+ }
+ }
+ break;
+ }
+ case FloatPixel:
+ {
+ register float
+ *q;
+
+ q=(float *) pixels;
+ if (LocaleCompare(map,"BGR") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (p == (const Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ *q++=(float) (QuantumScale*GetPixelBlue(image,p));
+ *q++=(float) (QuantumScale*GetPixelGreen(image,p));
+ *q++=(float) (QuantumScale*GetPixelRed(image,p));
+ p+=GetPixelChannels(image);
+ }
+ }
+ break;
+ }
+ if (LocaleCompare(map,"BGRA") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (p == (const Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ *q++=(float) (QuantumScale*GetPixelBlue(image,p));
+ *q++=(float) (QuantumScale*GetPixelGreen(image,p));
+ *q++=(float) (QuantumScale*GetPixelRed(image,p));
+ *q++=(float) (QuantumScale*GetPixelAlpha(image,p));
+ p+=GetPixelChannels(image);
+ }
+ }
+ break;
+ }
+ if (LocaleCompare(map,"BGRP") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (p == (const Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ *q++=(float) (QuantumScale*GetPixelBlue(image,p));
+ *q++=(float) (QuantumScale*GetPixelGreen(image,p));
+ *q++=(float) (QuantumScale*GetPixelRed(image,p));
+ *q++=0.0;
+ p+=GetPixelChannels(image);
+ }
+ }
+ break;
+ }
+ if (LocaleCompare(map,"I") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (p == (const Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ *q++=(float) (QuantumScale*GetPixelIntensity(image,p));
+ p+=GetPixelChannels(image);
+ }
+ }
+ break;
+ }
+ if (LocaleCompare(map,"RGB") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (p == (const Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ *q++=(float) (QuantumScale*GetPixelRed(image,p));
+ *q++=(float) (QuantumScale*GetPixelGreen(image,p));
+ *q++=(float) (QuantumScale*GetPixelBlue(image,p));
+ p+=GetPixelChannels(image);
+ }
+ }
+ break;
+ }
+ if (LocaleCompare(map,"RGBA") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (p == (const Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ *q++=(float) (QuantumScale*GetPixelRed(image,p));
+ *q++=(float) (QuantumScale*GetPixelGreen(image,p));
+ *q++=(float) (QuantumScale*GetPixelBlue(image,p));
+ *q++=(float) (QuantumScale*GetPixelAlpha(image,p));
+ p+=GetPixelChannels(image);
+ }
+ }
+ break;
+ }
+ if (LocaleCompare(map,"RGBP") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (p == (const Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ *q++=(float) (QuantumScale*GetPixelRed(image,p));
+ *q++=(float) (QuantumScale*GetPixelGreen(image,p));
+ *q++=(float) (QuantumScale*GetPixelBlue(image,p));
+ *q++=0.0;
+ p+=GetPixelChannels(image);
+ }
+ }
+ break;
+ }
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (p == (const Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ for (i=0; i < (ssize_t) length; i++)
+ {
+ *q=0;
+ switch (quantum_map[i])
+ {
+ case RedQuantum:
+ case CyanQuantum:
+ {
+ *q=(float) (QuantumScale*GetPixelRed(image,p));
+ break;
+ }
+ case GreenQuantum:
+ case MagentaQuantum:
+ {
+ *q=(float) (QuantumScale*GetPixelGreen(image,p));
+ break;
+ }
+ case BlueQuantum:
+ case YellowQuantum:
+ {
+ *q=(float) (QuantumScale*GetPixelBlue(image,p));
+ break;
+ }
+ case AlphaQuantum:
+ {
+ *q=(float) (QuantumScale*((Quantum) (GetPixelAlpha(image,p))));
+ break;
+ }
+ case OpacityQuantum:
+ {
+ *q=(float) (QuantumScale*GetPixelAlpha(image,p));
+ break;
+ }
+ case BlackQuantum:
+ {
+ if (image->colorspace == CMYKColorspace)
+ *q=(float) (QuantumScale* GetPixelBlack(image,p));
+ break;
+ }
+ case IndexQuantum:
+ {
+ *q=(float) (QuantumScale*GetPixelIntensity(image,p));
+ break;
+ }
+ default:
+ *q=0;
+ }
+ q++;
+ }
+ p+=GetPixelChannels(image);
+ }
+ }
+ break;
+ }
+ case IntegerPixel:
+ {
+ register unsigned int
+ *q;
+
+ q=(unsigned int *) pixels;
+ if (LocaleCompare(map,"BGR") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (p == (const Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelBlue(image,p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelGreen(image,p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelRed(image,p));
+ p+=GetPixelChannels(image);
+ }
+ }
+ break;
+ }
+ if (LocaleCompare(map,"BGRA") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (p == (const Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelBlue(image,p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelGreen(image,p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelRed(image,p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelAlpha(image,p));
+ p+=GetPixelChannels(image);
+ }
+ }
+ break;
+ }
+ if (LocaleCompare(map,"BGRP") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (p == (const Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelBlue(image,p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelGreen(image,p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelRed(image,p));
+ *q++=0U;
+ p+=GetPixelChannels(image);
+ }
+ }
+ break;
+ }
+ if (LocaleCompare(map,"I") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (p == (const Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ *q++=(unsigned int) ScaleQuantumToLong(
+ GetPixelIntensity(image,p));
+ p+=GetPixelChannels(image);
+ }
+ }
+ break;
+ }
+ if (LocaleCompare(map,"RGB") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (p == (const Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelRed(image,p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelGreen(image,p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelBlue(image,p));
+ p+=GetPixelChannels(image);
+ }
+ }
+ break;
+ }
+ if (LocaleCompare(map,"RGBA") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (p == (const Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelRed(image,p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelGreen(image,p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelBlue(image,p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelAlpha(image,p));
+ p+=GetPixelChannels(image);
+ }
+ }
+ break;
+ }
+ if (LocaleCompare(map,"RGBP") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (p == (const Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelRed(image,p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelGreen(image,p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelBlue(image,p));
+ *q++=0U;
+ p+=GetPixelChannels(image);
+ }
+ }
+ break;
+ }
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (p == (const Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ for (i=0; i < (ssize_t) length; i++)
+ {
+ *q=0;
+ switch (quantum_map[i])
+ {
+ case RedQuantum:
+ case CyanQuantum:
+ {
+ *q=(unsigned int) ScaleQuantumToLong(GetPixelRed(image,p));
+ break;
+ }
+ case GreenQuantum:
+ case MagentaQuantum:
+ {
+ *q=(unsigned int) ScaleQuantumToLong(GetPixelGreen(image,p));
+ break;
+ }
+ case BlueQuantum:
+ case YellowQuantum:
+ {
+ *q=(unsigned int) ScaleQuantumToLong(GetPixelBlue(image,p));
+ break;
+ }
+ case AlphaQuantum:
+ {
+ *q=(unsigned int) ScaleQuantumToLong(GetPixelAlpha(image,p));
+ break;
+ }
+ case OpacityQuantum:
+ {
+ *q=(unsigned int) ScaleQuantumToLong(GetPixelAlpha(image,p));
+ break;
+ }
+ case BlackQuantum:
+ {
+ if (image->colorspace == CMYKColorspace)
+ *q=(unsigned int) ScaleQuantumToLong(GetPixelBlack(image,p));
+ break;
+ }
+ case IndexQuantum:
+ {
+ *q=(unsigned int) ScaleQuantumToLong(
+ GetPixelIntensity(image,p));
+ break;
+ }
+ default:
+ *q=0;
+ }
+ q++;
+ }
+ p+=GetPixelChannels(image);
+ }
+ }
+ break;
+ }
+ case LongPixel:
+ {
+ register size_t
+ *q;
+
+ q=(size_t *) pixels;
+ if (LocaleCompare(map,"BGR") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (p == (const Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ *q++=ScaleQuantumToLong(GetPixelBlue(image,p));
+ *q++=ScaleQuantumToLong(GetPixelGreen(image,p));
+ *q++=ScaleQuantumToLong(GetPixelRed(image,p));
+ p+=GetPixelChannels(image);
+ }
+ }
+ break;
+ }
+ if (LocaleCompare(map,"BGRA") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (p == (const Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ *q++=ScaleQuantumToLong(GetPixelBlue(image,p));
+ *q++=ScaleQuantumToLong(GetPixelGreen(image,p));
+ *q++=ScaleQuantumToLong(GetPixelRed(image,p));
+ *q++=ScaleQuantumToLong(GetPixelAlpha(image,p));
+ p+=GetPixelChannels(image);
+ }
+ }
+ break;
+ }
+ if (LocaleCompare(map,"BGRP") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (p == (const Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ *q++=ScaleQuantumToLong(GetPixelBlue(image,p));
+ *q++=ScaleQuantumToLong(GetPixelGreen(image,p));
+ *q++=ScaleQuantumToLong(GetPixelRed(image,p));
+ *q++=0;
+ p+=GetPixelChannels(image);
+ }
+ }
+ break;
+ }
+ if (LocaleCompare(map,"I") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (p == (const Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ *q++=ScaleQuantumToLong(GetPixelIntensity(image,p));
+ p+=GetPixelChannels(image);
+ }
+ }
+ break;
+ }
+ if (LocaleCompare(map,"RGB") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (p == (const Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ *q++=ScaleQuantumToLong(GetPixelRed(image,p));
+ *q++=ScaleQuantumToLong(GetPixelGreen(image,p));
+ *q++=ScaleQuantumToLong(GetPixelBlue(image,p));
+ p+=GetPixelChannels(image);
+ }
+ }
+ break;
+ }
+ if (LocaleCompare(map,"RGBA") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (p == (const Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ *q++=ScaleQuantumToLong(GetPixelRed(image,p));
+ *q++=ScaleQuantumToLong(GetPixelGreen(image,p));
+ *q++=ScaleQuantumToLong(GetPixelBlue(image,p));
+ *q++=ScaleQuantumToLong(GetPixelAlpha(image,p));
+ p+=GetPixelChannels(image);
+ }
+ }
+ break;
+ }
+ if (LocaleCompare(map,"RGBP") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (p == (const Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ *q++=ScaleQuantumToLong(GetPixelRed(image,p));
+ *q++=ScaleQuantumToLong(GetPixelGreen(image,p));
+ *q++=ScaleQuantumToLong(GetPixelBlue(image,p));
+ *q++=0;
+ p+=GetPixelChannels(image);
+ }
+ }
+ break;
+ }
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (p == (const Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ for (i=0; i < (ssize_t) length; i++)
+ {
+ *q=0;
+ switch (quantum_map[i])
+ {
+ case RedQuantum:
+ case CyanQuantum:
+ {
+ *q=ScaleQuantumToLong(GetPixelRed(image,p));
+ break;
+ }
+ case GreenQuantum:
+ case MagentaQuantum:
+ {
+ *q=ScaleQuantumToLong(GetPixelGreen(image,p));
+ break;
+ }
+ case BlueQuantum:
+ case YellowQuantum:
+ {
+ *q=ScaleQuantumToLong(GetPixelBlue(image,p));
+ break;
+ }
+ case AlphaQuantum:
+ {
+ *q=ScaleQuantumToLong(GetPixelAlpha(image,p));
+ break;
+ }
+ case OpacityQuantum:
+ {
+ *q=ScaleQuantumToLong(GetPixelAlpha(image,p));
+ break;
+ }
+ case BlackQuantum:
+ {
+ if (image->colorspace == CMYKColorspace)
+ *q=ScaleQuantumToLong(GetPixelBlack(image,p));
+ break;
+ }
+ case IndexQuantum:
+ {
+ *q=ScaleQuantumToLong(GetPixelIntensity(image,p));
+ break;
+ }
+ default:
+ break;
+ }
+ q++;
+ }
+ p+=GetPixelChannels(image);
+ }
+ }
+ break;
+ }
+ case QuantumPixel:
+ {
+ register Quantum
+ *q;
+
+ q=(Quantum *) pixels;
+ if (LocaleCompare(map,"BGR") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (p == (const Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ *q++=GetPixelBlue(image,p);
+ *q++=GetPixelGreen(image,p);
+ *q++=GetPixelRed(image,p);
+ p+=GetPixelChannels(image);
+ }
+ }
+ break;
+ }
+ if (LocaleCompare(map,"BGRA") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (p == (const Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ *q++=GetPixelBlue(image,p);
+ *q++=GetPixelGreen(image,p);
+ *q++=GetPixelRed(image,p);
+ *q++=(Quantum) (GetPixelAlpha(image,p));
+ p+=GetPixelChannels(image);
+ }
+ }
+ break;
+ }
+ if (LocaleCompare(map,"BGRP") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (p == (const Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ *q++=GetPixelBlue(image,p);
+ *q++=GetPixelGreen(image,p);
+ *q++=GetPixelRed(image,p);
+ *q++=(Quantum) 0;
+ p+=GetPixelChannels(image);
+ }
+ }
+ break;
+ }
+ if (LocaleCompare(map,"I") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (p == (const Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ *q++=GetPixelIntensity(image,p);
+ p+=GetPixelChannels(image);
+ }
+ }
+ break;
+ }
+ if (LocaleCompare(map,"RGB") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (p == (const Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ *q++=GetPixelRed(image,p);
+ *q++=GetPixelGreen(image,p);
+ *q++=GetPixelBlue(image,p);
+ p+=GetPixelChannels(image);
+ }
+ }
+ break;
+ }
+ if (LocaleCompare(map,"RGBA") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (p == (const Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ *q++=GetPixelRed(image,p);
+ *q++=GetPixelGreen(image,p);
+ *q++=GetPixelBlue(image,p);
+ *q++=(Quantum) (GetPixelAlpha(image,p));
+ p+=GetPixelChannels(image);
+ }
+ }
+ break;
+ }
+ if (LocaleCompare(map,"RGBP") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (p == (const Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ *q++=GetPixelRed(image,p);
+ *q++=GetPixelGreen(image,p);
+ *q++=GetPixelBlue(image,p);
+ *q++=(Quantum) 0;
+ p+=GetPixelChannels(image);
+ }
+ }
+ break;
+ }
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (p == (const Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ for (i=0; i < (ssize_t) length; i++)
+ {
+ *q=(Quantum) 0;
+ switch (quantum_map[i])
+ {
+ case RedQuantum:
+ case CyanQuantum:
+ {
+ *q=GetPixelRed(image,p);
+ break;
+ }
+ case GreenQuantum:
+ case MagentaQuantum:
+ {
+ *q=GetPixelGreen(image,p);
+ break;
+ }
+ case BlueQuantum:
+ case YellowQuantum:
+ {
+ *q=GetPixelBlue(image,p);
+ break;
+ }
+ case AlphaQuantum:
+ {
+ *q=(Quantum) (GetPixelAlpha(image,p));
+ break;
+ }
+ case OpacityQuantum:
+ {
+ *q=GetPixelAlpha(image,p);
+ break;
+ }
+ case BlackQuantum:
+ {
+ if (image->colorspace == CMYKColorspace)
+ *q=GetPixelBlack(image,p);
+ break;
+ }
+ case IndexQuantum:
+ {
+ *q=(GetPixelIntensity(image,p));
+ break;
+ }
+ default:
+ *q=(Quantum) 0;
+ }
+ q++;
+ }
+ p+=GetPixelChannels(image);
+ }
+ }
+ break;
+ }
+ case ShortPixel:
+ {
+ register unsigned short
+ *q;
+
+ q=(unsigned short *) pixels;
+ if (LocaleCompare(map,"BGR") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (p == (const Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ *q++=ScaleQuantumToShort(GetPixelBlue(image,p));
+ *q++=ScaleQuantumToShort(GetPixelGreen(image,p));
+ *q++=ScaleQuantumToShort(GetPixelRed(image,p));
+ p+=GetPixelChannels(image);
+ }
+ }
+ break;
+ }
+ if (LocaleCompare(map,"BGRA") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (p == (const Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ *q++=ScaleQuantumToShort(GetPixelBlue(image,p));
+ *q++=ScaleQuantumToShort(GetPixelGreen(image,p));
+ *q++=ScaleQuantumToShort(GetPixelRed(image,p));
+ *q++=ScaleQuantumToShort(GetPixelAlpha(image,p));
+ p+=GetPixelChannels(image);
+ }
+ }
+ break;
+ }
+ if (LocaleCompare(map,"BGRP") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (p == (const Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ *q++=ScaleQuantumToShort(GetPixelBlue(image,p));
+ *q++=ScaleQuantumToShort(GetPixelGreen(image,p));
+ *q++=ScaleQuantumToShort(GetPixelRed(image,p));
+ *q++=0;
+ p+=GetPixelChannels(image);
+ }
+ }
+ break;
+ }
+ if (LocaleCompare(map,"I") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (p == (const Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ *q++=ScaleQuantumToShort(GetPixelIntensity(image,p));
+ p+=GetPixelChannels(image);
+ }
+ }
+ break;
+ }
+ if (LocaleCompare(map,"RGB") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (p == (const Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ *q++=ScaleQuantumToShort(GetPixelRed(image,p));
+ *q++=ScaleQuantumToShort(GetPixelGreen(image,p));
+ *q++=ScaleQuantumToShort(GetPixelBlue(image,p));
+ p+=GetPixelChannels(image);
+ }
+ }
+ break;
+ }
+ if (LocaleCompare(map,"RGBA") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (p == (const Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ *q++=ScaleQuantumToShort(GetPixelRed(image,p));
+ *q++=ScaleQuantumToShort(GetPixelGreen(image,p));
+ *q++=ScaleQuantumToShort(GetPixelBlue(image,p));
+ *q++=ScaleQuantumToShort(GetPixelAlpha(image,p));
+ p+=GetPixelChannels(image);
+ }
+ }
+ break;
+ }
+ if (LocaleCompare(map,"RGBP") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (p == (const Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ *q++=ScaleQuantumToShort(GetPixelRed(image,p));
+ *q++=ScaleQuantumToShort(GetPixelGreen(image,p));
+ *q++=ScaleQuantumToShort(GetPixelBlue(image,p));
+ *q++=0;
+ p+=GetPixelChannels(image);
+ }
+ }
+ break;
+ }
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (p == (const Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ for (i=0; i < (ssize_t) length; i++)
+ {
+ *q=0;
+ switch (quantum_map[i])
+ {
+ case RedQuantum:
+ case CyanQuantum:
+ {
+ *q=ScaleQuantumToShort(GetPixelRed(image,p));
+ break;
+ }
+ case GreenQuantum:
+ case MagentaQuantum:
+ {
+ *q=ScaleQuantumToShort(GetPixelGreen(image,p));
+ break;
+ }
+ case BlueQuantum:
+ case YellowQuantum:
+ {
+ *q=ScaleQuantumToShort(GetPixelBlue(image,p));
+ break;
+ }
+ case AlphaQuantum:
+ {
+ *q=ScaleQuantumToShort(GetPixelAlpha(image,p));
+ break;
+ }
+ case OpacityQuantum:
+ {
+ *q=ScaleQuantumToShort(GetPixelAlpha(image,p));
+ break;
+ }
+ case BlackQuantum:
+ {
+ if (image->colorspace == CMYKColorspace)
+ *q=ScaleQuantumToShort(GetPixelBlack(image,p));
+ break;
+ }
+ case IndexQuantum:
+ {
+ *q=ScaleQuantumToShort(GetPixelIntensity(image,p));
+ break;
+ }
+ default:
+ break;
+ }
+ q++;
+ }
+ p+=GetPixelChannels(image);
+ }
+ }
+ break;
+ }
+ default:
+ {
+ quantum_map=(QuantumType *) RelinquishMagickMemory(quantum_map);
+ (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
+ "UnrecognizedPixelMap","`%s'",map);
+ break;
+ }
+ }
+ quantum_map=(QuantumType *) RelinquishMagickMemory(quantum_map);
+ return(MagickTrue);
+}
+
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% %
+% %
+% %
+% G e t M a g i c k P i x e l P a c k e t %
+% %
+% %
+% %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% GetPixelInfo() initializes the PixelInfo structure.
+%
+% The format of the GetPixelInfo method is:
+%
+% GetPixelInfo(const Image *image,PixelInfo *pixel)
+%
+% A description of each parameter follows:
+%
+% o image: the image.
+%
+% o pixel: Specifies a pointer to a PixelPacket structure.
+%
+*/
+MagickExport void GetPixelInfo(const Image *image,
+ PixelInfo *pixel)
+{
+ pixel->storage_class=DirectClass;
+ pixel->colorspace=RGBColorspace;
+ pixel->matte=MagickFalse;
+ pixel->fuzz=0.0;
+ pixel->depth=MAGICKCORE_QUANTUM_DEPTH;
+ pixel->red=0.0;
+ pixel->green=0.0;
+ pixel->blue=0.0;
+ pixel->black=0.0;
+ pixel->alpha=(MagickRealType) OpaqueAlpha;
+ pixel->index=0.0;
+ if (image == (const Image *) NULL)
+ return;
+ pixel->storage_class=image->storage_class;
+ pixel->colorspace=image->colorspace;
+ pixel->matte=image->matte;
+ pixel->depth=image->depth;
+ pixel->fuzz=image->fuzz;
+}
+
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% %
+% %
+% %
+% I m p o r t I m a g e P i x e l s %
+% %
+% %
+% %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% ImportImagePixels() accepts pixel data and stores in the image at the
+% location you specify. The method returns MagickTrue on success otherwise
+% MagickFalse if an error is encountered. The pixel data can be either char,
+% short int, int, ssize_t, float, or double in the order specified by map.
+%
+% Suppose your want to upload the first scanline of a 640x480 image from
+% character data in red-green-blue order:
+%
+% ImportImagePixels(image,0,0,640,1,"RGB",CharPixel,pixels);
+%
+% The format of the ImportImagePixels method is:
+%
+% MagickBooleanType ImportImagePixels(Image *image,const ssize_t x_offset,
+% const ssize_t y_offset,const size_t columns,
+% const size_t rows,const char *map,const StorageType type,
+% const void *pixels)
+%
+% A description of each parameter follows:
+%
+% o image: the image.
+%
+% o x_offset,y_offset,columns,rows: These values define the perimeter
+% of a region of pixels you want to define.
+%
+% o map: This string reflects the expected ordering of the pixel array.
+% It can be any combination or order of R = red, G = green, B = blue,
+% A = alpha (0 is transparent), O = opacity (0 is opaque), C = cyan,
+% Y = yellow, M = magenta, K = black, I = intensity (for grayscale),
+% P = pad.
+%
+% o type: Define the data type of the pixels. Float and double types are
+% normalized to [0..1] otherwise [0..QuantumRange]. Choose from these
+% types: CharPixel, ShortPixel, IntegerPixel, LongPixel, FloatPixel, or
+% DoublePixel.
+%
+% o pixels: This array of values contain the pixel components as defined by
+% map and type. You must preallocate this array where the expected
+% length varies depending on the values of width, height, map, and type.
+%
+*/
+MagickExport MagickBooleanType ImportImagePixels(Image *image,
+ const ssize_t x_offset,const ssize_t y_offset,const size_t columns,
+ const size_t rows,const char *map,const StorageType type,
+ const void *pixels)
+{
+ ExceptionInfo
+ *exception;
+
+ QuantumType
+ *quantum_map;
+
+ register Quantum
+ *q;
+
+ register ssize_t
+ i,
+ x;
+
+ size_t
+ length;
+
+ ssize_t
+ y;
+
+ /*
+ Allocate image structure.
+ */
+ assert(image != (Image *) NULL);
+ assert(image->signature == MagickSignature);
+ if (image->debug != MagickFalse)
+ (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
+ length=strlen(map);
+ quantum_map=(QuantumType *) AcquireQuantumMemory(length,sizeof(*quantum_map));
+ if (quantum_map == (QuantumType *) NULL)
+ ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed",
+ image->filename);
+ for (i=0; i < (ssize_t) length; i++)
+ {
+ switch (map[i])
+ {
+ case 'a':
+ case 'A':
+ {
+ quantum_map[i]=AlphaQuantum;
+ image->matte=MagickTrue;
+ break;
+ }
+ case 'B':
+ case 'b':
+ {
+ quantum_map[i]=BlueQuantum;
+ break;
+ }
+ case 'C':
+ case 'c':
+ {
+ quantum_map[i]=CyanQuantum;
+ (void) SetImageColorspace(image,CMYKColorspace);
+ break;
+ }
+ case 'g':
+ case 'G':
+ {
+ quantum_map[i]=GreenQuantum;
+ break;
+ }
+ case 'K':
+ case 'k':
+ {
+ quantum_map[i]=BlackQuantum;
+ (void) SetImageColorspace(image,CMYKColorspace);
+ break;
+ }
+ case 'I':
+ case 'i':
+ {
+ quantum_map[i]=IndexQuantum;
+ break;
+ }
+ case 'm':
+ case 'M':
+ {
+ quantum_map[i]=MagentaQuantum;
+ (void) SetImageColorspace(image,CMYKColorspace);
+ break;
+ }
+ case 'O':
+ case 'o':
+ {
+ quantum_map[i]=OpacityQuantum;
+ image->matte=MagickTrue;
+ break;
+ }
+ case 'P':
+ case 'p':
+ {
+ quantum_map[i]=UndefinedQuantum;
+ break;
+ }
+ case 'R':
+ case 'r':
+ {
+ quantum_map[i]=RedQuantum;
+ break;
+ }
+ case 'Y':
+ case 'y':
+ {
+ quantum_map[i]=YellowQuantum;
+ (void) SetImageColorspace(image,CMYKColorspace);
+ break;
+ }
+ default:
+ {
+ quantum_map=(QuantumType *) RelinquishMagickMemory(quantum_map);
+ (void) ThrowMagickException(&image->exception,GetMagickModule(),
+ OptionError,"UnrecognizedPixelMap","`%s'",map);
+ return(MagickFalse);
+ }
+ }
+ }
+ if (SetImageStorageClass(image,DirectClass) == MagickFalse)
+ return(MagickFalse);
+ /*
+ Transfer the pixels from the pixel datarray to the image.
+ */
+ exception=(&image->exception);
+ switch (type)
+ {
+ case CharPixel:
+ {
+ register const unsigned char
+ *p;
+
+ p=(const unsigned char *) pixels;
+ if (LocaleCompare(map,"BGR") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ SetPixelBlue(image,ScaleCharToQuantum(*p++),q);
+ SetPixelGreen(image,ScaleCharToQuantum(*p++),q);
+ SetPixelRed(image,ScaleCharToQuantum(*p++),q);
+ q+=GetPixelChannels(image);
+ }
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ }
+ break;
+ }
+ if (LocaleCompare(map,"BGRA") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ SetPixelBlue(image,ScaleCharToQuantum(*p++),q);
+ SetPixelGreen(image,ScaleCharToQuantum(*p++),q);
+ SetPixelRed(image,ScaleCharToQuantum(*p++),q);
+ SetPixelAlpha(image,ScaleCharToQuantum(*p++),q);
+ q+=GetPixelChannels(image);
+ }
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ }
+ break;
+ }
+ if (LocaleCompare(map,"BGRO") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ SetPixelBlue(image,ScaleCharToQuantum(*p++),q);
+ SetPixelGreen(image,ScaleCharToQuantum(*p++),q);
+ SetPixelRed(image,ScaleCharToQuantum(*p++),q);
+ SetPixelAlpha(image,ScaleCharToQuantum(*p++),q);
+ q+=GetPixelChannels(image);
+ }
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ }
+ break;
+ }
+ if (LocaleCompare(map,"BGRP") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ SetPixelBlue(image,ScaleCharToQuantum(*p++),q);
+ SetPixelGreen(image,ScaleCharToQuantum(*p++),q);
+ SetPixelRed(image,ScaleCharToQuantum(*p++),q);
+ p++;
+ q+=GetPixelChannels(image);
+ }
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ }
+ break;
+ }
+ if (LocaleCompare(map,"I") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ SetPixelRed(image,ScaleCharToQuantum(*p++),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ q+=GetPixelChannels(image);
+ }
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ }
+ break;
+ }
+ if (LocaleCompare(map,"RGB") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ SetPixelRed(image,ScaleCharToQuantum(*p++),q);
+ SetPixelGreen(image,ScaleCharToQuantum(*p++),q);
+ SetPixelBlue(image,ScaleCharToQuantum(*p++),q);
+ q+=GetPixelChannels(image);
+ }
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ }
+ break;
+ }
+ if (LocaleCompare(map,"RGBA") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ SetPixelRed(image,ScaleCharToQuantum(*p++),q);
+ SetPixelGreen(image,ScaleCharToQuantum(*p++),q);
+ SetPixelBlue(image,ScaleCharToQuantum(*p++),q);
+ SetPixelAlpha(image,ScaleCharToQuantum(*p++),q);
+ q+=GetPixelChannels(image);
+ }
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ }
+ break;
+ }
+ if (LocaleCompare(map,"RGBO") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ SetPixelRed(image,ScaleCharToQuantum(*p++),q);
+ SetPixelGreen(image,ScaleCharToQuantum(*p++),q);
+ SetPixelBlue(image,ScaleCharToQuantum(*p++),q);
+ SetPixelAlpha(image,ScaleCharToQuantum(*p++),q);
+ q+=GetPixelChannels(image);
+ }
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ }
+ break;
+ }
+ if (LocaleCompare(map,"RGBP") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ SetPixelRed(image,ScaleCharToQuantum(*p++),q);
+ SetPixelGreen(image,ScaleCharToQuantum(*p++),q);
+ SetPixelBlue(image,ScaleCharToQuantum(*p++),q);
+ p++;
+ q+=GetPixelChannels(image);
+ }
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ }
+ break;
+ }
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ for (i=0; i < (ssize_t) length; i++)
+ {
+ switch (quantum_map[i])
+ {
+ case RedQuantum:
+ case CyanQuantum:
+ {
+ SetPixelRed(image,ScaleCharToQuantum(*p),q);
+ break;
+ }
+ case GreenQuantum:
+ case MagentaQuantum:
+ {
+ SetPixelGreen(image,ScaleCharToQuantum(*p),q);
+ break;
+ }
+ case BlueQuantum:
+ case YellowQuantum:
+ {
+ SetPixelBlue(image,ScaleCharToQuantum(*p),q);
+ break;
+ }
+ case AlphaQuantum:
+ {
+ SetPixelAlpha(image,ScaleCharToQuantum(*p),q);
+ break;
+ }
+ case OpacityQuantum:
+ {
+ SetPixelAlpha(image,ScaleCharToQuantum(*p),q);
+ break;
+ }
+ case BlackQuantum:
+ {
+ SetPixelBlack(image,ScaleCharToQuantum(*p),q);
+ break;
+ }
+ case IndexQuantum:
+ {
+ SetPixelRed(image,ScaleCharToQuantum(*p),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ break;
+ }
+ default:
+ break;
+ }
+ p++;
+ }
+ q+=GetPixelChannels(image);
+ }
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ }
+ break;
+ }
+ case DoublePixel:
+ {
+ register const double
+ *p;
+
+ p=(const double *) pixels;
+ if (LocaleCompare(map,"BGR") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ SetPixelBlue(image,ClampToQuantum((MagickRealType) QuantumRange*
+ (*p)),q);
+ p++;
+ SetPixelGreen(image,ClampToQuantum((MagickRealType) QuantumRange*
+ (*p)),q);
+ p++;
+ SetPixelRed(image,ClampToQuantum((MagickRealType) QuantumRange*
+ (*p)),q);
+ p++;
+ q+=GetPixelChannels(image);
+ }
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ }
+ break;
+ }
+ if (LocaleCompare(map,"BGRA") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ SetPixelBlue(image,ClampToQuantum((MagickRealType) QuantumRange*
+ (*p)),q);
+ p++;
+ SetPixelGreen(image,ClampToQuantum((MagickRealType) QuantumRange*
+ (*p)),q);
+ p++;
+ SetPixelRed(image,ClampToQuantum((MagickRealType) QuantumRange*
+ (*p)),q);
+ p++;
+ SetPixelAlpha(image,ClampToQuantum((MagickRealType) QuantumRange*
+ (*p)),q);
+ p++;
+ q+=GetPixelChannels(image);
+ }
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ }
+ break;
+ }
+ if (LocaleCompare(map,"BGRP") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ SetPixelBlue(image,ClampToQuantum((MagickRealType) QuantumRange*
+ (*p)),q);
+ p++;
+ SetPixelGreen(image,ClampToQuantum((MagickRealType) QuantumRange*
+ (*p)),q);
+ p++;
+ SetPixelRed(image,ClampToQuantum((MagickRealType) QuantumRange*
+ (*p)),q);
+ p++;
+ p++;
+ q+=GetPixelChannels(image);
+ }
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ }
+ break;
+ }
+ if (LocaleCompare(map,"I") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ SetPixelRed(image,ClampToQuantum((MagickRealType) QuantumRange*
+ (*p)),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ p++;
+ q+=GetPixelChannels(image);
+ }
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ }
+ break;
+ }
+ if (LocaleCompare(map,"RGB") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ SetPixelRed(image,ClampToQuantum((MagickRealType) QuantumRange*
+ (*p)),q);
+ p++;
+ SetPixelGreen(image,ClampToQuantum((MagickRealType) QuantumRange*
+ (*p)),q);
+ p++;
+ SetPixelBlue(image,ClampToQuantum((MagickRealType) QuantumRange*
+ (*p)),q);
+ p++;
+ q+=GetPixelChannels(image);
+ }
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ }
+ break;
+ }
+ if (LocaleCompare(map,"RGBA") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ SetPixelRed(image,ClampToQuantum((MagickRealType) QuantumRange*
+ (*p)),q);
+ p++;
+ SetPixelGreen(image,ClampToQuantum((MagickRealType) QuantumRange*
+ (*p)),q);
+ p++;
+ SetPixelBlue(image,ClampToQuantum((MagickRealType) QuantumRange*
+ (*p)),q);
+ p++;
+ SetPixelAlpha(image,ClampToQuantum((MagickRealType) QuantumRange*
+ (*p)),q);
+ p++;
+ q+=GetPixelChannels(image);
+ }
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ }
+ break;
+ }
+ if (LocaleCompare(map,"RGBP") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ SetPixelRed(image,ClampToQuantum((MagickRealType) QuantumRange*
+ (*p)),q);
+ p++;
+ SetPixelGreen(image,ClampToQuantum((MagickRealType) QuantumRange*
+ (*p)),q);
+ p++;
+ SetPixelBlue(image,ClampToQuantum((MagickRealType) QuantumRange*
+ (*p)),q);
+ p++;
+ q+=GetPixelChannels(image);
+ }
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ }
+ break;
+ }
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ for (i=0; i < (ssize_t) length; i++)
+ {
+ switch (quantum_map[i])
+ {
+ case RedQuantum:
+ case CyanQuantum:
+ {
+ SetPixelRed(image,ClampToQuantum((MagickRealType)
+ QuantumRange*(*p)),q);
+ break;
+ }
+ case GreenQuantum:
+ case MagentaQuantum:
+ {
+ SetPixelGreen(image,ClampToQuantum((MagickRealType)
+ QuantumRange*(*p)),q);
+ break;
+ }
+ case BlueQuantum:
+ case YellowQuantum:
+ {
+ SetPixelBlue(image,ClampToQuantum((MagickRealType)
+ QuantumRange*(*p)),q);
+ break;
+ }
+ case AlphaQuantum:
+ {
+ SetPixelAlpha(image,ClampToQuantum((MagickRealType)
+ QuantumRange*(*p)),q);
+ break;
+ }
+ case OpacityQuantum:
+ {
+ SetPixelAlpha(image,ClampToQuantum((MagickRealType)
+ QuantumRange*(*p)),q);
+ break;
+ }
+ case BlackQuantum:
+ {
+ SetPixelBlack(image,ClampToQuantum((MagickRealType)
+ QuantumRange*(*p)),q);
+ break;
+ }
+ case IndexQuantum:
+ {
+ SetPixelRed(image,ClampToQuantum((MagickRealType)
+ QuantumRange*(*p)),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ break;
+ }
+ default:
+ break;
+ }
+ p++;
+ }
+ q+=GetPixelChannels(image);
+ }
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ }
+ break;
+ }
+ case FloatPixel:
+ {
+ register const float
+ *p;
+
+ p=(const float *) pixels;
+ if (LocaleCompare(map,"BGR") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ SetPixelBlue(image,ClampToQuantum((MagickRealType) QuantumRange*
+ (*p)),q);
+ p++;
+ SetPixelGreen(image,ClampToQuantum((MagickRealType) QuantumRange*
+ (*p)),q);
+ p++;
+ SetPixelRed(image,ClampToQuantum((MagickRealType) QuantumRange*
+ (*p)),q);
+ p++;
+ q+=GetPixelChannels(image);
+ }
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ }
+ break;
+ }
+ if (LocaleCompare(map,"BGRA") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ SetPixelBlue(image,ClampToQuantum((MagickRealType) QuantumRange*
+ (*p)),q);
+ p++;
+ SetPixelGreen(image,ClampToQuantum((MagickRealType) QuantumRange*
+ (*p)),q);
+ p++;
+ SetPixelRed(image,ClampToQuantum((MagickRealType) QuantumRange*
+ (*p)),q);
+ p++;
+ SetPixelAlpha(image,ClampToQuantum((MagickRealType) QuantumRange*
+ (*p)),q);
+ p++;
+ q+=GetPixelChannels(image);
+ }
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ }
+ break;
+ }
+ if (LocaleCompare(map,"BGRP") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ SetPixelBlue(image,ClampToQuantum((MagickRealType) QuantumRange*
+ (*p)),q);
+ p++;
+ SetPixelGreen(image,ClampToQuantum((MagickRealType) QuantumRange*
+ (*p)),q);
+ p++;
+ SetPixelRed(image,ClampToQuantum((MagickRealType) QuantumRange*
+ (*p)),q);
+ p++;
+ p++;
+ q+=GetPixelChannels(image);
+ }
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ }
+ break;
+ }
+ if (LocaleCompare(map,"I") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ SetPixelRed(image,ClampToQuantum((MagickRealType) QuantumRange*
+ (*p)),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ p++;
+ q+=GetPixelChannels(image);
+ }
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ }
+ break;
+ }
+ if (LocaleCompare(map,"RGB") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ SetPixelRed(image,ClampToQuantum((MagickRealType) QuantumRange*
+ (*p)),q);
+ p++;
+ SetPixelGreen(image,ClampToQuantum((MagickRealType) QuantumRange*
+ (*p)),q);
+ p++;
+ SetPixelBlue(image,ClampToQuantum((MagickRealType) QuantumRange*
+ (*p)),q);
+ p++;
+ q+=GetPixelChannels(image);
+ }
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ }
+ break;
+ }
+ if (LocaleCompare(map,"RGBA") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ SetPixelRed(image,ClampToQuantum((MagickRealType)
+ QuantumRange*(*p)),q);
+ p++;
+ SetPixelGreen(image,ClampToQuantum((MagickRealType) QuantumRange*
+ (*p)),q);
+ p++;
+ SetPixelBlue(image,ClampToQuantum((MagickRealType) QuantumRange*
+ (*p)),q);
+ p++;
+ SetPixelAlpha(image,ClampToQuantum((MagickRealType) QuantumRange*
+ (*p)),q);
+ p++;
+ q+=GetPixelChannels(image);
+ }
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ }
+ break;
+ }
+ if (LocaleCompare(map,"RGBP") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ SetPixelRed(image,ClampToQuantum((MagickRealType) QuantumRange*
+ (*p)),q);
+ p++;
+ SetPixelGreen(image,ClampToQuantum((MagickRealType) QuantumRange*
+ (*p)),q);
+ p++;
+ SetPixelBlue(image,ClampToQuantum((MagickRealType) QuantumRange*
+ (*p)),q);
+ p++;
+ q+=GetPixelChannels(image);
+ }
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ }
+ break;
+ }
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ for (i=0; i < (ssize_t) length; i++)
+ {
+ switch (quantum_map[i])
+ {
+ case RedQuantum:
+ case CyanQuantum:
+ {
+ SetPixelRed(image,ClampToQuantum((MagickRealType)
+ QuantumRange*(*p)),q);
+ break;
+ }
+ case GreenQuantum:
+ case MagentaQuantum:
+ {
+ SetPixelGreen(image,ClampToQuantum((MagickRealType)
+ QuantumRange*(*p)),q);
+ break;
+ }
+ case BlueQuantum:
+ case YellowQuantum:
+ {
+ SetPixelBlue(image,ClampToQuantum((MagickRealType)
+ QuantumRange*(*p)),q);
+ break;
+ }
+ case AlphaQuantum:
+ {
+ SetPixelAlpha(image,ClampToQuantum((MagickRealType)
+ QuantumRange*(*p)),q);
+ break;
+ }
+ case OpacityQuantum:
+ {
+ SetPixelAlpha(image,ClampToQuantum((MagickRealType)
+ QuantumRange*(*p)),q);
+ break;
+ }
+ case BlackQuantum:
+ {
+ SetPixelBlack(image,ClampToQuantum((MagickRealType)
+ QuantumRange*(*p)),q);
+ break;
+ }
+ case IndexQuantum:
+ {
+ SetPixelRed(image,ClampToQuantum((MagickRealType)
+ QuantumRange*(*p)),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ break;
+ }
+ default:
+ break;
+ }
+ p++;
+ }
+ q+=GetPixelChannels(image);
+ }
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ }
+ break;
+ }
+ case IntegerPixel:
+ {
+ register const unsigned int
+ *p;
+
+ p=(const unsigned int *) pixels;
+ if (LocaleCompare(map,"BGR") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ SetPixelBlue(image,ScaleLongToQuantum(*p++),q);
+ SetPixelGreen(image,ScaleLongToQuantum(*p++),q);
+ SetPixelRed(image,ScaleLongToQuantum(*p++),q);
+ q+=GetPixelChannels(image);
+ }
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ }
+ break;
+ }
+ if (LocaleCompare(map,"BGRA") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ SetPixelBlue(image,ScaleLongToQuantum(*p++),q);
+ SetPixelGreen(image,ScaleLongToQuantum(*p++),q);
+ SetPixelRed(image,ScaleLongToQuantum(*p++),q);
+ SetPixelAlpha(image,ScaleLongToQuantum(*p++),q);
+ q+=GetPixelChannels(image);
+ }
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ }
+ break;
+ }
+ if (LocaleCompare(map,"BGRP") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ SetPixelBlue(image,ScaleLongToQuantum(*p++),q);
+ SetPixelGreen(image,ScaleLongToQuantum(*p++),q);
+ SetPixelRed(image,ScaleLongToQuantum(*p++),q);
+ p++;
+ q+=GetPixelChannels(image);
+ }
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ }
+ break;
+ }
+ if (LocaleCompare(map,"I") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ SetPixelRed(image,ScaleLongToQuantum(*p++),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ q+=GetPixelChannels(image);
+ }
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ }
+ break;
+ }
+ if (LocaleCompare(map,"RGB") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ SetPixelRed(image,ScaleLongToQuantum(*p++),q);
+ SetPixelGreen(image,ScaleLongToQuantum(*p++),q);
+ SetPixelBlue(image,ScaleLongToQuantum(*p++),q);
+ q+=GetPixelChannels(image);
+ }
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ }
+ break;
+ }
+ if (LocaleCompare(map,"RGBA") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ SetPixelRed(image,ScaleLongToQuantum(*p++),q);
+ SetPixelGreen(image,ScaleLongToQuantum(*p++),q);
+ SetPixelBlue(image,ScaleLongToQuantum(*p++),q);
+ SetPixelAlpha(image,ScaleLongToQuantum(*p++),q);
+ q+=GetPixelChannels(image);
+ }
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ }
+ break;
+ }
+ if (LocaleCompare(map,"RGBP") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ SetPixelRed(image,ScaleLongToQuantum(*p++),q);
+ SetPixelGreen(image,ScaleLongToQuantum(*p++),q);
+ SetPixelBlue(image,ScaleLongToQuantum(*p++),q);
+ p++;
+ q+=GetPixelChannels(image);
+ }
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ }
+ break;
+ }
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ for (i=0; i < (ssize_t) length; i++)
+ {
+ switch (quantum_map[i])
+ {
+ case RedQuantum:
+ case CyanQuantum:
+ {
+ SetPixelRed(image,ScaleLongToQuantum(*p),q);
+ break;
+ }
+ case GreenQuantum:
+ case MagentaQuantum:
+ {
+ SetPixelGreen(image,ScaleLongToQuantum(*p),q);
+ break;
+ }
+ case BlueQuantum:
+ case YellowQuantum:
+ {
+ SetPixelBlue(image,ScaleLongToQuantum(*p),q);
+ break;
+ }
+ case AlphaQuantum:
+ {
+ SetPixelAlpha(image,ScaleLongToQuantum(*p),q);
+ break;
+ }
+ case OpacityQuantum:
+ {
+ SetPixelAlpha(image,ScaleLongToQuantum(*p),q);
+ break;
+ }
+ case BlackQuantum:
+ {
+ SetPixelBlack(image,ScaleLongToQuantum(*p),q);
+ break;
+ }
+ case IndexQuantum:
+ {
+ SetPixelRed(image,ScaleLongToQuantum(*p),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ break;
+ }
+ default:
+ break;
+ }
+ p++;
+ }
+ q+=GetPixelChannels(image);
+ }
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ }
+ break;
+ }
+ case LongPixel:
+ {
+ register const unsigned int
+ *p;
+
+ p=(const unsigned int *) pixels;
+ if (LocaleCompare(map,"BGR") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ SetPixelBlue(image,ScaleLongToQuantum(*p++),q);
+ SetPixelGreen(image,ScaleLongToQuantum(*p++),q);
+ SetPixelRed(image,ScaleLongToQuantum(*p++),q);
+ q+=GetPixelChannels(image);
+ }
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ }
+ break;
+ }
+ if (LocaleCompare(map,"BGRA") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ SetPixelBlue(image,ScaleLongToQuantum(*p++),q);
+ SetPixelGreen(image,ScaleLongToQuantum(*p++),q);
+ SetPixelRed(image,ScaleLongToQuantum(*p++),q);
+ SetPixelAlpha(image,ScaleLongToQuantum(*p++),q);
+ q+=GetPixelChannels(image);
+ }
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ }
+ break;
+ }
+ if (LocaleCompare(map,"BGRP") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ SetPixelBlue(image,ScaleLongToQuantum(*p++),q);
+ SetPixelGreen(image,ScaleLongToQuantum(*p++),q);
+ SetPixelRed(image,ScaleLongToQuantum(*p++),q);
+ p++;
+ q+=GetPixelChannels(image);
+ }
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ }
+ break;
+ }
+ if (LocaleCompare(map,"I") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ SetPixelRed(image,ScaleLongToQuantum(*p++),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ q+=GetPixelChannels(image);
+ }
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ }
+ break;
+ }
+ if (LocaleCompare(map,"RGB") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ SetPixelRed(image,ScaleLongToQuantum(*p++),q);
+ SetPixelGreen(image,ScaleLongToQuantum(*p++),q);
+ SetPixelBlue(image,ScaleLongToQuantum(*p++),q);
+ q+=GetPixelChannels(image);
+ }
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ }
+ break;
+ }
+ if (LocaleCompare(map,"RGBA") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ SetPixelRed(image,ScaleLongToQuantum(*p++),q);
+ SetPixelGreen(image,ScaleLongToQuantum(*p++),q);
+ SetPixelBlue(image,ScaleLongToQuantum(*p++),q);
+ SetPixelAlpha(image,ScaleLongToQuantum(*p++),q);
+ q+=GetPixelChannels(image);
+ }
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ }
+ break;
+ }
+ if (LocaleCompare(map,"RGBP") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ SetPixelRed(image,ScaleLongToQuantum(*p++),q);
+ SetPixelGreen(image,ScaleLongToQuantum(*p++),q);
+ SetPixelBlue(image,ScaleLongToQuantum(*p++),q);
+ p++;
+ q+=GetPixelChannels(image);
+ }
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ }
+ break;
+ }
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ for (i=0; i < (ssize_t) length; i++)
+ {
+ switch (quantum_map[i])
+ {
+ case RedQuantum:
+ case CyanQuantum:
+ {
+ SetPixelRed(image,ScaleLongToQuantum(*p),q);
+ break;
+ }
+ case GreenQuantum:
+ case MagentaQuantum:
+ {
+ SetPixelGreen(image,ScaleLongToQuantum(*p),q);
+ break;
+ }
+ case BlueQuantum:
+ case YellowQuantum:
+ {
+ SetPixelBlue(image,ScaleLongToQuantum(*p),q);
+ break;
+ }
+ case AlphaQuantum:
+ {
+ SetPixelAlpha(image,ScaleLongToQuantum(*p),q);
+ break;
+ }
+ case OpacityQuantum:
+ {
+ SetPixelAlpha(image,ScaleLongToQuantum(*p),q);
+ break;
+ }
+ case BlackQuantum:
+ {
+ SetPixelBlack(image,ScaleLongToQuantum(*p),q);
+ break;
+ }
+ case IndexQuantum:
+ {
+ SetPixelRed(image,ScaleLongToQuantum(*p),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ break;
+ }
+ default:
+ break;
+ }
+ p++;
+ }
+ q+=GetPixelChannels(image);
+ }
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ }
+ break;
+ }
+ case QuantumPixel:
+ {
+ register const Quantum
+ *p;
+
+ p=(const Quantum *) pixels;
+ if (LocaleCompare(map,"BGR") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ SetPixelBlue(image,*p++,q);
+ SetPixelGreen(image,*p++,q);
+ SetPixelRed(image,*p++,q);
+ q+=GetPixelChannels(image);
+ }
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ }
+ break;
+ }
+ if (LocaleCompare(map,"BGRA") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ SetPixelBlue(image,*p++,q);
+ SetPixelGreen(image,*p++,q);
+ SetPixelRed(image,*p++,q);
+ SetPixelAlpha(image,*p++,q);
+ q+=GetPixelChannels(image);
+ }
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ }
+ break;
+ }
+ if (LocaleCompare(map,"BGRP") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ SetPixelBlue(image,*p++,q);
+ SetPixelGreen(image,*p++,q);
+ SetPixelRed(image,*p++,q);
+ p++;
+ q+=GetPixelChannels(image);
+ }
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ }
+ break;
+ }
+ if (LocaleCompare(map,"I") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ SetPixelRed(image,*p++,q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ q+=GetPixelChannels(image);
+ }
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ }
+ break;
+ }
+ if (LocaleCompare(map,"RGB") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ SetPixelRed(image,*p++,q);
+ SetPixelGreen(image,*p++,q);
+ SetPixelBlue(image,*p++,q);
+ q+=GetPixelChannels(image);
+ }
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ }
+ break;
+ }
+ if (LocaleCompare(map,"RGBA") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ SetPixelRed(image,*p++,q);
+ SetPixelGreen(image,*p++,q);
+ SetPixelBlue(image,*p++,q);
+ SetPixelAlpha(image,*p++,q);
+ q+=GetPixelChannels(image);
+ }
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ }
+ break;
+ }
+ if (LocaleCompare(map,"RGBP") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ SetPixelRed(image,*p++,q);
+ SetPixelGreen(image,*p++,q);
+ SetPixelBlue(image,*p++,q);
+ p++;
+ q+=GetPixelChannels(image);
+ }
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ }
+ break;
+ }
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ for (i=0; i < (ssize_t) length; i++)
+ {
+ switch (quantum_map[i])
+ {
+ case RedQuantum:
+ case CyanQuantum:
+ {
+ SetPixelRed(image,*p,q);
+ break;
+ }
+ case GreenQuantum:
+ case MagentaQuantum:
+ {
+ SetPixelGreen(image,*p,q);
+ break;
+ }
+ case BlueQuantum:
+ case YellowQuantum:
+ {
+ SetPixelBlue(image,*p,q);
+ break;
+ }
+ case AlphaQuantum:
+ {
+ SetPixelAlpha(image,*p,q);
+ break;
+ }
+ case OpacityQuantum:
+ {
+ SetPixelAlpha(image,*p,q);
+ break;
+ }
+ case BlackQuantum:
+ {
+ SetPixelBlack(image,*p,q);
+ break;
+ }
+ case IndexQuantum:
+ {
+ SetPixelRed(image,*p,q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ break;
+ }
+ default:
+ break;
+ }
+ p++;
+ }
+ q+=GetPixelChannels(image);
+ }
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ }
+ break;
+ }
+ case ShortPixel:
+ {
+ register const unsigned short
+ *p;
+
+ p=(const unsigned short *) pixels;
+ if (LocaleCompare(map,"BGR") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ SetPixelBlue(image,ScaleShortToQuantum(*p++),q);
+ SetPixelGreen(image,ScaleShortToQuantum(*p++),q);
+ SetPixelRed(image,ScaleShortToQuantum(*p++),q);
+ q+=GetPixelChannels(image);
+ }
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ }
+ break;
+ }
+ if (LocaleCompare(map,"BGRA") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ SetPixelBlue(image,ScaleShortToQuantum(*p++),q);
+ SetPixelGreen(image,ScaleShortToQuantum(*p++),q);
+ SetPixelRed(image,ScaleShortToQuantum(*p++),q);
+ SetPixelAlpha(image,ScaleShortToQuantum(*p++),q);
+ q+=GetPixelChannels(image);
+ }
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ }
+ break;
+ }
+ if (LocaleCompare(map,"BGRP") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ SetPixelBlue(image,ScaleShortToQuantum(*p++),q);
+ SetPixelGreen(image,ScaleShortToQuantum(*p++),q);
+ SetPixelRed(image,ScaleShortToQuantum(*p++),q);
+ p++;
+ q+=GetPixelChannels(image);
+ }
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ }
+ break;
+ }
+ if (LocaleCompare(map,"I") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ SetPixelRed(image,ScaleShortToQuantum(*p++),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ q+=GetPixelChannels(image);
+ }
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ }
+ break;
+ }
+ if (LocaleCompare(map,"RGB") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ SetPixelRed(image,ScaleShortToQuantum(*p++),q);
+ SetPixelGreen(image,ScaleShortToQuantum(*p++),q);
+ SetPixelBlue(image,ScaleShortToQuantum(*p++),q);
+ q+=GetPixelChannels(image);
+ }
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ }
+ break;
+ }
+ if (LocaleCompare(map,"RGBA") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ SetPixelRed(image,ScaleShortToQuantum(*p++),q);
+ SetPixelGreen(image,ScaleShortToQuantum(*p++),q);
+ SetPixelBlue(image,ScaleShortToQuantum(*p++),q);
+ SetPixelAlpha(image,ScaleShortToQuantum(*p++),q);
+ q+=GetPixelChannels(image);
+ }
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ }
+ break;
+ }
+ if (LocaleCompare(map,"RGBP") == 0)
+ {
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ SetPixelRed(image,ScaleShortToQuantum(*p++),q);
+ SetPixelGreen(image,ScaleShortToQuantum(*p++),q);
+ SetPixelBlue(image,ScaleShortToQuantum(*p++),q);
+ p++;
+ q+=GetPixelChannels(image);
+ }
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ }
+ break;
+ }
+ for (y=0; y < (ssize_t) rows; y++)
+ {
+ q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
+ if (q == (Quantum *) NULL)
+ break;
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ for (i=0; i < (ssize_t) length; i++)
+ {
+ switch (quantum_map[i])
+ {
+ case RedQuantum:
+ case CyanQuantum:
+ {
+ SetPixelRed(image,ScaleShortToQuantum(*p),q);
+ break;
+ }
+ case GreenQuantum:
+ case MagentaQuantum:
+ {
+ SetPixelGreen(image,ScaleShortToQuantum(*p),q);
+ break;
+ }
+ case BlueQuantum:
+ case YellowQuantum:
+ {
+ SetPixelBlue(image,ScaleShortToQuantum(*p),q);
+ break;
+ }
+ case AlphaQuantum:
+ {
+ SetPixelAlpha(image,ScaleShortToQuantum(*p),q);
+ break;
+ }
+ case OpacityQuantum:
+ {
+ SetPixelAlpha(image,ScaleShortToQuantum(*p),q);
+ break;
+ }
+ case BlackQuantum:
+ {
+ SetPixelBlack(image,ScaleShortToQuantum(*p),q);
+ break;
+ }
+ case IndexQuantum:
+ {
+ SetPixelRed(image,ScaleShortToQuantum(*p),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ break;
+ }
+ default:
+ break;
+ }
+ p++;
+ }
+ q+=GetPixelChannels(image);
+ }
+ if (SyncAuthenticPixels(image,exception) == MagickFalse)
+ break;
+ }
+ break;
+ }
+ default:
+ {
+ quantum_map=(QuantumType *) RelinquishMagickMemory(quantum_map);
+ (void) ThrowMagickException(&image->exception,GetMagickModule(),
+ OptionError,"UnrecognizedPixelMap","`%s'",map);
+ break;
+ }
+ }
+ quantum_map=(QuantumType *) RelinquishMagickMemory(quantum_map);
+ return(MagickTrue);
+}
+
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% %
+% %
+% %
+% I n t e r p o l a t e M a g i c k P i x e l P a c k e t %
+% %
+% %
+% %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% InterpolatePixelInfo() applies bi-linear or tri-linear interpolation
+% between a floating point coordinate and the pixels surrounding that
+% coordinate. No pixel area resampling, or scaling of the result is
+% performed.
+%
+% The format of the InterpolatePixelInfo method is:
+%
+% MagickBooleanType InterpolatePixelInfo(const Image *image,
+% const CacheView *image_view,const InterpolatePixelMethod method,
+% const double x,const double y,PixelInfo *pixel,
+% ExceptionInfo *exception)
+%
+% A description of each parameter follows:
+%
+% o image: the image.
+%
+% o image_view: the image view.
+%
+% o method: the pixel color interpolation method.
+%
+% o x,y: A double representing the current (x,y) position of the pixel.
+%
+% o pixel: return the interpolated pixel here.
+%
+% o exception: return any errors or warnings in this structure.
+%
+*/
+
+static inline void AlphaBlendPixelInfo(const Image *image,
+ const Quantum *pixel,PixelInfo *pixel_info,MagickRealType *alpha)
+{
+ if (image->matte == MagickFalse)
+ {
+ *alpha=1.0;
+ pixel_info->red=(MagickRealType) GetPixelRed(image,pixel);
+ pixel_info->green=(MagickRealType) GetPixelGreen(image,pixel);
+ pixel_info->blue=(MagickRealType) GetPixelBlue(image,pixel);
+ pixel_info->black=0.0;
+ if (image->colorspace == CMYKColorspace)
+ pixel_info->black=(MagickRealType) GetPixelBlack(image,pixel);
+ pixel_info->alpha=(MagickRealType) GetPixelAlpha(image,pixel);
+ return;
+ }
+ *alpha=QuantumScale*GetPixelAlpha(image,pixel);
+ pixel_info->red=(*alpha*GetPixelRed(image,pixel));
+ pixel_info->green=(*alpha*GetPixelGreen(image,pixel));
+ pixel_info->blue=(*alpha*GetPixelBlue(image,pixel));
+ pixel_info->black=0.0;
+ if (image->colorspace == CMYKColorspace)
+ pixel_info->black=(*alpha*GetPixelBlack(image,pixel));
+ pixel_info->alpha=(MagickRealType) GetPixelAlpha(image,pixel);
+}
+
+static void BicubicInterpolate(const PixelInfo *pixels,const double dx,
+ PixelInfo *pixel)
+{
+ MagickRealType
+ dx2,
+ p,
+ q,
+ r,
+ s;
+
+ dx2=dx*dx;
+ p=(pixels[3].red-pixels[2].red)-(pixels[0].red-pixels[1].red);
+ q=(pixels[0].red-pixels[1].red)-p;
+ r=pixels[2].red-pixels[0].red;
+ s=pixels[1].red;
+ pixel->red=(dx*dx2*p)+(dx2*q)+(dx*r)+s;
+ p=(pixels[3].green-pixels[2].green)-(pixels[0].green-pixels[1].green);
+ q=(pixels[0].green-pixels[1].green)-p;
+ r=pixels[2].green-pixels[0].green;
+ s=pixels[1].green;
+ pixel->green=(dx*dx2*p)+(dx2*q)+(dx*r)+s;
+ p=(pixels[3].blue-pixels[2].blue)-(pixels[0].blue-pixels[1].blue);
+ q=(pixels[0].blue-pixels[1].blue)-p;
+ r=pixels[2].blue-pixels[0].blue;
+ s=pixels[1].blue;
+ pixel->blue=(dx*dx2*p)+(dx2*q)+(dx*r)+s;
+ p=(pixels[3].alpha-pixels[2].alpha)-(pixels[0].alpha-pixels[1].alpha);
+ q=(pixels[0].alpha-pixels[1].alpha)-p;
+ r=pixels[2].alpha-pixels[0].alpha;
+ s=pixels[1].alpha;
+ pixel->alpha=(dx*dx2*p)+(dx2*q)+(dx*r)+s;
+ if (pixel->colorspace == CMYKColorspace)
+ {
+ p=(pixels[3].black-pixels[2].black)-(pixels[0].black-pixels[1].black);
+ q=(pixels[0].black-pixels[1].black)-p;
+ r=pixels[2].black-pixels[0].black;
+ s=pixels[1].black;
+ pixel->black=(dx*dx2*p)+(dx2*q)+(dx*r)+s;
+ }
+}
+
+static inline double MagickMax(const MagickRealType x,const MagickRealType y)
+{
+ if (x > y)
+ return(x);
+ return(y);
+}
+
+static inline MagickRealType CubicWeightingFunction(const MagickRealType x)
+{
+ MagickRealType
+ alpha,
+ gamma;
+
+ alpha=MagickMax(x+2.0,0.0);
+ gamma=1.0*alpha*alpha*alpha;
+ alpha=MagickMax(x+1.0,0.0);
+ gamma-=4.0*alpha*alpha*alpha;
+ alpha=MagickMax(x+0.0,0.0);
+ gamma+=6.0*alpha*alpha*alpha;
+ alpha=MagickMax(x-1.0,0.0);
+ gamma-=4.0*alpha*alpha*alpha;
+ return(gamma/6.0);
+}
+
+static inline double MeshInterpolate(const PointInfo *delta,const double p,
+ const double x,const double y)
+{
+ return(delta->x*x+delta->y*y+(1.0-delta->x-delta->y)*p);
+}
+
+static inline ssize_t NearestNeighbor(const MagickRealType x)
+{
+ if (x >= 0.0)
+ return((ssize_t) (x+0.5));
+ return((ssize_t) (x-0.5));
+}
+
+MagickExport MagickBooleanType InterpolatePixelInfo(const Image *image,
+ const CacheView *image_view,const InterpolatePixelMethod method,
+ const double x,const double y,PixelInfo *pixel,ExceptionInfo *exception)
+{
+ MagickBooleanType
+ status;
+
+ PixelInfo
+ pixels[16];
+
+ MagickRealType
+ alpha[16],
+ gamma;
+
+ register const Quantum
+ *p;
+
+ register ssize_t
+ i;
+
+ ssize_t
+ x_offset,
+ y_offset;
+
+ assert(image != (Image *) NULL);
+ assert(image->signature == MagickSignature);
+ assert(image_view != (CacheView *) NULL);
+ status=MagickTrue;
+ x_offset=(ssize_t) floor(x);
+ y_offset=(ssize_t) floor(y);
+ switch (method == UndefinedInterpolatePixel ? image->interpolate : method)
+ {
+ case AverageInterpolatePixel:
+ {
+ p=GetCacheViewVirtualPixels(image_view,x_offset-1,y_offset-1,4,4,
+ exception);
+ if (p == (const Quantum *) NULL)
+ {
+ status=MagickFalse;
+ break;
+ }
+ AlphaBlendPixelInfo(image,p+0*GetPixelChannels(image),pixels+0,alpha+0);
+ AlphaBlendPixelInfo(image,p+1*GetPixelChannels(image),pixels+1,alpha+1);
+ AlphaBlendPixelInfo(image,p+2*GetPixelChannels(image),pixels+2,alpha+2);
+ AlphaBlendPixelInfo(image,p+3*GetPixelChannels(image),pixels+3,alpha+3);
+ AlphaBlendPixelInfo(image,p+4*GetPixelChannels(image),pixels+4,alpha+4);
+ AlphaBlendPixelInfo(image,p+5*GetPixelChannels(image),pixels+5,alpha+5);
+ AlphaBlendPixelInfo(image,p+6*GetPixelChannels(image),pixels+6,alpha+6);
+ AlphaBlendPixelInfo(image,p+7*GetPixelChannels(image),pixels+7,alpha+7);
+ AlphaBlendPixelInfo(image,p+8*GetPixelChannels(image),pixels+8,alpha+8);
+ AlphaBlendPixelInfo(image,p+9*GetPixelChannels(image),pixels+9,alpha+9);
+ AlphaBlendPixelInfo(image,p+10*GetPixelChannels(image),pixels+10,
+ alpha+10);
+ AlphaBlendPixelInfo(image,p+11*GetPixelChannels(image),pixels+11,
+ alpha+11);
+ AlphaBlendPixelInfo(image,p+12*GetPixelChannels(image),pixels+12,
+ alpha+12);
+ AlphaBlendPixelInfo(image,p+13*GetPixelChannels(image),pixels+13,
+ alpha+13);
+ AlphaBlendPixelInfo(image,p+14*GetPixelChannels(image),pixels+14,
+ alpha+14);
+ AlphaBlendPixelInfo(image,p+15,pixels+15,alpha+15);
+ pixel->red=0.0;
+ pixel->green=0.0;
+ pixel->blue=0.0;
+ pixel->alpha=0.0;
+ pixel->black=0.0;
+ for (i=0; i < 16L; i++)
+ {
+ gamma=1.0/(fabs((double) alpha[i]) <= MagickEpsilon ? 1.0 : alpha[i]);
+ pixel->red+=gamma*0.0625*pixels[i].red;
+ pixel->green+=gamma*0.0625*pixels[i].green;
+ pixel->blue+=gamma*0.0625*pixels[i].blue;
+ pixel->alpha+=0.0625*pixels[i].alpha;
+ if (image->colorspace == CMYKColorspace)
+ pixel->black+=gamma*0.0625*pixels[i].black;
+ }
+ break;
+ }
+ case BicubicInterpolatePixel:
+ {
+ PixelInfo
+ u[4];
+
+ PointInfo
+ delta;
+
+ p=GetCacheViewVirtualPixels(image_view,x_offset-1,y_offset-1,4,4,
+ exception);
+ if (p == (const Quantum *) NULL)
+ {
+ status=MagickFalse;
+ break;
+ }
+ AlphaBlendPixelInfo(image,p+0*GetPixelChannels(image),pixels+0,alpha+0);
+ AlphaBlendPixelInfo(image,p+1*GetPixelChannels(image),pixels+1,alpha+1);
+ AlphaBlendPixelInfo(image,p+2*GetPixelChannels(image),pixels+2,alpha+2);
+ AlphaBlendPixelInfo(image,p+3*GetPixelChannels(image),pixels+3,alpha+3);
+ AlphaBlendPixelInfo(image,p+4*GetPixelChannels(image),pixels+4,alpha+4);
+ AlphaBlendPixelInfo(image,p+5*GetPixelChannels(image),pixels+5,alpha+5);
+ AlphaBlendPixelInfo(image,p+6*GetPixelChannels(image),pixels+6,alpha+6);
+ AlphaBlendPixelInfo(image,p+7*GetPixelChannels(image),pixels+7,alpha+7);
+ AlphaBlendPixelInfo(image,p+8*GetPixelChannels(image),pixels+8,alpha+8);
+ AlphaBlendPixelInfo(image,p+9*GetPixelChannels(image),pixels+9,alpha+9);
+ AlphaBlendPixelInfo(image,p+10*GetPixelChannels(image),pixels+10,
+ alpha+10);
+ AlphaBlendPixelInfo(image,p+11*GetPixelChannels(image),pixels+11,
+ alpha+11);
+ AlphaBlendPixelInfo(image,p+12*GetPixelChannels(image),pixels+12,
+ alpha+12);
+ AlphaBlendPixelInfo(image,p+13*GetPixelChannels(image),pixels+13,
+ alpha+13);
+ AlphaBlendPixelInfo(image,p+14*GetPixelChannels(image),pixels+14,
+ alpha+14);
+ AlphaBlendPixelInfo(image,p+15*GetPixelChannels(image),pixels+15,
+ alpha+15);
+ delta.x=x-x_offset;
+ delta.y=y-y_offset;
+ for (i=0; i < 4L; i++)
+ BicubicInterpolate(pixels+4*i,delta.x,u+i);
+ BicubicInterpolate(u,delta.y,pixel);
+ break;
+ }
+ case BilinearInterpolatePixel:
+ default:
+ {
+ PointInfo
+ delta,
+ epsilon;
+
+ p=GetCacheViewVirtualPixels(image_view,x_offset,y_offset,2,2,exception);
+ if (p == (const Quantum *) NULL)
+ {
+ status=MagickFalse;
+ break;
+ }
+ AlphaBlendPixelInfo(image,p+0*GetPixelChannels(image),pixels+0,alpha+0);
+ AlphaBlendPixelInfo(image,p+1*GetPixelChannels(image),pixels+1,alpha+1);
+ AlphaBlendPixelInfo(image,p+2*GetPixelChannels(image),pixels+2,alpha+2);
+ AlphaBlendPixelInfo(image,p+3*GetPixelChannels(image),pixels+3,alpha+3);
+ delta.x=x-x_offset;
+ delta.y=y-y_offset;
+ epsilon.x=1.0-delta.x;
+ epsilon.y=1.0-delta.y;
+ gamma=((epsilon.y*(epsilon.x*alpha[0]+delta.x*alpha[1])+delta.y*
+ (epsilon.x*alpha[2]+delta.x*alpha[3])));
+ gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
+ pixel->red=gamma*(epsilon.y*(epsilon.x*pixels[0].red+delta.x*
+ pixels[1].red)+delta.y*(epsilon.x*pixels[2].red+delta.x*pixels[3].red));
+ pixel->green=gamma*(epsilon.y*(epsilon.x*pixels[0].green+delta.x*
+ pixels[1].green)+delta.y*(epsilon.x*pixels[2].green+delta.x*
+ pixels[3].green));
+ pixel->blue=gamma*(epsilon.y*(epsilon.x*pixels[0].blue+delta.x*
+ pixels[1].blue)+delta.y*(epsilon.x*pixels[2].blue+delta.x*
+ pixels[3].blue));
+ pixel->alpha=(epsilon.y*(epsilon.x*pixels[0].alpha+delta.x*
+ pixels[1].alpha)+delta.y*(epsilon.x*pixels[2].alpha+delta.x*
+ pixels[3].alpha));
+ if (image->colorspace == CMYKColorspace)
+ pixel->black=gamma*(epsilon.y*(epsilon.x*pixels[0].black+delta.x*
+ pixels[1].black)+delta.y*(epsilon.x*pixels[2].black+delta.x*
+ pixels[3].black));
+ break;
+ }
+ case FilterInterpolatePixel:
+ {
+ CacheView
+ *filter_view;
+
+ Image
+ *excerpt_image,
+ *filter_image;
+
+ RectangleInfo
+ geometry;
+
+ geometry.width=4L;
+ geometry.height=4L;
+ geometry.x=x_offset-1;
+ geometry.y=y_offset-1;
+ excerpt_image=ExcerptImage(image,&geometry,exception);
+ if (excerpt_image == (Image *) NULL)
+ {
+ status=MagickFalse;
+ break;
+ }
+ filter_image=ResizeImage(excerpt_image,1,1,image->filter,image->blur,
+ exception);
+ excerpt_image=DestroyImage(excerpt_image);
+ if (filter_image == (Image *) NULL)
+ break;
+ filter_view=AcquireCacheView(filter_image);
+ p=GetCacheViewVirtualPixels(filter_view,0,0,1,1,exception);
+ if (p != (const Quantum *) NULL)
+ SetPixelInfo(image,p,pixel);
+ filter_view=DestroyCacheView(filter_view);
+ filter_image=DestroyImage(filter_image);
+ break;
+ }
+ case IntegerInterpolatePixel:
+ {
+ p=GetCacheViewVirtualPixels(image_view,x_offset,y_offset,1,1,exception);
+ if (p == (const Quantum *) NULL)
+ {
+ status=MagickFalse;
+ break;
+ }
+ SetPixelInfo(image,p,pixel);
+ break;
+ }
+ case MeshInterpolatePixel:
+ {
+ PointInfo
+ delta,
+ luminance;
+
+ p=GetCacheViewVirtualPixels(image_view,x_offset,y_offset,2,2,
+ exception);
+ if (p == (const Quantum *) NULL)
+ {
+ status=MagickFalse;
+ break;
+ }
+ AlphaBlendPixelInfo(image,p+0*GetPixelChannels(image),pixels+0,alpha+0);
+ AlphaBlendPixelInfo(image,p+1*GetPixelChannels(image),pixels+1,alpha+1);
+ AlphaBlendPixelInfo(image,p+2*GetPixelChannels(image),pixels+2,alpha+2);
+ AlphaBlendPixelInfo(image,p+3*GetPixelChannels(image),pixels+3,alpha+3);
+ delta.x=x-x_offset;
+ delta.y=y-y_offset;
+ luminance.x=GetPixelInfoLuminance(pixels+0)-(double)
+ GetPixelInfoLuminance(pixels+3);
+ luminance.y=GetPixelInfoLuminance(pixels+1)-(double)
+ GetPixelInfoLuminance(pixels+2);
+ if (fabs(luminance.x) < fabs(luminance.y))
+ {
+ /*
+ Diagonal 0-3 NW-SE.
+ */
+ if (delta.x <= delta.y)
+ {
+ /*
+ Bottom-left triangle (pixel:2, diagonal: 0-3).
+ */
+ delta.y=1.0-delta.y;
+ gamma=MeshInterpolate(&delta,alpha[2],alpha[3],alpha[0]);
+ gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
+ pixel->red=gamma*MeshInterpolate(&delta,pixels[2].red,
+ pixels[3].red,pixels[0].red);
+ pixel->green=gamma*MeshInterpolate(&delta,pixels[2].green,
+ pixels[3].green,pixels[0].green);
+ pixel->blue=gamma*MeshInterpolate(&delta,pixels[2].blue,
+ pixels[3].blue,pixels[0].blue);
+ pixel->alpha=gamma*MeshInterpolate(&delta,pixels[2].alpha,
+ pixels[3].alpha,pixels[0].alpha);
+ if (image->colorspace == CMYKColorspace)
+ pixel->black=gamma*MeshInterpolate(&delta,pixels[2].black,
+ pixels[3].black,pixels[0].black);
+ }
+ else
+ {
+ /*
+ Top-right triangle (pixel:1, diagonal: 0-3).
+ */
+ delta.x=1.0-delta.x;
+ gamma=MeshInterpolate(&delta,alpha[1],alpha[0],alpha[3]);
+ gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
+ pixel->red=gamma*MeshInterpolate(&delta,pixels[1].red,
+ pixels[0].red,pixels[3].red);
+ pixel->green=gamma*MeshInterpolate(&delta,pixels[1].green,
+ pixels[0].green,pixels[3].green);
+ pixel->blue=gamma*MeshInterpolate(&delta,pixels[1].blue,
+ pixels[0].blue,pixels[3].blue);
+ pixel->alpha=gamma*MeshInterpolate(&delta,pixels[1].alpha,
+ pixels[0].alpha,pixels[3].alpha);
+ if (image->colorspace == CMYKColorspace)
+ pixel->black=gamma*MeshInterpolate(&delta,pixels[1].black,
+ pixels[0].black,pixels[3].black);
+ }
+ }
+ else
+ {
+ /*
+ Diagonal 1-2 NE-SW.
+ */
+ if (delta.x <= (1.0-delta.y))
+ {
+ /*
+ Top-left triangle (pixel 0, diagonal: 1-2).
+ */
+ gamma=MeshInterpolate(&delta,alpha[0],alpha[1],alpha[2]);
+ gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
+ pixel->red=gamma*MeshInterpolate(&delta,pixels[0].red,
+ pixels[1].red,pixels[2].red);
+ pixel->green=gamma*MeshInterpolate(&delta,pixels[0].green,
+ pixels[1].green,pixels[2].green);
+ pixel->blue=gamma*MeshInterpolate(&delta,pixels[0].blue,
+ pixels[1].blue,pixels[2].blue);
+ pixel->alpha=gamma*MeshInterpolate(&delta,pixels[0].alpha,
+ pixels[1].alpha,pixels[2].alpha);
+ if (image->colorspace == CMYKColorspace)
+ pixel->black=gamma*MeshInterpolate(&delta,pixels[0].black,
+ pixels[1].black,pixels[2].black);
+ }
+ else
+ {
+ /*
+ Bottom-right triangle (pixel: 3, diagonal: 1-2).
+ */
+ delta.x=1.0-delta.x;
+ delta.y=1.0-delta.y;
+ gamma=MeshInterpolate(&delta,alpha[3],alpha[2],alpha[1]);
+ gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
+ pixel->red=gamma*MeshInterpolate(&delta,pixels[3].red,
+ pixels[2].red,pixels[1].red);
+ pixel->green=gamma*MeshInterpolate(&delta,pixels[3].green,
+ pixels[2].green,pixels[1].green);
+ pixel->blue=gamma*MeshInterpolate(&delta,pixels[3].blue,
+ pixels[2].blue,pixels[1].blue);
+ pixel->alpha=gamma*MeshInterpolate(&delta,pixels[3].alpha,
+ pixels[2].alpha,pixels[1].alpha);
+ if (image->colorspace == CMYKColorspace)
+ pixel->black=gamma*MeshInterpolate(&delta,pixels[3].black,
+ pixels[2].black,pixels[1].black);
+ }
+ }
+ break;
+ }
+ case NearestNeighborInterpolatePixel:
+ {
+ p=GetCacheViewVirtualPixels(image_view,NearestNeighbor(x),
+ NearestNeighbor(y),1,1,exception);
+ if (p == (const Quantum *) NULL)
+ {
+ status=MagickFalse;
+ break;
+ }
+ SetPixelInfo(image,p,pixel);
+ break;
+ }
+ case SplineInterpolatePixel:
+ {
+ MagickRealType
+ dx,
+ dy;
+
+ PointInfo
+ delta;
+
+ ssize_t
+ j,
+ n;
+
+ p=GetCacheViewVirtualPixels(image_view,x_offset-1,y_offset-1,4,4,
+ exception);
+ if (p == (const Quantum *) NULL)
+ {
+ status=MagickFalse;
+ break;
+ }
+ AlphaBlendPixelInfo(image,p+0*GetPixelChannels(image),pixels+0,alpha+0);
+ AlphaBlendPixelInfo(image,p+1*GetPixelChannels(image),pixels+1,alpha+1);
+ AlphaBlendPixelInfo(image,p+2*GetPixelChannels(image),pixels+2,alpha+2);
+ AlphaBlendPixelInfo(image,p+3*GetPixelChannels(image),pixels+3,alpha+3);
+ AlphaBlendPixelInfo(image,p+4*GetPixelChannels(image),pixels+4,alpha+4);
+ AlphaBlendPixelInfo(image,p+5*GetPixelChannels(image),pixels+5,alpha+5);
+ AlphaBlendPixelInfo(image,p+6*GetPixelChannels(image),pixels+6,alpha+6);
+ AlphaBlendPixelInfo(image,p+7*GetPixelChannels(image),pixels+7,alpha+7);
+ AlphaBlendPixelInfo(image,p+8*GetPixelChannels(image),pixels+8,alpha+8);
+ AlphaBlendPixelInfo(image,p+9*GetPixelChannels(image),pixels+9,alpha+9);
+ AlphaBlendPixelInfo(image,p+10*GetPixelChannels(image),pixels+10,
+ alpha+10);
+ AlphaBlendPixelInfo(image,p+11*GetPixelChannels(image),pixels+11,
+ alpha+11);
+ AlphaBlendPixelInfo(image,p+12*GetPixelChannels(image),pixels+12,
+ alpha+12);
+ AlphaBlendPixelInfo(image,p+13*GetPixelChannels(image),pixels+13,
+ alpha+13);
+ AlphaBlendPixelInfo(image,p+14*GetPixelChannels(image),pixels+14,
+ alpha+14);
+ AlphaBlendPixelInfo(image,p+15*GetPixelChannels(image),pixels+15,
+ alpha+15);
+ pixel->red=0.0;
+ pixel->green=0.0;
+ pixel->blue=0.0;
+ pixel->alpha=0.0;
+ pixel->black=0.0;
+ delta.x=x-x_offset;
+ delta.y=y-y_offset;
+ n=0;
+ for (i=(-1); i < 3L; i++)
+ {
+ dy=CubicWeightingFunction((MagickRealType) i-delta.y);
+ for (j=(-1); j < 3L; j++)
+ {
+ dx=CubicWeightingFunction(delta.x-(MagickRealType) j);
+ gamma=1.0/(fabs((double) alpha[n]) <= MagickEpsilon ? 1.0 : alpha[n]);
+ pixel->red+=gamma*dx*dy*pixels[n].red;
+ pixel->green+=gamma*dx*dy*pixels[n].green;
+ pixel->blue+=gamma*dx*dy*pixels[n].blue;
+ if (image->colorspace == CMYKColorspace)
+ pixel->black+=gamma*dx*dy*pixels[n].black;
+ pixel->alpha+=dx*dy*pixels[n].alpha;
+ n++;
+ }
+ }
+ break;
+ }
+ }
+ return(status);
+}
+
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% %
+% %
+% %
++ I s F u z z y E q u i v a l e n c e P i x e l %
+% %
+% %
+% %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% IsFuzzyEquivalencePixel() returns MagickTrue if the distance between two
+% pixels is less than the specified distance in a linear three (or four)u
+% dimensional color space.
+%
+% The format of the IsFuzzyEquivalencePixel method is:
+%
+% void IsFuzzyEquivalencePixel(const Image *image,const Quantum *p,
+% const Quantum *q)
+%
+% A description of each parameter follows:
+%
+% o image: the image.
+%
+% o p: Pixel p.
+%
+% o q: Pixel q.
+%
+*/
+MagickExport MagickBooleanType IsFuzzyEquivalencePixel(const Image *image,
+ const Quantum *p,const Quantum *q)
+{
+ MagickRealType
+ fuzz,
+ pixel;
+
+ register MagickRealType
+ distance,
+ scale;
+
+ 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 ?
+ GetPixelAlpha(image,p) : OpaqueAlpha)-(image->matte != MagickFalse ?
+ GetPixelAlpha(image,q) : 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*GetPixelAlpha(image,p);
+ scale*=QuantumScale*GetPixelAlpha(image,q);
+ if (scale <= MagickEpsilon)
+ return(MagickTrue);
+ }
+ /*
+ RGB or CMY color cube
+ */
+ distance*=3.0; /* rescale appropriately */
+ fuzz*=3.0;
+ pixel=GetPixelRed(image,p)-(MagickRealType) GetPixelRed(image,q);
+ 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=GetPixelGreen(image,p)-(MagickRealType) GetPixelGreen(image,q);
+ distance+=scale*pixel*pixel;
+ if (distance > fuzz)
+ return(MagickFalse);
+ pixel=GetPixelBlue(image,p)-(MagickRealType) GetPixelBlue(image,q);
+ distance+=scale*pixel*pixel;
+ if (distance > fuzz)
+ return(MagickFalse);
+ return(MagickTrue);
+}
+
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% %
+% %
+% %
++ I s F u z z y E q u i v a l e n c e P i x e l I n f o %
+% %
+% %
+% %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% IsFuzzyEquivalencePixelInfo() returns true if the distance between two
+% colors is less than the specified distance in a linear three (or four)
+% dimensional color space.
+%
+% This implements the equivalent of...
+% fuzz < sqrt( color_distance^2 * u.a*v.a + alpha_distance^2 )
+%
+% Which produces a multi-dimensional cone for that colorspace along the
+% transparency vector.
+%
+% For example for an RGB
+% color_distance^2 = ( (u.r-v.r)^2 + (u.g-v.g)^2 + (u.b-v.b)^2 ) / 3
+%
+% See http://www.imagemagick.org/Usage/bugs/fuzz_distance/
+%
+% Hue colorspace distances need more work. Hue is not a distance, it is an
+% angle!
+%
+% A check that q is in the same color space as p should be made and the
+% appropriate mapping made. -- Anthony Thyssen 8 December 2010
+%
+% The format of the IsFuzzyEquivalencePixelInfo method is:
+%
+% MagickBooleanType IsFuzzyEquivalencePixelInfo(const PixelInfo *p,
+% const PixelInfo *q)
+%
+% A description of each parameter follows:
+%
+% o p: Pixel p.
+%
+% o q: Pixel q.
+%
+*/
+MagickExport MagickBooleanType IsFuzzyEquivalencePixelInfo(const PixelInfo *p,
+ const PixelInfo *q)
+{
+ MagickRealType
+ fuzz,
+ pixel;
+
+ register MagickRealType
+ scale,
+ distance;
+
+ if ((p->fuzz == 0.0) && (q->fuzz == 0.0))
+ return(IsPixelInfoEquivalent(p,q));
+ if (p->fuzz == 0.0)
+ fuzz=MagickMax(q->fuzz,(MagickRealType) MagickSQ1_2)*
+ MagickMax(q->fuzz,(MagickRealType) MagickSQ1_2);
+ else if (q->fuzz == 0.0)
+ fuzz=MagickMax(p->fuzz,(MagickRealType) MagickSQ1_2)*
+ MagickMax(p->fuzz,(MagickRealType) MagickSQ1_2);
+ else
+ fuzz=MagickMax(p->fuzz,(MagickRealType) MagickSQ1_2)*
+ MagickMax(q->fuzz,(MagickRealType) MagickSQ1_2);
+ scale=1.0;
+ distance=0.0;
+ if ((p->matte != MagickFalse) || (q->matte != MagickFalse))
+ {
+ /*
+ Transparencies are involved - set alpha distance.
+ */
+ pixel=(p->matte != MagickFalse ? p->alpha : OpaqueAlpha)-
+ (q->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
+ */
+ if (p->matte != MagickFalse)
+ scale=(QuantumScale*p->alpha);
+ if (q->matte != MagickFalse)
+ scale*=(QuantumScale*q->alpha);
+ if (scale <= MagickEpsilon )
+ return(MagickTrue);
+ }
+ /*
+ CMYK create a CMY cube with a multi-dimensional cone toward black.
+ */
+ if (p->colorspace == CMYKColorspace)
+ {
+ pixel=p->black-q->black;
+ distance+=pixel*pixel*scale;
+ if (distance > fuzz)
+ return(MagickFalse);
+ scale*=(MagickRealType) (QuantumScale*(QuantumRange-p->black));
+ scale*=(MagickRealType) (QuantumScale*(QuantumRange-q->black));
+ }
+ /*
+ RGB or CMY color cube.
+ */
+ distance*=3.0; /* rescale appropriately */
+ fuzz*=3.0;
+ pixel=p->red-q->red;
+ if ((p->colorspace == HSLColorspace) || (p->colorspace == HSBColorspace) ||
+ (p->colorspace == HWBColorspace))
+ {
+ /* This calculates a arc distance for hue
+ Really if should be a vector angle of 'S'/'W' length
+ with 'L'/'B' forming appropriate cones.
+ In other words this is a hack - Anthony
+ */
+ if (fabs((double) pixel) > (QuantumRange/2))
+ pixel-=QuantumRange;
+ pixel*=2;
+ }
+ distance+=pixel*pixel*scale;
+ if (distance > fuzz)
+ return(MagickFalse);
+ pixel=p->green-q->green;
+ distance+=pixel*pixel*scale;
+ if (distance > fuzz)
+ return(MagickFalse);
+ pixel=p->blue-q->blue;
+ distance+=pixel*pixel*scale;
+ if (distance > fuzz)
+ return(MagickFalse);
+ return(MagickTrue);
+}
+
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% %
+% %
+% %
++ 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);
+}
diff --git a/MagickCore/pixel.h b/MagickCore/pixel.h
new file mode 100644
index 0000000..36e94dc
--- /dev/null
+++ b/MagickCore/pixel.h
@@ -0,0 +1,166 @@
+/*
+ Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization
+ dedicated to making software imaging solutions freely available.
+
+ You may not use this file except in compliance with the License.
+ obtain a copy of the License at
+
+ http://www.imagemagick.org/script/license.php
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ MagickCore image constitute methods.
+*/
+#ifndef _MAGICKCORE_PIXEL_H
+#define _MAGICKCORE_PIXEL_H
+
+#if defined(__cplusplus) || defined(c_plusplus)
+extern "C" {
+#endif
+
+#include <MagickCore/colorspace.h>
+#include <MagickCore/constitute.h>
+
+typedef enum
+{
+ UndefinedInterpolatePixel,
+ AverageInterpolatePixel,
+ BicubicInterpolatePixel,
+ BilinearInterpolatePixel,
+ FilterInterpolatePixel,
+ IntegerInterpolatePixel,
+ MeshInterpolatePixel,
+ NearestNeighborInterpolatePixel,
+ SplineInterpolatePixel
+} InterpolatePixelMethod;
+
+typedef enum
+{
+ RedPixelComponent = 0,
+ CyanPixelComponent = 0,
+ GrayPixelComponent = 0,
+ YPixelComponent = 0,
+ GreenPixelComponent = 1,
+ MagentaPixelComponent = 1,
+ CbPixelComponent = 1,
+ BluePixelComponent = 2,
+ YellowPixelComponent = 2,
+ CrPixelComponent = 2,
+ AlphaPixelComponent = 3,
+ BlackPixelComponent = 4,
+ IndexPixelComponent = 4,
+ MaskPixelComponent = 5
+} PixelComponent;
+
+typedef enum
+{
+ UndefinedPixelTrait
+} PixelTrait;
+
+typedef struct _PixelComponentMap
+{
+ PixelComponent
+ component;
+
+ PixelTrait
+ trait;
+} PixelComponentMap;
+
+typedef struct _DoublePixelPacket
+{
+ double
+ red,
+ green,
+ blue,
+ alpha,
+ black;
+} DoublePixelPacket;
+
+typedef struct _LongPixelPacket
+{
+ unsigned int
+ red,
+ green,
+ blue,
+ alpha,
+ black;
+} LongPixelPacket;
+
+typedef struct _PixelInfo
+{
+ ClassType
+ storage_class;
+
+ ColorspaceType
+ colorspace;
+
+ MagickBooleanType
+ matte;
+
+ double
+ fuzz;
+
+ size_t
+ depth;
+
+ MagickRealType
+ red,
+ green,
+ blue,
+ alpha,
+ black,
+ index;
+} PixelInfo;
+
+typedef struct _PixelPacket
+{
+ Quantum
+ red,
+ green,
+ blue,
+ alpha,
+ black,
+ index;
+
+ MagickSizeType
+ count;
+} PixelPacket;
+
+typedef struct _CacheView
+ CacheView_;
+
+extern MagickExport MagickBooleanType
+ ExportImagePixels(const Image *,const ssize_t,const ssize_t,const size_t,
+ const size_t,const char *,const StorageType,void *,ExceptionInfo *),
+ ImportImagePixels(Image *,const ssize_t,const ssize_t,const size_t,
+ const size_t,const char *,const StorageType,const void *),
+ InterpolatePixelInfo(const Image *,const CacheView_ *,
+ const InterpolatePixelMethod,const double,const double,PixelInfo *,
+ ExceptionInfo *),
+ IsFuzzyEquivalencePixel(const Image *,const Quantum *,
+ const Quantum *),
+ IsFuzzyEquivalencePixelInfo(const PixelInfo *,const PixelInfo *),
+ IsFuzzyEquivalencePixelPacket(const Image *,const PixelPacket *,
+ const PixelPacket *);
+
+extern MagickExport PixelComponentMap
+ *AcquirePixelComponentMap(void),
+ *ClonePixelComponentMap(const PixelComponentMap *),
+ *DestroyPixelComponentMap(PixelComponentMap *);
+
+extern MagickExport PixelInfo
+ *ClonePixelInfo(const PixelInfo *);
+
+extern MagickExport void
+ DefinePixelComponentMap(Image *),
+ GetPixelInfo(const Image *,PixelInfo *);
+
+#if defined(__cplusplus) || defined(c_plusplus)
+}
+#endif
+
+#endif
diff --git a/magick/policy.c b/MagickCore/policy.c
similarity index 98%
rename from magick/policy.c
rename to MagickCore/policy.c
index 4ab7443..8d20a11 100644
--- a/magick/policy.c
+++ b/MagickCore/policy.c
@@ -40,21 +40,21 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/client.h"
-#include "magick/configure.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/option.h"
-#include "magick/policy.h"
-#include "magick/semaphore.h"
-#include "magick/string_.h"
-#include "magick/token.h"
-#include "magick/utility.h"
-#include "magick/xml-tree.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/client.h"
+#include "MagickCore/configure.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/option.h"
+#include "MagickCore/policy.h"
+#include "MagickCore/semaphore.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/token.h"
+#include "MagickCore/utility.h"
+#include "MagickCore/xml-tree.h"
/*
Define declarations.
diff --git a/magick/policy.h b/MagickCore/policy.h
similarity index 95%
rename from magick/policy.h
rename to MagickCore/policy.h
index bfabae0..16854a4 100644
--- a/magick/policy.h
+++ b/MagickCore/policy.h
@@ -22,8 +22,8 @@
extern "C" {
#endif
-#include <magick/pixel.h>
-#include <magick/exception.h>
+#include <MagickCore/pixel.h>
+#include <MagickCore/exception.h>
typedef enum
{
diff --git a/magick/prepress.c b/MagickCore/prepress.c
similarity index 88%
rename from magick/prepress.c
rename to MagickCore/prepress.c
index fbbcc8c..76b09f6 100644
--- a/magick/prepress.c
+++ b/MagickCore/prepress.c
@@ -39,19 +39,20 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/cache-view.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/hashmap.h"
-#include "magick/image.h"
-#include "magick/list.h"
-#include "magick/memory_.h"
-#include "magick/prepress.h"
-#include "magick/registry.h"
-#include "magick/semaphore.h"
-#include "magick/splay-tree.h"
-#include "magick/string_.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/cache-view.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/hashmap.h"
+#include "MagickCore/image.h"
+#include "MagickCore/list.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/prepress.h"
+#include "MagickCore/registry.h"
+#include "MagickCore/semaphore.h"
+#include "MagickCore/splay-tree.h"
+#include "MagickCore/string_.h"
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -116,26 +117,22 @@
double
density;
- register const IndexPacket
- *indexes;
-
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
x;
p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewVirtualIndexQueue(image_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
- density=(double) GetPixelRed(p)+GetPixelGreen(p)+
- GetPixelBlue(p)+GetPixelIndex(indexes+x);
+ density=(double) GetPixelRed(image,p)+GetPixelGreen(image,p)+
+ GetPixelBlue(image,p)+GetPixelBlack(image,p);
if (density > total_ink_density)
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp critical (MagickCore_GetImageTotalInkDensity)
@@ -144,7 +141,7 @@
if (density > total_ink_density)
total_ink_density=density;
}
- p++;
+ p+=GetPixelChannels(image);
}
}
image_view=DestroyCacheView(image_view);
diff --git a/magick/prepress.h b/MagickCore/prepress.h
similarity index 100%
rename from magick/prepress.h
rename to MagickCore/prepress.h
diff --git a/magick/profile.c b/MagickCore/profile.c
similarity index 95%
rename from magick/profile.c
rename to MagickCore/profile.c
index d3a793f..b3a747a 100644
--- a/magick/profile.c
+++ b/MagickCore/profile.c
@@ -39,27 +39,29 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/cache.h"
-#include "magick/color.h"
-#include "magick/configure.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/hashmap.h"
-#include "magick/image.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/option.h"
-#include "magick/profile.h"
-#include "magick/property.h"
-#include "magick/quantum.h"
-#include "magick/quantum-private.h"
-#include "magick/splay-tree.h"
-#include "magick/string_.h"
-#include "magick/thread-private.h"
-#include "magick/token.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/attribute.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/color.h"
+#include "MagickCore/configure.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/hashmap.h"
+#include "MagickCore/image.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/option.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/profile.h"
+#include "MagickCore/property.h"
+#include "MagickCore/quantum.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/splay-tree.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/thread-private.h"
+#include "MagickCore/token.h"
+#include "MagickCore/utility.h"
#if defined(MAGICKCORE_LCMS_DELEGATE)
#if defined(MAGICKCORE_HAVE_LCMS_LCMS2_H)
#include <wchar.h>
@@ -172,22 +174,6 @@
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if (image->profiles == (SplayTreeInfo *) NULL)
return(MagickFalse);
- if (LocaleCompare(name,"icc") == 0)
- {
- /*
- Continue to support deprecated color profile for now.
- */
- image->color_profile.length=0;
- image->color_profile.info=(unsigned char *) NULL;
- }
- if (LocaleCompare(name,"iptc") == 0)
- {
- /*
- Continue to support deprecated IPTC profile for now.
- */
- image->iptc_profile.length=0;
- image->iptc_profile.info=(unsigned char *) NULL;
- }
return(DeleteNodeFromSplayTree((SplayTreeInfo *) image->profiles,name));
}
@@ -1146,7 +1132,7 @@
ThrowProfileException(ImageError,"ColorspaceColorProfileMismatch",
name);
if ((source_colorspace == GRAYColorspace) &&
- (IsGrayImage(image,exception) == MagickFalse))
+ (IsImageGray(image,exception) == MagickFalse))
ThrowProfileException(ImageError,"ColorspaceColorProfileMismatch",
name);
if ((source_colorspace == CMYKColorspace) &&
@@ -1226,13 +1212,10 @@
MagickBooleanType
sync;
- register IndexPacket
- *restrict indexes;
-
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
register unsigned short
@@ -1242,24 +1225,23 @@
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
p=source_pixels[id];
for (x=0; x < (ssize_t) image->columns; x++)
{
- *p++=ScaleQuantumToShort(GetPixelRed(q));
+ *p++=ScaleQuantumToShort(GetPixelRed(image,q));
if (source_channels > 1)
{
- *p++=ScaleQuantumToShort(GetPixelGreen(q));
- *p++=ScaleQuantumToShort(GetPixelBlue(q));
+ *p++=ScaleQuantumToShort(GetPixelGreen(image,q));
+ *p++=ScaleQuantumToShort(GetPixelBlue(image,q));
}
if (source_channels > 3)
- *p++=ScaleQuantumToShort(GetPixelIndex(indexes+x));
- q++;
+ *p++=ScaleQuantumToShort(GetPixelBlack(image,q));
+ q+=GetPixelChannels(image);
}
cmsDoTransform(transform[id],source_pixels[id],target_pixels[id],
(unsigned int) image->columns);
@@ -1267,23 +1249,23 @@
q-=image->columns;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelRed(q,ScaleShortToQuantum(*p));
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
+ SetPixelRed(image,ScaleShortToQuantum(*p),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
p++;
if (target_channels > 1)
{
- SetPixelGreen(q,ScaleShortToQuantum(*p));
+ SetPixelGreen(image,ScaleShortToQuantum(*p),q);
p++;
- SetPixelBlue(q,ScaleShortToQuantum(*p));
+ SetPixelBlue(image,ScaleShortToQuantum(*p),q);
p++;
}
if (target_channels > 3)
{
- SetPixelIndex(indexes+x,ScaleShortToQuantum(*p));
+ SetPixelBlack(image,ScaleShortToQuantum(*p),q);
p++;
}
- q++;
+ q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
if (sync == MagickFalse)
@@ -1379,22 +1361,6 @@
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if (image->profiles == (SplayTreeInfo *) NULL)
return((StringInfo *) NULL);
- if (LocaleCompare(name,"icc") == 0)
- {
- /*
- Continue to support deprecated color profile for now.
- */
- image->color_profile.length=0;
- image->color_profile.info=(unsigned char *) NULL;
- }
- if (LocaleCompare(name,"iptc") == 0)
- {
- /*
- Continue to support deprecated IPTC profile for now.
- */
- image->iptc_profile.length=0;
- image->iptc_profile.info=(unsigned char *) NULL;
- }
profile=(StringInfo *) RemoveNodeFromSplayTree((SplayTreeInfo *)
image->profiles,name);
return(profile);
@@ -1653,38 +1619,8 @@
status=AddValueToSplayTree((SplayTreeInfo *) image->profiles,
ConstantString(key),CloneStringInfo(profile));
if ((status != MagickFalse) &&
- ((LocaleCompare(name,"icc") == 0) || (LocaleCompare(name,"icm") == 0)))
- {
- const StringInfo
- *icc_profile;
-
- /*
- Continue to support deprecated color profile member.
- */
- icc_profile=GetImageProfile(image,name);
- if (icc_profile != (const StringInfo *) NULL)
- {
- image->color_profile.length=GetStringInfoLength(icc_profile);
- image->color_profile.info=GetStringInfoDatum(icc_profile);
- }
- }
- if ((status != MagickFalse) &&
((LocaleCompare(name,"iptc") == 0) || (LocaleCompare(name,"8bim") == 0)))
- {
- const StringInfo
- *iptc_profile;
-
- /*
- Continue to support deprecated IPTC profile member.
- */
- iptc_profile=GetImageProfile(image,name);
- if (iptc_profile != (const StringInfo *) NULL)
- {
- image->iptc_profile.length=GetStringInfoLength(iptc_profile);
- image->iptc_profile.info=GetStringInfoDatum(iptc_profile);
- }
- (void) GetProfilesFromResourceBlock(image,profile);
- }
+ (void) GetProfilesFromResourceBlock(image,profile);
/*
Inject profile into image properties.
*/
diff --git a/magick/profile.h b/MagickCore/profile.h
similarity index 97%
rename from magick/profile.h
rename to MagickCore/profile.h
index c43c0d2..7896e7a 100644
--- a/magick/profile.h
+++ b/MagickCore/profile.h
@@ -22,7 +22,7 @@
extern "C" {
#endif
-#include "magick/string_.h"
+#include "MagickCore/string_.h"
typedef struct _ProfileInfo
{
diff --git a/magick/property.c b/MagickCore/property.c
similarity index 98%
rename from magick/property.c
rename to MagickCore/property.c
index aa94611..f38915e 100644
--- a/magick/property.c
+++ b/MagickCore/property.c
@@ -40,43 +40,43 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/attribute.h"
-#include "magick/cache.h"
-#include "magick/color.h"
-#include "magick/compare.h"
-#include "magick/constitute.h"
-#include "magick/draw.h"
-#include "magick/effect.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/fx.h"
-#include "magick/fx-private.h"
-#include "magick/gem.h"
-#include "magick/geometry.h"
-#include "magick/histogram.h"
-#include "magick/image.h"
-#include "magick/image.h"
-#include "magick/layer.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/montage.h"
-#include "magick/option.h"
-#include "magick/profile.h"
-#include "magick/property.h"
-#include "magick/quantum.h"
-#include "magick/resource_.h"
-#include "magick/splay-tree.h"
-#include "magick/signature-private.h"
-#include "magick/statistic.h"
-#include "magick/string_.h"
-#include "magick/string-private.h"
-#include "magick/token.h"
-#include "magick/utility.h"
-#include "magick/version.h"
-#include "magick/xml-tree.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/attribute.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/color.h"
+#include "MagickCore/compare.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/draw.h"
+#include "MagickCore/effect.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/fx.h"
+#include "MagickCore/fx-private.h"
+#include "MagickCore/gem.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/histogram.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image.h"
+#include "MagickCore/layer.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/montage.h"
+#include "MagickCore/option.h"
+#include "MagickCore/profile.h"
+#include "MagickCore/property.h"
+#include "MagickCore/quantum.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/splay-tree.h"
+#include "MagickCore/signature-private.h"
+#include "MagickCore/statistic.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/string-private.h"
+#include "MagickCore/token.h"
+#include "MagickCore/utility.h"
+#include "MagickCore/version.h"
+#include "MagickCore/xml-tree.h"
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -2055,10 +2055,10 @@
{
if (LocaleNCompare("pixel:",property,6) == 0)
{
- MagickPixelPacket
+ PixelInfo
pixel;
- GetMagickPixelPacket(image,&pixel);
+ GetPixelInfo(image,&pixel);
fx_info=AcquireFxInfo(image,property+6);
status=FxEvaluateChannelExpression(fx_info,RedChannel,0,0,&alpha,
exception);
@@ -2069,15 +2069,15 @@
status|=FxEvaluateChannelExpression(fx_info,BlueChannel,0,0,&alpha,
exception);
pixel.blue=(MagickRealType) QuantumRange*alpha;
- status|=FxEvaluateChannelExpression(fx_info,OpacityChannel,0,0,&alpha,
- exception);
- pixel.opacity=(MagickRealType) QuantumRange*(1.0-alpha);
if (image->colorspace == CMYKColorspace)
{
status|=FxEvaluateChannelExpression(fx_info,BlackChannel,0,0,
&alpha,exception);
- pixel.index=(MagickRealType) QuantumRange*alpha;
+ pixel.black=(MagickRealType) QuantumRange*alpha;
}
+ status|=FxEvaluateChannelExpression(fx_info,OpacityChannel,0,0,&alpha,
+ exception);
+ pixel.alpha=(MagickRealType) QuantumRange*(1.0-alpha);
fx_info=DestroyFxInfo(fx_info);
if (status != MagickFalse)
{
@@ -2184,7 +2184,7 @@
Image storage class and colorspace.
*/
colorspace=image->colorspace;
- if (IsGrayImage(image,&image->exception) != MagickFalse)
+ if (IsImageGray(image,&image->exception) != MagickFalse)
colorspace=GRAYColorspace;
(void) FormatLocaleString(value,MaxTextExtent,"%s",
CommandOptionToMnemonic(MagickColorspaceOptions,(ssize_t)
@@ -2330,7 +2330,7 @@
MagickBooleanType
opaque;
- opaque=IsOpaqueImage(image,&image->exception);
+ opaque=IsImageOpaque(image,&image->exception);
(void) CopyMagickString(value,opaque == MagickFalse ? "false" :
"true",MaxTextExtent);
break;
@@ -2827,7 +2827,7 @@
Image storage class and colorspace.
*/
colorspace=image->colorspace;
- if (IsGrayImage(image,&image->exception) != MagickFalse)
+ if (IsImageGray(image,&image->exception) != MagickFalse)
colorspace=GRAYColorspace;
q+=FormatLocaleString(q,extent,"%s%s%s",CommandOptionToMnemonic(
MagickClassOptions,(ssize_t) image->storage_class),
diff --git a/magick/property.h b/MagickCore/property.h
similarity index 100%
rename from magick/property.h
rename to MagickCore/property.h
diff --git a/magick/quantize.c b/MagickCore/quantize.c
similarity index 90%
rename from magick/quantize.c
rename to MagickCore/quantize.c
index 22b6b46..b14e54b 100644
--- a/magick/quantize.c
+++ b/MagickCore/quantize.c
@@ -174,28 +174,30 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/cache-view.h"
-#include "magick/color.h"
-#include "magick/color-private.h"
-#include "magick/colormap.h"
-#include "magick/colorspace.h"
-#include "magick/enhance.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/histogram.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/option.h"
-#include "magick/pixel-private.h"
-#include "magick/quantize.h"
-#include "magick/quantum.h"
-#include "magick/string_.h"
-#include "magick/thread-private.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/attribute.h"
+#include "MagickCore/cache-view.h"
+#include "MagickCore/color.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colormap.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/enhance.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/histogram.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/option.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantize.h"
+#include "MagickCore/quantum.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/thread-private.h"
/*
Define declarations.
@@ -219,7 +221,7 @@
red,
green,
blue,
- opacity;
+ alpha;
} RealPixelPacket;
typedef struct _NodeInfo
@@ -426,27 +428,50 @@
%
*/
-static inline void AssociateAlphaPixel(const CubeInfo *cube_info,
- const PixelPacket *pixel,RealPixelPacket *alpha_pixel)
+static inline void AssociateAlphaPixel(const Image *image,
+ const CubeInfo *cube_info,const Quantum *pixel,
+ RealPixelPacket *alpha_pixel)
{
MagickRealType
alpha;
if ((cube_info->associate_alpha == MagickFalse) ||
- (pixel->opacity == OpaqueOpacity))
+ (GetPixelAlpha(image,pixel)== OpaqueAlpha))
{
- alpha_pixel->red=(MagickRealType) GetPixelRed(pixel);
- alpha_pixel->green=(MagickRealType) GetPixelGreen(pixel);
- alpha_pixel->blue=(MagickRealType) GetPixelBlue(pixel);
- alpha_pixel->opacity=(MagickRealType) GetPixelOpacity(pixel);
+ alpha_pixel->red=(MagickRealType) GetPixelRed(image,pixel);
+ alpha_pixel->green=(MagickRealType) GetPixelGreen(image,pixel);
+ alpha_pixel->blue=(MagickRealType) GetPixelBlue(image,pixel);
+ alpha_pixel->alpha=(MagickRealType) GetPixelAlpha(image,pixel);
return;
}
- alpha=(MagickRealType) (QuantumScale*(QuantumRange-
- GetPixelOpacity(pixel)));
- alpha_pixel->red=alpha*GetPixelRed(pixel);
- alpha_pixel->green=alpha*GetPixelGreen(pixel);
- alpha_pixel->blue=alpha*GetPixelBlue(pixel);
- alpha_pixel->opacity=(MagickRealType) GetPixelOpacity(pixel);
+ alpha=(MagickRealType) (QuantumScale*GetPixelAlpha(image,pixel));
+ alpha_pixel->red=alpha*GetPixelRed(image,pixel);
+ alpha_pixel->green=alpha*GetPixelGreen(image,pixel);
+ alpha_pixel->blue=alpha*GetPixelBlue(image,pixel);
+ alpha_pixel->alpha=(MagickRealType) GetPixelAlpha(image,pixel);
+}
+
+static inline void AssociateAlphaPixelPacket(const Image *image,
+ const CubeInfo *cube_info,const PixelPacket *pixel,
+ RealPixelPacket *alpha_pixel)
+{
+ MagickRealType
+ alpha;
+
+ if ((cube_info->associate_alpha == MagickFalse) ||
+ (pixel->alpha == OpaqueAlpha))
+ {
+ alpha_pixel->red=(MagickRealType) pixel->red;
+ alpha_pixel->green=(MagickRealType) pixel->green;
+ alpha_pixel->blue=(MagickRealType) pixel->blue;
+ alpha_pixel->alpha=(MagickRealType) pixel->alpha;
+ return;
+ }
+ alpha=(MagickRealType) (QuantumScale*pixel->alpha);
+ alpha_pixel->red=alpha*pixel->red;
+ alpha_pixel->green=alpha*pixel->green;
+ alpha_pixel->blue=alpha*pixel->blue;
+ alpha_pixel->alpha=(MagickRealType) pixel->alpha;
}
static inline Quantum ClampToUnsignedQuantum(const MagickRealType value)
@@ -464,31 +489,14 @@
size_t
id;
- id=(size_t) (((ScaleQuantumToChar(ClampToUnsignedQuantum(
- GetPixelRed(pixel))) >> index) & 0x01) |
- ((ScaleQuantumToChar(ClampToUnsignedQuantum(
- GetPixelGreen(pixel))) >> index) & 0x01) << 1 |
- ((ScaleQuantumToChar(ClampToUnsignedQuantum(
- GetPixelBlue(pixel))) >> index) & 0x01) << 2);
+ id=(size_t) (((ScaleQuantumToChar(ClampToUnsignedQuantum(pixel->red)) >> index) & 0x01) |
+ ((ScaleQuantumToChar(ClampToUnsignedQuantum(pixel->green)) >> index) & 0x01) << 1 |
+ ((ScaleQuantumToChar(ClampToUnsignedQuantum(pixel->blue)) >> index) & 0x01) << 2);
if (cube_info->associate_alpha != MagickFalse)
- id|=((ScaleQuantumToChar(ClampToUnsignedQuantum(
- GetPixelOpacity(pixel))) >> index) & 0x1) << 3;
+ id|=((ScaleQuantumToChar(ClampToUnsignedQuantum(pixel->alpha)) >> index) & 0x1) << 3;
return(id);
}
-static inline MagickBooleanType IsSameColor(const Image *image,
- const PixelPacket *p,const PixelPacket *q)
-{
- if ((GetPixelRed(p) != GetPixelRed(q)) ||
- (GetPixelGreen(p) != GetPixelGreen(q)) ||
- (GetPixelBlue(p) != GetPixelBlue(q)))
- return(MagickFalse);
- if ((image->matte != MagickFalse) &&
- (GetPixelOpacity(p) != GetPixelOpacity(q)))
- return(MagickFalse);
- return(MagickTrue);
-}
-
static MagickBooleanType AssignImageColors(Image *image,CubeInfo *cube_info)
{
#define AssignImageTag "Assign/Image"
@@ -543,10 +551,7 @@
CubeInfo
cube;
- register IndexPacket
- *restrict indexes;
-
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -559,12 +564,11 @@
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
cube=(*cube_info);
for (x=0; x < (ssize_t) image->columns; x+=count)
{
@@ -585,9 +589,15 @@
Identify the deepest node containing the pixel's color.
*/
for (count=1; (x+count) < (ssize_t) image->columns; count++)
- if (IsSameColor(image,q,q+count) == MagickFalse)
+ {
+ PixelPacket
+ packet;
+
+ GetPixelPacket(image,q+count*GetPixelChannels(image),&packet);
+ if (IsPixelEquivalent(image,q,&packet) == MagickFalse)
break;
- AssociateAlphaPixel(&cube,q,&pixel);
+ }
+ AssociateAlphaPixel(image,&cube,q,&pixel);
node_info=cube.root;
for (index=MaxTreeDepth-1; (ssize_t) index > 0; index--)
{
@@ -607,14 +617,16 @@
for (i=0; i < (ssize_t) count; i++)
{
if (image->storage_class == PseudoClass)
- SetPixelIndex(indexes+x+i,index);
+ SetPixelIndex(image,(Quantum) index,q);
if (cube.quantize_info->measure_error == MagickFalse)
{
- SetPixelRGB(q,image->colormap+index);
+ SetPixelRed(image,image->colormap[index].red,q);
+ SetPixelGreen(image,image->colormap[index].green,q);
+ SetPixelBlue(image,image->colormap[index].blue,q);
if (cube.associate_alpha != MagickFalse)
- SetPixelOpacity(q,image->colormap[index].opacity);
+ SetPixelAlpha(image,image->colormap[index].alpha,q);
}
- q++;
+ q+=GetPixelChannels(image);
}
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
@@ -655,11 +667,11 @@
q=image->colormap;
for (i=0; i < (ssize_t) image->colors; i++)
{
- intensity=(Quantum) (PixelIntensity(q) < ((MagickRealType)
- QuantumRange/2.0) ? 0 : QuantumRange);
- SetPixelRed(q,intensity);
- SetPixelGreen(q,intensity);
- SetPixelBlue(q,intensity);
+ intensity=(Quantum) ((MagickRealType) GetPixelPacketIntensity(q) <
+ ((MagickRealType) QuantumRange/2.0) ? 0 : QuantumRange);
+ q->red=intensity;
+ q->green=intensity;
+ q->blue=intensity;
q++;
}
}
@@ -793,19 +805,19 @@
midpoint.red=(MagickRealType) QuantumRange/2.0;
midpoint.green=(MagickRealType) QuantumRange/2.0;
midpoint.blue=(MagickRealType) QuantumRange/2.0;
- midpoint.opacity=(MagickRealType) QuantumRange/2.0;
- error.opacity=0.0;
+ midpoint.alpha=(MagickRealType) QuantumRange/2.0;
+ error.alpha=0.0;
image_view=AcquireCacheView(image);
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
register ssize_t
x;
p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
if (cube_info->nodes > MaxNodes)
{
@@ -821,9 +833,15 @@
Start at the root and descend the color cube tree.
*/
for (count=1; (x+(ssize_t) count) < (ssize_t) image->columns; count++)
- if (IsSameColor(image,p,p+count) == MagickFalse)
+ {
+ PixelPacket
+ packet;
+
+ GetPixelPacket(image,p+count*GetPixelChannels(image),&packet);
+ if (IsPixelEquivalent(image,p,&packet) == MagickFalse)
break;
- AssociateAlphaPixel(cube_info,p,&pixel);
+ }
+ AssociateAlphaPixel(image,cube_info,p,&pixel);
index=MaxTreeDepth-1;
bisect=((MagickRealType) QuantumRange+1.0)/2.0;
mid=midpoint;
@@ -835,7 +853,7 @@
mid.red+=(id & 1) != 0 ? bisect : -bisect;
mid.green+=(id & 2) != 0 ? bisect : -bisect;
mid.blue+=(id & 4) != 0 ? bisect : -bisect;
- mid.opacity+=(id & 8) != 0 ? bisect : -bisect;
+ mid.alpha+=(id & 8) != 0 ? bisect : -bisect;
if (node_info->child[id] == (NodeInfo *) NULL)
{
/*
@@ -857,10 +875,10 @@
error.green=QuantumScale*(pixel.green-mid.green);
error.blue=QuantumScale*(pixel.blue-mid.blue);
if (cube_info->associate_alpha != MagickFalse)
- error.opacity=QuantumScale*(pixel.opacity-mid.opacity);
+ error.alpha=QuantumScale*(pixel.alpha-mid.alpha);
node_info->quantize_error+=sqrt((double) (count*error.red*error.red+
count*error.green*error.green+count*error.blue*error.blue+
- count*error.opacity*error.opacity));
+ count*error.alpha*error.alpha));
cube_info->root->quantize_error+=node_info->quantize_error;
index--;
}
@@ -872,8 +890,8 @@
node_info->total_color.green+=count*QuantumScale*pixel.green;
node_info->total_color.blue+=count*QuantumScale*pixel.blue;
if (cube_info->associate_alpha != MagickFalse)
- node_info->total_color.opacity+=count*QuantumScale*pixel.opacity;
- p+=count;
+ node_info->total_color.alpha+=count*QuantumScale*pixel.alpha;
+ p+=count*GetPixelChannels(image);
}
if (cube_info->colors > cube_info->maximum_colors)
{
@@ -887,14 +905,14 @@
}
for (y++; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
register ssize_t
x;
p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
if (cube_info->nodes > MaxNodes)
{
@@ -910,9 +928,15 @@
Start at the root and descend the color cube tree.
*/
for (count=1; (x+(ssize_t) count) < (ssize_t) image->columns; count++)
- if (IsSameColor(image,p,p+count) == MagickFalse)
+ {
+ PixelPacket
+ packet;
+
+ GetPixelPacket(image,p+count*GetPixelChannels(image),&packet);
+ if (IsPixelEquivalent(image,p,&packet) == MagickFalse)
break;
- AssociateAlphaPixel(cube_info,p,&pixel);
+ }
+ AssociateAlphaPixel(image,cube_info,p,&pixel);
index=MaxTreeDepth-1;
bisect=((MagickRealType) QuantumRange+1.0)/2.0;
mid=midpoint;
@@ -924,7 +948,7 @@
mid.red+=(id & 1) != 0 ? bisect : -bisect;
mid.green+=(id & 2) != 0 ? bisect : -bisect;
mid.blue+=(id & 4) != 0 ? bisect : -bisect;
- mid.opacity+=(id & 8) != 0 ? bisect : -bisect;
+ mid.alpha+=(id & 8) != 0 ? bisect : -bisect;
if (node_info->child[id] == (NodeInfo *) NULL)
{
/*
@@ -946,10 +970,10 @@
error.green=QuantumScale*(pixel.green-mid.green);
error.blue=QuantumScale*(pixel.blue-mid.blue);
if (cube_info->associate_alpha != MagickFalse)
- error.opacity=QuantumScale*(pixel.opacity-mid.opacity);
+ error.alpha=QuantumScale*(pixel.alpha-mid.alpha);
node_info->quantize_error+=sqrt((double) (count*error.red*error.red+
count*error.green*error.green+count*error.blue*error.blue+
- count*error.opacity*error.opacity));
+ count*error.alpha*error.alpha));
cube_info->root->quantize_error+=node_info->quantize_error;
index--;
}
@@ -961,8 +985,8 @@
node_info->total_color.green+=count*QuantumScale*pixel.green;
node_info->total_color.blue+=count*QuantumScale*pixel.blue;
if (cube_info->associate_alpha != MagickFalse)
- node_info->total_color.opacity+=count*QuantumScale*pixel.opacity;
- p+=count;
+ node_info->total_color.alpha+=count*QuantumScale*pixel.alpha;
+ p+=count*GetPixelChannels(image);
}
proceed=SetImageProgress(image,ClassifyImageTag,(MagickOffsetType) y,
image->rows);
@@ -1092,19 +1116,18 @@
beta=1.0;
if (cube_info->associate_alpha != MagickFalse)
{
- alpha=(MagickRealType) (QuantumScale*GetPixelAlpha(p));
- beta=(MagickRealType) (QuantumScale*GetPixelAlpha(q));
+ alpha=(MagickRealType) (QuantumScale*p->alpha);
+ beta=(MagickRealType) (QuantumScale*q->alpha);
}
- pixel=alpha*GetPixelRed(p)-beta*GetPixelRed(q);
+ pixel=alpha*p->red-beta*q->red;
distance=pixel*pixel;
if (distance <= cube_info->distance)
{
- pixel=alpha*GetPixelGreen(p)-beta*GetPixelGreen(q);
+ pixel=alpha*p->green-beta*q->green;
distance+=pixel*pixel;
if (distance <= cube_info->distance)
{
- pixel=alpha*GetPixelBlue(p)-beta*
- GetPixelBlue(q);
+ pixel=alpha*p->blue-beta*q->blue;
distance+=pixel*pixel;
if (distance <= cube_info->distance)
{
@@ -1224,13 +1247,13 @@
alpha=1.0/(fabs(alpha) <= MagickEpsilon ? 1.0 : alpha);
if (cube_info->associate_alpha == MagickFalse)
{
- SetPixelRed(q,ClampToQuantum((MagickRealType) (alpha*
- QuantumRange*node_info->total_color.red)));
- SetPixelGreen(q,ClampToQuantum((MagickRealType) (alpha*
- QuantumRange*node_info->total_color.green)));
- SetPixelBlue(q,ClampToQuantum((MagickRealType) (alpha*
- QuantumRange*node_info->total_color.blue)));
- SetPixelOpacity(q,OpaqueOpacity);
+ q->red=ClampToQuantum((MagickRealType)
+ (alpha*QuantumRange*node_info->total_color.red));
+ q->green=ClampToQuantum((MagickRealType)
+ (alpha*QuantumRange*node_info->total_color.green));
+ q->blue=ClampToQuantum((MagickRealType)
+ (alpha*QuantumRange*node_info->total_color.blue));
+ q->alpha=OpaqueAlpha;
}
else
{
@@ -1238,31 +1261,30 @@
opacity;
opacity=(MagickRealType) (alpha*QuantumRange*
- node_info->total_color.opacity);
- SetPixelOpacity(q,ClampToQuantum(opacity));
- if (q->opacity == OpaqueOpacity)
+ node_info->total_color.alpha);
+ q->alpha=ClampToQuantum(opacity);
+ if (q->alpha == OpaqueAlpha)
{
- SetPixelRed(q,ClampToQuantum((MagickRealType) (alpha*
- QuantumRange*node_info->total_color.red)));
- SetPixelGreen(q,ClampToQuantum((MagickRealType) (alpha*
- QuantumRange*node_info->total_color.green)));
- SetPixelBlue(q,ClampToQuantum((MagickRealType) (alpha*
- QuantumRange*node_info->total_color.blue)));
+ q->red=ClampToQuantum((MagickRealType)
+ (alpha*QuantumRange*node_info->total_color.red));
+ q->green=ClampToQuantum((MagickRealType)
+ (alpha*QuantumRange*node_info->total_color.green));
+ q->blue=ClampToQuantum((MagickRealType)
+ (alpha*QuantumRange*node_info->total_color.blue));
}
else
{
MagickRealType
gamma;
- gamma=(MagickRealType) (QuantumScale*(QuantumRange-
- (MagickRealType) q->opacity));
+ gamma=(MagickRealType) (QuantumScale*q->alpha);
gamma=1.0/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma);
- SetPixelRed(q,ClampToQuantum((MagickRealType) (alpha*
- gamma*QuantumRange*node_info->total_color.red)));
- SetPixelGreen(q,ClampToQuantum((MagickRealType) (alpha*
- gamma*QuantumRange*node_info->total_color.green)));
- SetPixelBlue(q,ClampToQuantum((MagickRealType) (
- alpha*gamma*QuantumRange*node_info->total_color.blue)));
+ q->red=ClampToQuantum((MagickRealType)
+ (alpha*gamma*QuantumRange*node_info->total_color.red));
+ q->green=ClampToQuantum((MagickRealType)
+ (alpha*gamma*QuantumRange*node_info->total_color.green));
+ q->blue=ClampToQuantum((MagickRealType)
+ (alpha*gamma*QuantumRange*node_info->total_color.blue));
if (node_info->number_unique > cube_info->transparent_pixels)
{
cube_info->transparent_pixels=node_info->number_unique;
@@ -1438,7 +1460,7 @@
BlueShift(ScaleQuantumToChar(ClampToUnsignedQuantum(pixel->blue))));
if (cube_info->associate_alpha != MagickFalse)
offset|=AlphaShift(ScaleQuantumToChar(ClampToUnsignedQuantum(
- pixel->opacity)));
+ pixel->alpha)));
return(offset);
}
@@ -1482,10 +1504,7 @@
*current,
*previous;
- register IndexPacket
- *restrict indexes;
-
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -1500,16 +1519,16 @@
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
+ q+=(y & 0x01)*image->columns*GetPixelChannels(image);
cube=(*cube_info);
current=pixels[id]+(y & 0x01)*image->columns;
previous=pixels[id]+((y+1) & 0x01)*image->columns;
- v=(ssize_t) ((y & 0x01) ? -1 : 1);
+ v=(ssize_t) ((y & 0x01) != 0 ? -1 : 1);
for (x=0; x < (ssize_t) image->columns; x++)
{
RealPixelPacket
@@ -1522,15 +1541,16 @@
ssize_t
u;
- u=(y & 0x01) ? (ssize_t) image->columns-1-x : x;
- AssociateAlphaPixel(&cube,q+u,&pixel);
+ q-=(y & 0x01)*GetPixelChannels(image);
+ u=(y & 0x01) != 0 ? (ssize_t) image->columns-1-x : x;
+ AssociateAlphaPixel(image,&cube,q,&pixel);
if (x > 0)
{
pixel.red+=7*current[u-v].red/16;
pixel.green+=7*current[u-v].green/16;
pixel.blue+=7*current[u-v].blue/16;
if (cube.associate_alpha != MagickFalse)
- pixel.opacity+=7*current[u-v].opacity/16;
+ pixel.alpha+=7*current[u-v].alpha/16;
}
if (y > 0)
{
@@ -1540,27 +1560,27 @@
pixel.green+=previous[u+v].green/16;
pixel.blue+=previous[u+v].blue/16;
if (cube.associate_alpha != MagickFalse)
- pixel.opacity+=previous[u+v].opacity/16;
+ pixel.alpha+=previous[u+v].alpha/16;
}
pixel.red+=5*previous[u].red/16;
pixel.green+=5*previous[u].green/16;
pixel.blue+=5*previous[u].blue/16;
if (cube.associate_alpha != MagickFalse)
- pixel.opacity+=5*previous[u].opacity/16;
+ pixel.alpha+=5*previous[u].alpha/16;
if (x > 0)
{
pixel.red+=3*previous[u-v].red/16;
pixel.green+=3*previous[u-v].green/16;
pixel.blue+=3*previous[u-v].blue/16;
if (cube.associate_alpha != MagickFalse)
- pixel.opacity+=3*previous[u-v].opacity/16;
+ pixel.alpha+=3*previous[u-v].alpha/16;
}
}
pixel.red=(MagickRealType) ClampToUnsignedQuantum(pixel.red);
pixel.green=(MagickRealType) ClampToUnsignedQuantum(pixel.green);
pixel.blue=(MagickRealType) ClampToUnsignedQuantum(pixel.blue);
if (cube.associate_alpha != MagickFalse)
- pixel.opacity=(MagickRealType) ClampToUnsignedQuantum(pixel.opacity);
+ pixel.alpha=(MagickRealType) ClampToUnsignedQuantum(pixel.alpha);
i=CacheOffset(&cube,&pixel);
if (cube.cache[i] < 0)
{
@@ -1595,24 +1615,26 @@
*/
index=(size_t) cube.cache[i];
if (image->storage_class == PseudoClass)
- SetPixelIndex(indexes+u,index);
+ SetPixelIndex(image,(Quantum) index,q);
if (cube.quantize_info->measure_error == MagickFalse)
{
- SetPixelRGB(q+u,image->colormap+index);
+ SetPixelRed(image,image->colormap[index].red,q);
+ SetPixelGreen(image,image->colormap[index].green,q);
+ SetPixelBlue(image,image->colormap[index].blue,q);
if (cube.associate_alpha != MagickFalse)
- SetPixelOpacity(q+u,image->colormap[index].opacity);
+ SetPixelAlpha(image,image->colormap[index].alpha,q);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
/*
Store the error.
*/
- AssociateAlphaPixel(&cube,image->colormap+index,&color);
+ AssociateAlphaPixelPacket(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;
if (cube.associate_alpha != MagickFalse)
- current[u].opacity=pixel.opacity-color.opacity;
+ current[u].alpha=pixel.alpha-color.alpha;
if (image->progress_monitor != (MagickProgressMonitor) NULL)
{
MagickBooleanType
@@ -1626,6 +1648,7 @@
if (proceed == MagickFalse)
status=MagickFalse;
}
+ q+=((y+1) & 0x01)*GetPixelChannels(image);
}
}
image_view=DestroyCacheView(image_view);
@@ -1750,10 +1773,7 @@
ExceptionInfo
*exception;
- register IndexPacket
- *restrict indexes;
-
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -1764,23 +1784,22 @@
*/
exception=(&image->exception);
q=GetCacheViewAuthenticPixels(image_view,p->x,p->y,1,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
return(MagickFalse);
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
- AssociateAlphaPixel(cube_info,q,&pixel);
+ AssociateAlphaPixel(image,cube_info,q,&pixel);
for (i=0; i < ErrorQueueLength; i++)
{
pixel.red+=p->weights[i]*p->error[i].red;
pixel.green+=p->weights[i]*p->error[i].green;
pixel.blue+=p->weights[i]*p->error[i].blue;
if (cube_info->associate_alpha != MagickFalse)
- pixel.opacity+=p->weights[i]*p->error[i].opacity;
+ pixel.alpha+=p->weights[i]*p->error[i].alpha;
}
pixel.red=(MagickRealType) ClampToUnsignedQuantum(pixel.red);
pixel.green=(MagickRealType) ClampToUnsignedQuantum(pixel.green);
pixel.blue=(MagickRealType) ClampToUnsignedQuantum(pixel.blue);
if (cube_info->associate_alpha != MagickFalse)
- pixel.opacity=(MagickRealType) ClampToUnsignedQuantum(pixel.opacity);
+ pixel.alpha=(MagickRealType) ClampToUnsignedQuantum(pixel.alpha);
i=CacheOffset(cube_info,&pixel);
if (p->cache[i] < 0)
{
@@ -1814,14 +1833,16 @@
/*
Assign pixel to closest colormap entry.
*/
- index=(size_t) (1*p->cache[i]);
+ index=(size_t) p->cache[i];
if (image->storage_class == PseudoClass)
- *indexes=(IndexPacket) index;
+ SetPixelIndex(image,(Quantum) index,q);
if (cube_info->quantize_info->measure_error == MagickFalse)
{
- SetPixelRGB(q,image->colormap+index);
+ SetPixelRed(image,image->colormap[index].red,q);
+ SetPixelGreen(image,image->colormap[index].green,q);
+ SetPixelBlue(image,image->colormap[index].blue,q);
if (cube_info->associate_alpha != MagickFalse)
- SetPixelOpacity(q,image->colormap[index].opacity);
+ SetPixelAlpha(image,image->colormap[index].alpha,q);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
return(MagickFalse);
@@ -1830,12 +1851,12 @@
*/
(void) CopyMagickMemory(p->error,p->error+1,(ErrorQueueLength-1)*
sizeof(p->error[0]));
- AssociateAlphaPixel(cube_info,image->colormap+index,&color);
+ AssociateAlphaPixelPacket(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;
if (cube_info->associate_alpha != MagickFalse)
- p->error[ErrorQueueLength-1].opacity=pixel.opacity-color.opacity;
+ p->error[ErrorQueueLength-1].alpha=pixel.alpha-color.alpha;
proceed=SetImageProgress(image,DitherImageTag,p->offset,p->span);
if (proceed == MagickFalse)
return(MagickFalse);
@@ -2125,9 +2146,6 @@
ExceptionInfo
*exception;
- IndexPacket
- *indexes;
-
MagickRealType
alpha,
area,
@@ -2161,44 +2179,42 @@
image_view=AcquireCacheView(image);
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
register ssize_t
x;
p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
- index=1UL*GetPixelIndex(indexes+x);
+ index=1UL*GetPixelIndex(image,p);
if (image->matte != MagickFalse)
{
- alpha=(MagickRealType) (QuantumScale*(GetPixelAlpha(p)));
- beta=(MagickRealType) (QuantumScale*(QuantumRange-
- image->colormap[index].opacity));
+ alpha=(MagickRealType) (QuantumScale*GetPixelAlpha(image,p));
+ beta=(MagickRealType) (QuantumScale*image->colormap[index].alpha);
}
- distance=fabs(alpha*GetPixelRed(p)-beta*
+ distance=fabs(alpha*GetPixelRed(image,p)-beta*
image->colormap[index].red);
mean_error_per_pixel+=distance;
mean_error+=distance*distance;
if (distance > maximum_error)
maximum_error=distance;
- distance=fabs(alpha*GetPixelGreen(p)-beta*
+ distance=fabs(alpha*GetPixelGreen(image,p)-beta*
image->colormap[index].green);
mean_error_per_pixel+=distance;
mean_error+=distance*distance;
if (distance > maximum_error)
maximum_error=distance;
- distance=fabs(alpha*GetPixelBlue(p)-beta*
+ distance=fabs(alpha*GetPixelBlue(image,p)-beta*
image->colormap[index].blue);
mean_error_per_pixel+=distance;
mean_error+=distance*distance;
if (distance > maximum_error)
maximum_error=distance;
- p++;
+ p+=GetPixelChannels(image);
}
}
image_view=DestroyCacheView(image_view);
@@ -2346,7 +2362,7 @@
if ((channel & BlueChannel) != 0)
image->colormap[i].blue=PosterizePixel(image->colormap[i].blue);
if ((channel & OpacityChannel) != 0)
- image->colormap[i].opacity=PosterizePixel(image->colormap[i].opacity);
+ image->colormap[i].alpha=PosterizePixel(image->colormap[i].alpha);
}
/*
Posterize image.
@@ -2360,10 +2376,7 @@
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- register IndexPacket
- *restrict indexes;
-
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -2372,28 +2385,26 @@
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
if ((channel & RedChannel) != 0)
- SetPixelRed(q,PosterizePixel(GetPixelRed(q)));
+ SetPixelRed(image,PosterizePixel(GetPixelRed(image,q)),q);
if ((channel & GreenChannel) != 0)
- SetPixelGreen(q,PosterizePixel(GetPixelGreen(q)));
+ SetPixelGreen(image,PosterizePixel(GetPixelGreen(image,q)),q);
if ((channel & BlueChannel) != 0)
- SetPixelBlue(q,PosterizePixel(GetPixelBlue(q)));
+ SetPixelBlue(image,PosterizePixel(GetPixelBlue(image,q)),q);
+ if (((channel & BlackChannel) != 0) &&
+ (image->colorspace == CMYKColorspace))
+ SetPixelBlack(image,PosterizePixel(GetPixelBlack(image,q)),q);
if (((channel & OpacityChannel) != 0) &&
(image->matte == MagickTrue))
- SetPixelOpacity(q,PosterizePixel(GetPixelOpacity(q)));
- if (((channel & IndexChannel) != 0) &&
- (image->colorspace == CMYKColorspace))
- SetPixelIndex(indexes+x,PosterizePixel(
- GetPixelIndex(indexes+x)));
- q++;
+ SetPixelAlpha(image,PosterizePixel(GetPixelAlpha(image,q)),q);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -2477,7 +2488,7 @@
parent->total_color.red+=node_info->total_color.red;
parent->total_color.green+=node_info->total_color.green;
parent->total_color.blue+=node_info->total_color.blue;
- parent->total_color.opacity+=node_info->total_color.opacity;
+ parent->total_color.alpha+=node_info->total_color.alpha;
parent->child[node_info->id]=(NodeInfo *) NULL;
cube_info->nodes--;
}
@@ -2629,7 +2640,7 @@
maximum_colors=MaxColormapSize;
if (maximum_colors > MaxColormapSize)
maximum_colors=MaxColormapSize;
- if ((IsGrayImage(image,&image->exception) != MagickFalse) &&
+ if ((IsImageGray(image,&image->exception) != MagickFalse) &&
(image->matte == MagickFalse))
(void) SetGrayscaleImage(image);
if ((image->storage_class == PseudoClass) &&
@@ -3133,8 +3144,8 @@
color_1=(PixelPacket *) x;
color_2=(PixelPacket *) y;
- intensity=PixelIntensityToQuantum(color_1)-(ssize_t)
- PixelIntensityToQuantum(color_2);
+ intensity=GetPixelPacketIntensity(color_1)-(ssize_t)
+ GetPixelPacketIntensity(color_2);
return((int) intensity);
}
@@ -3192,10 +3203,7 @@
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- register IndexPacket
- *restrict indexes;
-
- register const PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -3205,18 +3213,17 @@
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
register size_t
intensity;
- intensity=ScaleQuantumToMap(GetPixelRed(q));
+ intensity=ScaleQuantumToMap(GetPixelRed(image,q));
if (colormap_index[intensity] < 0)
{
#if defined(MAGICKCORE_OPENMP_SUPPORT)
@@ -3225,15 +3232,15 @@
if (colormap_index[intensity] < 0)
{
colormap_index[intensity]=(ssize_t) image->colors;
- image->colormap[image->colors].red=GetPixelRed(q);
- image->colormap[image->colors].green=
- GetPixelGreen(q);
- image->colormap[image->colors].blue=GetPixelBlue(q);
+ image->colormap[image->colors].red=GetPixelRed(image,q);
+ image->colormap[image->colors].green=GetPixelGreen(image,q);
+ image->colormap[image->colors].blue=GetPixelBlue(image,q);
image->colors++;
}
}
- SetPixelIndex(indexes+x,colormap_index[intensity]);
- q++;
+ SetPixelIndex(image,(Quantum)
+ colormap_index[intensity],q);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -3241,7 +3248,7 @@
image_view=DestroyCacheView(image_view);
}
for (i=0; i < (ssize_t) image->colors; i++)
- image->colormap[i].opacity=(unsigned short) i;
+ image->colormap[i].alpha=(unsigned short) i;
qsort((void *) image->colormap,image->colors,sizeof(PixelPacket),
IntensityCompare);
colormap=(PixelPacket *) AcquireQuantumMemory(image->colors,
@@ -3253,12 +3260,12 @@
colormap[j]=image->colormap[0];
for (i=0; i < (ssize_t) image->colors; i++)
{
- if (IsSameColor(image,&colormap[j],&image->colormap[i]) == MagickFalse)
+ if (IsPixelPacketEquivalent(&colormap[j],&image->colormap[i]) == MagickFalse)
{
j++;
colormap[j]=image->colormap[i];
}
- colormap_index[(ssize_t) image->colormap[i].opacity]=j;
+ colormap_index[(ssize_t) image->colormap[i].alpha]=j;
}
image->colors=(size_t) (j+1);
image->colormap=(PixelPacket *) RelinquishMagickMemory(image->colormap);
@@ -3271,10 +3278,7 @@
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- register IndexPacket
- *restrict indexes;
-
- register const PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -3283,22 +3287,24 @@
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
for (x=0; x < (ssize_t) image->columns; x++)
- SetPixelIndex(indexes+x,colormap_index[ScaleQuantumToMap(
- GetPixelIndex(indexes+x))]);
+ {
+ SetPixelIndex(image,(Quantum) colormap_index[ScaleQuantumToMap(
+ GetPixelIndex(image,q))],q);
+ q+=GetPixelChannels(image);
+ }
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
}
image_view=DestroyCacheView(image_view);
colormap_index=(ssize_t *) RelinquishMagickMemory(colormap_index);
image->type=GrayscaleType;
- if (IsMonochromeImage(image,&image->exception) != MagickFalse)
+ if (IsImageMonochrome(image,&image->exception) != MagickFalse)
image->type=BilevelType;
return(status);
}
diff --git a/magick/quantize.h b/MagickCore/quantize.h
similarity index 97%
rename from magick/quantize.h
rename to MagickCore/quantize.h
index fa0eeaa..e0303ea 100644
--- a/magick/quantize.h
+++ b/MagickCore/quantize.h
@@ -22,7 +22,7 @@
extern "C" {
#endif
-#include "magick/colorspace.h"
+#include "MagickCore/colorspace.h"
typedef enum
{
diff --git a/magick/quantum-export.c b/MagickCore/quantum-export.c
similarity index 68%
rename from magick/quantum-export.c
rename to MagickCore/quantum-export.c
index b872529..cef5547 100644
--- a/magick/quantum-export.c
+++ b/MagickCore/quantum-export.c
@@ -44,32 +44,32 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/property.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/color-private.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/cache.h"
-#include "magick/constitute.h"
-#include "magick/delegate.h"
-#include "magick/geometry.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/option.h"
-#include "magick/pixel.h"
-#include "magick/pixel-private.h"
-#include "magick/quantum.h"
-#include "magick/quantum-private.h"
-#include "magick/resource_.h"
-#include "magick/semaphore.h"
-#include "magick/statistic.h"
-#include "magick/stream.h"
-#include "magick/string_.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/property.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/delegate.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/option.h"
+#include "MagickCore/pixel.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantum.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/semaphore.h"
+#include "MagickCore/statistic.h"
+#include "MagickCore/stream.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/utility.h"
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -233,9 +233,9 @@
return(pixels);
}
-MagickExport size_t ExportQuantumPixels(const Image *image,
- const CacheView *image_view,const QuantumInfo *quantum_info,
- const QuantumType quantum_type,unsigned char *pixels,ExceptionInfo *exception)
+MagickExport size_t ExportQuantumPixels(Image *image,CacheView *image_view,
+ const QuantumInfo *quantum_info,const QuantumType quantum_type,
+ unsigned char *pixels,ExceptionInfo *exception)
{
EndianType
endian;
@@ -252,10 +252,7 @@
QuantumState
quantum_state;
- register const IndexPacket
- *restrict indexes;
-
- register const PixelPacket
+ register const Quantum
*restrict p;
register ssize_t
@@ -265,6 +262,7 @@
*restrict q;
size_t
+ channels,
extent;
ssize_t
@@ -282,17 +280,17 @@
{
number_pixels=GetImageExtent(image);
p=GetVirtualPixelQueue(image);
- indexes=GetVirtualIndexQueue(image);
+ channels=GetPixelChannels(image);
}
else
{
number_pixels=GetCacheViewExtent(image_view);
p=GetCacheViewVirtualPixelQueue(image_view);
- indexes=GetCacheViewVirtualIndexQueue(image_view);
+ channels=GetPixelChannels(image);
}
if (quantum_info->alpha_type == AssociatedQuantumAlpha)
{
- register PixelPacket
+ register Quantum
*restrict q;
/*
@@ -300,28 +298,28 @@
*/
q=GetAuthenticPixelQueue(image);
if (image_view != (CacheView *) NULL)
- q=(PixelPacket *) GetCacheViewVirtualPixelQueue(image_view);
+ q=GetCacheViewAuthenticPixelQueue(image_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
- alpha=QuantumScale*GetPixelAlpha(q);
- SetPixelRed(q,ClampToQuantum(alpha*GetPixelRed(q)));
- SetPixelGreen(q,ClampToQuantum(alpha*GetPixelGreen(q)));
- SetPixelBlue(q,ClampToQuantum(alpha*GetPixelBlue(q)));
+ alpha=QuantumScale*GetPixelAlpha(image,q);
+ SetPixelRed(image,ClampToQuantum(alpha*GetPixelRed(image,q)),q);
+ SetPixelGreen(image,ClampToQuantum(alpha*GetPixelGreen(image,q)),q);
+ SetPixelBlue(image,ClampToQuantum(alpha*GetPixelBlue(image,q)),q);
q++;
}
}
if ((quantum_type == RGBOQuantum) || (quantum_type == CMYKOQuantum) ||
(quantum_type == BGROQuantum))
{
- register PixelPacket
+ register Quantum
*restrict q;
q=GetAuthenticPixelQueue(image);
if (image_view != (CacheView *) NULL)
- q=(PixelPacket *) GetCacheViewVirtualPixelQueue(image_view);
+ q=GetCacheViewAuthenticPixelQueue(image_view);
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q->opacity=(Quantum) GetPixelAlpha(q);
+ SetPixelAlpha(image,GetPixelAlpha(image,q),q);
q++;
}
}
@@ -330,7 +328,7 @@
Quantum
quantum;
- register PixelPacket
+ register Quantum
*restrict q;
q=GetAuthenticPixelQueue(image);
@@ -338,10 +336,10 @@
q=GetAuthenticPixelQueue(image);
for (x=0; x < (ssize_t) number_pixels; x++)
{
- quantum=GetPixelRed(q);
- SetPixelRed(q,GetPixelGreen(q));
- SetPixelGreen(q,quantum);
- q++;
+ quantum=GetPixelRed(image,q);
+ SetPixelRed(image,GetPixelGreen(image,q),q);
+ SetPixelGreen(image,quantum,q);
+ q+=channels;
}
}
x=0;
@@ -368,22 +366,30 @@
for (x=((ssize_t) number_pixels-7); x > 0; x-=8)
{
- pixel=(unsigned char) *indexes++;
+ pixel=(unsigned char) GetPixelIndex(image,p);
*q=((pixel & 0x01) << 7);
- pixel=(unsigned char) *indexes++;
+ p+=channels;
+ pixel=(unsigned char) GetPixelIndex(image,p);
*q|=((pixel & 0x01) << 6);
- pixel=(unsigned char) *indexes++;
+ p+=channels;
+ pixel=(unsigned char) GetPixelIndex(image,p);
*q|=((pixel & 0x01) << 5);
- pixel=(unsigned char) *indexes++;
+ p+=channels;
+ pixel=(unsigned char) GetPixelIndex(image,p);
*q|=((pixel & 0x01) << 4);
- pixel=(unsigned char) *indexes++;
+ p+=channels;
+ pixel=(unsigned char) GetPixelIndex(image,p);
*q|=((pixel & 0x01) << 3);
- pixel=(unsigned char) *indexes++;
+ p+=channels;
+ pixel=(unsigned char) GetPixelIndex(image,p);
*q|=((pixel & 0x01) << 2);
- pixel=(unsigned char) *indexes++;
+ p+=channels;
+ pixel=(unsigned char) GetPixelIndex(image,p);
*q|=((pixel & 0x01) << 1);
- pixel=(unsigned char) *indexes++;
+ p+=channels;
+ pixel=(unsigned char) GetPixelIndex(image,p);
*q|=((pixel & 0x01) << 0);
+ p+=channels;
q++;
}
if ((number_pixels % 8) != 0)
@@ -391,8 +397,9 @@
*q='\0';
for (bit=7; bit >= (ssize_t) (8-(number_pixels % 8)); bit--)
{
- pixel=(unsigned char) *indexes++;
+ pixel=(unsigned char) GetPixelIndex(image,p);
*q|=((pixel & 0x01) << (unsigned char) bit);
+ p+=channels;
}
q++;
}
@@ -405,16 +412,19 @@
for (x=0; x < (ssize_t) (number_pixels-1) ; x+=2)
{
- pixel=(unsigned char) *indexes++;
+ pixel=(unsigned char) GetPixelIndex(image,p);
*q=((pixel & 0xf) << 4);
- pixel=(unsigned char) *indexes++;
+ p+=channels;
+ pixel=(unsigned char) GetPixelIndex(image,p);
*q|=((pixel & 0xf) << 0);
+ p+=channels;
q++;
}
if ((number_pixels % 2) != 0)
{
- pixel=(unsigned char) *indexes++;
+ pixel=(unsigned char) GetPixelIndex(image,p);
*q=((pixel & 0xf) << 4);
+ p+=channels;
q++;
}
break;
@@ -423,7 +433,8 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopCharPixel((unsigned char) GetPixelIndex(indexes+x),q);
+ q=PopCharPixel((unsigned char) GetPixelIndex(image,p),q);
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -435,15 +446,16 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
q=PopShortPixel(endian,SinglePrecisionToHalf(QuantumScale*
- GetPixelIndex(indexes+x)),q);
+ GetPixelIndex(image,p)),q);
+ p+=channels;
q+=quantum_info->pad;
}
break;
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopShortPixel(endian,(unsigned short) GetPixelIndex(
- indexes+x),q);
+ q=PopShortPixel(endian,(unsigned short) GetPixelIndex(image,p),q);
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -454,17 +466,17 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopFloatPixel(&quantum_state,(float) GetPixelIndex(
- indexes+x),q);
- p++;
+ q=PopFloatPixel(&quantum_state,(float)
+ GetPixelIndex(image,p),q);
+ p+=channels;
q+=quantum_info->pad;
}
break;
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopLongPixel(endian,(unsigned int) GetPixelIndex(
- indexes+x),q);
+ q=PopLongPixel(endian,(unsigned int) GetPixelIndex(image,p),q);
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -475,9 +487,9 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopDoublePixel(&quantum_state,(double) GetPixelIndex(
- indexes+x),q);
- p++;
+ q=PopDoublePixel(&quantum_state,(double)
+ GetPixelIndex(image,p),q);
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -488,8 +500,8 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- GetPixelIndex(indexes+x),q);
- p++;
+ GetPixelIndex(image,p),q);
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -514,30 +526,30 @@
for (x=((ssize_t) number_pixels-3); x > 0; x-=4)
{
- pixel=(unsigned char) *indexes++;
+ pixel=(unsigned char) GetPixelIndex(image,p);
*q=((pixel & 0x01) << 7);
- pixel=(unsigned char) (GetPixelOpacity(p) == (Quantum) TransparentOpacity ?
- 1 : 0);
+ pixel=(unsigned char) (GetPixelAlpha(image,p) == (Quantum)
+ TransparentAlpha ? 1 : 0);
*q|=((pixel & 0x01) << 6);
- p++;
- pixel=(unsigned char) *indexes++;
+ p+=channels;
+ pixel=(unsigned char) GetPixelIndex(image,p);
*q|=((pixel & 0x01) << 5);
- pixel=(unsigned char) (GetPixelOpacity(p) == (Quantum) TransparentOpacity ?
- 1 : 0);
+ pixel=(unsigned char) (GetPixelAlpha(image,p) == (Quantum)
+ TransparentAlpha ? 1 : 0);
*q|=((pixel & 0x01) << 4);
- p++;
- pixel=(unsigned char) *indexes++;
+ p+=channels;
+ pixel=(unsigned char) GetPixelIndex(image,p);
*q|=((pixel & 0x01) << 3);
- pixel=(unsigned char) (GetPixelOpacity(p) == (Quantum) TransparentOpacity ?
- 1 : 0);
+ pixel=(unsigned char) (GetPixelAlpha(image,p) == (Quantum)
+ TransparentAlpha ? 1 : 0);
*q|=((pixel & 0x01) << 2);
- p++;
- pixel=(unsigned char) *indexes++;
+ p+=channels;
+ pixel=(unsigned char) GetPixelIndex(image,p);
*q|=((pixel & 0x01) << 1);
- pixel=(unsigned char) (GetPixelOpacity(p) == (Quantum) TransparentOpacity ?
- 1 : 0);
+ pixel=(unsigned char) (GetPixelAlpha(image,p) == (Quantum)
+ TransparentAlpha ? 1 : 0);
*q|=((pixel & 0x01) << 0);
- p++;
+ p+=channels;
q++;
}
if ((number_pixels % 4) != 0)
@@ -545,12 +557,12 @@
*q='\0';
for (bit=3; bit >= (ssize_t) (4-(number_pixels % 4)); bit-=2)
{
- pixel=(unsigned char) *indexes++;
+ pixel=(unsigned char) GetPixelIndex(image,p);
*q|=((pixel & 0x01) << (unsigned char) (bit+4));
- pixel=(unsigned char) (GetPixelOpacity(p) == (Quantum)
- TransparentOpacity ? 1 : 0);
+ pixel=(unsigned char) (GetPixelAlpha(image,p) == (Quantum)
+ TransparentAlpha ? 1 : 0);
*q|=((pixel & 0x01) << (unsigned char) (bit+4-1));
- p++;
+ p+=channels;
}
q++;
}
@@ -563,12 +575,11 @@
for (x=0; x < (ssize_t) number_pixels ; x++)
{
- pixel=(unsigned char) *indexes++;
+ pixel=(unsigned char) GetPixelIndex(image,p);
*q=((pixel & 0xf) << 4);
- pixel=(unsigned char) (16*QuantumScale*((Quantum) (QuantumRange-
- GetPixelOpacity(p)))+0.5);
+ pixel=(unsigned char) (16*QuantumScale*GetPixelAlpha(image,p)+0.5);
*q|=((pixel & 0xf) << 0);
- p++;
+ p+=channels;
q++;
}
break;
@@ -580,11 +591,10 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopCharPixel((unsigned char) GetPixelIndex(indexes+x),q);
- pixel=ScaleQuantumToChar((Quantum) (QuantumRange-
- GetPixelOpacity(p)));
+ q=PopCharPixel((unsigned char) GetPixelIndex(image,p),q);
+ pixel=ScaleQuantumToChar(GetPixelAlpha(image,p));
q=PopCharPixel(pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -598,24 +608,22 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopShortPixel(endian,(unsigned short) GetPixelIndex(
- indexes+x),q);
+ q=PopShortPixel(endian,(unsigned short)
+ GetPixelIndex(image,p),q);
pixel=SinglePrecisionToHalf(QuantumScale*
- GetPixelAlpha(p));
+ GetPixelAlpha(image,p));
q=PopShortPixel(endian,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopShortPixel(endian,(unsigned short) GetPixelIndex(
- indexes+x),q);
- pixel=ScaleQuantumToShort((Quantum) (QuantumRange-
- GetPixelOpacity(p)));
+ q=PopShortPixel(endian,(unsigned short) GetPixelIndex(image,p),q);
+ pixel=ScaleQuantumToShort(GetPixelAlpha(image,p));
q=PopShortPixel(endian,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -632,23 +640,21 @@
float
pixel;
- q=PopFloatPixel(&quantum_state,(float) GetPixelIndex(
- indexes+x),q);
- pixel=(float) (GetPixelAlpha(p));
+ q=PopFloatPixel(&quantum_state,(float)
+ GetPixelIndex(image,p),q);
+ pixel=(float) GetPixelAlpha(image,p);
q=PopFloatPixel(&quantum_state,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopLongPixel(endian,(unsigned int) GetPixelIndex(
- indexes+x),q);
- pixel=ScaleQuantumToLong((Quantum) (QuantumRange-
- GetPixelOpacity(p)));
+ q=PopLongPixel(endian,(unsigned int) GetPixelIndex(image,p),q);
+ pixel=ScaleQuantumToLong(GetPixelAlpha(image,p));
q=PopLongPixel(endian,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -662,11 +668,11 @@
double
pixel;
- q=PopDoublePixel(&quantum_state,(double) GetPixelIndex(
- indexes+x),q);
- pixel=(double) (GetPixelAlpha(p));
+ q=PopDoublePixel(&quantum_state,(double)
+ GetPixelIndex(image,p),q);
+ pixel=(double) GetPixelAlpha(image,p);
q=PopDoublePixel(&quantum_state,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -678,10 +684,10 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- GetPixelIndex(indexes+x),q);
+ GetPixelIndex(image,p),q);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny((Quantum) (GetPixelAlpha(p)),range),q);
- p++;
+ ScaleQuantumToAny(GetPixelAlpha(image,p),range),q);
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -697,10 +703,10 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopCharPixel(ScaleQuantumToChar(GetPixelBlue(p)),q);
- q=PopCharPixel(ScaleQuantumToChar(GetPixelGreen(p)),q);
- q=PopCharPixel(ScaleQuantumToChar(GetPixelRed(p)),q);
- p++;
+ q=PopCharPixel(ScaleQuantumToChar(GetPixelBlue(image,p)),q);
+ q=PopCharPixel(ScaleQuantumToChar(GetPixelGreen(image,p)),q);
+ q=PopCharPixel(ScaleQuantumToChar(GetPixelRed(image,p)),q);
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -716,11 +722,11 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
pixel=(unsigned int) (
- ScaleQuantumToAny(GetPixelRed(p),range) << 22 |
- ScaleQuantumToAny(GetPixelGreen(p),range) << 12 |
- ScaleQuantumToAny(GetPixelBlue(p),range) << 2);
+ ScaleQuantumToAny(GetPixelRed(image,p),range) << 22 |
+ ScaleQuantumToAny(GetPixelGreen(image,p),range) << 12 |
+ ScaleQuantumToAny(GetPixelBlue(image,p),range) << 2);
q=PopLongPixel(endian,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -729,29 +735,35 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(image,p),
+ range);
q=PopQuantumLongPixel(&quantum_state,quantum_info->depth,pixel,
q);
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(image,p),
+ range);
q=PopQuantumLongPixel(&quantum_state,quantum_info->depth,pixel,
q);
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(image,p),
+ range);
q=PopQuantumLongPixel(&quantum_state,quantum_info->depth,pixel,
q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(image,p),
+ range);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,pixel,q);
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(image,p),
+ range);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,pixel,q);
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(image,p),
+ range);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -771,18 +783,21 @@
default:
case 0:
{
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(
+ GetPixelRed(image,p),range);
break;
}
case 1:
{
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(
+ GetPixelGreen(image,p),range);
break;
}
case 2:
{
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(p),range);
- p++;
+ pixel=(unsigned int) ScaleQuantumToAny(
+ GetPixelBlue(image,p),range);
+ p+=channels;
break;
}
}
@@ -792,18 +807,21 @@
default:
case 0:
{
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(
+ GetPixelRed(image,p),range);
break;
}
case 1:
{
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(
+ GetPixelGreen(image,p),range);
break;
}
case 2:
{
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(p),range);
- p++;
+ pixel=(unsigned int) ScaleQuantumToAny(
+ GetPixelBlue(image,p),range);
+ p+=channels;
break;
}
}
@@ -817,18 +835,21 @@
default:
case 0:
{
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(
+ GetPixelRed(image,p),range);
break;
}
case 1:
{
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(
+ GetPixelGreen(image,p),range);
break;
}
case 2:
{
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(p),range);
- p++;
+ pixel=(unsigned int) ScaleQuantumToAny(
+ GetPixelBlue(image,p),range);
+ p+=channels;
break;
}
}
@@ -836,36 +857,42 @@
q+=quantum_info->pad;
}
if (bit != 0)
- p++;
+ p+=channels;
break;
}
if (quantum_info->quantum == 32UL)
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(image,p),
+ range);
q=PopQuantumLongPixel(&quantum_state,quantum_info->depth,pixel,
q);
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(image,p),
+ range);
q=PopQuantumLongPixel(&quantum_state,quantum_info->depth,pixel,
q);
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(image,p),
+ range);
q=PopQuantumLongPixel(&quantum_state,quantum_info->depth,pixel,
q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(image,p),
+ range);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,pixel,q);
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(image,p),
+ range);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,pixel,q);
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(image,p),
+ range);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -879,26 +906,29 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=SinglePrecisionToHalf(QuantumScale*GetPixelBlue(p));
+ pixel=SinglePrecisionToHalf(QuantumScale*
+ GetPixelBlue(image,p));
q=PopShortPixel(endian,pixel,q);
- pixel=SinglePrecisionToHalf(QuantumScale*GetPixelGreen(p));
+ pixel=SinglePrecisionToHalf(QuantumScale*
+ GetPixelGreen(image,p));
q=PopShortPixel(endian,pixel,q);
- pixel=SinglePrecisionToHalf(QuantumScale*GetPixelRed(p));
+ pixel=SinglePrecisionToHalf(QuantumScale*
+ GetPixelRed(image,p));
q=PopShortPixel(endian,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToShort(GetPixelBlue(p));
+ pixel=ScaleQuantumToShort(GetPixelBlue(image,p));
q=PopShortPixel(endian,pixel,q);
- pixel=ScaleQuantumToShort(GetPixelGreen(p));
+ pixel=ScaleQuantumToShort(GetPixelGreen(image,p));
q=PopShortPixel(endian,pixel,q);
- pixel=ScaleQuantumToShort(GetPixelRed(p));
+ pixel=ScaleQuantumToShort(GetPixelRed(image,p));
q=PopShortPixel(endian,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -912,23 +942,26 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopFloatPixel(&quantum_state,(float) GetPixelRed(p),q);
- q=PopFloatPixel(&quantum_state,(float) GetPixelGreen(p),q);
- q=PopFloatPixel(&quantum_state,(float) GetPixelBlue(p),q);
- p++;
+ q=PopFloatPixel(&quantum_state,(float)
+ GetPixelRed(image,p),q);
+ q=PopFloatPixel(&quantum_state,(float)
+ GetPixelGreen(image,p),q);
+ q=PopFloatPixel(&quantum_state,(float)
+ GetPixelBlue(image,p),q);
+ p+=channels;
q+=quantum_info->pad;
}
break;
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToLong(GetPixelBlue(p));
+ pixel=ScaleQuantumToLong(GetPixelBlue(image,p));
q=PopLongPixel(endian,pixel,q);
- pixel=ScaleQuantumToLong(GetPixelGreen(p));
+ pixel=ScaleQuantumToLong(GetPixelGreen(image,p));
q=PopLongPixel(endian,pixel,q);
- pixel=ScaleQuantumToLong(GetPixelRed(p));
+ pixel=ScaleQuantumToLong(GetPixelRed(image,p));
q=PopLongPixel(endian,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -939,10 +972,13 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopDoublePixel(&quantum_state,(double) GetPixelRed(p),q);
- q=PopDoublePixel(&quantum_state,(double) GetPixelGreen(p),q);
- q=PopDoublePixel(&quantum_state,(double) GetPixelBlue(p),q);
- p++;
+ q=PopDoublePixel(&quantum_state,(double)
+ GetPixelRed(image,p),q);
+ q=PopDoublePixel(&quantum_state,(double)
+ GetPixelGreen(image,p),q);
+ q=PopDoublePixel(&quantum_state,(double)
+ GetPixelBlue(image,p),q);
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -954,12 +990,12 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny(GetPixelRed(p),range),q);
+ ScaleQuantumToAny(GetPixelRed(image,p),range),q);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny(GetPixelGreen(p),range),q);
+ ScaleQuantumToAny(GetPixelGreen(image,p),range),q);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny(GetPixelBlue(p),range),q);
- p++;
+ ScaleQuantumToAny(GetPixelBlue(image,p),range),q);
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -979,15 +1015,15 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToChar(GetPixelBlue(p));
+ pixel=ScaleQuantumToChar(GetPixelBlue(image,p));
q=PopCharPixel(pixel,q);
- pixel=ScaleQuantumToChar(GetPixelGreen(p));
+ pixel=ScaleQuantumToChar(GetPixelGreen(image,p));
q=PopCharPixel(pixel,q);
- pixel=ScaleQuantumToChar(GetPixelRed(p));
+ pixel=ScaleQuantumToChar(GetPixelRed(image,p));
q=PopCharPixel(pixel,q);
- pixel=ScaleQuantumToChar((Quantum) GetPixelAlpha(p));
+ pixel=ScaleQuantumToChar(GetPixelAlpha(image,p));
q=PopCharPixel(pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -1018,10 +1054,10 @@
{
switch (i)
{
- case 0: quantum=GetPixelRed(p); break;
- case 1: quantum=GetPixelGreen(p); break;
- case 2: quantum=GetPixelBlue(p); break;
- case 3: quantum=(Quantum) (QuantumRange-GetPixelOpacity(p)); break;
+ case 0: quantum=GetPixelRed(image,p); break;
+ case 1: quantum=GetPixelGreen(image,p); break;
+ case 2: quantum=GetPixelBlue(image,p); break;
+ case 3: quantum=GetPixelAlpha(image,p); break;
}
switch (n % 3)
{
@@ -1048,7 +1084,7 @@
}
n++;
}
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -1057,36 +1093,42 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(image,p),
+ range);
q=PopQuantumLongPixel(&quantum_state,quantum_info->depth,pixel,
q);
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(image,p),
+ range);
q=PopQuantumLongPixel(&quantum_state,quantum_info->depth,pixel,
q);
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(image,p),
+ range);
q=PopQuantumLongPixel(&quantum_state,quantum_info->depth,pixel,
q);
- pixel=(unsigned int) ScaleQuantumToAny((Quantum) (QuantumRange-
- GetPixelOpacity(p)),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelAlpha(image,p),
+ range);
q=PopQuantumLongPixel(&quantum_state,quantum_info->depth,pixel,
q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(image,p),
+ range);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,pixel,q);
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(image,p),
+ range);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,pixel,q);
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(image,p),
+ range);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,pixel,q);
- pixel=(unsigned int) ScaleQuantumToAny((Quantum) (QuantumRange-
- GetPixelOpacity(p)),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelAlpha(image,p),
+ range);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -1100,30 +1142,34 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=SinglePrecisionToHalf(QuantumScale*GetPixelBlue(p));
+ pixel=SinglePrecisionToHalf(QuantumScale*
+ GetPixelBlue(image,p));
q=PopShortPixel(endian,pixel,q);
- pixel=SinglePrecisionToHalf(QuantumScale*GetPixelGreen(p));
+ pixel=SinglePrecisionToHalf(QuantumScale*
+ GetPixelGreen(image,p));
q=PopShortPixel(endian,pixel,q);
- pixel=SinglePrecisionToHalf(QuantumScale*GetPixelRed(p));
+ pixel=SinglePrecisionToHalf(QuantumScale*
+ GetPixelRed(image,p));
q=PopShortPixel(endian,pixel,q);
- pixel=SinglePrecisionToHalf(QuantumScale*GetPixelAlpha(p));
+ pixel=SinglePrecisionToHalf(QuantumScale*
+ GetPixelAlpha(image,p));
q=PopShortPixel(endian,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToShort(GetPixelBlue(p));
+ pixel=ScaleQuantumToShort(GetPixelBlue(image,p));
q=PopShortPixel(endian,pixel,q);
- pixel=ScaleQuantumToShort(GetPixelGreen(p));
+ pixel=ScaleQuantumToShort(GetPixelGreen(image,p));
q=PopShortPixel(endian,pixel,q);
- pixel=ScaleQuantumToShort(GetPixelRed(p));
+ pixel=ScaleQuantumToShort(GetPixelRed(image,p));
q=PopShortPixel(endian,pixel,q);
- pixel=ScaleQuantumToShort((Quantum) GetPixelAlpha(p));
+ pixel=ScaleQuantumToShort(GetPixelAlpha(image,p));
q=PopShortPixel(endian,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -1140,27 +1186,30 @@
float
pixel;
- q=PopFloatPixel(&quantum_state,(float) GetPixelRed(p),q);
- q=PopFloatPixel(&quantum_state,(float) GetPixelGreen(p),q);
- q=PopFloatPixel(&quantum_state,(float) GetPixelBlue(p),q);
- pixel=(float) GetPixelAlpha(p);
+ q=PopFloatPixel(&quantum_state,(float)
+ GetPixelRed(image,p),q);
+ q=PopFloatPixel(&quantum_state,(float)
+ GetPixelGreen(image,p),q);
+ q=PopFloatPixel(&quantum_state,(float)
+ GetPixelBlue(image,p),q);
+ pixel=(float) GetPixelAlpha(image,p);
q=PopFloatPixel(&quantum_state,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToLong(GetPixelBlue(p));
+ pixel=ScaleQuantumToLong(GetPixelBlue(image,p));
q=PopLongPixel(endian,pixel,q);
- pixel=ScaleQuantumToLong(GetPixelGreen(p));
+ pixel=ScaleQuantumToLong(GetPixelGreen(image,p));
q=PopLongPixel(endian,pixel,q);
- pixel=ScaleQuantumToLong(GetPixelRed(p));
+ pixel=ScaleQuantumToLong(GetPixelRed(image,p));
q=PopLongPixel(endian,pixel,q);
- pixel=ScaleQuantumToLong((Quantum) GetPixelAlpha(p));
+ pixel=ScaleQuantumToLong(GetPixelAlpha(image,p));
q=PopLongPixel(endian,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -1174,12 +1223,15 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopDoublePixel(&quantum_state,(double) GetPixelRed(p),q);
- q=PopDoublePixel(&quantum_state,(double) GetPixelGreen(p),q);
- q=PopDoublePixel(&quantum_state,(double) GetPixelBlue(p),q);
- pixel=(double) GetPixelAlpha(p);
+ q=PopDoublePixel(&quantum_state,(double)
+ GetPixelRed(image,p),q);
+ q=PopDoublePixel(&quantum_state,(double)
+ GetPixelGreen(image,p),q);
+ q=PopDoublePixel(&quantum_state,(double)
+ GetPixelBlue(image,p),q);
+ pixel=(double) GetPixelAlpha(image,p);
q=PopDoublePixel(&quantum_state,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -1191,14 +1243,14 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny(GetPixelBlue(p),range),q);
+ ScaleQuantumToAny(GetPixelBlue(image,p),range),q);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny(GetPixelGreen(p),range),q);
+ ScaleQuantumToAny(GetPixelGreen(image,p),range),q);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny(GetPixelRed(p),range),q);
+ ScaleQuantumToAny(GetPixelRed(image,p),range),q);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny((Quantum) GetPixelAlpha(p),range),q);
- p++;
+ ScaleQuantumToAny(GetPixelAlpha(image,p),range),q);
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -1230,22 +1282,22 @@
for (x=((ssize_t) number_pixels-7); x > 0; x-=8)
{
*q='\0';
- *q|=(PixelIntensityToQuantum(p) < threshold ? black : white) << 7;
- p++;
- *q|=(PixelIntensityToQuantum(p) < threshold ? black : white) << 6;
- p++;
- *q|=(PixelIntensityToQuantum(p) < threshold ? black : white) << 5;
- p++;
- *q|=(PixelIntensityToQuantum(p) < threshold ? black : white) << 4;
- p++;
- *q|=(PixelIntensityToQuantum(p) < threshold ? black : white) << 3;
- p++;
- *q|=(PixelIntensityToQuantum(p) < threshold ? black : white) << 2;
- p++;
- *q|=(PixelIntensityToQuantum(p) < threshold ? black : white) << 1;
- p++;
- *q|=(PixelIntensityToQuantum(p) < threshold ? black : white) << 0;
- p++;
+ *q|=(GetPixelIntensity(image,p) < threshold ? black : white) << 7;
+ p+=channels;
+ *q|=(GetPixelIntensity(image,p) < threshold ? black : white) << 6;
+ p+=channels;
+ *q|=(GetPixelIntensity(image,p) < threshold ? black : white) << 5;
+ p+=channels;
+ *q|=(GetPixelIntensity(image,p) < threshold ? black : white) << 4;
+ p+=channels;
+ *q|=(GetPixelIntensity(image,p) < threshold ? black : white) << 3;
+ p+=channels;
+ *q|=(GetPixelIntensity(image,p) < threshold ? black : white) << 2;
+ p+=channels;
+ *q|=(GetPixelIntensity(image,p) < threshold ? black : white) << 1;
+ p+=channels;
+ *q|=(GetPixelIntensity(image,p) < threshold ? black : white) << 0;
+ p+=channels;
q++;
}
if ((number_pixels % 8) != 0)
@@ -1253,9 +1305,9 @@
*q='\0';
for (bit=7; bit >= (ssize_t) (8-(number_pixels % 8)); bit--)
{
- *q|=(PixelIntensityToQuantum(p) < threshold ? black : white) <<
+ *q|=(GetPixelIntensity(image,p) < threshold ? black : white) <<
bit;
- p++;
+ p+=channels;
}
q++;
}
@@ -1268,19 +1320,19 @@
for (x=0; x < (ssize_t) (number_pixels-1) ; x+=2)
{
- pixel=ScaleQuantumToChar(PixelIntensityToQuantum(p));
+ pixel=ScaleQuantumToChar(GetPixelIntensity(image,p));
*q=(((pixel >> 4) & 0xf) << 4);
- p++;
- pixel=ScaleQuantumToChar(PixelIntensityToQuantum(p));
+ p+=channels;
+ pixel=ScaleQuantumToChar(GetPixelIntensity(image,p));
*q|=pixel >> 4;
- p++;
+ p+=channels;
q++;
}
if ((number_pixels % 2) != 0)
{
- pixel=ScaleQuantumToChar(PixelIntensityToQuantum(p));
+ pixel=ScaleQuantumToChar(GetPixelIntensity(image,p));
*q=(((pixel >> 4) & 0xf) << 4);
- p++;
+ p+=channels;
q++;
}
break;
@@ -1292,9 +1344,9 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToChar(PixelIntensityToQuantum(p));
+ pixel=ScaleQuantumToChar(GetPixelIntensity(image,p));
q=PopCharPixel(pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -1310,19 +1362,19 @@
for (x=0; x < (ssize_t) (number_pixels-2); x+=3)
{
pixel=(unsigned int) (
- ScaleQuantumToAny(PixelIntensityToQuantum(p+2),range) << 22 |
- ScaleQuantumToAny(PixelIntensityToQuantum(p+1),range) << 12 |
- ScaleQuantumToAny(PixelIntensityToQuantum(p+0),range) << 2);
+ ScaleQuantumToAny(GetPixelIntensity(image,p+2),range) << 22 |
+ ScaleQuantumToAny(GetPixelIntensity(image,p+1),range) << 12 |
+ ScaleQuantumToAny(GetPixelIntensity(image,p+0),range) << 2);
q=PopLongPixel(endian,pixel,q);
p+=3;
q+=quantum_info->pad;
}
pixel=0UL;
if (x++ < (ssize_t) (number_pixels-1))
- pixel|=ScaleQuantumToAny(PixelIntensityToQuantum(p+1),
+ pixel|=ScaleQuantumToAny(GetPixelIntensity(image,p+1),
range) << 12;
if (x++ < (ssize_t) number_pixels)
- pixel|=ScaleQuantumToAny(PixelIntensityToQuantum(p+0),
+ pixel|=ScaleQuantumToAny(GetPixelIntensity(image,p+0),
range) << 2;
q=PopLongPixel(endian,pixel,q);
break;
@@ -1330,8 +1382,8 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny(PixelIntensityToQuantum(p),range),q);
- p++;
+ ScaleQuantumToAny(GetPixelIntensity(image,p),range),q);
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -1346,9 +1398,9 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToShort(PixelIntensityToQuantum(p));
+ pixel=ScaleQuantumToShort(GetPixelIntensity(image,p));
q=PopShortPixel(endian,(unsigned short) (pixel >> 4),q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -1356,8 +1408,8 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny(PixelIntensityToQuantum(p),range),q);
- p++;
+ ScaleQuantumToAny(GetPixelIntensity(image,p),range),q);
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -1372,18 +1424,18 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
pixel=SinglePrecisionToHalf(QuantumScale*
- PixelIntensityToQuantum(p));
+ GetPixelIntensity(image,p));
q=PopShortPixel(endian,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToShort(PixelIntensityToQuantum(p));
+ pixel=ScaleQuantumToShort(GetPixelIntensity(image,p));
q=PopShortPixel(endian,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -1400,18 +1452,18 @@
float
pixel;
- pixel=(float) PixelIntensityToQuantum(p);
+ pixel=(float) GetPixelIntensity(image,p);
q=PopFloatPixel(&quantum_state,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToLong(PixelIntensityToQuantum(p));
+ pixel=ScaleQuantumToLong(GetPixelIntensity(image,p));
q=PopLongPixel(endian,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -1425,9 +1477,9 @@
double
pixel;
- pixel=(double) PixelIntensityToQuantum(p);
+ pixel=(double) GetPixelIntensity(image,p);
q=PopDoublePixel(&quantum_state,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -1439,8 +1491,8 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny(PixelIntensityToQuantum(p),range),q);
- p++;
+ ScaleQuantumToAny(GetPixelIntensity(image,p),range),q);
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -1473,22 +1525,26 @@
for (x=((ssize_t) number_pixels-3); x > 0; x-=4)
{
*q='\0';
- *q|=(PixelIntensityToQuantum(p) > threshold ? black : white) << 7;
- pixel=(unsigned char) (GetPixelOpacity(p) == OpaqueOpacity ? 0x00 : 0x01);
+ *q|=(GetPixelIntensity(image,p) > threshold ? black : white) << 7;
+ pixel=(unsigned char) (GetPixelAlpha(image,p) == OpaqueAlpha ?
+ 0x00 : 0x01);
*q|=(((int) pixel != 0 ? 0x00 : 0x01) << 6);
- p++;
- *q|=(PixelIntensityToQuantum(p) > threshold ? black : white) << 5;
- pixel=(unsigned char) (GetPixelOpacity(p) == OpaqueOpacity ? 0x00 : 0x01);
+ p+=channels;
+ *q|=(GetPixelIntensity(image,p) > threshold ? black : white) << 5;
+ pixel=(unsigned char) (GetPixelAlpha(image,p) == OpaqueAlpha ?
+ 0x00 : 0x01);
*q|=(((int) pixel != 0 ? 0x00 : 0x01) << 4);
- p++;
- *q|=(PixelIntensityToQuantum(p) > threshold ? black : white) << 3;
- pixel=(unsigned char) (GetPixelOpacity(p) == OpaqueOpacity ? 0x00 : 0x01);
+ p+=channels;
+ *q|=(GetPixelIntensity(image,p) > threshold ? black : white) << 3;
+ pixel=(unsigned char) (GetPixelAlpha(image,p) == OpaqueAlpha ?
+ 0x00 : 0x01);
*q|=(((int) pixel != 0 ? 0x00 : 0x01) << 2);
- p++;
- *q|=(PixelIntensityToQuantum(p) > threshold ? black : white) << 1;
- pixel=(unsigned char) (GetPixelOpacity(p) == OpaqueOpacity ? 0x00 : 0x01);
+ p+=channels;
+ *q|=(GetPixelIntensity(image,p) > threshold ? black : white) << 1;
+ pixel=(unsigned char) (GetPixelAlpha(image,p) == OpaqueAlpha ?
+ 0x00 : 0x01);
*q|=(((int) pixel != 0 ? 0x00 : 0x01) << 0);
- p++;
+ p+=channels;
q++;
}
if ((number_pixels % 4) != 0)
@@ -1496,13 +1552,13 @@
*q='\0';
for (bit=0; bit <= (ssize_t) (number_pixels % 4); bit+=2)
{
- *q|=(PixelIntensityToQuantum(p) > threshold ? black : white) <<
+ *q|=(GetPixelIntensity(image,p) > threshold ? black : white) <<
(7-bit);
- pixel=(unsigned char) (GetPixelOpacity(p) == OpaqueOpacity ? 0x00 :
- 0x01);
+ pixel=(unsigned char) (GetPixelAlpha(image,p) == OpaqueAlpha ?
+ 0x00 : 0x01);
*q|=(((int) pixel != 0 ? 0x00 : 0x01) << (unsigned char)
(7-bit-1));
- p++;
+ p+=channels;
}
q++;
}
@@ -1515,12 +1571,11 @@
for (x=0; x < (ssize_t) number_pixels ; x++)
{
- pixel=ScaleQuantumToChar(PixelIntensityToQuantum(p));
+ pixel=ScaleQuantumToChar(GetPixelIntensity(image,p));
*q=(((pixel >> 4) & 0xf) << 4);
- pixel=(unsigned char) (16*QuantumScale*((Quantum) (QuantumRange-
- GetPixelOpacity(p)))+0.5);
+ pixel=(unsigned char) (16*QuantumScale*GetPixelAlpha(image,p)+0.5);
*q|=pixel & 0xf;
- p++;
+ p+=channels;
q++;
}
break;
@@ -1532,12 +1587,11 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToChar(PixelIntensityToQuantum(p));
+ pixel=ScaleQuantumToChar(GetPixelIntensity(image,p));
q=PopCharPixel(pixel,q);
- pixel=ScaleQuantumToChar((Quantum) (QuantumRange-
- GetPixelOpacity(p)));
+ pixel=ScaleQuantumToChar(GetPixelAlpha(image,p));
q=PopCharPixel(pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -1552,24 +1606,23 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
pixel=SinglePrecisionToHalf(QuantumScale*
- PixelIntensityToQuantum(p));
+ GetPixelIntensity(image,p));
q=PopShortPixel(endian,pixel,q);
pixel=SinglePrecisionToHalf(QuantumScale*
- GetPixelAlpha(p));
+ GetPixelAlpha(image,p));
q=PopShortPixel(endian,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToShort(PixelIntensityToQuantum(p));
+ pixel=ScaleQuantumToShort(GetPixelIntensity(image,p));
q=PopShortPixel(endian,pixel,q);
- pixel=ScaleQuantumToShort((Quantum) (QuantumRange-
- GetPixelOpacity(p)));
+ pixel=ScaleQuantumToShort(GetPixelAlpha(image,p));
q=PopShortPixel(endian,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -1586,23 +1639,22 @@
float
pixel;
- pixel=(float) PixelIntensityToQuantum(p);
+ pixel=(float) GetPixelIntensity(image,p);
q=PopFloatPixel(&quantum_state,pixel,q);
- pixel=(float) (GetPixelAlpha(p));
+ pixel=(float) (GetPixelAlpha(image,p));
q=PopFloatPixel(&quantum_state,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToLong(PixelIntensityToQuantum(p));
+ pixel=ScaleQuantumToLong(GetPixelIntensity(image,p));
q=PopLongPixel(endian,pixel,q);
- pixel=ScaleQuantumToLong((Quantum) (QuantumRange-
- GetPixelOpacity(p)));
+ pixel=ScaleQuantumToLong(GetPixelAlpha(image,p));
q=PopLongPixel(endian,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -1616,11 +1668,11 @@
double
pixel;
- pixel=(double) PixelIntensityToQuantum(p);
+ pixel=(double) GetPixelIntensity(image,p);
q=PopDoublePixel(&quantum_state,pixel,q);
- pixel=(double) (GetPixelAlpha(p));
+ pixel=(double) (GetPixelAlpha(image,p));
q=PopDoublePixel(&quantum_state,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -1632,10 +1684,10 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny(PixelIntensityToQuantum(p),range),q);
+ ScaleQuantumToAny(GetPixelIntensity(image,p),range),q);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny((Quantum) (GetPixelAlpha(p)),range),q);
- p++;
+ ScaleQuantumToAny(GetPixelAlpha(image,p),range),q);
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -1655,9 +1707,9 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToChar(GetPixelRed(p));
+ pixel=ScaleQuantumToChar(GetPixelRed(image,p));
q=PopCharPixel(pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -1671,18 +1723,19 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=SinglePrecisionToHalf(QuantumScale*GetPixelRed(p));
+ pixel=SinglePrecisionToHalf(QuantumScale*
+ GetPixelRed(image,p));
q=PopShortPixel(endian,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToShort(GetPixelRed(p));
+ pixel=ScaleQuantumToShort(GetPixelRed(image,p));
q=PopShortPixel(endian,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -1696,17 +1749,18 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopFloatPixel(&quantum_state,(float) GetPixelRed(p),q);
- p++;
+ q=PopFloatPixel(&quantum_state,(float)
+ GetPixelRed(image,p),q);
+ p+=channels;
q+=quantum_info->pad;
}
break;
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToLong(GetPixelRed(p));
+ pixel=ScaleQuantumToLong(GetPixelRed(image,p));
q=PopLongPixel(endian,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -1717,8 +1771,9 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopDoublePixel(&quantum_state,(double) GetPixelRed(p),q);
- p++;
+ q=PopDoublePixel(&quantum_state,(double)
+ GetPixelRed(image,p),q);
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -1730,8 +1785,8 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny(GetPixelRed(p),range),q);
- p++;
+ ScaleQuantumToAny(GetPixelRed(image,p),range),q);
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -1751,9 +1806,9 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToChar(GetPixelGreen(p));
+ pixel=ScaleQuantumToChar(GetPixelGreen(image,p));
q=PopCharPixel(pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -1768,18 +1823,18 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
pixel=SinglePrecisionToHalf(QuantumScale*
- GetPixelGreen(p));
+ GetPixelGreen(image,p));
q=PopShortPixel(endian,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToShort(GetPixelGreen(p));
+ pixel=ScaleQuantumToShort(GetPixelGreen(image,p));
q=PopShortPixel(endian,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -1793,17 +1848,18 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopFloatPixel(&quantum_state,(float) GetPixelGreen(p),q);
- p++;
+ q=PopFloatPixel(&quantum_state,(float)
+ GetPixelGreen(image,p),q);
+ p+=channels;
q+=quantum_info->pad;
}
break;
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToLong(GetPixelGreen(p));
+ pixel=ScaleQuantumToLong(GetPixelGreen(image,p));
q=PopLongPixel(endian,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -1814,8 +1870,9 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopDoublePixel(&quantum_state,(double) GetPixelGreen(p),q);
- p++;
+ q=PopDoublePixel(&quantum_state,(double)
+ GetPixelGreen(image,p),q);
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -1827,8 +1884,8 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny(GetPixelGreen(p),range),q);
- p++;
+ ScaleQuantumToAny(GetPixelGreen(image,p),range),q);
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -1848,9 +1905,9 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToChar(GetPixelBlue(p));
+ pixel=ScaleQuantumToChar(GetPixelBlue(image,p));
q=PopCharPixel(pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -1865,18 +1922,18 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
pixel=SinglePrecisionToHalf(QuantumScale*
- GetPixelBlue(p));
+ GetPixelBlue(image,p));
q=PopShortPixel(endian,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToShort(GetPixelBlue(p));
+ pixel=ScaleQuantumToShort(GetPixelBlue(image,p));
q=PopShortPixel(endian,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -1890,17 +1947,18 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopFloatPixel(&quantum_state,(float) GetPixelBlue(p),q);
- p++;
+ q=PopFloatPixel(&quantum_state,(float)
+ GetPixelBlue(image,p),q);
+ p+=channels;
q+=quantum_info->pad;
}
break;
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToLong(GetPixelBlue(p));
+ pixel=ScaleQuantumToLong(GetPixelBlue(image,p));
q=PopLongPixel(endian,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -1911,8 +1969,9 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopDoublePixel(&quantum_state,(double) GetPixelBlue(p),q);
- p++;
+ q=PopDoublePixel(&quantum_state,(double)
+ GetPixelBlue(image,p),q);
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -1924,8 +1983,8 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny(GetPixelBlue(p),range),q);
- p++;
+ ScaleQuantumToAny(GetPixelBlue(image,p),range),q);
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -1944,10 +2003,9 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToChar((Quantum) (QuantumRange-
- GetPixelOpacity(p)));
+ pixel=ScaleQuantumToChar(GetPixelAlpha(image,p));
q=PopCharPixel(pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -1962,19 +2020,18 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
pixel=SinglePrecisionToHalf(QuantumScale*
- GetPixelAlpha(p));
+ GetPixelAlpha(image,p));
q=PopShortPixel(endian,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToShort((Quantum) (QuantumRange-
- GetPixelOpacity(p)));
+ pixel=ScaleQuantumToShort(GetPixelAlpha(image,p));
q=PopShortPixel(endian,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -1991,19 +2048,18 @@
float
pixel;
- pixel=(float) (GetPixelAlpha(p));
+ pixel=(float) GetPixelAlpha(image,p);
q=PopFloatPixel(&quantum_state,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToLong((Quantum) (QuantumRange-
- GetPixelOpacity(p)));
+ pixel=ScaleQuantumToLong(GetPixelAlpha(image,p));
q=PopLongPixel(endian,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -2017,9 +2073,9 @@
double
pixel;
- pixel=(double) (GetPixelAlpha(p));
+ pixel=(double) (GetPixelAlpha(image,p));
q=PopDoublePixel(&quantum_state,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -2031,8 +2087,8 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny((Quantum) (GetPixelAlpha(p)),range),q);
- p++;
+ ScaleQuantumToAny(GetPixelAlpha(image,p),range),q);
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -2051,9 +2107,9 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToChar(GetPixelOpacity(p));
+ pixel=ScaleQuantumToChar(GetPixelAlpha(image,p));
q=PopCharPixel(pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -2068,18 +2124,18 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
pixel=SinglePrecisionToHalf(QuantumScale*
- GetPixelOpacity(p));
+ GetPixelAlpha(image,p));
q=PopShortPixel(endian,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToShort(GetPixelOpacity(p));
+ pixel=ScaleQuantumToShort(GetPixelAlpha(image,p));
q=PopShortPixel(endian,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -2093,17 +2149,18 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopFloatPixel(&quantum_state,(float) GetPixelOpacity(p),q);
- p++;
+ q=PopFloatPixel(&quantum_state,(float)
+ GetPixelAlpha(image,p),q);
+ p+=channels;
q+=quantum_info->pad;
}
break;
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToLong(GetPixelOpacity(p));
+ pixel=ScaleQuantumToLong(GetPixelAlpha(image,p));
q=PopLongPixel(endian,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -2114,8 +2171,9 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopDoublePixel(&quantum_state,(double) GetPixelOpacity(p),q);
- p++;
+ q=PopDoublePixel(&quantum_state,(double)
+ GetPixelAlpha(image,p),q);
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -2127,8 +2185,8 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny(GetPixelOpacity(p),range),q);
- p++;
+ ScaleQuantumToAny(GetPixelAlpha(image,p),range),q);
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -2153,9 +2211,9 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToChar(GetPixelIndex(indexes+x));
+ pixel=ScaleQuantumToChar(GetPixelBlack(image,p));
q=PopCharPixel(pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -2169,19 +2227,19 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=SinglePrecisionToHalf(QuantumScale*GetPixelIndex(
- indexes+x));
+ pixel=SinglePrecisionToHalf(QuantumScale*
+ GetPixelBlack(image,p));
q=PopShortPixel(endian,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToShort(GetPixelIndex(indexes+x));
+ pixel=ScaleQuantumToShort(GetPixelBlack(image,p));
q=PopShortPixel(endian,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -2195,18 +2253,18 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopFloatPixel(&quantum_state,(float) GetPixelIndex(
- indexes+x),q);
- p++;
+ q=PopFloatPixel(&quantum_state,(float)
+ GetPixelBlack(image,p),q);
+ p+=channels;
q+=quantum_info->pad;
}
break;
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToLong(GetPixelIndex(indexes+x));
+ pixel=ScaleQuantumToLong(GetPixelBlack(image,p));
q=PopLongPixel(endian,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -2217,9 +2275,9 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopDoublePixel(&quantum_state,(double) GetPixelIndex(
- indexes+x),q);
- p++;
+ q=PopDoublePixel(&quantum_state,(double)
+ GetPixelBlack(image,p),q);
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -2231,9 +2289,8 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny((Quantum) GetPixelIndex(indexes+x),
- range),q);
- p++;
+ ScaleQuantumToAny((Quantum) GetPixelBlack(image,p),range),q);
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -2250,10 +2307,10 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopCharPixel(ScaleQuantumToChar(GetPixelRed(p)),q);
- q=PopCharPixel(ScaleQuantumToChar(GetPixelGreen(p)),q);
- q=PopCharPixel(ScaleQuantumToChar(GetPixelBlue(p)),q);
- p++;
+ q=PopCharPixel(ScaleQuantumToChar(GetPixelRed(image,p)),q);
+ q=PopCharPixel(ScaleQuantumToChar(GetPixelGreen(image,p)),q);
+ q=PopCharPixel(ScaleQuantumToChar(GetPixelBlue(image,p)),q);
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -2268,11 +2325,12 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=(unsigned int) (ScaleQuantumToAny(GetPixelRed(p),range) << 22 |
- ScaleQuantumToAny(GetPixelGreen(p),range) << 12 |
- ScaleQuantumToAny(GetPixelBlue(p),range) << 2);
+ pixel=(unsigned int) (
+ ScaleQuantumToAny(GetPixelRed(image,p),range) << 22 |
+ ScaleQuantumToAny(GetPixelGreen(image,p),range) << 12 |
+ ScaleQuantumToAny(GetPixelBlue(image,p),range) << 2);
q=PopLongPixel(endian,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -2281,29 +2339,35 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(image,p),
+ range);
q=PopQuantumLongPixel(&quantum_state,quantum_info->depth,pixel,
q);
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(image,p),
+ range);
q=PopQuantumLongPixel(&quantum_state,quantum_info->depth,pixel,
q);
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(image,p),
+ range);
q=PopQuantumLongPixel(&quantum_state,quantum_info->depth,pixel,
q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(image,p),
+ range);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,pixel,q);
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(image,p),
+ range);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,pixel,q);
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(image,p),
+ range);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -2323,18 +2387,21 @@
default:
case 0:
{
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(
+ GetPixelRed(image,p),range);
break;
}
case 1:
{
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(
+ GetPixelGreen(image,p),range);
break;
}
case 2:
{
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(p),range);
- p++;
+ pixel=(unsigned int) ScaleQuantumToAny(
+ GetPixelBlue(image,p),range);
+ p+=channels;
break;
}
}
@@ -2344,18 +2411,21 @@
default:
case 0:
{
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(
+ GetPixelRed(image,p),range);
break;
}
case 1:
{
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(
+ GetPixelGreen(image,p),range);
break;
}
case 2:
{
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(p),range);
- p++;
+ pixel=(unsigned int) ScaleQuantumToAny(
+ GetPixelBlue(image,p),range);
+ p+=channels;
break;
}
}
@@ -2369,18 +2439,21 @@
default:
case 0:
{
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(
+ GetPixelRed(image,p),range);
break;
}
case 1:
{
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(
+ GetPixelGreen(image,p),range);
break;
}
case 2:
{
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(p),range);
- p++;
+ pixel=(unsigned int) ScaleQuantumToAny(
+ GetPixelBlue(image,p),range);
+ p+=channels;
break;
}
}
@@ -2388,36 +2461,42 @@
q+=quantum_info->pad;
}
if (bit != 0)
- p++;
+ p+=channels;
break;
}
if (quantum_info->quantum == 32UL)
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(image,p),
+ range);
q=PopQuantumLongPixel(&quantum_state,quantum_info->depth,pixel,
q);
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(image,p),
+ range);
q=PopQuantumLongPixel(&quantum_state,quantum_info->depth,pixel,
q);
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(image,p),
+ range);
q=PopQuantumLongPixel(&quantum_state,quantum_info->depth,pixel,
q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(image,p),
+ range);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,pixel,q);
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(image,p),
+ range);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,pixel,q);
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(image,p),
+ range);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -2431,26 +2510,29 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=SinglePrecisionToHalf(QuantumScale*GetPixelRed(p));
+ pixel=SinglePrecisionToHalf(QuantumScale*
+ GetPixelRed(image,p));
q=PopShortPixel(endian,pixel,q);
- pixel=SinglePrecisionToHalf(QuantumScale*GetPixelGreen(p));
+ pixel=SinglePrecisionToHalf(QuantumScale*
+ GetPixelGreen(image,p));
q=PopShortPixel(endian,pixel,q);
- pixel=SinglePrecisionToHalf(QuantumScale*GetPixelBlue(p));
+ pixel=SinglePrecisionToHalf(QuantumScale*
+ GetPixelBlue(image,p));
q=PopShortPixel(endian,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToShort(GetPixelRed(p));
+ pixel=ScaleQuantumToShort(GetPixelRed(image,p));
q=PopShortPixel(endian,pixel,q);
- pixel=ScaleQuantumToShort(GetPixelGreen(p));
+ pixel=ScaleQuantumToShort(GetPixelGreen(image,p));
q=PopShortPixel(endian,pixel,q);
- pixel=ScaleQuantumToShort(GetPixelBlue(p));
+ pixel=ScaleQuantumToShort(GetPixelBlue(image,p));
q=PopShortPixel(endian,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -2464,23 +2546,26 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopFloatPixel(&quantum_state,(float) GetPixelRed(p),q);
- q=PopFloatPixel(&quantum_state,(float) GetPixelGreen(p),q);
- q=PopFloatPixel(&quantum_state,(float) GetPixelBlue(p),q);
- p++;
+ q=PopFloatPixel(&quantum_state,(float)
+ GetPixelRed(image,p),q);
+ q=PopFloatPixel(&quantum_state,(float)
+ GetPixelGreen(image,p),q);
+ q=PopFloatPixel(&quantum_state,(float)
+ GetPixelBlue(image,p),q);
+ p+=channels;
q+=quantum_info->pad;
}
break;
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToLong(GetPixelRed(p));
+ pixel=ScaleQuantumToLong(GetPixelRed(image,p));
q=PopLongPixel(endian,pixel,q);
- pixel=ScaleQuantumToLong(GetPixelGreen(p));
+ pixel=ScaleQuantumToLong(GetPixelGreen(image,p));
q=PopLongPixel(endian,pixel,q);
- pixel=ScaleQuantumToLong(GetPixelBlue(p));
+ pixel=ScaleQuantumToLong(GetPixelBlue(image,p));
q=PopLongPixel(endian,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -2491,10 +2576,13 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopDoublePixel(&quantum_state,(double) GetPixelRed(p),q);
- q=PopDoublePixel(&quantum_state,(double) GetPixelGreen(p),q);
- q=PopDoublePixel(&quantum_state,(double) GetPixelBlue(p),q);
- p++;
+ q=PopDoublePixel(&quantum_state,(double)
+ GetPixelRed(image,p),q);
+ q=PopDoublePixel(&quantum_state,(double)
+ GetPixelGreen(image,p),q);
+ q=PopDoublePixel(&quantum_state,(double)
+ GetPixelBlue(image,p),q);
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -2506,12 +2594,12 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny(GetPixelRed(p),range),q);
+ ScaleQuantumToAny(GetPixelRed(image,p),range),q);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny(GetPixelGreen(p),range),q);
+ ScaleQuantumToAny(GetPixelGreen(image,p),range),q);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny(GetPixelBlue(p),range),q);
- p++;
+ ScaleQuantumToAny(GetPixelBlue(image,p),range),q);
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -2532,15 +2620,15 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToChar(GetPixelRed(p));
+ pixel=ScaleQuantumToChar(GetPixelRed(image,p));
q=PopCharPixel(pixel,q);
- pixel=ScaleQuantumToChar(GetPixelGreen(p));
+ pixel=ScaleQuantumToChar(GetPixelGreen(image,p));
q=PopCharPixel(pixel,q);
- pixel=ScaleQuantumToChar(GetPixelBlue(p));
+ pixel=ScaleQuantumToChar(GetPixelBlue(image,p));
q=PopCharPixel(pixel,q);
- pixel=ScaleQuantumToChar((Quantum) GetPixelAlpha(p));
+ pixel=ScaleQuantumToChar(GetPixelAlpha(image,p));
q=PopCharPixel(pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -2571,10 +2659,10 @@
{
switch (i)
{
- case 0: quantum=GetPixelRed(p); break;
- case 1: quantum=GetPixelGreen(p); break;
- case 2: quantum=GetPixelBlue(p); break;
- case 3: quantum=(Quantum) (QuantumRange-GetPixelOpacity(p)); break;
+ case 0: quantum=GetPixelRed(image,p); break;
+ case 1: quantum=GetPixelGreen(image,p); break;
+ case 2: quantum=GetPixelBlue(image,p); break;
+ case 3: quantum=GetPixelAlpha(image,p); break;
}
switch (n % 3)
{
@@ -2601,7 +2689,7 @@
}
n++;
}
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -2610,36 +2698,42 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(image,p),
+ range);
q=PopQuantumLongPixel(&quantum_state,quantum_info->depth,pixel,
q);
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(image,p),
+ range);
q=PopQuantumLongPixel(&quantum_state,quantum_info->depth,pixel,
q);
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(image,p),
+ range);
q=PopQuantumLongPixel(&quantum_state,quantum_info->depth,pixel,
q);
- pixel=(unsigned int) ScaleQuantumToAny((Quantum) (QuantumRange-
- GetPixelOpacity(p)),range);
+ pixel=(unsigned int) ScaleQuantumToAny(GetPixelAlpha(image,p),
+ range);
q=PopQuantumLongPixel(&quantum_state,quantum_info->depth,pixel,
q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelRed(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(
+ GetPixelRed(image,p),range);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,pixel,q);
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelGreen(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(
+ GetPixelGreen(image,p),range);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,pixel,q);
- pixel=(unsigned int) ScaleQuantumToAny(GetPixelBlue(p),range);
+ pixel=(unsigned int) ScaleQuantumToAny(
+ GetPixelBlue(image,p),range);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,pixel,q);
- pixel=(unsigned int) ScaleQuantumToAny((Quantum) (QuantumRange-
- GetPixelOpacity(p)),range);
+ pixel=(unsigned int) ScaleQuantumToAny(
+ GetPixelAlpha(image,p),range);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -2653,30 +2747,34 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=SinglePrecisionToHalf(QuantumScale*GetPixelRed(p));
+ pixel=SinglePrecisionToHalf(QuantumScale*
+ GetPixelRed(image,p));
q=PopShortPixel(endian,pixel,q);
- pixel=SinglePrecisionToHalf(QuantumScale*GetPixelGreen(p));
+ pixel=SinglePrecisionToHalf(QuantumScale*
+ GetPixelGreen(image,p));
q=PopShortPixel(endian,pixel,q);
- pixel=SinglePrecisionToHalf(QuantumScale*GetPixelBlue(p));
+ pixel=SinglePrecisionToHalf(QuantumScale*
+ GetPixelBlue(image,p));
q=PopShortPixel(endian,pixel,q);
- pixel=SinglePrecisionToHalf(QuantumScale*GetPixelAlpha(p));
+ pixel=SinglePrecisionToHalf(QuantumScale*
+ GetPixelAlpha(image,p));
q=PopShortPixel(endian,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToShort(GetPixelRed(p));
+ pixel=ScaleQuantumToShort(GetPixelRed(image,p));
q=PopShortPixel(endian,pixel,q);
- pixel=ScaleQuantumToShort(GetPixelGreen(p));
+ pixel=ScaleQuantumToShort(GetPixelGreen(image,p));
q=PopShortPixel(endian,pixel,q);
- pixel=ScaleQuantumToShort(GetPixelBlue(p));
+ pixel=ScaleQuantumToShort(GetPixelBlue(image,p));
q=PopShortPixel(endian,pixel,q);
- pixel=ScaleQuantumToShort((Quantum) GetPixelAlpha(p));
+ pixel=ScaleQuantumToShort(GetPixelAlpha(image,p));
q=PopShortPixel(endian,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -2693,27 +2791,30 @@
float
pixel;
- q=PopFloatPixel(&quantum_state,(float) GetPixelRed(p),q);
- q=PopFloatPixel(&quantum_state,(float) GetPixelGreen(p),q);
- q=PopFloatPixel(&quantum_state,(float) GetPixelBlue(p),q);
- pixel=(float) GetPixelAlpha(p);
+ q=PopFloatPixel(&quantum_state,(float)
+ GetPixelRed(image,p),q);
+ q=PopFloatPixel(&quantum_state,(float)
+ GetPixelGreen(image,p),q);
+ q=PopFloatPixel(&quantum_state,(float)
+ GetPixelBlue(image,p),q);
+ pixel=(float) GetPixelAlpha(image,p);
q=PopFloatPixel(&quantum_state,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToLong(GetPixelRed(p));
+ pixel=ScaleQuantumToLong(GetPixelRed(image,p));
q=PopLongPixel(endian,pixel,q);
- pixel=ScaleQuantumToLong(GetPixelGreen(p));
+ pixel=ScaleQuantumToLong(GetPixelGreen(image,p));
q=PopLongPixel(endian,pixel,q);
- pixel=ScaleQuantumToLong(GetPixelBlue(p));
+ pixel=ScaleQuantumToLong(GetPixelBlue(image,p));
q=PopLongPixel(endian,pixel,q);
- pixel=ScaleQuantumToLong((Quantum) GetPixelAlpha(p));
+ pixel=ScaleQuantumToLong(GetPixelAlpha(image,p));
q=PopLongPixel(endian,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -2727,12 +2828,15 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopDoublePixel(&quantum_state,(double) GetPixelRed(p),q);
- q=PopDoublePixel(&quantum_state,(double) GetPixelGreen(p),q);
- q=PopDoublePixel(&quantum_state,(double) GetPixelBlue(p),q);
- pixel=(double) GetPixelAlpha(p);
+ q=PopDoublePixel(&quantum_state,(double)
+ GetPixelRed(image,p),q);
+ q=PopDoublePixel(&quantum_state,(double)
+ GetPixelGreen(image,p),q);
+ q=PopDoublePixel(&quantum_state,(double)
+ GetPixelBlue(image,p),q);
+ pixel=(double) GetPixelAlpha(image,p);
q=PopDoublePixel(&quantum_state,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -2744,14 +2848,14 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny(GetPixelRed(p),range),q);
+ ScaleQuantumToAny(GetPixelRed(image,p),range),q);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny(GetPixelGreen(p),range),q);
+ ScaleQuantumToAny(GetPixelGreen(image,p),range),q);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny(GetPixelBlue(p),range),q);
+ ScaleQuantumToAny(GetPixelBlue(image,p),range),q);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny((Quantum) GetPixelAlpha(p),range),q);
- p++;
+ ScaleQuantumToAny(GetPixelAlpha(image,p),range),q);
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -2776,15 +2880,15 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToChar(GetPixelRed(p));
+ pixel=ScaleQuantumToChar(GetPixelRed(image,p));
q=PopCharPixel(pixel,q);
- pixel=ScaleQuantumToChar(GetPixelGreen(p));
+ pixel=ScaleQuantumToChar(GetPixelGreen(image,p));
q=PopCharPixel(pixel,q);
- pixel=ScaleQuantumToChar(GetPixelBlue(p));
+ pixel=ScaleQuantumToChar(GetPixelBlue(image,p));
q=PopCharPixel(pixel,q);
- pixel=ScaleQuantumToChar(GetPixelIndex(indexes+x));
+ pixel=ScaleQuantumToChar(GetPixelBlack(image,p));
q=PopCharPixel(pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -2798,31 +2902,34 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=SinglePrecisionToHalf(QuantumScale*GetPixelRed(p));
+ pixel=SinglePrecisionToHalf(QuantumScale*
+ GetPixelRed(image,p));
q=PopShortPixel(endian,pixel,q);
- pixel=SinglePrecisionToHalf(QuantumScale*GetPixelGreen(p));
+ pixel=SinglePrecisionToHalf(QuantumScale*
+ GetPixelGreen(image,p));
q=PopShortPixel(endian,pixel,q);
- pixel=SinglePrecisionToHalf(QuantumScale*GetPixelBlue(p));
+ pixel=SinglePrecisionToHalf(QuantumScale*
+ GetPixelBlue(image,p));
q=PopShortPixel(endian,pixel,q);
- pixel=SinglePrecisionToHalf(QuantumScale*GetPixelIndex(
- indexes+x));
+ pixel=SinglePrecisionToHalf(QuantumScale*
+ GetPixelBlack(image,p));
q=PopShortPixel(endian,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToShort(GetPixelRed(p));
+ pixel=ScaleQuantumToShort(GetPixelRed(image,p));
q=PopShortPixel(endian,pixel,q);
- pixel=ScaleQuantumToShort(GetPixelGreen(p));
+ pixel=ScaleQuantumToShort(GetPixelGreen(image,p));
q=PopShortPixel(endian,pixel,q);
- pixel=ScaleQuantumToShort(GetPixelBlue(p));
+ pixel=ScaleQuantumToShort(GetPixelBlue(image,p));
q=PopShortPixel(endian,pixel,q);
- pixel=ScaleQuantumToShort(GetPixelIndex(indexes+x));
+ pixel=ScaleQuantumToShort(GetPixelBlack(image,p));
q=PopShortPixel(endian,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -2836,27 +2943,30 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopFloatPixel(&quantum_state,(float) GetPixelRed(p),q);
- q=PopFloatPixel(&quantum_state,(float) GetPixelGreen(p),q);
- q=PopFloatPixel(&quantum_state,(float) GetPixelBlue(p),q);
q=PopFloatPixel(&quantum_state,(float)
- GetPixelIndex(indexes+x),q);
- p++;
+ GetPixelRed(image,p),q);
+ q=PopFloatPixel(&quantum_state,(float)
+ GetPixelGreen(image,p),q);
+ q=PopFloatPixel(&quantum_state,(float)
+ GetPixelBlue(image,p),q);
+ q=PopFloatPixel(&quantum_state,(float)
+ GetPixelBlack(image,p),q);
+ p+=channels;
q+=quantum_info->pad;
}
break;
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToLong(GetPixelRed(p));
+ pixel=ScaleQuantumToLong(GetPixelRed(image,p));
q=PopLongPixel(endian,pixel,q);
- pixel=ScaleQuantumToLong(GetPixelGreen(p));
+ pixel=ScaleQuantumToLong(GetPixelGreen(image,p));
q=PopLongPixel(endian,pixel,q);
- pixel=ScaleQuantumToLong(GetPixelBlue(p));
+ pixel=ScaleQuantumToLong(GetPixelBlue(image,p));
q=PopLongPixel(endian,pixel,q);
- pixel=ScaleQuantumToLong(GetPixelIndex(indexes+x));
+ pixel=ScaleQuantumToLong(GetPixelBlack(image,p));
q=PopLongPixel(endian,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -2867,12 +2977,15 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopDoublePixel(&quantum_state,(double) GetPixelRed(p),q);
- q=PopDoublePixel(&quantum_state,(double) GetPixelGreen(p),q);
- q=PopDoublePixel(&quantum_state,(double) GetPixelBlue(p),q);
q=PopDoublePixel(&quantum_state,(double)
- GetPixelIndex(indexes+x),q);
- p++;
+ GetPixelRed(image,p),q);
+ q=PopDoublePixel(&quantum_state,(double)
+ GetPixelGreen(image,p),q);
+ q=PopDoublePixel(&quantum_state,(double)
+ GetPixelBlue(image,p),q);
+ q=PopDoublePixel(&quantum_state,(double)
+ GetPixelBlack(image,p),q);
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -2884,14 +2997,14 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny(GetPixelRed(p),range),q);
+ ScaleQuantumToAny(GetPixelRed(image,p),range),q);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny(GetPixelGreen(p),range),q);
+ ScaleQuantumToAny(GetPixelGreen(image,p),range),q);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny(GetPixelBlue(p),range),q);
+ ScaleQuantumToAny(GetPixelBlue(image,p),range),q);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny(GetPixelIndex(indexes+x),range),q);
- p++;
+ ScaleQuantumToAny(GetPixelBlack(image,p),range),q);
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -2917,18 +3030,17 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToChar(GetPixelRed(p));
+ pixel=ScaleQuantumToChar(GetPixelRed(image,p));
q=PopCharPixel(pixel,q);
- pixel=ScaleQuantumToChar(GetPixelGreen(p));
+ pixel=ScaleQuantumToChar(GetPixelGreen(image,p));
q=PopCharPixel(pixel,q);
- pixel=ScaleQuantumToChar(GetPixelBlue(p));
+ pixel=ScaleQuantumToChar(GetPixelBlue(image,p));
q=PopCharPixel(pixel,q);
- pixel=ScaleQuantumToChar(GetPixelIndex(indexes+x));
+ pixel=ScaleQuantumToChar(GetPixelBlack(image,p));
q=PopCharPixel(pixel,q);
- pixel=ScaleQuantumToChar((Quantum) (QuantumRange-
- GetPixelOpacity(p)));
+ pixel=ScaleQuantumToChar(GetPixelAlpha(image,p));
q=PopCharPixel(pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -2942,36 +3054,39 @@
{
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=SinglePrecisionToHalf(QuantumScale*GetPixelRed(p));
- q=PopShortPixel(endian,pixel,q);
- pixel=SinglePrecisionToHalf(QuantumScale*GetPixelGreen(p));
- q=PopShortPixel(endian,pixel,q);
- pixel=SinglePrecisionToHalf(QuantumScale*GetPixelBlue(p));
+ pixel=SinglePrecisionToHalf(QuantumScale*
+ GetPixelRed(image,p));
q=PopShortPixel(endian,pixel,q);
pixel=SinglePrecisionToHalf(QuantumScale*
- GetPixelIndex(indexes+x));
+ GetPixelGreen(image,p));
q=PopShortPixel(endian,pixel,q);
- pixel=SinglePrecisionToHalf(QuantumScale*GetPixelAlpha(p));
+ pixel=SinglePrecisionToHalf(QuantumScale*
+ GetPixelBlue(image,p));
q=PopShortPixel(endian,pixel,q);
- p++;
+ pixel=SinglePrecisionToHalf(QuantumScale*
+ GetPixelBlack(image,p));
+ q=PopShortPixel(endian,pixel,q);
+ pixel=SinglePrecisionToHalf(QuantumScale*
+ GetPixelAlpha(image,p));
+ q=PopShortPixel(endian,pixel,q);
+ p+=channels;
q+=quantum_info->pad;
}
break;
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToShort(GetPixelRed(p));
+ pixel=ScaleQuantumToShort(GetPixelRed(image,p));
q=PopShortPixel(endian,pixel,q);
- pixel=ScaleQuantumToShort(GetPixelGreen(p));
+ pixel=ScaleQuantumToShort(GetPixelGreen(image,p));
q=PopShortPixel(endian,pixel,q);
- pixel=ScaleQuantumToShort(GetPixelBlue(p));
+ pixel=ScaleQuantumToShort(GetPixelBlue(image,p));
q=PopShortPixel(endian,pixel,q);
- pixel=ScaleQuantumToShort(GetPixelIndex(indexes+x));
+ pixel=ScaleQuantumToShort(GetPixelBlack(image,p));
q=PopShortPixel(endian,pixel,q);
- pixel=ScaleQuantumToShort((Quantum) (QuantumRange-
- GetPixelOpacity(p)));
+ pixel=ScaleQuantumToShort(GetPixelAlpha(image,p));
q=PopShortPixel(endian,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -2988,32 +3103,34 @@
float
pixel;
- q=PopFloatPixel(&quantum_state,(float) GetPixelRed(p),q);
- q=PopFloatPixel(&quantum_state,(float) GetPixelGreen(p),q);
- q=PopFloatPixel(&quantum_state,(float) GetPixelBlue(p),q);
q=PopFloatPixel(&quantum_state,(float)
- GetPixelIndex(indexes+x),q);
- pixel=(float) (GetPixelAlpha(p));
+ GetPixelRed(image,p),q);
+ q=PopFloatPixel(&quantum_state,(float)
+ GetPixelGreen(image,p),q);
+ q=PopFloatPixel(&quantum_state,(float)
+ GetPixelBlue(image,p),q);
+ q=PopFloatPixel(&quantum_state,(float)
+ GetPixelBlack(image,p),q);
+ pixel=(float) (GetPixelAlpha(image,p));
q=PopFloatPixel(&quantum_state,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
- pixel=ScaleQuantumToLong(GetPixelRed(p));
+ pixel=ScaleQuantumToLong(GetPixelRed(image,p));
q=PopLongPixel(endian,pixel,q);
- pixel=ScaleQuantumToLong(GetPixelGreen(p));
+ pixel=ScaleQuantumToLong(GetPixelGreen(image,p));
q=PopLongPixel(endian,pixel,q);
- pixel=ScaleQuantumToLong(GetPixelBlue(p));
+ pixel=ScaleQuantumToLong(GetPixelBlue(image,p));
q=PopLongPixel(endian,pixel,q);
- pixel=ScaleQuantumToLong(GetPixelIndex(indexes+x));
+ pixel=ScaleQuantumToLong(GetPixelBlack(image,p));
q=PopLongPixel(endian,pixel,q);
- pixel=ScaleQuantumToLong((Quantum) (QuantumRange-
- GetPixelOpacity(p)));
+ pixel=ScaleQuantumToLong(GetPixelAlpha(image,p));
q=PopLongPixel(endian,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -3027,14 +3144,17 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
- q=PopDoublePixel(&quantum_state,(double) GetPixelRed(p),q);
- q=PopDoublePixel(&quantum_state,(double) GetPixelGreen(p),q);
- q=PopDoublePixel(&quantum_state,(double) GetPixelBlue(p),q);
q=PopDoublePixel(&quantum_state,(double)
- GetPixelIndex(indexes+x),q);
- pixel=(double) (GetPixelAlpha(p));
+ GetPixelRed(image,p),q);
+ q=PopDoublePixel(&quantum_state,(double)
+ GetPixelGreen(image,p),q);
+ q=PopDoublePixel(&quantum_state,(double)
+ GetPixelBlue(image,p),q);
+ q=PopDoublePixel(&quantum_state,(double)
+ GetPixelBlack(image,p),q);
+ pixel=(double) (GetPixelAlpha(image,p));
q=PopDoublePixel(&quantum_state,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -3046,16 +3166,16 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny(GetPixelRed(p),range),q);
+ ScaleQuantumToAny(GetPixelRed(image,p),range),q);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny(GetPixelGreen(p),range),q);
+ ScaleQuantumToAny(GetPixelGreen(image,p),range),q);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny(GetPixelBlue(p),range),q);
+ ScaleQuantumToAny(GetPixelBlue(image,p),range),q);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny(GetPixelIndex(indexes+x),range),q);
+ ScaleQuantumToAny(GetPixelBlack(image,p),range),q);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
- ScaleQuantumToAny(GetPixelOpacity(p),range),q);
- p++;
+ ScaleQuantumToAny(GetPixelAlpha(image,p),range),q);
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -3097,33 +3217,31 @@
{
case 0:
{
- quantum=GetPixelRed(p);
+ quantum=GetPixelRed(image,p);
break;
}
case 1:
{
- quantum=GetPixelGreen(p);
+ quantum=GetPixelGreen(image,p);
break;
}
case 2:
{
- quantum=GetPixelBlue(p);
+ quantum=GetPixelBlue(image,p);
break;
}
}
cbcr[i]=(Quantum) quantum;
n++;
}
- pixel=(unsigned int) ((size_t) (cbcr[1]) << 22 |
- (size_t) (cbcr[0]) << 12 |
- (size_t) (cbcr[2]) << 2);
+ pixel=(unsigned int) ((size_t) (cbcr[1]) << 22 | (size_t)
+ (cbcr[0]) << 12 | (size_t) (cbcr[2]) << 2);
q=PopLongPixel(endian,pixel,q);
- p++;
- pixel=(unsigned int) ((size_t) (cbcr[3]) << 22 |
- (size_t) (cbcr[0]) << 12 |
- (size_t) (cbcr[2]) << 2);
+ p+=channels;
+ pixel=(unsigned int) ((size_t) (cbcr[3]) << 22 | (size_t)
+ (cbcr[0]) << 12 | (size_t) (cbcr[2]) << 2);
q=PopLongPixel(endian,pixel,q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -3140,17 +3258,17 @@
{
case 0:
{
- quantum=GetPixelRed(p);
+ quantum=GetPixelRed(image,p);
break;
}
case 1:
{
- quantum=GetPixelGreen(p);
+ quantum=GetPixelGreen(image,p);
break;
}
case 2:
{
- quantum=GetPixelBlue(p);
+ quantum=GetPixelBlue(image,p);
break;
}
}
@@ -3163,14 +3281,14 @@
ScaleQuantumToAny(cbcr[0],range),q);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
ScaleQuantumToAny(cbcr[2],range),q);
- p++;
+ p+=channels;
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
ScaleQuantumToAny(cbcr[3],range),q);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
ScaleQuantumToAny(cbcr[0],range),q);
q=PopQuantumPixel(&quantum_state,quantum_info->depth,
ScaleQuantumToAny(cbcr[2],range),q);
- p++;
+ p+=channels;
q+=quantum_info->pad;
}
break;
@@ -3186,33 +3304,33 @@
Quantum
quantum;
- register PixelPacket
+ register Quantum
*restrict q;
q=GetAuthenticPixelQueue(image);
if (image_view != (CacheView *) NULL)
- q=(PixelPacket *) GetCacheViewVirtualPixelQueue(image_view);
+ q=GetCacheViewAuthenticPixelQueue(image_view);
for (x=0; x < (ssize_t) number_pixels; x++)
{
- quantum=GetPixelRed(q);
- SetPixelRed(q,GetPixelGreen(q));
- SetPixelGreen(q,quantum);
- q++;
+ quantum=GetPixelRed(image,q);
+ SetPixelRed(image,GetPixelGreen(image,q),q);
+ SetPixelGreen(image,quantum,q);
+ q+=channels;
}
}
if ((quantum_type == RGBOQuantum) || (quantum_type == CMYKOQuantum) ||
(quantum_type == BGROQuantum))
{
- register PixelPacket
+ register Quantum
*restrict q;
q=GetAuthenticPixelQueue(image);
if (image_view != (CacheView *) NULL)
- q=(PixelPacket *) GetCacheViewVirtualPixelQueue(image_view);
+ q=GetCacheViewAuthenticPixelQueue(image_view);
for (x=0; x < (ssize_t) number_pixels; x++)
{
- SetPixelOpacity(q,(Quantum) GetPixelAlpha(q));
- q++;
+ SetPixelAlpha(image,GetPixelAlpha(image,q),q);
+ q+=channels;
}
}
return(extent);
diff --git a/magick/quantum-import.c b/MagickCore/quantum-import.c
similarity index 63%
rename from magick/quantum-import.c
rename to MagickCore/quantum-import.c
index cd80cb3..0da2d48 100644
--- a/magick/quantum-import.c
+++ b/MagickCore/quantum-import.c
@@ -44,32 +44,32 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/property.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/color-private.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/cache.h"
-#include "magick/constitute.h"
-#include "magick/delegate.h"
-#include "magick/geometry.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/option.h"
-#include "magick/pixel.h"
-#include "magick/pixel-private.h"
-#include "magick/quantum.h"
-#include "magick/quantum-private.h"
-#include "magick/resource_.h"
-#include "magick/semaphore.h"
-#include "magick/statistic.h"
-#include "magick/stream.h"
-#include "magick/string_.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/property.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/delegate.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/option.h"
+#include "MagickCore/pixel.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantum.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/semaphore.h"
+#include "MagickCore/statistic.h"
+#include "MagickCore/stream.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/utility.h"
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -110,13 +110,13 @@
%
*/
-static inline IndexPacket PushColormapIndex(Image *image,
+static inline Quantum PushColormapIndex(Image *image,
const size_t index,MagickBooleanType *range_exception)
{
if (index < image->colors)
- return((IndexPacket) index);
+ return((Quantum) index);
*range_exception=MagickTrue;
- return((IndexPacket) 0);
+ return((Quantum) 0);
}
static inline const unsigned char *PushDoublePixel(
@@ -270,16 +270,14 @@
register const unsigned char
*restrict p;
- register IndexPacket
- *restrict indexes;
-
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
size_t
+ channels,
extent;
ssize_t
@@ -302,13 +300,13 @@
{
number_pixels=GetImageExtent(image);
q=GetAuthenticPixelQueue(image);
- indexes=GetAuthenticIndexQueue(image);
+ channels=GetPixelChannels(image);
}
else
{
number_pixels=GetCacheViewExtent(image_view);
q=GetCacheViewAuthenticPixelQueue(image_view);
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
+ channels=GetPixelChannels(image);
}
InitializeQuantumState(quantum_info,image->endian,&quantum_state);
extent=GetQuantumExtent(image,quantum_info,quantum_type);
@@ -344,11 +342,11 @@
else
pixel=(unsigned char) (((*p) & (1 << (7-bit))) != 0 ?
0x00 : 0x01);
- SetPixelIndex(indexes+x+bit,PushColormapIndex(image,
- pixel,&range_exception));
- SetPixelRGBO(q,image->colormap+(ssize_t)
- GetPixelIndex(indexes+x+bit));
- q++;
+ SetPixelIndex(image,PushColormapIndex(image,pixel,
+ &range_exception),q);
+ SetPixelPacket(image,image->colormap+(ssize_t)
+ GetPixelIndex(image,q),q);
+ q+=channels;
}
p++;
}
@@ -360,11 +358,11 @@
else
pixel=(unsigned char) (((*p) & (1 << (7-bit))) != 0 ?
0x00 : 0x01);
- SetPixelIndex(indexes+x+bit,PushColormapIndex(image,pixel,
- &range_exception));
- SetPixelRGBO(q,image->colormap+(ssize_t)
- GetPixelIndex(indexes+x+bit));
- q++;
+ SetPixelIndex(image,PushColormapIndex(image,pixel,
+ &range_exception),q);
+ SetPixelPacket(image,image->colormap+(ssize_t)
+ GetPixelIndex(image,q),q);
+ q+=channels;
}
break;
}
@@ -376,27 +374,27 @@
for (x=0; x < ((ssize_t) number_pixels-1); x+=2)
{
pixel=(unsigned char) ((*p >> 4) & 0xf);
- SetPixelIndex(indexes+x,PushColormapIndex(image,pixel,
- &range_exception));
- SetPixelRGBO(q,image->colormap+(ssize_t)
- GetPixelIndex(indexes+x));
- q++;
+ SetPixelIndex(image,PushColormapIndex(image,pixel,
+ &range_exception),q);
+ SetPixelPacket(image,image->colormap+(ssize_t)
+ GetPixelIndex(image,q),q);
+ q+=channels;
pixel=(unsigned char) ((*p) & 0xf);
- SetPixelIndex(indexes+x+1,PushColormapIndex(image,pixel,
- &range_exception));
- SetPixelRGBO(q,image->colormap+(ssize_t)
- GetPixelIndex(indexes+x+1));
+ SetPixelIndex(image,PushColormapIndex(image,pixel,
+ &range_exception),q);
+ SetPixelPacket(image,image->colormap+(ssize_t)
+ GetPixelIndex(image,q),q);
p++;
- q++;
+ q+=channels;
}
for (bit=0; bit < (ssize_t) (number_pixels % 2); bit++)
{
pixel=(unsigned char) ((*p++ >> 4) & 0xf);
- SetPixelIndex(indexes+x+bit,PushColormapIndex(image,pixel,
- &range_exception));
- SetPixelRGBO(q,image->colormap+(ssize_t)
- GetPixelIndex(indexes+x+bit));
- q++;
+ SetPixelIndex(image,PushColormapIndex(image,pixel,
+ &range_exception),q);
+ SetPixelPacket(image,image->colormap+(ssize_t)
+ GetPixelIndex(image,q),q);
+ q+=channels;
}
break;
}
@@ -408,12 +406,12 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushCharPixel(p,&pixel);
- SetPixelIndex(indexes+x,PushColormapIndex(image,pixel,
- &range_exception));
- SetPixelRGBO(q,image->colormap+(ssize_t)
- GetPixelIndex(indexes+x));
+ SetPixelIndex(image,PushColormapIndex(image,pixel,
+ &range_exception),q);
+ SetPixelPacket(image,image->colormap+(ssize_t)
+ GetPixelIndex(image,q),q);
p+=quantum_info->pad;
- q++;
+ q+=channels;
}
break;
}
@@ -427,25 +425,25 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushShortPixel(endian,p,&pixel);
- SetPixelIndex(indexes+x,PushColormapIndex(image,
- ClampToQuantum((MagickRealType) QuantumRange*
- HalfToSinglePrecision(pixel)),&range_exception));
- SetPixelRGBO(q,image->colormap+(ssize_t)
- GetPixelIndex(indexes+x));
+ SetPixelIndex(image,PushColormapIndex(image,ClampToQuantum(
+ (MagickRealType) QuantumRange*HalfToSinglePrecision(pixel)),
+ &range_exception),q);
+ SetPixelPacket(image,image->colormap+(ssize_t)
+ GetPixelIndex(image,q),q);
p+=quantum_info->pad;
- q++;
+ q+=channels;
}
break;
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushShortPixel(endian,p,&pixel);
- SetPixelIndex(indexes+x,PushColormapIndex(image,pixel,
- &range_exception));
- SetPixelRGBO(q,image->colormap+(ssize_t)
- GetPixelIndex(indexes+x));
+ SetPixelIndex(image,PushColormapIndex(image,pixel,
+ &range_exception),q);
+ SetPixelPacket(image,image->colormap+(ssize_t)
+ GetPixelIndex(image,q),q);
p+=quantum_info->pad;
- q++;
+ q+=channels;
}
break;
}
@@ -462,24 +460,24 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushFloatPixel(&quantum_state,p,&pixel);
- SetPixelIndex(indexes+x,PushColormapIndex(image,
- ClampToQuantum(pixel),&range_exception));
- SetPixelRGBO(q,image->colormap+(ssize_t)
- GetPixelIndex(indexes+x));
+ SetPixelIndex(image,PushColormapIndex(image,
+ ClampToQuantum(pixel),&range_exception),q);
+ SetPixelPacket(image,image->colormap+(ssize_t)
+ GetPixelIndex(image,q),q);
p+=quantum_info->pad;
- q++;
+ q+=channels;
}
break;
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushLongPixel(endian,p,&pixel);
- SetPixelIndex(indexes+x,PushColormapIndex(image,pixel,
- &range_exception));
- SetPixelRGBO(q,image->colormap+(ssize_t)
- GetPixelIndex(indexes+x));
+ SetPixelIndex(image,PushColormapIndex(image,pixel,
+ &range_exception),q);
+ SetPixelPacket(image,image->colormap+(ssize_t)
+ GetPixelIndex(image,q),q);
p+=quantum_info->pad;
- q++;
+ q+=channels;
}
break;
}
@@ -493,12 +491,12 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushDoublePixel(&quantum_state,p,&pixel);
- SetPixelIndex(indexes+x,PushColormapIndex(image,
- ClampToQuantum(pixel),&range_exception));
- SetPixelRGBO(q,image->colormap+(ssize_t)
- GetPixelIndex(indexes+x));
+ SetPixelIndex(image,PushColormapIndex(image,
+ ClampToQuantum(pixel),&range_exception),q);
+ SetPixelPacket(image,image->colormap+(ssize_t)
+ GetPixelIndex(image,q),q);
p+=quantum_info->pad;
- q++;
+ q+=channels;
}
break;
}
@@ -508,12 +506,12 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelIndex(indexes+x,PushColormapIndex(image,pixel,
- &range_exception));
- SetPixelRGBO(q,image->colormap+(ssize_t)
- GetPixelIndex(indexes+x));
+ SetPixelIndex(image,PushColormapIndex(image,pixel,
+ &range_exception),q);
+ SetPixelPacket(image,image->colormap+(ssize_t)
+ GetPixelIndex(image,q),q);
p+=quantum_info->pad;
- q++;
+ q+=channels;
}
break;
}
@@ -552,13 +550,13 @@
else
pixel=(unsigned char) (((*p) & (1 << (7-bit))) != 0 ?
0x00 : 0x01);
- SetPixelIndex(indexes+x+bit/2,pixel == 0 ? 0 : 1);
- SetPixelRed(q,pixel == 0 ? 0 : QuantumRange);
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- SetPixelOpacity(q,((*p) & (1UL << (unsigned char)
- (6-bit))) == 0 ? TransparentOpacity : OpaqueOpacity);
- q++;
+ SetPixelRed(image,(Quantum) (pixel == 0 ? 0 : QuantumRange),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ SetPixelAlpha(image,((*p) & (1UL << (unsigned char)
+ (6-bit))) == 0 ? TransparentAlpha : OpaqueAlpha,q);
+ SetPixelIndex(image,(Quantum) (pixel == 0 ? 0 : 1),q);
+ q+=channels;
}
}
for (bit=0; bit < (ssize_t) (number_pixels % 4); bit+=2)
@@ -569,13 +567,13 @@
else
pixel=(unsigned char) (((*p) & (1 << (7-bit))) != 0 ?
0x00 : 0x01);
- SetPixelIndex(indexes+x+bit/2,pixel == 0 ? 0 : 1);
- SetPixelRed(q,pixel == 0 ? 0 : QuantumRange);
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- SetPixelOpacity(q,((*p) & (1UL << (unsigned char)
- (6-bit))) == 0 ? TransparentOpacity : OpaqueOpacity);
- q++;
+ SetPixelIndex(image,(Quantum) (pixel == 0 ? 0 : 1),q);
+ SetPixelRed(image,(Quantum) (pixel == 0 ? 0 : QuantumRange),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ SetPixelAlpha(image,((*p) & (1UL << (unsigned char)
+ (6-bit))) == 0 ? TransparentAlpha : OpaqueAlpha,q);
+ q+=channels;
}
break;
}
@@ -588,14 +586,14 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
pixel=(unsigned char) ((*p >> 4) & 0xf);
- SetPixelIndex(indexes+x,PushColormapIndex(image,pixel,
- &range_exception));
- SetPixelRGBO(q,image->colormap+(ssize_t)
- GetPixelIndex(indexes+x));
+ SetPixelIndex(image,PushColormapIndex(image,pixel,
+ &range_exception),q);
+ SetPixelPacket(image,image->colormap+(ssize_t)
+ GetPixelIndex(image,q),q);
pixel=(unsigned char) ((*p) & 0xf);
- SetPixelAlpha(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelAlpha(image,ScaleAnyToQuantum(pixel,range),q);
p++;
- q++;
+ q+=channels;
}
break;
}
@@ -607,14 +605,14 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushCharPixel(p,&pixel);
- SetPixelIndex(indexes+x,PushColormapIndex(image,pixel,
- &range_exception));
- SetPixelRGBO(q,image->colormap+(ssize_t)
- GetPixelIndex(indexes+x));
+ SetPixelIndex(image,PushColormapIndex(image,pixel,
+ &range_exception),q);
+ SetPixelPacket(image,image->colormap+(ssize_t)
+ GetPixelIndex(image,q),q);
p=PushCharPixel(p,&pixel);
- SetPixelAlpha(q,ScaleCharToQuantum(pixel));
+ SetPixelAlpha(image,ScaleCharToQuantum(pixel),q);
p+=quantum_info->pad;
- q++;
+ q+=channels;
}
break;
}
@@ -628,30 +626,30 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushShortPixel(endian,p,&pixel);
- SetPixelIndex(indexes+x,PushColormapIndex(image,
- ClampToQuantum((MagickRealType) QuantumRange*
- HalfToSinglePrecision(pixel)),&range_exception));
- SetPixelRGBO(q,image->colormap+(ssize_t)
- GetPixelIndex(indexes+x));
+ SetPixelIndex(image,PushColormapIndex(image,ClampToQuantum(
+ (MagickRealType) QuantumRange*HalfToSinglePrecision(pixel)),
+ &range_exception),q);
+ SetPixelPacket(image,image->colormap+(ssize_t)
+ GetPixelIndex(image,q),q);
p=PushShortPixel(endian,p,&pixel);
- SetPixelAlpha(q,ClampToQuantum((MagickRealType)
- QuantumRange*HalfToSinglePrecision(pixel)));
+ SetPixelAlpha(image,ClampToQuantum((MagickRealType)
+ QuantumRange*HalfToSinglePrecision(pixel)),q);
p+=quantum_info->pad;
- q++;
+ q+=channels;
}
break;
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushShortPixel(endian,p,&pixel);
- SetPixelIndex(indexes+x,PushColormapIndex(image,pixel,
- &range_exception));
- SetPixelRGBO(q,image->colormap+(ssize_t)
- GetPixelIndex(indexes+x));
+ SetPixelIndex(image,PushColormapIndex(image,pixel,
+ &range_exception),q);
+ SetPixelPacket(image,image->colormap+(ssize_t)
+ GetPixelIndex(image,q),q);
p=PushShortPixel(endian,p,&pixel);
- SetPixelAlpha(q,ScaleShortToQuantum(pixel));
+ SetPixelAlpha(image,ScaleShortToQuantum(pixel),q);
p+=quantum_info->pad;
- q++;
+ q+=channels;
}
break;
}
@@ -668,28 +666,28 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushFloatPixel(&quantum_state,p,&pixel);
- SetPixelIndex(indexes+x,PushColormapIndex(image,
- ClampToQuantum(pixel),&range_exception));
- SetPixelRGBO(q,image->colormap+(ssize_t)
- GetPixelIndex(indexes+x));
+ SetPixelIndex(image,PushColormapIndex(image,
+ ClampToQuantum(pixel),&range_exception),q);
+ SetPixelPacket(image,image->colormap+(ssize_t)
+ GetPixelIndex(image,q),q);
p=PushFloatPixel(&quantum_state,p,&pixel);
- SetPixelAlpha(q,ClampToQuantum(pixel));
+ SetPixelAlpha(image,ClampToQuantum(pixel),q);
p+=quantum_info->pad;
- q++;
+ q+=channels;
}
break;
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushLongPixel(endian,p,&pixel);
- SetPixelIndex(indexes+x,PushColormapIndex(image,pixel,
- &range_exception));
- SetPixelRGBO(q,image->colormap+(ssize_t)
- GetPixelIndex(indexes+x));
+ SetPixelIndex(image,PushColormapIndex(image,pixel,
+ &range_exception),q);
+ SetPixelPacket(image,image->colormap+(ssize_t)
+ GetPixelIndex(image,q),q);
p=PushLongPixel(endian,p,&pixel);
- SetPixelAlpha(q,ScaleLongToQuantum(pixel));
+ SetPixelAlpha(image,ScaleLongToQuantum(pixel),q);
p+=quantum_info->pad;
- q++;
+ q+=channels;
}
break;
}
@@ -703,14 +701,14 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushDoublePixel(&quantum_state,p,&pixel);
- SetPixelIndex(indexes+x,PushColormapIndex(image,
- ClampToQuantum(pixel),&range_exception));
- SetPixelRGBO(q,image->colormap+(ssize_t)
- GetPixelIndex(indexes+x));
+ SetPixelIndex(image,PushColormapIndex(image,
+ ClampToQuantum(pixel),&range_exception),q);
+ SetPixelPacket(image,image->colormap+(ssize_t)
+ GetPixelIndex(image,q),q);
p=PushDoublePixel(&quantum_state,p,&pixel);
- SetPixelAlpha(q,ClampToQuantum(pixel));
+ SetPixelAlpha(image,ClampToQuantum(pixel),q);
p+=quantum_info->pad;
- q++;
+ q+=channels;
}
break;
}
@@ -721,14 +719,14 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelIndex(indexes+x,PushColormapIndex(image,pixel,
- &range_exception));
- SetPixelRGBO(q,image->colormap+(ssize_t)
- GetPixelIndex(indexes+x));
+ SetPixelIndex(image,PushColormapIndex(image,pixel,
+ &range_exception),q);
+ SetPixelPacket(image,image->colormap+(ssize_t)
+ GetPixelIndex(image,q),q);
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelAlpha(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelAlpha(image,ScaleAnyToQuantum(pixel,range),q);
p+=quantum_info->pad;
- q++;
+ q+=channels;
}
break;
}
@@ -750,14 +748,14 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushCharPixel(p,&pixel);
- SetPixelBlue(q,ScaleCharToQuantum(pixel));
+ SetPixelBlue(image,ScaleCharToQuantum(pixel),q);
p=PushCharPixel(p,&pixel);
- SetPixelGreen(q,ScaleCharToQuantum(pixel));
+ SetPixelGreen(image,ScaleCharToQuantum(pixel),q);
p=PushCharPixel(p,&pixel);
- SetPixelRed(q,ScaleCharToQuantum(pixel));
- SetPixelOpacity(q,OpaqueOpacity);
+ SetPixelRed(image,ScaleCharToQuantum(pixel),q);
+ SetPixelAlpha(image,OpaqueAlpha,q);
p+=quantum_info->pad;
- q++;
+ q+=channels;
}
break;
}
@@ -769,14 +767,14 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushLongPixel(endian,p,&pixel);
- SetPixelRed(q,ScaleAnyToQuantum((pixel >> 22) & 0x3ff,
- range));
- SetPixelGreen(q,ScaleAnyToQuantum((pixel >> 12) &
- 0x3ff,range));
- SetPixelBlue(q,ScaleAnyToQuantum((pixel >> 2) & 0x3ff,
- range));
+ SetPixelRed(image,ScaleAnyToQuantum((pixel >> 22) & 0x3ff,
+ range),q);
+ SetPixelGreen(image,ScaleAnyToQuantum((pixel >> 12) & 0x3ff,
+ range),q);
+ SetPixelBlue(image,ScaleAnyToQuantum((pixel >> 2) & 0x3ff,
+ range),q);
p+=quantum_info->pad;
- q++;
+ q+=channels;
}
break;
}
@@ -785,24 +783,24 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushQuantumLongPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelBlue(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelBlue(image,ScaleAnyToQuantum(pixel,range),q);
p=PushQuantumLongPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelGreen(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelGreen(image,ScaleAnyToQuantum(pixel,range),q);
p=PushQuantumLongPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
- q++;
+ SetPixelRed(image,ScaleAnyToQuantum(pixel,range),q);
+ q+=channels;
}
break;
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelBlue(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelBlue(image,ScaleAnyToQuantum(pixel,range),q);
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelGreen(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelGreen(image,ScaleAnyToQuantum(pixel,range),q);
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
- q++;
+ SetPixelRed(image,ScaleAnyToQuantum(pixel,range),q);
+ q+=channels;
}
break;
}
@@ -822,21 +820,21 @@
default:
case 0:
{
- SetPixelRed(q,ScaleAnyToQuantum((QuantumAny)
- (pixel >> 4),range));
+ SetPixelRed(image,ScaleAnyToQuantum((QuantumAny)
+ (pixel >> 4),range),q);
break;
}
case 1:
{
- SetPixelGreen(q,ScaleAnyToQuantum((QuantumAny)
- (pixel >> 4),range));
+ SetPixelGreen(image,ScaleAnyToQuantum((QuantumAny)
+ (pixel >> 4),range),q);
break;
}
case 2:
{
- SetPixelBlue(q,ScaleAnyToQuantum((QuantumAny)
- (pixel >> 4),range));
- q++;
+ SetPixelBlue(image,ScaleAnyToQuantum((QuantumAny)
+ (pixel >> 4),range),q);
+ q+=channels;
break;
}
}
@@ -846,21 +844,21 @@
default:
case 0:
{
- SetPixelRed(q,ScaleAnyToQuantum((QuantumAny)
- (pixel >> 4),range));
+ SetPixelRed(image,ScaleAnyToQuantum((QuantumAny)
+ (pixel >> 4),range),q);
break;
}
case 1:
{
- SetPixelGreen(q,ScaleAnyToQuantum((QuantumAny)
- (pixel >> 4),range));
+ SetPixelGreen(image,ScaleAnyToQuantum((QuantumAny)
+ (pixel >> 4),range),q);
break;
}
case 2:
{
- SetPixelBlue(q,ScaleAnyToQuantum((QuantumAny)
- (pixel >> 4),range));
- q++;
+ SetPixelBlue(image,ScaleAnyToQuantum((QuantumAny)
+ (pixel >> 4),range),q);
+ q+=channels;
break;
}
}
@@ -874,21 +872,21 @@
default:
case 0:
{
- SetPixelRed(q,ScaleAnyToQuantum((QuantumAny)
- (pixel >> 4),range));
+ SetPixelRed(image,ScaleAnyToQuantum((QuantumAny)
+ (pixel >> 4),range),q);
break;
}
case 1:
{
- SetPixelGreen(q,ScaleAnyToQuantum((QuantumAny)
- (pixel >> 4),range));
+ SetPixelGreen(image,ScaleAnyToQuantum((QuantumAny)
+ (pixel >> 4),range),q);
break;
}
case 2:
{
- SetPixelBlue(q,ScaleAnyToQuantum((QuantumAny)
- (pixel >> 4),range));
- q++;
+ SetPixelBlue(image,ScaleAnyToQuantum((QuantumAny)
+ (pixel >> 4),range),q);
+ q+=channels;
break;
}
}
@@ -903,24 +901,24 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushQuantumLongPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelBlue(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelBlue(image,ScaleAnyToQuantum(pixel,range),q);
p=PushQuantumLongPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelGreen(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelGreen(image,ScaleAnyToQuantum(pixel,range),q);
p=PushQuantumLongPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
- q++;
+ SetPixelRed(image,ScaleAnyToQuantum(pixel,range),q);
+ q+=channels;
}
break;
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelBlue(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelBlue(image,ScaleAnyToQuantum(pixel,range),q);
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelGreen(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelGreen(image,ScaleAnyToQuantum(pixel,range),q);
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
- q++;
+ SetPixelRed(image,ScaleAnyToQuantum(pixel,range),q);
+ q+=channels;
}
break;
}
@@ -934,29 +932,29 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushShortPixel(endian,p,&pixel);
- SetPixelRed(q,ClampToQuantum((MagickRealType)
- QuantumRange*HalfToSinglePrecision(pixel)));
+ SetPixelRed(image,ClampToQuantum((MagickRealType)
+ QuantumRange*HalfToSinglePrecision(pixel)),q);
p=PushShortPixel(endian,p,&pixel);
- SetPixelGreen(q,ClampToQuantum((MagickRealType)
- QuantumRange*HalfToSinglePrecision(pixel)));
+ SetPixelGreen(image,ClampToQuantum((MagickRealType)
+ QuantumRange*HalfToSinglePrecision(pixel)),q);
p=PushShortPixel(endian,p,&pixel);
- SetPixelBlue(q,ClampToQuantum((MagickRealType)
- QuantumRange*HalfToSinglePrecision(pixel)));
+ SetPixelBlue(image,ClampToQuantum((MagickRealType)
+ QuantumRange*HalfToSinglePrecision(pixel)),q);
p+=quantum_info->pad;
- q++;
+ q+=channels;
}
break;
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushShortPixel(endian,p,&pixel);
- SetPixelBlue(q,ScaleShortToQuantum(pixel));
+ SetPixelBlue(image,ScaleShortToQuantum(pixel),q);
p=PushShortPixel(endian,p,&pixel);
- SetPixelGreen(q,ScaleShortToQuantum(pixel));
+ SetPixelGreen(image,ScaleShortToQuantum(pixel),q);
p=PushShortPixel(endian,p,&pixel);
- SetPixelRed(q,ScaleShortToQuantum(pixel));
+ SetPixelRed(image,ScaleShortToQuantum(pixel),q);
p+=quantum_info->pad;
- q++;
+ q+=channels;
}
break;
}
@@ -973,26 +971,26 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushFloatPixel(&quantum_state,p,&pixel);
- SetPixelRed(q,ClampToQuantum(pixel));
+ SetPixelRed(image,ClampToQuantum(pixel),q);
p=PushFloatPixel(&quantum_state,p,&pixel);
- SetPixelGreen(q,ClampToQuantum(pixel));
+ SetPixelGreen(image,ClampToQuantum(pixel),q);
p=PushFloatPixel(&quantum_state,p,&pixel);
- SetPixelBlue(q,ClampToQuantum(pixel));
+ SetPixelBlue(image,ClampToQuantum(pixel),q);
p+=quantum_info->pad;
- q++;
+ q+=channels;
}
break;
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushLongPixel(endian,p,&pixel);
- SetPixelBlue(q,ScaleLongToQuantum(pixel));
+ SetPixelBlue(image,ScaleLongToQuantum(pixel),q);
p=PushLongPixel(endian,p,&pixel);
- SetPixelGreen(q,ScaleLongToQuantum(pixel));
+ SetPixelGreen(image,ScaleLongToQuantum(pixel),q);
p=PushLongPixel(endian,p,&pixel);
- SetPixelRed(q,ScaleLongToQuantum(pixel));
+ SetPixelRed(image,ScaleLongToQuantum(pixel),q);
p+=quantum_info->pad;
- q++;
+ q+=channels;
}
break;
}
@@ -1006,13 +1004,13 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushDoublePixel(&quantum_state,p,&pixel);
- SetPixelRed(q,ClampToQuantum(pixel));
+ SetPixelRed(image,ClampToQuantum(pixel),q);
p=PushDoublePixel(&quantum_state,p,&pixel);
- SetPixelGreen(q,ClampToQuantum(pixel));
+ SetPixelGreen(image,ClampToQuantum(pixel),q);
p=PushDoublePixel(&quantum_state,p,&pixel);
- SetPixelBlue(q,ClampToQuantum(pixel));
+ SetPixelBlue(image,ClampToQuantum(pixel),q);
p+=quantum_info->pad;
- q++;
+ q+=channels;
}
break;
}
@@ -1023,12 +1021,12 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelBlue(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelBlue(image,ScaleAnyToQuantum(pixel,range),q);
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelGreen(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelGreen(image,ScaleAnyToQuantum(pixel,range),q);
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
- q++;
+ SetPixelRed(image,ScaleAnyToQuantum(pixel,range),q);
+ q+=channels;
}
break;
}
@@ -1048,1639 +1046,15 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushCharPixel(p,&pixel);
- SetPixelBlue(q,ScaleCharToQuantum(pixel));
+ SetPixelBlue(image,ScaleCharToQuantum(pixel),q);
p=PushCharPixel(p,&pixel);
- SetPixelGreen(q,ScaleCharToQuantum(pixel));
+ SetPixelGreen(image,ScaleCharToQuantum(pixel),q);
p=PushCharPixel(p,&pixel);
- SetPixelRed(q,ScaleCharToQuantum(pixel));
+ SetPixelRed(image,ScaleCharToQuantum(pixel),q);
p=PushCharPixel(p,&pixel);
- SetPixelAlpha(q,ScaleCharToQuantum(pixel));
+ SetPixelAlpha(image,ScaleCharToQuantum(pixel),q);
p+=quantum_info->pad;
- q++;
- }
- break;
- }
- case 10:
- {
- pixel=0;
- if (quantum_info->pack == MagickFalse)
- {
- register ssize_t
- i;
-
- size_t
- quantum;
-
- ssize_t
- n;
-
- n=0;
- quantum=0;
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- for (i=0; i < 4; i++)
- {
- switch (n % 3)
- {
- case 0:
- {
- p=PushLongPixel(endian,p,&pixel);
- quantum=(size_t) (ScaleShortToQuantum(
- (unsigned short) (((pixel >> 22) & 0x3ff) << 6)));
- break;
- }
- case 1:
- {
- quantum=(size_t) (ScaleShortToQuantum(
- (unsigned short) (((pixel >> 12) & 0x3ff) << 6)));
- break;
- }
- case 2:
- {
- quantum=(size_t) (ScaleShortToQuantum(
- (unsigned short) (((pixel >> 2) & 0x3ff) << 6)));
- break;
- }
- }
- switch (i)
- {
- case 0: SetPixelRed(q,quantum); break;
- case 1: SetPixelGreen(q,quantum); break;
- case 2: SetPixelBlue(q,quantum); break;
- case 3: SetPixelAlpha(q,quantum); break;
- }
- n++;
- }
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelRed(q,ScaleShortToQuantum((unsigned short)
- (pixel << 6)));
- p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelGreen(q,ScaleShortToQuantum((unsigned short)
- (pixel << 6)));
- p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelBlue(q,ScaleShortToQuantum((unsigned short)
- (pixel << 6)));
- p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelAlpha(q,ScaleShortToQuantum((unsigned short)
- (pixel << 6)));
- q++;
- }
- break;
- }
- case 16:
- {
- unsigned short
- pixel;
-
- if (quantum_info->format == FloatingPointQuantumFormat)
- {
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushShortPixel(endian,p,&pixel);
- SetPixelRed(q,ClampToQuantum((MagickRealType)
- QuantumRange*HalfToSinglePrecision(pixel)));
- p=PushShortPixel(endian,p,&pixel);
- SetPixelGreen(q,ClampToQuantum((MagickRealType)
- QuantumRange*HalfToSinglePrecision(pixel)));
- p=PushShortPixel(endian,p,&pixel);
- SetPixelBlue(q,ClampToQuantum((MagickRealType)
- QuantumRange*HalfToSinglePrecision(pixel)));
- p=PushShortPixel(endian,p,&pixel);
- SetPixelAlpha(q,ClampToQuantum((MagickRealType)
- QuantumRange*HalfToSinglePrecision(pixel)));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushShortPixel(endian,p,&pixel);
- SetPixelBlue(q,ScaleShortToQuantum(pixel));
- p=PushShortPixel(endian,p,&pixel);
- SetPixelGreen(q,ScaleShortToQuantum(pixel));
- p=PushShortPixel(endian,p,&pixel);
- SetPixelRed(q,ScaleShortToQuantum(pixel));
- p=PushShortPixel(endian,p,&pixel);
- SetPixelAlpha(q,ScaleShortToQuantum(pixel));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- case 32:
- {
- unsigned int
- pixel;
-
- if (quantum_info->format == FloatingPointQuantumFormat)
- {
- float
- pixel;
-
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushFloatPixel(&quantum_state,p,&pixel);
- SetPixelRed(q,ClampToQuantum(pixel));
- p=PushFloatPixel(&quantum_state,p,&pixel);
- SetPixelGreen(q,ClampToQuantum(pixel));
- p=PushFloatPixel(&quantum_state,p,&pixel);
- SetPixelBlue(q,ClampToQuantum(pixel));
- p=PushFloatPixel(&quantum_state,p,&pixel);
- SetPixelAlpha(q,ClampToQuantum(pixel));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushLongPixel(endian,p,&pixel);
- SetPixelBlue(q,ScaleLongToQuantum(pixel));
- p=PushLongPixel(endian,p,&pixel);
- SetPixelGreen(q,ScaleLongToQuantum(pixel));
- p=PushLongPixel(endian,p,&pixel);
- SetPixelRed(q,ScaleLongToQuantum(pixel));
- p=PushLongPixel(endian,p,&pixel);
- SetPixelAlpha(q,ScaleLongToQuantum(pixel));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- case 64:
- {
- if (quantum_info->format == FloatingPointQuantumFormat)
- {
- double
- pixel;
-
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushDoublePixel(&quantum_state,p,&pixel);
- SetPixelRed(q,ClampToQuantum(pixel));
- p=PushDoublePixel(&quantum_state,p,&pixel);
- SetPixelGreen(q,ClampToQuantum(pixel));
- p=PushDoublePixel(&quantum_state,p,&pixel);
- SetPixelBlue(q,ClampToQuantum(pixel));
- p=PushDoublePixel(&quantum_state,p,&pixel);
- SetPixelAlpha(q,ClampToQuantum(pixel));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- }
- default:
- {
- range=GetQuantumRange(image->depth);
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelBlue(q,ScaleAnyToQuantum(pixel,range));
- p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelGreen(q,ScaleAnyToQuantum(pixel,range));
- p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
- p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelAlpha(q,ScaleAnyToQuantum(pixel,range));
- q++;
- }
- break;
- }
- }
- break;
- }
- case GrayQuantum:
- {
- switch (quantum_info->depth)
- {
- case 1:
- {
- register Quantum
- black,
- white;
-
- black=0;
- white=(Quantum) QuantumRange;
- if (quantum_info->min_is_white != MagickFalse)
- {
- black=(Quantum) QuantumRange;
- white=0;
- }
- for (x=0; x < ((ssize_t) number_pixels-7); x+=8)
- {
- for (bit=0; bit < 8; bit++)
- {
- SetPixelRed(q,((*p) & (1 << (7-bit))) == 0 ?
- black : white);
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- q++;
- }
- p++;
- }
- for (bit=0; bit < (ssize_t) (number_pixels % 8); bit++)
- {
- SetPixelRed(q,((*p) & (0x01 << (7-bit))) == 0 ?
- black : white);
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- q++;
- }
- if (bit != 0)
- p++;
- break;
- }
- case 4:
- {
- register unsigned char
- pixel;
-
- range=GetQuantumRange(image->depth);
- for (x=0; x < ((ssize_t) number_pixels-1); x+=2)
- {
- pixel=(unsigned char) ((*p >> 4) & 0xf);
- SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- q++;
- pixel=(unsigned char) ((*p) & 0xf);
- SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- p++;
- q++;
- }
- for (bit=0; bit < (ssize_t) (number_pixels % 2); bit++)
- {
- pixel=(unsigned char) (*p++ >> 4);
- SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- q++;
- }
- break;
- }
- case 8:
- {
- unsigned char
- pixel;
-
- if (quantum_info->min_is_white != MagickFalse)
- {
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushCharPixel(p,&pixel);
- SetPixelRed(q,QuantumRange-ScaleCharToQuantum(pixel));
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- SetPixelOpacity(q,OpaqueOpacity);
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushCharPixel(p,&pixel);
- SetPixelRed(q,ScaleCharToQuantum(pixel));
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- SetPixelOpacity(q,OpaqueOpacity);
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- case 10:
- {
- range=GetQuantumRange(image->depth);
- if (quantum_info->pack == MagickFalse)
- {
- if (image->endian != LSBEndian)
- {
- for (x=0; x < (ssize_t) (number_pixels-2); x+=3)
- {
- p=PushLongPixel(endian,p,&pixel);
- SetPixelRed(q,ScaleAnyToQuantum((pixel >> 2) &
- 0x3ff,range));
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- q++;
- SetPixelRed(q,ScaleAnyToQuantum((pixel >> 12) &
- 0x3ff,range));
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- q++;
- SetPixelRed(q,ScaleAnyToQuantum((pixel >> 22) &
- 0x3ff,range));
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- p+=quantum_info->pad;
- q++;
- }
- p=PushLongPixel(endian,p,&pixel);
- if (x++ < (ssize_t) (number_pixels-1))
- {
- SetPixelRed(q,ScaleAnyToQuantum((pixel >> 2) &
- 0x3ff,range));
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- q++;
- }
- if (x++ < (ssize_t) number_pixels)
- {
- SetPixelRed(q,ScaleAnyToQuantum((pixel >> 12) &
- 0x3ff,range));
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- q++;
- }
- break;
- }
- for (x=0; x < (ssize_t) (number_pixels-2); x+=3)
- {
- p=PushLongPixel(endian,p,&pixel);
- SetPixelRed(q,ScaleAnyToQuantum((pixel >> 22) &
- 0x3ff,range));
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- q++;
- SetPixelRed(q,ScaleAnyToQuantum((pixel >> 12) &
- 0x3ff,range));
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- q++;
- SetPixelRed(q,ScaleAnyToQuantum((pixel >> 2) &
- 0x3ff,range));
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- p+=quantum_info->pad;
- q++;
- }
- p=PushLongPixel(endian,p,&pixel);
- if (x++ < (ssize_t) (number_pixels-1))
- {
- SetPixelRed(q,ScaleAnyToQuantum((pixel >> 22) &
- 0x3ff,range));
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- q++;
- }
- if (x++ < (ssize_t) number_pixels)
- {
- SetPixelRed(q,ScaleAnyToQuantum((pixel >> 12) &
- 0x3ff,range));
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- q++;
- }
- break;
- }
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- case 12:
- {
- range=GetQuantumRange(image->depth);
- if (quantum_info->pack == MagickFalse)
- {
- unsigned short
- pixel;
-
- for (x=0; x < (ssize_t) (number_pixels-1); x+=2)
- {
- p=PushShortPixel(endian,p,&pixel);
- SetPixelRed(q,ScaleAnyToQuantum((QuantumAny)
- (pixel >> 4),range));
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- q++;
- p=PushShortPixel(endian,p,&pixel);
- SetPixelRed(q,ScaleAnyToQuantum((QuantumAny)
- (pixel >> 4),range));
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- p+=quantum_info->pad;
- q++;
- }
- for (bit=0; bit < (ssize_t) (number_pixels % 2); bit++)
- {
- p=PushShortPixel(endian,p,&pixel);
- SetPixelRed(q,ScaleAnyToQuantum((QuantumAny)
- (pixel >> 4),range));
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- p+=quantum_info->pad;
- q++;
- }
- if (bit != 0)
- p++;
- break;
- }
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- case 16:
- {
- unsigned short
- pixel;
-
- if (quantum_info->min_is_white != MagickFalse)
- {
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushShortPixel(endian,p,&pixel);
- SetPixelRed(q,QuantumRange-ScaleShortToQuantum(pixel));
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- if (quantum_info->format == FloatingPointQuantumFormat)
- {
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushShortPixel(endian,p,&pixel);
- SetPixelRed(q,ClampToQuantum((MagickRealType)
- QuantumRange*HalfToSinglePrecision(pixel)));
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushShortPixel(endian,p,&pixel);
- SetPixelRed(q,ScaleShortToQuantum(pixel));
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- case 32:
- {
- unsigned int
- pixel;
-
- if (quantum_info->format == FloatingPointQuantumFormat)
- {
- float
- pixel;
-
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushFloatPixel(&quantum_state,p,&pixel);
- SetPixelRed(q,ClampToQuantum(pixel));
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushLongPixel(endian,p,&pixel);
- SetPixelRed(q,ScaleLongToQuantum(pixel));
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- case 64:
- {
- if (quantum_info->format == FloatingPointQuantumFormat)
- {
- double
- pixel;
-
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushDoublePixel(&quantum_state,p,&pixel);
- SetPixelRed(q,ClampToQuantum(pixel));
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- }
- default:
- {
- range=GetQuantumRange(image->depth);
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- }
- break;
- }
- case GrayAlphaQuantum:
- {
- switch (quantum_info->depth)
- {
- case 1:
- {
- register unsigned char
- pixel;
-
- for (x=0; x < ((ssize_t) number_pixels-3); x+=4)
- {
- for (bit=0; bit < 8; bit+=2)
- {
- pixel=(unsigned char)
- (((*p) & (1 << (7-bit))) != 0 ? 0x00 : 0x01);
- SetPixelRed(q,pixel == 0 ? 0 : QuantumRange);
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- SetPixelOpacity(q,((*p) & (1UL << (unsigned char)
- (6-bit))) == 0 ? TransparentOpacity : OpaqueOpacity);
- q++;
- }
- p++;
- }
- for (bit=0; bit <= (ssize_t) (number_pixels % 4); bit+=2)
- {
- pixel=(unsigned char) (((*p) & (1 << (7-bit))) != 0 ? 0x00 : 0x01);
- SetPixelRed(q,pixel != 0 ? 0 : QuantumRange);
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- SetPixelOpacity(q,((*p) & (1UL << (unsigned char)
- (6-bit))) == 0 ? TransparentOpacity : OpaqueOpacity);
- q++;
- }
- if (bit != 0)
- p++;
- break;
- }
- case 4:
- {
- register unsigned char
- pixel;
-
- range=GetQuantumRange(image->depth);
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- pixel=(unsigned char) ((*p >> 4) & 0xf);
- SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- pixel=(unsigned char) ((*p) & 0xf);
- SetPixelAlpha(q,ScaleAnyToQuantum(pixel,range));
- p++;
- q++;
- }
- break;
- }
- case 8:
- {
- unsigned char
- pixel;
-
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushCharPixel(p,&pixel);
- SetPixelRed(q,ScaleCharToQuantum(pixel));
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- p=PushCharPixel(p,&pixel);
- SetPixelAlpha(q,ScaleCharToQuantum(pixel));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- case 10:
- {
- range=GetQuantumRange(image->depth);
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelOpacity(q,ScaleAnyToQuantum(pixel,range));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- case 12:
- {
- range=GetQuantumRange(image->depth);
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelOpacity(q,ScaleAnyToQuantum(pixel,range));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- case 16:
- {
- unsigned short
- pixel;
-
- if (quantum_info->format == FloatingPointQuantumFormat)
- {
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushShortPixel(endian,p,&pixel);
- SetPixelRed(q,ClampToQuantum((MagickRealType)
- QuantumRange*HalfToSinglePrecision(pixel)));
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- p=PushShortPixel(endian,p,&pixel);
- SetPixelAlpha(q,ClampToQuantum((MagickRealType)
- QuantumRange*HalfToSinglePrecision(pixel)));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushShortPixel(endian,p,&pixel);
- SetPixelRed(q,ScaleShortToQuantum(pixel));
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- p=PushShortPixel(endian,p,&pixel);
- SetPixelAlpha(q,ScaleShortToQuantum(pixel));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- case 32:
- {
- unsigned int
- pixel;
-
- if (quantum_info->format == FloatingPointQuantumFormat)
- {
- float
- pixel;
-
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushFloatPixel(&quantum_state,p,&pixel);
- SetPixelRed(q,ClampToQuantum(pixel));
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- p=PushFloatPixel(&quantum_state,p,&pixel);
- SetPixelAlpha(q,ClampToQuantum(pixel));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushLongPixel(endian,p,&pixel);
- SetPixelRed(q,ScaleLongToQuantum(pixel));
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- p=PushLongPixel(endian,p,&pixel);
- SetPixelAlpha(q,ScaleLongToQuantum(pixel));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- case 64:
- {
- if (quantum_info->format == FloatingPointQuantumFormat)
- {
- double
- pixel;
-
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushDoublePixel(&quantum_state,p,&pixel);
- SetPixelRed(q,ClampToQuantum(pixel));
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- p=PushDoublePixel(&quantum_state,p,&pixel);
- SetPixelAlpha(q,ClampToQuantum(pixel));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- }
- default:
- {
- range=GetQuantumRange(image->depth);
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelAlpha(q,ScaleAnyToQuantum(pixel,range));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- }
- break;
- }
- case RedQuantum:
- case CyanQuantum:
- {
- switch (quantum_info->depth)
- {
- case 8:
- {
- unsigned char
- pixel;
-
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushCharPixel(p,&pixel);
- SetPixelRed(q,ScaleCharToQuantum(pixel));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- case 16:
- {
- unsigned short
- pixel;
-
- if (quantum_info->format == FloatingPointQuantumFormat)
- {
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushShortPixel(endian,p,&pixel);
- SetPixelRed(q,ClampToQuantum((MagickRealType)
- QuantumRange*HalfToSinglePrecision(pixel)));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushShortPixel(endian,p,&pixel);
- SetPixelRed(q,ScaleShortToQuantum(pixel));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- case 32:
- {
- unsigned int
- pixel;
-
- if (quantum_info->format == FloatingPointQuantumFormat)
- {
- float
- pixel;
-
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushFloatPixel(&quantum_state,p,&pixel);
- SetPixelRed(q,ClampToQuantum(pixel));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushLongPixel(endian,p,&pixel);
- SetPixelRed(q,ScaleLongToQuantum(pixel));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- case 64:
- {
- if (quantum_info->format == FloatingPointQuantumFormat)
- {
- double
- pixel;
-
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushDoublePixel(&quantum_state,p,&pixel);
- SetPixelRed(q,ClampToQuantum(pixel));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- }
- default:
- {
- range=GetQuantumRange(image->depth);
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- }
- break;
- }
- case GreenQuantum:
- case MagentaQuantum:
- {
- switch (quantum_info->depth)
- {
- case 8:
- {
- unsigned char
- pixel;
-
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushCharPixel(p,&pixel);
- SetPixelGreen(q,ScaleCharToQuantum(pixel));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- case 16:
- {
- unsigned short
- pixel;
-
- if (quantum_info->format == FloatingPointQuantumFormat)
- {
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushShortPixel(endian,p,&pixel);
- SetPixelGreen(q,ClampToQuantum((MagickRealType)
- QuantumRange*HalfToSinglePrecision(pixel)));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushShortPixel(endian,p,&pixel);
- SetPixelGreen(q,ScaleShortToQuantum(pixel));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- case 32:
- {
- unsigned int
- pixel;
-
- if (quantum_info->format == FloatingPointQuantumFormat)
- {
- float
- pixel;
-
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushFloatPixel(&quantum_state,p,&pixel);
- SetPixelGreen(q,ClampToQuantum(pixel));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushLongPixel(endian,p,&pixel);
- SetPixelGreen(q,ScaleLongToQuantum(pixel));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- case 64:
- {
- if (quantum_info->format == FloatingPointQuantumFormat)
- {
- double
- pixel;
-
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushDoublePixel(&quantum_state,p,&pixel);
- SetPixelGreen(q,ClampToQuantum(pixel));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- }
- default:
- {
- range=GetQuantumRange(image->depth);
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelGreen(q,ScaleAnyToQuantum(pixel,range));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- }
- break;
- }
- case BlueQuantum:
- case YellowQuantum:
- {
- switch (quantum_info->depth)
- {
- case 8:
- {
- unsigned char
- pixel;
-
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushCharPixel(p,&pixel);
- SetPixelBlue(q,ScaleCharToQuantum(pixel));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- case 16:
- {
- unsigned short
- pixel;
-
- if (quantum_info->format == FloatingPointQuantumFormat)
- {
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushShortPixel(endian,p,&pixel);
- SetPixelBlue(q,ClampToQuantum((MagickRealType)
- QuantumRange*HalfToSinglePrecision(pixel)));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushShortPixel(endian,p,&pixel);
- SetPixelBlue(q,ScaleShortToQuantum(pixel));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- case 32:
- {
- unsigned int
- pixel;
-
- if (quantum_info->format == FloatingPointQuantumFormat)
- {
- float
- pixel;
-
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushFloatPixel(&quantum_state,p,&pixel);
- SetPixelBlue(q,ClampToQuantum(pixel));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushLongPixel(endian,p,&pixel);
- SetPixelBlue(q,ScaleLongToQuantum(pixel));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- case 64:
- {
- if (quantum_info->format == FloatingPointQuantumFormat)
- {
- double
- pixel;
-
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushDoublePixel(&quantum_state,p,&pixel);
- SetPixelBlue(q,ClampToQuantum(pixel));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- }
- default:
- {
- range=GetQuantumRange(image->depth);
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelBlue(q,ScaleAnyToQuantum(pixel,range));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- }
- break;
- }
- case AlphaQuantum:
- {
- switch (quantum_info->depth)
- {
- case 8:
- {
- unsigned char
- pixel;
-
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushCharPixel(p,&pixel);
- SetPixelAlpha(q,ScaleCharToQuantum(pixel));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- case 16:
- {
- unsigned short
- pixel;
-
- if (quantum_info->format == FloatingPointQuantumFormat)
- {
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushShortPixel(endian,p,&pixel);
- SetPixelAlpha(q,ClampToQuantum((MagickRealType)
- QuantumRange*HalfToSinglePrecision(pixel)));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushShortPixel(endian,p,&pixel);
- SetPixelAlpha(q,ScaleShortToQuantum(pixel));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- case 32:
- {
- unsigned int
- pixel;
-
- if (quantum_info->format == FloatingPointQuantumFormat)
- {
- float
- pixel;
-
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushFloatPixel(&quantum_state,p,&pixel);
- SetPixelAlpha(q,ClampToQuantum(pixel));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushLongPixel(endian,p,&pixel);
- SetPixelAlpha(q,ScaleLongToQuantum(pixel));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- case 64:
- {
- if (quantum_info->format == FloatingPointQuantumFormat)
- {
- double
- pixel;
-
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushDoublePixel(&quantum_state,p,&pixel);
- SetPixelAlpha(q,ClampToQuantum(pixel));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- }
- default:
- {
- range=GetQuantumRange(image->depth);
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelAlpha(q,ScaleAnyToQuantum(pixel,range));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- }
- break;
- }
- case BlackQuantum:
- {
- if (image->colorspace != CMYKColorspace)
- {
- (void) ThrowMagickException(exception,GetMagickModule(),ImageError,
- "ColorSeparatedImageRequired","`%s'",image->filename);
- return(extent);
- }
- switch (quantum_info->depth)
- {
- case 8:
- {
- unsigned char
- pixel;
-
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushCharPixel(p,&pixel);
- SetPixelIndex(indexes+x,ScaleCharToQuantum(pixel));
- p+=quantum_info->pad;
- }
- break;
- }
- case 16:
- {
- unsigned short
- pixel;
-
- if (quantum_info->format == FloatingPointQuantumFormat)
- {
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushShortPixel(endian,p,&pixel);
- SetPixelIndex(indexes+x,ClampToQuantum((MagickRealType)
- QuantumRange*HalfToSinglePrecision(pixel)));
- p+=quantum_info->pad;
- }
- break;
- }
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushShortPixel(endian,p,&pixel);
- SetPixelIndex(indexes+x,ScaleShortToQuantum(pixel));
- p+=quantum_info->pad;
- }
- break;
- }
- case 32:
- {
- unsigned int
- pixel;
-
- if (quantum_info->format == FloatingPointQuantumFormat)
- {
- float
- pixel;
-
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushFloatPixel(&quantum_state,p,&pixel);
- SetPixelIndex(indexes+x,ClampToQuantum(pixel));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushLongPixel(endian,p,&pixel);
- SetPixelIndex(indexes+x,ScaleLongToQuantum(pixel));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- case 64:
- {
- if (quantum_info->format == FloatingPointQuantumFormat)
- {
- double
- pixel;
-
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushDoublePixel(&quantum_state,p,&pixel);
- SetPixelIndex(indexes+x,ClampToQuantum(pixel));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- }
- default:
- {
- range=GetQuantumRange(image->depth);
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelIndex(indexes+x,ScaleAnyToQuantum(pixel,range));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- }
- break;
- }
- case RGBQuantum:
- case CbYCrQuantum:
- {
- switch (quantum_info->depth)
- {
- case 8:
- {
- unsigned char
- pixel;
-
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushCharPixel(p,&pixel);
- SetPixelRed(q,ScaleCharToQuantum(pixel));
- p=PushCharPixel(p,&pixel);
- SetPixelGreen(q,ScaleCharToQuantum(pixel));
- p=PushCharPixel(p,&pixel);
- SetPixelBlue(q,ScaleCharToQuantum(pixel));
- SetPixelOpacity(q,OpaqueOpacity);
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- case 10:
- {
- range=GetQuantumRange(image->depth);
- if (quantum_info->pack == MagickFalse)
- {
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushLongPixel(endian,p,&pixel);
- SetPixelRed(q,ScaleAnyToQuantum((pixel >> 22) &
- 0x3ff,range));
- SetPixelGreen(q,ScaleAnyToQuantum((pixel >> 12) &
- 0x3ff,range));
- SetPixelBlue(q,ScaleAnyToQuantum((pixel >> 2) &
- 0x3ff,range));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- if (quantum_info->quantum == 32U)
- {
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushQuantumLongPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
- p=PushQuantumLongPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelGreen(q,ScaleAnyToQuantum(pixel,range));
- p=PushQuantumLongPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelBlue(q,ScaleAnyToQuantum(pixel,range));
- q++;
- }
- break;
- }
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
- p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelGreen(q,ScaleAnyToQuantum(pixel,range));
- p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelBlue(q,ScaleAnyToQuantum(pixel,range));
- q++;
- }
- break;
- }
- case 12:
- {
- range=GetQuantumRange(image->depth);
- if (quantum_info->pack == MagickFalse)
- {
- unsigned short
- pixel;
-
- for (x=0; x < (ssize_t) (3*number_pixels-1); x+=2)
- {
- p=PushShortPixel(endian,p,&pixel);
- switch (x % 3)
- {
- default:
- case 0:
- {
- SetPixelRed(q,ScaleAnyToQuantum((QuantumAny)
- (pixel >> 4),range));
- break;
- }
- case 1:
- {
- SetPixelGreen(q,ScaleAnyToQuantum((QuantumAny)
- (pixel >> 4),range));
- break;
- }
- case 2:
- {
- SetPixelBlue(q,ScaleAnyToQuantum((QuantumAny)
- (pixel >> 4),range));
- q++;
- break;
- }
- }
- p=PushShortPixel(endian,p,&pixel);
- switch ((x+1) % 3)
- {
- default:
- case 0:
- {
- SetPixelRed(q,ScaleAnyToQuantum((QuantumAny)
- (pixel >> 4),range));
- break;
- }
- case 1:
- {
- SetPixelGreen(q,ScaleAnyToQuantum((QuantumAny)
- (pixel >> 4),range));
- break;
- }
- case 2:
- {
- SetPixelBlue(q,ScaleAnyToQuantum((QuantumAny)
- (pixel >> 4),range));
- q++;
- break;
- }
- }
- p+=quantum_info->pad;
- }
- for (bit=0; bit < (ssize_t) (3*number_pixels % 2); bit++)
- {
- p=PushShortPixel(endian,p,&pixel);
- switch ((x+bit) % 3)
- {
- default:
- case 0:
- {
- SetPixelRed(q,ScaleAnyToQuantum((QuantumAny)
- (pixel >> 4),range));
- break;
- }
- case 1:
- {
- SetPixelGreen(q,ScaleAnyToQuantum((QuantumAny)
- (pixel >> 4),range));
- break;
- }
- case 2:
- {
- SetPixelBlue(q,ScaleAnyToQuantum((QuantumAny)
- (pixel >> 4),range));
- q++;
- break;
- }
- }
- p+=quantum_info->pad;
- }
- if (bit != 0)
- p++;
- break;
- }
- if (quantum_info->quantum == 32U)
- {
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushQuantumLongPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
- p=PushQuantumLongPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelGreen(q,ScaleAnyToQuantum(pixel,range));
- p=PushQuantumLongPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelBlue(q,ScaleAnyToQuantum(pixel,range));
- q++;
- }
- break;
- }
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
- p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelGreen(q,ScaleAnyToQuantum(pixel,range));
- p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelBlue(q,ScaleAnyToQuantum(pixel,range));
- q++;
- }
- break;
- }
- case 16:
- {
- unsigned short
- pixel;
-
- if (quantum_info->format == FloatingPointQuantumFormat)
- {
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushShortPixel(endian,p,&pixel);
- SetPixelRed(q,ClampToQuantum((MagickRealType)
- QuantumRange*HalfToSinglePrecision(pixel)));
- p=PushShortPixel(endian,p,&pixel);
- SetPixelGreen(q,ClampToQuantum((MagickRealType)
- QuantumRange*HalfToSinglePrecision(pixel)));
- p=PushShortPixel(endian,p,&pixel);
- SetPixelBlue(q,ClampToQuantum((MagickRealType)
- QuantumRange*HalfToSinglePrecision(pixel)));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushShortPixel(endian,p,&pixel);
- SetPixelRed(q,ScaleShortToQuantum(pixel));
- p=PushShortPixel(endian,p,&pixel);
- SetPixelGreen(q,ScaleShortToQuantum(pixel));
- p=PushShortPixel(endian,p,&pixel);
- SetPixelBlue(q,ScaleShortToQuantum(pixel));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- case 32:
- {
- unsigned int
- pixel;
-
- if (quantum_info->format == FloatingPointQuantumFormat)
- {
- float
- pixel;
-
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushFloatPixel(&quantum_state,p,&pixel);
- SetPixelRed(q,ClampToQuantum(pixel));
- p=PushFloatPixel(&quantum_state,p,&pixel);
- SetPixelGreen(q,ClampToQuantum(pixel));
- p=PushFloatPixel(&quantum_state,p,&pixel);
- SetPixelBlue(q,ClampToQuantum(pixel));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushLongPixel(endian,p,&pixel);
- SetPixelRed(q,ScaleLongToQuantum(pixel));
- p=PushLongPixel(endian,p,&pixel);
- SetPixelGreen(q,ScaleLongToQuantum(pixel));
- p=PushLongPixel(endian,p,&pixel);
- SetPixelBlue(q,ScaleLongToQuantum(pixel));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- case 64:
- {
- if (quantum_info->format == FloatingPointQuantumFormat)
- {
- double
- pixel;
-
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushDoublePixel(&quantum_state,p,&pixel);
- SetPixelRed(q,ClampToQuantum(pixel));
- p=PushDoublePixel(&quantum_state,p,&pixel);
- SetPixelGreen(q,ClampToQuantum(pixel));
- p=PushDoublePixel(&quantum_state,p,&pixel);
- SetPixelBlue(q,ClampToQuantum(pixel));
- p+=quantum_info->pad;
- q++;
- }
- break;
- }
- }
- default:
- {
- range=GetQuantumRange(image->depth);
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
- p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelGreen(q,ScaleAnyToQuantum(pixel,range));
- p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelBlue(q,ScaleAnyToQuantum(pixel,range));
- q++;
- }
- break;
- }
- }
- break;
- }
- case RGBAQuantum:
- case RGBOQuantum:
- case CbYCrAQuantum:
- {
- switch (quantum_info->depth)
- {
- case 8:
- {
- unsigned char
- pixel;
-
- for (x=0; x < (ssize_t) number_pixels; x++)
- {
- p=PushCharPixel(p,&pixel);
- SetPixelRed(q,ScaleCharToQuantum(pixel));
- p=PushCharPixel(p,&pixel);
- SetPixelGreen(q,ScaleCharToQuantum(pixel));
- p=PushCharPixel(p,&pixel);
- SetPixelBlue(q,ScaleCharToQuantum(pixel));
- p=PushCharPixel(p,&pixel);
- SetPixelAlpha(q,ScaleCharToQuantum(pixel));
- p+=quantum_info->pad;
- q++;
+ q+=channels;
}
break;
}
@@ -2728,33 +1102,33 @@
}
switch (i)
{
- case 0: SetPixelRed(q,quantum); break;
- case 1: SetPixelGreen(q,quantum); break;
- case 2: SetPixelBlue(q,quantum); break;
- case 3: SetPixelAlpha(q,quantum); break;
+ case 0: SetPixelRed(image,(Quantum) quantum,q); break;
+ case 1: SetPixelGreen(image,(Quantum) quantum,q); break;
+ case 2: SetPixelBlue(image,(Quantum) quantum,q); break;
+ case 3: SetPixelAlpha(image,(Quantum) quantum,q); break;
}
n++;
}
p+=quantum_info->pad;
- q++;
+ q+=channels;
}
break;
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelRed(q,ScaleShortToQuantum((unsigned short)
- (pixel << 6)));
+ SetPixelRed(image,ScaleShortToQuantum((unsigned short)
+ (pixel << 6)),q);
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelGreen(q,ScaleShortToQuantum((unsigned short)
- (pixel << 6)));
+ SetPixelGreen(image,ScaleShortToQuantum((unsigned short)
+ (pixel << 6)),q);
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelBlue(q,ScaleShortToQuantum((unsigned short)
- (pixel << 6)));
+ SetPixelBlue(image,ScaleShortToQuantum((unsigned short)
+ (pixel << 6)),q);
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelAlpha(q,ScaleShortToQuantum((unsigned short)
- (pixel << 6)));
- q++;
+ SetPixelAlpha(image,ScaleShortToQuantum((unsigned short)
+ (pixel << 6)),q);
+ q+=channels;
}
break;
}
@@ -2768,34 +1142,34 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushShortPixel(endian,p,&pixel);
- SetPixelRed(q,ClampToQuantum((MagickRealType)
- QuantumRange*HalfToSinglePrecision(pixel)));
+ SetPixelRed(image,ClampToQuantum((MagickRealType)
+ QuantumRange*HalfToSinglePrecision(pixel)),q);
p=PushShortPixel(endian,p,&pixel);
- SetPixelGreen(q,ClampToQuantum((MagickRealType)
- QuantumRange*HalfToSinglePrecision(pixel)));
+ SetPixelGreen(image,ClampToQuantum((MagickRealType)
+ QuantumRange*HalfToSinglePrecision(pixel)),q);
p=PushShortPixel(endian,p,&pixel);
- SetPixelBlue(q,ClampToQuantum((MagickRealType)
- QuantumRange*HalfToSinglePrecision(pixel)));
+ SetPixelBlue(image,ClampToQuantum((MagickRealType)
+ QuantumRange*HalfToSinglePrecision(pixel)),q);
p=PushShortPixel(endian,p,&pixel);
- SetPixelAlpha(q,ClampToQuantum((MagickRealType)
- QuantumRange*HalfToSinglePrecision(pixel)));
+ SetPixelAlpha(image,ClampToQuantum((MagickRealType)
+ QuantumRange*HalfToSinglePrecision(pixel)),q);
p+=quantum_info->pad;
- q++;
+ q+=channels;
}
break;
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushShortPixel(endian,p,&pixel);
- SetPixelRed(q,ScaleShortToQuantum(pixel));
+ SetPixelBlue(image,ScaleShortToQuantum(pixel),q);
p=PushShortPixel(endian,p,&pixel);
- SetPixelGreen(q,ScaleShortToQuantum(pixel));
+ SetPixelGreen(image,ScaleShortToQuantum(pixel),q);
p=PushShortPixel(endian,p,&pixel);
- SetPixelBlue(q,ScaleShortToQuantum(pixel));
+ SetPixelRed(image,ScaleShortToQuantum(pixel),q);
p=PushShortPixel(endian,p,&pixel);
- SetPixelAlpha(q,ScaleShortToQuantum(pixel));
+ SetPixelAlpha(image,ScaleShortToQuantum(pixel),q);
p+=quantum_info->pad;
- q++;
+ q+=channels;
}
break;
}
@@ -2812,30 +1186,30 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushFloatPixel(&quantum_state,p,&pixel);
- SetPixelRed(q,ClampToQuantum(pixel));
+ SetPixelRed(image,ClampToQuantum(pixel),q);
p=PushFloatPixel(&quantum_state,p,&pixel);
- SetPixelGreen(q,ClampToQuantum(pixel));
+ SetPixelGreen(image,ClampToQuantum(pixel),q);
p=PushFloatPixel(&quantum_state,p,&pixel);
- SetPixelBlue(q,ClampToQuantum(pixel));
+ SetPixelBlue(image,ClampToQuantum(pixel),q);
p=PushFloatPixel(&quantum_state,p,&pixel);
- SetPixelAlpha(q,ClampToQuantum(pixel));
+ SetPixelAlpha(image,ClampToQuantum(pixel),q);
p+=quantum_info->pad;
- q++;
+ q+=channels;
}
break;
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushLongPixel(endian,p,&pixel);
- SetPixelRed(q,ScaleLongToQuantum(pixel));
+ SetPixelBlue(image,ScaleLongToQuantum(pixel),q);
p=PushLongPixel(endian,p,&pixel);
- SetPixelGreen(q,ScaleLongToQuantum(pixel));
+ SetPixelGreen(image,ScaleLongToQuantum(pixel),q);
p=PushLongPixel(endian,p,&pixel);
- SetPixelBlue(q,ScaleLongToQuantum(pixel));
+ SetPixelRed(image,ScaleLongToQuantum(pixel),q);
p=PushLongPixel(endian,p,&pixel);
- SetPixelAlpha(q,ScaleLongToQuantum(pixel));
+ SetPixelAlpha(image,ScaleLongToQuantum(pixel),q);
p+=quantum_info->pad;
- q++;
+ q+=channels;
}
break;
}
@@ -2849,15 +1223,15 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushDoublePixel(&quantum_state,p,&pixel);
- SetPixelRed(q,ClampToQuantum(pixel));
+ SetPixelRed(image,ClampToQuantum(pixel),q);
p=PushDoublePixel(&quantum_state,p,&pixel);
- SetPixelGreen(q,ClampToQuantum(pixel));
+ SetPixelGreen(image,ClampToQuantum(pixel),q);
p=PushDoublePixel(&quantum_state,p,&pixel);
- SetPixelBlue(q,ClampToQuantum(pixel));
+ SetPixelBlue(image,ClampToQuantum(pixel),q);
p=PushDoublePixel(&quantum_state,p,&pixel);
- SetPixelAlpha(q,ClampToQuantum(pixel));
+ SetPixelAlpha(image,ClampToQuantum(pixel),q);
p+=quantum_info->pad;
- q++;
+ q+=channels;
}
break;
}
@@ -2868,14 +1242,1641 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelBlue(image,ScaleAnyToQuantum(pixel,range),q);
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelGreen(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelGreen(image,ScaleAnyToQuantum(pixel,range),q);
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelBlue(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelRed(image,ScaleAnyToQuantum(pixel,range),q);
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelAlpha(q,ScaleAnyToQuantum(pixel,range));
- q++;
+ SetPixelAlpha(image,ScaleAnyToQuantum(pixel,range),q);
+ q+=channels;
+ }
+ break;
+ }
+ }
+ break;
+ }
+ case GrayQuantum:
+ {
+ switch (quantum_info->depth)
+ {
+ case 1:
+ {
+ register Quantum
+ black,
+ white;
+
+ black=0;
+ white=(Quantum) QuantumRange;
+ if (quantum_info->min_is_white != MagickFalse)
+ {
+ black=(Quantum) QuantumRange;
+ white=0;
+ }
+ for (x=0; x < ((ssize_t) number_pixels-7); x+=8)
+ {
+ for (bit=0; bit < 8; bit++)
+ {
+ SetPixelRed(image,((*p) & (1 << (7-bit))) == 0 ? black :
+ white,q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ q+=channels;
+ }
+ p++;
+ }
+ for (bit=0; bit < (ssize_t) (number_pixels % 8); bit++)
+ {
+ SetPixelRed(image,((*p) & (0x01 << (7-bit))) == 0 ? black :
+ white,q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ q+=channels;
+ }
+ if (bit != 0)
+ p++;
+ break;
+ }
+ case 4:
+ {
+ register unsigned char
+ pixel;
+
+ range=GetQuantumRange(image->depth);
+ for (x=0; x < ((ssize_t) number_pixels-1); x+=2)
+ {
+ pixel=(unsigned char) ((*p >> 4) & 0xf);
+ SetPixelRed(image,ScaleAnyToQuantum(pixel,range),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ q+=channels;
+ pixel=(unsigned char) ((*p) & 0xf);
+ SetPixelRed(image,ScaleAnyToQuantum(pixel,range),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ p++;
+ q+=channels;
+ }
+ for (bit=0; bit < (ssize_t) (number_pixels % 2); bit++)
+ {
+ pixel=(unsigned char) (*p++ >> 4);
+ SetPixelRed(image,ScaleAnyToQuantum(pixel,range),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ q+=channels;
+ }
+ break;
+ }
+ case 8:
+ {
+ unsigned char
+ pixel;
+
+ if (quantum_info->min_is_white != MagickFalse)
+ {
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushCharPixel(p,&pixel);
+ SetPixelRed(image,ScaleCharToQuantum(pixel),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ SetPixelAlpha(image,OpaqueAlpha,q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushCharPixel(p,&pixel);
+ SetPixelRed(image,ScaleCharToQuantum(pixel),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ SetPixelAlpha(image,OpaqueAlpha,q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ case 10:
+ {
+ range=GetQuantumRange(image->depth);
+ if (quantum_info->pack == MagickFalse)
+ {
+ if (image->endian != LSBEndian)
+ {
+ for (x=0; x < (ssize_t) (number_pixels-2); x+=3)
+ {
+ p=PushLongPixel(endian,p,&pixel);
+ SetPixelRed(image,ScaleAnyToQuantum((pixel >> 2) & 0x3ff,
+ range),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ q+=channels;
+ SetPixelRed(image,ScaleAnyToQuantum((pixel >> 12) & 0x3ff,
+ range),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ q+=channels;
+ SetPixelRed(image,ScaleAnyToQuantum((pixel >> 22) & 0x3ff,
+ range),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ p=PushLongPixel(endian,p,&pixel);
+ if (x++ < (ssize_t) (number_pixels-1))
+ {
+ SetPixelRed(image,ScaleAnyToQuantum((pixel >> 2) & 0x3ff,
+ range),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ q+=channels;
+ }
+ if (x++ < (ssize_t) number_pixels)
+ {
+ SetPixelRed(image,ScaleAnyToQuantum((pixel >> 12) & 0x3ff,
+ range),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ q+=channels;
+ }
+ break;
+ }
+ for (x=0; x < (ssize_t) (number_pixels-2); x+=3)
+ {
+ p=PushLongPixel(endian,p,&pixel);
+ SetPixelRed(image,ScaleAnyToQuantum((pixel >> 22) & 0x3ff,
+ range),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ q+=channels;
+ SetPixelRed(image,ScaleAnyToQuantum((pixel >> 12) & 0x3ff,
+ range),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ q+=channels;
+ SetPixelRed(image,ScaleAnyToQuantum((pixel >> 2) & 0x3ff,
+ range),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ p=PushLongPixel(endian,p,&pixel);
+ if (x++ < (ssize_t) (number_pixels-1))
+ {
+ SetPixelRed(image,ScaleAnyToQuantum((pixel >> 22) & 0x3ff,
+ range),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ q+=channels;
+ }
+ if (x++ < (ssize_t) number_pixels)
+ {
+ SetPixelRed(image,ScaleAnyToQuantum((pixel >> 12) & 0x3ff,
+ range),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ q+=channels;
+ }
+ break;
+ }
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
+ SetPixelRed(image,ScaleAnyToQuantum(pixel,range),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ case 12:
+ {
+ range=GetQuantumRange(image->depth);
+ if (quantum_info->pack == MagickFalse)
+ {
+ unsigned short
+ pixel;
+
+ for (x=0; x < (ssize_t) (number_pixels-1); x+=2)
+ {
+ p=PushShortPixel(endian,p,&pixel);
+ SetPixelRed(image,ScaleAnyToQuantum((QuantumAny)
+ (pixel >> 4),range),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ q+=channels;
+ p=PushShortPixel(endian,p,&pixel);
+ SetPixelRed(image,ScaleAnyToQuantum(
+ (QuantumAny) (pixel >> 4),range),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ for (bit=0; bit < (ssize_t) (number_pixels % 2); bit++)
+ {
+ p=PushShortPixel(endian,p,&pixel);
+ SetPixelRed(image,ScaleAnyToQuantum(
+ (QuantumAny) (pixel >> 4),range),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ if (bit != 0)
+ p++;
+ break;
+ }
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
+ SetPixelRed(image,ScaleAnyToQuantum(pixel,range),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ case 16:
+ {
+ unsigned short
+ pixel;
+
+ if (quantum_info->min_is_white != MagickFalse)
+ {
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushShortPixel(endian,p,&pixel);
+ SetPixelRed(image,ScaleShortToQuantum(pixel),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ if (quantum_info->format == FloatingPointQuantumFormat)
+ {
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushShortPixel(endian,p,&pixel);
+ SetPixelRed(image,ClampToQuantum((MagickRealType)
+ QuantumRange*HalfToSinglePrecision(pixel)),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushShortPixel(endian,p,&pixel);
+ SetPixelRed(image,ScaleShortToQuantum(pixel),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ case 32:
+ {
+ unsigned int
+ pixel;
+
+ if (quantum_info->format == FloatingPointQuantumFormat)
+ {
+ float
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushFloatPixel(&quantum_state,p,&pixel);
+ SetPixelRed(image,ClampToQuantum(pixel),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushLongPixel(endian,p,&pixel);
+ SetPixelRed(image,ScaleLongToQuantum(pixel),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ case 64:
+ {
+ if (quantum_info->format == FloatingPointQuantumFormat)
+ {
+ double
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushDoublePixel(&quantum_state,p,&pixel);
+ SetPixelRed(image,ClampToQuantum(pixel),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ }
+ default:
+ {
+ range=GetQuantumRange(image->depth);
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
+ SetPixelRed(image,ScaleAnyToQuantum(pixel,range),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ }
+ break;
+ }
+ case GrayAlphaQuantum:
+ {
+ switch (quantum_info->depth)
+ {
+ case 1:
+ {
+ register unsigned char
+ pixel;
+
+ for (x=0; x < ((ssize_t) number_pixels-3); x+=4)
+ {
+ for (bit=0; bit < 8; bit+=2)
+ {
+ pixel=(unsigned char)
+ (((*p) & (1 << (7-bit))) != 0 ? 0x00 : 0x01);
+ SetPixelRed(image,(Quantum) (pixel == 0 ? 0 : QuantumRange),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ SetPixelAlpha(image,((*p) & (1UL << (unsigned char)
+ (6-bit))) == 0 ? TransparentAlpha : OpaqueAlpha,q);
+ q+=channels;
+ }
+ p++;
+ }
+ for (bit=0; bit <= (ssize_t) (number_pixels % 4); bit+=2)
+ {
+ pixel=(unsigned char) (((*p) & (1 << (7-bit))) != 0 ? 0x00 : 0x01);
+ SetPixelRed(image,(Quantum) (pixel != 0 ? 0 : QuantumRange),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ SetPixelAlpha(image,((*p) & (1UL << (unsigned char)
+ (6-bit))) == 0 ? TransparentAlpha : OpaqueAlpha,q);
+ q+=channels;
+ }
+ if (bit != 0)
+ p++;
+ break;
+ }
+ case 4:
+ {
+ register unsigned char
+ pixel;
+
+ range=GetQuantumRange(image->depth);
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ pixel=(unsigned char) ((*p >> 4) & 0xf);
+ SetPixelRed(image,ScaleAnyToQuantum(pixel,range),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ pixel=(unsigned char) ((*p) & 0xf);
+ SetPixelAlpha(image,ScaleAnyToQuantum(pixel,range),q);
+ p++;
+ q+=channels;
+ }
+ break;
+ }
+ case 8:
+ {
+ unsigned char
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushCharPixel(p,&pixel);
+ SetPixelRed(image,ScaleCharToQuantum(pixel),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ p=PushCharPixel(p,&pixel);
+ SetPixelAlpha(image,ScaleCharToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ case 10:
+ {
+ range=GetQuantumRange(image->depth);
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
+ SetPixelRed(image,ScaleAnyToQuantum(pixel,range),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
+ SetPixelAlpha(image,ScaleAnyToQuantum(pixel,range),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ case 12:
+ {
+ range=GetQuantumRange(image->depth);
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
+ SetPixelRed(image,ScaleAnyToQuantum(pixel,range),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
+ SetPixelAlpha(image,ScaleAnyToQuantum(pixel,range),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ case 16:
+ {
+ unsigned short
+ pixel;
+
+ if (quantum_info->format == FloatingPointQuantumFormat)
+ {
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushShortPixel(endian,p,&pixel);
+ SetPixelRed(image,ClampToQuantum((MagickRealType)
+ QuantumRange*HalfToSinglePrecision(pixel)),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ p=PushShortPixel(endian,p,&pixel);
+ SetPixelAlpha(image,ClampToQuantum((MagickRealType)
+ QuantumRange*HalfToSinglePrecision(pixel)),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushShortPixel(endian,p,&pixel);
+ SetPixelRed(image,ScaleShortToQuantum(pixel),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ p=PushShortPixel(endian,p,&pixel);
+ SetPixelAlpha(image,ScaleShortToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ case 32:
+ {
+ unsigned int
+ pixel;
+
+ if (quantum_info->format == FloatingPointQuantumFormat)
+ {
+ float
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushFloatPixel(&quantum_state,p,&pixel);
+ SetPixelRed(image,ClampToQuantum(pixel),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ p=PushFloatPixel(&quantum_state,p,&pixel);
+ SetPixelAlpha(image,ClampToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushLongPixel(endian,p,&pixel);
+ SetPixelRed(image,ScaleLongToQuantum(pixel),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ p=PushLongPixel(endian,p,&pixel);
+ SetPixelAlpha(image,ScaleLongToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ case 64:
+ {
+ if (quantum_info->format == FloatingPointQuantumFormat)
+ {
+ double
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushDoublePixel(&quantum_state,p,&pixel);
+ SetPixelRed(image,ClampToQuantum(pixel),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ p=PushDoublePixel(&quantum_state,p,&pixel);
+ SetPixelAlpha(image,ClampToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ }
+ default:
+ {
+ range=GetQuantumRange(image->depth);
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
+ SetPixelRed(image,ScaleAnyToQuantum(pixel,range),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
+ SetPixelAlpha(image,ScaleAnyToQuantum(pixel,range),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ }
+ break;
+ }
+ case RedQuantum:
+ case CyanQuantum:
+ {
+ switch (quantum_info->depth)
+ {
+ case 8:
+ {
+ unsigned char
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushCharPixel(p,&pixel);
+ SetPixelRed(image,ScaleCharToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ case 16:
+ {
+ unsigned short
+ pixel;
+
+ if (quantum_info->format == FloatingPointQuantumFormat)
+ {
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushShortPixel(endian,p,&pixel);
+ SetPixelRed(image,ClampToQuantum((MagickRealType)
+ QuantumRange*HalfToSinglePrecision(pixel)),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushShortPixel(endian,p,&pixel);
+ SetPixelRed(image,ScaleShortToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ case 32:
+ {
+ unsigned int
+ pixel;
+
+ if (quantum_info->format == FloatingPointQuantumFormat)
+ {
+ float
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushFloatPixel(&quantum_state,p,&pixel);
+ SetPixelRed(image,ClampToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushLongPixel(endian,p,&pixel);
+ SetPixelRed(image,ScaleLongToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ case 64:
+ {
+ if (quantum_info->format == FloatingPointQuantumFormat)
+ {
+ double
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushDoublePixel(&quantum_state,p,&pixel);
+ SetPixelRed(image,ClampToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ }
+ default:
+ {
+ range=GetQuantumRange(image->depth);
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
+ SetPixelRed(image,ScaleAnyToQuantum(pixel,range),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ }
+ break;
+ }
+ case GreenQuantum:
+ case MagentaQuantum:
+ {
+ switch (quantum_info->depth)
+ {
+ case 8:
+ {
+ unsigned char
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushCharPixel(p,&pixel);
+ SetPixelGreen(image,ScaleCharToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ case 16:
+ {
+ unsigned short
+ pixel;
+
+ if (quantum_info->format == FloatingPointQuantumFormat)
+ {
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushShortPixel(endian,p,&pixel);
+ SetPixelGreen(image,ClampToQuantum((MagickRealType)
+ QuantumRange*HalfToSinglePrecision(pixel)),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushShortPixel(endian,p,&pixel);
+ SetPixelGreen(image,ScaleShortToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ case 32:
+ {
+ unsigned int
+ pixel;
+
+ if (quantum_info->format == FloatingPointQuantumFormat)
+ {
+ float
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushFloatPixel(&quantum_state,p,&pixel);
+ SetPixelGreen(image,ClampToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushLongPixel(endian,p,&pixel);
+ SetPixelGreen(image,ScaleLongToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ case 64:
+ {
+ if (quantum_info->format == FloatingPointQuantumFormat)
+ {
+ double
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushDoublePixel(&quantum_state,p,&pixel);
+ SetPixelGreen(image,ClampToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ }
+ default:
+ {
+ range=GetQuantumRange(image->depth);
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
+ SetPixelGreen(image,ScaleAnyToQuantum(pixel,range),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ }
+ break;
+ }
+ case BlueQuantum:
+ case YellowQuantum:
+ {
+ switch (quantum_info->depth)
+ {
+ case 8:
+ {
+ unsigned char
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushCharPixel(p,&pixel);
+ SetPixelBlue(image,ScaleCharToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ case 16:
+ {
+ unsigned short
+ pixel;
+
+ if (quantum_info->format == FloatingPointQuantumFormat)
+ {
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushShortPixel(endian,p,&pixel);
+ SetPixelBlue(image,ClampToQuantum((MagickRealType)
+ QuantumRange*HalfToSinglePrecision(pixel)),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushShortPixel(endian,p,&pixel);
+ SetPixelBlue(image,ScaleShortToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ case 32:
+ {
+ unsigned int
+ pixel;
+
+ if (quantum_info->format == FloatingPointQuantumFormat)
+ {
+ float
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushFloatPixel(&quantum_state,p,&pixel);
+ SetPixelBlue(image,ClampToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushLongPixel(endian,p,&pixel);
+ SetPixelBlue(image,ScaleLongToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ case 64:
+ {
+ if (quantum_info->format == FloatingPointQuantumFormat)
+ {
+ double
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushDoublePixel(&quantum_state,p,&pixel);
+ SetPixelBlue(image,ClampToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ }
+ default:
+ {
+ range=GetQuantumRange(image->depth);
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
+ SetPixelBlue(image,ScaleAnyToQuantum(pixel,range),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ }
+ break;
+ }
+ case AlphaQuantum:
+ {
+ switch (quantum_info->depth)
+ {
+ case 8:
+ {
+ unsigned char
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushCharPixel(p,&pixel);
+ SetPixelAlpha(image,ScaleCharToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ case 16:
+ {
+ unsigned short
+ pixel;
+
+ if (quantum_info->format == FloatingPointQuantumFormat)
+ {
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushShortPixel(endian,p,&pixel);
+ SetPixelAlpha(image,ClampToQuantum((MagickRealType)
+ QuantumRange*HalfToSinglePrecision(pixel)),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushShortPixel(endian,p,&pixel);
+ SetPixelAlpha(image,ScaleShortToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ case 32:
+ {
+ unsigned int
+ pixel;
+
+ if (quantum_info->format == FloatingPointQuantumFormat)
+ {
+ float
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushFloatPixel(&quantum_state,p,&pixel);
+ SetPixelAlpha(image,ClampToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushLongPixel(endian,p,&pixel);
+ SetPixelAlpha(image,ScaleLongToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ case 64:
+ {
+ if (quantum_info->format == FloatingPointQuantumFormat)
+ {
+ double
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushDoublePixel(&quantum_state,p,&pixel);
+ SetPixelAlpha(image,ClampToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ }
+ default:
+ {
+ range=GetQuantumRange(image->depth);
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
+ SetPixelAlpha(image,ScaleAnyToQuantum(pixel,range),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ }
+ break;
+ }
+ case BlackQuantum:
+ {
+ if (image->colorspace != CMYKColorspace)
+ {
+ (void) ThrowMagickException(exception,GetMagickModule(),ImageError,
+ "ColorSeparatedImageRequired","`%s'",image->filename);
+ return(extent);
+ }
+ switch (quantum_info->depth)
+ {
+ case 8:
+ {
+ unsigned char
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushCharPixel(p,&pixel);
+ SetPixelBlack(image,ScaleCharToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ case 16:
+ {
+ unsigned short
+ pixel;
+
+ if (quantum_info->format == FloatingPointQuantumFormat)
+ {
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushShortPixel(endian,p,&pixel);
+ SetPixelBlack(image,ClampToQuantum((MagickRealType)
+ QuantumRange*HalfToSinglePrecision(pixel)),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushShortPixel(endian,p,&pixel);
+ SetPixelBlack(image,ScaleShortToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ case 32:
+ {
+ unsigned int
+ pixel;
+
+ if (quantum_info->format == FloatingPointQuantumFormat)
+ {
+ float
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushFloatPixel(&quantum_state,p,&pixel);
+ SetPixelBlack(image,ClampToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushLongPixel(endian,p,&pixel);
+ SetPixelBlack(image,ScaleLongToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ case 64:
+ {
+ if (quantum_info->format == FloatingPointQuantumFormat)
+ {
+ double
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushDoublePixel(&quantum_state,p,&pixel);
+ SetPixelBlack(image,ClampToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ }
+ default:
+ {
+ range=GetQuantumRange(image->depth);
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
+ SetPixelBlack(image,ScaleAnyToQuantum(pixel,range),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ }
+ break;
+ }
+ case RGBQuantum:
+ case CbYCrQuantum:
+ {
+ switch (quantum_info->depth)
+ {
+ case 8:
+ {
+ unsigned char
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushCharPixel(p,&pixel);
+ SetPixelRed(image,ScaleCharToQuantum(pixel),q);
+ p=PushCharPixel(p,&pixel);
+ SetPixelGreen(image,ScaleCharToQuantum(pixel),q);
+ p=PushCharPixel(p,&pixel);
+ SetPixelBlue(image,ScaleCharToQuantum(pixel),q);
+ SetPixelAlpha(image,OpaqueAlpha,q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ case 10:
+ {
+ range=GetQuantumRange(image->depth);
+ if (quantum_info->pack == MagickFalse)
+ {
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushLongPixel(endian,p,&pixel);
+ SetPixelRed(image,ScaleAnyToQuantum((pixel >> 22) & 0x3ff,
+ range),q);
+ SetPixelGreen(image,ScaleAnyToQuantum((pixel >> 12) & 0x3ff,
+ range),q);
+ SetPixelBlue(image,ScaleAnyToQuantum((pixel >> 2) & 0x3ff,
+ range),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ if (quantum_info->quantum == 32U)
+ {
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushQuantumLongPixel(&quantum_state,image->depth,p,&pixel);
+ SetPixelRed(image,ScaleAnyToQuantum(pixel,range),q);
+ p=PushQuantumLongPixel(&quantum_state,image->depth,p,&pixel);
+ SetPixelGreen(image,ScaleAnyToQuantum(pixel,range),q);
+ p=PushQuantumLongPixel(&quantum_state,image->depth,p,&pixel);
+ SetPixelBlue(image,ScaleAnyToQuantum(pixel,range),q);
+ q+=channels;
+ }
+ break;
+ }
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
+ SetPixelRed(image,ScaleAnyToQuantum(pixel,range),q);
+ p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
+ SetPixelGreen(image,ScaleAnyToQuantum(pixel,range),q);
+ p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
+ SetPixelBlue(image,ScaleAnyToQuantum(pixel,range),q);
+ q+=channels;
+ }
+ break;
+ }
+ case 12:
+ {
+ range=GetQuantumRange(image->depth);
+ if (quantum_info->pack == MagickFalse)
+ {
+ unsigned short
+ pixel;
+
+ for (x=0; x < (ssize_t) (3*number_pixels-1); x+=2)
+ {
+ p=PushShortPixel(endian,p,&pixel);
+ switch (x % 3)
+ {
+ default:
+ case 0:
+ {
+ SetPixelRed(image,ScaleAnyToQuantum((QuantumAny)
+ (pixel >> 4),range),q);
+ break;
+ }
+ case 1:
+ {
+ SetPixelGreen(image,ScaleAnyToQuantum((QuantumAny)
+ (pixel >> 4),range),q);
+ break;
+ }
+ case 2:
+ {
+ SetPixelBlue(image,ScaleAnyToQuantum((QuantumAny)
+ (pixel >> 4),range),q);
+ q+=channels;
+ break;
+ }
+ }
+ p=PushShortPixel(endian,p,&pixel);
+ switch ((x+1) % 3)
+ {
+ default:
+ case 0:
+ {
+ SetPixelRed(image,ScaleAnyToQuantum((QuantumAny)
+ (pixel >> 4),range),q);
+ break;
+ }
+ case 1:
+ {
+ SetPixelGreen(image,ScaleAnyToQuantum((QuantumAny)
+ (pixel >> 4),range),q);
+ break;
+ }
+ case 2:
+ {
+ SetPixelBlue(image,ScaleAnyToQuantum((QuantumAny)
+ (pixel >> 4),range),q);
+ q+=channels;
+ break;
+ }
+ }
+ p+=quantum_info->pad;
+ }
+ for (bit=0; bit < (ssize_t) (3*number_pixels % 2); bit++)
+ {
+ p=PushShortPixel(endian,p,&pixel);
+ switch ((x+bit) % 3)
+ {
+ default:
+ case 0:
+ {
+ SetPixelRed(image,ScaleAnyToQuantum((QuantumAny)
+ (pixel >> 4),range),q);
+ break;
+ }
+ case 1:
+ {
+ SetPixelGreen(image,ScaleAnyToQuantum((QuantumAny)
+ (pixel >> 4),range),q);
+ break;
+ }
+ case 2:
+ {
+ SetPixelBlue(image,ScaleAnyToQuantum((QuantumAny)
+ (pixel >> 4),range),q);
+ q+=channels;
+ break;
+ }
+ }
+ p+=quantum_info->pad;
+ }
+ if (bit != 0)
+ p++;
+ break;
+ }
+ if (quantum_info->quantum == 32U)
+ {
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushQuantumLongPixel(&quantum_state,image->depth,p,&pixel);
+ SetPixelRed(image,ScaleAnyToQuantum(pixel,range),q);
+ p=PushQuantumLongPixel(&quantum_state,image->depth,p,&pixel);
+ SetPixelGreen(image,ScaleAnyToQuantum(pixel,range),q);
+ p=PushQuantumLongPixel(&quantum_state,image->depth,p,&pixel);
+ SetPixelBlue(image,ScaleAnyToQuantum(pixel,range),q);
+ q+=channels;
+ }
+ break;
+ }
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
+ SetPixelRed(image,ScaleAnyToQuantum(pixel,range),q);
+ p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
+ SetPixelGreen(image,ScaleAnyToQuantum(pixel,range),q);
+ p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
+ SetPixelBlue(image,ScaleAnyToQuantum(pixel,range),q);
+ q+=channels;
+ }
+ break;
+ }
+ case 16:
+ {
+ unsigned short
+ pixel;
+
+ if (quantum_info->format == FloatingPointQuantumFormat)
+ {
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushShortPixel(endian,p,&pixel);
+ SetPixelRed(image,ClampToQuantum((MagickRealType)
+ QuantumRange*HalfToSinglePrecision(pixel)),q);
+ p=PushShortPixel(endian,p,&pixel);
+ SetPixelGreen(image,ClampToQuantum((MagickRealType)
+ QuantumRange*HalfToSinglePrecision(pixel)),q);
+ p=PushShortPixel(endian,p,&pixel);
+ SetPixelBlue(image,ClampToQuantum((MagickRealType)
+ QuantumRange*HalfToSinglePrecision(pixel)),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushShortPixel(endian,p,&pixel);
+ SetPixelRed(image,ScaleShortToQuantum(pixel),q);
+ p=PushShortPixel(endian,p,&pixel);
+ SetPixelGreen(image,ScaleShortToQuantum(pixel),q);
+ p=PushShortPixel(endian,p,&pixel);
+ SetPixelBlue(image,ScaleShortToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ case 32:
+ {
+ unsigned int
+ pixel;
+
+ if (quantum_info->format == FloatingPointQuantumFormat)
+ {
+ float
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushFloatPixel(&quantum_state,p,&pixel);
+ SetPixelRed(image,ClampToQuantum(pixel),q);
+ p=PushFloatPixel(&quantum_state,p,&pixel);
+ SetPixelGreen(image,ClampToQuantum(pixel),q);
+ p=PushFloatPixel(&quantum_state,p,&pixel);
+ SetPixelBlue(image,ClampToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushLongPixel(endian,p,&pixel);
+ SetPixelRed(image,ScaleLongToQuantum(pixel),q);
+ p=PushLongPixel(endian,p,&pixel);
+ SetPixelGreen(image,ScaleLongToQuantum(pixel),q);
+ p=PushLongPixel(endian,p,&pixel);
+ SetPixelBlue(image,ScaleLongToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ case 64:
+ {
+ if (quantum_info->format == FloatingPointQuantumFormat)
+ {
+ double
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushDoublePixel(&quantum_state,p,&pixel);
+ SetPixelRed(image,ClampToQuantum(pixel),q);
+ p=PushDoublePixel(&quantum_state,p,&pixel);
+ SetPixelGreen(image,ClampToQuantum(pixel),q);
+ p=PushDoublePixel(&quantum_state,p,&pixel);
+ SetPixelBlue(image,ClampToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ }
+ default:
+ {
+ range=GetQuantumRange(image->depth);
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
+ SetPixelRed(image,ScaleAnyToQuantum(pixel,range),q);
+ p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
+ SetPixelGreen(image,ScaleAnyToQuantum(pixel,range),q);
+ p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
+ SetPixelBlue(image,ScaleAnyToQuantum(pixel,range),q);
+ q+=channels;
+ }
+ break;
+ }
+ }
+ break;
+ }
+ case RGBAQuantum:
+ case RGBOQuantum:
+ case CbYCrAQuantum:
+ {
+ switch (quantum_info->depth)
+ {
+ case 8:
+ {
+ unsigned char
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushCharPixel(p,&pixel);
+ SetPixelRed(image,ScaleCharToQuantum(pixel),q);
+ p=PushCharPixel(p,&pixel);
+ SetPixelGreen(image,ScaleCharToQuantum(pixel),q);
+ p=PushCharPixel(p,&pixel);
+ SetPixelBlue(image,ScaleCharToQuantum(pixel),q);
+ p=PushCharPixel(p,&pixel);
+ SetPixelAlpha(image,ScaleCharToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ case 10:
+ {
+ pixel=0;
+ if (quantum_info->pack == MagickFalse)
+ {
+ register ssize_t
+ i;
+
+ size_t
+ quantum;
+
+ ssize_t
+ n;
+
+ n=0;
+ quantum=0;
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ for (i=0; i < 4; i++)
+ {
+ switch (n % 3)
+ {
+ case 0:
+ {
+ p=PushLongPixel(endian,p,&pixel);
+ quantum=(size_t) (ScaleShortToQuantum((unsigned short)
+ (((pixel >> 22) & 0x3ff) << 6)));
+ break;
+ }
+ case 1:
+ {
+ quantum=(size_t) (ScaleShortToQuantum((unsigned short)
+ (((pixel >> 12) & 0x3ff) << 6)));
+ break;
+ }
+ case 2:
+ {
+ quantum=(size_t) (ScaleShortToQuantum((unsigned short)
+ (((pixel >> 2) & 0x3ff) << 6)));
+ break;
+ }
+ }
+ switch (i)
+ {
+ case 0: SetPixelRed(image,(Quantum) quantum,q); break;
+ case 1: SetPixelGreen(image,(Quantum) quantum,q); break;
+ case 2: SetPixelBlue(image,(Quantum) quantum,q); break;
+ case 3: SetPixelAlpha(image,(Quantum) quantum,q); break;
+ }
+ n++;
+ }
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
+ SetPixelRed(image,ScaleShortToQuantum((unsigned short)
+ (pixel << 6)),q);
+ p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
+ SetPixelGreen(image,ScaleShortToQuantum((unsigned short)
+ (pixel << 6)),q);
+ p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
+ SetPixelBlue(image,ScaleShortToQuantum((unsigned short)
+ (pixel << 6)),q);
+ p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
+ SetPixelAlpha(image,ScaleShortToQuantum((unsigned short)
+ (pixel << 6)),q);
+ q+=channels;
+ }
+ break;
+ }
+ case 16:
+ {
+ unsigned short
+ pixel;
+
+ if (quantum_info->format == FloatingPointQuantumFormat)
+ {
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushShortPixel(endian,p,&pixel);
+ SetPixelRed(image,ClampToQuantum((MagickRealType)
+ QuantumRange*HalfToSinglePrecision(pixel)),q);
+ p=PushShortPixel(endian,p,&pixel);
+ SetPixelGreen(image,ClampToQuantum((MagickRealType)
+ QuantumRange*HalfToSinglePrecision(pixel)),q);
+ p=PushShortPixel(endian,p,&pixel);
+ SetPixelBlue(image,ClampToQuantum((MagickRealType)
+ QuantumRange*HalfToSinglePrecision(pixel)),q);
+ p=PushShortPixel(endian,p,&pixel);
+ SetPixelAlpha(image,ClampToQuantum((MagickRealType)
+ QuantumRange*HalfToSinglePrecision(pixel)),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushShortPixel(endian,p,&pixel);
+ SetPixelRed(image,ScaleShortToQuantum(pixel),q);
+ p=PushShortPixel(endian,p,&pixel);
+ SetPixelGreen(image,ScaleShortToQuantum(pixel),q);
+ p=PushShortPixel(endian,p,&pixel);
+ SetPixelBlue(image,ScaleShortToQuantum(pixel),q);
+ p=PushShortPixel(endian,p,&pixel);
+ SetPixelAlpha(image,ScaleShortToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ case 32:
+ {
+ unsigned int
+ pixel;
+
+ if (quantum_info->format == FloatingPointQuantumFormat)
+ {
+ float
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushFloatPixel(&quantum_state,p,&pixel);
+ SetPixelRed(image,ClampToQuantum(pixel),q);
+ p=PushFloatPixel(&quantum_state,p,&pixel);
+ SetPixelGreen(image,ClampToQuantum(pixel),q);
+ p=PushFloatPixel(&quantum_state,p,&pixel);
+ SetPixelBlue(image,ClampToQuantum(pixel),q);
+ p=PushFloatPixel(&quantum_state,p,&pixel);
+ SetPixelAlpha(image,ClampToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushLongPixel(endian,p,&pixel);
+ SetPixelRed(image,ScaleLongToQuantum(pixel),q);
+ p=PushLongPixel(endian,p,&pixel);
+ SetPixelGreen(image,ScaleLongToQuantum(pixel),q);
+ p=PushLongPixel(endian,p,&pixel);
+ SetPixelBlue(image,ScaleLongToQuantum(pixel),q);
+ p=PushLongPixel(endian,p,&pixel);
+ SetPixelAlpha(image,ScaleLongToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ case 64:
+ {
+ if (quantum_info->format == FloatingPointQuantumFormat)
+ {
+ double
+ pixel;
+
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushDoublePixel(&quantum_state,p,&pixel);
+ SetPixelRed(image,ClampToQuantum(pixel),q);
+ p=PushDoublePixel(&quantum_state,p,&pixel);
+ SetPixelGreen(image,ClampToQuantum(pixel),q);
+ p=PushDoublePixel(&quantum_state,p,&pixel);
+ SetPixelBlue(image,ClampToQuantum(pixel),q);
+ p=PushDoublePixel(&quantum_state,p,&pixel);
+ SetPixelAlpha(image,ClampToQuantum(pixel),q);
+ p+=quantum_info->pad;
+ q+=channels;
+ }
+ break;
+ }
+ }
+ default:
+ {
+ range=GetQuantumRange(image->depth);
+ for (x=0; x < (ssize_t) number_pixels; x++)
+ {
+ p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
+ SetPixelRed(image,ScaleAnyToQuantum(pixel,range),q);
+ p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
+ SetPixelGreen(image,ScaleAnyToQuantum(pixel,range),q);
+ p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
+ SetPixelBlue(image,ScaleAnyToQuantum(pixel,range),q);
+ p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
+ SetPixelAlpha(image,ScaleAnyToQuantum(pixel,range),q);
+ q+=channels;
}
break;
}
@@ -2900,15 +2901,15 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushCharPixel(p,&pixel);
- SetPixelRed(q,ScaleCharToQuantum(pixel));
+ SetPixelRed(image,ScaleCharToQuantum(pixel),q);
p=PushCharPixel(p,&pixel);
- SetPixelGreen(q,ScaleCharToQuantum(pixel));
+ SetPixelGreen(image,ScaleCharToQuantum(pixel),q);
p=PushCharPixel(p,&pixel);
- SetPixelBlue(q,ScaleCharToQuantum(pixel));
+ SetPixelBlue(image,ScaleCharToQuantum(pixel),q);
p=PushCharPixel(p,&pixel);
- SetPixelIndex(indexes+x,ScaleCharToQuantum(pixel));
+ SetPixelBlack(image,ScaleCharToQuantum(pixel),q);
p+=quantum_info->pad;
- q++;
+ q+=channels;
}
break;
}
@@ -2922,34 +2923,34 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushShortPixel(endian,p,&pixel);
- SetPixelRed(q,ClampToQuantum((MagickRealType)
- QuantumRange*HalfToSinglePrecision(pixel)));
+ SetPixelRed(image,ClampToQuantum((MagickRealType)
+ QuantumRange*HalfToSinglePrecision(pixel)),q);
p=PushShortPixel(endian,p,&pixel);
- SetPixelGreen(q,ClampToQuantum((MagickRealType)
- QuantumRange*HalfToSinglePrecision(pixel)));
+ SetPixelGreen(image,ClampToQuantum((MagickRealType)
+ QuantumRange*HalfToSinglePrecision(pixel)),q);
p=PushShortPixel(endian,p,&pixel);
- SetPixelBlue(q,ClampToQuantum((MagickRealType)
- QuantumRange*HalfToSinglePrecision(pixel)));
+ SetPixelBlue(image,ClampToQuantum((MagickRealType)
+ QuantumRange*HalfToSinglePrecision(pixel)),q);
p=PushShortPixel(endian,p,&pixel);
- SetPixelIndex(indexes+x,ClampToQuantum(
- (MagickRealType) QuantumRange*HalfToSinglePrecision(pixel)));
+ SetPixelBlack(image,ClampToQuantum((MagickRealType)
+ QuantumRange*HalfToSinglePrecision(pixel)),q);
p+=quantum_info->pad;
- q++;
+ q+=channels;
}
break;
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushShortPixel(endian,p,&pixel);
- SetPixelRed(q,ScaleShortToQuantum(pixel));
+ SetPixelRed(image,ScaleShortToQuantum(pixel),q);
p=PushShortPixel(endian,p,&pixel);
- SetPixelGreen(q,ScaleShortToQuantum(pixel));
+ SetPixelGreen(image,ScaleShortToQuantum(pixel),q);
p=PushShortPixel(endian,p,&pixel);
- SetPixelBlue(q,ScaleShortToQuantum(pixel));
+ SetPixelBlue(image,ScaleShortToQuantum(pixel),q);
p=PushShortPixel(endian,p,&pixel);
- SetPixelIndex(indexes+x,ScaleShortToQuantum(pixel));
+ SetPixelBlack(image,ScaleShortToQuantum(pixel),q);
p+=quantum_info->pad;
- q++;
+ q+=channels;
}
break;
}
@@ -2966,30 +2967,30 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushFloatPixel(&quantum_state,p,&pixel);
- SetPixelRed(q,ClampToQuantum(pixel));
+ SetPixelRed(image,ClampToQuantum(pixel),q);
p=PushFloatPixel(&quantum_state,p,&pixel);
- SetPixelGreen(q,ClampToQuantum(pixel));
+ SetPixelGreen(image,ClampToQuantum(pixel),q);
p=PushFloatPixel(&quantum_state,p,&pixel);
- SetPixelBlue(q,ClampToQuantum(pixel));
+ SetPixelBlue(image,ClampToQuantum(pixel),q);
p=PushFloatPixel(&quantum_state,p,&pixel);
- SetPixelIndex(indexes+x,ClampToQuantum(pixel));
+ SetPixelBlack(image,ClampToQuantum(pixel),q);
p+=quantum_info->pad;
- q++;
+ q+=channels;
}
break;
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushLongPixel(endian,p,&pixel);
- SetPixelRed(q,ScaleLongToQuantum(pixel));
+ SetPixelRed(image,ScaleLongToQuantum(pixel),q);
p=PushLongPixel(endian,p,&pixel);
- SetPixelGreen(q,ScaleLongToQuantum(pixel));
+ SetPixelGreen(image,ScaleLongToQuantum(pixel),q);
p=PushLongPixel(endian,p,&pixel);
- SetPixelBlue(q,ScaleLongToQuantum(pixel));
+ SetPixelBlue(image,ScaleLongToQuantum(pixel),q);
p=PushLongPixel(endian,p,&pixel);
- SetPixelIndex(indexes+x,ScaleLongToQuantum(pixel));
+ SetPixelBlack(image,ScaleLongToQuantum(pixel),q);
p+=quantum_info->pad;
- q++;
+ q+=channels;
}
break;
}
@@ -3003,15 +3004,15 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushDoublePixel(&quantum_state,p,&pixel);
- SetPixelRed(q,ClampToQuantum(pixel));
+ SetPixelRed(image,ClampToQuantum(pixel),q);
p=PushDoublePixel(&quantum_state,p,&pixel);
- SetPixelGreen(q,ClampToQuantum(pixel));
+ SetPixelGreen(image,ClampToQuantum(pixel),q);
p=PushDoublePixel(&quantum_state,p,&pixel);
- SetPixelBlue(q,ClampToQuantum(pixel));
+ SetPixelBlue(image,ClampToQuantum(pixel),q);
p=PushDoublePixel(&quantum_state,p,&pixel);
- SetPixelIndex(indexes+x,ClampToQuantum(pixel));
+ SetPixelBlack(image,ClampToQuantum(pixel),q);
p+=quantum_info->pad;
- q++;
+ q+=channels;
}
break;
}
@@ -3022,14 +3023,14 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelRed(image,ScaleAnyToQuantum(pixel,range),q);
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelGreen(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelGreen(image,ScaleAnyToQuantum(pixel,range),q);
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelBlue(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelBlue(image,ScaleAnyToQuantum(pixel,range),q);
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelIndex(indexes+x,ScaleAnyToQuantum(pixel,range));
- q++;
+ SetPixelBlack(image,ScaleAnyToQuantum(pixel,range),q);
+ q+=channels;
}
break;
}
@@ -3055,17 +3056,17 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushCharPixel(p,&pixel);
- SetPixelRed(q,ScaleCharToQuantum(pixel));
+ SetPixelRed(image,ScaleCharToQuantum(pixel),q);
p=PushCharPixel(p,&pixel);
- SetPixelGreen(q,ScaleCharToQuantum(pixel));
+ SetPixelGreen(image,ScaleCharToQuantum(pixel),q);
p=PushCharPixel(p,&pixel);
- SetPixelBlue(q,ScaleCharToQuantum(pixel));
+ SetPixelBlue(image,ScaleCharToQuantum(pixel),q);
p=PushCharPixel(p,&pixel);
- SetPixelIndex(indexes+x,ScaleCharToQuantum(pixel));
+ SetPixelBlack(image,ScaleCharToQuantum(pixel),q);
p=PushCharPixel(p,&pixel);
- SetPixelAlpha(q,ScaleCharToQuantum(pixel));
+ SetPixelAlpha(image,ScaleCharToQuantum(pixel),q);
p+=quantum_info->pad;
- q++;
+ q+=channels;
}
break;
}
@@ -3079,39 +3080,39 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushShortPixel(endian,p,&pixel);
- SetPixelRed(q,ClampToQuantum((MagickRealType)
- QuantumRange*HalfToSinglePrecision(pixel)));
+ SetPixelRed(image,ClampToQuantum((MagickRealType)
+ QuantumRange*HalfToSinglePrecision(pixel)),q);
p=PushShortPixel(endian,p,&pixel);
- SetPixelGreen(q,ClampToQuantum((MagickRealType)
- QuantumRange*HalfToSinglePrecision(pixel)));
+ SetPixelGreen(image,ClampToQuantum((MagickRealType)
+ QuantumRange*HalfToSinglePrecision(pixel)),q);
p=PushShortPixel(endian,p,&pixel);
- SetPixelBlue(q,ClampToQuantum((MagickRealType)
- QuantumRange*HalfToSinglePrecision(pixel)));
+ SetPixelBlue(image,ClampToQuantum((MagickRealType)
+ QuantumRange*HalfToSinglePrecision(pixel)),q);
p=PushShortPixel(endian,p,&pixel);
- SetPixelIndex(indexes+x,ClampToQuantum(
- (MagickRealType) QuantumRange*HalfToSinglePrecision(pixel)));
+ SetPixelBlack(image,ClampToQuantum((MagickRealType)
+ QuantumRange*HalfToSinglePrecision(pixel)),q);
p=PushShortPixel(endian,p,&pixel);
- SetPixelAlpha(q,ClampToQuantum((MagickRealType)
- QuantumRange*HalfToSinglePrecision(pixel)));
+ SetPixelAlpha(image,ClampToQuantum((MagickRealType)
+ QuantumRange*HalfToSinglePrecision(pixel)),q);
p+=quantum_info->pad;
- q++;
+ q+=channels;
}
break;
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushShortPixel(endian,p,&pixel);
- SetPixelRed(q,ScaleShortToQuantum(pixel));
+ SetPixelRed(image,ScaleShortToQuantum(pixel),q);
p=PushShortPixel(endian,p,&pixel);
- SetPixelGreen(q,ScaleShortToQuantum(pixel));
+ SetPixelGreen(image,ScaleShortToQuantum(pixel),q);
p=PushShortPixel(endian,p,&pixel);
- SetPixelBlue(q,ScaleShortToQuantum(pixel));
+ SetPixelBlue(image,ScaleShortToQuantum(pixel),q);
p=PushShortPixel(endian,p,&pixel);
- SetPixelIndex(indexes+x,ScaleShortToQuantum(pixel));
+ SetPixelBlack(image,ScaleShortToQuantum(pixel),q);
p=PushShortPixel(endian,p,&pixel);
- SetPixelAlpha(q,ScaleShortToQuantum(pixel));
+ SetPixelAlpha(image,ScaleShortToQuantum(pixel),q);
p+=quantum_info->pad;
- q++;
+ q+=channels;
}
break;
}
@@ -3128,34 +3129,34 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushFloatPixel(&quantum_state,p,&pixel);
- SetPixelRed(q,ClampToQuantum(pixel));
+ SetPixelRed(image,ClampToQuantum(pixel),q);
p=PushFloatPixel(&quantum_state,p,&pixel);
- SetPixelGreen(q,ClampToQuantum(pixel));
+ SetPixelGreen(image,ClampToQuantum(pixel),q);
p=PushFloatPixel(&quantum_state,p,&pixel);
- SetPixelBlue(q,ClampToQuantum(pixel));
+ SetPixelBlue(image,ClampToQuantum(pixel),q);
p=PushFloatPixel(&quantum_state,p,&pixel);
- SetPixelIndex(indexes+x,ClampToQuantum(pixel));
+ SetPixelBlack(image,ClampToQuantum(pixel),q);
p=PushFloatPixel(&quantum_state,p,&pixel);
- SetPixelAlpha(q,ClampToQuantum(pixel));
+ SetPixelAlpha(image,ClampToQuantum(pixel),q);
p+=quantum_info->pad;
- q++;
+ q+=channels;
}
break;
}
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushLongPixel(endian,p,&pixel);
- SetPixelRed(q,ScaleLongToQuantum(pixel));
+ SetPixelRed(image,ScaleLongToQuantum(pixel),q);
p=PushLongPixel(endian,p,&pixel);
- SetPixelGreen(q,ScaleLongToQuantum(pixel));
+ SetPixelGreen(image,ScaleLongToQuantum(pixel),q);
p=PushLongPixel(endian,p,&pixel);
- SetPixelBlue(q,ScaleLongToQuantum(pixel));
+ SetPixelBlue(image,ScaleLongToQuantum(pixel),q);
p=PushLongPixel(endian,p,&pixel);
- SetPixelIndex(indexes+x,ScaleLongToQuantum(pixel));
+ SetPixelBlack(image,ScaleLongToQuantum(pixel),q);
p=PushLongPixel(endian,p,&pixel);
- SetPixelAlpha(q,ScaleLongToQuantum(pixel));
+ SetPixelAlpha(image,ScaleLongToQuantum(pixel),q);
p+=quantum_info->pad;
- q++;
+ q+=channels;
}
break;
}
@@ -3169,18 +3170,18 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushDoublePixel(&quantum_state,p,&pixel);
- SetPixelRed(q,ClampToQuantum(pixel));
+ SetPixelRed(image,ClampToQuantum(pixel),q);
p=PushDoublePixel(&quantum_state,p,&pixel);
- SetPixelGreen(q,ClampToQuantum(pixel));
+ SetPixelGreen(image,ClampToQuantum(pixel),q);
p=PushDoublePixel(&quantum_state,p,&pixel);
- SetPixelBlue(q,ClampToQuantum(pixel));
+ SetPixelBlue(image,ClampToQuantum(pixel),q);
p=PushDoublePixel(&quantum_state,p,&pixel);
- SetPixelIndex(indexes+x,ClampToQuantum(pixel));
+ SetPixelBlack(image,ClampToQuantum(pixel),q);
p=PushDoublePixel(&quantum_state,p,&pixel);
- SetPixelAlpha(q,ClampToQuantum(pixel));
+ SetPixelAlpha(image,ClampToQuantum(pixel),q);
p=PushDoublePixel(&quantum_state,p,&pixel);
p+=quantum_info->pad;
- q++;
+ q+=channels;
}
break;
}
@@ -3191,16 +3192,16 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelRed(image,ScaleAnyToQuantum(pixel,range),q);
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelGreen(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelGreen(image,ScaleAnyToQuantum(pixel,range),q);
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelBlue(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelBlue(image,ScaleAnyToQuantum(pixel,range),q);
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelIndex(indexes+x,ScaleAnyToQuantum(pixel,range));
+ SetPixelBlack(image,ScaleAnyToQuantum(pixel,range),q);
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelAlpha(q,ScaleAnyToQuantum(pixel,range));
- q++;
+ SetPixelAlpha(image,ScaleAnyToQuantum(pixel,range),q);
+ q+=channels;
}
break;
}
@@ -3260,14 +3261,14 @@
n++;
}
p+=quantum_info->pad;
- SetPixelRed(q,cbcr[1]);
- SetPixelGreen(q,cbcr[0]);
- SetPixelBlue(q,cbcr[2]);
- q++;
- SetPixelRed(q,cbcr[3]);
- SetPixelGreen(q,cbcr[0]);
- SetPixelBlue(q,cbcr[2]);
- q++;
+ SetPixelRed(image,cbcr[1],q);
+ SetPixelGreen(image,cbcr[0],q);
+ SetPixelBlue(image,cbcr[2],q);
+ q+=channels;
+ SetPixelRed(image,cbcr[3],q);
+ SetPixelGreen(image,cbcr[0],q);
+ SetPixelBlue(image,cbcr[2],q);
+ q+=channels;
}
break;
}
@@ -3278,10 +3279,10 @@
for (x=0; x < (ssize_t) number_pixels; x++)
{
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelRed(image,ScaleAnyToQuantum(pixel,range),q);
p=PushQuantumPixel(&quantum_state,image->depth,p,&pixel);
- SetPixelGreen(q,ScaleAnyToQuantum(pixel,range));
- q++;
+ SetPixelGreen(image,ScaleAnyToQuantum(pixel,range),q);
+ q+=channels;
}
break;
}
@@ -3296,7 +3297,7 @@
Quantum
quantum;
- register PixelPacket
+ register Quantum
*restrict q;
q=GetAuthenticPixelQueue(image);
@@ -3304,15 +3305,15 @@
q=GetCacheViewAuthenticPixelQueue(image_view);
for (x=0; x < (ssize_t) number_pixels; x++)
{
- quantum=GetPixelRed(q);
- SetPixelRed(q,GetPixelGreen(q));
- SetPixelGreen(q,quantum);
- q++;
+ quantum=GetPixelRed(image,q);
+ SetPixelRed(image,GetPixelGreen(image,q),q);
+ SetPixelGreen(image,quantum,q);
+ q+=channels;
}
}
if ((quantum_type == RGBOQuantum) || (quantum_type == CMYKOQuantum))
{
- register PixelPacket
+ register Quantum
*restrict q;
q=GetAuthenticPixelQueue(image);
@@ -3320,8 +3321,8 @@
q=GetCacheViewAuthenticPixelQueue(image_view);
for (x=0; x < (ssize_t) number_pixels; x++)
{
- SetPixelOpacity(q,GetPixelAlpha(q));
- q++;
+ SetPixelAlpha(image,GetPixelAlpha(image,q),q);
+ q+=channels;
}
}
if (quantum_info->alpha_type == DisassociatedQuantumAlpha)
@@ -3329,7 +3330,7 @@
MagickRealType
alpha;
- register PixelPacket
+ register Quantum
*restrict q;
/*
@@ -3340,15 +3341,12 @@
q=GetCacheViewAuthenticPixelQueue(image_view);
for (x=0; x < (ssize_t) number_pixels; x++)
{
- alpha=QuantumScale*GetPixelAlpha(q);
+ alpha=QuantumScale*GetPixelAlpha(image,q);
alpha=1.0/(fabs(alpha) <= MagickEpsilon ? 1.0 : alpha);
- SetPixelRed(q,ClampToQuantum(alpha*
- GetPixelRed(q)));
- SetPixelGreen(q,ClampToQuantum(alpha*
- GetPixelGreen(q)));
- SetPixelBlue(q,ClampToQuantum(alpha*
- GetPixelBlue(q)));
- q++;
+ SetPixelRed(image,ClampToQuantum(alpha*GetPixelRed(image,q)),q);
+ SetPixelGreen(image,ClampToQuantum(alpha*GetPixelGreen(image,q)),q);
+ SetPixelBlue(image,ClampToQuantum(alpha*GetPixelBlue(image,q)),q);
+ q+=channels;
}
}
return(extent);
diff --git a/magick/quantum-private.h b/MagickCore/quantum-private.h
similarity index 99%
rename from magick/quantum-private.h
rename to MagickCore/quantum-private.h
index 3c319a8..f248caa 100644
--- a/magick/quantum-private.h
+++ b/MagickCore/quantum-private.h
@@ -22,7 +22,7 @@
extern "C" {
#endif
-#include "magick/cache.h"
+#include "MagickCore/cache.h"
typedef struct _QuantumState
{
diff --git a/magick/quantum.c b/MagickCore/quantum.c
similarity index 96%
rename from magick/quantum.c
rename to MagickCore/quantum.c
index 69cc9a1..28ca73c 100644
--- a/magick/quantum.c
+++ b/MagickCore/quantum.c
@@ -38,34 +38,35 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/property.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/color-private.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/cache.h"
-#include "magick/constitute.h"
-#include "magick/delegate.h"
-#include "magick/geometry.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/option.h"
-#include "magick/pixel.h"
-#include "magick/pixel-private.h"
-#include "magick/quantum.h"
-#include "magick/quantum-private.h"
-#include "magick/resource_.h"
-#include "magick/semaphore.h"
-#include "magick/statistic.h"
-#include "magick/stream.h"
-#include "magick/string_.h"
-#include "magick/string-private.h"
-#include "magick/thread-private.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/attribute.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/delegate.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/option.h"
+#include "MagickCore/pixel.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/property.h"
+#include "MagickCore/quantum.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/semaphore.h"
+#include "MagickCore/statistic.h"
+#include "MagickCore/stream.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/string-private.h"
+#include "MagickCore/thread-private.h"
+#include "MagickCore/utility.h"
/*
Define declarations.
@@ -469,7 +470,7 @@
if (image->matte != MagickFalse)
quantum_type=CMYKAQuantum;
}
- if (IsGrayImage(image,exception) != MagickFalse)
+ if (IsImageGray(image,exception) != MagickFalse)
{
quantum_type=GrayQuantum;
if (image->matte != MagickFalse)
diff --git a/magick/quantum.h b/MagickCore/quantum.h
similarity index 94%
rename from magick/quantum.h
rename to MagickCore/quantum.h
index aa4be3a..5c6b898 100644
--- a/magick/quantum.h
+++ b/MagickCore/quantum.h
@@ -22,7 +22,7 @@
extern "C" {
#endif
-#include "magick/semaphore.h"
+#include "MagickCore/semaphore.h"
#define RoundToQuantum(quantum) ClampToQuantum(quantum)
@@ -52,9 +52,16 @@
{
UndefinedQuantum,
AlphaQuantum,
+ BGRAQuantum,
+ BGROQuantum,
+ BGRQuantum,
BlackQuantum,
BlueQuantum,
+ CbYCrAQuantum,
+ CbYCrQuantum,
+ CbYCrYQuantum,
CMYKAQuantum,
+ CMYKOQuantum,
CMYKQuantum,
CyanQuantum,
GrayAlphaQuantum,
@@ -66,18 +73,10 @@
OpacityQuantum,
RedQuantum,
RGBAQuantum,
- BGRAQuantum,
RGBOQuantum,
- RGBQuantum,
- YellowQuantum,
- GrayPadQuantum, /* deprecated */
RGBPadQuantum,
- CbYCrYQuantum,
- CbYCrQuantum,
- CbYCrAQuantum,
- CMYKOQuantum,
- BGRQuantum,
- BGROQuantum
+ RGBQuantum,
+ YellowQuantum
} QuantumType;
typedef struct _QuantumInfo
@@ -164,8 +163,8 @@
GetQuantumType(Image *,ExceptionInfo *);
extern MagickExport size_t
- ExportQuantumPixels(const Image *,const CacheView *,const QuantumInfo *,
- const QuantumType,unsigned char *,ExceptionInfo *),
+ ExportQuantumPixels(Image *,CacheView *,const QuantumInfo *,const QuantumType,
+ unsigned char *,ExceptionInfo *),
GetQuantumExtent(const Image *,const QuantumInfo *,const QuantumType),
ImportQuantumPixels(Image *,CacheView *,const QuantumInfo *,const QuantumType,
const unsigned char *,ExceptionInfo *);
diff --git a/magick/random-private.h b/MagickCore/random-private.h
similarity index 97%
rename from magick/random-private.h
rename to MagickCore/random-private.h
index 1d764ee..fd589c8 100644
--- a/magick/random-private.h
+++ b/MagickCore/random-private.h
@@ -22,7 +22,7 @@
extern "C" {
#endif
-#include "magick/thread-private.h"
+#include "MagickCore/thread-private.h"
static inline RandomInfo **DestroyRandomInfoThreadSet(
RandomInfo **random_info)
diff --git a/magick/random.c b/MagickCore/random.c
similarity index 98%
rename from magick/random.c
rename to MagickCore/random.c
index db38b06..818e7ca 100644
--- a/magick/random.c
+++ b/MagickCore/random.c
@@ -47,18 +47,18 @@
#if defined(__MINGW32__)
#include <sys/time.h>
#endif
-#include "magick/studio.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/memory_.h"
-#include "magick/semaphore.h"
-#include "magick/random_.h"
-#include "magick/resource_.h"
-#include "magick/signature-private.h"
-#include "magick/string_.h"
-#include "magick/thread_.h"
-#include "magick/thread-private.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/semaphore.h"
+#include "MagickCore/random_.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/signature-private.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/thread_.h"
+#include "MagickCore/thread-private.h"
+#include "MagickCore/utility.h"
/*
Define declarations.
*/
diff --git a/magick/random_.h b/MagickCore/random_.h
similarity index 97%
rename from magick/random_.h
rename to MagickCore/random_.h
index 7af2938..06de7d1 100644
--- a/magick/random_.h
+++ b/MagickCore/random_.h
@@ -22,7 +22,7 @@
extern "C" {
#endif
-#include "magick/string_.h"
+#include "MagickCore/string_.h"
/*
Typedef declarations.
diff --git a/magick/registry.c b/MagickCore/registry.c
similarity index 97%
rename from magick/registry.c
rename to MagickCore/registry.c
index b462089..e3ba26b 100644
--- a/magick/registry.c
+++ b/MagickCore/registry.c
@@ -40,16 +40,16 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/list.h"
-#include "magick/memory_.h"
-#include "magick/registry.h"
-#include "magick/splay-tree.h"
-#include "magick/string_.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/list.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/registry.h"
+#include "MagickCore/splay-tree.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/utility.h"
/*
Typedef declarations.
diff --git a/magick/registry.h b/MagickCore/registry.h
similarity index 100%
rename from magick/registry.h
rename to MagickCore/registry.h
diff --git a/magick/resample-private.h b/MagickCore/resample-private.h
similarity index 97%
rename from magick/resample-private.h
rename to MagickCore/resample-private.h
index a6737c3..2658859 100644
--- a/magick/resample-private.h
+++ b/MagickCore/resample-private.h
@@ -22,7 +22,7 @@
extern "C" {
#endif
-#include "magick/thread-private.h"
+#include "MagickCore/thread-private.h"
static inline ResampleFilter **DestroyResampleFilterThreadSet(
ResampleFilter **filter)
diff --git a/magick/resample.c b/MagickCore/resample.c
similarity index 94%
rename from magick/resample.c
rename to MagickCore/resample.c
index 755b154..7da164c 100644
--- a/magick/resample.c
+++ b/MagickCore/resample.c
@@ -40,28 +40,28 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/artifact.h"
-#include "magick/color-private.h"
-#include "magick/cache.h"
-#include "magick/draw.h"
-#include "magick/exception-private.h"
-#include "magick/gem.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/log.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/pixel.h"
-#include "magick/pixel-private.h"
-#include "magick/quantum.h"
-#include "magick/random_.h"
-#include "magick/resample.h"
-#include "magick/resize.h"
-#include "magick/resize-private.h"
-#include "magick/transform.h"
-#include "magick/signature-private.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/artifact.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/draw.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/gem.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/log.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/pixel.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantum.h"
+#include "MagickCore/random_.h"
+#include "MagickCore/resample.h"
+#include "MagickCore/resize.h"
+#include "MagickCore/resize-private.h"
+#include "MagickCore/transform.h"
+#include "MagickCore/signature-private.h"
+#include "MagickCore/utility.h"
/*
EWA Resampling Options
*/
@@ -118,7 +118,7 @@
do_interpolate,
average_defined;
- MagickPixelPacket
+ PixelInfo
average_pixel;
/* current ellipitical area being resampled around center point */
@@ -301,7 +301,7 @@
% The format of the ResamplePixelColor method is:
%
% MagickBooleanType ResamplePixelColor(ResampleFilter *resample_filter,
-% const double u0,const double v0,MagickPixelPacket *pixel)
+% const double u0,const double v0,PixelInfo *pixel)
%
% A description of each parameter follows:
%
@@ -315,7 +315,7 @@
*/
MagickExport MagickBooleanType ResamplePixelColor(
ResampleFilter *resample_filter,const double u0,const double v0,
- MagickPixelPacket *pixel)
+ PixelInfo *pixel)
{
MagickBooleanType
status;
@@ -325,15 +325,14 @@
double U,V,Q,DQ,DDQ;
double divisor_c,divisor_m;
register double weight;
- register const PixelPacket *pixels;
- register const IndexPacket *indexes;
+ register const Quantum *pixels;
assert(resample_filter != (ResampleFilter *) NULL);
assert(resample_filter->signature == MagickSignature);
status=MagickTrue;
- /* GetMagickPixelPacket(resample_filter->image,pixel); */
+ /* GetPixelInfo(resample_filter->image,pixel); */
if ( resample_filter->do_interpolate ) {
- status=InterpolateMagickPixelPacket(resample_filter->image,
+ status=InterpolatePixelInfo(resample_filter->image,
resample_filter->view,resample_filter->interpolate,u0,v0,pixel,
resample_filter->exception);
return(status);
@@ -350,7 +349,6 @@
hit = 0;
switch ( resample_filter->virtual_pixel ) {
case BackgroundVirtualPixelMethod:
- case ConstantVirtualPixelMethod:
case TransparentVirtualPixelMethod:
case BlackVirtualPixelMethod:
case GrayVirtualPixelMethod:
@@ -411,7 +409,7 @@
}
if ( hit ) {
/* whole area is a solid color -- just return that color */
- status=InterpolateMagickPixelPacket(resample_filter->image,
+ status=InterpolatePixelInfo(resample_filter->image,
resample_filter->view,IntegerInterpolatePixel,u0,v0,pixel,
resample_filter->exception);
return(status);
@@ -441,14 +439,14 @@
works well in general, but falls down for TileEdge methods.
This needs to be done properly!!!!!!
*/
- status=InterpolateMagickPixelPacket(resample_filter->image,
+ status=InterpolatePixelInfo(resample_filter->image,
resample_filter->view,AverageInterpolatePixel,u0,v0,pixel,
resample_filter->exception);
break;
case HorizontalTileVirtualPixelMethod:
case VerticalTileVirtualPixelMethod:
/* just return the background pixel - Is there more direct way? */
- status=InterpolateMagickPixelPacket(resample_filter->image,
+ status=InterpolatePixelInfo(resample_filter->image,
resample_filter->view,IntegerInterpolatePixel,-1.0,-1.0,pixel,
resample_filter->exception);
break;
@@ -465,7 +463,7 @@
CacheView
*average_view;
- GetMagickPixelPacket(resample_filter->image,(MagickPixelPacket *)
+ GetPixelInfo(resample_filter->image,(PixelInfo *)
&resample_filter->average_pixel);
resample_filter->average_defined=MagickTrue;
@@ -478,16 +476,15 @@
break;
}
average_view=AcquireCacheView(average_image);
- pixels=(PixelPacket *)GetCacheViewVirtualPixels(average_view,0,0,1,1,
+ pixels=GetCacheViewVirtualPixels(average_view,0,0,1,1,
resample_filter->exception);
- if (pixels == (const PixelPacket *) NULL) {
+ if (pixels == (const Quantum *) NULL) {
average_view=DestroyCacheView(average_view);
average_image=DestroyImage(average_image);
*pixel=resample_filter->average_pixel; /* FAILED */
break;
}
- indexes=(IndexPacket *) GetCacheViewAuthenticIndexQueue(average_view);
- SetMagickPixelPacket(resample_filter->image,pixels,indexes,
+ SetPixelInfo(resample_filter->image,pixels,
&(resample_filter->average_pixel));
average_view=DestroyCacheView(average_view);
average_image=DestroyImage(average_image);
@@ -497,29 +494,29 @@
/* CheckerTile is avergae of image average half background */
/* FUTURE: replace with a 50% blend of both pixels */
- weight = QuantumScale*((MagickRealType)(QuantumRange-
- resample_filter->average_pixel.opacity));
+ weight = QuantumScale*((MagickRealType)
+ resample_filter->average_pixel.alpha);
resample_filter->average_pixel.red *= weight;
resample_filter->average_pixel.green *= weight;
resample_filter->average_pixel.blue *= weight;
divisor_c = weight;
- weight = QuantumScale*((MagickRealType)(QuantumRange-
- resample_filter->image->background_color.opacity));
+ weight = QuantumScale*((MagickRealType)
+ resample_filter->image->background_color.alpha);
resample_filter->average_pixel.red +=
weight*resample_filter->image->background_color.red;
resample_filter->average_pixel.green +=
weight*resample_filter->image->background_color.green;
resample_filter->average_pixel.blue +=
weight*resample_filter->image->background_color.blue;
- resample_filter->average_pixel.opacity +=
- resample_filter->image->background_color.opacity;
+ resample_filter->average_pixel.alpha +=
+ resample_filter->image->background_color.alpha;
divisor_c += weight;
resample_filter->average_pixel.red /= divisor_c;
resample_filter->average_pixel.green /= divisor_c;
resample_filter->average_pixel.blue /= divisor_c;
- resample_filter->average_pixel.opacity /= 2;
+ resample_filter->average_pixel.alpha /= 2;
}
}
@@ -536,8 +533,10 @@
divisor_c = 0.0;
divisor_m = 0.0;
pixel->red = pixel->green = pixel->blue = 0.0;
- if (pixel->matte != MagickFalse) pixel->opacity = 0.0;
- if (pixel->colorspace == CMYKColorspace) pixel->index = 0.0;
+ if (pixel->colorspace == CMYKColorspace)
+ pixel->black = 0.0;
+ if (pixel->matte != MagickFalse)
+ pixel->alpha = 0.0;
/*
Determine the parellelogram bounding box fitted to the ellipse
@@ -582,9 +581,8 @@
/* get the scanline of pixels for this v */
pixels=GetCacheViewVirtualPixels(resample_filter->view,u,v,(size_t) uw,
1,resample_filter->exception);
- if (pixels == (const PixelPacket *) NULL)
+ if (pixels == (const Quantum *) NULL)
return(MagickFalse);
- indexes=GetCacheViewVirtualIndexQueue(resample_filter->view);
/* count up the weighted pixel colors */
for( u=0; u<uw; u++ ) {
@@ -599,16 +597,16 @@
sqrt(Q)); /* a SquareRoot! Arrggghhhhh... */
#endif
- pixel->opacity += weight*pixels->opacity;
+ pixel->alpha += weight*GetPixelAlpha(resample_filter->image,pixels);
divisor_m += weight;
if (pixel->matte != MagickFalse)
- weight *= QuantumScale*((MagickRealType)(QuantumRange-pixels->opacity));
- pixel->red += weight*pixels->red;
- pixel->green += weight*pixels->green;
- pixel->blue += weight*pixels->blue;
+ weight *= QuantumScale*((MagickRealType) GetPixelAlpha(resample_filter->image,pixels));
+ pixel->red += weight*GetPixelRed(resample_filter->image,pixels);
+ pixel->green += weight*GetPixelGreen(resample_filter->image,pixels);
+ pixel->blue += weight*GetPixelBlue(resample_filter->image,pixels);
if (pixel->colorspace == CMYKColorspace)
- pixel->index += weight*(*indexes);
+ pixel->black += weight*GetPixelBlack(resample_filter->image,pixels);
divisor_c += weight;
hit++;
@@ -628,8 +626,7 @@
#else
}
#endif
- pixels++;
- indexes++;
+ pixels+=GetPixelChannels(resample_filter->image);
Q += DQ;
DQ += DDQ;
}
@@ -644,10 +641,10 @@
if ( hit == 0 ) {
/* not enough pixels in resampling, resort to direct interpolation */
#if DEBUG_NO_PIXEL_HIT
- pixel->opacity = pixel->red = pixel->green = pixel->blue = 0;
+ pixel->alpha = pixel->red = pixel->green = pixel->blue = 0;
pixel->red = QuantumRange; /* show pixels for which EWA fails */
#else
- status=InterpolateMagickPixelPacket(resample_filter->image,
+ status=InterpolatePixelInfo(resample_filter->image,
resample_filter->view,resample_filter->interpolate,u0,v0,pixel,
resample_filter->exception);
#endif
@@ -658,13 +655,13 @@
Finialize results of resampling
*/
divisor_m = 1.0/divisor_m;
- pixel->opacity = (MagickRealType) ClampToQuantum(divisor_m*pixel->opacity);
+ pixel->alpha = (MagickRealType) ClampToQuantum(divisor_m*pixel->alpha);
divisor_c = 1.0/divisor_c;
pixel->red = (MagickRealType) ClampToQuantum(divisor_c*pixel->red);
pixel->green = (MagickRealType) ClampToQuantum(divisor_c*pixel->green);
pixel->blue = (MagickRealType) ClampToQuantum(divisor_c*pixel->blue);
if (pixel->colorspace == CMYKColorspace)
- pixel->index = (MagickRealType) ClampToQuantum(divisor_c*pixel->index);
+ pixel->black = (MagickRealType) ClampToQuantum(divisor_c*pixel->black);
return(MagickTrue);
}
diff --git a/magick/resample.h b/MagickCore/resample.h
similarity index 97%
rename from magick/resample.h
rename to MagickCore/resample.h
index 98e2cf6..72d529f 100644
--- a/magick/resample.h
+++ b/MagickCore/resample.h
@@ -22,7 +22,7 @@
extern "C" {
#endif
-#include <magick/cache-view.h>
+#include <MagickCore/cache-view.h>
/*
WARNING: The order of this table must also match the order of a table
@@ -73,7 +73,7 @@
extern MagickExport MagickBooleanType
ResamplePixelColor(ResampleFilter *,const double,const double,
- MagickPixelPacket *),
+ PixelInfo *),
SetResampleFilterInterpolateMethod(ResampleFilter *,
const InterpolatePixelMethod),
SetResampleFilterVirtualPixelMethod(ResampleFilter *,
diff --git a/magick/resize-private.h b/MagickCore/resize-private.h
similarity index 100%
rename from magick/resize-private.h
rename to MagickCore/resize-private.h
diff --git a/magick/resize.c b/MagickCore/resize.c
similarity index 89%
rename from magick/resize.c
rename to MagickCore/resize.c
index 0ca9fcb..116bcfd 100644
--- a/magick/resize.c
+++ b/MagickCore/resize.c
@@ -39,37 +39,37 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/artifact.h"
-#include "magick/blob.h"
-#include "magick/cache.h"
-#include "magick/cache-view.h"
-#include "magick/color.h"
-#include "magick/color-private.h"
-#include "magick/draw.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/gem.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/memory_.h"
-#include "magick/magick.h"
-#include "magick/pixel-private.h"
-#include "magick/property.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/pixel.h"
-#include "magick/option.h"
-#include "magick/resample.h"
-#include "magick/resample-private.h"
-#include "magick/resize.h"
-#include "magick/resize-private.h"
-#include "magick/string_.h"
-#include "magick/string-private.h"
-#include "magick/thread-private.h"
-#include "magick/utility.h"
-#include "magick/version.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/artifact.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/cache-view.h"
+#include "MagickCore/color.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/draw.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/gem.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/property.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/pixel.h"
+#include "MagickCore/option.h"
+#include "MagickCore/resample.h"
+#include "MagickCore/resample-private.h"
+#include "MagickCore/resize.h"
+#include "MagickCore/resize-private.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/string-private.h"
+#include "MagickCore/thread-private.h"
+#include "MagickCore/utility.h"
+#include "MagickCore/version.h"
#if defined(MAGICKCORE_LQR_DELEGATE)
#include <lqr.h>
#endif
@@ -1176,16 +1176,13 @@
#endif
for (y=0; y < (ssize_t) resize_image->rows; y++)
{
- MagickPixelPacket
+ PixelInfo
pixel;
PointInfo
offset;
- register IndexPacket
- *restrict resize_indexes;
-
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -1195,18 +1192,17 @@
continue;
q=QueueCacheViewAuthenticPixels(resize_view,0,y,resize_image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
continue;
- resize_indexes=GetCacheViewAuthenticIndexQueue(resize_view);
offset.y=((MagickRealType) (y+0.5)*image->rows/resize_image->rows);
- GetMagickPixelPacket(image,&pixel);
+ GetPixelInfo(image,&pixel);
for (x=0; x < (ssize_t) resize_image->columns; x++)
{
offset.x=((MagickRealType) (x+0.5)*image->columns/resize_image->columns);
- (void) InterpolateMagickPixelPacket(image,image_view,
+ (void) InterpolatePixelInfo(image,image_view,
MeshInterpolatePixel,offset.x-0.5,offset.y-0.5,&pixel,exception);
- SetPixelPacket(resize_image,&pixel,q,resize_indexes+x);
- q++;
+ SetPixelPixelInfo(resize_image,&pixel,q);
+ q+=GetPixelChannels(resize_image);
}
if (SyncCacheViewAuthenticPixels(resize_view,exception) == MagickFalse)
continue;
@@ -1774,7 +1770,7 @@
MagickBooleanType
status;
- MagickPixelPacket
+ PixelInfo
pixel;
unsigned char
@@ -1860,36 +1856,32 @@
rescale_image=DestroyImage(rescale_image);
return((Image *) NULL);
}
- GetMagickPixelPacket(rescale_image,&pixel);
+ GetPixelInfo(rescale_image,&pixel);
(void) lqr_carver_scan_reset(carver);
rescale_view=AcquireCacheView(rescale_image);
while (lqr_carver_scan(carver,&x,&y,&packet) != 0)
{
- register IndexPacket
- *restrict rescale_indexes;
-
- register PixelPacket
+ register Quantum
*restrict q;
q=QueueCacheViewAuthenticPixels(rescale_view,x,y,1,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- rescale_indexes=GetCacheViewAuthenticIndexQueue(rescale_view);
pixel.red=QuantumRange*(packet[0]/255.0);
pixel.green=QuantumRange*(packet[1]/255.0);
pixel.blue=QuantumRange*(packet[2]/255.0);
if (image->colorspace != CMYKColorspace)
{
if (image->matte == MagickFalse)
- pixel.opacity=QuantumRange*(packet[3]/255.0);
+ pixel.alpha=QuantumRange*(packet[3]/255.0);
}
else
{
- pixel.index=QuantumRange*(packet[3]/255.0);
+ pixel.black=QuantumRange*(packet[3]/255.0);
if (image->matte == MagickFalse)
- pixel.opacity=QuantumRange*(packet[4]/255.0);
+ pixel.alpha=QuantumRange*(packet[4]/255.0);
}
- SetPixelPacket(rescale_image,&pixel,q,rescale_indexes);
+ SetPixelPixelInfo(rescale_image,&pixel,q);
if (SyncCacheViewAuthenticPixels(rescale_view,exception) == MagickFalse)
break;
}
@@ -2045,7 +2037,7 @@
MagickBooleanType
status;
- MagickPixelPacket
+ PixelInfo
zero;
MagickRealType
@@ -2096,19 +2088,14 @@
center,
density;
- register const IndexPacket
- *restrict indexes;
- register const PixelPacket
+ register const Quantum
*restrict p;
register ContributionInfo
*restrict contribution;
- register IndexPacket
- *restrict resize_indexes;
-
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -2149,16 +2136,14 @@
(contribution[n-1].pixel-contribution[0].pixel+1),image->rows,exception);
q=QueueCacheViewAuthenticPixels(resize_view,x,0,1,resize_image->rows,
exception);
- if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewVirtualIndexQueue(image_view);
- resize_indexes=GetCacheViewAuthenticIndexQueue(resize_view);
for (y=0; y < (ssize_t) resize_image->rows; y++)
{
- MagickPixelPacket
+ PixelInfo
pixel;
MagickRealType
@@ -2178,28 +2163,26 @@
j=y*(contribution[n-1].pixel-contribution[0].pixel+1)+
(contribution[i].pixel-contribution[0].pixel);
alpha=contribution[i].weight;
- pixel.red+=alpha*GetPixelRed(p+j);
- pixel.green+=alpha*GetPixelGreen(p+j);
- pixel.blue+=alpha*GetPixelBlue(p+j);
- pixel.opacity+=alpha*GetPixelOpacity(p+j);
+ pixel.red+=alpha*GetPixelRed(image,p+j*
+ GetPixelChannels(image));
+ pixel.green+=alpha*GetPixelGreen(image,p+j*
+ GetPixelChannels(image));
+ pixel.blue+=alpha*GetPixelBlue(image,p+j*
+ GetPixelChannels(image));
+ if ((image->colorspace == CMYKColorspace) &&
+ (resize_image->colorspace == CMYKColorspace))
+ pixel.black+=alpha*GetPixelBlue(image,p+j*
+ GetPixelChannels(image));
+ pixel.alpha+=alpha*GetPixelAlpha(image,p+j*
+ GetPixelChannels(image));
}
- SetPixelRed(q,ClampToQuantum(pixel.red));
- SetPixelGreen(q,ClampToQuantum(pixel.green));
- SetPixelBlue(q,ClampToQuantum(pixel.blue));
- SetPixelOpacity(q,ClampToQuantum(pixel.opacity));
+ SetPixelRed(resize_image,ClampToQuantum(pixel.red),q);
+ SetPixelGreen(resize_image,ClampToQuantum(pixel.green),q);
+ SetPixelBlue(resize_image,ClampToQuantum(pixel.blue),q);
if ((image->colorspace == CMYKColorspace) &&
(resize_image->colorspace == CMYKColorspace))
- {
- for (i=0; i < n; i++)
- {
- j=y*(contribution[n-1].pixel-contribution[0].pixel+1)+
- (contribution[i].pixel-contribution[0].pixel);
- alpha=contribution[i].weight;
- pixel.index+=alpha*GetPixelIndex(indexes+j);
- }
- SetPixelIndex(resize_indexes+y,ClampToQuantum(
- pixel.index));
- }
+ SetPixelBlack(resize_image,ClampToQuantum(pixel.black),q);
+ SetPixelAlpha(resize_image,ClampToQuantum(pixel.alpha),q);
}
else
{
@@ -2212,32 +2195,29 @@
j=y*(contribution[n-1].pixel-contribution[0].pixel+1)+
(contribution[i].pixel-contribution[0].pixel);
alpha=contribution[i].weight*QuantumScale*
- GetPixelAlpha(p+j);
- pixel.red+=alpha*GetPixelRed(p+j);
- pixel.green+=alpha*GetPixelGreen(p+j);
- pixel.blue+=alpha*GetPixelBlue(p+j);
- pixel.opacity+=contribution[i].weight*GetPixelOpacity(p+j);
+ GetPixelAlpha(image,p+j*GetPixelChannels(image));
+ pixel.red+=alpha*GetPixelRed(image,p+j*
+ GetPixelChannels(image));
+ pixel.green+=alpha*GetPixelGreen(image,p+j*
+ GetPixelChannels(image));
+ pixel.blue+=alpha*GetPixelBlue(image,p+j*
+ GetPixelChannels(image));
+ if ((image->colorspace == CMYKColorspace) &&
+ (resize_image->colorspace == CMYKColorspace))
+ pixel.black+=alpha*GetPixelBlack(image,p+j*
+ GetPixelChannels(image));
+ pixel.alpha+=contribution[i].weight*
+ GetPixelAlpha(image,p+j*GetPixelChannels(image));
gamma+=alpha;
}
gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
- SetPixelRed(q,ClampToQuantum(gamma*pixel.red));
- SetPixelGreen(q,ClampToQuantum(gamma*pixel.green));
- SetPixelBlue(q,ClampToQuantum(gamma*pixel.blue));
- SetPixelOpacity(q,ClampToQuantum(pixel.opacity));
+ SetPixelRed(resize_image,ClampToQuantum(gamma*pixel.red),q);
+ SetPixelGreen(resize_image,ClampToQuantum(gamma*pixel.green),q);
+ SetPixelBlue(resize_image,ClampToQuantum(gamma*pixel.blue),q);
if ((image->colorspace == CMYKColorspace) &&
(resize_image->colorspace == CMYKColorspace))
- {
- for (i=0; i < n; i++)
- {
- j=y*(contribution[n-1].pixel-contribution[0].pixel+1)+
- (contribution[i].pixel-contribution[0].pixel);
- alpha=contribution[i].weight*QuantumScale*
- GetPixelAlpha(p+j);
- pixel.index+=alpha*GetPixelIndex(indexes+j);
- }
- SetPixelIndex(resize_indexes+y,ClampToQuantum(gamma*
- pixel.index));
- }
+ SetPixelBlack(resize_image,ClampToQuantum(gamma*pixel.black),q);
+ SetPixelAlpha(resize_image,ClampToQuantum(pixel.alpha),q);
}
if ((resize_image->storage_class == PseudoClass) &&
(image->storage_class == PseudoClass))
@@ -2246,10 +2226,10 @@
1.0)+0.5);
j=y*(contribution[n-1].pixel-contribution[0].pixel+1)+
(contribution[i-start].pixel-contribution[0].pixel);
- SetPixelIndex(resize_indexes+y,GetPixelIndex(
- indexes+j));
+ SetPixelIndex(resize_image,GetPixelIndex(image,p+j*
+ GetPixelChannels(image)),q);
}
- q++;
+ q+=GetPixelChannels(resize_image);
}
if (SyncCacheViewAuthenticPixels(resize_view,exception) == MagickFalse)
status=MagickFalse;
@@ -2289,7 +2269,7 @@
MagickBooleanType
status;
- MagickPixelPacket
+ PixelInfo
zero;
MagickRealType
@@ -2340,19 +2320,13 @@
center,
density;
- register const IndexPacket
- *restrict indexes;
-
- register const PixelPacket
+ register const Quantum
*restrict p;
register ContributionInfo
*restrict contribution;
- register IndexPacket
- *restrict resize_indexes;
-
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -2394,16 +2368,14 @@
exception);
q=QueueCacheViewAuthenticPixels(resize_view,0,y,resize_image->columns,1,
exception);
- if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewVirtualIndexQueue(image_view);
- resize_indexes=GetCacheViewAuthenticIndexQueue(resize_view);
for (x=0; x < (ssize_t) resize_image->columns; x++)
{
- MagickPixelPacket
+ PixelInfo
pixel;
MagickRealType
@@ -2423,28 +2395,26 @@
j=(ssize_t) ((contribution[i].pixel-contribution[0].pixel)*
image->columns+x);
alpha=contribution[i].weight;
- pixel.red+=alpha*GetPixelRed(p+j);
- pixel.green+=alpha*GetPixelGreen(p+j);
- pixel.blue+=alpha*GetPixelBlue(p+j);
- pixel.opacity+=alpha*GetPixelOpacity(p+j);
+ pixel.red+=alpha*GetPixelRed(image,p+j*
+ GetPixelChannels(image));
+ pixel.green+=alpha*GetPixelGreen(image,p+j*
+ GetPixelChannels(image));
+ pixel.blue+=alpha*GetPixelBlue(image,p+j*
+ GetPixelChannels(image));
+ if ((image->colorspace == CMYKColorspace) &&
+ (resize_image->colorspace == CMYKColorspace))
+ pixel.black+=alpha*GetPixelBlack(image,p+j*
+ GetPixelChannels(image));
+ pixel.alpha+=alpha*GetPixelAlpha(image,p+j*
+ GetPixelChannels(image));
}
- SetPixelRed(q,ClampToQuantum(pixel.red));
- SetPixelGreen(q,ClampToQuantum(pixel.green));
- SetPixelBlue(q,ClampToQuantum(pixel.blue));
- SetPixelOpacity(q,ClampToQuantum(pixel.opacity));
+ SetPixelRed(resize_image,ClampToQuantum(pixel.red),q);
+ SetPixelGreen(resize_image,ClampToQuantum(pixel.green),q);
+ SetPixelBlue(resize_image,ClampToQuantum(pixel.blue),q);
if ((image->colorspace == CMYKColorspace) &&
(resize_image->colorspace == CMYKColorspace))
- {
- for (i=0; i < n; i++)
- {
- j=(ssize_t) ((contribution[i].pixel-contribution[0].pixel)*
- image->columns+x);
- alpha=contribution[i].weight;
- pixel.index+=alpha*GetPixelIndex(indexes+j);
- }
- SetPixelIndex(resize_indexes+x,ClampToQuantum(
- pixel.index));
- }
+ SetPixelBlack(resize_image,ClampToQuantum(pixel.black),q);
+ SetPixelAlpha(resize_image,ClampToQuantum(pixel.alpha),q);
}
else
{
@@ -2457,32 +2427,29 @@
j=(ssize_t) ((contribution[i].pixel-contribution[0].pixel)*
image->columns+x);
alpha=contribution[i].weight*QuantumScale*
- GetPixelAlpha(p+j);
- pixel.red+=alpha*GetPixelRed(p+j);
- pixel.green+=alpha*GetPixelGreen(p+j);
- pixel.blue+=alpha*GetPixelBlue(p+j);
- pixel.opacity+=contribution[i].weight*GetPixelOpacity(p+j);
+ GetPixelAlpha(image,p+j*GetPixelChannels(image));
+ pixel.red+=alpha*GetPixelRed(image,p+j*
+ GetPixelChannels(image));
+ pixel.green+=alpha*GetPixelGreen(image,p+j*
+ GetPixelChannels(image));
+ pixel.blue+=alpha*GetPixelBlue(image,p+j*
+ GetPixelChannels(image));
+ if ((image->colorspace == CMYKColorspace) &&
+ (resize_image->colorspace == CMYKColorspace))
+ pixel.black+=alpha*GetPixelBlack(image,p+j*
+ GetPixelChannels(image));
+ pixel.alpha+=contribution[i].weight*GetPixelAlpha(image,p+j*
+ GetPixelChannels(image));
gamma+=alpha;
}
gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
- SetPixelRed(q,ClampToQuantum(gamma*pixel.red));
- SetPixelGreen(q,ClampToQuantum(gamma*pixel.green));
- SetPixelBlue(q,ClampToQuantum(gamma*pixel.blue));
- SetPixelOpacity(q,ClampToQuantum(pixel.opacity));
+ SetPixelRed(resize_image,ClampToQuantum(gamma*pixel.red),q);
+ SetPixelGreen(resize_image,ClampToQuantum(gamma*pixel.green),q);
+ SetPixelBlue(resize_image,ClampToQuantum(gamma*pixel.blue),q);
if ((image->colorspace == CMYKColorspace) &&
(resize_image->colorspace == CMYKColorspace))
- {
- for (i=0; i < n; i++)
- {
- j=(ssize_t) ((contribution[i].pixel-contribution[0].pixel)*
- image->columns+x);
- alpha=contribution[i].weight*QuantumScale*
- GetPixelAlpha(p+j);
- pixel.index+=alpha*GetPixelIndex(indexes+j);
- }
- SetPixelIndex(resize_indexes+x,ClampToQuantum(gamma*
- pixel.index));
- }
+ SetPixelBlack(resize_image,ClampToQuantum(gamma*pixel.black),q);
+ SetPixelAlpha(resize_image,ClampToQuantum(pixel.alpha),q);
}
if ((resize_image->storage_class == PseudoClass) &&
(image->storage_class == PseudoClass))
@@ -2491,10 +2458,10 @@
1.0)+0.5);
j=(ssize_t) ((contribution[i-start].pixel-contribution[0].pixel)*
image->columns+x);
- SetPixelIndex(resize_indexes+x,
- GetPixelIndex(indexes+j));
+ SetPixelIndex(resize_image,GetPixelIndex(image,p+j*
+ GetPixelChannels(image)),q);
}
- q++;
+ q+=GetPixelChannels(resize_image);
}
if (SyncCacheViewAuthenticPixels(resize_view,exception) == MagickFalse)
status=MagickFalse;
@@ -2714,16 +2681,10 @@
#endif
for (y=0; y < (ssize_t) sample_image->rows; y++)
{
- register const IndexPacket
- *restrict indexes;
-
- register const PixelPacket
+ register const Quantum
*restrict p;
- register IndexPacket
- *restrict sample_indexes;
-
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -2740,23 +2701,33 @@
exception);
q=QueueCacheViewAuthenticPixels(sample_view,0,y,sample_image->columns,1,
exception);
- if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
- sample_indexes=GetCacheViewAuthenticIndexQueue(sample_view);
/*
Sample each column.
*/
for (x=0; x < (ssize_t) sample_image->columns; x++)
- *q++=p[x_offset[x]];
- if ((image->storage_class == PseudoClass) ||
- (image->colorspace == CMYKColorspace))
- for (x=0; x < (ssize_t) sample_image->columns; x++)
- SetPixelIndex(sample_indexes+x,
- GetPixelIndex(indexes+x_offset[x]));
+ {
+ SetPixelRed(sample_image,GetPixelRed(image,p+x_offset[x]*
+ GetPixelChannels(image)),q);
+ SetPixelGreen(sample_image,GetPixelGreen(image,p+x_offset[x]*
+ GetPixelChannels(image)),q);
+ SetPixelBlue(sample_image,GetPixelBlue(image,p+x_offset[x]*
+ GetPixelChannels(image)),q);
+ if (image->colorspace == CMYKColorspace)
+ SetPixelBlack(sample_image,GetPixelBlack(image,p+x_offset[x]*
+ GetPixelChannels(image)),q);
+ if (image->matte != MagickFalse)
+ SetPixelAlpha(sample_image,GetPixelAlpha(image,p+x_offset[x]*
+ GetPixelChannels(image)),q);
+ if (image->storage_class == PseudoClass)
+ SetPixelIndex(sample_image,GetPixelIndex(image,p+x_offset[x]*
+ GetPixelChannels(image)),q);
+ q+=GetPixelChannels(sample_image);
+ }
if (SyncCacheViewAuthenticPixels(sample_view,exception) == MagickFalse)
status=MagickFalse;
if (image->progress_monitor != (MagickProgressMonitor) NULL)
@@ -2825,7 +2796,7 @@
next_row,
proceed;
- MagickPixelPacket
+ PixelInfo
pixel,
*scale_scanline,
*scanline,
@@ -2872,20 +2843,20 @@
/*
Allocate memory.
*/
- x_vector=(MagickPixelPacket *) AcquireQuantumMemory((size_t) image->columns,
+ x_vector=(PixelInfo *) AcquireQuantumMemory((size_t) image->columns,
sizeof(*x_vector));
scanline=x_vector;
if (image->rows != scale_image->rows)
- scanline=(MagickPixelPacket *) AcquireQuantumMemory((size_t) image->columns,
+ scanline=(PixelInfo *) AcquireQuantumMemory((size_t) image->columns,
sizeof(*scanline));
- scale_scanline=(MagickPixelPacket *) AcquireQuantumMemory((size_t)
+ scale_scanline=(PixelInfo *) AcquireQuantumMemory((size_t)
scale_image->columns,sizeof(*scale_scanline));
- y_vector=(MagickPixelPacket *) AcquireQuantumMemory((size_t) image->columns,
+ y_vector=(PixelInfo *) AcquireQuantumMemory((size_t) image->columns,
sizeof(*y_vector));
- if ((scanline == (MagickPixelPacket *) NULL) ||
- (scale_scanline == (MagickPixelPacket *) NULL) ||
- (x_vector == (MagickPixelPacket *) NULL) ||
- (y_vector == (MagickPixelPacket *) NULL))
+ if ((scanline == (PixelInfo *) NULL) ||
+ (scale_scanline == (PixelInfo *) NULL) ||
+ (x_vector == (PixelInfo *) NULL) ||
+ (y_vector == (PixelInfo *) NULL))
{
scale_image=DestroyImage(scale_image);
ThrowImageException(ResourceLimitError,"MemoryAllocationFailed");
@@ -2899,27 +2870,21 @@
scale.y=(double) scale_image->rows/(double) image->rows;
(void) ResetMagickMemory(y_vector,0,(size_t) image->columns*
sizeof(*y_vector));
- GetMagickPixelPacket(image,&pixel);
+ GetPixelInfo(image,&pixel);
(void) ResetMagickMemory(&zero,0,sizeof(zero));
i=0;
image_view=AcquireCacheView(image);
scale_view=AcquireCacheView(scale_image);
for (y=0; y < (ssize_t) scale_image->rows; y++)
{
- register const IndexPacket
- *restrict indexes;
-
- register const PixelPacket
+ register const Quantum
*restrict p;
- register IndexPacket
- *restrict scale_indexes;
-
- register MagickPixelPacket
+ register PixelInfo
*restrict s,
*restrict t;
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -2927,10 +2892,9 @@
q=QueueCacheViewAuthenticPixels(scale_view,0,y,scale_image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
alpha=1.0;
- scale_indexes=GetCacheViewAuthenticIndexQueue(scale_view);
if (scale_image->rows == image->rows)
{
/*
@@ -2938,22 +2902,20 @@
*/
p=GetCacheViewVirtualPixels(image_view,0,i++,image->columns,1,
exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetCacheViewVirtualIndexQueue(image_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
if (image->matte != MagickFalse)
- alpha=QuantumScale*GetPixelAlpha(p);
- x_vector[x].red=(MagickRealType) (alpha*GetPixelRed(p));
- x_vector[x].green=(MagickRealType) (alpha*GetPixelGreen(p));
- x_vector[x].blue=(MagickRealType) (alpha*GetPixelBlue(p));
+ alpha=QuantumScale*GetPixelAlpha(image,p);
+ x_vector[x].red=(MagickRealType) (alpha*GetPixelRed(image,p));
+ x_vector[x].green=(MagickRealType) (alpha*GetPixelGreen(image,p));
+ x_vector[x].blue=(MagickRealType) (alpha*GetPixelBlue(image,p));
if (image->matte != MagickFalse)
- x_vector[x].opacity=(MagickRealType) GetPixelOpacity(p);
- if (indexes != (IndexPacket *) NULL)
- x_vector[x].index=(MagickRealType) (alpha*
- GetPixelIndex(indexes+x));
- p++;
+ x_vector[x].alpha=(MagickRealType) GetPixelAlpha(image,p);
+ if (image->colorspace == CMYKColorspace)
+ x_vector[x].black=(MagickRealType) (alpha*GetPixelBlack(image,p));
+ p+=GetPixelChannels(image);
}
}
else
@@ -2971,26 +2933,26 @@
*/
p=GetCacheViewVirtualPixels(image_view,0,i++,image->columns,1,
exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetCacheViewVirtualIndexQueue(image_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
if (image->matte != MagickFalse)
- alpha=QuantumScale*GetPixelAlpha(p);
+ alpha=QuantumScale*
+ GetPixelAlpha(image,p);
x_vector[x].red=(MagickRealType) (alpha*
- GetPixelRed(p));
+ GetPixelRed(image,p));
x_vector[x].green=(MagickRealType) (alpha*
- GetPixelGreen(p));
+ GetPixelGreen(image,p));
x_vector[x].blue=(MagickRealType) (alpha*
- GetPixelBlue(p));
+ GetPixelBlue(image,p));
+ if (image->colorspace == CMYKColorspace)
+ x_vector[x].black=(MagickRealType) (alpha*
+ GetPixelBlack(image,p));
if (image->matte != MagickFalse)
- x_vector[x].opacity=(MagickRealType)
- GetPixelOpacity(p);
- if (indexes != (IndexPacket *) NULL)
- x_vector[x].index=(MagickRealType) (alpha*
- GetPixelIndex(indexes+x));
- p++;
+ x_vector[x].alpha=(MagickRealType)
+ GetPixelAlpha(image,p);
+ p+=GetPixelChannels(image);
}
number_rows++;
}
@@ -2999,10 +2961,10 @@
y_vector[x].red+=scale.y*x_vector[x].red;
y_vector[x].green+=scale.y*x_vector[x].green;
y_vector[x].blue+=scale.y*x_vector[x].blue;
+ if (scale_image->colorspace == CMYKColorspace)
+ y_vector[x].black+=scale.y*x_vector[x].black;
if (scale_image->matte != MagickFalse)
- y_vector[x].opacity+=scale.y*x_vector[x].opacity;
- if (scale_indexes != (IndexPacket *) NULL)
- y_vector[x].index+=scale.y*x_vector[x].index;
+ y_vector[x].alpha+=scale.y*x_vector[x].alpha;
}
span.y-=scale.y;
scale.y=(double) scale_image->rows/(double) image->rows;
@@ -3015,26 +2977,21 @@
*/
p=GetCacheViewVirtualPixels(image_view,0,i++,image->columns,1,
exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetCacheViewVirtualIndexQueue(image_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
if (image->matte != MagickFalse)
- alpha=QuantumScale*GetPixelAlpha(p);
- x_vector[x].red=(MagickRealType) (alpha*
- GetPixelRed(p));
- x_vector[x].green=(MagickRealType) (alpha*
- GetPixelGreen(p));
- x_vector[x].blue=(MagickRealType) (alpha*
- GetPixelBlue(p));
+ alpha=QuantumScale*GetPixelAlpha(image,p);
+ x_vector[x].red=(MagickRealType) (alpha*GetPixelRed(image,p));
+ x_vector[x].green=(MagickRealType) (alpha*GetPixelGreen(image,p));
+ x_vector[x].blue=(MagickRealType) (alpha*GetPixelBlue(image,p));
+ if (image->colorspace == CMYKColorspace)
+ x_vector[x].black=(MagickRealType) (alpha*
+ GetPixelBlack(image,p));
if (image->matte != MagickFalse)
- x_vector[x].opacity=(MagickRealType)
- GetPixelOpacity(p);
- if (indexes != (IndexPacket *) NULL)
- x_vector[x].index=(MagickRealType) (alpha*
- GetPixelIndex(indexes+x));
- p++;
+ x_vector[x].alpha=(MagickRealType) GetPixelAlpha(image,p);
+ p+=GetPixelChannels(image);
}
number_rows++;
next_row=MagickFalse;
@@ -3045,17 +3002,17 @@
pixel.red=y_vector[x].red+span.y*x_vector[x].red;
pixel.green=y_vector[x].green+span.y*x_vector[x].green;
pixel.blue=y_vector[x].blue+span.y*x_vector[x].blue;
+ if (image->colorspace == CMYKColorspace)
+ pixel.black=y_vector[x].black+span.y*x_vector[x].black;
if (image->matte != MagickFalse)
- pixel.opacity=y_vector[x].opacity+span.y*x_vector[x].opacity;
- if (scale_indexes != (IndexPacket *) NULL)
- pixel.index=y_vector[x].index+span.y*x_vector[x].index;
+ pixel.alpha=y_vector[x].alpha+span.y*x_vector[x].alpha;
s->red=pixel.red;
s->green=pixel.green;
s->blue=pixel.blue;
+ if (scale_image->colorspace == CMYKColorspace)
+ s->black=pixel.black;
if (scale_image->matte != MagickFalse)
- s->opacity=pixel.opacity;
- if (scale_indexes != (IndexPacket *) NULL)
- s->index=pixel.index;
+ s->alpha=pixel.alpha;
s++;
y_vector[x]=zero;
}
@@ -3076,17 +3033,16 @@
for (x=0; x < (ssize_t) scale_image->columns; x++)
{
if (scale_image->matte != MagickFalse)
- alpha=QuantumScale*(QuantumRange-s->opacity);
+ alpha=QuantumScale*s->alpha;
alpha=1.0/(fabs(alpha) <= MagickEpsilon ? 1.0 : alpha);
- SetPixelRed(q,ClampToQuantum(alpha*s->red));
- SetPixelGreen(q,ClampToQuantum(alpha*s->green));
- SetPixelBlue(q,ClampToQuantum(alpha*s->blue));
+ SetPixelRed(scale_image,ClampToQuantum(alpha*s->red),q);
+ SetPixelGreen(scale_image,ClampToQuantum(alpha*s->green),q);
+ SetPixelBlue(scale_image,ClampToQuantum(alpha*s->blue),q);
+ if (scale_image->colorspace == CMYKColorspace)
+ SetPixelBlack(scale_image,ClampToQuantum(alpha*s->black),q);
if (scale_image->matte != MagickFalse)
- SetPixelOpacity(q,ClampToQuantum(s->opacity));
- if (scale_indexes != (IndexPacket *) NULL)
- SetPixelIndex(scale_indexes+x,ClampToQuantum(alpha*
- s->index));
- q++;
+ SetPixelAlpha(scale_image,ClampToQuantum(s->alpha),q);
+ q+=GetPixelChannels(scale_image);
s++;
}
}
@@ -3113,17 +3069,17 @@
pixel.red+=span.x*s->red;
pixel.green+=span.x*s->green;
pixel.blue+=span.x*s->blue;
+ if (scale_image->colorspace == CMYKColorspace)
+ pixel.black+=span.x*s->black;
if (image->matte != MagickFalse)
- pixel.opacity+=span.x*s->opacity;
- if (scale_indexes != (IndexPacket *) NULL)
- pixel.index+=span.x*s->index;
+ pixel.alpha+=span.x*s->alpha;
t->red=pixel.red;
t->green=pixel.green;
t->blue=pixel.blue;
+ if (scale_image->colorspace == CMYKColorspace)
+ t->black=pixel.black;
if (scale_image->matte != MagickFalse)
- t->opacity=pixel.opacity;
- if (scale_indexes != (IndexPacket *) NULL)
- t->index=pixel.index;
+ t->alpha=pixel.alpha;
scale.x-=span.x;
span.x=1.0;
next_column=MagickTrue;
@@ -3139,10 +3095,10 @@
pixel.red+=scale.x*s->red;
pixel.green+=scale.x*s->green;
pixel.blue+=scale.x*s->blue;
+ if (scale_image->colorspace == CMYKColorspace)
+ pixel.black+=scale.x*s->black;
if (scale_image->matte != MagickFalse)
- pixel.opacity+=scale.x*s->opacity;
- if (scale_indexes != (IndexPacket *) NULL)
- pixel.index+=scale.x*s->index;
+ pixel.alpha+=scale.x*s->alpha;
span.x-=scale.x;
}
s++;
@@ -3153,10 +3109,10 @@
pixel.red+=span.x*s->red;
pixel.green+=span.x*s->green;
pixel.blue+=span.x*s->blue;
+ if (scale_image->colorspace == CMYKColorspace)
+ pixel.black+=span.x*s->black;
if (scale_image->matte != MagickFalse)
- pixel.opacity+=span.x*s->opacity;
- if (scale_indexes != (IndexPacket *) NULL)
- pixel.index+=span.x*s->index;
+ pixel.alpha+=span.x*s->alpha;
}
if ((next_column == MagickFalse) &&
((ssize_t) (t-scale_scanline) < (ssize_t) scale_image->columns))
@@ -3164,10 +3120,10 @@
t->red=pixel.red;
t->green=pixel.green;
t->blue=pixel.blue;
+ if (scale_image->colorspace == CMYKColorspace)
+ t->black=pixel.black;
if (scale_image->matte != MagickFalse)
- t->opacity=pixel.opacity;
- if (scale_indexes != (IndexPacket *) NULL)
- t->index=pixel.index;
+ t->alpha=pixel.alpha;
}
/*
Transfer scanline to scaled image.
@@ -3176,18 +3132,17 @@
for (x=0; x < (ssize_t) scale_image->columns; x++)
{
if (scale_image->matte != MagickFalse)
- alpha=QuantumScale*(QuantumRange-s->opacity);
+ alpha=QuantumScale*s->alpha;
alpha=1.0/(fabs(alpha) <= MagickEpsilon ? 1.0 : alpha);
- SetPixelRed(q,ClampToQuantum(alpha*t->red));
- SetPixelGreen(q,ClampToQuantum(alpha*t->green));
- SetPixelBlue(q,ClampToQuantum(alpha*t->blue));
+ SetPixelRed(scale_image,ClampToQuantum(alpha*t->red),q);
+ SetPixelGreen(scale_image,ClampToQuantum(alpha*t->green),q);
+ SetPixelBlue(scale_image,ClampToQuantum(alpha*t->blue),q);
+ if (scale_image->colorspace == CMYKColorspace)
+ SetPixelBlack(scale_image,ClampToQuantum(alpha*t->black),q);
if (scale_image->matte != MagickFalse)
- SetPixelOpacity(q,ClampToQuantum(t->opacity));
- if (scale_indexes != (IndexPacket *) NULL)
- SetPixelIndex(scale_indexes+x,ClampToQuantum(alpha*
- t->index));
+ SetPixelAlpha(scale_image,ClampToQuantum(t->alpha),q);
t++;
- q++;
+ q+=GetPixelChannels(scale_image);
}
}
if (SyncCacheViewAuthenticPixels(scale_view,exception) == MagickFalse)
@@ -3202,11 +3157,11 @@
/*
Free allocated memory.
*/
- y_vector=(MagickPixelPacket *) RelinquishMagickMemory(y_vector);
- scale_scanline=(MagickPixelPacket *) RelinquishMagickMemory(scale_scanline);
+ y_vector=(PixelInfo *) RelinquishMagickMemory(y_vector);
+ scale_scanline=(PixelInfo *) RelinquishMagickMemory(scale_scanline);
if (scale_image->rows != image->rows)
- scanline=(MagickPixelPacket *) RelinquishMagickMemory(scanline);
- x_vector=(MagickPixelPacket *) RelinquishMagickMemory(x_vector);
+ scanline=(PixelInfo *) RelinquishMagickMemory(scanline);
+ x_vector=(PixelInfo *) RelinquishMagickMemory(x_vector);
scale_image->type=image->type;
return(scale_image);
}
diff --git a/magick/resize.h b/MagickCore/resize.h
similarity index 100%
rename from magick/resize.h
rename to MagickCore/resize.h
diff --git a/magick/resource.c b/MagickCore/resource.c
similarity index 97%
rename from magick/resource.c
rename to MagickCore/resource.c
index a4d56da..1fc7c48 100644
--- a/magick/resource.c
+++ b/MagickCore/resource.c
@@ -39,28 +39,28 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/cache.h"
-#include "magick/configure.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/hashmap.h"
-#include "magick/log.h"
-#include "magick/image.h"
-#include "magick/memory_.h"
-#include "magick/option.h"
-#include "magick/policy.h"
-#include "magick/random_.h"
-#include "magick/registry.h"
-#include "magick/resource_.h"
-#include "magick/semaphore.h"
-#include "magick/signature-private.h"
-#include "magick/string_.h"
-#include "magick/string-private.h"
-#include "magick/splay-tree.h"
-#include "magick/thread-private.h"
-#include "magick/token.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/configure.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/hashmap.h"
+#include "MagickCore/log.h"
+#include "MagickCore/image.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/option.h"
+#include "MagickCore/policy.h"
+#include "MagickCore/random_.h"
+#include "MagickCore/registry.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/semaphore.h"
+#include "MagickCore/signature-private.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/string-private.h"
+#include "MagickCore/splay-tree.h"
+#include "MagickCore/thread-private.h"
+#include "MagickCore/token.h"
+#include "MagickCore/utility.h"
/*
Typedef declarations.
diff --git a/magick/resource_.h b/MagickCore/resource_.h
similarity index 100%
rename from magick/resource_.h
rename to MagickCore/resource_.h
diff --git a/magick/segment.c b/MagickCore/segment.c
similarity index 93%
rename from magick/segment.c
rename to MagickCore/segment.c
index 922c5e6..e8dcc8d 100644
--- a/magick/segment.c
+++ b/MagickCore/segment.c
@@ -82,23 +82,24 @@
%
*/
-#include "magick/studio.h"
-#include "magick/cache.h"
-#include "magick/color.h"
-#include "magick/colormap.h"
-#include "magick/colorspace.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/quantize.h"
-#include "magick/quantum.h"
-#include "magick/quantum-private.h"
-#include "magick/segment.h"
-#include "magick/string_.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/color.h"
+#include "MagickCore/colormap.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantize.h"
+#include "MagickCore/quantum.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/segment.h"
+#include "MagickCore/string_.h"
/*
Define declarations.
@@ -354,43 +355,45 @@
image_view=AcquireCacheView(image);
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
x;
p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
for (cluster=head; cluster != (Cluster *) NULL; cluster=cluster->next)
- if (((ssize_t) ScaleQuantumToChar(GetPixelRed(p)) >=
+ if (((ssize_t) ScaleQuantumToChar(GetPixelRed(image,p)) >=
(cluster->red.left-SafeMargin)) &&
- ((ssize_t) ScaleQuantumToChar(GetPixelRed(p)) <=
+ ((ssize_t) ScaleQuantumToChar(GetPixelRed(image,p)) <=
(cluster->red.right+SafeMargin)) &&
- ((ssize_t) ScaleQuantumToChar(GetPixelGreen(p)) >=
+ ((ssize_t) ScaleQuantumToChar(GetPixelGreen(image,p)) >=
(cluster->green.left-SafeMargin)) &&
- ((ssize_t) ScaleQuantumToChar(GetPixelGreen(p)) <=
+ ((ssize_t) ScaleQuantumToChar(GetPixelGreen(image,p)) <=
(cluster->green.right+SafeMargin)) &&
- ((ssize_t) ScaleQuantumToChar(GetPixelBlue(p)) >=
+ ((ssize_t) ScaleQuantumToChar(GetPixelBlue(image,p)) >=
(cluster->blue.left-SafeMargin)) &&
- ((ssize_t) ScaleQuantumToChar(GetPixelBlue(p)) <=
+ ((ssize_t) ScaleQuantumToChar(GetPixelBlue(image,p)) <=
(cluster->blue.right+SafeMargin)))
{
/*
Count this pixel.
*/
count++;
- cluster->red.center+=(MagickRealType) ScaleQuantumToChar(GetPixelRed(p));
- cluster->green.center+=(MagickRealType)
- ScaleQuantumToChar(GetPixelGreen(p));
- cluster->blue.center+=(MagickRealType) ScaleQuantumToChar(GetPixelBlue(p));
+ cluster->red.center+=(MagickRealType) ScaleQuantumToChar(
+ GetPixelRed(image,p));
+ cluster->green.center+=(MagickRealType) ScaleQuantumToChar(
+ GetPixelGreen(image,p));
+ cluster->blue.center+=(MagickRealType) ScaleQuantumToChar(
+ GetPixelBlue(image,p));
cluster->count++;
break;
}
- p++;
+ p+=GetPixelChannels(image);
}
if (image->progress_monitor != (MagickProgressMonitor) NULL)
{
@@ -538,46 +541,42 @@
register const PixelPacket
*restrict p;
- register IndexPacket
- *restrict indexes;
-
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelIndex(indexes+x,0);
+ SetPixelIndex(image,0,q);
for (cluster=head; cluster != (Cluster *) NULL; cluster=cluster->next)
{
- if (((ssize_t) ScaleQuantumToChar(q->red) >=
+ if (((ssize_t) ScaleQuantumToChar(GetPixelRed(image,q)) >=
(cluster->red.left-SafeMargin)) &&
- ((ssize_t) ScaleQuantumToChar(q->red) <=
+ ((ssize_t) ScaleQuantumToChar(GetPixelRed(image,q)) <=
(cluster->red.right+SafeMargin)) &&
- ((ssize_t) ScaleQuantumToChar(q->green) >=
+ ((ssize_t) ScaleQuantumToChar(GetPixelGreen(image,q)) >=
(cluster->green.left-SafeMargin)) &&
- ((ssize_t) ScaleQuantumToChar(q->green) <=
+ ((ssize_t) ScaleQuantumToChar(GetPixelGreen(image,q)) <=
(cluster->green.right+SafeMargin)) &&
- ((ssize_t) ScaleQuantumToChar(q->blue) >=
+ ((ssize_t) ScaleQuantumToChar(GetPixelBlue(image,q)) >=
(cluster->blue.left-SafeMargin)) &&
- ((ssize_t) ScaleQuantumToChar(q->blue) <=
+ ((ssize_t) ScaleQuantumToChar(GetPixelBlue(image,q)) <=
(cluster->blue.right+SafeMargin)))
{
/*
Classify this pixel.
*/
- SetPixelIndex(indexes+x,cluster->id);
+ SetPixelIndex(image,(Quantum) cluster->id,q);
break;
}
}
@@ -602,22 +601,24 @@
{
sum=0.0;
p=image->colormap+j;
- distance_squared=squares[(ssize_t) ScaleQuantumToChar(q->red)-
- (ssize_t) ScaleQuantumToChar(GetPixelRed(p))]+
- squares[(ssize_t) ScaleQuantumToChar(q->green)-
- (ssize_t) ScaleQuantumToChar(GetPixelGreen(p))]+
- squares[(ssize_t) ScaleQuantumToChar(q->blue)-
- (ssize_t) ScaleQuantumToChar(GetPixelBlue(p))];
+ distance_squared=squares[(ssize_t) ScaleQuantumToChar(
+ GetPixelRed(image,q))-(ssize_t)
+ ScaleQuantumToChar(p->red)]+squares[(ssize_t)
+ ScaleQuantumToChar(GetPixelGreen(image,q))-(ssize_t)
+ ScaleQuantumToChar(p->green)]+squares[(ssize_t)
+ ScaleQuantumToChar(GetPixelBlue(image,q))-(ssize_t)
+ ScaleQuantumToChar(p->blue)];
numerator=distance_squared;
for (k=0; k < (ssize_t) image->colors; k++)
{
p=image->colormap+k;
- distance_squared=squares[(ssize_t) ScaleQuantumToChar(q->red)-
- (ssize_t) ScaleQuantumToChar(GetPixelRed(p))]+
- squares[(ssize_t) ScaleQuantumToChar(q->green)-
- (ssize_t) ScaleQuantumToChar(GetPixelGreen(p))]+
- squares[(ssize_t) ScaleQuantumToChar(q->blue)-
- (ssize_t) ScaleQuantumToChar(GetPixelBlue(p))];
+ distance_squared=squares[(ssize_t) ScaleQuantumToChar(
+ GetPixelRed(image,q))-(ssize_t)
+ ScaleQuantumToChar(p->red)]+squares[(ssize_t)
+ ScaleQuantumToChar(GetPixelGreen(image,q))-(ssize_t)
+ ScaleQuantumToChar(p->green)]+squares[(ssize_t)
+ ScaleQuantumToChar(GetPixelBlue(image,q))-(ssize_t)
+ ScaleQuantumToChar(p->blue)];
ratio=numerator/distance_squared;
sum+=SegmentPower(ratio);
}
@@ -627,11 +628,11 @@
Classify this pixel.
*/
local_minima=1.0/sum;
- SetPixelIndex(indexes+x,j);
+ SetPixelIndex(image,(Quantum) j,q);
}
}
}
- q++;
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -925,7 +926,7 @@
%
% MagickBooleanType GetImageDynamicThreshold(const Image *image,
% const double cluster_threshold,const double smooth_threshold,
-% MagickPixelPacket *pixel,ExceptionInfo *exception)
+% PixelInfo *pixel,ExceptionInfo *exception)
%
% A description of each parameter follows.
%
@@ -946,7 +947,7 @@
*/
MagickExport MagickBooleanType GetImageDynamicThreshold(const Image *image,
const double cluster_threshold,const double smooth_threshold,
- MagickPixelPacket *pixel,ExceptionInfo *exception)
+ PixelInfo *pixel,ExceptionInfo *exception)
{
Cluster
*background,
@@ -967,7 +968,7 @@
MagickRealType
threshold;
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
@@ -989,7 +990,7 @@
assert(image->signature == MagickSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
- GetMagickPixelPacket(image,pixel);
+ GetPixelInfo(image,pixel);
for (i=0; i < MaxDimension; i++)
{
histogram[i]=(ssize_t *) AcquireQuantumMemory(256UL,sizeof(**histogram));
@@ -1093,38 +1094,38 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
for (cluster=head; cluster != (Cluster *) NULL; cluster=cluster->next)
- if (((ssize_t) ScaleQuantumToChar(GetPixelRed(p)) >=
+ if (((ssize_t) ScaleQuantumToChar(GetPixelRed(image,p)) >=
(cluster->red.left-SafeMargin)) &&
- ((ssize_t) ScaleQuantumToChar(GetPixelRed(p)) <=
+ ((ssize_t) ScaleQuantumToChar(GetPixelRed(image,p)) <=
(cluster->red.right+SafeMargin)) &&
- ((ssize_t) ScaleQuantumToChar(GetPixelGreen(p)) >=
+ ((ssize_t) ScaleQuantumToChar(GetPixelGreen(image,p)) >=
(cluster->green.left-SafeMargin)) &&
- ((ssize_t) ScaleQuantumToChar(GetPixelGreen(p)) <=
+ ((ssize_t) ScaleQuantumToChar(GetPixelGreen(image,p)) <=
(cluster->green.right+SafeMargin)) &&
- ((ssize_t) ScaleQuantumToChar(GetPixelBlue(p)) >=
+ ((ssize_t) ScaleQuantumToChar(GetPixelBlue(image,p)) >=
(cluster->blue.left-SafeMargin)) &&
- ((ssize_t) ScaleQuantumToChar(GetPixelBlue(p)) <=
+ ((ssize_t) ScaleQuantumToChar(GetPixelBlue(image,p)) <=
(cluster->blue.right+SafeMargin)))
{
/*
Count this pixel.
*/
count++;
- cluster->red.center+=(MagickRealType)
- ScaleQuantumToChar(GetPixelRed(p));
- cluster->green.center+=(MagickRealType)
- ScaleQuantumToChar(GetPixelGreen(p));
- cluster->blue.center+=(MagickRealType)
- ScaleQuantumToChar(GetPixelBlue(p));
+ cluster->red.center+=(MagickRealType) ScaleQuantumToChar(
+ GetPixelRed(image,p));
+ cluster->green.center+=(MagickRealType) ScaleQuantumToChar(
+ GetPixelGreen(image,p));
+ cluster->blue.center+=(MagickRealType) ScaleQuantumToChar(
+ GetPixelBlue(image,p));
cluster->count++;
break;
}
- p++;
+ p+=GetPixelChannels(image);
}
proceed=SetImageProgress(image,SegmentImageTag,(MagickOffsetType) y,
2*image->rows);
@@ -1236,7 +1237,7 @@
static void InitializeHistogram(const Image *image,ssize_t **histogram,
ExceptionInfo *exception)
{
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
@@ -1258,14 +1259,14 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- histogram[Red][(ssize_t) ScaleQuantumToChar(GetPixelRed(p))]++;
- histogram[Green][(ssize_t) ScaleQuantumToChar(GetPixelGreen(p))]++;
- histogram[Blue][(ssize_t) ScaleQuantumToChar(GetPixelBlue(p))]++;
- p++;
+ histogram[Red][(ssize_t) ScaleQuantumToChar(GetPixelRed(image,p))]++;
+ histogram[Green][(ssize_t) ScaleQuantumToChar(GetPixelGreen(image,p))]++;
+ histogram[Blue][(ssize_t) ScaleQuantumToChar(GetPixelBlue(image,p))]++;
+ p+=GetPixelChannels(image);
}
}
}
diff --git a/magick/segment.h b/MagickCore/segment.h
similarity index 95%
rename from magick/segment.h
rename to MagickCore/segment.h
index 54d43e4..06314da 100644
--- a/magick/segment.h
+++ b/MagickCore/segment.h
@@ -24,7 +24,7 @@
extern MagickExport MagickBooleanType
GetImageDynamicThreshold(const Image *,const double,const double,
- MagickPixelPacket *,ExceptionInfo *),
+ PixelInfo *,ExceptionInfo *),
SegmentImage(Image *,const ColorspaceType,const MagickBooleanType,
const double,const double);
diff --git a/magick/semaphore-private.h b/MagickCore/semaphore-private.h
similarity index 100%
rename from magick/semaphore-private.h
rename to MagickCore/semaphore-private.h
diff --git a/magick/semaphore.c b/MagickCore/semaphore.c
similarity index 97%
rename from magick/semaphore.c
rename to MagickCore/semaphore.c
index d4a95ab..3c169f1 100644
--- a/magick/semaphore.c
+++ b/MagickCore/semaphore.c
@@ -41,15 +41,15 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/memory_.h"
-#include "magick/semaphore.h"
-#include "magick/semaphore-private.h"
-#include "magick/string_.h"
-#include "magick/thread_.h"
-#include "magick/thread-private.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/semaphore.h"
+#include "MagickCore/semaphore-private.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/thread_.h"
+#include "MagickCore/thread-private.h"
/*
Struct declaractions.
diff --git a/magick/semaphore.h b/MagickCore/semaphore.h
similarity index 100%
rename from magick/semaphore.h
rename to MagickCore/semaphore.h
diff --git a/magick/shear.c b/MagickCore/shear.c
similarity index 86%
rename from magick/shear.c
rename to MagickCore/shear.c
index 58c0eff..70f093a 100644
--- a/magick/shear.c
+++ b/MagickCore/shear.c
@@ -45,38 +45,38 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/artifact.h"
-#include "magick/attribute.h"
-#include "magick/blob-private.h"
-#include "magick/cache-private.h"
-#include "magick/color-private.h"
-#include "magick/colorspace-private.h"
-#include "magick/composite.h"
-#include "magick/composite-private.h"
-#include "magick/decorate.h"
-#include "magick/distort.h"
-#include "magick/draw.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/gem.h"
-#include "magick/geometry.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/memory_.h"
-#include "magick/list.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/pixel-private.h"
-#include "magick/quantum.h"
-#include "magick/resource_.h"
-#include "magick/shear.h"
-#include "magick/statistic.h"
-#include "magick/string_.h"
-#include "magick/string-private.h"
-#include "magick/thread-private.h"
-#include "magick/threshold.h"
-#include "magick/transform.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/artifact.h"
+#include "MagickCore/attribute.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache-private.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colorspace-private.h"
+#include "MagickCore/composite.h"
+#include "MagickCore/composite-private.h"
+#include "MagickCore/decorate.h"
+#include "MagickCore/distort.h"
+#include "MagickCore/draw.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/gem.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/list.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantum.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/shear.h"
+#include "MagickCore/statistic.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/string-private.h"
+#include "MagickCore/thread-private.h"
+#include "MagickCore/threshold.h"
+#include "MagickCore/transform.h"
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -714,7 +714,7 @@
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
register ssize_t
@@ -728,7 +728,7 @@
if (status == MagickFalse)
continue;
p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
@@ -739,9 +739,9 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
byte<<=1;
- if (((MagickRealType) GetPixelRed(p) < threshold) ||
- ((MagickRealType) GetPixelGreen(p) < threshold) ||
- ((MagickRealType) GetPixelBlue(p) < threshold))
+ if (((MagickRealType) GetPixelRed(image,p) < threshold) ||
+ ((MagickRealType) GetPixelGreen(image,p) < threshold) ||
+ ((MagickRealType) GetPixelBlue(image,p) < threshold))
byte|=0x01;
bit++;
if (bit == 8)
@@ -750,7 +750,7 @@
bit=0;
byte=0;
}
- p++;
+ p+=GetPixelChannels(image);
}
if (bit != 0)
{
@@ -765,7 +765,7 @@
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
register ssize_t
@@ -779,7 +779,7 @@
if (status == MagickFalse)
continue;
p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
@@ -790,9 +790,9 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
byte<<=1;
- if (((MagickRealType) GetPixelRed(p) < threshold) ||
- ((MagickRealType) GetPixelGreen(p) < threshold) ||
- ((MagickRealType) GetPixelBlue(p) < threshold))
+ if (((MagickRealType) GetPixelRed(image,p) < threshold) ||
+ ((MagickRealType) GetPixelGreen(image,p) < threshold) ||
+ ((MagickRealType) GetPixelBlue(image,p) < threshold))
byte|=0x01;
bit++;
if (bit == 8)
@@ -801,7 +801,7 @@
bit=0;
byte=0;
}
- p++;
+ p+=GetPixelChannels(image);
}
if (bit != 0)
{
@@ -822,7 +822,7 @@
CacheView
*image_view;
- MagickPixelPacket
+ PixelInfo
background;
MagickRealType
@@ -836,12 +836,12 @@
*/
if (offset <= 0)
return;
- GetMagickPixelPacket(image,&background);
+ GetPixelInfo(image,&background);
count=0.0;
image_view=AcquireCacheView(image);
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
register ssize_t
@@ -850,18 +850,18 @@
if ((y >= offset) && (y < ((ssize_t) image->rows-offset)))
continue;
p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
continue;
for (x=0; x < (ssize_t) image->columns; x++)
{
if ((x >= offset) && (x < ((ssize_t) image->columns-offset)))
continue;
- background.red+=QuantumScale*GetPixelRed(p);
- background.green+=QuantumScale*GetPixelGreen(p);
- background.blue+=QuantumScale*GetPixelBlue(p);
- background.opacity+=QuantumScale*GetPixelOpacity(p);
+ background.red+=QuantumScale*GetPixelRed(image,p);
+ background.green+=QuantumScale*GetPixelGreen(image,p);
+ background.blue+=QuantumScale*GetPixelBlue(image,p);
+ background.alpha+=QuantumScale*GetPixelAlpha(image,p);
count++;
- p++;
+ p+=GetPixelChannels(image);
}
}
image_view=DestroyCacheView(image_view);
@@ -871,8 +871,8 @@
background.green/count);
image->background_color.blue=ClampToQuantum((MagickRealType) QuantumRange*
background.blue/count);
- image->background_color.opacity=ClampToQuantum((MagickRealType) QuantumRange*
- background.opacity/count);
+ image->background_color.alpha=ClampToQuantum((MagickRealType) QuantumRange*
+ background.alpha/count);
}
MagickExport Image *DeskewImage(const Image *image,const double threshold,
@@ -1096,19 +1096,13 @@
MagickBooleanType
sync;
- register const IndexPacket
- *restrict indexes;
-
- register const PixelPacket
+ register const Quantum
*restrict p;
- register IndexPacket
- *restrict rotate_indexes;
-
register ssize_t
y;
- register PixelPacket
+ register Quantum
*restrict q;
size_t
@@ -1125,15 +1119,14 @@
image->rows));
p=GetCacheViewVirtualPixels(image_view,tile_x,tile_y,width,height,
exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
{
status=MagickFalse;
break;
}
- indexes=GetCacheViewVirtualIndexQueue(image_view);
for (y=0; y < (ssize_t) width; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict tile_pixels;
register ssize_t
@@ -1142,31 +1135,21 @@
q=QueueCacheViewAuthenticPixels(rotate_view,(ssize_t)
(rotate_image->columns-(tile_y+height)),y+tile_x,height,
1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
break;
}
- tile_pixels=p+(height-1)*width+y;
+ tile_pixels=p+((height-1)*width+y)*GetPixelChannels(image);
for (x=0; x < (ssize_t) height; x++)
{
- *q++=(*tile_pixels);
- tile_pixels-=width;
+ SetPixelRed(rotate_image,GetPixelRed(image,tile_pixels),q);
+ SetPixelGreen(rotate_image,GetPixelGreen(image,tile_pixels),q);
+ SetPixelBlue(rotate_image,GetPixelBlue(image,tile_pixels),q);
+ SetPixelAlpha(rotate_image,GetPixelAlpha(image,tile_pixels),q);
+ tile_pixels-=width*GetPixelChannels(image);
+ q+=GetPixelChannels(rotate_image);
}
- rotate_indexes=GetCacheViewAuthenticIndexQueue(rotate_view);
- if ((indexes != (IndexPacket *) NULL) &&
- (rotate_indexes != (IndexPacket *) NULL))
- {
- register const IndexPacket
- *restrict tile_indexes;
-
- tile_indexes=indexes+(height-1)*width+y;
- for (x=0; x < (ssize_t) height; x++)
- {
- *rotate_indexes++=(*tile_indexes);
- tile_indexes-=width;
- }
- }
sync=SyncCacheViewAuthenticPixels(rotate_view,exception);
if (sync == MagickFalse)
status=MagickFalse;
@@ -1204,19 +1187,13 @@
MagickBooleanType
sync;
- register const IndexPacket
- *restrict indexes;
-
- register const PixelPacket
+ register const Quantum
*restrict p;
- register IndexPacket
- *restrict rotate_indexes;
-
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
if (status == MagickFalse)
@@ -1225,21 +1202,21 @@
exception);
q=QueueCacheViewAuthenticPixels(rotate_view,0,(ssize_t) (image->rows-
y-1),image->columns,1,exception);
- if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewVirtualIndexQueue(image_view);
- rotate_indexes=GetCacheViewAuthenticIndexQueue(rotate_view);
- q+=image->columns;
+ q+=GetPixelChannels(rotate_image)*image->columns;
for (x=0; x < (ssize_t) image->columns; x++)
- *--q=(*p++);
- if ((indexes != (IndexPacket *) NULL) &&
- (rotate_indexes != (IndexPacket *) NULL))
- for (x=0; x < (ssize_t) image->columns; x++)
- SetPixelIndex(rotate_indexes+image->columns-x-1,
- GetPixelIndex(indexes+x));
+ {
+ q-=GetPixelChannels(rotate_image);
+ SetPixelRed(rotate_image,GetPixelRed(image,p),q);
+ SetPixelGreen(rotate_image,GetPixelGreen(image,p),q);
+ SetPixelBlue(rotate_image,GetPixelBlue(image,p),q);
+ SetPixelAlpha(rotate_image,GetPixelAlpha(image,p),q);
+ p+=GetPixelChannels(image);
+ }
sync=SyncCacheViewAuthenticPixels(rotate_view,exception);
if (sync == MagickFalse)
status=MagickFalse;
@@ -1288,19 +1265,13 @@
MagickBooleanType
sync;
- register const IndexPacket
- *restrict indexes;
-
- register const PixelPacket
+ register const Quantum
*restrict p;
- register IndexPacket
- *restrict rotate_indexes;
-
register ssize_t
y;
- register PixelPacket
+ register Quantum
*restrict q;
size_t
@@ -1317,15 +1288,14 @@
image->rows));
p=GetCacheViewVirtualPixels(image_view,tile_x,tile_y,width,
height,exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
{
status=MagickFalse;
break;
}
- indexes=GetCacheViewVirtualIndexQueue(image_view);
for (y=0; y < (ssize_t) width; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict tile_pixels;
register ssize_t
@@ -1333,31 +1303,21 @@
q=QueueCacheViewAuthenticPixels(rotate_view,tile_y,(ssize_t)
(y+rotate_image->rows-(tile_x+width)),height,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
break;
}
- tile_pixels=p+(width-1)-y;
+ tile_pixels=p+((width-1)-y)*GetPixelChannels(image);
for (x=0; x < (ssize_t) height; x++)
{
- *q++=(*tile_pixels);
- tile_pixels+=width;
+ SetPixelRed(rotate_image,GetPixelRed(image,tile_pixels),q);
+ SetPixelGreen(rotate_image,GetPixelGreen(image,tile_pixels),q);
+ SetPixelBlue(rotate_image,GetPixelBlue(image,tile_pixels),q);
+ SetPixelAlpha(rotate_image,GetPixelAlpha(image,tile_pixels),q);
+ tile_pixels+=width*GetPixelChannels(image);
+ q+=GetPixelChannels(rotate_image);
}
- rotate_indexes=GetCacheViewAuthenticIndexQueue(rotate_view);
- if ((indexes != (IndexPacket *) NULL) &&
- (rotate_indexes != (IndexPacket *) NULL))
- {
- register const IndexPacket
- *restrict tile_indexes;
-
- tile_indexes=indexes+(width-1)-y;
- for (x=0; x < (ssize_t) height; x++)
- {
- *rotate_indexes++=(*tile_indexes);
- tile_indexes+=width;
- }
- }
sync=SyncCacheViewAuthenticPixels(rotate_view,exception);
if (sync == MagickFalse)
status=MagickFalse;
@@ -1449,7 +1409,7 @@
MagickOffsetType
progress;
- MagickPixelPacket
+ PixelInfo
background;
ssize_t
@@ -1459,9 +1419,8 @@
assert(image->signature == MagickSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
- GetMagickPixelPacket(image,&background);
- SetMagickPixelPacket(image,&image->background_color,(IndexPacket *) NULL,
- &background);
+ GetPixelInfo(image,&background);
+ SetPixelInfoPacket(image,&image->background_color,&background);
if (image->colorspace == CMYKColorspace)
ConvertRGBToCMYK(&background);
/*
@@ -1475,7 +1434,7 @@
#endif
for (y=0; y < (ssize_t) height; y++)
{
- MagickPixelPacket
+ PixelInfo
pixel,
source,
destination;
@@ -1484,11 +1443,7 @@
area,
displacement;
- register IndexPacket
- *restrict indexes,
- *restrict shear_indexes;
-
- register PixelPacket
+ register Quantum
*restrict p,
*restrict q;
@@ -1505,14 +1460,12 @@
continue;
p=GetCacheViewAuthenticPixels(image_view,0,y_offset+y,image->columns,1,
exception);
- if (p == (PixelPacket *) NULL)
+ if (p == (Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
- p+=x_offset;
- indexes+=x_offset;
+ p+=x_offset*GetPixelChannels(image);
displacement=degrees*(MagickRealType) (y-height/2.0);
if (displacement == 0.0)
continue;
@@ -1527,8 +1480,8 @@
area=(MagickRealType) (displacement-step);
step++;
pixel=background;
- GetMagickPixelPacket(image,&source);
- GetMagickPixelPacket(image,&destination);
+ GetPixelInfo(image,&source);
+ GetPixelInfo(image,&destination);
switch (direction)
{
case LEFT:
@@ -1538,28 +1491,34 @@
*/
if (step > x_offset)
break;
- q=p-step;
- shear_indexes=indexes-step;
+ q=p-step*GetPixelChannels(image);
for (i=0; i < (ssize_t) width; i++)
{
if ((x_offset+i) < step)
{
- SetMagickPixelPacket(image,++p,++indexes,&pixel);
- q++;
- shear_indexes++;
+ p+=GetPixelChannels(image);
+ SetPixelInfo(image,p,&pixel);
+ q+=GetPixelChannels(image);
continue;
}
- SetMagickPixelPacket(image,p,indexes,&source);
- MagickPixelCompositeAreaBlend(&pixel,(MagickRealType) pixel.opacity,
- &source,(MagickRealType) GetPixelOpacity(p),area,&destination);
- SetPixelPacket(image,&destination,q++,shear_indexes++);
- SetMagickPixelPacket(image,p++,indexes++,&pixel);
+ SetPixelInfo(image,p,&source);
+ CompositePixelInfoAreaBlend(&pixel,(MagickRealType) pixel.alpha,
+ &source,(MagickRealType) GetPixelAlpha(image,p),area,
+ &destination);
+ SetPixelPixelInfo(image,&destination,q);
+ SetPixelInfo(image,p,&pixel);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(image);
}
- MagickPixelCompositeAreaBlend(&pixel,(MagickRealType) pixel.opacity,
- &background,(MagickRealType) background.opacity,area,&destination);
- SetPixelPacket(image,&destination,q++,shear_indexes++);
+ CompositePixelInfoAreaBlend(&pixel,(MagickRealType) pixel.alpha,
+ &background,(MagickRealType) background.alpha,area,&destination);
+ SetPixelPixelInfo(image,&destination,q);
+ q+=GetPixelChannels(image);
for (i=0; i < (step-1); i++)
- SetPixelPacket(image,&background,q++,shear_indexes++);
+ {
+ SetPixelPixelInfo(image,&background,q);
+ q+=GetPixelChannels(image);
+ }
break;
}
case RIGHT:
@@ -1567,29 +1526,30 @@
/*
Transfer pixels right-to-left.
*/
- p+=width;
- indexes+=width;
- q=p+step;
- shear_indexes=indexes+step;
+ p+=width*GetPixelChannels(image);
+ q=p+step*GetPixelChannels(image);
for (i=0; i < (ssize_t) width; i++)
{
- p--;
- indexes--;
- q--;
- shear_indexes--;
+ p-=GetPixelChannels(image);
+ q-=GetPixelChannels(image);
if ((size_t) (x_offset+width+step-i) >= image->columns)
continue;
- SetMagickPixelPacket(image,p,indexes,&source);
- MagickPixelCompositeAreaBlend(&pixel,(MagickRealType) pixel.opacity,
- &source,(MagickRealType) GetPixelOpacity(p),area,&destination);
- SetPixelPacket(image,&destination,q,shear_indexes);
- SetMagickPixelPacket(image,p,indexes,&pixel);
+ SetPixelInfo(image,p,&source);
+ CompositePixelInfoAreaBlend(&pixel,(MagickRealType) pixel.alpha,
+ &source,(MagickRealType) GetPixelAlpha(image,p),area,
+ &destination);
+ SetPixelPixelInfo(image,&destination,q);
+ SetPixelInfo(image,p,&pixel);
}
- MagickPixelCompositeAreaBlend(&pixel,(MagickRealType) pixel.opacity,
- &background,(MagickRealType) background.opacity,area,&destination);
- SetPixelPacket(image,&destination,--q,--shear_indexes);
+ CompositePixelInfoAreaBlend(&pixel,(MagickRealType) pixel.alpha,
+ &background,(MagickRealType) background.alpha,area,&destination);
+ q-=GetPixelChannels(image);
+ SetPixelPixelInfo(image,&destination,q);
for (i=0; i < (step-1); i++)
- SetPixelPacket(image,&background,--q,--shear_indexes);
+ {
+ q-=GetPixelChannels(image);
+ SetPixelPixelInfo(image,&background,q);
+ }
break;
}
}
@@ -1669,7 +1629,7 @@
MagickOffsetType
progress;
- MagickPixelPacket
+ PixelInfo
background;
ssize_t
@@ -1679,9 +1639,8 @@
assert(image->signature == MagickSignature);
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
- GetMagickPixelPacket(image,&background);
- SetMagickPixelPacket(image,&image->background_color,(IndexPacket *) NULL,
- &background);
+ GetPixelInfo(image,&background);
+ SetPixelInfoPacket(image,&image->background_color,&background);
if (image->colorspace == CMYKColorspace)
ConvertRGBToCMYK(&background);
/*
@@ -1698,26 +1657,22 @@
ssize_t
step;
- MagickPixelPacket
- pixel,
- source,
- destination;
-
MagickRealType
area,
displacement;
- register IndexPacket
- *restrict indexes,
- *restrict shear_indexes;
+ PixelInfo
+ pixel,
+ source,
+ destination;
+
+ register Quantum
+ *restrict p,
+ *restrict q;
register ssize_t
i;
- register PixelPacket
- *restrict p,
- *restrict q;
-
ShearDirection
direction;
@@ -1725,14 +1680,12 @@
continue;
p=GetCacheViewAuthenticPixels(image_view,x_offset+x,0,1,image->rows,
exception);
- if (p == (PixelPacket *) NULL)
+ if (p == (Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
- p+=y_offset;
- indexes+=y_offset;
+ p+=y_offset*GetPixelChannels(image);
displacement=degrees*(MagickRealType) (x-width/2.0);
if (displacement == 0.0)
continue;
@@ -1747,8 +1700,8 @@
area=(MagickRealType) (displacement-step);
step++;
pixel=background;
- GetMagickPixelPacket(image,&source);
- GetMagickPixelPacket(image,&destination);
+ GetPixelInfo(image,&source);
+ GetPixelInfo(image,&destination);
switch (direction)
{
case UP:
@@ -1758,28 +1711,34 @@
*/
if (step > y_offset)
break;
- q=p-step;
- shear_indexes=indexes-step;
+ q=p-step*GetPixelChannels(image);
for (i=0; i < (ssize_t) height; i++)
{
if ((y_offset+i) < step)
{
- SetMagickPixelPacket(image,++p,++indexes,&pixel);
- q++;
- shear_indexes++;
+ p+=GetPixelChannels(image);
+ SetPixelInfo(image,p,&pixel);
+ q+=GetPixelChannels(image);
continue;
}
- SetMagickPixelPacket(image,p,indexes,&source);
- MagickPixelCompositeAreaBlend(&pixel,(MagickRealType) pixel.opacity,
- &source,(MagickRealType) GetPixelOpacity(p),area,&destination);
- SetPixelPacket(image,&destination,q++,shear_indexes++);
- SetMagickPixelPacket(image,p++,indexes++,&pixel);
+ SetPixelInfo(image,p,&source);
+ CompositePixelInfoAreaBlend(&pixel,(MagickRealType) pixel.alpha,
+ &source,(MagickRealType) GetPixelAlpha(image,p),area,
+ &destination);
+ SetPixelPixelInfo(image,&destination,q);
+ SetPixelInfo(image,p,&pixel);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(image);
}
- MagickPixelCompositeAreaBlend(&pixel,(MagickRealType) pixel.opacity,
- &background,(MagickRealType) background.opacity,area,&destination);
- SetPixelPacket(image,&destination,q++,shear_indexes++);
+ CompositePixelInfoAreaBlend(&pixel,(MagickRealType) pixel.alpha,
+ &background,(MagickRealType) background.alpha,area,&destination);
+ SetPixelPixelInfo(image,&destination,q);
+ q+=GetPixelChannels(image);
for (i=0; i < (step-1); i++)
- SetPixelPacket(image,&background,q++,shear_indexes++);
+ {
+ SetPixelPixelInfo(image,&background,q);
+ q+=GetPixelChannels(image);
+ }
break;
}
case DOWN:
@@ -1787,29 +1746,30 @@
/*
Transfer pixels bottom-to-top.
*/
- p+=height;
- indexes+=height;
- q=p+step;
- shear_indexes=indexes+step;
+ p+=height*GetPixelChannels(image);
+ q=p+step*GetPixelChannels(image);
for (i=0; i < (ssize_t) height; i++)
{
- p--;
- indexes--;
- q--;
- shear_indexes--;
+ p-=GetPixelChannels(image);
+ q-=GetPixelChannels(image);
if ((size_t) (y_offset+height+step-i) >= image->rows)
continue;
- SetMagickPixelPacket(image,p,indexes,&source);
- MagickPixelCompositeAreaBlend(&pixel,(MagickRealType) pixel.opacity,
- &source,(MagickRealType) GetPixelOpacity(p),area,&destination);
- SetPixelPacket(image,&destination,q,shear_indexes);
- SetMagickPixelPacket(image,p,indexes,&pixel);
+ SetPixelInfo(image,p,&source);
+ CompositePixelInfoAreaBlend(&pixel,(MagickRealType) pixel.alpha,
+ &source,(MagickRealType) GetPixelAlpha(image,p),area,
+ &destination);
+ SetPixelPixelInfo(image,&destination,q);
+ SetPixelInfo(image,p,&pixel);
}
- MagickPixelCompositeAreaBlend(&pixel,(MagickRealType) pixel.opacity,
- &background,(MagickRealType) background.opacity,area,&destination);
- SetPixelPacket(image,&destination,--q,--shear_indexes);
+ CompositePixelInfoAreaBlend(&pixel,(MagickRealType) pixel.alpha,
+ &background,(MagickRealType) background.alpha,area,&destination);
+ q-=GetPixelChannels(image);
+ SetPixelPixelInfo(image,&destination,q);
for (i=0; i < (step-1); i++)
- SetPixelPacket(image,&background,--q,--shear_indexes);
+ {
+ q-=GetPixelChannels(image);
+ SetPixelPixelInfo(image,&background,q);
+ }
break;
}
}
@@ -1878,10 +1838,6 @@
*integral_image,
*rotate_image;
- ssize_t
- x_offset,
- y_offset;
-
MagickBooleanType
status;
@@ -1900,6 +1856,10 @@
width,
y_width;
+ ssize_t
+ x_offset,
+ y_offset;
+
/*
Adjust rotation angle.
*/
diff --git a/magick/shear.h b/MagickCore/shear.h
similarity index 100%
rename from magick/shear.h
rename to MagickCore/shear.h
diff --git a/magick/signature-private.h b/MagickCore/signature-private.h
similarity index 97%
rename from magick/signature-private.h
rename to MagickCore/signature-private.h
index fc0a60c..2171e17 100644
--- a/magick/signature-private.h
+++ b/MagickCore/signature-private.h
@@ -24,7 +24,7 @@
#define MagickSignatureSize 64
-#include <magick/string_.h>
+#include <MagickCore/string_.h>
typedef struct _SignatureInfo
SignatureInfo;
diff --git a/magick/signature.c b/MagickCore/signature.c
similarity index 97%
rename from magick/signature.c
rename to MagickCore/signature.c
index cdf9dbe..52345bb 100644
--- a/magick/signature.c
+++ b/MagickCore/signature.c
@@ -39,18 +39,18 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/cache.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/property.h"
-#include "magick/image.h"
-#include "magick/memory_.h"
-#include "magick/quantum.h"
-#include "magick/quantum-private.h"
-#include "magick/signature.h"
-#include "magick/signature-private.h"
-#include "magick/string_.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/property.h"
+#include "MagickCore/image.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/quantum.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/signature.h"
+#include "MagickCore/signature-private.h"
+#include "MagickCore/string_.h"
/*
Define declarations.
*/
@@ -482,7 +482,7 @@
QuantumType
quantum_type;
- register const PixelPacket
+ register const Quantum
*p;
SignatureInfo
@@ -528,7 +528,7 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
length=ExportQuantumPixels(image,image_view,quantum_info,quantum_type,
pixels,&image->exception);
diff --git a/magick/signature.h b/MagickCore/signature.h
similarity index 100%
rename from magick/signature.h
rename to MagickCore/signature.h
diff --git a/magick/splay-tree.c b/MagickCore/splay-tree.c
similarity index 99%
rename from magick/splay-tree.c
rename to MagickCore/splay-tree.c
index c9cd202..82be190 100644
--- a/magick/splay-tree.c
+++ b/MagickCore/splay-tree.c
@@ -48,14 +48,14 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/log.h"
-#include "magick/memory_.h"
-#include "magick/splay-tree.h"
-#include "magick/semaphore.h"
-#include "magick/string_.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/log.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/splay-tree.h"
+#include "MagickCore/semaphore.h"
+#include "MagickCore/string_.h"
/*
Define declarations.
diff --git a/magick/splay-tree.h b/MagickCore/splay-tree.h
similarity index 100%
rename from magick/splay-tree.h
rename to MagickCore/splay-tree.h
diff --git a/magick/stamp-h.in b/MagickCore/stamp-h.in
similarity index 100%
rename from magick/stamp-h.in
rename to MagickCore/stamp-h.in
diff --git a/magick/stamp-h1 b/MagickCore/stamp-h1
similarity index 100%
rename from magick/stamp-h1
rename to MagickCore/stamp-h1
diff --git a/magick/static.c b/MagickCore/static.c
similarity index 98%
rename from magick/static.c
rename to MagickCore/static.c
index bd9dd2d..9ef564c 100644
--- a/magick/static.c
+++ b/MagickCore/static.c
@@ -40,13 +40,13 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/module.h"
-#include "magick/policy.h"
-#include "magick/static.h"
-#include "magick/string_.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/module.h"
+#include "MagickCore/policy.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/magick/static.h b/MagickCore/static.h
similarity index 100%
rename from magick/static.h
rename to MagickCore/static.h
diff --git a/magick/statistic.c b/MagickCore/statistic.c
similarity index 76%
rename from magick/statistic.c
rename to MagickCore/statistic.c
index 390e659..9054354 100644
--- a/magick/statistic.c
+++ b/MagickCore/statistic.c
@@ -40,55 +40,55 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/property.h"
-#include "magick/animate.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/cache-private.h"
-#include "magick/cache-view.h"
-#include "magick/client.h"
-#include "magick/color.h"
-#include "magick/color-private.h"
-#include "magick/colorspace.h"
-#include "magick/colorspace-private.h"
-#include "magick/composite.h"
-#include "magick/composite-private.h"
-#include "magick/compress.h"
-#include "magick/constitute.h"
-#include "magick/deprecate.h"
-#include "magick/display.h"
-#include "magick/draw.h"
-#include "magick/enhance.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/gem.h"
-#include "magick/geometry.h"
-#include "magick/list.h"
-#include "magick/image-private.h"
-#include "magick/magic.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/module.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/option.h"
-#include "magick/paint.h"
-#include "magick/pixel-private.h"
-#include "magick/profile.h"
-#include "magick/quantize.h"
-#include "magick/random_.h"
-#include "magick/random-private.h"
-#include "magick/segment.h"
-#include "magick/semaphore.h"
-#include "magick/signature-private.h"
-#include "magick/statistic.h"
-#include "magick/string_.h"
-#include "magick/thread-private.h"
-#include "magick/timer.h"
-#include "magick/utility.h"
-#include "magick/version.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/property.h"
+#include "MagickCore/animate.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/cache-private.h"
+#include "MagickCore/cache-view.h"
+#include "MagickCore/client.h"
+#include "MagickCore/color.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/colorspace-private.h"
+#include "MagickCore/composite.h"
+#include "MagickCore/composite-private.h"
+#include "MagickCore/compress.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/display.h"
+#include "MagickCore/draw.h"
+#include "MagickCore/enhance.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/gem.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/list.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/magic.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/option.h"
+#include "MagickCore/paint.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/profile.h"
+#include "MagickCore/quantize.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/random_.h"
+#include "MagickCore/random-private.h"
+#include "MagickCore/segment.h"
+#include "MagickCore/semaphore.h"
+#include "MagickCore/signature-private.h"
+#include "MagickCore/statistic.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/thread-private.h"
+#include "MagickCore/timer.h"
+#include "MagickCore/utility.h"
+#include "MagickCore/version.h"
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -132,27 +132,27 @@
%
*/
-static MagickPixelPacket **DestroyPixelThreadSet(MagickPixelPacket **pixels)
+static PixelInfo **DestroyPixelThreadSet(PixelInfo **pixels)
{
register ssize_t
i;
- assert(pixels != (MagickPixelPacket **) NULL);
+ assert(pixels != (PixelInfo **) NULL);
for (i=0; i < (ssize_t) GetOpenMPMaximumThreads(); i++)
- if (pixels[i] != (MagickPixelPacket *) NULL)
- pixels[i]=(MagickPixelPacket *) RelinquishMagickMemory(pixels[i]);
- pixels=(MagickPixelPacket **) RelinquishMagickMemory(pixels);
+ if (pixels[i] != (PixelInfo *) NULL)
+ pixels[i]=(PixelInfo *) RelinquishMagickMemory(pixels[i]);
+ pixels=(PixelInfo **) RelinquishMagickMemory(pixels);
return(pixels);
}
-static MagickPixelPacket **AcquirePixelThreadSet(const Image *image,
+static PixelInfo **AcquirePixelThreadSet(const Image *image,
const size_t number_images)
{
register ssize_t
i,
j;
- MagickPixelPacket
+ PixelInfo
**pixels;
size_t
@@ -160,22 +160,22 @@
number_threads;
number_threads=GetOpenMPMaximumThreads();
- pixels=(MagickPixelPacket **) AcquireQuantumMemory(number_threads,
+ pixels=(PixelInfo **) AcquireQuantumMemory(number_threads,
sizeof(*pixels));
- if (pixels == (MagickPixelPacket **) NULL)
- return((MagickPixelPacket **) NULL);
+ if (pixels == (PixelInfo **) NULL)
+ return((PixelInfo **) NULL);
(void) ResetMagickMemory(pixels,0,number_threads*sizeof(*pixels));
for (i=0; i < (ssize_t) number_threads; i++)
{
length=image->columns;
if (length < number_images)
length=number_images;
- pixels[i]=(MagickPixelPacket *) AcquireQuantumMemory(length,
+ pixels[i]=(PixelInfo *) AcquireQuantumMemory(length,
sizeof(**pixels));
- if (pixels[i] == (MagickPixelPacket *) NULL)
+ if (pixels[i] == (PixelInfo *) NULL)
return(DestroyPixelThreadSet(pixels));
for (j=0; j < (ssize_t) length; j++)
- GetMagickPixelPacket(image,&pixels[i][j]);
+ GetPixelInfo(image,&pixels[i][j]);
}
return(pixels);
}
@@ -193,17 +193,17 @@
static int IntensityCompare(const void *x,const void *y)
{
- const MagickPixelPacket
+ const PixelInfo
*color_1,
*color_2;
int
intensity;
- color_1=(const MagickPixelPacket *) x;
- color_2=(const MagickPixelPacket *) y;
- intensity=(int) MagickPixelIntensity(color_2)-
- (int) MagickPixelIntensity(color_1);
+ color_1=(const PixelInfo *) x;
+ color_2=(const PixelInfo *) y;
+ intensity=(int) GetPixelInfoIntensity(color_2)-(int)
+ GetPixelInfoIntensity(color_1);
return(intensity);
}
@@ -433,7 +433,7 @@
MagickOffsetType
progress;
- MagickPixelPacket
+ PixelInfo
**restrict evaluate_pixels,
zero;
@@ -477,7 +477,7 @@
}
number_images=GetImageListLength(images);
evaluate_pixels=AcquirePixelThreadSet(images,number_images);
- if (evaluate_pixels == (MagickPixelPacket **) NULL)
+ if (evaluate_pixels == (PixelInfo **) NULL)
{
evaluate_image=DestroyImage(evaluate_image);
(void) ThrowMagickException(exception,GetMagickModule(),
@@ -489,7 +489,7 @@
*/
status=MagickTrue;
progress=0;
- GetMagickPixelPacket(images,&zero);
+ GetPixelInfo(images,&zero);
random_info=AcquireRandomInfoThreadSet();
evaluate_view=AcquireCacheView(evaluate_image);
if (op == MedianEvaluateOperator)
@@ -507,13 +507,10 @@
const int
id = GetOpenMPThreadId();
- register IndexPacket
- *restrict evaluate_indexes;
-
- register MagickPixelPacket
+ register PixelInfo
*evaluate_pixel;
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -523,12 +520,11 @@
continue;
q=QueueCacheViewAuthenticPixels(evaluate_view,0,y,evaluate_image->columns,
1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- evaluate_indexes=GetCacheViewAuthenticIndexQueue(evaluate_view);
evaluate_pixel=evaluate_pixels[id];
for (x=0; x < (ssize_t) evaluate_image->columns; x++)
{
@@ -540,48 +536,48 @@
next=images;
for (i=0; i < (ssize_t) number_images; i++)
{
- register const IndexPacket
- *indexes;
-
- register const PixelPacket
+ register const Quantum
*p;
image_view=AcquireCacheView(next);
p=GetCacheViewVirtualPixels(image_view,x,y,1,1,exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
{
image_view=DestroyCacheView(image_view);
break;
}
- indexes=GetCacheViewVirtualIndexQueue(image_view);
evaluate_pixel[i].red=ApplyEvaluateOperator(random_info[id],
- GetPixelRed(p),op,evaluate_pixel[i].red);
+ GetPixelRed(next,p),op,evaluate_pixel[i].red);
evaluate_pixel[i].green=ApplyEvaluateOperator(random_info[id],
- GetPixelGreen(p),op,evaluate_pixel[i].green);
+ GetPixelGreen(next,p),op,evaluate_pixel[i].green);
evaluate_pixel[i].blue=ApplyEvaluateOperator(random_info[id],
- GetPixelBlue(p),op,evaluate_pixel[i].blue);
- evaluate_pixel[i].opacity=ApplyEvaluateOperator(random_info[id],
- GetPixelOpacity(p),op,evaluate_pixel[i].opacity);
+ GetPixelBlue(next,p),op,evaluate_pixel[i].blue);
if (evaluate_image->colorspace == CMYKColorspace)
- evaluate_pixel[i].index=ApplyEvaluateOperator(random_info[id],
- *indexes,op,evaluate_pixel[i].index);
+ evaluate_pixel[i].black=ApplyEvaluateOperator(random_info[id],
+ GetPixelBlack(next,p),op,evaluate_pixel[i].black);
+ evaluate_pixel[i].alpha=ApplyEvaluateOperator(random_info[id],
+ GetPixelAlpha(next,p),op,evaluate_pixel[i].alpha);
image_view=DestroyCacheView(image_view);
next=GetNextImageInList(next);
}
qsort((void *) evaluate_pixel,number_images,sizeof(*evaluate_pixel),
IntensityCompare);
- SetPixelRed(q,ClampToQuantum(evaluate_pixel[i/2].red));
- SetPixelGreen(q,ClampToQuantum(evaluate_pixel[i/2].green));
- SetPixelBlue(q,ClampToQuantum(evaluate_pixel[i/2].blue));
- if (evaluate_image->matte == MagickFalse)
- SetPixelOpacity(q,ClampToQuantum(
- evaluate_pixel[i/2].opacity));
- else
- SetPixelAlpha(q,ClampToQuantum(evaluate_pixel[i/2].opacity));
+ SetPixelRed(evaluate_image,
+ ClampToQuantum(evaluate_pixel[i/2].red),q);
+ SetPixelGreen(evaluate_image,
+ ClampToQuantum(evaluate_pixel[i/2].green),q);
+ SetPixelBlue(evaluate_image,
+ ClampToQuantum(evaluate_pixel[i/2].blue),q);
if (evaluate_image->colorspace == CMYKColorspace)
- SetPixelIndex(evaluate_indexes+i,ClampToQuantum(
- evaluate_pixel[i/2].index));
- q++;
+ SetPixelBlack(evaluate_image,
+ ClampToQuantum(evaluate_pixel[i/2].black),q);
+ if (evaluate_image->matte == MagickFalse)
+ SetPixelAlpha(evaluate_image,
+ ClampToQuantum(evaluate_pixel[i/2].alpha),q);
+ else
+ SetPixelAlpha(evaluate_image,
+ ClampToQuantum(evaluate_pixel[i/2].alpha),q);
+ q+=GetPixelChannels(evaluate_image);
}
if (SyncCacheViewAuthenticPixels(evaluate_view,exception) == MagickFalse)
status=MagickFalse;
@@ -614,67 +610,60 @@
const int
id = GetOpenMPThreadId();
- register IndexPacket
- *restrict evaluate_indexes;
-
register ssize_t
i,
x;
- register MagickPixelPacket
+ register PixelInfo
*evaluate_pixel;
- register PixelPacket
+ register Quantum
*restrict q;
if (status == MagickFalse)
continue;
q=QueueCacheViewAuthenticPixels(evaluate_view,0,y,evaluate_image->columns,
1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- evaluate_indexes=GetCacheViewAuthenticIndexQueue(evaluate_view);
evaluate_pixel=evaluate_pixels[id];
for (x=0; x < (ssize_t) evaluate_image->columns; x++)
evaluate_pixel[x]=zero;
next=images;
for (i=0; i < (ssize_t) number_images; i++)
{
- register const IndexPacket
- *indexes;
-
- register const PixelPacket
+ register const Quantum
*p;
image_view=AcquireCacheView(next);
p=GetCacheViewVirtualPixels(image_view,0,y,next->columns,1,exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
{
image_view=DestroyCacheView(image_view);
break;
}
- indexes=GetCacheViewVirtualIndexQueue(image_view);
for (x=0; x < (ssize_t) next->columns; x++)
{
evaluate_pixel[x].red=ApplyEvaluateOperator(random_info[id],
- GetPixelRed(p),i == 0 ? AddEvaluateOperator : op,evaluate_pixel[x].red);
+ GetPixelRed(next,p),i == 0 ? AddEvaluateOperator : op,
+ evaluate_pixel[x].red);
evaluate_pixel[x].green=ApplyEvaluateOperator(random_info[id],
- GetPixelGreen(p),i == 0 ? AddEvaluateOperator : op,
- evaluate_pixel[x].green);
+ GetPixelGreen(next,p),i == 0 ? AddEvaluateOperator : op,
+ evaluate_pixel[x].green);
evaluate_pixel[x].blue=ApplyEvaluateOperator(random_info[id],
- GetPixelBlue(p),i == 0 ? AddEvaluateOperator : op,
- evaluate_pixel[x].blue);
- evaluate_pixel[x].opacity=ApplyEvaluateOperator(random_info[id],
- GetPixelOpacity(p),i == 0 ? AddEvaluateOperator : op,
- evaluate_pixel[x].opacity);
+ GetPixelBlue(next,p),i == 0 ? AddEvaluateOperator : op,
+ evaluate_pixel[x].blue);
if (evaluate_image->colorspace == CMYKColorspace)
- evaluate_pixel[x].index=ApplyEvaluateOperator(random_info[id],
- GetPixelIndex(indexes+x),i == 0 ? AddEvaluateOperator :
- op,evaluate_pixel[x].index);
- p++;
+ evaluate_pixel[x].black=ApplyEvaluateOperator(random_info[id],
+ GetPixelBlack(next,p),i == 0 ? AddEvaluateOperator : op,
+ evaluate_pixel[x].black);
+ evaluate_pixel[x].alpha=ApplyEvaluateOperator(random_info[id],
+ GetPixelAlpha(next,p),i == 0 ? AddEvaluateOperator : op,
+ evaluate_pixel[x].alpha);
+ p+=GetPixelChannels(next);
}
image_view=DestroyCacheView(image_view);
next=GetNextImageInList(next);
@@ -685,22 +674,24 @@
evaluate_pixel[x].red/=number_images;
evaluate_pixel[x].green/=number_images;
evaluate_pixel[x].blue/=number_images;
- evaluate_pixel[x].opacity/=number_images;
- evaluate_pixel[x].index/=number_images;
+ evaluate_pixel[x].black/=number_images;
+ evaluate_pixel[x].alpha/=number_images;
}
for (x=0; x < (ssize_t) evaluate_image->columns; x++)
{
- SetPixelRed(q,ClampToQuantum(evaluate_pixel[x].red));
- SetPixelGreen(q,ClampToQuantum(evaluate_pixel[x].green));
- SetPixelBlue(q,ClampToQuantum(evaluate_pixel[x].blue));
- if (evaluate_image->matte == MagickFalse)
- SetPixelOpacity(q,ClampToQuantum(evaluate_pixel[x].opacity));
- else
- SetPixelAlpha(q,ClampToQuantum(evaluate_pixel[x].opacity));
+ SetPixelRed(evaluate_image,ClampToQuantum(evaluate_pixel[x].red),q);
+ SetPixelGreen(evaluate_image,ClampToQuantum(evaluate_pixel[x].green),q);
+ SetPixelBlue(evaluate_image,ClampToQuantum(evaluate_pixel[x].blue),q);
if (evaluate_image->colorspace == CMYKColorspace)
- SetPixelIndex(evaluate_indexes+x,ClampToQuantum(
- evaluate_pixel[x].index));
- q++;
+ SetPixelBlack(evaluate_image,
+ ClampToQuantum(evaluate_pixel[x].black),q);
+ if (evaluate_image->matte == MagickFalse)
+ SetPixelAlpha(evaluate_image,
+ ClampToQuantum(evaluate_pixel[x].alpha),q);
+ else
+ SetPixelAlpha(evaluate_image,
+ ClampToQuantum(evaluate_pixel[x].alpha),q);
+ q+=GetPixelChannels(evaluate_image);
}
if (SyncCacheViewAuthenticPixels(evaluate_view,exception) == MagickFalse)
status=MagickFalse;
@@ -768,10 +759,7 @@
const int
id = GetOpenMPThreadId();
- register IndexPacket
- *restrict indexes;
-
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -780,36 +768,42 @@
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
if ((channel & RedChannel) != 0)
- SetPixelRed(q,ClampToQuantum(ApplyEvaluateOperator(
- random_info[id],GetPixelRed(q),op,value)));
+ SetPixelRed(image,ClampToQuantum(
+ ApplyEvaluateOperator(random_info[id],
+ GetPixelRed(image,q),op,value)),q);
if ((channel & GreenChannel) != 0)
- SetPixelGreen(q,ClampToQuantum(ApplyEvaluateOperator(
- random_info[id],GetPixelGreen(q),op,value)));
+ SetPixelGreen(image,ClampToQuantum(
+ ApplyEvaluateOperator(random_info[id],
+ GetPixelGreen(image,q),op,value)),q);
if ((channel & BlueChannel) != 0)
- SetPixelBlue(q,ClampToQuantum(ApplyEvaluateOperator(
- random_info[id],GetPixelBlue(q),op,value)));
- if ((channel & OpacityChannel) != 0)
+ SetPixelBlue(image,ClampToQuantum(
+ ApplyEvaluateOperator(random_info[id],
+ GetPixelBlue(image,q),op,value)),q);
+ if (((channel & BlackChannel) != 0) &&
+ (image->colorspace == CMYKColorspace))
+ SetPixelBlack(image,ClampToQuantum(
+ ApplyEvaluateOperator(random_info[id],
+ GetPixelBlack(image,q),op,value)),q);
+ if ((channel & AlphaChannel) != 0)
{
if (image->matte == MagickFalse)
- SetPixelOpacity(q,ClampToQuantum(ApplyEvaluateOperator(
- random_info[id],GetPixelOpacity(q),op,value)));
+ SetPixelAlpha(image,
+ ClampToQuantum(ApplyEvaluateOperator(random_info[id],
+ GetPixelAlpha(image,q),op,value)),q);
else
- SetPixelAlpha(q,ClampToQuantum(ApplyEvaluateOperator(
- random_info[id],(Quantum) GetPixelAlpha(q),op,value)));
+ SetPixelAlpha(image,
+ ClampToQuantum(ApplyEvaluateOperator(random_info[id],
+ GetPixelAlpha(image,q),op,value)),q);
}
- if (((channel & IndexChannel) != 0) && (indexes != (IndexPacket *) NULL))
- SetPixelIndex(indexes+x,ClampToQuantum(ApplyEvaluateOperator(
- random_info[id],GetPixelIndex(indexes+x),op,value)));
- q++;
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -1003,50 +997,45 @@
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- register IndexPacket
- *restrict indexes;
-
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
if ((channel & RedChannel) != 0)
- SetPixelRed(q,ApplyFunction(GetPixelRed(q),
- function,number_parameters,parameters,exception));
+ SetPixelRed(image,ApplyFunction(GetPixelRed(image,q),function,
+ number_parameters,parameters,exception),q);
if ((channel & GreenChannel) != 0)
- SetPixelGreen(q,ApplyFunction(GetPixelGreen(q),
- function,number_parameters,parameters,exception));
+ SetPixelGreen(image,ApplyFunction(GetPixelGreen(image,q),function,
+ number_parameters,parameters,exception),q);
if ((channel & BlueChannel) != 0)
- SetPixelBlue(q,ApplyFunction(GetPixelBlue(q),
- function,number_parameters,parameters,exception));
- if ((channel & OpacityChannel) != 0)
+ SetPixelBlue(image,ApplyFunction(GetPixelBlue(image,q),function,
+ number_parameters,parameters,exception),q);
+ if (((channel & BlackChannel) != 0) &&
+ (image->colorspace == CMYKColorspace))
+ SetPixelBlack(image,ApplyFunction(GetPixelBlack(image,q),function,
+ number_parameters,parameters,exception),q);
+ if ((channel & AlphaChannel) != 0)
{
if (image->matte == MagickFalse)
- SetPixelOpacity(q,ApplyFunction(
- GetPixelOpacity(q),function,number_parameters,parameters,
- exception));
+ SetPixelAlpha(image,ApplyFunction(GetPixelAlpha(image,q),function,
+ number_parameters,parameters,exception),q);
else
- SetPixelAlpha(q,ApplyFunction((Quantum)
- GetPixelAlpha(q),function,number_parameters,parameters,
- exception));
+ SetPixelAlpha(image,ApplyFunction(GetPixelAlpha(image,q),function,
+ number_parameters,parameters,exception),q);
}
- if (((channel & IndexChannel) != 0) && (indexes != (IndexPacket *) NULL))
- SetPixelIndex(indexes+x,ApplyFunction(GetPixelIndex(
- indexes+x),function,number_parameters,parameters,exception));
- q++;
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -1222,18 +1211,7 @@
channel_statistics[BlueChannel].mean;
channels++;
}
- if (((channel & OpacityChannel) != 0) &&
- (image->matte != MagickFalse))
- {
- channel_statistics[CompositeChannels].mean+=
- channel_statistics[OpacityChannel].mean;
- channel_statistics[CompositeChannels].standard_deviation+=
- channel_statistics[OpacityChannel].variance-
- channel_statistics[OpacityChannel].mean*
- channel_statistics[OpacityChannel].mean;
- channels++;
- }
- if (((channel & IndexChannel) != 0) &&
+ if (((channel & BlackChannel) != 0) &&
(image->colorspace == CMYKColorspace))
{
channel_statistics[CompositeChannels].mean+=
@@ -1244,6 +1222,17 @@
channel_statistics[BlackChannel].mean;
channels++;
}
+ if (((channel & AlphaChannel) != 0) &&
+ (image->matte != MagickFalse))
+ {
+ channel_statistics[CompositeChannels].mean+=
+ channel_statistics[AlphaChannel].mean;
+ channel_statistics[CompositeChannels].standard_deviation+=
+ channel_statistics[AlphaChannel].variance-
+ channel_statistics[AlphaChannel].mean*
+ channel_statistics[AlphaChannel].mean;
+ channels++;
+ }
channel_statistics[CompositeChannels].mean/=channels;
channel_statistics[CompositeChannels].standard_deviation=
sqrt(channel_statistics[CompositeChannels].standard_deviation/channels);
@@ -1328,82 +1317,73 @@
sum_fourth_power=0.0;
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const IndexPacket
- *restrict indexes;
-
- register const PixelPacket
+ register const Quantum
*restrict p;
register ssize_t
x;
p=GetVirtualPixels(image,0,y,image->columns,1,exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetVirtualIndexQueue(image);
for (x=0; x < (ssize_t) image->columns; x++)
{
if ((channel & RedChannel) != 0)
{
- mean+=GetPixelRed(p);
- sum_squares+=(double) GetPixelRed(p)*GetPixelRed(p);
- sum_cubes+=(double) GetPixelRed(p)*GetPixelRed(p)*
- GetPixelRed(p);
- sum_fourth_power+=(double) GetPixelRed(p)*
- GetPixelRed(p)*GetPixelRed(p)*
- GetPixelRed(p);
+ mean+=GetPixelRed(image,p);
+ sum_squares+=(double) GetPixelRed(image,p)*GetPixelRed(image,p);
+ sum_cubes+=(double) GetPixelRed(image,p)*GetPixelRed(image,p)*
+ GetPixelRed(image,p);
+ sum_fourth_power+=(double) GetPixelRed(image,p)*
+ GetPixelRed(image,p)*GetPixelRed(image,p)*GetPixelRed(image,p);
area++;
}
if ((channel & GreenChannel) != 0)
{
- mean+=GetPixelGreen(p);
- sum_squares+=(double) GetPixelGreen(p)*
- GetPixelGreen(p);
- sum_cubes+=(double) GetPixelGreen(p)*
- GetPixelGreen(p)*GetPixelGreen(p);
- sum_fourth_power+=(double) GetPixelGreen(p)*
- GetPixelGreen(p)*GetPixelGreen(p)*
- GetPixelGreen(p);
+ mean+=GetPixelGreen(image,p);
+ sum_squares+=(double) GetPixelGreen(image,p)*GetPixelGreen(image,p);
+ sum_cubes+=(double) GetPixelGreen(image,p)*GetPixelGreen(image,p)*
+ GetPixelGreen(image,p);
+ sum_fourth_power+=(double) GetPixelGreen(image,p)*
+ GetPixelGreen(image,p)*GetPixelGreen(image,p)*
+ GetPixelGreen(image,p);
area++;
}
if ((channel & BlueChannel) != 0)
{
- mean+=GetPixelBlue(p);
- sum_squares+=(double) GetPixelBlue(p)*
- GetPixelBlue(p);
- sum_cubes+=(double) GetPixelBlue(p)*GetPixelBlue(p)*
- GetPixelBlue(p);
- sum_fourth_power+=(double) GetPixelBlue(p)*
- GetPixelBlue(p)*GetPixelBlue(p)*
- GetPixelBlue(p);
+ mean+=GetPixelBlue(image,p);
+ sum_squares+=(double) GetPixelBlue(image,p)*GetPixelBlue(image,p);
+ sum_cubes+=(double) GetPixelBlue(image,p)*GetPixelBlue(image,p)*
+ GetPixelBlue(image,p);
+ sum_fourth_power+=(double) GetPixelBlue(image,p)*
+ GetPixelBlue(image,p)*GetPixelBlue(image,p)*
+ GetPixelBlue(image,p);
area++;
}
- if ((channel & OpacityChannel) != 0)
- {
- mean+=GetPixelOpacity(p);
- sum_squares+=(double) GetPixelOpacity(p)*
- GetPixelOpacity(p);
- sum_cubes+=(double) GetPixelOpacity(p)*
- GetPixelOpacity(p)*GetPixelOpacity(p);
- sum_fourth_power+=(double) GetPixelOpacity(p)*
- GetPixelOpacity(p)*GetPixelOpacity(p)*
- GetPixelOpacity(p);
- area++;
- }
- if (((channel & IndexChannel) != 0) &&
+ if (((channel & BlackChannel) != 0) &&
(image->colorspace == CMYKColorspace))
{
- mean+=GetPixelIndex(indexes+x);
- sum_squares+=(double) GetPixelIndex(indexes+x)*
- GetPixelIndex(indexes+x);
- sum_cubes+=(double) GetPixelIndex(indexes+x)*
- GetPixelIndex(indexes+x)*GetPixelIndex(indexes+x);
- sum_fourth_power+=(double) GetPixelIndex(indexes+x)*
- GetPixelIndex(indexes+x)*GetPixelIndex(indexes+x)*
- GetPixelIndex(indexes+x);
+ mean+=GetPixelBlack(image,p);
+ sum_squares+=(double) GetPixelBlack(image,p)*GetPixelBlack(image,p);
+ sum_cubes+=(double) GetPixelBlack(image,p)*GetPixelBlack(image,p)*
+ GetPixelBlack(image,p);
+ sum_fourth_power+=(double) GetPixelBlack(image,p)*
+ GetPixelBlack(image,p)*GetPixelBlack(image,p)*
+ GetPixelBlack(image,p);
area++;
}
- p++;
+ if ((channel & AlphaChannel) != 0)
+ {
+ mean+=GetPixelAlpha(image,p);
+ sum_squares+=(double) GetPixelAlpha(image,p)*GetPixelAlpha(image,p);
+ sum_cubes+=(double) GetPixelAlpha(image,p)*GetPixelAlpha(image,p)*
+ GetPixelAlpha(image,p);
+ sum_fourth_power+=(double) GetPixelAlpha(image,p)*
+ GetPixelAlpha(image,p)*GetPixelAlpha(image,p)*
+ GetPixelAlpha(image,p);
+ area++;
+ }
+ p+=GetPixelChannels(image);
}
}
if (y < (ssize_t) image->rows)
@@ -1472,7 +1452,7 @@
const ChannelType channel,double *minima,double *maxima,
ExceptionInfo *exception)
{
- MagickPixelPacket
+ PixelInfo
pixel;
ssize_t
@@ -1484,25 +1464,21 @@
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
*maxima=(-1.0E-37);
*minima=1.0E+37;
- GetMagickPixelPacket(image,&pixel);
+ GetPixelInfo(image,&pixel);
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const IndexPacket
- *restrict indexes;
-
- register const PixelPacket
+ register const Quantum
*restrict p;
register ssize_t
x;
p=GetVirtualPixels(image,0,y,image->columns,1,exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetVirtualIndexQueue(image);
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetMagickPixelPacket(image,p,indexes+x,&pixel);
+ SetPixelInfo(image,p,&pixel);
if ((channel & RedChannel) != 0)
{
if (pixel.red < *minima)
@@ -1524,22 +1500,22 @@
if (pixel.blue > *maxima)
*maxima=(double) pixel.blue;
}
- if ((channel & OpacityChannel) != 0)
- {
- if (pixel.opacity < *minima)
- *minima=(double) pixel.opacity;
- if (pixel.opacity > *maxima)
- *maxima=(double) pixel.opacity;
- }
- if (((channel & IndexChannel) != 0) &&
+ if (((channel & BlackChannel) != 0) &&
(image->colorspace == CMYKColorspace))
{
- if ((double) GetPixelIndex(indexes+x) < *minima)
- *minima=(double) GetPixelIndex(indexes+x);
- if ((double) GetPixelIndex(indexes+x) > *maxima)
- *maxima=(double) GetPixelIndex(indexes+x);
+ if (pixel.black < *minima)
+ *minima=(double) pixel.black;
+ if (pixel.black > *maxima)
+ *maxima=(double) pixel.black;
}
- p++;
+ if ((channel & AlphaChannel) != 0)
+ {
+ if (pixel.alpha < *minima)
+ *minima=(double) pixel.alpha;
+ if (pixel.alpha > *maxima)
+ *maxima=(double) pixel.alpha;
+ }
+ p+=GetPixelChannels(image);
}
}
return(y == (ssize_t) image->rows ? MagickTrue : MagickFalse);
@@ -1623,28 +1599,23 @@
}
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const IndexPacket
- *restrict indexes;
-
- register const PixelPacket
+ register const Quantum
*restrict p;
register ssize_t
x;
p=GetVirtualPixels(image,0,y,image->columns,1,exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetVirtualIndexQueue(image);
for (x=0; x < (ssize_t) image->columns; )
{
if (channel_statistics[RedChannel].depth != MAGICKCORE_QUANTUM_DEPTH)
{
depth=channel_statistics[RedChannel].depth;
range=GetQuantumRange(depth);
- status=GetPixelRed(p) != ScaleAnyToQuantum(
- ScaleQuantumToAny(GetPixelRed(p),range),range) ?
- MagickTrue : MagickFalse;
+ status=GetPixelRed(image,p) != ScaleAnyToQuantum(ScaleQuantumToAny(
+ GetPixelRed(image,p),range),range) ? MagickTrue : MagickFalse;
if (status != MagickFalse)
{
channel_statistics[RedChannel].depth++;
@@ -1655,9 +1626,8 @@
{
depth=channel_statistics[GreenChannel].depth;
range=GetQuantumRange(depth);
- status=GetPixelGreen(p) != ScaleAnyToQuantum(
- ScaleQuantumToAny(GetPixelGreen(p),range),range) ?
- MagickTrue : MagickFalse;
+ status=GetPixelGreen(image,p) != ScaleAnyToQuantum(ScaleQuantumToAny(
+ GetPixelGreen(image,p),range),range) ? MagickTrue : MagickFalse;
if (status != MagickFalse)
{
channel_statistics[GreenChannel].depth++;
@@ -1668,9 +1638,8 @@
{
depth=channel_statistics[BlueChannel].depth;
range=GetQuantumRange(depth);
- status=GetPixelBlue(p) != ScaleAnyToQuantum(
- ScaleQuantumToAny(GetPixelBlue(p),range),range) ?
- MagickTrue : MagickFalse;
+ status=GetPixelBlue(image,p) != ScaleAnyToQuantum(ScaleQuantumToAny(
+ GetPixelBlue(image,p),range),range) ? MagickTrue : MagickFalse;
if (status != MagickFalse)
{
channel_statistics[BlueChannel].depth++;
@@ -1679,16 +1648,16 @@
}
if (image->matte != MagickFalse)
{
- if (channel_statistics[OpacityChannel].depth != MAGICKCORE_QUANTUM_DEPTH)
+ if (channel_statistics[AlphaChannel].depth != MAGICKCORE_QUANTUM_DEPTH)
{
- depth=channel_statistics[OpacityChannel].depth;
+ depth=channel_statistics[AlphaChannel].depth;
range=GetQuantumRange(depth);
- status=GetPixelOpacity(p) != ScaleAnyToQuantum(
- ScaleQuantumToAny(GetPixelOpacity(p),range),range) ?
+ status=GetPixelAlpha(image,p) != ScaleAnyToQuantum(
+ ScaleQuantumToAny(GetPixelAlpha(image,p),range),range) ?
MagickTrue : MagickFalse;
if (status != MagickFalse)
{
- channel_statistics[OpacityChannel].depth++;
+ channel_statistics[AlphaChannel].depth++;
continue;
}
}
@@ -1699,9 +1668,9 @@
{
depth=channel_statistics[BlackChannel].depth;
range=GetQuantumRange(depth);
- status=GetPixelIndex(indexes+x) !=
- ScaleAnyToQuantum(ScaleQuantumToAny(GetPixelIndex(
- indexes+x),range),range) ? MagickTrue : MagickFalse;
+ status=GetPixelBlack(image,p) != ScaleAnyToQuantum(
+ ScaleQuantumToAny(GetPixelBlack(image,p),range),range) ?
+ MagickTrue : MagickFalse;
if (status != MagickFalse)
{
channel_statistics[BlackChannel].depth++;
@@ -1709,88 +1678,81 @@
}
}
}
- if ((double) GetPixelRed(p) < channel_statistics[RedChannel].minima)
- channel_statistics[RedChannel].minima=(double) GetPixelRed(p);
- if ((double) GetPixelRed(p) > channel_statistics[RedChannel].maxima)
- channel_statistics[RedChannel].maxima=(double) GetPixelRed(p);
- channel_statistics[RedChannel].sum+=GetPixelRed(p);
- channel_statistics[RedChannel].sum_squared+=(double) GetPixelRed(p)*
- GetPixelRed(p);
+ if ((double) GetPixelRed(image,p) < channel_statistics[RedChannel].minima)
+ channel_statistics[RedChannel].minima=(double) GetPixelRed(image,p);
+ if ((double) GetPixelRed(image,p) > channel_statistics[RedChannel].maxima)
+ channel_statistics[RedChannel].maxima=(double) GetPixelRed(image,p);
+ channel_statistics[RedChannel].sum+=GetPixelRed(image,p);
+ channel_statistics[RedChannel].sum_squared+=(double)
+ GetPixelRed(image,p)*GetPixelRed(image,p);
channel_statistics[RedChannel].sum_cubed+=(double)
- GetPixelRed(p)*GetPixelRed(p)*
- GetPixelRed(p);
+ GetPixelRed(image,p)*GetPixelRed(image,p)*GetPixelRed(image,p);
channel_statistics[RedChannel].sum_fourth_power+=(double)
- GetPixelRed(p)*GetPixelRed(p)*
- GetPixelRed(p)*GetPixelRed(p);
- if ((double) GetPixelGreen(p) < channel_statistics[GreenChannel].minima)
+ GetPixelRed(image,p)*GetPixelRed(image,p)*GetPixelRed(image,p)*
+ GetPixelRed(image,p);
+ if ((double) GetPixelGreen(image,p) < channel_statistics[GreenChannel].minima)
channel_statistics[GreenChannel].minima=(double)
- GetPixelGreen(p);
- if ((double) GetPixelGreen(p) > channel_statistics[GreenChannel].maxima)
- channel_statistics[GreenChannel].maxima=(double)
- GetPixelGreen(p);
- channel_statistics[GreenChannel].sum+=GetPixelGreen(p);
+ GetPixelGreen(image,p);
+ if ((double) GetPixelGreen(image,p) > channel_statistics[GreenChannel].maxima)
+ channel_statistics[GreenChannel].maxima=(double) GetPixelGreen(image,p);
+ channel_statistics[GreenChannel].sum+=GetPixelGreen(image,p);
channel_statistics[GreenChannel].sum_squared+=(double)
- GetPixelGreen(p)*GetPixelGreen(p);
+ GetPixelGreen(image,p)*GetPixelGreen(image,p);
channel_statistics[GreenChannel].sum_cubed+=(double)
- GetPixelGreen(p)*GetPixelGreen(p)*
- GetPixelGreen(p);
+ GetPixelGreen(image,p)*GetPixelGreen(image,p)*GetPixelGreen(image,p);
channel_statistics[GreenChannel].sum_fourth_power+=(double)
- GetPixelGreen(p)*GetPixelGreen(p)*
- GetPixelGreen(p)*GetPixelGreen(p);
- if ((double) GetPixelBlue(p) < channel_statistics[BlueChannel].minima)
- channel_statistics[BlueChannel].minima=(double)
- GetPixelBlue(p);
- if ((double) GetPixelBlue(p) > channel_statistics[BlueChannel].maxima)
- channel_statistics[BlueChannel].maxima=(double)
- GetPixelBlue(p);
- channel_statistics[BlueChannel].sum+=GetPixelBlue(p);
+ GetPixelGreen(image,p)*GetPixelGreen(image,p)*GetPixelGreen(image,p)*
+ GetPixelGreen(image,p);
+ if ((double) GetPixelBlue(image,p) < channel_statistics[BlueChannel].minima)
+ channel_statistics[BlueChannel].minima=(double) GetPixelBlue(image,p);
+ if ((double) GetPixelBlue(image,p) > channel_statistics[BlueChannel].maxima)
+ channel_statistics[BlueChannel].maxima=(double) GetPixelBlue(image,p);
+ channel_statistics[BlueChannel].sum+=GetPixelBlue(image,p);
channel_statistics[BlueChannel].sum_squared+=(double)
- GetPixelBlue(p)*GetPixelBlue(p);
+ GetPixelBlue(image,p)*GetPixelBlue(image,p);
channel_statistics[BlueChannel].sum_cubed+=(double)
- GetPixelBlue(p)*GetPixelBlue(p)*
- GetPixelBlue(p);
+ GetPixelBlue(image,p)*GetPixelBlue(image,p)*GetPixelBlue(image,p);
channel_statistics[BlueChannel].sum_fourth_power+=(double)
- GetPixelBlue(p)*GetPixelBlue(p)*
- GetPixelBlue(p)*GetPixelBlue(p);
- if (image->matte != MagickFalse)
- {
- if ((double) GetPixelOpacity(p) < channel_statistics[OpacityChannel].minima)
- channel_statistics[OpacityChannel].minima=(double)
- GetPixelOpacity(p);
- if ((double) GetPixelOpacity(p) > channel_statistics[OpacityChannel].maxima)
- channel_statistics[OpacityChannel].maxima=(double)
- GetPixelOpacity(p);
- channel_statistics[OpacityChannel].sum+=GetPixelOpacity(p);
- channel_statistics[OpacityChannel].sum_squared+=(double)
- GetPixelOpacity(p)*GetPixelOpacity(p);
- channel_statistics[OpacityChannel].sum_cubed+=(double)
- GetPixelOpacity(p)*GetPixelOpacity(p)*
- GetPixelOpacity(p);
- channel_statistics[OpacityChannel].sum_fourth_power+=(double)
- GetPixelOpacity(p)*GetPixelOpacity(p)*
- GetPixelOpacity(p)*GetPixelOpacity(p);
- }
+ GetPixelBlue(image,p)*GetPixelBlue(image,p)*GetPixelBlue(image,p)*
+ GetPixelBlue(image,p);
if (image->colorspace == CMYKColorspace)
{
- if ((double) GetPixelIndex(indexes+x) < channel_statistics[BlackChannel].minima)
+ if ((double) GetPixelBlack(image,p) < channel_statistics[BlackChannel].minima)
channel_statistics[BlackChannel].minima=(double)
- GetPixelIndex(indexes+x);
- if ((double) GetPixelIndex(indexes+x) > channel_statistics[BlackChannel].maxima)
+ GetPixelBlack(image,p);
+ if ((double) GetPixelBlack(image,p) > channel_statistics[BlackChannel].maxima)
channel_statistics[BlackChannel].maxima=(double)
- GetPixelIndex(indexes+x);
- channel_statistics[BlackChannel].sum+=
- GetPixelIndex(indexes+x);
+ GetPixelBlack(image,p);
+ channel_statistics[BlackChannel].sum+=GetPixelBlack(image,p);
channel_statistics[BlackChannel].sum_squared+=(double)
- GetPixelIndex(indexes+x)*GetPixelIndex(indexes+x);
+ GetPixelBlack(image,p)*GetPixelBlack(image,p);
channel_statistics[BlackChannel].sum_cubed+=(double)
- GetPixelIndex(indexes+x)*GetPixelIndex(indexes+x)*
- GetPixelIndex(indexes+x);
+ GetPixelBlack(image,p)*GetPixelBlack(image,p)*
+ GetPixelBlack(image,p);
channel_statistics[BlackChannel].sum_fourth_power+=(double)
- GetPixelIndex(indexes+x)*GetPixelIndex(indexes+x)*
- GetPixelIndex(indexes+x)*GetPixelIndex(indexes+x);
+ GetPixelBlack(image,p)*GetPixelBlack(image,p)*
+ GetPixelBlack(image,p)*GetPixelBlack(image,p);
+ }
+ if (image->matte != MagickFalse)
+ {
+ if ((double) GetPixelAlpha(image,p) < channel_statistics[AlphaChannel].minima)
+ channel_statistics[AlphaChannel].minima=(double)
+ GetPixelAlpha(image,p);
+ if ((double) GetPixelAlpha(image,p) > channel_statistics[AlphaChannel].maxima)
+ channel_statistics[AlphaChannel].maxima=(double)
+ GetPixelAlpha(image,p);
+ channel_statistics[AlphaChannel].sum+=GetPixelAlpha(image,p);
+ channel_statistics[AlphaChannel].sum_squared+=(double)
+ GetPixelAlpha(image,p)*GetPixelAlpha(image,p);
+ channel_statistics[AlphaChannel].sum_cubed+=(double)
+ GetPixelAlpha(image,p)*GetPixelAlpha(image,p)*
+ GetPixelAlpha(image,p);
+ channel_statistics[AlphaChannel].sum_fourth_power+=(double)
+ GetPixelAlpha(image,p)*GetPixelAlpha(image,p)*
+ GetPixelAlpha(image,p)*GetPixelAlpha(image,p);
}
x++;
- p++;
+ p+=GetPixelChannels(image);
}
}
area=(double) image->columns*image->rows;
diff --git a/magick/statistic.h b/MagickCore/statistic.h
similarity index 100%
rename from magick/statistic.h
rename to MagickCore/statistic.h
diff --git a/magick/stream-private.h b/MagickCore/stream-private.h
similarity index 100%
rename from magick/stream-private.h
rename to MagickCore/stream-private.h
diff --git a/magick/stream.c b/MagickCore/stream.c
similarity index 80%
rename from magick/stream.c
rename to MagickCore/stream.c
index 28d4c8d..ee3a483 100644
--- a/magick/stream.c
+++ b/MagickCore/stream.c
@@ -40,25 +40,26 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/cache-private.h"
-#include "magick/color-private.h"
-#include "magick/composite-private.h"
-#include "magick/constitute.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/geometry.h"
-#include "magick/memory_.h"
-#include "magick/pixel.h"
-#include "magick/quantum.h"
-#include "magick/quantum-private.h"
-#include "magick/semaphore.h"
-#include "magick/stream.h"
-#include "magick/stream-private.h"
-#include "magick/string_.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/cache-private.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/composite-private.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/pixel.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantum.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/semaphore.h"
+#include "MagickCore/stream.h"
+#include "MagickCore/stream-private.h"
+#include "MagickCore/string_.h"
/*
Typedef declaractions.
@@ -109,7 +110,7 @@
extern "C" {
#endif
-static const PixelPacket
+static const Quantum
*GetVirtualPixelStream(const Image *,const VirtualPixelMethod,const ssize_t,
const ssize_t,const size_t,const size_t,ExceptionInfo *);
@@ -117,7 +118,7 @@
StreamImagePixels(const StreamInfo *,const Image *,ExceptionInfo *),
SyncAuthenticPixelsStream(Image *,ExceptionInfo *);
-static PixelPacket
+static Quantum
*QueueAuthenticPixelsStream(Image *,const ssize_t,const ssize_t,const size_t,
const size_t,ExceptionInfo *);
@@ -197,8 +198,8 @@
(void) RelinquishMagickMemory(cache_info->pixels);
else
(void) UnmapBlob(cache_info->pixels,(size_t) cache_info->length);
- cache_info->pixels=(PixelPacket *) NULL;
- cache_info->indexes=(IndexPacket *) NULL;
+ cache_info->pixels=(Quantum *) NULL;
+ cache_info->metacontent=(void *) NULL;
cache_info->length=0;
cache_info->mapped=MagickFalse;
}
@@ -286,25 +287,26 @@
% %
% %
% %
-+ G e t A u t h e n t i c I n d e x e s F r o m S t r e a m %
++ G e t A u t h e n t i c M e t a c o n t e n t F r o m S t r e a m %
% %
% %
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% GetAuthenticIndexesFromStream() returns the indexes associated with the
-% last call to QueueAuthenticPixelsStream() or GetAuthenticPixelsStream().
+% GetAuthenticMetacontentFromStream() returns the metacontent corresponding
+% with the last call to QueueAuthenticPixelsStream() or
+% GetAuthenticPixelsStream().
%
-% The format of the GetAuthenticIndexesFromStream() method is:
+% The format of the GetAuthenticMetacontentFromStream() method is:
%
-% IndexPacket *GetAuthenticIndexesFromStream(const Image *image)
+% void *GetAuthenticMetacontentFromStream(const Image *image)
%
% A description of each parameter follows:
%
% o image: the image.
%
*/
-static IndexPacket *GetAuthenticIndexesFromStream(const Image *image)
+static void *GetAuthenticMetacontentFromStream(const Image *image)
{
CacheInfo
*cache_info;
@@ -315,7 +317,7 @@
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
cache_info=(CacheInfo *) image->cache;
assert(cache_info->signature == MagickSignature);
- return(cache_info->indexes);
+ return(cache_info->metacontent);
}
/*
@@ -336,7 +338,7 @@
%
% The format of the GetAuthenticPixelsStream() method is:
%
-% PixelPacket *GetAuthenticPixelsStream(Image *image,const ssize_t x,
+% Quantum *GetAuthenticPixelsStream(Image *image,const ssize_t x,
% const ssize_t y,const size_t columns,const size_t rows,
% ExceptionInfo *exception)
%
@@ -350,11 +352,11 @@
% o exception: return any errors or warnings in this structure.
%
*/
-static PixelPacket *GetAuthenticPixelsStream(Image *image,const ssize_t x,
+static Quantum *GetAuthenticPixelsStream(Image *image,const ssize_t x,
const ssize_t y,const size_t columns,const size_t rows,
ExceptionInfo *exception)
{
- PixelPacket
+ Quantum
*pixels;
assert(image != (Image *) NULL);
@@ -381,14 +383,14 @@
%
% The format of the GetAuthenticPixelsFromStream() method is:
%
-% PixelPacket *GetAuthenticPixelsFromStream(const Image image)
+% Quantum *GetAuthenticPixelsFromStream(const Image image)
%
% A description of each parameter follows:
%
% o image: the image.
%
*/
-static PixelPacket *GetAuthenticPixelsFromStream(const Image *image)
+static Quantum *GetAuthenticPixelsFromStream(const Image *image)
{
CacheInfo
*cache_info;
@@ -436,16 +438,16 @@
static MagickBooleanType GetOneAuthenticPixelFromStream(Image *image,
const ssize_t x,const ssize_t y,PixelPacket *pixel,ExceptionInfo *exception)
{
- register PixelPacket
- *pixels;
+ register Quantum
+ *q;
assert(image != (Image *) NULL);
assert(image->signature == MagickSignature);
*pixel=image->background_color;
- pixels=GetAuthenticPixelsStream(image,x,y,1,1,exception);
- if (pixels != (PixelPacket *) NULL)
+ q=GetAuthenticPixelsStream(image,x,y,1,1,exception);
+ if (q != (Quantum *) NULL)
return(MagickFalse);
- *pixel=(*pixels);
+ GetPixelPacket(image,q,pixel);
return(MagickTrue);
}
@@ -486,16 +488,16 @@
const VirtualPixelMethod virtual_pixel_method,const ssize_t x,const ssize_t y,
PixelPacket *pixel,ExceptionInfo *exception)
{
- const PixelPacket
- *pixels;
+ const Quantum
+ *q;
assert(image != (Image *) NULL);
assert(image->signature == MagickSignature);
*pixel=image->background_color;
- pixels=GetVirtualPixelStream(image,virtual_pixel_method,x,y,1,1,exception);
- if (pixels != (const PixelPacket *) NULL)
+ q=GetVirtualPixelStream(image,virtual_pixel_method,x,y,1,1,exception);
+ if (q != (const Quantum *) NULL)
return(MagickFalse);
- *pixel=(*pixels);
+ GetPixelPacket(image,q,pixel);
return(MagickTrue);
}
@@ -544,17 +546,17 @@
%
% The format of the GetVirtualPixelsStream() method is:
%
-% const IndexPacket *GetVirtualPixelsStream(const Image *image)
+% const Quantum *GetVirtualPixelsStream(const Image *image)
%
% A description of each parameter follows:
%
-% o pixels: return the pixels associated with the last call to
+% o pixels: return the pixels associated corresponding with the last call to
% QueueAuthenticPixelsStream() or GetVirtualPixelStream().
%
% o image: the image.
%
*/
-static const PixelPacket *GetVirtualPixelsStream(const Image *image)
+static const Quantum *GetVirtualPixelsStream(const Image *image)
{
CacheInfo
*cache_info;
@@ -579,19 +581,21 @@
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% GetVirtualIndexesFromStream() returns the indexes associated with the last
-% call to QueueAuthenticPixelsStream() or GetVirtualPixelStream().
+% GetVirtualMetacontentFromStream() returns the associated pixel
+% channels corresponding with the last call to QueueAuthenticPixelsStream() or
+% GetVirtualPixelStream().
%
-% The format of the GetVirtualIndexesFromStream() method is:
+% The format of the GetVirtualMetacontentFromStream() method is:
%
-% const IndexPacket *GetVirtualIndexesFromStream(const Image *image)
+% const void *GetVirtualMetacontentFromStream(const Image *image)
%
% A description of each parameter follows:
%
% o image: the image.
%
*/
-static const IndexPacket *GetVirtualIndexesFromStream(const Image *image)
+static const void *GetVirtualMetacontentFromStream(
+ const Image *image)
{
CacheInfo
*cache_info;
@@ -602,7 +606,7 @@
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
cache_info=(CacheInfo *) image->cache;
assert(cache_info->signature == MagickSignature);
- return(cache_info->indexes);
+ return(cache_info->metacontent);
}
/*
@@ -623,7 +627,7 @@
%
% The format of the GetVirtualPixelStream() method is:
%
-% const PixelPacket *GetVirtualPixelStream(const Image *image,
+% const Quantum *GetVirtualPixelStream(const Image *image,
% const VirtualPixelMethod virtual_pixel_method,const ssize_t x,
% const ssize_t y,const size_t columns,const size_t rows,
% ExceptionInfo *exception)
@@ -647,15 +651,15 @@
if (cache_info->length != (MagickSizeType) ((size_t) cache_info->length))
return(MagickFalse);
cache_info->mapped=MagickFalse;
- cache_info->pixels=(PixelPacket *) AcquireMagickMemory((size_t)
+ cache_info->pixels=(Quantum *) AcquireMagickMemory((size_t)
cache_info->length);
- if (cache_info->pixels == (PixelPacket *) NULL)
+ if (cache_info->pixels == (Quantum *) NULL)
{
cache_info->mapped=MagickTrue;
- cache_info->pixels=(PixelPacket *) MapBlob(-1,IOMode,0,(size_t)
+ cache_info->pixels=(Quantum *) MapBlob(-1,IOMode,0,(size_t)
cache_info->length);
}
- if (cache_info->pixels == (PixelPacket *) NULL)
+ if (cache_info->pixels == (Quantum *) NULL)
{
(void) ThrowMagickException(exception,GetMagickModule(),
ResourceLimitError,"MemoryAllocationFailed","`%s'",
@@ -665,7 +669,7 @@
return(MagickTrue);
}
-static const PixelPacket *GetVirtualPixelStream(const Image *image,
+static const Quantum *GetVirtualPixelStream(const Image *image,
const VirtualPixelMethod magick_unused(virtual_pixel_method),const ssize_t x,
const ssize_t y,const size_t columns,const size_t rows,
ExceptionInfo *exception)
@@ -696,27 +700,25 @@
{
(void) ThrowMagickException(exception,GetMagickModule(),StreamError,
"ImageDoesNotContainTheStreamGeometry","`%s'",image->filename);
- return((PixelPacket *) NULL);
+ return((Quantum *) NULL);
}
cache_info=(CacheInfo *) image->cache;
assert(cache_info->signature == MagickSignature);
/*
Pixels are stored in a temporary buffer until they are synced to the cache.
*/
- cache_info->active_index_channel=((image->storage_class == PseudoClass) ||
- (image->colorspace == CMYKColorspace)) ? MagickTrue : MagickFalse;
number_pixels=(MagickSizeType) columns*rows;
- length=(size_t) number_pixels*sizeof(PixelPacket);
- if (cache_info->active_index_channel != MagickFalse)
- length+=number_pixels*sizeof(IndexPacket);
- if (cache_info->pixels == (PixelPacket *) NULL)
+ length=(size_t) number_pixels*cache_info->pixel_channels*sizeof(Quantum);
+ if (cache_info->metacontent_extent != 0)
+ length+=number_pixels*cache_info->metacontent_extent;
+ if (cache_info->pixels == (Quantum *) NULL)
{
cache_info->length=length;
status=AcquireStreamPixels(cache_info,exception);
if (status == MagickFalse)
{
cache_info->length=0;
- return((PixelPacket *) NULL);
+ return((Quantum *) NULL);
}
}
else
@@ -728,12 +730,13 @@
if (status == MagickFalse)
{
cache_info->length=0;
- return((PixelPacket *) NULL);
+ return((Quantum *) NULL);
}
}
- cache_info->indexes=(IndexPacket *) NULL;
- if (cache_info->active_index_channel != MagickFalse)
- cache_info->indexes=(IndexPacket *) (cache_info->pixels+number_pixels);
+ cache_info->metacontent=(void *) NULL;
+ if (cache_info->metacontent_extent != 0)
+ cache_info->metacontent=(void *) (cache_info->pixels+number_pixels*
+ cache_info->pixel_channels);
return(cache_info->pixels);
}
@@ -796,7 +799,7 @@
%
% The format of the QueueAuthenticPixelsStream() method is:
%
-% PixelPacket *QueueAuthenticPixelsStream(Image *image,const ssize_t x,
+% Quantum *QueueAuthenticPixelsStream(Image *image,const ssize_t x,
% const ssize_t y,const size_t columns,const size_t rows,
% ExceptionInfo *exception)
%
@@ -808,7 +811,7 @@
% pixels.
%
*/
-static PixelPacket *QueueAuthenticPixelsStream(Image *image,const ssize_t x,
+static Quantum *QueueAuthenticPixelsStream(Image *image,const ssize_t x,
const ssize_t y,const size_t columns,const size_t rows,
ExceptionInfo *exception)
{
@@ -835,14 +838,14 @@
{
(void) ThrowMagickException(exception,GetMagickModule(),StreamError,
"ImageDoesNotContainTheStreamGeometry","`%s'",image->filename);
- return((PixelPacket *) NULL);
+ return((Quantum *) NULL);
}
stream_handler=GetBlobStreamHandler(image);
if (stream_handler == (StreamHandler) NULL)
{
(void) ThrowMagickException(exception,GetMagickModule(),StreamError,
"NoStreamHandlerIsDefined","`%s'",image->filename);
- return((PixelPacket *) NULL);
+ return((Quantum *) NULL);
}
cache_info=(CacheInfo *) image->cache;
assert(cache_info->signature == MagickSignature);
@@ -861,31 +864,30 @@
/*
Pixels are stored in a temporary buffer until they are synced to the cache.
*/
- cache_info->active_index_channel=((image->storage_class == PseudoClass) ||
- (image->colorspace == CMYKColorspace)) ? MagickTrue : MagickFalse;
cache_info->columns=columns;
cache_info->rows=rows;
number_pixels=(MagickSizeType) columns*rows;
- length=(size_t) number_pixels*sizeof(PixelPacket);
- if (cache_info->active_index_channel != MagickFalse)
- length+=number_pixels*sizeof(IndexPacket);
- if (cache_info->pixels == (PixelPacket *) NULL)
+ length=(size_t) number_pixels*cache_info->pixel_channels*sizeof(Quantum);
+ if (cache_info->metacontent_extent != 0)
+ length+=number_pixels*cache_info->metacontent_extent;
+ if (cache_info->pixels == (Quantum *) NULL)
{
- cache_info->pixels=(PixelPacket *) AcquireMagickMemory(length);
+ cache_info->pixels=(Quantum *) AcquireMagickMemory(length);
cache_info->length=(MagickSizeType) length;
}
else
if (cache_info->length < (MagickSizeType) length)
{
- cache_info->pixels=(PixelPacket *) ResizeMagickMemory(
+ cache_info->pixels=(Quantum *) ResizeMagickMemory(
cache_info->pixels,length);
cache_info->length=(MagickSizeType) length;
}
if (cache_info->pixels == (void *) NULL)
- return((PixelPacket *) NULL);
- cache_info->indexes=(IndexPacket *) NULL;
- if (cache_info->active_index_channel != MagickFalse)
- cache_info->indexes=(IndexPacket *) (cache_info->pixels+number_pixels);
+ return((Quantum *) NULL);
+ cache_info->metacontent=(void *) NULL;
+ if (cache_info->metacontent_extent != 0)
+ cache_info->metacontent=(void *) (cache_info->pixels+number_pixels*
+ cache_info->pixel_channels);
return(cache_info->pixels);
}
@@ -943,14 +945,15 @@
read_info->cache=AcquirePixelCache(0);
GetPixelCacheMethods(&cache_methods);
cache_methods.get_virtual_pixel_handler=GetVirtualPixelStream;
- cache_methods.get_virtual_indexes_from_handler=GetVirtualIndexesFromStream;
+ cache_methods.get_virtual_metacontent_from_handler=
+ GetVirtualMetacontentFromStream;
cache_methods.get_virtual_pixels_handler=GetVirtualPixelsStream;
cache_methods.get_authentic_pixels_handler=GetAuthenticPixelsStream;
cache_methods.queue_authentic_pixels_handler=QueueAuthenticPixelsStream;
cache_methods.sync_authentic_pixels_handler=SyncAuthenticPixelsStream;
cache_methods.get_authentic_pixels_from_handler=GetAuthenticPixelsFromStream;
- cache_methods.get_authentic_indexes_from_handler=
- GetAuthenticIndexesFromStream;
+ cache_methods.get_authentic_metacontent_from_handler=
+ GetAuthenticMetacontentFromStream;
cache_methods.get_one_virtual_pixel_from_handler=GetOneVirtualPixelFromStream;
cache_methods.get_one_authentic_pixel_from_handler=
GetOneAuthenticPixelFromStream;
@@ -1248,12 +1251,9 @@
QuantumType
*quantum_map;
- register const PixelPacket
+ register const Quantum
*p;
- register IndexPacket
- *indexes;
-
register ssize_t
i,
x;
@@ -1386,13 +1386,13 @@
if (LocaleCompare(stream_info->map,"BGR") == 0)
{
p=GetAuthenticPixelQueue(image);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=ScaleQuantumToChar(GetPixelBlue(p));
- *q++=ScaleQuantumToChar(GetPixelGreen(p));
- *q++=ScaleQuantumToChar(GetPixelRed(p));
+ *q++=ScaleQuantumToChar(GetPixelBlue(image,p));
+ *q++=ScaleQuantumToChar(GetPixelGreen(image,p));
+ *q++=ScaleQuantumToChar(GetPixelRed(image,p));
p++;
}
break;
@@ -1400,14 +1400,14 @@
if (LocaleCompare(stream_info->map,"BGRA") == 0)
{
p=GetAuthenticPixelQueue(image);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=ScaleQuantumToChar(GetPixelBlue(p));
- *q++=ScaleQuantumToChar(GetPixelGreen(p));
- *q++=ScaleQuantumToChar(GetPixelRed(p));
- *q++=ScaleQuantumToChar((Quantum) (GetPixelAlpha(p)));
+ *q++=ScaleQuantumToChar(GetPixelBlue(image,p));
+ *q++=ScaleQuantumToChar(GetPixelGreen(image,p));
+ *q++=ScaleQuantumToChar(GetPixelRed(image,p));
+ *q++=ScaleQuantumToChar(GetPixelAlpha(image,p));
p++;
}
break;
@@ -1415,13 +1415,13 @@
if (LocaleCompare(stream_info->map,"BGRP") == 0)
{
p=GetAuthenticPixelQueue(image);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=ScaleQuantumToChar(GetPixelBlue(p));
- *q++=ScaleQuantumToChar(GetPixelGreen(p));
- *q++=ScaleQuantumToChar(GetPixelRed(p));
+ *q++=ScaleQuantumToChar(GetPixelBlue(image,p));
+ *q++=ScaleQuantumToChar(GetPixelGreen(image,p));
+ *q++=ScaleQuantumToChar(GetPixelRed(image,p));
*q++=ScaleQuantumToChar((Quantum) 0);
p++;
}
@@ -1430,11 +1430,11 @@
if (LocaleCompare(stream_info->map,"I") == 0)
{
p=GetAuthenticPixelQueue(image);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=ScaleQuantumToChar(PixelIntensityToQuantum(p));
+ *q++=ScaleQuantumToChar(GetPixelIntensity(image,p));
p++;
}
break;
@@ -1442,13 +1442,13 @@
if (LocaleCompare(stream_info->map,"RGB") == 0)
{
p=GetAuthenticPixelQueue(image);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=ScaleQuantumToChar(GetPixelRed(p));
- *q++=ScaleQuantumToChar(GetPixelGreen(p));
- *q++=ScaleQuantumToChar(GetPixelBlue(p));
+ *q++=ScaleQuantumToChar(GetPixelRed(image,p));
+ *q++=ScaleQuantumToChar(GetPixelGreen(image,p));
+ *q++=ScaleQuantumToChar(GetPixelBlue(image,p));
p++;
}
break;
@@ -1456,14 +1456,14 @@
if (LocaleCompare(stream_info->map,"RGBA") == 0)
{
p=GetAuthenticPixelQueue(image);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=ScaleQuantumToChar(GetPixelRed(p));
- *q++=ScaleQuantumToChar(GetPixelGreen(p));
- *q++=ScaleQuantumToChar(GetPixelBlue(p));
- *q++=ScaleQuantumToChar((Quantum) (GetPixelAlpha(p)));
+ *q++=ScaleQuantumToChar(GetPixelRed(image,p));
+ *q++=ScaleQuantumToChar(GetPixelGreen(image,p));
+ *q++=ScaleQuantumToChar(GetPixelBlue(image,p));
+ *q++=ScaleQuantumToChar((Quantum) (GetPixelAlpha(image,p)));
p++;
}
break;
@@ -1471,22 +1471,21 @@
if (LocaleCompare(stream_info->map,"RGBP") == 0)
{
p=GetAuthenticPixelQueue(image);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=ScaleQuantumToChar(GetPixelRed(p));
- *q++=ScaleQuantumToChar(GetPixelGreen(p));
- *q++=ScaleQuantumToChar(GetPixelBlue(p));
+ *q++=ScaleQuantumToChar(GetPixelRed(image,p));
+ *q++=ScaleQuantumToChar(GetPixelGreen(image,p));
+ *q++=ScaleQuantumToChar(GetPixelBlue(image,p));
*q++=ScaleQuantumToChar((Quantum) 0);
p++;
}
break;
}
p=GetAuthenticPixelQueue(image);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
for (i=0; i < (ssize_t) length; i++)
@@ -1497,40 +1496,40 @@
case RedQuantum:
case CyanQuantum:
{
- *q=ScaleQuantumToChar(GetPixelRed(p));
+ *q=ScaleQuantumToChar(GetPixelRed(image,p));
break;
}
case GreenQuantum:
case MagentaQuantum:
{
- *q=ScaleQuantumToChar(GetPixelGreen(p));
+ *q=ScaleQuantumToChar(GetPixelGreen(image,p));
break;
}
case BlueQuantum:
case YellowQuantum:
{
- *q=ScaleQuantumToChar(GetPixelBlue(p));
+ *q=ScaleQuantumToChar(GetPixelBlue(image,p));
break;
}
case AlphaQuantum:
{
- *q=ScaleQuantumToChar((Quantum) (GetPixelAlpha(p)));
+ *q=ScaleQuantumToChar((Quantum) (GetPixelAlpha(image,p)));
break;
}
case OpacityQuantum:
{
- *q=ScaleQuantumToChar(GetPixelOpacity(p));
+ *q=ScaleQuantumToChar(GetPixelAlpha(image,p));
break;
}
case BlackQuantum:
{
if (image->colorspace == CMYKColorspace)
- *q=ScaleQuantumToChar(GetPixelIndex(indexes+x));
+ *q=ScaleQuantumToChar(GetPixelBlack(image,p));
break;
}
case IndexQuantum:
{
- *q=ScaleQuantumToChar(PixelIntensityToQuantum(p));
+ *q=ScaleQuantumToChar(GetPixelIntensity(image,p));
break;
}
default:
@@ -1551,15 +1550,15 @@
if (LocaleCompare(stream_info->map,"BGR") == 0)
{
p=GetAuthenticPixelQueue(image);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=(double) ((QuantumScale*GetPixelBlue(p))*
+ *q++=(double) ((QuantumScale*GetPixelBlue(image,p))*
quantum_info->scale+quantum_info->minimum);
- *q++=(double) ((QuantumScale*GetPixelGreen(p))*
+ *q++=(double) ((QuantumScale*GetPixelGreen(image,p))*
quantum_info->scale+quantum_info->minimum);
- *q++=(double) ((QuantumScale*GetPixelRed(p))*
+ *q++=(double) ((QuantumScale*GetPixelRed(image,p))*
quantum_info->scale+quantum_info->minimum);
p++;
}
@@ -1568,17 +1567,17 @@
if (LocaleCompare(stream_info->map,"BGRA") == 0)
{
p=GetAuthenticPixelQueue(image);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=(double) ((QuantumScale*GetPixelBlue(p))*
+ *q++=(double) ((QuantumScale*GetPixelBlue(image,p))*
quantum_info->scale+quantum_info->minimum);
- *q++=(double) ((QuantumScale*GetPixelGreen(p))*
+ *q++=(double) ((QuantumScale*GetPixelGreen(image,p))*
quantum_info->scale+quantum_info->minimum);
- *q++=(double) ((QuantumScale*GetPixelRed(p))*
+ *q++=(double) ((QuantumScale*GetPixelRed(image,p))*
quantum_info->scale+quantum_info->minimum);
- *q++=(double) ((QuantumScale*GetPixelAlpha(p))*
+ *q++=(double) ((QuantumScale*GetPixelAlpha(image,p))*
quantum_info->scale+quantum_info->minimum);
p++;
}
@@ -1587,15 +1586,15 @@
if (LocaleCompare(stream_info->map,"BGRP") == 0)
{
p=GetAuthenticPixelQueue(image);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=(double) ((QuantumScale*GetPixelBlue(p))*
+ *q++=(double) ((QuantumScale*GetPixelBlue(image,p))*
quantum_info->scale+quantum_info->minimum);
- *q++=(double) ((QuantumScale*GetPixelGreen(p))*
+ *q++=(double) ((QuantumScale*GetPixelGreen(image,p))*
quantum_info->scale+quantum_info->minimum);
- *q++=(double) ((QuantumScale*GetPixelRed(p))*
+ *q++=(double) ((QuantumScale*GetPixelRed(image,p))*
quantum_info->scale+quantum_info->minimum);
*q++=0.0;
p++;
@@ -1605,11 +1604,11 @@
if (LocaleCompare(stream_info->map,"I") == 0)
{
p=GetAuthenticPixelQueue(image);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=(double) ((QuantumScale*PixelIntensityToQuantum(p))*
+ *q++=(double) ((QuantumScale*GetPixelIntensity(image,p))*
quantum_info->scale+quantum_info->minimum);
p++;
}
@@ -1618,15 +1617,15 @@
if (LocaleCompare(stream_info->map,"RGB") == 0)
{
p=GetAuthenticPixelQueue(image);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=(double) ((QuantumScale*GetPixelRed(p))*
+ *q++=(double) ((QuantumScale*GetPixelRed(image,p))*
quantum_info->scale+quantum_info->minimum);
- *q++=(double) ((QuantumScale*GetPixelGreen(p))*
+ *q++=(double) ((QuantumScale*GetPixelGreen(image,p))*
quantum_info->scale+quantum_info->minimum);
- *q++=(double) ((QuantumScale*GetPixelBlue(p))*
+ *q++=(double) ((QuantumScale*GetPixelBlue(image,p))*
quantum_info->scale+quantum_info->minimum);
p++;
}
@@ -1635,17 +1634,17 @@
if (LocaleCompare(stream_info->map,"RGBA") == 0)
{
p=GetAuthenticPixelQueue(image);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=(double) ((QuantumScale*GetPixelRed(p))*
+ *q++=(double) ((QuantumScale*GetPixelRed(image,p))*
quantum_info->scale+quantum_info->minimum);
- *q++=(double) ((QuantumScale*GetPixelGreen(p))*
+ *q++=(double) ((QuantumScale*GetPixelGreen(image,p))*
quantum_info->scale+quantum_info->minimum);
- *q++=(double) ((QuantumScale*GetPixelBlue(p))*
+ *q++=(double) ((QuantumScale*GetPixelBlue(image,p))*
quantum_info->scale+quantum_info->minimum);
- *q++=(double) ((QuantumScale*GetPixelAlpha(p))*
+ *q++=(double) ((QuantumScale*GetPixelAlpha(image,p))*
quantum_info->scale+quantum_info->minimum);
p++;
}
@@ -1654,15 +1653,15 @@
if (LocaleCompare(stream_info->map,"RGBP") == 0)
{
p=GetAuthenticPixelQueue(image);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=(double) ((QuantumScale*GetPixelRed(p))*
+ *q++=(double) ((QuantumScale*GetPixelRed(image,p))*
quantum_info->scale+quantum_info->minimum);
- *q++=(double) ((QuantumScale*GetPixelGreen(p))*
+ *q++=(double) ((QuantumScale*GetPixelGreen(image,p))*
quantum_info->scale+quantum_info->minimum);
- *q++=(double) ((QuantumScale*GetPixelBlue(p))*
+ *q++=(double) ((QuantumScale*GetPixelBlue(image,p))*
quantum_info->scale+quantum_info->minimum);
*q++=0.0;
p++;
@@ -1670,9 +1669,8 @@
break;
}
p=GetAuthenticPixelQueue(image);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
for (i=0; i < (ssize_t) length; i++)
@@ -1683,46 +1681,46 @@
case RedQuantum:
case CyanQuantum:
{
- *q=(double) ((QuantumScale*GetPixelRed(p))*
+ *q=(double) ((QuantumScale*GetPixelRed(image,p))*
quantum_info->scale+quantum_info->minimum);
break;
}
case GreenQuantum:
case MagentaQuantum:
{
- *q=(double) ((QuantumScale*GetPixelGreen(p))*
+ *q=(double) ((QuantumScale*GetPixelGreen(image,p))*
quantum_info->scale+quantum_info->minimum);
break;
}
case BlueQuantum:
case YellowQuantum:
{
- *q=(double) ((QuantumScale*GetPixelBlue(p))*
+ *q=(double) ((QuantumScale*GetPixelBlue(image,p))*
quantum_info->scale+quantum_info->minimum);
break;
}
case AlphaQuantum:
{
- *q=(double) ((QuantumScale*GetPixelAlpha(p))*
+ *q=(double) ((QuantumScale*GetPixelAlpha(image,p))*
quantum_info->scale+quantum_info->minimum);
break;
}
case OpacityQuantum:
{
- *q=(double) ((QuantumScale*GetPixelOpacity(p))*
+ *q=(double) ((QuantumScale*GetPixelAlpha(image,p))*
quantum_info->scale+quantum_info->minimum);
break;
}
case BlackQuantum:
{
if (image->colorspace == CMYKColorspace)
- *q=(double) ((QuantumScale*GetPixelIndex(indexes+x))*
+ *q=(double) ((QuantumScale*GetPixelBlack(image,p))*
quantum_info->scale+quantum_info->minimum);
break;
}
case IndexQuantum:
{
- *q=(double) ((QuantumScale*PixelIntensityToQuantum(p))*
+ *q=(double) ((QuantumScale*GetPixelIntensity(image,p))*
quantum_info->scale+quantum_info->minimum);
break;
}
@@ -1744,15 +1742,15 @@
if (LocaleCompare(stream_info->map,"BGR") == 0)
{
p=GetAuthenticPixelQueue(image);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=(float) ((QuantumScale*GetPixelBlue(p))*
+ *q++=(float) ((QuantumScale*GetPixelBlue(image,p))*
quantum_info->scale+quantum_info->minimum);
- *q++=(float) ((QuantumScale*GetPixelGreen(p))*
+ *q++=(float) ((QuantumScale*GetPixelGreen(image,p))*
quantum_info->scale+quantum_info->minimum);
- *q++=(float) ((QuantumScale*GetPixelRed(p))*
+ *q++=(float) ((QuantumScale*GetPixelRed(image,p))*
quantum_info->scale+quantum_info->minimum);
p++;
}
@@ -1761,17 +1759,17 @@
if (LocaleCompare(stream_info->map,"BGRA") == 0)
{
p=GetAuthenticPixelQueue(image);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=(float) ((QuantumScale*GetPixelBlue(p))*
+ *q++=(float) ((QuantumScale*GetPixelBlue(image,p))*
quantum_info->scale+quantum_info->minimum);
- *q++=(float) ((QuantumScale*GetPixelGreen(p))*
+ *q++=(float) ((QuantumScale*GetPixelGreen(image,p))*
quantum_info->scale+quantum_info->minimum);
- *q++=(float) ((QuantumScale*GetPixelRed(p))*
+ *q++=(float) ((QuantumScale*GetPixelRed(image,p))*
quantum_info->scale+quantum_info->minimum);
- *q++=(float) ((QuantumScale*(Quantum) (GetPixelAlpha(p)))*
+ *q++=(float) ((QuantumScale*(Quantum) (GetPixelAlpha(image,p)))*
quantum_info->scale+quantum_info->minimum);
p++;
}
@@ -1780,15 +1778,15 @@
if (LocaleCompare(stream_info->map,"BGRP") == 0)
{
p=GetAuthenticPixelQueue(image);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=(float) ((QuantumScale*GetPixelBlue(p))*
+ *q++=(float) ((QuantumScale*GetPixelBlue(image,p))*
quantum_info->scale+quantum_info->minimum);
- *q++=(float) ((QuantumScale*GetPixelGreen(p))*
+ *q++=(float) ((QuantumScale*GetPixelGreen(image,p))*
quantum_info->scale+quantum_info->minimum);
- *q++=(float) ((QuantumScale*GetPixelRed(p))*
+ *q++=(float) ((QuantumScale*GetPixelRed(image,p))*
quantum_info->scale+quantum_info->minimum);
*q++=0.0;
p++;
@@ -1798,11 +1796,11 @@
if (LocaleCompare(stream_info->map,"I") == 0)
{
p=GetAuthenticPixelQueue(image);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=(float) ((QuantumScale*PixelIntensityToQuantum(p))*
+ *q++=(float) ((QuantumScale*GetPixelIntensity(image,p))*
quantum_info->scale+quantum_info->minimum);
p++;
}
@@ -1811,15 +1809,15 @@
if (LocaleCompare(stream_info->map,"RGB") == 0)
{
p=GetAuthenticPixelQueue(image);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=(float) ((QuantumScale*GetPixelRed(p))*
+ *q++=(float) ((QuantumScale*GetPixelRed(image,p))*
quantum_info->scale+quantum_info->minimum);
- *q++=(float) ((QuantumScale*GetPixelGreen(p))*
+ *q++=(float) ((QuantumScale*GetPixelGreen(image,p))*
quantum_info->scale+quantum_info->minimum);
- *q++=(float) ((QuantumScale*GetPixelBlue(p))*
+ *q++=(float) ((QuantumScale*GetPixelBlue(image,p))*
quantum_info->scale+quantum_info->minimum);
p++;
}
@@ -1828,17 +1826,17 @@
if (LocaleCompare(stream_info->map,"RGBA") == 0)
{
p=GetAuthenticPixelQueue(image);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=(float) ((QuantumScale*GetPixelRed(p))*
+ *q++=(float) ((QuantumScale*GetPixelRed(image,p))*
quantum_info->scale+quantum_info->minimum);
- *q++=(float) ((QuantumScale*GetPixelGreen(p))*
+ *q++=(float) ((QuantumScale*GetPixelGreen(image,p))*
quantum_info->scale+quantum_info->minimum);
- *q++=(float) ((QuantumScale*GetPixelBlue(p))*
+ *q++=(float) ((QuantumScale*GetPixelBlue(image,p))*
quantum_info->scale+quantum_info->minimum);
- *q++=(float) ((QuantumScale*GetPixelAlpha(p))*
+ *q++=(float) ((QuantumScale*GetPixelAlpha(image,p))*
quantum_info->scale+quantum_info->minimum);
p++;
}
@@ -1847,15 +1845,15 @@
if (LocaleCompare(stream_info->map,"RGBP") == 0)
{
p=GetAuthenticPixelQueue(image);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=(float) ((QuantumScale*GetPixelRed(p))*
+ *q++=(float) ((QuantumScale*GetPixelRed(image,p))*
quantum_info->scale+quantum_info->minimum);
- *q++=(float) ((QuantumScale*GetPixelGreen(p))*
+ *q++=(float) ((QuantumScale*GetPixelGreen(image,p))*
quantum_info->scale+quantum_info->minimum);
- *q++=(float) ((QuantumScale*GetPixelBlue(p))*
+ *q++=(float) ((QuantumScale*GetPixelBlue(image,p))*
quantum_info->scale+quantum_info->minimum);
*q++=0.0;
p++;
@@ -1863,9 +1861,8 @@
break;
}
p=GetAuthenticPixelQueue(image);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
for (i=0; i < (ssize_t) length; i++)
@@ -1876,46 +1873,46 @@
case RedQuantum:
case CyanQuantum:
{
- *q=(float) ((QuantumScale*GetPixelRed(p))*
+ *q=(float) ((QuantumScale*GetPixelRed(image,p))*
quantum_info->scale+quantum_info->minimum);
break;
}
case GreenQuantum:
case MagentaQuantum:
{
- *q=(float) ((QuantumScale*GetPixelGreen(p))*
+ *q=(float) ((QuantumScale*GetPixelGreen(image,p))*
quantum_info->scale+quantum_info->minimum);
break;
}
case BlueQuantum:
case YellowQuantum:
{
- *q=(float) ((QuantumScale*GetPixelBlue(p))*
+ *q=(float) ((QuantumScale*GetPixelBlue(image,p))*
quantum_info->scale+quantum_info->minimum);
break;
}
case AlphaQuantum:
{
- *q=(float) ((QuantumScale*GetPixelAlpha(p))*
+ *q=(float) ((QuantumScale*GetPixelAlpha(image,p))*
quantum_info->scale+quantum_info->minimum);
break;
}
case OpacityQuantum:
{
- *q=(float) ((QuantumScale*GetPixelOpacity(p))*
+ *q=(float) ((QuantumScale*GetPixelAlpha(image,p))*
quantum_info->scale+quantum_info->minimum);
break;
}
case BlackQuantum:
{
if (image->colorspace == CMYKColorspace)
- *q=(float) ((QuantumScale*GetPixelIndex(indexes+x))*
+ *q=(float) ((QuantumScale*GetPixelBlack(image,p))*
quantum_info->scale+quantum_info->minimum);
break;
}
case IndexQuantum:
{
- *q=(float) ((QuantumScale*PixelIntensityToQuantum(p))*
+ *q=(float) ((QuantumScale*GetPixelIntensity(image,p))*
quantum_info->scale+quantum_info->minimum);
break;
}
@@ -1937,13 +1934,13 @@
if (LocaleCompare(stream_info->map,"BGR") == 0)
{
p=GetAuthenticPixelQueue(image);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=(unsigned int) ScaleQuantumToLong(GetPixelBlue(p));
- *q++=(unsigned int) ScaleQuantumToLong(GetPixelGreen(p));
- *q++=(unsigned int) ScaleQuantumToLong(GetPixelRed(p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelBlue(image,p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelGreen(image,p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelRed(image,p));
p++;
}
break;
@@ -1951,15 +1948,14 @@
if (LocaleCompare(stream_info->map,"BGRA") == 0)
{
p=GetAuthenticPixelQueue(image);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=(unsigned int) ScaleQuantumToLong(GetPixelBlue(p));
- *q++=(unsigned int) ScaleQuantumToLong(GetPixelGreen(p));
- *q++=(unsigned int) ScaleQuantumToLong(GetPixelRed(p));
- *q++=(unsigned int) ScaleQuantumToLong((Quantum) (QuantumRange-
- GetPixelOpacity(p)));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelBlue(image,p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelGreen(image,p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelRed(image,p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelAlpha(image,p));
p++;
}
break;
@@ -1967,13 +1963,13 @@
if (LocaleCompare(stream_info->map,"BGRP") == 0)
{
p=GetAuthenticPixelQueue(image);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=(unsigned int) ScaleQuantumToLong(GetPixelBlue(p));
- *q++=(unsigned int) ScaleQuantumToLong(GetPixelGreen(p));
- *q++=(unsigned int) ScaleQuantumToLong(GetPixelRed(p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelBlue(image,p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelGreen(image,p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelRed(image,p));
*q++=0U;
p++;
}
@@ -1982,12 +1978,12 @@
if (LocaleCompare(stream_info->map,"I") == 0)
{
p=GetAuthenticPixelQueue(image);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
*q++=(unsigned int) ScaleQuantumToLong(
- PixelIntensityToQuantum(p));
+ GetPixelIntensity(image,p));
p++;
}
break;
@@ -1995,13 +1991,13 @@
if (LocaleCompare(stream_info->map,"RGB") == 0)
{
p=GetAuthenticPixelQueue(image);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=(unsigned int) ScaleQuantumToLong(GetPixelRed(p));
- *q++=(unsigned int) ScaleQuantumToLong(GetPixelGreen(p));
- *q++=(unsigned int) ScaleQuantumToLong(GetPixelBlue(p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelRed(image,p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelGreen(image,p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelBlue(image,p));
p++;
}
break;
@@ -2009,15 +2005,15 @@
if (LocaleCompare(stream_info->map,"RGBA") == 0)
{
p=GetAuthenticPixelQueue(image);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=(unsigned int) ScaleQuantumToLong(GetPixelRed(p));
- *q++=(unsigned int) ScaleQuantumToLong(GetPixelGreen(p));
- *q++=(unsigned int) ScaleQuantumToLong(GetPixelBlue(p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelRed(image,p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelGreen(image,p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelBlue(image,p));
*q++=(unsigned int) ScaleQuantumToLong((Quantum)
- (GetPixelAlpha(p)));
+ (GetPixelAlpha(image,p)));
p++;
}
break;
@@ -2025,22 +2021,21 @@
if (LocaleCompare(stream_info->map,"RGBP") == 0)
{
p=GetAuthenticPixelQueue(image);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=(unsigned int) ScaleQuantumToLong(GetPixelRed(p));
- *q++=(unsigned int) ScaleQuantumToLong(GetPixelGreen(p));
- *q++=(unsigned int) ScaleQuantumToLong(GetPixelBlue(p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelRed(image,p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelGreen(image,p));
+ *q++=(unsigned int) ScaleQuantumToLong(GetPixelBlue(image,p));
*q++=0U;
p++;
}
break;
}
p=GetAuthenticPixelQueue(image);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
for (i=0; i < (ssize_t) length; i++)
@@ -2051,43 +2046,41 @@
case RedQuantum:
case CyanQuantum:
{
- *q=(unsigned int) ScaleQuantumToLong(GetPixelRed(p));
+ *q=(unsigned int) ScaleQuantumToLong(GetPixelRed(image,p));
break;
}
case GreenQuantum:
case MagentaQuantum:
{
- *q=(unsigned int) ScaleQuantumToLong(GetPixelGreen(p));
+ *q=(unsigned int) ScaleQuantumToLong(GetPixelGreen(image,p));
break;
}
case BlueQuantum:
case YellowQuantum:
{
- *q=(unsigned int) ScaleQuantumToLong(GetPixelBlue(p));
+ *q=(unsigned int) ScaleQuantumToLong(GetPixelBlue(image,p));
break;
}
case AlphaQuantum:
{
- *q=(unsigned int) ScaleQuantumToLong((Quantum) (QuantumRange-
- GetPixelOpacity(p)));
+ *q=(unsigned int) ScaleQuantumToLong(GetPixelAlpha(image,p));
break;
}
case OpacityQuantum:
{
- *q=(unsigned int) ScaleQuantumToLong(GetPixelOpacity(p));
+ *q=(unsigned int) ScaleQuantumToLong(GetPixelAlpha(image,p));
break;
}
case BlackQuantum:
{
if (image->colorspace == CMYKColorspace)
- *q=(unsigned int) ScaleQuantumToLong(GetPixelIndex(
- indexes+x));
+ *q=(unsigned int) ScaleQuantumToLong(GetPixelBlack(image,p));
break;
}
case IndexQuantum:
{
*q=(unsigned int)
- ScaleQuantumToLong(PixelIntensityToQuantum(p));
+ ScaleQuantumToLong(GetPixelIntensity(image,p));
break;
}
default:
@@ -2108,13 +2101,13 @@
if (LocaleCompare(stream_info->map,"BGR") == 0)
{
p=GetAuthenticPixelQueue(image);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=ScaleQuantumToLong(GetPixelBlue(p));
- *q++=ScaleQuantumToLong(GetPixelGreen(p));
- *q++=ScaleQuantumToLong(GetPixelRed(p));
+ *q++=ScaleQuantumToLong(GetPixelBlue(image,p));
+ *q++=ScaleQuantumToLong(GetPixelGreen(image,p));
+ *q++=ScaleQuantumToLong(GetPixelRed(image,p));
p++;
}
break;
@@ -2122,14 +2115,14 @@
if (LocaleCompare(stream_info->map,"BGRA") == 0)
{
p=GetAuthenticPixelQueue(image);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=ScaleQuantumToLong(GetPixelBlue(p));
- *q++=ScaleQuantumToLong(GetPixelGreen(p));
- *q++=ScaleQuantumToLong(GetPixelRed(p));
- *q++=ScaleQuantumToLong((Quantum) (GetPixelAlpha(p)));
+ *q++=ScaleQuantumToLong(GetPixelBlue(image,p));
+ *q++=ScaleQuantumToLong(GetPixelGreen(image,p));
+ *q++=ScaleQuantumToLong(GetPixelRed(image,p));
+ *q++=ScaleQuantumToLong((Quantum) (GetPixelAlpha(image,p)));
p++;
}
break;
@@ -2137,13 +2130,13 @@
if (LocaleCompare(stream_info->map,"BGRP") == 0)
{
p=GetAuthenticPixelQueue(image);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=ScaleQuantumToLong(GetPixelBlue(p));
- *q++=ScaleQuantumToLong(GetPixelGreen(p));
- *q++=ScaleQuantumToLong(GetPixelRed(p));
+ *q++=ScaleQuantumToLong(GetPixelBlue(image,p));
+ *q++=ScaleQuantumToLong(GetPixelGreen(image,p));
+ *q++=ScaleQuantumToLong(GetPixelRed(image,p));
*q++=0;
p++;
}
@@ -2152,11 +2145,11 @@
if (LocaleCompare(stream_info->map,"I") == 0)
{
p=GetAuthenticPixelQueue(image);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=ScaleQuantumToLong(PixelIntensityToQuantum(p));
+ *q++=ScaleQuantumToLong(GetPixelIntensity(image,p));
p++;
}
break;
@@ -2164,13 +2157,13 @@
if (LocaleCompare(stream_info->map,"RGB") == 0)
{
p=GetAuthenticPixelQueue(image);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=ScaleQuantumToLong(GetPixelRed(p));
- *q++=ScaleQuantumToLong(GetPixelGreen(p));
- *q++=ScaleQuantumToLong(GetPixelBlue(p));
+ *q++=ScaleQuantumToLong(GetPixelRed(image,p));
+ *q++=ScaleQuantumToLong(GetPixelGreen(image,p));
+ *q++=ScaleQuantumToLong(GetPixelBlue(image,p));
p++;
}
break;
@@ -2178,14 +2171,14 @@
if (LocaleCompare(stream_info->map,"RGBA") == 0)
{
p=GetAuthenticPixelQueue(image);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=ScaleQuantumToLong(GetPixelRed(p));
- *q++=ScaleQuantumToLong(GetPixelGreen(p));
- *q++=ScaleQuantumToLong(GetPixelBlue(p));
- *q++=ScaleQuantumToLong((Quantum) (GetPixelAlpha(p)));
+ *q++=ScaleQuantumToLong(GetPixelRed(image,p));
+ *q++=ScaleQuantumToLong(GetPixelGreen(image,p));
+ *q++=ScaleQuantumToLong(GetPixelBlue(image,p));
+ *q++=ScaleQuantumToLong((Quantum) (GetPixelAlpha(image,p)));
p++;
}
break;
@@ -2193,22 +2186,21 @@
if (LocaleCompare(stream_info->map,"RGBP") == 0)
{
p=GetAuthenticPixelQueue(image);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=ScaleQuantumToLong(GetPixelRed(p));
- *q++=ScaleQuantumToLong(GetPixelGreen(p));
- *q++=ScaleQuantumToLong(GetPixelBlue(p));
+ *q++=ScaleQuantumToLong(GetPixelRed(image,p));
+ *q++=ScaleQuantumToLong(GetPixelGreen(image,p));
+ *q++=ScaleQuantumToLong(GetPixelBlue(image,p));
*q++=0;
p++;
}
break;
}
p=GetAuthenticPixelQueue(image);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
for (i=0; i < (ssize_t) length; i++)
@@ -2219,40 +2211,40 @@
case RedQuantum:
case CyanQuantum:
{
- *q=ScaleQuantumToLong(GetPixelRed(p));
+ *q=ScaleQuantumToLong(GetPixelRed(image,p));
break;
}
case GreenQuantum:
case MagentaQuantum:
{
- *q=ScaleQuantumToLong(GetPixelGreen(p));
+ *q=ScaleQuantumToLong(GetPixelGreen(image,p));
break;
}
case BlueQuantum:
case YellowQuantum:
{
- *q=ScaleQuantumToLong(GetPixelBlue(p));
+ *q=ScaleQuantumToLong(GetPixelBlue(image,p));
break;
}
case AlphaQuantum:
{
- *q=ScaleQuantumToLong((Quantum) (GetPixelAlpha(p)));
+ *q=ScaleQuantumToLong((Quantum) (GetPixelAlpha(image,p)));
break;
}
case OpacityQuantum:
{
- *q=ScaleQuantumToLong(GetPixelOpacity(p));
+ *q=ScaleQuantumToLong(GetPixelAlpha(image,p));
break;
}
case BlackQuantum:
{
if (image->colorspace == CMYKColorspace)
- *q=ScaleQuantumToLong(GetPixelIndex(indexes+x));
+ *q=ScaleQuantumToLong(GetPixelBlack(image,p));
break;
}
case IndexQuantum:
{
- *q=ScaleQuantumToLong(PixelIntensityToQuantum(p));
+ *q=ScaleQuantumToLong(GetPixelIntensity(image,p));
break;
}
default:
@@ -2273,13 +2265,13 @@
if (LocaleCompare(stream_info->map,"BGR") == 0)
{
p=GetAuthenticPixelQueue(image);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=GetPixelBlue(p);
- *q++=GetPixelGreen(p);
- *q++=GetPixelRed(p);
+ *q++=GetPixelBlue(image,p);
+ *q++=GetPixelGreen(image,p);
+ *q++=GetPixelRed(image,p);
p++;
}
break;
@@ -2287,14 +2279,14 @@
if (LocaleCompare(stream_info->map,"BGRA") == 0)
{
p=GetAuthenticPixelQueue(image);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=GetPixelBlue(p);
- *q++=GetPixelGreen(p);
- *q++=GetPixelRed(p);
- *q++=(Quantum) (GetPixelAlpha(p));
+ *q++=GetPixelBlue(image,p);
+ *q++=GetPixelGreen(image,p);
+ *q++=GetPixelRed(image,p);
+ *q++=(Quantum) (GetPixelAlpha(image,p));
p++;
}
break;
@@ -2302,13 +2294,13 @@
if (LocaleCompare(stream_info->map,"BGRP") == 0)
{
p=GetAuthenticPixelQueue(image);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=GetPixelBlue(p);
- *q++=GetPixelGreen(p);
- *q++=GetPixelRed(p);
+ *q++=GetPixelBlue(image,p);
+ *q++=GetPixelGreen(image,p);
+ *q++=GetPixelRed(image,p);
*q++=0;
p++;
}
@@ -2317,11 +2309,11 @@
if (LocaleCompare(stream_info->map,"I") == 0)
{
p=GetAuthenticPixelQueue(image);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=PixelIntensityToQuantum(p);
+ *q++=GetPixelIntensity(image,p);
p++;
}
break;
@@ -2329,13 +2321,13 @@
if (LocaleCompare(stream_info->map,"RGB") == 0)
{
p=GetAuthenticPixelQueue(image);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=GetPixelRed(p);
- *q++=GetPixelGreen(p);
- *q++=GetPixelBlue(p);
+ *q++=GetPixelRed(image,p);
+ *q++=GetPixelGreen(image,p);
+ *q++=GetPixelBlue(image,p);
p++;
}
break;
@@ -2343,14 +2335,14 @@
if (LocaleCompare(stream_info->map,"RGBA") == 0)
{
p=GetAuthenticPixelQueue(image);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=GetPixelRed(p);
- *q++=GetPixelGreen(p);
- *q++=GetPixelBlue(p);
- *q++=(Quantum) (GetPixelAlpha(p));
+ *q++=GetPixelRed(image,p);
+ *q++=GetPixelGreen(image,p);
+ *q++=GetPixelBlue(image,p);
+ *q++=(Quantum) (GetPixelAlpha(image,p));
p++;
}
break;
@@ -2358,22 +2350,21 @@
if (LocaleCompare(stream_info->map,"RGBP") == 0)
{
p=GetAuthenticPixelQueue(image);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=GetPixelRed(p);
- *q++=GetPixelGreen(p);
- *q++=GetPixelBlue(p);
+ *q++=GetPixelRed(image,p);
+ *q++=GetPixelGreen(image,p);
+ *q++=GetPixelBlue(image,p);
*q++=0U;
p++;
}
break;
}
p=GetAuthenticPixelQueue(image);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
for (i=0; i < (ssize_t) length; i++)
@@ -2384,40 +2375,40 @@
case RedQuantum:
case CyanQuantum:
{
- *q=GetPixelRed(p);
+ *q=GetPixelRed(image,p);
break;
}
case GreenQuantum:
case MagentaQuantum:
{
- *q=GetPixelGreen(p);
+ *q=GetPixelGreen(image,p);
break;
}
case BlueQuantum:
case YellowQuantum:
{
- *q=GetPixelBlue(p);
+ *q=GetPixelBlue(image,p);
break;
}
case AlphaQuantum:
{
- *q=(Quantum) (GetPixelAlpha(p));
+ *q=(Quantum) (GetPixelAlpha(image,p));
break;
}
case OpacityQuantum:
{
- *q=GetPixelOpacity(p);
+ *q=GetPixelAlpha(image,p);
break;
}
case BlackQuantum:
{
if (image->colorspace == CMYKColorspace)
- *q=GetPixelIndex(indexes+x);
+ *q=GetPixelBlack(image,p);
break;
}
case IndexQuantum:
{
- *q=(PixelIntensityToQuantum(p));
+ *q=(GetPixelIntensity(image,p));
break;
}
default:
@@ -2438,13 +2429,13 @@
if (LocaleCompare(stream_info->map,"BGR") == 0)
{
p=GetAuthenticPixelQueue(image);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=ScaleQuantumToShort(GetPixelBlue(p));
- *q++=ScaleQuantumToShort(GetPixelGreen(p));
- *q++=ScaleQuantumToShort(GetPixelRed(p));
+ *q++=ScaleQuantumToShort(GetPixelBlue(image,p));
+ *q++=ScaleQuantumToShort(GetPixelGreen(image,p));
+ *q++=ScaleQuantumToShort(GetPixelRed(image,p));
p++;
}
break;
@@ -2452,14 +2443,14 @@
if (LocaleCompare(stream_info->map,"BGRA") == 0)
{
p=GetAuthenticPixelQueue(image);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=ScaleQuantumToShort(GetPixelBlue(p));
- *q++=ScaleQuantumToShort(GetPixelGreen(p));
- *q++=ScaleQuantumToShort(GetPixelRed(p));
- *q++=ScaleQuantumToShort((Quantum) (GetPixelAlpha(p)));
+ *q++=ScaleQuantumToShort(GetPixelBlue(image,p));
+ *q++=ScaleQuantumToShort(GetPixelGreen(image,p));
+ *q++=ScaleQuantumToShort(GetPixelRed(image,p));
+ *q++=ScaleQuantumToShort((Quantum) (GetPixelAlpha(image,p)));
p++;
}
break;
@@ -2467,13 +2458,13 @@
if (LocaleCompare(stream_info->map,"BGRP") == 0)
{
p=GetAuthenticPixelQueue(image);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=ScaleQuantumToShort(GetPixelBlue(p));
- *q++=ScaleQuantumToShort(GetPixelGreen(p));
- *q++=ScaleQuantumToShort(GetPixelRed(p));
+ *q++=ScaleQuantumToShort(GetPixelBlue(image,p));
+ *q++=ScaleQuantumToShort(GetPixelGreen(image,p));
+ *q++=ScaleQuantumToShort(GetPixelRed(image,p));
*q++=0;
p++;
}
@@ -2482,11 +2473,11 @@
if (LocaleCompare(stream_info->map,"I") == 0)
{
p=GetAuthenticPixelQueue(image);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=ScaleQuantumToShort(PixelIntensityToQuantum(p));
+ *q++=ScaleQuantumToShort(GetPixelIntensity(image,p));
p++;
}
break;
@@ -2494,13 +2485,13 @@
if (LocaleCompare(stream_info->map,"RGB") == 0)
{
p=GetAuthenticPixelQueue(image);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=ScaleQuantumToShort(GetPixelRed(p));
- *q++=ScaleQuantumToShort(GetPixelGreen(p));
- *q++=ScaleQuantumToShort(GetPixelBlue(p));
+ *q++=ScaleQuantumToShort(GetPixelRed(image,p));
+ *q++=ScaleQuantumToShort(GetPixelGreen(image,p));
+ *q++=ScaleQuantumToShort(GetPixelBlue(image,p));
p++;
}
break;
@@ -2508,14 +2499,14 @@
if (LocaleCompare(stream_info->map,"RGBA") == 0)
{
p=GetAuthenticPixelQueue(image);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=ScaleQuantumToShort(GetPixelRed(p));
- *q++=ScaleQuantumToShort(GetPixelGreen(p));
- *q++=ScaleQuantumToShort(GetPixelBlue(p));
- *q++=ScaleQuantumToShort((Quantum) (GetPixelAlpha(p)));
+ *q++=ScaleQuantumToShort(GetPixelRed(image,p));
+ *q++=ScaleQuantumToShort(GetPixelGreen(image,p));
+ *q++=ScaleQuantumToShort(GetPixelBlue(image,p));
+ *q++=ScaleQuantumToShort((Quantum) (GetPixelAlpha(image,p)));
p++;
}
break;
@@ -2523,22 +2514,21 @@
if (LocaleCompare(stream_info->map,"RGBP") == 0)
{
p=GetAuthenticPixelQueue(image);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
- *q++=ScaleQuantumToShort(GetPixelRed(p));
- *q++=ScaleQuantumToShort(GetPixelGreen(p));
- *q++=ScaleQuantumToShort(GetPixelBlue(p));
+ *q++=ScaleQuantumToShort(GetPixelRed(image,p));
+ *q++=ScaleQuantumToShort(GetPixelGreen(image,p));
+ *q++=ScaleQuantumToShort(GetPixelBlue(image,p));
*q++=0;
p++;
}
break;
}
p=GetAuthenticPixelQueue(image);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
for (x=0; x < (ssize_t) GetImageExtent(image); x++)
{
for (i=0; i < (ssize_t) length; i++)
@@ -2549,40 +2539,40 @@
case RedQuantum:
case CyanQuantum:
{
- *q=ScaleQuantumToShort(GetPixelRed(p));
+ *q=ScaleQuantumToShort(GetPixelRed(image,p));
break;
}
case GreenQuantum:
case MagentaQuantum:
{
- *q=ScaleQuantumToShort(GetPixelGreen(p));
+ *q=ScaleQuantumToShort(GetPixelGreen(image,p));
break;
}
case BlueQuantum:
case YellowQuantum:
{
- *q=ScaleQuantumToShort(GetPixelBlue(p));
+ *q=ScaleQuantumToShort(GetPixelBlue(image,p));
break;
}
case AlphaQuantum:
{
- *q=ScaleQuantumToShort((Quantum) (GetPixelAlpha(p)));
+ *q=ScaleQuantumToShort(GetPixelAlpha(image,p));
break;
}
case OpacityQuantum:
{
- *q=ScaleQuantumToShort(GetPixelOpacity(p));
+ *q=ScaleQuantumToShort(GetPixelAlpha(image,p));
break;
}
case BlackQuantum:
{
if (image->colorspace == CMYKColorspace)
- *q=ScaleQuantumToShort(GetPixelIndex(indexes+x));
+ *q=ScaleQuantumToShort(GetPixelBlack(image,p));
break;
}
case IndexQuantum:
{
- *q=ScaleQuantumToShort(PixelIntensityToQuantum(p));
+ *q=ScaleQuantumToShort(GetPixelIntensity(image,p));
break;
}
default:
diff --git a/magick/stream.h b/MagickCore/stream.h
similarity index 100%
rename from magick/stream.h
rename to MagickCore/stream.h
diff --git a/magick/string-private.h b/MagickCore/string-private.h
similarity index 100%
rename from magick/string-private.h
rename to MagickCore/string-private.h
diff --git a/magick/string.c b/MagickCore/string.c
similarity index 98%
rename from magick/string.c
rename to MagickCore/string.c
index 59f6c3e..50bd4b0 100644
--- a/magick/string.c
+++ b/MagickCore/string.c
@@ -39,19 +39,19 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/list.h"
-#include "magick/locale_.h"
-#include "magick/log.h"
-#include "magick/memory_.h"
-#include "magick/property.h"
-#include "magick/resource_.h"
-#include "magick/signature-private.h"
-#include "magick/string_.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/locale_.h"
+#include "MagickCore/log.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/property.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/signature-private.h"
+#include "MagickCore/string_.h"
/*
Static declarations.
diff --git a/magick/string_.h b/MagickCore/string_.h
similarity index 98%
rename from magick/string_.h
rename to MagickCore/string_.h
index b1fd5b5..96f6c0b 100644
--- a/magick/string_.h
+++ b/MagickCore/string_.h
@@ -24,7 +24,7 @@
#include <stdarg.h>
#include <time.h>
-#include "magick/exception.h"
+#include "MagickCore/exception.h"
typedef struct _StringInfo
{
diff --git a/magick/studio.h b/MagickCore/studio.h
similarity index 97%
rename from magick/studio.h
rename to MagickCore/studio.h
index f80c6b0..1e9bd8a 100644
--- a/magick/studio.h
+++ b/MagickCore/studio.h
@@ -33,7 +33,7 @@
#if !defined(_MAGICKCORE_CONFIG_H)
# define _MAGICKCORE_CONFIG_H
# if !defined(vms) && !defined(macintosh)
-# include "magick/magick-config.h"
+# include "MagickCore/magick-config.h"
# else
# include "magick-config.h"
# endif
@@ -55,7 +55,7 @@
#endif
#if defined(MAGICKCORE_NAMESPACE_PREFIX)
-# include "magick/methods.h"
+# include "MagickCore/methods.h"
#endif
#if !defined(const)
@@ -269,7 +269,7 @@
# if !defined(S_ISREG)
# define S_ISREG(mode) (((mode) & S_IFMT) == S_IFREG)
# endif
-# include "magick/magick-type.h"
+# include "MagickCore/magick-type.h"
# if !defined(MAGICKCORE_WINDOWS_SUPPORT)
# include <sys/time.h>
# if defined(MAGICKCORE_HAVE_SYS_TIMES_H)
@@ -289,7 +289,7 @@
# endif
# include <unix.h>
# endif
-# include "magick/magick-type.h"
+# include "MagickCore/magick-type.h"
#endif
#if defined(S_IRUSR) && defined(S_IWUSR)
@@ -301,13 +301,13 @@
#endif
#if defined(MAGICKCORE_WINDOWS_SUPPORT)
-# include "magick/nt-base.h"
+# include "MagickCore/nt-base.h"
#endif
#if defined(macintosh)
-# include "magick/mac.h"
+# include "MagickCore/mac.h"
#endif
#if defined(vms)
-# include "magick/vms.h"
+# include "MagickCore/vms.h"
#endif
#undef HAVE_CONFIG_H
diff --git a/magick/thread-private.h b/MagickCore/thread-private.h
similarity index 98%
rename from magick/thread-private.h
rename to MagickCore/thread-private.h
index 2588eee..6b726c2 100644
--- a/magick/thread-private.h
+++ b/MagickCore/thread-private.h
@@ -22,7 +22,7 @@
extern "C" {
#endif
-#include <magick/thread_.h>
+#include <MagickCore/thread_.h>
#define omp_throttle(factor) num_threads(omp_get_max_threads() >> (factor))
diff --git a/magick/thread.c b/MagickCore/thread.c
similarity index 97%
rename from magick/thread.c
rename to MagickCore/thread.c
index d0515b9..b09da48 100644
--- a/magick/thread.c
+++ b/MagickCore/thread.c
@@ -38,10 +38,10 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/memory_.h"
-#include "magick/thread_.h"
-#include "magick/thread-private.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/thread_.h"
+#include "MagickCore/thread-private.h"
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/magick/thread_.h b/MagickCore/thread_.h
similarity index 100%
rename from magick/thread_.h
rename to MagickCore/thread_.h
diff --git a/magick/threshold.c b/MagickCore/threshold.c
similarity index 80%
rename from magick/threshold.c
rename to MagickCore/threshold.c
index c2bd371..4b95cc1 100644
--- a/magick/threshold.c
+++ b/MagickCore/threshold.c
@@ -40,49 +40,49 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/property.h"
-#include "magick/blob.h"
-#include "magick/cache-view.h"
-#include "magick/color.h"
-#include "magick/color-private.h"
-#include "magick/colormap.h"
-#include "magick/colorspace.h"
-#include "magick/configure.h"
-#include "magick/constitute.h"
-#include "magick/decorate.h"
-#include "magick/draw.h"
-#include "magick/enhance.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/effect.h"
-#include "magick/fx.h"
-#include "magick/gem.h"
-#include "magick/geometry.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/log.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/montage.h"
-#include "magick/option.h"
-#include "magick/pixel-private.h"
-#include "magick/quantize.h"
-#include "magick/quantum.h"
-#include "magick/random_.h"
-#include "magick/random-private.h"
-#include "magick/resize.h"
-#include "magick/resource_.h"
-#include "magick/segment.h"
-#include "magick/shear.h"
-#include "magick/signature-private.h"
-#include "magick/string_.h"
-#include "magick/string-private.h"
-#include "magick/thread-private.h"
-#include "magick/threshold.h"
-#include "magick/transform.h"
-#include "magick/xml-tree.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/property.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/cache-view.h"
+#include "MagickCore/color.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colormap.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/configure.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/decorate.h"
+#include "MagickCore/draw.h"
+#include "MagickCore/enhance.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/effect.h"
+#include "MagickCore/fx.h"
+#include "MagickCore/gem.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/log.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/montage.h"
+#include "MagickCore/option.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantize.h"
+#include "MagickCore/quantum.h"
+#include "MagickCore/random_.h"
+#include "MagickCore/random-private.h"
+#include "MagickCore/resize.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/segment.h"
+#include "MagickCore/shear.h"
+#include "MagickCore/signature-private.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/string-private.h"
+#include "MagickCore/thread-private.h"
+#include "MagickCore/threshold.h"
+#include "MagickCore/transform.h"
+#include "MagickCore/xml-tree.h"
/*
Define declarations.
@@ -161,7 +161,7 @@
MagickOffsetType
progress;
- MagickPixelPacket
+ PixelInfo
zero;
MagickRealType
@@ -190,7 +190,7 @@
*/
status=MagickTrue;
progress=0;
- GetMagickPixelPacket(image,&zero);
+ GetPixelInfo(image,&zero);
number_pixels=(MagickRealType) width*height;
image_view=AcquireCacheView(image);
threshold_view=AcquireCacheView(threshold_image);
@@ -202,19 +202,13 @@
MagickBooleanType
sync;
- register const IndexPacket
- *restrict indexes;
-
- register const PixelPacket
+ register const Quantum
*restrict p;
- register IndexPacket
- *restrict threshold_indexes;
-
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
if (status == MagickFalse)
@@ -223,20 +217,18 @@
height/2L,image->columns+width,height,exception);
q=GetCacheViewAuthenticPixels(threshold_view,0,y,threshold_image->columns,1,
exception);
- if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewVirtualIndexQueue(image_view);
- threshold_indexes=GetCacheViewAuthenticIndexQueue(threshold_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
- MagickPixelPacket
+ PixelInfo
mean,
pixel;
- register const PixelPacket
+ register const Quantum
*r;
register ssize_t
@@ -252,36 +244,34 @@
{
for (u=0; u < (ssize_t) width; u++)
{
- pixel.red+=r[u].red;
- pixel.green+=r[u].green;
- pixel.blue+=r[u].blue;
- pixel.opacity+=r[u].opacity;
+ pixel.red+=GetPixelAlpha(image,r+u*GetPixelChannels(image));
+ pixel.green+=GetPixelGreen(image,r+u*GetPixelChannels(image));
+ pixel.blue+=GetPixelBlue(image,r+u*GetPixelChannels(image));
if (image->colorspace == CMYKColorspace)
- pixel.index=(MagickRealType) GetPixelIndex(
- indexes+x+(r-p)+u);
+ pixel.black+=GetPixelBlack(image,r+u*GetPixelChannels(image));
+ pixel.alpha+=GetPixelAlpha(image,r+u*GetPixelChannels(image));
}
- r+=image->columns+width;
+ r+=(image->columns+width)*GetPixelChannels(image);
}
mean.red=(MagickRealType) (pixel.red/number_pixels+offset);
mean.green=(MagickRealType) (pixel.green/number_pixels+offset);
mean.blue=(MagickRealType) (pixel.blue/number_pixels+offset);
- mean.opacity=(MagickRealType) (pixel.opacity/number_pixels+offset);
+ mean.black=(MagickRealType) (pixel.black/number_pixels+offset);
+ mean.alpha=(MagickRealType) (pixel.alpha/number_pixels+offset);
+ SetPixelRed(threshold_image,(Quantum) (((MagickRealType)
+ GetPixelRed(threshold_image,q) <= mean.red) ? 0 : QuantumRange),q);
+ SetPixelGreen(threshold_image,(Quantum) (((MagickRealType)
+ GetPixelGreen(threshold_image,q) <= mean.green) ? 0 : QuantumRange),q);
+ SetPixelBlue(threshold_image,(Quantum) (((MagickRealType)
+ GetPixelBlue(threshold_image,q) <= mean.blue) ? 0 : QuantumRange),q);
if (image->colorspace == CMYKColorspace)
- mean.index=(MagickRealType) (pixel.index/number_pixels+offset);
- SetPixelRed(q,((MagickRealType) GetPixelRed(q) <=
- mean.red) ? 0 : QuantumRange);
- SetPixelGreen(q,((MagickRealType) GetPixelGreen(q) <=
- mean.green) ? 0 : QuantumRange);
- SetPixelBlue(q,((MagickRealType) GetPixelBlue(q) <=
- mean.blue) ? 0 : QuantumRange);
- SetPixelOpacity(q,((MagickRealType) GetPixelOpacity(q)
- <= mean.opacity) ? 0 : QuantumRange);
- if (image->colorspace == CMYKColorspace)
- SetPixelIndex(threshold_indexes+x,(((MagickRealType)
- GetPixelIndex(threshold_indexes+x) <= mean.index) ? 0 :
- QuantumRange));
- p++;
- q++;
+ SetPixelBlack(threshold_image,(Quantum) (((MagickRealType)
+ GetPixelBlack(threshold_image,q) <= mean.black) ? 0 : QuantumRange),
+ q);
+ SetPixelAlpha(threshold_image,(Quantum) (((MagickRealType)
+ GetPixelAlpha(threshold_image,q) <= mean.alpha) ? 0 : QuantumRange),q);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(threshold_image);
}
sync=SyncCacheViewAuthenticPixels(threshold_view,exception);
if (sync == MagickFalse)
@@ -397,62 +387,58 @@
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- register IndexPacket
- *restrict indexes;
-
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
if (channel == DefaultChannels)
{
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelRed(q,(MagickRealType) PixelIntensityToQuantum(q) <=
- threshold ? 0 : QuantumRange);
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- q++;
+ SetPixelRed(image,(Quantum) ((MagickRealType)
+ GetPixelIntensity(image,q) <= threshold ? 0 : QuantumRange),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ q+=GetPixelChannels(image);
}
}
else
for (x=0; x < (ssize_t) image->columns; x++)
{
if ((channel & RedChannel) != 0)
- SetPixelRed(q,(MagickRealType) GetPixelRed(q) <=
- threshold ? 0 : QuantumRange);
+ SetPixelRed(image,(Quantum) ((MagickRealType)
+ GetPixelRed(image,q) <= threshold ? 0 : QuantumRange),q);
if ((channel & GreenChannel) != 0)
- SetPixelGreen(q,(MagickRealType) GetPixelGreen(q) <=
- threshold ? 0 : QuantumRange);
+ SetPixelGreen(image,(Quantum) ((MagickRealType)
+ GetPixelGreen(image,q) <= threshold ? 0 : QuantumRange),q);
if ((channel & BlueChannel) != 0)
- SetPixelBlue(q,(MagickRealType) GetPixelBlue(q) <=
- threshold ? 0 : QuantumRange);
- if ((channel & OpacityChannel) != 0)
+ SetPixelBlue(image,(Quantum) ((MagickRealType)
+ GetPixelBlue(image,q) <= threshold ? 0 : QuantumRange),q);
+ if (((channel & BlackChannel) != 0) &&
+ (image->colorspace == CMYKColorspace))
+ SetPixelBlack(image,(Quantum) ((MagickRealType)
+ GetPixelBlack(image,q) <= threshold ? 0 : QuantumRange),q);
+ if ((channel & AlphaChannel) != 0)
{
if (image->matte == MagickFalse)
- SetPixelOpacity(q,(MagickRealType)
- GetPixelOpacity(q) <= threshold ? 0 : QuantumRange);
+ SetPixelAlpha(image,(Quantum) ((MagickRealType)
+ GetPixelAlpha(image,q) <= threshold ? 0 : QuantumRange),q);
else
- SetPixelOpacity(q,(MagickRealType)
- GetPixelOpacity(q) <= threshold ? OpaqueOpacity :
- TransparentOpacity);
+ SetPixelAlpha(image,(Quantum) ((MagickRealType)
+ GetPixelAlpha(image,q) >= threshold ? OpaqueAlpha :
+ TransparentAlpha),q);
}
- if (((channel & IndexChannel) != 0) &&
- (image->colorspace == CMYKColorspace))
- SetPixelIndex(indexes+x,(MagickRealType)
- GetPixelIndex(indexes+x) <= threshold ? 0 : QuantumRange);
- q++;
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -535,7 +521,7 @@
MagickOffsetType
progress;
- MagickPixelPacket
+ PixelInfo
threshold;
MagickStatusType
@@ -552,7 +538,7 @@
return(MagickTrue);
if (SetImageStorageClass(image,DirectClass) == MagickFalse)
return(MagickFalse);
- GetMagickPixelPacket(image,&threshold);
+ GetPixelInfo(image,&threshold);
flags=ParseGeometry(thresholds,&geometry_info);
threshold.red=geometry_info.rho;
threshold.green=geometry_info.sigma;
@@ -561,19 +547,19 @@
threshold.blue=geometry_info.xi;
if ((flags & XiValue) == 0)
threshold.blue=threshold.red;
- threshold.opacity=geometry_info.psi;
+ threshold.alpha=geometry_info.psi;
if ((flags & PsiValue) == 0)
- threshold.opacity=threshold.red;
- threshold.index=geometry_info.chi;
+ threshold.alpha=threshold.red;
+ threshold.black=geometry_info.chi;
if ((flags & ChiValue) == 0)
- threshold.index=threshold.red;
+ threshold.black=threshold.red;
if ((flags & PercentValue) != 0)
{
threshold.red*=(QuantumRange/100.0);
threshold.green*=(QuantumRange/100.0);
threshold.blue*=(QuantumRange/100.0);
- threshold.opacity*=(QuantumRange/100.0);
- threshold.index*=(QuantumRange/100.0);
+ threshold.alpha*=(QuantumRange/100.0);
+ threshold.black*=(QuantumRange/100.0);
}
/*
Black threshold image.
@@ -586,58 +572,53 @@
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- register IndexPacket
- *restrict indexes;
-
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
if (channel != DefaultChannels)
{
- if (PixelIntensity(q) < MagickPixelIntensity(&threshold))
+ if (GetPixelIntensity(image,q) < GetPixelInfoIntensity(&threshold))
{
- SetPixelRed(q,0);
- SetPixelGreen(q,0);
- SetPixelBlue(q,0);
+ SetPixelRed(image,0,q);
+ SetPixelGreen(image,0,q);
+ SetPixelBlue(image,0,q);
if (image->colorspace == CMYKColorspace)
- SetPixelIndex(indexes+x,0);
+ SetPixelBlack(image,0,q);
}
}
else
{
if (((channel & RedChannel) != 0) &&
- ((MagickRealType) GetPixelRed(q) < threshold.red))
- SetPixelRed(q,0);
+ ((MagickRealType) GetPixelRed(image,q) < threshold.red))
+ SetPixelRed(image,0,q);
if (((channel & GreenChannel) != 0) &&
- ((MagickRealType) GetPixelGreen(q) < threshold.green))
- SetPixelGreen(q,0);
+ ((MagickRealType) GetPixelGreen(image,q) < threshold.green))
+ SetPixelGreen(image,0,q);
if (((channel & BlueChannel) != 0) &&
- ((MagickRealType) GetPixelBlue(q) < threshold.blue))
- SetPixelBlue(q,0);
- if (((channel & OpacityChannel) != 0) &&
- ((MagickRealType) GetPixelOpacity(q) < threshold.opacity))
- SetPixelOpacity(q,0);
- if (((channel & IndexChannel) != 0) &&
+ ((MagickRealType) GetPixelBlue(image,q) < threshold.blue))
+ SetPixelBlue(image,0,q);
+ if (((channel & BlackChannel) != 0) &&
(image->colorspace == CMYKColorspace) &&
- ((MagickRealType) GetPixelIndex(indexes+x) <
- threshold.index))
- SetPixelIndex(indexes+x,0);
+ ((MagickRealType) GetPixelBlack(image,q) < threshold.black))
+ SetPixelBlack(image,0,q);
+ if (((channel & OpacityChannel) != 0) &&
+ ((MagickRealType) GetPixelAlpha(image,q) < threshold.alpha))
+ SetPixelAlpha(image,0,q);
}
- q++;
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -743,14 +724,10 @@
q=image->colormap;
for (i=0; i < (ssize_t) image->colors; i++)
{
- SetPixelRed(q,ClampToUnsignedQuantum(
- GetPixelRed(q)));
- SetPixelGreen(q,ClampToUnsignedQuantum(
- GetPixelGreen(q)));
- SetPixelBlue(q,ClampToUnsignedQuantum(
- GetPixelBlue(q)));
- SetPixelOpacity(q,ClampToUnsignedQuantum(
- GetPixelOpacity(q)));
+ q->red=ClampToUnsignedQuantum(q->red);
+ q->green=ClampToUnsignedQuantum(q->green);
+ q->blue=ClampToUnsignedQuantum(q->blue);
+ q->alpha=ClampToUnsignedQuantum(q->alpha);
q++;
}
return(SyncImage(image));
@@ -767,43 +744,34 @@
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- register IndexPacket
- *restrict indexes;
-
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
if ((channel & RedChannel) != 0)
- SetPixelRed(q,ClampToUnsignedQuantum(
- GetPixelRed(q)));
+ SetPixelRed(image,ClampToUnsignedQuantum(GetPixelRed(image,q)),q);
if ((channel & GreenChannel) != 0)
- SetPixelGreen(q,ClampToUnsignedQuantum(
- GetPixelGreen(q)));
+ SetPixelGreen(image,ClampToUnsignedQuantum(GetPixelGreen(image,q)),q);
if ((channel & BlueChannel) != 0)
- SetPixelBlue(q,ClampToUnsignedQuantum(
- GetPixelBlue(q)));
- if ((channel & OpacityChannel) != 0)
- SetPixelOpacity(q,ClampToUnsignedQuantum(
- GetPixelOpacity(q)));
- if (((channel & IndexChannel) != 0) &&
+ SetPixelBlue(image,ClampToUnsignedQuantum(GetPixelBlue(image,q)),q);
+ if (((channel & BlackChannel) != 0) &&
(image->colorspace == CMYKColorspace))
- SetPixelIndex(indexes+x,ClampToUnsignedQuantum(
- GetPixelIndex(indexes+x)));
- q++;
+ SetPixelBlack(image,ClampToUnsignedQuantum(GetPixelBlack(image,q)),q);
+ if ((channel & OpacityChannel) != 0)
+ SetPixelAlpha(image,ClampToUnsignedQuantum(GetPixelAlpha(image,q)),q);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -1254,62 +1222,6 @@
% %
% %
% %
-% O r d e r e d D i t h e r I m a g e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% OrderedDitherImage() uses the ordered dithering technique of reducing color
-% images to monochrome using positional information to retain as much
-% information as possible.
-%
-% WARNING: This function is deprecated, and is now just a call to
-% the more more powerful OrderedPosterizeImage(); function.
-%
-% The format of the OrderedDitherImage method is:
-%
-% MagickBooleanType OrderedDitherImage(Image *image)
-% MagickBooleanType OrderedDitherImageChannel(Image *image,
-% const ChannelType channel,ExceptionInfo *exception)
-%
-% A description of each parameter follows:
-%
-% o image: the image.
-%
-% o channel: the channel or channels to be thresholded.
-%
-% o exception: return any errors or warnings in this structure.
-%
-*/
-
-MagickExport MagickBooleanType OrderedDitherImage(Image *image)
-{
- MagickBooleanType
- status;
-
- status=OrderedDitherImageChannel(image,DefaultChannels,&image->exception);
- return(status);
-}
-
-MagickExport MagickBooleanType OrderedDitherImageChannel(Image *image,
- const ChannelType channel,ExceptionInfo *exception)
-{
- MagickBooleanType
- status;
-
- /*
- Call the augumented function OrderedPosterizeImage()
- */
- status=OrderedPosterizeImageChannel(image,channel,"o8x8",exception);
- return(status);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
% O r d e r e d P o s t e r i z e I m a g e %
% %
% %
@@ -1435,16 +1347,16 @@
p = strchr((char *) threshold_map,',');
if ( p != (char *)NULL && isdigit((int) ((unsigned char) *(++p))) )
- levels.index = (unsigned int) strtoul(p, &p, 10);
+ levels.black = (unsigned int) strtoul(p, &p, 10);
else
- levels.index = 2;
+ levels.black = 2;
- levels.red = ((channel & RedChannel ) != 0) ? levels.index : 0;
- levels.green = ((channel & GreenChannel) != 0) ? levels.index : 0;
- levels.blue = ((channel & BlueChannel) != 0) ? levels.index : 0;
- levels.opacity = ((channel & OpacityChannel) != 0) ? levels.index : 0;
- levels.index = ((channel & IndexChannel) != 0
- && (image->colorspace == CMYKColorspace)) ? levels.index : 0;
+ levels.red = ((channel & RedChannel ) != 0) ? levels.black : 0;
+ levels.green = ((channel & GreenChannel) != 0) ? levels.black : 0;
+ levels.blue = ((channel & BlueChannel) != 0) ? levels.black : 0;
+ levels.black = ((channel & BlackChannel) != 0 &&
+ (image->colorspace == CMYKColorspace)) ? levels.black : 0;
+ levels.alpha = ((channel & OpacityChannel) != 0) ? levels.black : 0;
/* if more than a single number, each channel has a separate value */
if ( p != (char *) NULL && *p == ',' ) {
@@ -1456,10 +1368,11 @@
levels.green = (unsigned int) strtoul(p, &p, 10), (void)(*p == ',' && p++);
if ((channel & BlueChannel) != 0)
levels.blue = (unsigned int) strtoul(p, &p, 10), (void)(*p == ',' && p++);
- if ((channel & IndexChannel) != 0 && image->colorspace == CMYKColorspace)
- levels.index=(unsigned int) strtoul(p, &p, 10), (void)(*p == ',' && p++);
+ if ((channel & BlackChannel) != 0 &&
+ (image->colorspace == CMYKColorspace))
+ levels.black=(unsigned int) strtoul(p, &p, 10), (void)(*p == ',' && p++);
if ((channel & OpacityChannel) != 0)
- levels.opacity = (unsigned int) strtoul(p, &p, 10), (void)(*p == ',' && p++);
+ levels.alpha = (unsigned int) strtoul(p, &p, 10), (void)(*p == ',' && p++);
}
}
#else
@@ -1469,7 +1382,7 @@
* LongPixelPacket structure elements, but according to channel?
* Note the channels list may skip elements!!!!
* EG -channel BA -ordered-dither map,2,3
- * will need to map g.rho -> l.blue, and g.sigma -> l.opacity
+ * will need to map g.rho -> l.blue, and g.sigma -> l.alpha
* A simpler way is needed, probably converting geometry to a temporary
* array, then using channel to advance the index into ssize_t pixel packet.
*/
@@ -1477,7 +1390,7 @@
#if 0
printf("DEBUG levels r=%u g=%u b=%u a=%u i=%u\n",
- levels.red, levels.green, levels.blue, levels.opacity, levels.index);
+ levels.red, levels.green, levels.blue, levels.alpha, levels.index);
#endif
{ /* Do the posterized ordered dithering of the image */
@@ -1491,8 +1404,8 @@
levels.red = levels.red ? levels.red-1 : 0;
levels.green = levels.green ? levels.green-1 : 0;
levels.blue = levels.blue ? levels.blue-1 : 0;
- levels.opacity = levels.opacity ? levels.opacity-1 : 0;
- levels.index = levels.index ? levels.index-1 : 0;
+ levels.black = levels.black ? levels.black-1 : 0;
+ levels.alpha = levels.alpha ? levels.alpha-1 : 0;
if (SetImageStorageClass(image,DirectClass) == MagickFalse)
{
@@ -1507,24 +1420,20 @@
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- register IndexPacket
- *restrict indexes;
-
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
register ssize_t
@@ -1549,42 +1458,42 @@
NB: All input levels and divisor are already had 1 subtracted
Opacity is inverted so 'off' represents transparent.
*/
- if (levels.red) {
- t = (ssize_t) (QuantumScale*GetPixelRed(q)*(levels.red*d+1));
+ if (levels.red != 0) {
+ t = (ssize_t) (QuantumScale*GetPixelRed(image,q)*(levels.red*d+1));
l = t/d; t = t-l*d;
- SetPixelRed(q,RoundToQuantum((MagickRealType)
- ((l+(t >= threshold))*(MagickRealType) QuantumRange/levels.red)));
+ SetPixelRed(image,RoundToQuantum((MagickRealType)
+ ((l+(t >= threshold))*(MagickRealType) QuantumRange/levels.red)),q);
}
- if (levels.green) {
- t = (ssize_t) (QuantumScale*GetPixelGreen(q)*
+ if (levels.green != 0) {
+ t = (ssize_t) (QuantumScale*GetPixelGreen(image,q)*
(levels.green*d+1));
l = t/d; t = t-l*d;
- SetPixelGreen(q,RoundToQuantum((MagickRealType)
- ((l+(t >= threshold))*(MagickRealType) QuantumRange/levels.green)));
+ SetPixelGreen(image,RoundToQuantum((MagickRealType)
+ ((l+(t >= threshold))*(MagickRealType) QuantumRange/levels.green)),q);
}
- if (levels.blue) {
- t = (ssize_t) (QuantumScale*GetPixelBlue(q)*
+ if (levels.blue != 0) {
+ t = (ssize_t) (QuantumScale*GetPixelBlue(image,q)*
(levels.blue*d+1));
l = t/d; t = t-l*d;
- SetPixelBlue(q,RoundToQuantum((MagickRealType)
- ((l+(t >= threshold))*(MagickRealType) QuantumRange/levels.blue)));
+ SetPixelBlue(image,RoundToQuantum((MagickRealType)
+ ((l+(t >= threshold))*(MagickRealType) QuantumRange/levels.blue)),q);
}
- if (levels.opacity) {
- t = (ssize_t) ((1.0-QuantumScale*GetPixelOpacity(q))*
- (levels.opacity*d+1));
+ if (levels.alpha != 0) {
+ t = (ssize_t) ((1.0-QuantumScale*GetPixelAlpha(image,q))*
+ (levels.alpha*d+1));
l = t/d; t = t-l*d;
- SetPixelOpacity(q,RoundToQuantum((MagickRealType)
+ SetPixelAlpha(image,RoundToQuantum((MagickRealType)
((1.0-l-(t >= threshold))*(MagickRealType) QuantumRange/
- levels.opacity)));
+ levels.alpha)),q);
}
- if (levels.index) {
- t = (ssize_t) (QuantumScale*GetPixelIndex(indexes+x)*
- (levels.index*d+1));
+ if (levels.black != 0) {
+ t = (ssize_t) (QuantumScale*GetPixelBlack(image,q)*
+ (levels.black*d+1));
l = t/d; t = t-l*d;
- SetPixelIndex(indexes+x,RoundToQuantum((MagickRealType) ((l+
- (t>=threshold))*(MagickRealType) QuantumRange/levels.index)));
+ SetPixelBlack(image,RoundToQuantum((MagickRealType)
+ ((l+(t>=threshold))*(MagickRealType) QuantumRange/levels.black)),q);
}
- q++;
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -1675,7 +1584,7 @@
MagickOffsetType
progress;
- MagickPixelPacket
+ PixelInfo
threshold;
MagickRealType
@@ -1696,7 +1605,7 @@
assert(exception->signature == MagickSignature);
if (thresholds == (const char *) NULL)
return(MagickTrue);
- GetMagickPixelPacket(image,&threshold);
+ GetPixelInfo(image,&threshold);
min_threshold=0.0;
max_threshold=(MagickRealType) QuantumRange;
flags=ParseGeometry(thresholds,&geometry_info);
@@ -1742,45 +1651,42 @@
MagickBooleanType
sync;
- register IndexPacket
- *restrict indexes;
-
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
- IndexPacket
- index;
-
MagickRealType
intensity;
- intensity=(MagickRealType) PixelIntensityToQuantum(q);
+ Quantum
+ index;
+
+ intensity=(MagickRealType) GetPixelIntensity(image,q);
if (intensity < min_threshold)
- threshold.index=min_threshold;
- else if (intensity > max_threshold)
- threshold.index=max_threshold;
+ threshold.black=min_threshold;
else
- threshold.index=(MagickRealType)(QuantumRange*
- GetPseudoRandomValue(random_info[id]));
- index=(IndexPacket) (intensity <= threshold.index ? 0 : 1);
- SetPixelIndex(indexes+x,index);
- SetPixelRGBO(q,image->colormap+(ssize_t) index);
- q++;
+ if (intensity > max_threshold)
+ threshold.black=max_threshold;
+ else
+ threshold.black=(MagickRealType)(QuantumRange*
+ GetPseudoRandomValue(random_info[id]));
+ index=(Quantum) (intensity <= threshold.black ? 0 : 1);
+ SetPixelIndex(image,index,q);
+ SetPixelPacket(image,image->colormap+(ssize_t) index,q);
+ q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
if (sync == MagickFalse)
@@ -1818,10 +1724,7 @@
const int
id = GetOpenMPThreadId();
- register IndexPacket
- *restrict indexes;
-
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -1830,20 +1733,19 @@
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
if ((channel & RedChannel) != 0)
{
- if ((MagickRealType) GetPixelRed(q) < min_threshold)
+ if ((MagickRealType) GetPixelRed(image,q) < min_threshold)
threshold.red=min_threshold;
else
- if ((MagickRealType) GetPixelRed(q) > max_threshold)
+ if ((MagickRealType) GetPixelRed(image,q) > max_threshold)
threshold.red=max_threshold;
else
threshold.red=(MagickRealType) (QuantumRange*
@@ -1851,10 +1753,10 @@
}
if ((channel & GreenChannel) != 0)
{
- if ((MagickRealType) GetPixelGreen(q) < min_threshold)
+ if ((MagickRealType) GetPixelGreen(image,q) < min_threshold)
threshold.green=min_threshold;
else
- if ((MagickRealType) GetPixelGreen(q) > max_threshold)
+ if ((MagickRealType) GetPixelGreen(image,q) > max_threshold)
threshold.green=max_threshold;
else
threshold.green=(MagickRealType) (QuantumRange*
@@ -1862,56 +1764,55 @@
}
if ((channel & BlueChannel) != 0)
{
- if ((MagickRealType) GetPixelBlue(q) < min_threshold)
+ if ((MagickRealType) GetPixelBlue(image,q) < min_threshold)
threshold.blue=min_threshold;
else
- if ((MagickRealType) GetPixelBlue(q) > max_threshold)
+ if ((MagickRealType) GetPixelBlue(image,q) > max_threshold)
threshold.blue=max_threshold;
else
threshold.blue=(MagickRealType) (QuantumRange*
GetPseudoRandomValue(random_info[id]));
}
- if ((channel & OpacityChannel) != 0)
- {
- if ((MagickRealType) GetPixelOpacity(q) < min_threshold)
- threshold.opacity=min_threshold;
- else
- if ((MagickRealType) GetPixelOpacity(q) > max_threshold)
- threshold.opacity=max_threshold;
- else
- threshold.opacity=(MagickRealType) (QuantumRange*
- GetPseudoRandomValue(random_info[id]));
- }
- if (((channel & IndexChannel) != 0) &&
+ if (((channel & BlackChannel) != 0) &&
(image->colorspace == CMYKColorspace))
{
- if ((MagickRealType) GetPixelIndex(indexes+x) < min_threshold)
- threshold.index=min_threshold;
+ if ((MagickRealType) GetPixelBlack(image,q) < min_threshold)
+ threshold.black=min_threshold;
else
- if ((MagickRealType) GetPixelIndex(indexes+x) > max_threshold)
- threshold.index=max_threshold;
+ if ((MagickRealType) GetPixelBlack(image,q) > max_threshold)
+ threshold.black=max_threshold;
else
- threshold.index=(MagickRealType) (QuantumRange*
+ threshold.black=(MagickRealType) (QuantumRange*
+ GetPseudoRandomValue(random_info[id]));
+ }
+ if ((channel & OpacityChannel) != 0)
+ {
+ if ((MagickRealType) GetPixelAlpha(image,q) < min_threshold)
+ threshold.alpha=min_threshold;
+ else
+ if ((MagickRealType) GetPixelAlpha(image,q) > max_threshold)
+ threshold.alpha=max_threshold;
+ else
+ threshold.alpha=(MagickRealType) (QuantumRange*
GetPseudoRandomValue(random_info[id]));
}
if ((channel & RedChannel) != 0)
- SetPixelRed(q,(MagickRealType) GetPixelRed(q) <=
- threshold.red ? 0 : QuantumRange);
+ SetPixelRed(image,(Quantum) ((MagickRealType)
+ GetPixelRed(image,q) <= threshold.red ? 0 : QuantumRange),q);
if ((channel & GreenChannel) != 0)
- SetPixelGreen(q,(MagickRealType) GetPixelGreen(q) <=
- threshold.green ? 0 : QuantumRange);
+ SetPixelGreen(image,(Quantum) ((MagickRealType)
+ GetPixelGreen(image,q) <= threshold.green ? 0 : QuantumRange),q);
if ((channel & BlueChannel) != 0)
- SetPixelBlue(q,(MagickRealType) GetPixelBlue(q) <=
- threshold.blue ? 0 : QuantumRange);
- if ((channel & OpacityChannel) != 0)
- SetPixelOpacity(q,(MagickRealType) GetPixelOpacity(q)
- <= threshold.opacity ? 0 : QuantumRange);
- if (((channel & IndexChannel) != 0) &&
+ SetPixelBlue(image,(Quantum) ((MagickRealType)
+ GetPixelBlue(image,q) <= threshold.blue ? 0 : QuantumRange),q);
+ if (((channel & BlackChannel) != 0) &&
(image->colorspace == CMYKColorspace))
- SetPixelIndex(indexes+x,(MagickRealType)
- GetPixelIndex(indexes+x) <= threshold.index ? 0 :
- QuantumRange);
- q++;
+ SetPixelBlack(image,(Quantum) ((MagickRealType)
+ GetPixelBlack(image,q) <= threshold.black ? 0 : QuantumRange),q);
+ if ((channel & OpacityChannel) != 0)
+ SetPixelAlpha(image,(Quantum) ((MagickRealType)
+ GetPixelAlpha(image,q) <= threshold.alpha ? 0 : QuantumRange),q);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -1992,7 +1893,7 @@
MagickBooleanType
status;
- MagickPixelPacket
+ PixelInfo
threshold;
MagickOffsetType
@@ -2013,7 +1914,7 @@
if (SetImageStorageClass(image,DirectClass) == MagickFalse)
return(MagickFalse);
flags=ParseGeometry(thresholds,&geometry_info);
- GetMagickPixelPacket(image,&threshold);
+ GetPixelInfo(image,&threshold);
threshold.red=geometry_info.rho;
threshold.green=geometry_info.sigma;
if ((flags & SigmaValue) == 0)
@@ -2021,19 +1922,19 @@
threshold.blue=geometry_info.xi;
if ((flags & XiValue) == 0)
threshold.blue=threshold.red;
- threshold.opacity=geometry_info.psi;
+ threshold.alpha=geometry_info.psi;
if ((flags & PsiValue) == 0)
- threshold.opacity=threshold.red;
- threshold.index=geometry_info.chi;
+ threshold.alpha=threshold.red;
+ threshold.black=geometry_info.chi;
if ((flags & ChiValue) == 0)
- threshold.index=threshold.red;
+ threshold.black=threshold.red;
if ((flags & PercentValue) != 0)
{
threshold.red*=(QuantumRange/100.0);
threshold.green*=(QuantumRange/100.0);
threshold.blue*=(QuantumRange/100.0);
- threshold.opacity*=(QuantumRange/100.0);
- threshold.index*=(QuantumRange/100.0);
+ threshold.alpha*=(QuantumRange/100.0);
+ threshold.black*=(QuantumRange/100.0);
}
/*
White threshold image.
@@ -2046,58 +1947,53 @@
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- register IndexPacket
- *restrict indexes;
-
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
if (status == MagickFalse)
continue;
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
if (channel != DefaultChannels)
{
- if (PixelIntensity(q) > MagickPixelIntensity(&threshold))
+ if (GetPixelIntensity(image,q) > GetPixelInfoIntensity(&threshold))
{
- SetPixelRed(q,QuantumRange);
- SetPixelGreen(q,QuantumRange);
- SetPixelBlue(q,QuantumRange);
+ SetPixelRed(image,QuantumRange,q);
+ SetPixelGreen(image,QuantumRange,q);
+ SetPixelBlue(image,QuantumRange,q);
if (image->colorspace == CMYKColorspace)
- SetPixelIndex(indexes+x,QuantumRange);
+ SetPixelBlack(image,QuantumRange,q);
}
}
else
{
if (((channel & RedChannel) != 0) &&
- ((MagickRealType) GetPixelRed(q) > threshold.red))
- SetPixelRed(q,QuantumRange);
+ ((MagickRealType) GetPixelRed(image,q) > threshold.red))
+ SetPixelRed(image,QuantumRange,q);
if (((channel & GreenChannel) != 0) &&
- ((MagickRealType) GetPixelGreen(q) > threshold.green))
- SetPixelGreen(q,QuantumRange);
+ ((MagickRealType) GetPixelGreen(image,q) > threshold.green))
+ SetPixelGreen(image,QuantumRange,q);
if (((channel & BlueChannel) != 0) &&
- ((MagickRealType) GetPixelBlue(q) > threshold.blue))
- SetPixelBlue(q,QuantumRange);
- if (((channel & OpacityChannel) != 0) &&
- ((MagickRealType) GetPixelOpacity(q) > threshold.opacity))
- SetPixelOpacity(q,QuantumRange);
- if (((channel & IndexChannel) != 0) &&
+ ((MagickRealType) GetPixelBlue(image,q) > threshold.blue))
+ SetPixelBlue(image,QuantumRange,q);
+ if (((channel & BlackChannel) != 0) &&
(image->colorspace == CMYKColorspace) &&
- ((MagickRealType) GetPixelIndex(indexes+x)) >
- threshold.index)
- SetPixelIndex(indexes+x,QuantumRange);
+ ((MagickRealType) GetPixelBlack(image,q)) > threshold.black)
+ SetPixelBlack(image,QuantumRange,q);
+ if (((channel & OpacityChannel) != 0) &&
+ ((MagickRealType) GetPixelAlpha(image,q) > threshold.alpha))
+ SetPixelAlpha(image,QuantumRange,q);
}
- q++;
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
diff --git a/magick/threshold.h b/MagickCore/threshold.h
similarity index 93%
rename from magick/threshold.h
rename to MagickCore/threshold.h
index e130556..1315248 100644
--- a/magick/threshold.h
+++ b/MagickCore/threshold.h
@@ -42,8 +42,6 @@
ClampImage(Image *),
ClampImageChannel(Image *,const ChannelType),
ListThresholdMaps(FILE *,ExceptionInfo *),
- OrderedDitherImage(Image *), /* deprecated */
- OrderedDitherImageChannel(Image *,const ChannelType,ExceptionInfo *),
OrderedPosterizeImage(Image *,const char *,ExceptionInfo *),
OrderedPosterizeImageChannel(Image *,const ChannelType,const char *,
ExceptionInfo *),
diff --git a/magick/timer.c b/MagickCore/timer.c
similarity index 98%
rename from magick/timer.c
rename to MagickCore/timer.c
index 9ff19e9..c42f23b 100644
--- a/magick/timer.c
+++ b/MagickCore/timer.c
@@ -40,12 +40,12 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/log.h"
-#include "magick/memory_.h"
-#include "magick/timer.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/log.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/timer.h"
/*
Define declarations.
diff --git a/magick/timer.h b/MagickCore/timer.h
similarity index 100%
rename from magick/timer.h
rename to MagickCore/timer.h
diff --git a/magick/token-private.h b/MagickCore/token-private.h
similarity index 100%
rename from magick/token-private.h
rename to MagickCore/token-private.h
diff --git a/magick/token.c b/MagickCore/token.c
similarity index 98%
rename from magick/token.c
rename to MagickCore/token.c
index d5fac16..cc74f37 100644
--- a/magick/token.c
+++ b/MagickCore/token.c
@@ -40,16 +40,16 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/memory_.h"
-#include "magick/string_.h"
-#include "magick/string-private.h"
-#include "magick/token.h"
-#include "magick/token-private.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/string-private.h"
+#include "MagickCore/token.h"
+#include "MagickCore/token-private.h"
+#include "MagickCore/utility.h"
/*
Typedef declaractions.
diff --git a/magick/token.h b/MagickCore/token.h
similarity index 100%
rename from magick/token.h
rename to MagickCore/token.h
diff --git a/magick/transform.c b/MagickCore/transform.c
similarity index 87%
rename from magick/transform.c
rename to MagickCore/transform.c
index 65f16d2..1dce2d7 100644
--- a/magick/transform.c
+++ b/MagickCore/transform.c
@@ -39,32 +39,32 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/attribute.h"
-#include "magick/cache.h"
-#include "magick/cache-view.h"
-#include "magick/color.h"
-#include "magick/color-private.h"
-#include "magick/colorspace-private.h"
-#include "magick/composite.h"
-#include "magick/draw.h"
-#include "magick/effect.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/geometry.h"
-#include "magick/image.h"
-#include "magick/memory_.h"
-#include "magick/layer.h"
-#include "magick/list.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/pixel-private.h"
-#include "magick/resource_.h"
-#include "magick/resize.h"
-#include "magick/statistic.h"
-#include "magick/string_.h"
-#include "magick/thread-private.h"
-#include "magick/transform.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/attribute.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/cache-view.h"
+#include "MagickCore/color.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colorspace-private.h"
+#include "MagickCore/composite.h"
+#include "MagickCore/draw.h"
+#include "MagickCore/effect.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/image.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/layer.h"
+#include "MagickCore/list.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/resize.h"
+#include "MagickCore/statistic.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/thread-private.h"
+#include "MagickCore/transform.h"
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -164,17 +164,13 @@
#endif
for (y=0; y < (ssize_t) extent.y; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
- register IndexPacket
- *restrict chop_indexes,
- *restrict indexes;
-
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
if (status == MagickFalse)
@@ -182,26 +178,23 @@
p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
q=QueueCacheViewAuthenticPixels(chop_view,0,y,chop_image->columns,1,
exception);
- if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
- chop_indexes=GetCacheViewAuthenticIndexQueue(chop_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
if ((x < extent.x) || (x >= (ssize_t) (extent.x+extent.width)))
{
- *q=(*p);
- if (indexes != (IndexPacket *) NULL)
- {
- if (chop_indexes != (IndexPacket *) NULL)
- *chop_indexes++=GetPixelIndex(indexes+x);
- }
- q++;
+ SetPixelRed(chop_image,GetPixelRed(image,p),q);
+ SetPixelGreen(chop_image,GetPixelGreen(image,p),q);
+ SetPixelBlue(chop_image,GetPixelBlue(image,p),q);
+ if (image->colorspace == CMYKColorspace)
+ SetPixelBlack(chop_image,GetPixelBlack(image,p),q);
+ q+=GetPixelChannels(chop_image);
}
- p++;
+ p+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(chop_view,exception) == MagickFalse)
status=MagickFalse;
@@ -226,17 +219,13 @@
#endif
for (y=0; y < (ssize_t) (image->rows-(extent.y+extent.height)); y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
- register IndexPacket
- *restrict chop_indexes,
- *restrict indexes;
-
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
if (status == MagickFalse)
@@ -245,26 +234,22 @@
image->columns,1,exception);
q=QueueCacheViewAuthenticPixels(chop_view,0,extent.y+y,chop_image->columns,
1,exception);
- if ((p == (PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
- chop_indexes=GetCacheViewAuthenticIndexQueue(chop_view);
for (x=0; x < (ssize_t) image->columns; x++)
{
if ((x < extent.x) || (x >= (ssize_t) (extent.x+extent.width)))
{
- *q=(*p);
- if (indexes != (IndexPacket *) NULL)
- {
- if (chop_indexes != (IndexPacket *) NULL)
- *chop_indexes++=GetPixelIndex(indexes+x);
- }
- q++;
+ SetPixelRed(chop_image,GetPixelRed(image,p),q);
+ SetPixelGreen(chop_image,GetPixelGreen(image,p),q);
+ SetPixelBlue(chop_image,GetPixelBlue(image,p),q);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(chop_image);
}
- p++;
+ p+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(chop_view,exception) == MagickFalse)
status=MagickFalse;
@@ -352,25 +337,25 @@
cmyk_view=AcquireCacheView(cmyk_image);
for (y=0; y < (ssize_t) images->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
p=GetCacheViewVirtualPixels(image_view,0,y,images->columns,1,exception);
q=QueueCacheViewAuthenticPixels(cmyk_view,0,y,cmyk_image->columns,1,
exception);
- if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
for (x=0; x < (ssize_t) images->columns; x++)
{
- SetPixelRed(q,QuantumRange-PixelIntensityToQuantum(p));
- p++;
- q++;
+ SetPixelRed(cmyk_image,QuantumRange-GetPixelIntensity(images,p),q);
+ p+=GetPixelChannels(images);
+ q+=GetPixelChannels(cmyk_image);
}
if (SyncCacheViewAuthenticPixels(cmyk_view,exception) == MagickFalse)
break;
@@ -384,25 +369,25 @@
cmyk_view=AcquireCacheView(cmyk_image);
for (y=0; y < (ssize_t) images->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
p=GetCacheViewVirtualPixels(image_view,0,y,images->columns,1,exception);
q=GetCacheViewAuthenticPixels(cmyk_view,0,y,cmyk_image->columns,1,
exception);
- if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
for (x=0; x < (ssize_t) images->columns; x++)
{
- q->green=(Quantum) (QuantumRange-PixelIntensityToQuantum(p));
- p++;
- q++;
+ SetPixelGreen(cmyk_image,QuantumRange-GetPixelIntensity(images,p),q);
+ p+=GetPixelChannels(images);
+ q+=GetPixelChannels(cmyk_image);
}
if (SyncCacheViewAuthenticPixels(cmyk_view,exception) == MagickFalse)
break;
@@ -416,25 +401,25 @@
cmyk_view=AcquireCacheView(cmyk_image);
for (y=0; y < (ssize_t) images->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
p=GetCacheViewVirtualPixels(image_view,0,y,images->columns,1,exception);
q=GetCacheViewAuthenticPixels(cmyk_view,0,y,cmyk_image->columns,1,
exception);
- if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
for (x=0; x < (ssize_t) images->columns; x++)
{
- q->blue=(Quantum) (QuantumRange-PixelIntensityToQuantum(p));
- p++;
- q++;
+ SetPixelBlue(cmyk_image,QuantumRange-GetPixelIntensity(images,p),q);
+ p+=GetPixelChannels(images);
+ q+=GetPixelChannels(cmyk_image);
}
if (SyncCacheViewAuthenticPixels(cmyk_view,exception) == MagickFalse)
break;
@@ -448,29 +433,25 @@
cmyk_view=AcquireCacheView(cmyk_image);
for (y=0; y < (ssize_t) images->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
- register IndexPacket
- *restrict indexes;
-
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
p=GetCacheViewVirtualPixels(image_view,0,y,images->columns,1,exception);
q=GetCacheViewAuthenticPixels(cmyk_view,0,y,cmyk_image->columns,1,
exception);
- if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
- indexes=GetCacheViewAuthenticIndexQueue(cmyk_view);
for (x=0; x < (ssize_t) images->columns; x++)
{
- SetPixelIndex(indexes+x,QuantumRange-
- PixelIntensityToQuantum(p));
- p++;
+ SetPixelBlack(cmyk_image,QuantumRange-GetPixelIntensity(images,p),q);
+ p+=GetPixelChannels(images);
+ q+=GetPixelChannels(cmyk_image);
}
if (SyncCacheViewAuthenticPixels(cmyk_view,exception) == MagickFalse)
break;
@@ -574,7 +555,7 @@
crop_image=CloneImage(image,1,1,MagickTrue,exception);
if (crop_image == (Image *) NULL)
return((Image *) NULL);
- crop_image->background_color.opacity=(Quantum) TransparentOpacity;
+ crop_image->background_color.alpha=(Quantum) TransparentAlpha;
(void) SetImageBackgroundColor(crop_image);
crop_image->page=bounding_box;
crop_image->page.x=(-1);
@@ -651,36 +632,39 @@
#endif
for (y=0; y < (ssize_t) crop_image->rows; y++)
{
- register const IndexPacket
- *restrict indexes;
-
- register const PixelPacket
+ register const Quantum
*restrict p;
- register IndexPacket
- *restrict crop_indexes;
-
- register PixelPacket
+ register Quantum
*restrict q;
+ register size_t
+ x;
+
if (status == MagickFalse)
continue;
p=GetCacheViewVirtualPixels(image_view,page.x,page.y+y,crop_image->columns,
1,exception);
q=QueueCacheViewAuthenticPixels(crop_view,0,y,crop_image->columns,1,
exception);
- if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewVirtualIndexQueue(image_view);
- crop_indexes=GetCacheViewAuthenticIndexQueue(crop_view);
- (void) CopyMagickMemory(q,p,(size_t) crop_image->columns*sizeof(*p));
- if ((indexes != (IndexPacket *) NULL) &&
- (crop_indexes != (IndexPacket *) NULL))
- (void) CopyMagickMemory(crop_indexes,indexes,(size_t) crop_image->columns*
- sizeof(*crop_indexes));
+ for (x=0; x < (ssize_t) crop_image->columns; x++)
+ {
+ SetPixelRed(crop_image,GetPixelRed(image,p),q);
+ SetPixelGreen(crop_image,GetPixelGreen(image,p),q);
+ SetPixelBlue(crop_image,GetPixelBlue(image,p),q);
+ if (image->colorspace == CMYKColorspace)
+ SetPixelBlack(crop_image,GetPixelBlack(image,p),q);
+ SetPixelAlpha(crop_image,GetPixelAlpha(image,p),q);
+ if (image->storage_class == PseudoClass)
+ SetPixelIndex(crop_image,GetPixelIndex(image,p),q);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(crop_image);
+ }
if (SyncCacheViewAuthenticPixels(crop_view,exception) == MagickFalse)
status=MagickFalse;
if (image->progress_monitor != (MagickProgressMonitor) NULL)
@@ -1055,36 +1039,39 @@
#endif
for (y=0; y < (ssize_t) excerpt_image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
- register IndexPacket
- *restrict excerpt_indexes,
- *restrict indexes;
-
- register PixelPacket
+ register Quantum
*restrict q;
+ register ssize_t
+ x;
+
if (status == MagickFalse)
continue;
p=GetCacheViewVirtualPixels(image_view,geometry->x,geometry->y+y,
geometry->width,1,exception);
q=GetCacheViewAuthenticPixels(excerpt_view,0,y,excerpt_image->columns,1,
exception);
- if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
{
status=MagickFalse;
continue;
}
- (void) CopyMagickMemory(q,p,(size_t) excerpt_image->columns*sizeof(*q));
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
- if (indexes != (IndexPacket *) NULL)
- {
- excerpt_indexes=GetCacheViewAuthenticIndexQueue(excerpt_view);
- if (excerpt_indexes != (IndexPacket *) NULL)
- (void) CopyMagickMemory(excerpt_indexes,indexes,(size_t)
- excerpt_image->columns*sizeof(*excerpt_indexes));
- }
+ for (x=0; x < (ssize_t) excerpt_image->columns; x++)
+ {
+ SetPixelRed(excerpt_image,GetPixelRed(image,p),q);
+ SetPixelGreen(excerpt_image,GetPixelGreen(image,p),q);
+ SetPixelBlue(excerpt_image,GetPixelBlue(image,p),q);
+ if (image->colorspace == CMYKColorspace)
+ SetPixelBlack(excerpt_image,GetPixelBlack(image,p),q);
+ if (image->storage_class == PseudoClass)
+ SetPixelIndex(excerpt_image,GetPixelIndex(image,p),q);
+ SetPixelAlpha(excerpt_image,GetPixelAlpha(image,p),q);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(excerpt_image);
+ }
if (SyncCacheViewAuthenticPixels(excerpt_view,exception) == MagickFalse)
status=MagickFalse;
if (image->progress_monitor != (MagickProgressMonitor) NULL)
@@ -1164,7 +1151,7 @@
extent_image=DestroyImage(extent_image);
return((Image *) NULL);
}
- if (extent_image->background_color.opacity != OpaqueOpacity)
+ if (extent_image->background_color.alpha != OpaqueAlpha)
extent_image->matte=MagickTrue;
(void) SetImageBackgroundColor(extent_image);
(void) CompositeImage(extent_image,image->compose,image,-geometry->x,
@@ -1242,37 +1229,38 @@
#endif
for (y=0; y < (ssize_t) flip_image->rows; y++)
{
- register const IndexPacket
- *restrict indexes;
-
- register const PixelPacket
+ register const Quantum
*restrict p;
- register IndexPacket
- *restrict flip_indexes;
-
- register PixelPacket
+ register Quantum
*restrict q;
+ register ssize_t
+ x;
+
if (status == MagickFalse)
continue;
p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
q=QueueCacheViewAuthenticPixels(flip_view,0,(ssize_t) (flip_image->rows-y-
1),flip_image->columns,1,exception);
- if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
{
status=MagickFalse;
continue;
}
- (void) CopyMagickMemory(q,p,(size_t) image->columns*sizeof(*q));
- indexes=GetCacheViewVirtualIndexQueue(image_view);
- if (indexes != (const IndexPacket *) NULL)
- {
- flip_indexes=GetCacheViewAuthenticIndexQueue(flip_view);
- if (flip_indexes != (IndexPacket *) NULL)
- (void) CopyMagickMemory(flip_indexes,indexes,(size_t) image->columns*
- sizeof(*flip_indexes));
- }
+ for (x=0; x < (ssize_t) flip_image->columns; x++)
+ {
+ SetPixelRed(flip_image,GetPixelRed(image,p),q);
+ SetPixelGreen(flip_image,GetPixelGreen(image,p),q);
+ SetPixelBlue(flip_image,GetPixelBlue(image,p),q);
+ if (image->colorspace == CMYKColorspace)
+ SetPixelBlack(flip_image,GetPixelBlack(image,p),q);
+ if (image->storage_class == PseudoClass)
+ SetPixelIndex(flip_image,GetPixelIndex(image,p),q);
+ SetPixelAlpha(flip_image,GetPixelAlpha(image,p),q);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(flip_image);
+ }
if (SyncCacheViewAuthenticPixels(flip_view,exception) == MagickFalse)
status=MagickFalse;
if (image->progress_monitor != (MagickProgressMonitor) NULL)
@@ -1369,19 +1357,13 @@
#endif
for (y=0; y < (ssize_t) flop_image->rows; y++)
{
- register const IndexPacket
- *restrict indexes;
-
- register const PixelPacket
+ register const Quantum
*restrict p;
- register IndexPacket
- *restrict flop_indexes;
-
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
if (status == MagickFalse)
@@ -1389,21 +1371,24 @@
p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
q=QueueCacheViewAuthenticPixels(flop_view,0,y,flop_image->columns,1,
exception);
- if ((p == (PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
{
status=MagickFalse;
continue;
}
- q+=flop_image->columns;
- indexes=GetCacheViewVirtualIndexQueue(image_view);
- flop_indexes=GetCacheViewAuthenticIndexQueue(flop_view);
+ q+=GetPixelChannels(flop_image)*flop_image->columns;
for (x=0; x < (ssize_t) flop_image->columns; x++)
{
- (*--q)=(*p++);
- if ((indexes != (const IndexPacket *) NULL) &&
- (flop_indexes != (IndexPacket *) NULL))
- SetPixelIndex(flop_indexes+flop_image->columns-x-1,
- GetPixelIndex( indexes+x));
+ q-=GetPixelChannels(flop_image);
+ SetPixelRed(flop_image,GetPixelRed(image,p),q);
+ SetPixelGreen(flop_image,GetPixelGreen(image,p),q);
+ SetPixelBlue(flop_image,GetPixelBlue(image,p),q);
+ if (image->colorspace == CMYKColorspace)
+ SetPixelBlack(flop_image,GetPixelBlack(image,p),q);
+ SetPixelAlpha(flop_image,GetPixelAlpha(image,p),q);
+ if (image->storage_class == PseudoClass)
+ SetPixelIndex(flop_image,GetPixelIndex(image,p),q);
+ p+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(flop_view,exception) == MagickFalse)
status=MagickFalse;
@@ -1487,18 +1472,15 @@
MagickBooleanType
sync;
- register const IndexPacket
- *restrict indexes;
-
- register const PixelPacket
+ register const Quantum
*restrict p;
- register IndexPacket
- *restrict destination_indexes;
-
- register PixelPacket
+ register Quantum
*restrict q;
+ register ssize_t
+ x;
+
/*
Transfer scanline.
*/
@@ -1506,20 +1488,22 @@
continue;
p=GetCacheViewVirtualPixels(source_view,sx,sy+y,columns,1,exception);
q=GetCacheViewAuthenticPixels(destination_view,dx,dy+y,columns,1,exception);
- if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewVirtualIndexQueue(source_view);
- (void) CopyMagickMemory(q,p,(size_t) columns*sizeof(*p));
- if (indexes != (IndexPacket *) NULL)
- {
- destination_indexes=GetCacheViewAuthenticIndexQueue(destination_view);
- if (destination_indexes != (IndexPacket *) NULL)
- (void) CopyMagickMemory(destination_indexes,indexes,(size_t)
- columns*sizeof(*indexes));
- }
+ for (x=0; x < (ssize_t) columns; x++)
+ {
+ SetPixelRed(destination,GetPixelRed(source,p),q);
+ SetPixelGreen(destination,GetPixelGreen(source,p),q);
+ SetPixelBlue(destination,GetPixelBlue(source,p),q);
+ if (destination->colorspace == CMYKColorspace)
+ SetPixelBlack(destination,GetPixelBlack(source,p),q);
+ SetPixelAlpha(destination,GetPixelAlpha(source,p),q);
+ p+=GetPixelChannels(source);
+ q+=GetPixelChannels(destination);
+ }
sync=SyncCacheViewAuthenticPixels(destination_view,exception);
if (sync == MagickFalse)
status=MagickFalse;
@@ -1795,17 +1779,13 @@
#endif
for (y=0; y < (ssize_t) splice_geometry.y; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
- register IndexPacket
- *restrict indexes,
- *restrict splice_indexes;
-
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
if (status == MagickFalse)
@@ -1813,44 +1793,38 @@
p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
q=QueueCacheViewAuthenticPixels(splice_view,0,y,splice_image->columns,1,
exception);
- if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
- splice_indexes=GetCacheViewAuthenticIndexQueue(splice_view);
for (x=0; x < splice_geometry.x; x++)
{
- SetPixelRed(q,GetPixelRed(p));
- SetPixelGreen(q,GetPixelGreen(p));
- SetPixelBlue(q,GetPixelBlue(p));
- SetPixelOpacity(q,OpaqueOpacity);
- if (image->matte != MagickFalse)
- SetPixelOpacity(q,GetPixelOpacity(p));
+ SetPixelRed(splice_image,GetPixelRed(image,p),q);
+ SetPixelGreen(splice_image,GetPixelGreen(image,p),q);
+ SetPixelBlue(splice_image,GetPixelBlue(image,p),q);
if (image->colorspace == CMYKColorspace)
- SetPixelIndex(splice_indexes+x,
- GetPixelIndex(indexes));
- indexes++;
- p++;
- q++;
+ SetPixelBlack(splice_image,GetPixelBlack(image,p),q);
+ SetPixelAlpha(splice_image,OpaqueAlpha,q);
+ if (image->matte != MagickFalse)
+ SetPixelAlpha(splice_image,GetPixelAlpha(image,p),q);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(splice_image);
}
for ( ; x < (ssize_t) (splice_geometry.x+splice_geometry.width); x++)
- q++;
+ q+=GetPixelChannels(splice_image);
for ( ; x < (ssize_t) splice_image->columns; x++)
{
- SetPixelRed(q,GetPixelRed(p));
- SetPixelGreen(q,GetPixelGreen(p));
- SetPixelBlue(q,GetPixelBlue(p));
- SetPixelOpacity(q,OpaqueOpacity);
- if (image->matte != MagickFalse)
- SetPixelOpacity(q,GetPixelOpacity(p));
+ SetPixelRed(splice_image,GetPixelRed(image,p),q);
+ SetPixelGreen(splice_image,GetPixelGreen(image,p),q);
+ SetPixelBlue(splice_image,GetPixelBlue(image,p),q);
if (image->colorspace == CMYKColorspace)
- SetPixelIndex(splice_indexes+x,
- GetPixelIndex(indexes));
- indexes++;
- p++;
- q++;
+ SetPixelBlack(splice_image,GetPixelBlack(image,p),q);
+ SetPixelAlpha(splice_image,OpaqueAlpha,q);
+ if (image->matte != MagickFalse)
+ SetPixelAlpha(splice_image,GetPixelAlpha(image,p),q);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(splice_image);
}
if (SyncCacheViewAuthenticPixels(splice_view,exception) == MagickFalse)
status=MagickFalse;
@@ -1874,17 +1848,13 @@
for (y=(ssize_t) (splice_geometry.y+splice_geometry.height);
y < (ssize_t) splice_image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
- register IndexPacket
- *restrict indexes,
- *restrict splice_indexes;
-
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
if (status == MagickFalse)
@@ -1895,44 +1865,38 @@
continue;
q=QueueCacheViewAuthenticPixels(splice_view,0,y,splice_image->columns,1,
exception);
- if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
- splice_indexes=GetCacheViewAuthenticIndexQueue(splice_view);
for (x=0; x < splice_geometry.x; x++)
{
- SetPixelRed(q,GetPixelRed(p));
- SetPixelGreen(q,GetPixelGreen(p));
- SetPixelBlue(q,GetPixelBlue(p));
- SetPixelOpacity(q,OpaqueOpacity);
- if (image->matte != MagickFalse)
- SetPixelOpacity(q,GetPixelOpacity(p));
+ SetPixelRed(splice_image,GetPixelRed(image,p),q);
+ SetPixelGreen(splice_image,GetPixelGreen(image,p),q);
+ SetPixelBlue(splice_image,GetPixelBlue(image,p),q);
+ SetPixelAlpha(splice_image,OpaqueAlpha,q);
if (image->colorspace == CMYKColorspace)
- SetPixelIndex(splice_indexes+x,
- GetPixelIndex(indexes));
- indexes++;
- p++;
- q++;
+ SetPixelBlack(splice_image,GetPixelBlack(image,p),q);
+ if (image->matte != MagickFalse)
+ SetPixelAlpha(splice_image,GetPixelAlpha(image,p),q);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(splice_image);
}
for ( ; x < (ssize_t) (splice_geometry.x+splice_geometry.width); x++)
- q++;
+ q+=GetPixelChannels(splice_image);
for ( ; x < (ssize_t) splice_image->columns; x++)
{
- SetPixelRed(q,GetPixelRed(p));
- SetPixelGreen(q,GetPixelGreen(p));
- SetPixelBlue(q,GetPixelBlue(p));
- SetPixelOpacity(q,OpaqueOpacity);
- if (image->matte != MagickFalse)
- SetPixelOpacity(q,GetPixelOpacity(p));
+ SetPixelRed(splice_image,GetPixelRed(image,p),q);
+ SetPixelGreen(splice_image,GetPixelGreen(image,p),q);
+ SetPixelBlue(splice_image,GetPixelBlue(image,p),q);
+ SetPixelAlpha(splice_image,OpaqueAlpha,q);
if (image->colorspace == CMYKColorspace)
- SetPixelIndex(splice_indexes+x,
- GetPixelIndex(indexes));
- indexes++;
- p++;
- q++;
+ SetPixelBlack(splice_image,GetPixelBlack(image,p),q);
+ if (image->matte != MagickFalse)
+ SetPixelAlpha(splice_image,GetPixelAlpha(image,p),q);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(splice_image);
}
if (SyncCacheViewAuthenticPixels(splice_view,exception) == MagickFalse)
status=MagickFalse;
@@ -2196,36 +2160,37 @@
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
- register IndexPacket
- *restrict transpose_indexes,
- *restrict indexes;
-
- register PixelPacket
+ register Quantum
*restrict q;
+ register ssize_t
+ x;
+
if (status == MagickFalse)
continue;
p=GetCacheViewVirtualPixels(image_view,0,(ssize_t) image->rows-y-1,
image->columns,1,exception);
q=QueueCacheViewAuthenticPixels(transpose_view,(ssize_t) (image->rows-y-1),
0,1,transpose_image->rows,exception);
- if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
{
status=MagickFalse;
continue;
}
- (void) CopyMagickMemory(q,p,(size_t) image->columns*sizeof(*q));
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
- if (indexes != (IndexPacket *) NULL)
- {
- transpose_indexes=GetCacheViewAuthenticIndexQueue(transpose_view);
- if (transpose_indexes != (IndexPacket *) NULL)
- (void) CopyMagickMemory(transpose_indexes,indexes,(size_t)
- image->columns*sizeof(*transpose_indexes));
- }
+ for (x=0; x < (ssize_t) image->columns; x++)
+ {
+ SetPixelRed(transpose_image,GetPixelRed(image,p),q);
+ SetPixelGreen(transpose_image,GetPixelGreen(image,p),q);
+ SetPixelBlue(transpose_image,GetPixelBlue(image,p),q);
+ if (image->colorspace == CMYKColorspace)
+ SetPixelBlack(transpose_image,GetPixelBlack(image,p),q);
+ SetPixelAlpha(transpose_image,GetPixelAlpha(image,p),q);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(transpose_image);
+ }
if (SyncCacheViewAuthenticPixels(transpose_view,exception) == MagickFalse)
status=MagickFalse;
if (image->progress_monitor != (MagickProgressMonitor) NULL)
@@ -2327,17 +2292,13 @@
MagickBooleanType
sync;
- register const PixelPacket
+ register const Quantum
*restrict p;
- register IndexPacket
- *restrict transverse_indexes,
- *restrict indexes;
-
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
if (status == MagickFalse)
@@ -2345,23 +2306,23 @@
p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);
q=QueueCacheViewAuthenticPixels(transverse_view,(ssize_t) (image->rows-y-
1),0,1,transverse_image->rows,exception);
- if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
{
status=MagickFalse;
continue;
}
- q+=image->columns;
+ q+=GetPixelChannels(transverse_image)*image->columns;
for (x=0; x < (ssize_t) image->columns; x++)
- *--q=(*p++);
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
- if (indexes != (IndexPacket *) NULL)
- {
- transverse_indexes=GetCacheViewAuthenticIndexQueue(transverse_view);
- if (transverse_indexes != (IndexPacket *) NULL)
- for (x=0; x < (ssize_t) image->columns; x++)
- SetPixelIndex(transverse_indexes+image->columns-x-1,
- GetPixelIndex(indexes+x));
- }
+ {
+ q-=GetPixelChannels(transverse_image);
+ SetPixelRed(transverse_image,GetPixelRed(image,p),q);
+ SetPixelGreen(transverse_image,GetPixelGreen(image,p),q);
+ SetPixelBlue(transverse_image,GetPixelBlue(image,p),q);
+ SetPixelAlpha(transverse_image,GetPixelAlpha(image,p),q);
+ if (image->colorspace == CMYKColorspace)
+ SetPixelBlack(transverse_image,GetPixelBlack(image,p),q);
+ p+=GetPixelChannels(image);
+ }
sync=SyncCacheViewAuthenticPixels(transverse_view,exception);
if (sync == MagickFalse)
status=MagickFalse;
@@ -2439,7 +2400,7 @@
crop_image=CloneImage(image,1,1,MagickTrue,exception);
if (crop_image == (Image *) NULL)
return((Image *) NULL);
- crop_image->background_color.opacity=(Quantum) TransparentOpacity;
+ crop_image->background_color.alpha=(Quantum) TransparentAlpha;
(void) SetImageBackgroundColor(crop_image);
crop_image->page=image->page;
crop_image->page.x=(-1);
diff --git a/magick/transform.h b/MagickCore/transform.h
similarity index 100%
rename from magick/transform.h
rename to MagickCore/transform.h
diff --git a/magick/type.c b/MagickCore/type.c
similarity index 98%
rename from magick/type.c
rename to MagickCore/type.c
index 234219a..2d3bd11 100644
--- a/magick/type.c
+++ b/MagickCore/type.c
@@ -39,25 +39,25 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/client.h"
-#include "magick/configure.h"
-#include "magick/draw.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/hashmap.h"
-#include "magick/log.h"
-#include "magick/memory_.h"
-#include "magick/option.h"
-#include "magick/semaphore.h"
-#include "magick/splay-tree.h"
-#include "magick/string_.h"
-#include "magick/string-private.h"
-#include "magick/type.h"
-#include "magick/token.h"
-#include "magick/utility.h"
-#include "magick/xml-tree.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/client.h"
+#include "MagickCore/configure.h"
+#include "MagickCore/draw.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/hashmap.h"
+#include "MagickCore/log.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/option.h"
+#include "MagickCore/semaphore.h"
+#include "MagickCore/splay-tree.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/string-private.h"
+#include "MagickCore/type.h"
+#include "MagickCore/token.h"
+#include "MagickCore/utility.h"
+#include "MagickCore/xml-tree.h"
#if defined(MAGICKCORE_FONTCONFIG_DELEGATE)
# include "fontconfig/fontconfig.h"
#if (FC_VERSION < 20209)
@@ -91,7 +91,7 @@
#endif
#endif
#if defined(MAGICKCORE_WINDOWS_SUPPORT)
-# include "magick/nt-feature.h"
+# include "MagickCore/nt-feature.h"
#endif
/*
diff --git a/magick/type.h b/MagickCore/type.h
similarity index 95%
rename from magick/type.h
rename to MagickCore/type.h
index 4b43377..9076e8e 100644
--- a/magick/type.h
+++ b/MagickCore/type.h
@@ -76,10 +76,6 @@
MagickBooleanType
stealth;
- struct _TypeInfo
- *previous,
- *next; /* deprecated, use GetTypeInfoList() */
-
size_t
signature;
} TypeInfo;
diff --git a/magick/utility.c b/MagickCore/utility.c
similarity index 98%
rename from magick/utility.c
rename to MagickCore/utility.c
index 6d3cbb1..6b8867f 100644
--- a/magick/utility.c
+++ b/MagickCore/utility.c
@@ -39,25 +39,25 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/property.h"
-#include "magick/blob.h"
-#include "magick/color.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/geometry.h"
-#include "magick/list.h"
-#include "magick/log.h"
-#include "magick/memory_.h"
-#include "magick/option.h"
-#include "magick/policy.h"
-#include "magick/resource_.h"
-#include "magick/semaphore.h"
-#include "magick/signature-private.h"
-#include "magick/statistic.h"
-#include "magick/string_.h"
-#include "magick/token.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/property.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/color.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/list.h"
+#include "MagickCore/log.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/option.h"
+#include "MagickCore/policy.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/semaphore.h"
+#include "MagickCore/signature-private.h"
+#include "MagickCore/statistic.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/token.h"
+#include "MagickCore/utility.h"
#if defined(MAGICKCORE_HAVE_PROCESS_H)
#include <process.h>
#endif
diff --git a/magick/utility.h b/MagickCore/utility.h
similarity index 100%
rename from magick/utility.h
rename to MagickCore/utility.h
diff --git a/magick/version.c b/MagickCore/version.c
similarity index 96%
rename from magick/version.c
rename to MagickCore/version.c
index a858305..869ccfb 100644
--- a/magick/version.c
+++ b/MagickCore/version.c
@@ -36,16 +36,16 @@
%
*/
-#include "magick/studio.h"
-#include "magick/configure.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/hashmap.h"
-#include "magick/locale_.h"
-#include "magick/option.h"
-#include "magick/string_.h"
-#include "magick/utility.h"
-#include "magick/version.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/configure.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/hashmap.h"
+#include "MagickCore/locale_.h"
+#include "MagickCore/option.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/utility.h"
+#include "MagickCore/version.h"
/*
Define declarations.
diff --git a/magick/version.h b/MagickCore/version.h
similarity index 95%
rename from magick/version.h
rename to MagickCore/version.h
index 49a2081..0cd48a7 100644
--- a/magick/version.h
+++ b/MagickCore/version.h
@@ -27,15 +27,15 @@
*/
#define MagickPackageName "ImageMagick"
#define MagickCopyright "Copyright (C) 1999-2011 ImageMagick Studio LLC"
-#define MagickSVNRevision "4677"
+#define MagickSVNRevision "4683"
#define MagickLibVersion 0x671
#define MagickLibVersionText "6.7.1"
#define MagickLibVersionNumber 4,0,1
#define MagickLibAddendum "-0"
#define MagickLibInterface 4
#define MagickLibMinInterface 4
-#define MagickReleaseDate "2011-06-30"
-#define MagickChangeDate "20110630"
+#define MagickReleaseDate "2011-07-01"
+#define MagickChangeDate "20110701"
#define MagickAuthoritativeURL "http://www.imagemagick.org"
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#define MagickOpenMPFeature "OpenMP "
@@ -53,7 +53,7 @@
#define MagickHDRIFeature " "
#endif
#define MagickFeatures MagickOpenMPFeature MagickOpenCLFeature MagickHDRIFeature
-#define MagickHomeURL "file:///usr/local/share/doc/ImageMagick-6.7.1//index.html"
+#define MagickHomeURL "file:///usr/local/share/doc/ImageMagick-7.0.0//index.html"
#if (MAGICKCORE_QUANTUM_DEPTH == 8)
#define MagickQuantumDepth "Q8"
#define MagickQuantumRange "255"
diff --git a/magick/version.h.in b/MagickCore/version.h.in
similarity index 100%
rename from magick/version.h.in
rename to MagickCore/version.h.in
diff --git a/magick/vms.c b/MagickCore/vms.c
similarity index 98%
rename from magick/vms.c
rename to MagickCore/vms.c
index 89a7794..ff53923 100644
--- a/magick/vms.c
+++ b/MagickCore/vms.c
@@ -42,10 +42,10 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/string_.h"
-#include "magick/memory_.h"
-#include "magick/vms.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/vms.h"
#if !defined(_AXP_) && (!defined(__VMS_VER) || (__VMS_VER < 70000000))
/*
diff --git a/magick/vms.h b/MagickCore/vms.h
similarity index 100%
rename from magick/vms.h
rename to MagickCore/vms.h
diff --git a/magick/widget.c b/MagickCore/widget.c
similarity index 99%
rename from magick/widget.c
rename to MagickCore/widget.c
index 07742fe..9d77007 100644
--- a/magick/widget.c
+++ b/MagickCore/widget.c
@@ -40,20 +40,20 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/color.h"
-#include "magick/color-private.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/PreRvIcccm.h"
-#include "magick/string_.h"
-#include "magick/token.h"
-#include "magick/utility.h"
-#include "magick/xwindow-private.h"
-#include "magick/widget.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/color.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/PreRvIcccm.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/token.h"
+#include "MagickCore/utility.h"
+#include "MagickCore/xwindow-private.h"
+#include "MagickCore/widget.h"
#if defined(MAGICKCORE_X11_DELEGATE)
diff --git a/magick/widget.h b/MagickCore/widget.h
similarity index 97%
rename from magick/widget.h
rename to MagickCore/widget.h
index 7b6de05..bcfced2 100644
--- a/magick/widget.h
+++ b/MagickCore/widget.h
@@ -24,7 +24,7 @@
#if defined(MAGICKCORE_X11_DELEGATE)
-#include "magick/xwindow-private.h"
+#include "MagickCore/xwindow-private.h"
extern MagickExport int
XCommandWidget(Display *,XWindows *,const char **,XEvent *),
diff --git a/magick/xml-tree.c b/MagickCore/xml-tree.c
similarity index 99%
rename from magick/xml-tree.c
rename to MagickCore/xml-tree.c
index 3e02023..f7395c5 100644
--- a/magick/xml-tree.c
+++ b/MagickCore/xml-tree.c
@@ -47,18 +47,18 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/log.h"
-#include "magick/memory_.h"
-#include "magick/semaphore.h"
-#include "magick/string_.h"
-#include "magick/string-private.h"
-#include "magick/token-private.h"
-#include "magick/xml-tree.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/log.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/semaphore.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/string-private.h"
+#include "MagickCore/token-private.h"
+#include "MagickCore/xml-tree.h"
+#include "MagickCore/utility.h"
/*
Define declarations.
diff --git a/magick/xml-tree.h b/MagickCore/xml-tree.h
similarity index 96%
rename from magick/xml-tree.h
rename to MagickCore/xml-tree.h
index 03ba48e..64a4053 100644
--- a/magick/xml-tree.h
+++ b/MagickCore/xml-tree.h
@@ -22,8 +22,8 @@
extern "C" {
#endif
-#include <magick/exception.h>
-#include <magick/splay-tree.h>
+#include <MagickCore/exception.h>
+#include <MagickCore/splay-tree.h>
typedef struct _XMLTreeInfo
XMLTreeInfo;
diff --git a/magick/xwdfile.h_vms b/MagickCore/xwdfile.h_vms
similarity index 100%
rename from magick/xwdfile.h_vms
rename to MagickCore/xwdfile.h_vms
diff --git a/magick/xwindow-private.h b/MagickCore/xwindow-private.h
similarity index 97%
rename from magick/xwindow-private.h
rename to MagickCore/xwindow-private.h
index 71fc02b..b56a32e 100644
--- a/magick/xwindow-private.h
+++ b/MagickCore/xwindow-private.h
@@ -31,9 +31,9 @@
#include <X11/keysym.h>
#include <X11/Xresource.h>
#include <X11/Xutil.h>
-#include "magick/exception.h"
-#include "magick/geometry.h"
-#include "magick/quantize.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/quantize.h"
#if defined(__cplusplus) || defined(c_plusplus)
# define klass c_class
@@ -550,7 +550,7 @@
XHighlightLine(Display *,Window,GC,const XSegment *),
XHighlightRectangle(Display *,Window,GC,const RectangleInfo *),
XGetAnnotateInfo(XAnnotateInfo *),
- XGetPixelPacket(Display *,const XVisualInfo *,const XStandardColormap *,
+ XGetPixelInfo(Display *,const XVisualInfo *,const XStandardColormap *,
const XResourceInfo *,Image *,XPixelInfo *),
XGetMapInfo(const XVisualInfo *,const Colormap,XStandardColormap *),
XGetResourceInfo(const ImageInfo *,XrmDatabase,const char *,XResourceInfo *),
diff --git a/magick/xwindow.c b/MagickCore/xwindow.c
similarity index 95%
rename from magick/xwindow.c
rename to MagickCore/xwindow.c
index dfedc33..6fe293c 100644
--- a/magick/xwindow.c
+++ b/MagickCore/xwindow.c
@@ -39,46 +39,47 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/animate.h"
-#include "magick/artifact.h"
-#include "magick/blob.h"
-#include "magick/cache.h"
-#include "magick/client.h"
-#include "magick/color.h"
-#include "magick/color-private.h"
-#include "magick/colormap.h"
-#include "magick/composite.h"
-#include "magick/display.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/geometry.h"
-#include "magick/identify.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/locale_.h"
-#include "magick/log.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/option.h"
-#include "magick/PreRvIcccm.h"
-#include "magick/quantize.h"
-#include "magick/quantum.h"
-#include "magick/quantum-private.h"
-#include "magick/resource_.h"
-#include "magick/resize.h"
-#include "magick/shear.h"
-#include "magick/statistic.h"
-#include "magick/string_.h"
-#include "magick/string-private.h"
-#include "magick/transform.h"
-#include "magick/utility.h"
-#include "magick/widget.h"
-#include "magick/xwindow.h"
-#include "magick/xwindow-private.h"
-#include "magick/version.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/animate.h"
+#include "MagickCore/artifact.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/client.h"
+#include "MagickCore/color.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colormap.h"
+#include "MagickCore/composite.h"
+#include "MagickCore/display.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/identify.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/locale_.h"
+#include "MagickCore/log.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/option.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/PreRvIcccm.h"
+#include "MagickCore/quantize.h"
+#include "MagickCore/quantum.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/resize.h"
+#include "MagickCore/shear.h"
+#include "MagickCore/statistic.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/string-private.h"
+#include "MagickCore/transform.h"
+#include "MagickCore/utility.h"
+#include "MagickCore/widget.h"
+#include "MagickCore/xwindow.h"
+#include "MagickCore/xwindow-private.h"
+#include "MagickCore/version.h"
#if defined(__BEOS__)
#include <OS.h>
#endif
@@ -106,13 +107,20 @@
#define XBlueGamma(color) ClampToQuantum(blue_gamma == 1.0 ? (double) \
(color) : ((pow(((double) QuantumScale*(color)),1.0/(double) blue_gamma)* \
QuantumRange)))
-#define XGammaPixel(map,color) (size_t) (map->base_pixel+ \
+#define XGammaPacket(map,color) (size_t) (map->base_pixel+ \
((ScaleQuantumToShort(XRedGamma((color)->red))*map->red_max/65535L)* \
map->red_mult)+ \
((ScaleQuantumToShort(XGreenGamma((color)->green))*map->green_max/65535L)* \
map->green_mult)+ \
((ScaleQuantumToShort(XBlueGamma((color)->blue))*map->blue_max/65535L)* \
map->blue_mult))
+#define XGammaPixel(image,map,color) (size_t) (map->base_pixel+ \
+ ((ScaleQuantumToShort(XRedGamma(GetPixelRed(image,color)))*map->red_max/65535L)* \
+ map->red_mult)+ \
+ ((ScaleQuantumToShort(XGreenGamma(GetPixelGreen(image,color)))*map->green_max/65535L)* \
+ map->green_mult)+ \
+ ((ScaleQuantumToShort(XBlueGamma(GetPixelBlue(image,color)))*map->blue_max/65535L)* \
+ map->blue_mult))
#define XGreenGamma(color) ClampToQuantum(green_gamma == 1.0 ? (double) \
(color) : ((pow(((double) QuantumScale*(color)),1.0/(double) green_gamma)* \
QuantumRange)))
@@ -552,40 +560,46 @@
register int
x;
- register PixelPacket
+ register Quantum
*restrict q;
q=GetCacheViewAuthenticPixels(annotate_view,0,(ssize_t) y,
annotate_image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
for (x=0; x < (int) annotate_image->columns; x++)
{
- SetPixelOpacity(q,OpaqueOpacity);
+ SetPixelAlpha(annotate_image,OpaqueAlpha,q);
if (XGetPixel(annotate_ximage,x,y) == 0)
{
/*
Set this pixel to the background color.
*/
- SetPixelRed(q,ScaleShortToQuantum(pixel->box_color.red));
- SetPixelGreen(q,ScaleShortToQuantum(pixel->box_color.green));
- SetPixelBlue(q,ScaleShortToQuantum(pixel->box_color.blue));
+ SetPixelRed(annotate_image,ScaleShortToQuantum(
+ pixel->box_color.red),q);
+ SetPixelGreen(annotate_image,ScaleShortToQuantum(
+ pixel->box_color.green),q);
+ SetPixelBlue(annotate_image,ScaleShortToQuantum(
+ pixel->box_color.blue),q);
if ((annotate_info->stencil == ForegroundStencil) ||
(annotate_info->stencil == OpaqueStencil))
- SetPixelOpacity(q,TransparentOpacity);
+ SetPixelAlpha(annotate_image,TransparentAlpha,q);
}
else
{
/*
Set this pixel to the pen color.
*/
- SetPixelRed(q,ScaleShortToQuantum(pixel->pen_color.red));
- SetPixelGreen(q,ScaleShortToQuantum(pixel->pen_color.green));
- SetPixelBlue(q,ScaleShortToQuantum(pixel->pen_color.blue));
+ SetPixelRed(annotate_image,ScaleShortToQuantum(
+ pixel->pen_color.red),q);
+ SetPixelGreen(annotate_image,ScaleShortToQuantum(
+ pixel->pen_color.green),q);
+ SetPixelBlue(annotate_image,ScaleShortToQuantum(
+ pixel->pen_color.blue),q);
if (annotate_info->stencil == BackgroundStencil)
- SetPixelOpacity(q,TransparentOpacity);
+ SetPixelAlpha(annotate_image,TransparentAlpha,q);
}
- q++;
+ q+=GetPixelChannels(annotate_image);
}
if (SyncCacheViewAuthenticPixels(annotate_view,exception) == MagickFalse)
break;
@@ -1009,7 +1023,7 @@
MagickBooleanType
query_server;
- MagickPixelPacket
+ PixelInfo
pixel;
MagickRealType
@@ -2123,7 +2137,7 @@
register char
*q;
- register const PixelPacket
+ register const Quantum
*p;
register int
@@ -2202,21 +2216,21 @@
{
p=GetCacheViewVirtualPixels(image_view,0,(ssize_t) y,image->columns,1,
&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (int) image->columns; x++)
{
color.red=ClampToQuantum((MagickRealType) (red_map[i][j][(int)
- ScaleQuantumToChar(GetPixelRed(p))] << 8));
+ ScaleQuantumToChar(GetPixelRed(image,p))] << 8));
color.green=ClampToQuantum((MagickRealType) (green_map[i][j][(int)
- ScaleQuantumToChar(GetPixelGreen(p))] << 8));
+ ScaleQuantumToChar(GetPixelGreen(image,p))] << 8));
color.blue=ClampToQuantum((MagickRealType) (blue_map[i][j][(int)
- ScaleQuantumToChar(GetPixelBlue(p))] << 8));
+ ScaleQuantumToChar(GetPixelBlue(image,p))] << 8));
pixel=(size_t) (((size_t) color.red & 0xe0) |
(((size_t) color.green & 0xe0) >> 3) |
(((size_t) color.blue & 0xc0) >> 6));
*q++=(char) pixel;
- p++;
+ p+=GetPixelChannels(image);
j++;
if (j == 16)
j=0;
@@ -2460,12 +2474,12 @@
register int
x;
- register PixelPacket
+ register Quantum
*restrict q;
q=QueueCacheViewAuthenticPixels(draw_view,0,(ssize_t) y,draw_image->columns,
1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
for (x=0; x < (int) draw_image->columns; x++)
{
@@ -2474,22 +2488,25 @@
/*
Set this pixel to the background color.
*/
- *q=draw_image->background_color;
- q->opacity=(Quantum) (draw_info->stencil == OpaqueStencil ?
- TransparentOpacity : OpaqueOpacity);
+ SetPixelPacket(draw_image,&draw_image->background_color,q);
+ SetPixelAlpha(draw_image,(Quantum) (draw_info->stencil ==
+ OpaqueStencil ? TransparentAlpha : OpaqueAlpha),q);
}
else
{
/*
Set this pixel to the pen color.
*/
- SetPixelRed(q,ScaleShortToQuantum(pixel->pen_color.red));
- SetPixelGreen(q,ScaleShortToQuantum(pixel->pen_color.green));
- SetPixelBlue(q,ScaleShortToQuantum(pixel->pen_color.blue));
- SetPixelOpacity(q,(Quantum) (draw_info->stencil ==
- OpaqueStencil ? OpaqueOpacity : TransparentOpacity));
+ SetPixelRed(draw_image,ScaleShortToQuantum(
+ pixel->pen_color.red),q);
+ SetPixelGreen(draw_image,ScaleShortToQuantum(
+ pixel->pen_color.green),q);
+ SetPixelBlue(draw_image,ScaleShortToQuantum(
+ pixel->pen_color.blue),q);
+ SetPixelAlpha(draw_image,(Quantum) (draw_info->stencil ==
+ OpaqueStencil ? OpaqueAlpha : TransparentAlpha),q);
}
- q++;
+ q+=GetPixelChannels(draw_image);
}
if (SyncCacheViewAuthenticPixels(draw_view,exception) == MagickFalse)
break;
@@ -2582,18 +2599,18 @@
register int
x;
- register PixelPacket
+ register Quantum
*restrict q;
q=GetCacheViewAuthenticPixels(draw_view,0,(ssize_t) y,draw_image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
for (x=0; x < (int) draw_image->columns; x++)
{
- if (q->opacity != (Quantum) TransparentOpacity)
- SetPixelOpacity(q,OpaqueOpacity);
- q++;
+ if (GetPixelAlpha(image,q) != TransparentAlpha)
+ SetPixelAlpha(draw_image,OpaqueAlpha,q);
+ q+=GetPixelChannels(draw_image);
}
if (SyncCacheViewAuthenticPixels(draw_view,exception) == MagickFalse)
break;
@@ -2967,11 +2984,11 @@
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% XGetPixelPacket() initializes the PixelPacket structure.
+% XGetPixelInfo() initializes the PixelPacket structure.
%
-% The format of the XGetPixelPacket method is:
+% The format of the XGetPixelInfo method is:
%
-% void XGetPixelPacket(Display *display,const XVisualInfo *visual_info,
+% void XGetPixelInfo(Display *display,const XVisualInfo *visual_info,
% const XStandardColormap *map_info,const XResourceInfo *resource_info,
% Image *image,XPixelInfo *pixel)
% pixel)
@@ -2994,7 +3011,7 @@
% o pixel: Specifies a pointer to a XPixelInfo structure.
%
*/
-MagickExport void XGetPixelPacket(Display *display,
+MagickExport void XGetPixelInfo(Display *display,
const XVisualInfo *visual_info,const XStandardColormap *map_info,
const XResourceInfo *resource_info,Image *image,XPixelInfo *pixel)
{
@@ -3202,7 +3219,7 @@
Initialize pixel array for images of type PseudoClass.
*/
for (i=0; i < (ssize_t) image->colors; i++)
- pixel->pixels[i]=XGammaPixel(map_info,image->colormap+i);
+ pixel->pixels[i]=XGammaPacket(map_info,image->colormap+i);
for (i=0; i < MaxNumberPens; i++)
pixel->pixels[image->colors+i]=pixel->pen_colors[i].pixel;
pixel->colors+=MaxNumberPens;
@@ -3895,7 +3912,7 @@
pixel.red=ScaleShortToQuantum(color.red);
pixel.green=ScaleShortToQuantum(color.green);
pixel.blue=ScaleShortToQuantum(color.blue);
- pixel.opacity=OpaqueOpacity;
+ pixel.alpha=OpaqueAlpha;
(void) QueryColorname(windows->image.image,&pixel,X11Compliance,name,
&windows->image.image->exception);
return(MagickTrue);
@@ -3974,9 +3991,6 @@
crop_info;
} WindowInfo;
- IndexPacket
- index;
-
int
display_height,
display_width,
@@ -3984,12 +3998,12 @@
x_offset,
y_offset;
+ Quantum
+ index;
+
RectangleInfo
crop_info;
- register IndexPacket
- *indexes;
-
register int
i;
@@ -4155,7 +4169,7 @@
j,
x;
- register PixelPacket
+ register Quantum
*restrict q;
register size_t
@@ -4376,21 +4390,21 @@
{
q=QueueCacheViewAuthenticPixels(composite_view,0,(ssize_t) y,
composite_image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
for (x=0; x < (int) composite_image->columns; x++)
{
pixel=XGetPixel(ximage,x,y);
index=(pixel >> red_shift) & red_mask;
- SetPixelRed(q,ScaleShortToQuantum(
- colors[index].red));
+ SetPixelRed(composite_image,
+ ScaleShortToQuantum(colors[index].red),q);
index=(pixel >> green_shift) & green_mask;
- SetPixelGreen(q,ScaleShortToQuantum(
- colors[index].green));
+ SetPixelGreen(composite_image,
+ ScaleShortToQuantum(colors[index].green),q);
index=(pixel >> blue_shift) & blue_mask;
- SetPixelBlue(q,ScaleShortToQuantum(
- colors[index].blue));
- q++;
+ SetPixelBlue(composite_image,
+ ScaleShortToQuantum(colors[index].blue),q);
+ q+=GetPixelChannels(composite_image);
}
if (SyncCacheViewAuthenticPixels(composite_view,exception) == MagickFalse)
break;
@@ -4400,24 +4414,24 @@
{
q=QueueCacheViewAuthenticPixels(composite_view,0,(ssize_t) y,
composite_image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
for (x=0; x < (int) composite_image->columns; x++)
{
pixel=XGetPixel(ximage,x,y);
color=(pixel >> red_shift) & red_mask;
color=(65535UL*color)/red_mask;
- SetPixelRed(q,ScaleShortToQuantum((unsigned short)
- color));
+ SetPixelRed(composite_image,
+ ScaleShortToQuantum((unsigned short) color),q);
color=(pixel >> green_shift) & green_mask;
color=(65535UL*color)/green_mask;
- SetPixelGreen(q,ScaleShortToQuantum((unsigned short)
- color));
+ SetPixelGreen(composite_image,
+ ScaleShortToQuantum((unsigned short) color),q);
color=(pixel >> blue_shift) & blue_mask;
color=(65535UL*color)/blue_mask;
- SetPixelBlue(q,ScaleShortToQuantum((unsigned short)
- color));
- q++;
+ SetPixelBlue(composite_image,
+ ScaleShortToQuantum((unsigned short) color),q);
+ q+=GetPixelChannels(composite_image);
}
if (SyncCacheViewAuthenticPixels(composite_view,exception) == MagickFalse)
break;
@@ -4451,16 +4465,15 @@
{
q=QueueCacheViewAuthenticPixels(composite_view,0,(ssize_t) y,
composite_image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetCacheViewAuthenticIndexQueue(composite_view);
for (x=0; x < (int) composite_image->columns; x++)
{
- index=(IndexPacket) XGetPixel(ximage,x,y);
- SetPixelIndex(indexes+x,index);
- SetPixelRGBO(q,composite_image->colormap+(ssize_t)
- index);
- q++;
+ index=(Quantum) XGetPixel(ximage,x,y);
+ SetPixelIndex(composite_image,index,q);
+ SetPixelPacket(composite_image,
+ composite_image->colormap+(ssize_t) index,q);
+ q+=GetPixelChannels(composite_image);
}
if (SyncCacheViewAuthenticPixels(composite_view,exception) == MagickFalse)
break;
@@ -5766,8 +5779,8 @@
/*
Copy matte image to matte pixmap.
*/
- context_values.background=1;
- context_values.foreground=0;
+ context_values.background=0;
+ context_values.foreground=1;
graphics_context=XCreateGC(display,window->matte_pixmap,
(size_t) (GCBackground | GCForeground),&context_values);
(void) XPutImage(display,window->matte_pixmap,graphics_context,
@@ -5836,10 +5849,7 @@
int
y;
- register const IndexPacket
- *indexes;
-
- register const PixelPacket
+ register const Quantum
*p;
register int
@@ -5923,24 +5933,23 @@
foreground=(unsigned char)
(XPixelIntensity(&window->pixel_info->background_color) <
XPixelIntensity(&window->pixel_info->foreground_color) ? 0x80 : 0x00);
- polarity=(unsigned short) ((PixelIntensityToQuantum(
+ polarity=(unsigned short) ((GetPixelPacketIntensity(
&canvas->colormap[0])) < ((Quantum) QuantumRange/2) ? 1 : 0);
if (canvas->colors == 2)
- polarity=PixelIntensity(&canvas->colormap[0]) <
- PixelIntensity(&canvas->colormap[1]);
+ polarity=GetPixelPacketIntensity(&canvas->colormap[0]) <
+ GetPixelPacketIntensity(&canvas->colormap[1]);
for (y=0; y < (int) canvas->rows; y++)
{
p=GetCacheViewVirtualPixels(canvas_view,0,(ssize_t) y,canvas->columns,1,
&canvas->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetCacheViewVirtualIndexQueue(canvas_view);
bit=0;
byte=0;
for (x=0; x < (int) canvas->columns; x++)
{
byte>>=1;
- if (GetPixelIndex(indexes+x) == (IndexPacket) polarity)
+ if (GetPixelIndex(canvas,p) == (Quantum) polarity)
byte|=foreground;
else
byte|=background;
@@ -5951,6 +5960,7 @@
bit=0;
byte=0;
}
+ p+=GetPixelChannels(canvas);
}
if (bit != 0)
*q=byte >> (8-bit);
@@ -5973,13 +5983,12 @@
{
p=GetCacheViewVirtualPixels(canvas_view,0,(ssize_t) y,
canvas->columns,1,&canvas->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetCacheViewVirtualIndexQueue(canvas_view);
nibble=0;
for (x=0; x < (int) canvas->columns; x++)
{
- pixel=pixels[(ssize_t) GetPixelIndex(indexes+x)] & 0x0f;
+ pixel=pixels[(ssize_t) GetPixelIndex(canvas,p)] & 0x0f;
switch (nibble)
{
case 0:
@@ -6008,6 +6017,7 @@
break;
}
}
+ p+=GetPixelChannels(canvas);
}
q+=scanline_pad;
}
@@ -6025,13 +6035,12 @@
{
p=GetCacheViewVirtualPixels(canvas_view,0,(ssize_t) y,
canvas->columns,1,&canvas->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetCacheViewVirtualIndexQueue(canvas_view);
nibble=0;
for (x=0; x < (int) canvas->columns; x++)
{
- pixel=pixels[(ssize_t) GetPixelIndex(indexes+x)] & 0xf;
+ pixel=pixels[(ssize_t) GetPixelIndex(canvas,p)] & 0xf;
switch (nibble)
{
case 0:
@@ -6048,6 +6057,7 @@
break;
}
}
+ p+=GetPixelChannels(canvas);
}
q+=scanline_pad;
}
@@ -6069,13 +6079,13 @@
{
p=GetCacheViewVirtualPixels(canvas_view,0,(ssize_t) y,
canvas->columns,1,&canvas->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetCacheViewVirtualIndexQueue(canvas_view);
for (x=0; x < (int) canvas->columns; x++)
{
- pixel=pixels[(ssize_t) GetPixelIndex(indexes+x)];
+ pixel=pixels[(ssize_t) GetPixelIndex(canvas,p)];
*q++=(unsigned char) pixel;
+ p+=GetPixelChannels(canvas);
}
q+=scanline_pad;
}
@@ -6100,12 +6110,11 @@
{
p=GetCacheViewVirtualPixels(canvas_view,0,(ssize_t) y,
canvas->columns,1,&canvas->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetCacheViewVirtualIndexQueue(canvas_view);
for (x=0; x < (int) canvas->columns; x++)
{
- pixel=pixels[(ssize_t) GetPixelIndex(indexes+x)];
+ pixel=pixels[(ssize_t) GetPixelIndex(canvas,p)];
for (k=0; k < (int) bytes_per_pixel; k++)
{
channel[k]=(unsigned char) pixel;
@@ -6113,6 +6122,7 @@
}
for (k=0; k < (int) bytes_per_pixel; k++)
*q++=channel[k];
+ p+=GetPixelChannels(canvas);
}
q+=scanline_pad;
}
@@ -6135,11 +6145,11 @@
nibble=0;
p=GetCacheViewVirtualPixels(canvas_view,0,(ssize_t) y,
canvas->columns,1,&canvas->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (int) canvas->columns; x++)
{
- pixel=XGammaPixel(map_info,p);
+ pixel=XGammaPixel(canvas,map_info,p);
pixel&=0xf;
switch (nibble)
{
@@ -6169,7 +6179,7 @@
break;
}
}
- p++;
+ p+=GetPixelChannels(canvas);
}
q+=scanline_pad;
}
@@ -6187,12 +6197,12 @@
{
p=GetCacheViewVirtualPixels(canvas_view,0,(ssize_t) y,
canvas->columns,1,&canvas->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
nibble=0;
for (x=0; x < (int) canvas->columns; x++)
{
- pixel=XGammaPixel(map_info,p);
+ pixel=XGammaPixel(canvas,map_info,p);
pixel&=0xf;
switch (nibble)
{
@@ -6210,7 +6220,7 @@
break;
}
}
- p++;
+ p+=GetPixelChannels(canvas);
}
q+=scanline_pad;
}
@@ -6232,13 +6242,13 @@
{
p=GetCacheViewVirtualPixels(canvas_view,0,(ssize_t) y,
canvas->columns,1,&canvas->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (int) canvas->columns; x++)
{
- pixel=XGammaPixel(map_info,p);
+ pixel=XGammaPixel(canvas,map_info,p);
*q++=(unsigned char) pixel;
- p++;
+ p+=GetPixelChannels(canvas);
}
q+=scanline_pad;
}
@@ -6258,7 +6268,7 @@
{
p=GetCacheViewVirtualPixels(canvas_view,0,(ssize_t) y,
canvas->columns,1,&canvas->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
if ((red_gamma != 1.0) || (green_gamma != 1.0) ||
(blue_gamma != 1.0))
@@ -6269,23 +6279,26 @@
for (x=(int) canvas->columns-1; x >= 0; x--)
{
*q++=ScaleQuantumToChar(XBlueGamma(
- GetPixelBlue(p)));
+ GetPixelBlue(canvas,p)));
*q++=ScaleQuantumToChar(XGreenGamma(
- GetPixelGreen(p)));
+ GetPixelGreen(canvas,p)));
*q++=ScaleQuantumToChar(XRedGamma(
- GetPixelRed(p)));
+ GetPixelRed(canvas,p)));
*q++=0;
- p++;
+ p+=GetPixelChannels(canvas);
}
continue;
}
for (x=(int) canvas->columns-1; x >= 0; x--)
{
- *q++=ScaleQuantumToChar((Quantum) GetPixelBlue(p));
- *q++=ScaleQuantumToChar((Quantum) GetPixelGreen(p));
- *q++=ScaleQuantumToChar((Quantum) GetPixelRed(p));
+ *q++=ScaleQuantumToChar((Quantum)
+ GetPixelBlue(canvas,p));
+ *q++=ScaleQuantumToChar((Quantum)
+ GetPixelGreen(canvas,p));
+ *q++=ScaleQuantumToChar((Quantum)
+ GetPixelRed(canvas,p));
*q++=0;
- p++;
+ p+=GetPixelChannels(canvas);
}
}
}
@@ -6302,7 +6315,7 @@
{
p=GetCacheViewVirtualPixels(canvas_view,0,(ssize_t) y,
canvas->columns,1,&canvas->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
if ((red_gamma != 1.0) || (green_gamma != 1.0) ||
(blue_gamma != 1.0))
@@ -6313,26 +6326,26 @@
for (x=(int) canvas->columns-1; x >= 0; x--)
{
*q++=ScaleQuantumToChar(XRedGamma(
- GetPixelRed(p)));
+ GetPixelRed(canvas,p)));
*q++=ScaleQuantumToChar(XGreenGamma(
- GetPixelGreen(p)));
+ GetPixelGreen(canvas,p)));
*q++=ScaleQuantumToChar(XBlueGamma(
- GetPixelBlue(p)));
+ GetPixelBlue(canvas,p)));
*q++=0;
- p++;
+ p+=GetPixelChannels(canvas);
}
continue;
}
for (x=(int) canvas->columns-1; x >= 0; x--)
{
*q++=ScaleQuantumToChar((Quantum)
- GetPixelRed(p));
+ GetPixelRed(canvas,p));
*q++=ScaleQuantumToChar((Quantum)
- GetPixelGreen(p));
+ GetPixelGreen(canvas,p));
*q++=ScaleQuantumToChar((Quantum)
- GetPixelBlue(p));
+ GetPixelBlue(canvas,p));
*q++=0;
- p++;
+ p+=GetPixelChannels(canvas);
}
}
}
@@ -6355,11 +6368,11 @@
{
p=GetCacheViewVirtualPixels(canvas_view,0,(ssize_t) y,
canvas->columns,1,&canvas->exception);
- if (p == (PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (int) canvas->columns; x++)
{
- pixel=XGammaPixel(map_info,p);
+ pixel=XGammaPixel(canvas,map_info,p);
for (k=0; k < (int) bytes_per_pixel; k++)
{
channel[k]=(unsigned char) pixel;
@@ -6367,7 +6380,7 @@
}
for (k=0; k < (int) bytes_per_pixel; k++)
*q++=channel[k];
- p++;
+ p+=GetPixelChannels(canvas);
}
q+=scanline_pad;
}
@@ -6387,14 +6400,14 @@
{
p=GetCacheViewVirtualPixels(canvas_view,0,(ssize_t) y,canvas->columns,1,
&canvas->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
bit=0;
byte=0;
for (x=(int) canvas->columns-1; x >= 0; x--)
{
byte>>=1;
- if (GetPixelOpacity(p) > (QuantumRange/2))
+ if (GetPixelAlpha(canvas,p) > (QuantumRange/2))
byte|=0x80;
bit++;
if (bit == 8)
@@ -6403,7 +6416,7 @@
bit=0;
byte=0;
}
- p++;
+ p+=GetPixelChannels(canvas);
}
if (bit != 0)
*q=byte >> (8-bit);
@@ -6466,10 +6479,7 @@
register int
x;
- register const IndexPacket
- *indexes;
-
- register const PixelPacket
+ register const Quantum
*p;
register unsigned char
@@ -6525,8 +6535,8 @@
pattern=DestroyImage(pattern);
}
}
- scanline_pad=(unsigned int) (ximage->bytes_per_line-
- ((ximage->width*ximage->bits_per_pixel) >> 3));
+ scanline_pad=(unsigned int) (ximage->bytes_per_line-((ximage->width*
+ ximage->bits_per_pixel) >> 3));
map_info=window->map_info;
pixels=window->pixel_info->pixels;
q=(unsigned char *) ximage->data;
@@ -6550,24 +6560,23 @@
foreground=(unsigned char)
(XPixelIntensity(&window->pixel_info->background_color) <
XPixelIntensity(&window->pixel_info->foreground_color) ? 0x01 : 0x00);
- polarity=(unsigned short) ((PixelIntensityToQuantum(
+ polarity=(unsigned short) ((GetPixelPacketIntensity(
&canvas->colormap[0])) < ((Quantum) QuantumRange/2) ? 1 : 0);
if (canvas->colors == 2)
- polarity=PixelIntensity(&canvas->colormap[0]) <
- PixelIntensity(&canvas->colormap[1]);
+ polarity=GetPixelPacketIntensity(&canvas->colormap[0]) <
+ GetPixelPacketIntensity(&canvas->colormap[1]);
for (y=0; y < (int) canvas->rows; y++)
{
p=GetCacheViewVirtualPixels(canvas_view,0,(ssize_t) y,canvas->columns,1,
&canvas->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetCacheViewVirtualIndexQueue(canvas_view);
bit=0;
byte=0;
for (x=(int) canvas->columns-1; x >= 0; x--)
{
byte<<=1;
- if (GetPixelIndex(indexes+x) == (IndexPacket) polarity)
+ if (GetPixelIndex(canvas,p) == (Quantum) polarity)
byte|=foreground;
else
byte|=background;
@@ -6578,6 +6587,7 @@
bit=0;
byte=0;
}
+ p+=GetPixelChannels(canvas);
}
if (bit != 0)
*q=byte << (8-bit);
@@ -6600,13 +6610,13 @@
{
p=GetCacheViewVirtualPixels(canvas_view,0,(ssize_t) y,
canvas->columns,1,&canvas->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetCacheViewVirtualIndexQueue(canvas_view);
nibble=0;
for (x=0; x < (int) canvas->columns; x++)
{
- pixel=pixels[(ssize_t) GetPixelIndex(indexes+x)] & 0xf;
+ pixel=pixels[(ssize_t)
+ GetPixelIndex(canvas,p)] & 0xf;
switch (nibble)
{
case 0:
@@ -6635,6 +6645,7 @@
break;
}
}
+ p+=GetPixelChannels(canvas);
}
q+=scanline_pad;
}
@@ -6652,13 +6663,13 @@
{
p=GetCacheViewVirtualPixels(canvas_view,0,(ssize_t) y,
canvas->columns,1,&canvas->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetCacheViewVirtualIndexQueue(canvas_view);
nibble=0;
for (x=0; x < (int) canvas->columns; x++)
{
- pixel=pixels[(ssize_t) GetPixelIndex(indexes+x)] & 0xf;
+ pixel=pixels[(ssize_t)
+ GetPixelIndex(canvas,p)] & 0xf;
switch (nibble)
{
case 0:
@@ -6675,6 +6686,7 @@
break;
}
}
+ p+=GetPixelChannels(canvas);
}
q+=scanline_pad;
}
@@ -6696,13 +6708,14 @@
{
p=GetCacheViewVirtualPixels(canvas_view,0,(ssize_t) y,
canvas->columns,1,&canvas->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetCacheViewVirtualIndexQueue(canvas_view);
for (x=0; x < (int) canvas->columns; x++)
{
- pixel=pixels[(ssize_t) GetPixelIndex(indexes+x)];
+ pixel=pixels[(ssize_t)
+ GetPixelIndex(canvas,p)];
*q++=(unsigned char) pixel;
+ p+=GetPixelChannels(canvas);
}
q+=scanline_pad;
}
@@ -6727,12 +6740,12 @@
{
p=GetCacheViewVirtualPixels(canvas_view,0,(ssize_t) y,
canvas->columns,1,&canvas->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetCacheViewVirtualIndexQueue(canvas_view);
for (x=0; x < (int) canvas->columns; x++)
{
- pixel=pixels[(ssize_t) GetPixelIndex(indexes+x)];
+ pixel=pixels[(ssize_t)
+ GetPixelIndex(canvas,p)];
for (k=(int) bytes_per_pixel-1; k >= 0; k--)
{
channel[k]=(unsigned char) pixel;
@@ -6740,6 +6753,7 @@
}
for (k=0; k < (int) bytes_per_pixel; k++)
*q++=channel[k];
+ p+=GetPixelChannels(canvas);
}
q+=scanline_pad;
}
@@ -6761,12 +6775,12 @@
{
p=GetCacheViewVirtualPixels(canvas_view,0,(ssize_t) y,
canvas->columns,1,&canvas->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
nibble=0;
for (x=(int) canvas->columns-1; x >= 0; x--)
{
- pixel=XGammaPixel(map_info,p);
+ pixel=XGammaPixel(canvas,map_info,p);
pixel&=0xf;
switch (nibble)
{
@@ -6796,7 +6810,7 @@
break;
}
}
- p++;
+ p+=GetPixelChannels(canvas);
}
q+=scanline_pad;
}
@@ -6814,12 +6828,12 @@
{
p=GetCacheViewVirtualPixels(canvas_view,0,(ssize_t) y,
canvas->columns,1,&canvas->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
nibble=0;
for (x=(int) canvas->columns-1; x >= 0; x--)
{
- pixel=XGammaPixel(map_info,p);
+ pixel=XGammaPixel(canvas,map_info,p);
pixel&=0xf;
switch (nibble)
{
@@ -6837,7 +6851,7 @@
break;
}
}
- p++;
+ p+=GetPixelChannels(canvas);
}
q+=scanline_pad;
}
@@ -6859,13 +6873,13 @@
{
p=GetCacheViewVirtualPixels(canvas_view,0,(ssize_t) y,
canvas->columns,1,&canvas->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=(int) canvas->columns-1; x >= 0; x--)
{
- pixel=XGammaPixel(map_info,p);
+ pixel=XGammaPixel(canvas,map_info,p);
*q++=(unsigned char) pixel;
- p++;
+ p+=GetPixelChannels(canvas);
}
q+=scanline_pad;
}
@@ -6885,7 +6899,7 @@
{
p=GetCacheViewVirtualPixels(canvas_view,0,(ssize_t) y,
canvas->columns,1,&canvas->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
if ((red_gamma != 1.0) || (green_gamma != 1.0) ||
(blue_gamma != 1.0))
@@ -6897,22 +6911,25 @@
{
*q++=0;
*q++=ScaleQuantumToChar(XRedGamma(
- GetPixelRed(p)));
+ GetPixelRed(canvas,p)));
*q++=ScaleQuantumToChar(XGreenGamma(
- GetPixelGreen(p)));
+ GetPixelGreen(canvas,p)));
*q++=ScaleQuantumToChar(XBlueGamma(
- GetPixelBlue(p)));
- p++;
+ GetPixelBlue(canvas,p)));
+ p+=GetPixelChannels(canvas);
}
continue;
}
for (x=(int) canvas->columns-1; x >= 0; x--)
{
*q++=0;
- *q++=ScaleQuantumToChar((Quantum) GetPixelRed(p));
- *q++=ScaleQuantumToChar((Quantum) GetPixelGreen(p));
- *q++=ScaleQuantumToChar((Quantum) GetPixelBlue(p));
- p++;
+ *q++=ScaleQuantumToChar((Quantum)
+ GetPixelRed(canvas,p));
+ *q++=ScaleQuantumToChar((Quantum)
+ GetPixelGreen(canvas,p));
+ *q++=ScaleQuantumToChar((Quantum)
+ GetPixelBlue(canvas,p));
+ p+=GetPixelChannels(canvas);
}
}
}
@@ -6929,7 +6946,7 @@
{
p=GetCacheViewVirtualPixels(canvas_view,0,(ssize_t) y,
canvas->columns,1,&canvas->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
if ((red_gamma != 1.0) || (green_gamma != 1.0) ||
(blue_gamma != 1.0))
@@ -6941,12 +6958,12 @@
{
*q++=0;
*q++=ScaleQuantumToChar(XBlueGamma(
- GetPixelBlue(p)));
+ GetPixelBlue(canvas,p)));
*q++=ScaleQuantumToChar(XGreenGamma(
- GetPixelGreen(p)));
+ GetPixelGreen(canvas,p)));
*q++=ScaleQuantumToChar(XRedGamma(
- GetPixelRed(p)));
- p++;
+ GetPixelRed(canvas,p)));
+ p+=GetPixelChannels(canvas);
}
continue;
}
@@ -6954,12 +6971,12 @@
{
*q++=0;
*q++=ScaleQuantumToChar((Quantum)
- GetPixelBlue(p));
+ GetPixelBlue(canvas,p));
*q++=ScaleQuantumToChar((Quantum)
- GetPixelGreen(p));
+ GetPixelGreen(canvas,p));
*q++=ScaleQuantumToChar((Quantum)
- GetPixelRed(p));
- p++;
+ GetPixelRed(canvas,p));
+ p+=GetPixelChannels(canvas);
}
}
}
@@ -6982,11 +6999,11 @@
{
p=GetCacheViewVirtualPixels(canvas_view,0,(ssize_t) y,
canvas->columns,1,&canvas->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=(int) canvas->columns-1; x >= 0; x--)
{
- pixel=XGammaPixel(map_info,p);
+ pixel=XGammaPixel(canvas,map_info,p);
for (k=(int) bytes_per_pixel-1; k >= 0; k--)
{
channel[k]=(unsigned char) pixel;
@@ -6994,7 +7011,7 @@
}
for (k=0; k < (int) bytes_per_pixel; k++)
*q++=channel[k];
- p++;
+ p+=GetPixelChannels(canvas);
}
q+=scanline_pad;
}
@@ -7014,14 +7031,14 @@
{
p=GetCacheViewVirtualPixels(canvas_view,0,(ssize_t) y,canvas->columns,1,
&canvas->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
bit=0;
byte=0;
for (x=(int) canvas->columns-1; x >= 0; x--)
{
byte<<=1;
- if (GetPixelOpacity(p) > (QuantumRange/2))
+ if (GetPixelAlpha(canvas,p) > (QuantumRange/2))
byte|=0x01;
bit++;
if (bit == 8)
@@ -7030,7 +7047,7 @@
bit=0;
byte=0;
}
- p++;
+ p+=GetPixelChannels(canvas);
}
if (bit != 0)
*q=byte << (8-bit);
@@ -7075,7 +7092,7 @@
int
y;
- MagickPixelPacket
+ PixelInfo
pixel;
register int
@@ -7472,7 +7489,7 @@
if (pixel.colorspace == CMYKColorspace)
{
(void) ConcatenateMagickString(tuple,",",MaxTextExtent);
- ConcatenateColorComponent(&pixel,IndexChannel,X11Compliance,tuple);
+ ConcatenateColorComponent(&pixel,BlackChannel,X11Compliance,tuple);
}
if (pixel.matte != MagickFalse)
{
@@ -7697,9 +7714,6 @@
ExceptionInfo
*exception;
- register IndexPacket
- *indexes;
-
register ssize_t
i;
@@ -7730,7 +7744,7 @@
/*
Standard Colormap is already defined (i.e. xstdcmap).
*/
- XGetPixelPacket(display,visual_info,map_info,resource_info,image,
+ XGetPixelInfo(display,visual_info,map_info,resource_info,image,
pixel);
number_colors=(unsigned int) (map_info->base_pixel+
(map_info->red_max+1)*(map_info->green_max+1)*(map_info->blue_max+1));
@@ -7743,7 +7757,7 @@
Image
*affinity_image;
- register PixelPacket
+ register Quantum
*restrict q;
/*
@@ -7760,31 +7774,34 @@
*/
q=QueueAuthenticPixels(affinity_image,0,0,affinity_image->columns,
1,exception);
- if (q != (PixelPacket *) NULL)
+ if (q != (Quantum *) NULL)
{
for (i=0; i < (ssize_t) number_colors; i++)
{
- SetPixelRed(q,0);
+ SetPixelRed(affinity_image,0,q);
if (map_info->red_max != 0)
- SetPixelRed(q,ScaleXToQuantum((size_t) (i/
- map_info->red_mult),map_info->red_max));
- SetPixelGreen(q,0);
+ SetPixelRed(affinity_image,
+ ScaleXToQuantum((size_t) (i/map_info->red_mult),
+ map_info->red_max),q);
+ SetPixelGreen(affinity_image,0,q);
if (map_info->green_max != 0)
- SetPixelGreen(q,ScaleXToQuantum((size_t) ((i/
- map_info->green_mult) % (map_info->green_max+1)),
- map_info->green_max));
- SetPixelBlue(q,0);
+ SetPixelGreen(affinity_image,
+ ScaleXToQuantum((size_t) ((i/map_info->green_mult) %
+ (map_info->green_max+1)),map_info->green_max),q);
+ SetPixelBlue(affinity_image,0,q);
if (map_info->blue_max != 0)
- SetPixelBlue(q,ScaleXToQuantum((size_t) (i %
- map_info->green_mult),map_info->blue_max));
- SetPixelOpacity(q,TransparentOpacity);
- q++;
+ SetPixelBlue(affinity_image,
+ ScaleXToQuantum((size_t) (i % map_info->green_mult),
+ map_info->blue_max),q);
+ SetPixelAlpha(affinity_image,
+ TransparentAlpha,q);
+ q+=GetPixelChannels(affinity_image);
}
(void) SyncAuthenticPixels(affinity_image,exception);
(void) RemapImage(resource_info->quantize_info,image,
affinity_image);
}
- XGetPixelPacket(display,visual_info,map_info,resource_info,image,
+ XGetPixelInfo(display,visual_info,map_info,resource_info,image,
pixel);
(void) SetImageStorageClass(image,DirectClass);
affinity_image=DestroyImage(affinity_image);
@@ -7835,7 +7852,7 @@
Initialize the map and pixel info structures.
*/
XGetMapInfo(visual_info,colormap,map_info);
- XGetPixelPacket(display,visual_info,map_info,resource_info,image,pixel);
+ XGetPixelInfo(display,visual_info,map_info,resource_info,image,pixel);
/*
Allocating colors in server colormap is based on visual class.
*/
@@ -7956,16 +7973,18 @@
register int
x;
- register const PixelPacket
+ register const Quantum
*restrict p;
p=GetCacheViewAuthenticPixels(image_view,0,(ssize_t) y,
image->columns,1,exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
for (x=(int) image->columns-1; x >= 0; x--)
- diversity[(ssize_t) GetPixelIndex(indexes+x)].count++;
+ {
+ diversity[(ssize_t) GetPixelIndex(image,p)].count++;
+ p+=GetPixelChannels(image);
+ }
}
image_view=DestroyCacheView(image_view);
/*
diff --git a/magick/xwindow.h b/MagickCore/xwindow.h
similarity index 100%
rename from magick/xwindow.h
rename to MagickCore/xwindow.h
diff --git a/wand/ChangeLog b/MagickWand/ChangeLog
similarity index 100%
rename from wand/ChangeLog
rename to MagickWand/ChangeLog
diff --git a/wand/MagickWand-config.1 b/MagickWand/MagickWand-config.1
similarity index 100%
rename from wand/MagickWand-config.1
rename to MagickWand/MagickWand-config.1
diff --git a/wand/MagickWand-config.in b/MagickWand/MagickWand-config.in
similarity index 100%
rename from wand/MagickWand-config.in
rename to MagickWand/MagickWand-config.in
diff --git a/wand/MagickWand.h b/MagickWand/MagickWand.h
similarity index 85%
rename from wand/MagickWand.h
rename to MagickWand/MagickWand.h
index 46afbbe..146e519 100644
--- a/wand/MagickWand.h
+++ b/MagickWand/MagickWand.h
@@ -26,7 +26,7 @@
#if !defined(_MAGICKWAND_CONFIG_H)
# define _MAGICKWAND_CONFIG_H
# if !defined(vms) && !defined(macintosh)
-# include "magick/magick-config.h"
+# include "MagickCore/magick-config.h"
# else
# include "magick-config.h"
# endif
@@ -124,25 +124,25 @@
typedef struct _MagickWand
MagickWand;
-#include "magick/MagickCore.h"
-#include "wand/animate.h"
-#include "wand/compare.h"
-#include "wand/composite.h"
-#include "wand/conjure.h"
-#include "wand/convert.h"
-#include "wand/deprecate.h"
-#include "wand/display.h"
-#include "wand/drawing-wand.h"
-#include "wand/identify.h"
-#include "wand/import.h"
-#include "wand/magick-property.h"
-#include "wand/magick-image.h"
-#include "wand/mogrify.h"
-#include "wand/montage.h"
-#include "wand/pixel-iterator.h"
-#include "wand/pixel-wand.h"
-#include "wand/stream.h"
-#include "wand/wand-view.h"
+#include "MagickCore/MagickCore.h"
+#include "MagickWand/animate.h"
+#include "MagickWand/compare.h"
+#include "MagickWand/composite.h"
+#include "MagickWand/conjure.h"
+#include "MagickWand/convert.h"
+#include "MagickWand/deprecate.h"
+#include "MagickWand/display.h"
+#include "MagickWand/drawing-wand.h"
+#include "MagickWand/identify.h"
+#include "MagickWand/import.h"
+#include "MagickWand/magick-property.h"
+#include "MagickWand/magick-image.h"
+#include "MagickWand/mogrify.h"
+#include "MagickWand/montage.h"
+#include "MagickWand/pixel-iterator.h"
+#include "MagickWand/pixel-wand.h"
+#include "MagickWand/stream.h"
+#include "MagickWand/wand-view.h"
extern WandExport char
*MagickGetException(const MagickWand *,ExceptionType *);
diff --git a/wand/MagickWand.pc.in b/MagickWand/MagickWand.pc.in
similarity index 100%
rename from wand/MagickWand.pc.in
rename to MagickWand/MagickWand.pc.in
diff --git a/MagickWand/Makefile.am b/MagickWand/Makefile.am
new file mode 100644
index 0000000..8247e30
--- /dev/null
+++ b/MagickWand/Makefile.am
@@ -0,0 +1,147 @@
+# Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization
+# dedicated to making software imaging solutions freely available.
+#
+# You may not use this file except in compliance with the License. You may
+# obtain a copy of the License at
+#
+# http://www.imagemagick.org/script/license.php
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Makefile for building MagickWand API.
+#
+
+MagickWandincdir = $(topincludedir)/MagickWand
+
+MAGICKWAND_SOURCES = \
+ MagickWand/MagickWand.h \
+ MagickWand/animate.c \
+ MagickWand/animate.h \
+ MagickWand/compare.c \
+ MagickWand/compare.h \
+ MagickWand/composite.c \
+ MagickWand/composite.h \
+ MagickWand/conjure.c \
+ MagickWand/conjure.h \
+ MagickWand/convert.c \
+ MagickWand/convert.h \
+ MagickWand/deprecate.h \
+ MagickWand/deprecate.c \
+ MagickWand/display.c \
+ MagickWand/display.h \
+ MagickWand/drawing-wand.c \
+ MagickWand/drawing-wand.h \
+ MagickWand/identify.c \
+ MagickWand/identify.h \
+ MagickWand/import.c \
+ MagickWand/import.h \
+ MagickWand/magick-image.c \
+ MagickWand/magick-image.h \
+ MagickWand/magick-property.c \
+ MagickWand/magick-property.h \
+ MagickWand/magick-wand.c \
+ MagickWand/magick-wand-private.h \
+ MagickWand/mogrify.c \
+ MagickWand/mogrify.h \
+ MagickWand/mogrify-private.h \
+ MagickWand/montage.c \
+ MagickWand/montage.h \
+ MagickWand/pixel-iterator.c \
+ MagickWand/pixel-iterator.h \
+ MagickWand/pixel-wand.c \
+ MagickWand/pixel-wand.h \
+ MagickWand/pixel-wand-private.h \
+ MagickWand/stream.c \
+ MagickWand/stream.h \
+ MagickWand/studio.h \
+ MagickWand/wand.c \
+ MagickWand/wand.h \
+ MagickWand/wand-view.c \
+ MagickWand/wand-view.h
+
+MAGICKWAND_INCLUDE_HDRS = \
+ MagickWand/MagickWand.h \
+ MagickWand/animate.h \
+ MagickWand/compare.h \
+ MagickWand/composite.h \
+ MagickWand/conjure.h \
+ MagickWand/convert.h \
+ MagickWand/deprecate.h \
+ MagickWand/display.h \
+ MagickWand/drawing-wand.h \
+ MagickWand/identify.h \
+ MagickWand/import.h \
+ MagickWand/magick-image.h \
+ MagickWand/magick-property.h \
+ MagickWand/mogrify.h \
+ MagickWand/montage.h \
+ MagickWand/pixel-iterator.h \
+ MagickWand/pixel-wand.h \
+ MagickWand/stream.h \
+ MagickWand/wand-view.h
+
+MAGICKWAND_NOINST_HDRS = \
+ MagickWand/mogrify-private.h \
+ MagickWand/magick-wand-private.h \
+ MagickWand/pixel-wand-private.h \
+ MagickWand/studio.h \
+ MagickWand/wand.h
+
+# Headers which are installed
+MagickWandinc_HEADERS = \
+ $(MAGICKWAND_INCLUDE_HDRS)
+
+MAGICKWAND_BIN_SCRPTS = \
+ MagickWand/MagickWand-config
+
+MAGICKWAND_PKGCONFIG = \
+ MagickWand/MagickWand.pc
+
+MAGICKWAND_MANS = \
+ MagickWand/MagickWand-config.1
+
+MAGICKWAND_BUILT_SRCS =
+
+MAGICKWAND_LIBS = MagickWand/libMagickWand.la
+
+MagickWand_libMagickWand_la_SOURCES = $(MAGICKWAND_SOURCES)
+MagickWand_libMagickWand_la_CPPFLAGS = $(LIBRARY_EXTRA_CPPFLAGS)
+MagickWand_libMagickWand_la_LDFLAGS = -no-undefined -export-symbols-regex ".*" \
+ -version-info \
+ $(MAGICK_LIBRARY_CURRENT):$(MAGICK_LIBRARY_REVISION):$(MAGICK_LIBRARY_AGE)
+MagickWand_libMagickWand_la_LIBADD = $(MAGICKCORE_LIBS) $(X11_LIBS) $(GOMP_LIBS) $(MATH_LIBS)
+
+MAGICKWAND_EXTRA_DIST = \
+ MagickWand/ChangeLog \
+ MagickWand/input_256c.miff \
+ MagickWand/input_bilevel.miff \
+ MagickWand/input_gray.miff \
+ MagickWand/input_truecolor.miff \
+ MagickWand/MagickWand-config.1 \
+ MagickWand/MagickWand.pc.in \
+ MagickWand/sequence.miff \
+ MagickWand/common.sh \
+ $(MAGICKWAND_TESTS)
+
+MagickWand_drawtest_SOURCES = MagickWand/drawtest.c
+MagickWand_drawtest_LDFLAGS = $(LDFLAGS)
+MagickWand_drawtest_LDADD = $(MAGICKWAND_LIBS)
+
+MagickWand_wandtest_SOURCES = MagickWand/wandtest.c
+MagickWand_wandtest_LDFLAGS = $(LDFLAGS)
+MagickWand_wandtest_LDADD = $(MAGICKWAND_LIBS)
+
+MAGICKWAND_CHECK_PGRMS = \
+ MagickWand/drawtest \
+ MagickWand/wandtest
+
+MAGICKWAND_TESTS = \
+ MagickWand/drawtest.sh \
+ MagickWand/wandtest.sh
+
+MAGICKWAND_CLEANFILES = \
+ MagickWand/*_out.*
diff --git a/wand/Wand-config b/MagickWand/Wand-config
similarity index 100%
rename from wand/Wand-config
rename to MagickWand/Wand-config
diff --git a/wand/Wand-config.1 b/MagickWand/Wand-config.1
similarity index 100%
rename from wand/Wand-config.1
rename to MagickWand/Wand-config.1
diff --git a/wand/Wand.pc.in b/MagickWand/Wand.pc.in
similarity index 100%
rename from wand/Wand.pc.in
rename to MagickWand/Wand.pc.in
diff --git a/wand/WandCore-config.1 b/MagickWand/WandCore-config.1
similarity index 100%
rename from wand/WandCore-config.1
rename to MagickWand/WandCore-config.1
diff --git a/wand/animate.c b/MagickWand/animate.c
similarity index 99%
rename from wand/animate.c
rename to MagickWand/animate.c
index d8c1b92..ce1d18f 100644
--- a/wand/animate.c
+++ b/MagickWand/animate.c
@@ -40,11 +40,11 @@
/*
Include declarations.
*/
-#include "wand/studio.h"
-#include "wand/MagickWand.h"
-#include "wand/mogrify-private.h"
-#include "magick/animate-private.h"
-#include "magick/string-private.h"
+#include "MagickWand/studio.h"
+#include "MagickWand/MagickWand.h"
+#include "MagickWand/mogrify-private.h"
+#include "MagickCore/animate-private.h"
+#include "MagickCore/string-private.h"
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/wand/animate.h b/MagickWand/animate.h
similarity index 100%
rename from wand/animate.h
rename to MagickWand/animate.h
diff --git a/wand/common.sh b/MagickWand/common.sh
similarity index 80%
rename from wand/common.sh
rename to MagickWand/common.sh
index 06363f4..8e3ab3f 100644
--- a/wand/common.sh
+++ b/MagickWand/common.sh
@@ -2,4 +2,4 @@
SRCDIR=`cd $SRCDIR && pwd`
TOPSRCDIR=`cd $srcdir && pwd`
export SRCDIR TOPSRCDIR
-cd wand || exit 1
+cd MagickWand || exit 1
diff --git a/wand/compare.c b/MagickWand/compare.c
similarity index 99%
rename from wand/compare.c
rename to MagickWand/compare.c
index 3563e72..ad328ca 100644
--- a/wand/compare.c
+++ b/MagickWand/compare.c
@@ -41,10 +41,10 @@
/*
Include declarations.
*/
-#include "wand/studio.h"
-#include "wand/MagickWand.h"
-#include "wand/mogrify-private.h"
-#include "magick/string-private.h"
+#include "MagickWand/studio.h"
+#include "MagickWand/MagickWand.h"
+#include "MagickWand/mogrify-private.h"
+#include "MagickCore/string-private.h"
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/wand/compare.h b/MagickWand/compare.h
similarity index 100%
rename from wand/compare.h
rename to MagickWand/compare.h
diff --git a/wand/composite.c b/MagickWand/composite.c
similarity index 99%
rename from wand/composite.c
rename to MagickWand/composite.c
index 83da8a3..6f22b80 100644
--- a/wand/composite.c
+++ b/MagickWand/composite.c
@@ -40,10 +40,10 @@
/*
Include declarations.
*/
-#include "wand/studio.h"
-#include "wand/MagickWand.h"
-#include "wand/mogrify-private.h"
-#include "magick/string-private.h"
+#include "MagickWand/studio.h"
+#include "MagickWand/MagickWand.h"
+#include "MagickWand/mogrify-private.h"
+#include "MagickCore/string-private.h"
/*
Typedef declarations.
diff --git a/wand/composite.h b/MagickWand/composite.h
similarity index 100%
rename from wand/composite.h
rename to MagickWand/composite.h
diff --git a/wand/conjure.c b/MagickWand/conjure.c
similarity index 98%
rename from wand/conjure.c
rename to MagickWand/conjure.c
index 0fb9138..ade0137 100644
--- a/wand/conjure.c
+++ b/MagickWand/conjure.c
@@ -45,9 +45,9 @@
/*
Include declarations.
*/
-#include "wand/studio.h"
-#include "wand/MagickWand.h"
-#include "wand/mogrify-private.h"
+#include "MagickWand/studio.h"
+#include "MagickWand/MagickWand.h"
+#include "MagickWand/mogrify-private.h"
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/wand/conjure.h b/MagickWand/conjure.h
similarity index 100%
rename from wand/conjure.h
rename to MagickWand/conjure.h
diff --git a/wand/convert.c b/MagickWand/convert.c
similarity index 99%
rename from wand/convert.c
rename to MagickWand/convert.c
index b94f9f6..b75b617 100644
--- a/wand/convert.c
+++ b/MagickWand/convert.c
@@ -42,19 +42,22 @@
/*
Include declarations.
*/
-#include "wand/studio.h"
-#include "wand/MagickWand.h"
-#include "wand/mogrify-private.h"
-#include "magick/string-private.h"
-
+#include "MagickWand/studio.h"
+#include "MagickWand/MagickWand.h"
+#include "MagickWand/mogrify-private.h"
+#include "MagickCore/string-private.h"
/*
Define declarations.
*/
#define ThrowFileException(exception,severity,tag,context) \
{ \
+ char \
+ *message; \
+ \
+ message=GetExceptionMessage(errno); \
(void) ThrowMagickException(exception,GetMagickModule(),severity, \
- tag == (const char *) NULL ? "unknown" : tag,"`%s': %s",context, \
- GetExceptionMessage(errno)); \
+ tag == (const char *) NULL ? "unknown" : tag,"`%s': %s",context,message); \
+ message=DestroyString(message); \
}
/*
diff --git a/wand/convert.h b/MagickWand/convert.h
similarity index 100%
rename from wand/convert.h
rename to MagickWand/convert.h
diff --git a/MagickWand/deprecate.c b/MagickWand/deprecate.c
new file mode 100644
index 0000000..0f281d7
--- /dev/null
+++ b/MagickWand/deprecate.c
@@ -0,0 +1,52 @@
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% %
+% %
+% %
+% DDDD EEEEE PPPP RRRR EEEEE CCCC AAA TTTTT EEEEE %
+% D D E P P R R E C A A T E %
+% D D EEE PPPPP RRRR EEE C AAAAA T EEE %
+% D D E P R R E C A A T E %
+% DDDD EEEEE P R R EEEEE CCCC A A T EEEEE %
+% %
+% %
+% MagickWand Deprecated Methods %
+% %
+% Software Design %
+% John Cristy %
+% October 2002 %
+% %
+% %
+% Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization %
+% dedicated to making software imaging solutions freely available. %
+% %
+% You may not use this file except in compliance with the License. You may %
+% obtain a copy of the License at %
+% %
+% http://www.imagemagick.org/script/license.php %
+% %
+% Unless required by applicable law or agreed to in writing, software %
+% distributed under the License is distributed on an "AS IS" BASIS, %
+% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. %
+% See the License for the specific language governing permissions and %
+% limitations under the License. %
+% %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%
+%
+*/
+
+/*
+ Include declarations.
+*/
+#include "MagickWand/studio.h"
+#include "MagickWand/MagickWand.h"
+#include "MagickWand/magick-wand-private.h"
+#include "MagickWand/wand.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/thread-private.h"
+
+#if !defined(MAGICKCORE_EXCLUDE_DEPRECATED)
+
+#endif
diff --git a/magick/accelerate.h b/MagickWand/deprecate.h
similarity index 73%
copy from magick/accelerate.h
copy to MagickWand/deprecate.h
index c575667..0b22794 100644
--- a/magick/accelerate.h
+++ b/MagickWand/deprecate.h
@@ -1,32 +1,30 @@
/*
Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization
dedicated to making software imaging solutions freely available.
-
+
You may not use this file except in compliance with the License.
obtain a copy of the License at
-
+
http://www.imagemagick.org/script/license.php
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
- MagickCore acceleration methods.
+ MagickCore deprecated methods.
*/
-#ifndef _MAGICKCORE_ACCELERATE_H
-#define _MAGICKCORE_ACCELERATE_H
+#ifndef _MAGICKWAND_DEPRECATE_H
+#define _MAGICKWAND_DEPRECATE_H
#if defined(__cplusplus) || defined(c_plusplus)
extern "C" {
#endif
-#include <magick/morphology.h>
+#if !defined(MAGICKCORE_EXCLUDE_DEPRECATED)
-extern MagickExport MagickBooleanType
- AccelerateConvolveImage(const Image *,const KernelInfo *,Image *,
- ExceptionInfo *);
+#endif
#if defined(__cplusplus) || defined(c_plusplus)
}
diff --git a/wand/display.c b/MagickWand/display.c
similarity index 99%
rename from wand/display.c
rename to MagickWand/display.c
index e6d8b27..41f8fd4 100644
--- a/wand/display.c
+++ b/MagickWand/display.c
@@ -41,11 +41,11 @@
/*
Include declarations.
*/
-#include "wand/studio.h"
-#include "wand/MagickWand.h"
-#include "wand/mogrify-private.h"
-#include "magick/display-private.h"
-#include "magick/string-private.h"
+#include "MagickWand/studio.h"
+#include "MagickWand/MagickWand.h"
+#include "MagickWand/mogrify-private.h"
+#include "MagickCore/display-private.h"
+#include "MagickCore/string-private.h"
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/wand/display.h b/MagickWand/display.h
similarity index 100%
rename from wand/display.h
rename to MagickWand/display.h
diff --git a/wand/drawing-wand.c b/MagickWand/drawing-wand.c
similarity index 97%
rename from wand/drawing-wand.c
rename to MagickWand/drawing-wand.c
index 53a8287..bba8c55 100644
--- a/wand/drawing-wand.c
+++ b/MagickWand/drawing-wand.c
@@ -46,11 +46,11 @@
/*
Include declarations.
*/
-#include "wand/studio.h"
-#include "wand/MagickWand.h"
-#include "wand/magick-wand-private.h"
-#include "wand/wand.h"
-#include "magick/string-private.h"
+#include "MagickWand/studio.h"
+#include "MagickWand/MagickWand.h"
+#include "MagickWand/magick-wand-private.h"
+#include "MagickWand/wand.h"
+#include "MagickCore/string-private.h"
/*
Define declarations.
@@ -386,28 +386,26 @@
return(count);
}
-static void MvgAppendColor(DrawingWand *wand,const PixelPacket *color)
+static void MvgAppendColor(DrawingWand *wand,const PixelPacket *packet)
{
- if ((GetPixelRed(color) == 0) &&
- (GetPixelGreen(color) == 0) &&
- (GetPixelBlue(color) == 0) &&
- (GetPixelOpacity(color) == (Quantum) TransparentOpacity))
+ if ((packet->red == 0) && (packet->green == 0) && (packet->blue == 0) &&
+ (packet->alpha == (Quantum) TransparentAlpha))
(void) MvgPrintf(wand,"none");
else
{
char
tuple[MaxTextExtent];
- MagickPixelPacket
+ PixelInfo
pixel;
- GetMagickPixelPacket(wand->image,&pixel);
+ GetPixelInfo(wand->image,&pixel);
pixel.colorspace=RGBColorspace;
- pixel.matte=color->opacity != OpaqueOpacity ? MagickTrue : MagickFalse;
- pixel.red=(MagickRealType) GetPixelRed(color);
- pixel.green=(MagickRealType) GetPixelGreen(color);
- pixel.blue=(MagickRealType) GetPixelBlue(color);
- pixel.opacity=(MagickRealType) GetPixelOpacity(color);
+ pixel.matte=packet->alpha != OpaqueAlpha ? MagickTrue : MagickFalse;
+ pixel.red=(MagickRealType) packet->red;
+ pixel.green=(MagickRealType) packet->green;
+ pixel.blue=(MagickRealType) packet->blue;
+ pixel.alpha=(MagickRealType) packet->alpha;
GetColorTuple(&pixel,MagickTrue,tuple);
(void) MvgPrintf(wand,"%s",tuple);
}
@@ -1219,7 +1217,7 @@
assert(border_color != (PixelWand *) NULL);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
- PixelSetQuantumColor(border_color,&CurrentContext->border_color);
+ PixelSetQuantumPacket(border_color,&CurrentContext->border_color);
}
/*
@@ -1442,7 +1440,7 @@
assert(fill_color != (PixelWand *) NULL);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
- PixelSetQuantumColor(fill_color,&CurrentContext->fill);
+ PixelSetQuantumPacket(fill_color,&CurrentContext->fill);
}
/*
@@ -1477,7 +1475,7 @@
assert(wand->signature == WandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
- alpha=(double) QuantumScale*(QuantumRange-CurrentContext->fill.opacity);
+ alpha=(double) QuantumScale*CurrentContext->fill.alpha;
return(alpha);
}
@@ -1822,7 +1820,7 @@
assert(wand->signature == WandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
- alpha=(double) QuantumScale*(QuantumRange-CurrentContext->opacity);
+ alpha=(double) QuantumScale*CurrentContext->alpha;
return(alpha);
}
@@ -1893,7 +1891,7 @@
assert(stroke_color != (PixelWand *) NULL);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
- PixelSetQuantumColor(stroke_color,&CurrentContext->stroke);
+ PixelSetQuantumPacket(stroke_color,&CurrentContext->stroke);
}
/*
@@ -2130,7 +2128,7 @@
assert(wand->signature == WandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
- alpha=(double) QuantumScale*(QuantumRange-CurrentContext->stroke.opacity);
+ alpha=(double) QuantumScale*CurrentContext->stroke.alpha;
return(alpha);
}
@@ -2416,28 +2414,13 @@
% o wand: the drawing wand.
%
*/
-
-static inline void SetMagickPixelPacket(const Image *image,
- const PixelPacket *color,const IndexPacket *index,MagickPixelPacket *pixel)
-{
- pixel->red=(MagickRealType) GetPixelRed(color);
- pixel->green=(MagickRealType) GetPixelGreen(color);
- pixel->blue=(MagickRealType) GetPixelBlue(color);
- if (image->matte != MagickFalse)
- pixel->opacity=(MagickRealType) GetPixelOpacity(color);
- if (((image->colorspace == CMYKColorspace) ||
- (image->storage_class == PseudoClass)) &&
- (index != (const IndexPacket *) NULL))
- pixel->index=(MagickRealType) GetPixelIndex(index);
-}
-
WandExport char *DrawGetVectorGraphics(DrawingWand *wand)
{
char
value[MaxTextExtent],
*xml;
- MagickPixelPacket
+ PixelInfo
pixel;
register ssize_t
@@ -2454,7 +2437,7 @@
xml_info=NewXMLTreeTag("drawing-wand");
if (xml_info == (XMLTreeInfo *) NULL)
return(char *) NULL;
- GetMagickPixelPacket(wand->image,&pixel);
+ GetPixelInfo(wand->image,&pixel);
child=AddChildToXMLTree(xml_info,"clip-path",0);
if (child != (XMLTreeInfo *) NULL)
(void) SetXMLTreeContent(child,CurrentContext->clip_mask);
@@ -2462,14 +2445,16 @@
if (child != (XMLTreeInfo *) NULL)
{
(void) CopyMagickString(value,CommandOptionToMnemonic(
- MagickClipPathOptions,(ssize_t) CurrentContext->clip_units),MaxTextExtent);
+ MagickClipPathOptions,(ssize_t) CurrentContext->clip_units),
+ MaxTextExtent);
(void) SetXMLTreeContent(child,value);
}
child=AddChildToXMLTree(xml_info,"decorate",0);
if (child != (XMLTreeInfo *) NULL)
{
(void) CopyMagickString(value,CommandOptionToMnemonic(
- MagickDecorateOptions,(ssize_t) CurrentContext->decorate),MaxTextExtent);
+ MagickDecorateOptions,(ssize_t) CurrentContext->decorate),
+ MaxTextExtent);
(void) SetXMLTreeContent(child,value);
}
child=AddChildToXMLTree(xml_info,"encoding",0);
@@ -2478,11 +2463,10 @@
child=AddChildToXMLTree(xml_info,"fill",0);
if (child != (XMLTreeInfo *) NULL)
{
- if (CurrentContext->fill.opacity != OpaqueOpacity)
- pixel.matte=CurrentContext->fill.opacity != OpaqueOpacity ?
+ if (CurrentContext->fill.alpha != OpaqueAlpha)
+ pixel.matte=CurrentContext->fill.alpha != OpaqueAlpha ?
MagickTrue : MagickFalse;
- SetMagickPixelPacket(wand->image,&CurrentContext->fill,
- (const IndexPacket *) NULL,&pixel);
+ SetPixelInfoPacket(wand->image,&CurrentContext->fill,&pixel);
GetColorTuple(&pixel,MagickTrue,value);
(void) SetXMLTreeContent(child,value);
}
@@ -2490,7 +2474,7 @@
if (child != (XMLTreeInfo *) NULL)
{
(void) FormatLocaleString(value,MaxTextExtent,"%g",
- (double) QuantumScale*(QuantumRange-CurrentContext->fill.opacity));
+ (double) QuantumScale*CurrentContext->fill.alpha);
(void) SetXMLTreeContent(child,value);
}
child=AddChildToXMLTree(xml_info,"fill-rule",0);
@@ -2538,18 +2522,17 @@
child=AddChildToXMLTree(xml_info,"gravity",0);
if (child != (XMLTreeInfo *) NULL)
{
- (void) CopyMagickString(value,CommandOptionToMnemonic(MagickGravityOptions,
- (ssize_t) CurrentContext->gravity),MaxTextExtent);
+ (void) CopyMagickString(value,CommandOptionToMnemonic(
+ MagickGravityOptions,(ssize_t) CurrentContext->gravity),MaxTextExtent);
(void) SetXMLTreeContent(child,value);
}
child=AddChildToXMLTree(xml_info,"stroke",0);
if (child != (XMLTreeInfo *) NULL)
{
- if (CurrentContext->stroke.opacity != OpaqueOpacity)
- pixel.matte=CurrentContext->stroke.opacity != OpaqueOpacity ?
+ if (CurrentContext->stroke.alpha != OpaqueAlpha)
+ pixel.matte=CurrentContext->stroke.alpha != OpaqueAlpha ?
MagickTrue : MagickFalse;
- SetMagickPixelPacket(wand->image,&CurrentContext->stroke,
- (const IndexPacket *) NULL,&pixel);
+ SetPixelInfoPacket(wand->image,&CurrentContext->stroke,&pixel);
GetColorTuple(&pixel,MagickTrue,value);
(void) SetXMLTreeContent(child,value);
}
@@ -2612,7 +2595,7 @@
if (child != (XMLTreeInfo *) NULL)
{
(void) FormatLocaleString(value,MaxTextExtent,"%g",
- (double) QuantumScale*(QuantumRange-CurrentContext->stroke.opacity));
+ (double) QuantumScale*CurrentContext->stroke.alpha);
(void) SetXMLTreeContent(child,value);
}
child=AddChildToXMLTree(xml_info,"stroke-width",0);
@@ -2639,11 +2622,10 @@
child=AddChildToXMLTree(xml_info,"text-undercolor",0);
if (child != (XMLTreeInfo *) NULL)
{
- if (CurrentContext->undercolor.opacity != OpaqueOpacity)
- pixel.matte=CurrentContext->undercolor.opacity != OpaqueOpacity ?
+ if (CurrentContext->undercolor.alpha != OpaqueAlpha)
+ pixel.matte=CurrentContext->undercolor.alpha != OpaqueAlpha ?
MagickTrue : MagickFalse;
- SetMagickPixelPacket(wand->image,&CurrentContext->undercolor,
- (const IndexPacket *) NULL,&pixel);
+ SetPixelInfoPacket(wand->image,&CurrentContext->undercolor,&pixel);
GetColorTuple(&pixel,MagickTrue,value);
(void) SetXMLTreeContent(child,value);
}
@@ -2689,7 +2671,7 @@
assert(under_color != (PixelWand *) NULL);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
- PixelSetQuantumColor(under_color,&CurrentContext->undercolor);
+ PixelSetQuantumPacket(under_color,&CurrentContext->undercolor);
}
/*
@@ -4502,22 +4484,8 @@
% o border_wand: border wand.
%
*/
-
-static inline MagickBooleanType IsColorEqual(const PixelPacket *p,
- const PixelPacket *q)
-{
- if (GetPixelRed(p) != GetPixelRed(q))
- return(MagickFalse);
- if (GetPixelGreen(p) != GetPixelGreen(q))
- return(MagickFalse);
- if (GetPixelBlue(p) != GetPixelBlue(q))
- return(MagickFalse);
- if (GetPixelOpacity(p) != GetPixelOpacity(q))
- return(MagickFalse);
- return(MagickTrue);
-}
-
-WandExport void DrawSetBorderColor(DrawingWand *wand,const PixelWand *border_wand)
+WandExport void DrawSetBorderColor(DrawingWand *wand,
+ const PixelWand *border_wand)
{
PixelPacket
*current_border,
@@ -4529,11 +4497,11 @@
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
assert(border_wand != (const PixelWand *) NULL);
- PixelGetQuantumColor(border_wand,&border_color);
+ PixelGetQuantumPacket(border_wand,&border_color);
new_border=border_color;
current_border=(&CurrentContext->border_color);
if ((wand->filter_off != MagickFalse) ||
- (IsColorEqual(current_border,&new_border) == MagickFalse))
+ (IsPixelPacketEquivalent(current_border,&new_border) == MagickFalse))
{
CurrentContext->border_color=new_border;
(void) MvgPrintf(wand,"border-color '");
@@ -4721,11 +4689,11 @@
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
assert(fill_wand != (const PixelWand *) NULL);
- PixelGetQuantumColor(fill_wand,&fill_color);
+ PixelGetQuantumPacket(fill_wand,&fill_color);
new_fill=fill_color;
current_fill=(&CurrentContext->fill);
if ((wand->filter_off != MagickFalse) ||
- (IsColorEqual(current_fill,&new_fill) == MagickFalse))
+ (IsPixelPacketEquivalent(current_fill,&new_fill) == MagickFalse))
{
CurrentContext->fill=new_fill;
(void) MvgPrintf(wand,"fill '");
@@ -4770,9 +4738,9 @@
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
opacity=ClampToQuantum((double) QuantumRange*(1.0-fill_opacity));
if ((wand->filter_off != MagickFalse) ||
- (CurrentContext->fill.opacity != opacity))
+ (CurrentContext->fill.alpha != opacity))
{
- CurrentContext->fill.opacity=opacity;
+ CurrentContext->fill.alpha=opacity;
(void) MvgPrintf(wand,"fill-opacity %g\n",fill_opacity);
}
}
@@ -4856,9 +4824,9 @@
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
quantum_opacity=ClampToQuantum((double) QuantumRange*(1.0-opacity));
if ((wand->filter_off != MagickFalse) ||
- (CurrentContext->opacity != quantum_opacity))
+ (CurrentContext->alpha != quantum_opacity))
{
- CurrentContext->opacity=(Quantum) opacity;
+ CurrentContext->alpha=(Quantum) opacity;
(void) MvgPrintf(wand,"opacity %g\n",opacity);
}
}
@@ -4921,8 +4889,8 @@
DrawPatternPath(wand->image,CurrentContext,pattern_spec,
&CurrentContext->fill_pattern);
#endif
- if (CurrentContext->fill.opacity != (Quantum) TransparentOpacity)
- CurrentContext->fill.opacity=CurrentContext->opacity;
+ if (CurrentContext->fill.alpha != (Quantum) TransparentAlpha)
+ CurrentContext->fill.alpha=CurrentContext->alpha;
(void) MvgPrintf(wand,"fill %s\n",pattern_spec);
return(MagickTrue);
}
@@ -5296,11 +5264,11 @@
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
assert(stroke_wand != (const PixelWand *) NULL);
- PixelGetQuantumColor(stroke_wand,&stroke_color);
+ PixelGetQuantumPacket(stroke_wand,&stroke_color);
new_stroke=stroke_color;
current_stroke=(&CurrentContext->stroke);
if ((wand->filter_off != MagickFalse) ||
- (IsColorEqual(current_stroke,&new_stroke) == MagickFalse))
+ (IsPixelPacketEquivalent(current_stroke,&new_stroke) == MagickFalse))
{
CurrentContext->stroke=new_stroke;
(void) MvgPrintf(wand,"stroke '");
@@ -5361,8 +5329,8 @@
DrawPatternPath(wand->image,CurrentContext,pattern_spec,
&CurrentContext->stroke_pattern);
#endif
- if (CurrentContext->stroke.opacity != (Quantum) TransparentOpacity)
- CurrentContext->stroke.opacity=CurrentContext->opacity;
+ if (CurrentContext->stroke.alpha != (Quantum) TransparentAlpha)
+ CurrentContext->stroke.alpha=CurrentContext->alpha;
(void) MvgPrintf(wand,"stroke %s\n",pattern_spec);
return(MagickTrue);
}
@@ -5737,9 +5705,9 @@
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
opacity=ClampToQuantum((double) QuantumRange*(1.0-stroke_opacity));
if ((wand->filter_off != MagickFalse) ||
- (CurrentContext->stroke.opacity != opacity))
+ (CurrentContext->stroke.alpha != opacity))
{
- CurrentContext->stroke.opacity=opacity;
+ CurrentContext->stroke.alpha=opacity;
(void) MvgPrintf(wand,"stroke-opacity %g\n",stroke_opacity);
}
}
@@ -6114,9 +6082,9 @@
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
assert(under_wand != (const PixelWand *) NULL);
- PixelGetQuantumColor(under_wand,&under_color);
+ PixelGetQuantumPacket(under_wand,&under_color);
if ((wand->filter_off != MagickFalse) ||
- (IsColorEqual(&CurrentContext->undercolor,&under_color) == MagickFalse))
+ (IsPixelPacketEquivalent(&CurrentContext->undercolor,&under_color) == MagickFalse))
{
CurrentContext->undercolor=under_color;
(void) MvgPrintf(wand,"text-undercolor '");
@@ -6221,7 +6189,7 @@
{
value=GetXMLTreeContent(child);
if (value != (const char *) NULL)
- CurrentContext->fill.opacity=ClampToQuantum((MagickRealType)
+ CurrentContext->fill.alpha=ClampToQuantum((MagickRealType)
QuantumRange*(1.0-InterpretLocaleValue(value,(char **) NULL)));
}
child=GetXMLTreeChild(xml_info,"fill-rule");
@@ -6385,7 +6353,7 @@
{
value=GetXMLTreeContent(child);
if (value != (const char *) NULL)
- CurrentContext->stroke.opacity=ClampToQuantum((MagickRealType)
+ CurrentContext->stroke.alpha=ClampToQuantum((MagickRealType)
QuantumRange*(1.0-InterpretLocaleValue(value,(char **) NULL)));
}
child=GetXMLTreeChild(xml_info,"stroke-width");
diff --git a/wand/drawing-wand.h b/MagickWand/drawing-wand.h
similarity index 99%
rename from wand/drawing-wand.h
rename to MagickWand/drawing-wand.h
index 43233ca..3d714aa 100644
--- a/wand/drawing-wand.h
+++ b/MagickWand/drawing-wand.h
@@ -22,7 +22,7 @@
extern "C" {
#endif
-#include "wand/pixel-wand.h"
+#include "MagickWand/pixel-wand.h"
typedef struct _DrawingWand
DrawingWand;
diff --git a/wand/drawtest.c b/MagickWand/drawtest.c
similarity index 99%
rename from wand/drawtest.c
rename to MagickWand/drawtest.c
index 9dcec8d..2596d81 100644
--- a/wand/drawtest.c
+++ b/MagickWand/drawtest.c
@@ -46,7 +46,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include <wand/MagickWand.h>
+#include <MagickWand/MagickWand.h>
#define ThrowWandException(wand) \
{ \
diff --git a/wand/drawtest.sh b/MagickWand/drawtest.sh
similarity index 90%
rename from wand/drawtest.sh
rename to MagickWand/drawtest.sh
index d61bfc9..6c66358 100755
--- a/wand/drawtest.sh
+++ b/MagickWand/drawtest.sh
@@ -7,6 +7,6 @@
#
set -e # Exit on any error
-. ${srcdir}/wand/common.sh
+. ${srcdir}/MagickWand/common.sh
${MEMCHECK} ./drawtest drawtest_out.miff
diff --git a/wand/identify.c b/MagickWand/identify.c
similarity index 99%
rename from wand/identify.c
rename to MagickWand/identify.c
index 5063a74..25f8517d 100644
--- a/wand/identify.c
+++ b/MagickWand/identify.c
@@ -47,9 +47,9 @@
/*
Include declarations.
*/
-#include "wand/studio.h"
-#include "wand/MagickWand.h"
-#include "wand/mogrify-private.h"
+#include "MagickWand/studio.h"
+#include "MagickWand/MagickWand.h"
+#include "MagickWand/mogrify-private.h"
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/wand/identify.h b/MagickWand/identify.h
similarity index 100%
rename from wand/identify.h
rename to MagickWand/identify.h
diff --git a/wand/import.c b/MagickWand/import.c
similarity index 99%
rename from wand/import.c
rename to MagickWand/import.c
index beca813..0207574 100644
--- a/wand/import.c
+++ b/MagickWand/import.c
@@ -41,11 +41,11 @@
/*
Include declarations.
*/
-#include "wand/studio.h"
-#include "wand/MagickWand.h"
-#include "wand/mogrify-private.h"
-#include "magick/xwindow-private.h"
-#include "magick/string-private.h"
+#include "MagickWand/studio.h"
+#include "MagickWand/MagickWand.h"
+#include "MagickWand/mogrify-private.h"
+#include "MagickCore/xwindow-private.h"
+#include "MagickCore/string-private.h"
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/wand/import.h b/MagickWand/import.h
similarity index 100%
rename from wand/import.h
rename to MagickWand/import.h
diff --git a/wand/input_256c.miff b/MagickWand/input_256c.miff
similarity index 100%
rename from wand/input_256c.miff
rename to MagickWand/input_256c.miff
Binary files differ
diff --git a/wand/input_bilevel.miff b/MagickWand/input_bilevel.miff
similarity index 100%
rename from wand/input_bilevel.miff
rename to MagickWand/input_bilevel.miff
Binary files differ
diff --git a/wand/input_gray.miff b/MagickWand/input_gray.miff
similarity index 100%
rename from wand/input_gray.miff
rename to MagickWand/input_gray.miff
Binary files differ
diff --git a/wand/input_truecolor.miff b/MagickWand/input_truecolor.miff
similarity index 100%
rename from wand/input_truecolor.miff
rename to MagickWand/input_truecolor.miff
diff --git a/wand/magick-image.c b/MagickWand/magick-image.c
similarity index 99%
rename from wand/magick-image.c
rename to MagickWand/magick-image.c
index 2f95ccd..5ff8e3c 100644
--- a/wand/magick-image.c
+++ b/MagickWand/magick-image.c
@@ -46,11 +46,11 @@
/*
Include declarations.
*/
-#include "wand/studio.h"
-#include "wand/MagickWand.h"
-#include "wand/magick-wand-private.h"
-#include "wand/wand.h"
-#include "wand/pixel-wand-private.h"
+#include "MagickWand/studio.h"
+#include "MagickWand/MagickWand.h"
+#include "MagickWand/magick-wand-private.h"
+#include "MagickWand/wand.h"
+#include "MagickWand/pixel-wand-private.h"
/*
Define declarations.
@@ -1066,7 +1066,7 @@
border_info.height=height;
border_info.x=0;
border_info.y=0;
- PixelGetQuantumColor(bordercolor,&wand->images->border_color);
+ PixelGetQuantumPacket(bordercolor,&wand->images->border_color);
border_image=BorderImage(wand->images,&border_info,wand->exception);
if (border_image == (Image *) NULL)
return(MagickFalse);
@@ -1605,7 +1605,7 @@
PixelGetGreenQuantum(opacity)),(double) (100.0*QuantumScale*
PixelGetBlueQuantum(opacity)),(double) (100.0*QuantumScale*
PixelGetOpacityQuantum(opacity)));
- PixelGetQuantumColor(colorize,&target);
+ PixelGetQuantumPacket(colorize,&target);
colorize_image=ColorizeImage(wand->images,percent_opaque,target,
wand->exception);
if (colorize_image == (Image *) NULL)
@@ -2409,7 +2409,8 @@
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
return((MagickWand *) NULL);
- deconstruct_image=DeconstructImages(wand->images,wand->exception);
+ deconstruct_image=CompareImageLayers(wand->images,CompareAnyLayer,
+ wand->exception);
if (deconstruct_image == (Image *) NULL)
return((MagickWand *) NULL);
return(CloneMagickWandFromImages(wand,deconstruct_image));
@@ -3373,7 +3374,7 @@
MagickBooleanType
status;
- MagickPixelPacket
+ PixelInfo
target;
assert(wand != (MagickWand *) NULL);
@@ -3383,7 +3384,7 @@
if (wand->images == (Image *) NULL)
ThrowWandException(WandError,"ContainsNoImages",wand->name);
draw_info=CloneDrawInfo(wand->image_info,(DrawInfo *) NULL);
- PixelGetQuantumColor(fill,&draw_info->fill);
+ PixelGetQuantumPacket(fill,&draw_info->fill);
(void) GetOneVirtualMagickPixel(wand->images,x % wand->images->columns,
y % wand->images->rows,&target,wand->exception);
if (bordercolor != (PixelWand *) NULL)
@@ -3547,7 +3548,7 @@
frame_info.y=(ssize_t) height;
frame_info.inner_bevel=inner_bevel;
frame_info.outer_bevel=outer_bevel;
- PixelGetQuantumColor(matte_color,&wand->images->matte_color);
+ PixelGetQuantumPacket(matte_color,&wand->images->matte_color);
frame_image=FrameImage(wand->images,&frame_info,wand->exception);
if (frame_image == (Image *) NULL)
return(MagickFalse);
@@ -3973,7 +3974,7 @@
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
ThrowWandException(WandError,"ContainsNoImages",wand->name);
- PixelSetQuantumColor(background_color,&wand->images->background_color);
+ PixelSetQuantumPacket(background_color,&wand->images->background_color);
return(MagickTrue);
}
@@ -4151,7 +4152,7 @@
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
ThrowWandException(WandError,"ContainsNoImages",wand->name);
- PixelSetQuantumColor(border_color,&wand->images->border_color);
+ PixelSetQuantumPacket(border_color,&wand->images->border_color);
return(MagickTrue);
}
@@ -4581,7 +4582,7 @@
"InvalidColormapIndex","`%s'",wand->name);
return(MagickFalse);
}
- PixelSetQuantumColor(color,wand->images->colormap+index);
+ PixelSetQuantumPacket(color,wand->images->colormap+index);
return(MagickTrue);
}
@@ -5214,7 +5215,7 @@
WandExport PixelWand **MagickGetImageHistogram(MagickWand *wand,
size_t *number_colors)
{
- ColorPacket
+ PixelPacket
*histogram;
PixelWand
@@ -5234,16 +5235,15 @@
return((PixelWand **) NULL);
}
histogram=GetImageHistogram(wand->images,number_colors,wand->exception);
- if (histogram == (ColorPacket *) NULL)
+ if (histogram == (PixelPacket *) NULL)
return((PixelWand **) NULL);
pixel_wands=NewPixelWands(*number_colors);
for (i=0; i < (ssize_t) *number_colors; i++)
{
- PixelSetQuantumColor(pixel_wands[i],&histogram[i].pixel);
- PixelSetIndex(pixel_wands[i],histogram[i].index);
+ PixelSetQuantumPacket(pixel_wands[i],&histogram[i]);
PixelSetColorCount(pixel_wands[i],(size_t) histogram[i].count);
}
- histogram=(ColorPacket *) RelinquishMagickMemory(histogram);
+ histogram=(PixelPacket *) RelinquishMagickMemory(histogram);
return(pixel_wands);
}
@@ -5428,7 +5428,7 @@
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
ThrowWandException(WandError,"ContainsNoImages",wand->name);
- PixelSetQuantumColor(matte_color,&wand->images->matte_color);
+ PixelSetQuantumPacket(matte_color,&wand->images->matte_color);
return(MagickTrue);
}
@@ -5546,10 +5546,7 @@
WandExport MagickBooleanType MagickGetImagePixelColor(MagickWand *wand,
const ssize_t x,const ssize_t y,PixelWand *color)
{
- IndexPacket
- *indexes;
-
- register const PixelPacket
+ register const Quantum
*p;
CacheView
@@ -5563,18 +5560,12 @@
ThrowWandException(WandError,"ContainsNoImages",wand->name);
image_view=AcquireCacheView(wand->images);
p=GetCacheViewVirtualPixels(image_view,x,y,1,1,wand->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
{
image_view=DestroyCacheView(image_view);
return(MagickFalse);
}
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
- PixelSetQuantumColor(color,p);
- if (GetCacheViewColorspace(image_view) == CMYKColorspace)
- PixelSetBlackQuantum(color,*indexes);
- else
- if (GetCacheViewStorageClass(image_view) == PseudoClass)
- PixelSetIndex(color,*indexes);
+ PixelSetQuantumPixel(wand->images,p,color);
image_view=DestroyCacheView(image_view);
return(MagickTrue);
}
@@ -7065,9 +7056,9 @@
montage_info->pointsize=DrawGetFontSize(drawing_wand);
pixel_wand=NewPixelWand();
DrawGetFillColor(drawing_wand,pixel_wand);
- PixelGetQuantumColor(pixel_wand,&montage_info->fill);
+ PixelGetQuantumPacket(pixel_wand,&montage_info->fill);
DrawGetStrokeColor(drawing_wand,pixel_wand);
- PixelGetQuantumColor(pixel_wand,&montage_info->stroke);
+ PixelGetQuantumPacket(pixel_wand,&montage_info->stroke);
pixel_wand=DestroyPixelWand(pixel_wand);
if (thumbnail_geometry != (char *) NULL)
(void) CloneString(&montage_info->geometry,thumbnail_geometry);
@@ -7370,7 +7361,7 @@
Image
*images;
- MagickPixelPacket
+ PixelInfo
pixel;
assert(wand != (MagickWand *) NULL);
@@ -7598,7 +7589,7 @@
MagickBooleanType
status;
- MagickPixelPacket
+ PixelInfo
fill_pixel,
target_pixel;
@@ -8910,7 +8901,7 @@
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
ThrowWandException(WandError,"ContainsNoImages",wand->name);
- PixelGetQuantumColor(background,&wand->images->background_color);
+ PixelGetQuantumPacket(background,&wand->images->background_color);
rotate_image=RotateImage(wand->images,degrees,wand->exception);
if (rotate_image == (Image *) NULL)
return(MagickFalse);
@@ -9359,7 +9350,7 @@
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
ThrowWandException(WandError,"ContainsNoImages",wand->name);
- PixelGetQuantumColor(background,&wand->images->background_color);
+ PixelGetQuantumPacket(background,&wand->images->background_color);
return(MagickTrue);
}
@@ -9477,7 +9468,7 @@
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
ThrowWandException(WandError,"ContainsNoImages",wand->name);
- PixelGetQuantumColor(border,&wand->images->border_color);
+ PixelGetQuantumPacket(border,&wand->images->border_color);
return(MagickTrue);
}
@@ -9592,7 +9583,7 @@
MagickBooleanType
status;
- MagickPixelPacket
+ PixelInfo
pixel;
assert(wand != (MagickWand *) NULL);
@@ -9646,7 +9637,7 @@
if ((wand->images->colormap == (PixelPacket *) NULL) ||
(index >= wand->images->colors))
ThrowWandException(WandError,"InvalidColormapIndex",wand->name);
- PixelGetQuantumColor(color,wand->images->colormap+index);
+ PixelGetQuantumPacket(color,wand->images->colormap+index);
return(SyncImage(wand->images));
}
@@ -10361,7 +10352,7 @@
if (wand->images == (Image *) NULL)
ThrowWandException(WandError,"ContainsNoImages",wand->name);
if ((wand->images->matte == MagickFalse) && (matte != MagickFalse))
- (void) SetImageOpacity(wand->images,OpaqueOpacity);
+ (void) SetImageOpacity(wand->images,OpaqueAlpha);
wand->images->matte=matte;
return(MagickTrue);
}
@@ -10400,7 +10391,7 @@
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
ThrowWandException(WandError,"ContainsNoImages",wand->name);
- PixelGetQuantumColor(matte,&wand->images->matte_color);
+ PixelGetQuantumPacket(matte,&wand->images->matte_color);
return(MagickTrue);
}
@@ -10442,8 +10433,7 @@
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
ThrowWandException(WandError,"ContainsNoImages",wand->name);
- status=SetImageOpacity(wand->images,ClampToQuantum((MagickRealType)
- QuantumRange-QuantumRange*alpha));
+ status=SetImageOpacity(wand->images,ClampToQuantum(QuantumRange*alpha));
if (status == MagickFalse)
InheritException(wand->exception,&wand->images->exception);
return(status);
@@ -11219,7 +11209,7 @@
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
if (wand->images == (Image *) NULL)
ThrowWandException(WandError,"ContainsNoImages",wand->name);
- PixelGetQuantumColor(background,&wand->images->background_color);
+ PixelGetQuantumPacket(background,&wand->images->background_color);
shear_image=ShearImage(wand->images,x_shear,y_shear,wand->exception);
if (shear_image == (Image *) NULL)
return(MagickFalse);
@@ -12141,7 +12131,7 @@
PixelGetGreenQuantum(opacity)),(double) (100.0*QuantumScale*
PixelGetBlueQuantum(opacity)),(double) (100.0*QuantumScale*
PixelGetOpacityQuantum(opacity)));
- PixelGetQuantumColor(tint,&target);
+ PixelGetQuantumPacket(tint,&target);
tint_image=TintImage(wand->images,percent_opaque,target,wand->exception);
if (tint_image == (Image *) NULL)
return(MagickFalse);
@@ -12297,7 +12287,7 @@
MagickBooleanType
status;
- MagickPixelPacket
+ PixelInfo
target_pixel;
assert(wand != (MagickWand *) NULL);
@@ -12309,7 +12299,7 @@
PixelGetMagickColor(target,&target_pixel);
wand->images->fuzz=fuzz;
status=TransparentPaintImage(wand->images,&target_pixel,ClampToQuantum(
- (MagickRealType) QuantumRange-QuantumRange*alpha),invert);
+ QuantumRange*alpha),invert);
if (status == MagickFalse)
InheritException(wand->exception,&wand->images->exception);
return(status);
diff --git a/wand/magick-image.h b/MagickWand/magick-image.h
similarity index 100%
rename from wand/magick-image.h
rename to MagickWand/magick-image.h
diff --git a/wand/magick-property.c b/MagickWand/magick-property.c
similarity index 99%
rename from wand/magick-property.c
rename to MagickWand/magick-property.c
index 16f2f1e..9e8e2c7 100644
--- a/wand/magick-property.c
+++ b/MagickWand/magick-property.c
@@ -46,11 +46,11 @@
/*
Include declarations.
*/
-#include "wand/studio.h"
-#include "wand/MagickWand.h"
-#include "wand/magick-wand-private.h"
-#include "wand/wand.h"
-#include "magick/string-private.h"
+#include "MagickWand/studio.h"
+#include "MagickWand/MagickWand.h"
+#include "MagickWand/magick-wand-private.h"
+#include "MagickWand/wand.h"
+#include "MagickCore/string-private.h"
/*
Define declarations.
@@ -243,7 +243,7 @@
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
background_color=NewPixelWand();
- PixelSetQuantumColor(background_color,&wand->image_info->background_color);
+ PixelSetQuantumPacket(background_color,&wand->image_info->background_color);
return(background_color);
}
@@ -1869,7 +1869,7 @@
assert(wand->signature == WandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
- PixelGetQuantumColor(background,&wand->image_info->background_color);
+ PixelGetQuantumPacket(background,&wand->image_info->background_color);
return(MagickTrue);
}
diff --git a/wand/magick-property.h b/MagickWand/magick-property.h
similarity index 100%
rename from wand/magick-property.h
rename to MagickWand/magick-property.h
diff --git a/wand/magick-wand-private.h b/MagickWand/magick-wand-private.h
similarity index 90%
rename from wand/magick-wand-private.h
rename to MagickWand/magick-wand-private.h
index 0eabd01..e43cb70 100644
--- a/wand/magick-wand-private.h
+++ b/MagickWand/magick-wand-private.h
@@ -23,9 +23,7 @@
#endif
#define DegreesToRadians(x) (MagickPI*(x)/180.0)
-#define MagickPI 3.14159265358979323846264338327950288419716939937510
#define MagickWandId "MagickWand"
-#define QuantumScale ((MagickRealType) 1.0/(MagickRealType) QuantumRange)
#define QuantumTick(i,span) ((MagickBooleanType) ((((i) & ((i)-1)) == 0) || \
(((i) & 0xfff) == 0) || \
((MagickOffsetType) (i) == ((MagickOffsetType) (span)-1))))
diff --git a/wand/magick-wand.c b/MagickWand/magick-wand.c
similarity index 99%
rename from wand/magick-wand.c
rename to MagickWand/magick-wand.c
index 6b8b615..0b125e8 100644
--- a/wand/magick-wand.c
+++ b/MagickWand/magick-wand.c
@@ -46,10 +46,10 @@
/*
Include declarations.
*/
-#include "wand/studio.h"
-#include "wand/MagickWand.h"
-#include "wand/magick-wand-private.h"
-#include "wand/wand.h"
+#include "MagickWand/studio.h"
+#include "MagickWand/MagickWand.h"
+#include "MagickWand/magick-wand-private.h"
+#include "MagickWand/wand.h"
/*
Define declarations.
diff --git a/wand/mogrify-private.h b/MagickWand/mogrify-private.h
similarity index 69%
rename from wand/mogrify-private.h
rename to MagickWand/mogrify-private.h
index 03e1ba0..653330e 100644
--- a/wand/mogrify-private.h
+++ b/MagickWand/mogrify-private.h
@@ -63,7 +63,6 @@
pend=MagickFalse; \
} \
}
-#define MagickPI 3.14159265358979323846264338327950288419716939937510
#define MaxImageStackDepth 32
#define NewImageStack() \
{ \
@@ -93,7 +92,6 @@
image_info=image_stack[k].image_info; \
image=image_stack[k].image; \
}
-#define QuantumScale ((MagickRealType) 1.0/(MagickRealType) QuantumRange)
#define QuantumTick(i,span) ((MagickBooleanType) ((((i) & ((i)-1)) == 0) || \
(((i) & 0xfff) == 0) || \
((MagickOffsetType) (i) == ((MagickOffsetType) (span)-1))))
@@ -122,64 +120,6 @@
*image;
} ImageStack;
-static inline MagickRealType MagickPixelIntensity(
- const MagickPixelPacket *pixel)
-{
- MagickRealType
- intensity;
-
- intensity=0.299*pixel->red+0.587*pixel->green+0.114*pixel->blue;
- return(intensity);
-}
-
-static inline Quantum MagickPixelIntensityToQuantum(
- const MagickPixelPacket *pixel)
-{
- MagickRealType
- intensity;
-
- intensity=0.299*pixel->red+0.587*pixel->green+0.114*pixel->blue;
- return((Quantum) (intensity+0.5));
-}
-
-static inline MagickRealType PixelIntensity(const PixelPacket *pixel)
-{
- MagickRealType
- intensity;
-
- intensity=(MagickRealType) (0.299*pixel->red+0.587*pixel->green+
- 0.114*pixel->blue);
- return(intensity);
-}
-
-static inline Quantum PixelIntensityToQuantum(const PixelPacket *pixel)
-{
- MagickRealType
- intensity;
-
- intensity=(MagickRealType) (0.299*pixel->red+0.587*pixel->green+
- 0.114*pixel->blue);
-#if !defined(MAGICKCORE_HDRI_SUPPORT)
- return((Quantum) (intensity+0.5));
-#else
- return((Quantum) intensity);
-#endif
-}
-
-static inline void SetMagickPixelPacket(const Image *image,
- const PixelPacket *color,const IndexPacket *index,MagickPixelPacket *pixel)
-{
- pixel->red=(MagickRealType) color->red;
- pixel->green=(MagickRealType) color->green;
- pixel->blue=(MagickRealType) color->blue;
- if (image->matte != MagickFalse)
- pixel->opacity=(MagickRealType) color->opacity;
- if (((image->colorspace == CMYKColorspace) ||
- (image->storage_class == PseudoClass)) &&
- (index != (const IndexPacket *) NULL))
- pixel->index=(MagickRealType) *index;
-}
-
#if defined(__cplusplus) || defined(c_plusplus)
}
#endif
diff --git a/wand/mogrify.c b/MagickWand/mogrify.c
similarity index 98%
rename from wand/mogrify.c
rename to MagickWand/mogrify.c
index c2702d9..9e89aae 100644
--- a/wand/mogrify.c
+++ b/MagickWand/mogrify.c
@@ -44,12 +44,15 @@
/*
Include declarations.
*/
-#include "wand/studio.h"
-#include "wand/MagickWand.h"
-#include "wand/mogrify-private.h"
-#include "magick/monitor-private.h"
-#include "magick/thread-private.h"
-#include "magick/string-private.h"
+#include "MagickWand/studio.h"
+#include "MagickWand/MagickWand.h"
+#include "MagickWand/mogrify-private.h"
+#undef DegreesToRadians
+#undef RadiansToDegrees
+#include "MagickCore/image-private.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/thread-private.h"
+#include "MagickCore/string-private.h"
/*
Define declarations.
@@ -57,14 +60,6 @@
#define UndefinedCompressionQuality 0UL
/*
- Constant declaration.
-*/
-static const char
- BackgroundColor[] = "#fff", /* white */
- BorderColor[] = "#dfdfdf", /* gray */
- MatteColor[] = "#bdbdbd"; /* gray */
-
-/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% %
% %
@@ -293,6 +288,10 @@
%
*/
+/*
+** GetImageCache() will read an image into a image cache if not already
+** present then return the image that is in the cache under that filename.
+*/
static inline Image *GetImageCache(const ImageInfo *image_info,const char *path,
ExceptionInfo *exception)
{
@@ -308,10 +307,6 @@
ImageInfo
*read_info;
- /*
- Read an image into a image cache if not already present and return the
- image that is in the cache under that filename.
- */
(void) FormatLocaleString(key,MaxTextExtent,"cache:%s",path);
sans_exception=AcquireExceptionInfo();
image=(Image *) GetImageRegistry(ImageRegistryType,key,sans_exception);
@@ -408,7 +403,7 @@
Image
*sparse_image;
- MagickPixelPacket
+ PixelInfo
color;
MagickBooleanType
@@ -432,7 +427,7 @@
*/
channels=channel;
if (image->colorspace != CMYKColorspace)
- channels=(ChannelType) (channels & ~IndexChannel); /* no index channel */
+ channels=(ChannelType) (channels & ~BlackChannel); /* no black channel */
if (image->matte == MagickFalse)
channels=(ChannelType) (channels & ~OpacityChannel); /* no alpha channel */
number_colors=0;
@@ -442,7 +437,7 @@
number_colors++;
if ((channels & BlueChannel) != 0)
number_colors++;
- if ((channels & IndexChannel) != 0)
+ if ((channels & BlackChannel) != 0)
number_colors++;
if ((channels & OpacityChannel) != 0)
number_colors++;
@@ -537,16 +532,16 @@
if ( isalpha((int) token[0]) || token[0] == '#' ) {
/* Color string given */
(void) QueryMagickColor(token,&color,exception);
- if ( channels & RedChannel )
+ if (channels & RedChannel)
sparse_arguments[x++] = QuantumScale*color.red;
- if ( channels & GreenChannel )
+ if (channels & GreenChannel)
sparse_arguments[x++] = QuantumScale*color.green;
- if ( channels & BlueChannel )
+ if (channels & BlueChannel)
sparse_arguments[x++] = QuantumScale*color.blue;
- if ( channels & IndexChannel )
- sparse_arguments[x++] = QuantumScale*color.index;
- if ( channels & OpacityChannel )
- sparse_arguments[x++] = QuantumScale*color.opacity;
+ if (channels & BlackChannel)
+ sparse_arguments[x++] = QuantumScale*color.black;
+ if (channels & OpacityChannel)
+ sparse_arguments[x++] = QuantumScale*color.alpha;
}
else {
/* Colors given as a set of floating point values - experimental */
@@ -572,7 +567,7 @@
sparse_arguments[x++]=InterpretLocaleValue(token,(char **) NULL);
token[0] = ','; /* used this token - get another */
}
- if ( channels & IndexChannel ) {
+ if (channels & BlackChannel) {
while ( token[0] == ',' ) GetMagickToken(p,&p,token);
if ( token[0] == '\0' || isalpha((int)token[0]) || token[0] == '#' )
break;
@@ -630,7 +625,7 @@
MagickStatusType
status;
- MagickPixelPacket
+ PixelInfo
fill;
MagickStatusType
@@ -661,9 +656,8 @@
draw_info=CloneDrawInfo(mogrify_info,(DrawInfo *) NULL);
quantize_info=AcquireQuantizeInfo(mogrify_info);
SetGeometryInfo(&geometry_info);
- GetMagickPixelPacket(*image,&fill);
- SetMagickPixelPacket(*image,&(*image)->background_color,(IndexPacket *) NULL,
- &fill);
+ GetPixelInfo(*image,&fill);
+ SetPixelInfoPacket(*image,&(*image)->background_color,&fill);
channel=mogrify_info->channel;
format=GetImageOption(mogrify_info,"format");
SetGeometry(*image,®ion_geometry);
@@ -1040,7 +1034,7 @@
Image
*mask_image;
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -1073,16 +1067,16 @@
{
q=GetCacheViewAuthenticPixels(mask_view,0,y,mask_image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) mask_image->columns; x++)
{
if (mask_image->matte == MagickFalse)
- SetPixelOpacity(q,PixelIntensityToQuantum(q));
- SetPixelRed(q,GetPixelOpacity(q));
- SetPixelGreen(q,GetPixelOpacity(q));
- SetPixelBlue(q,GetPixelOpacity(q));
- q++;
+ SetPixelAlpha(mask_image,GetPixelIntensity(mask_image,q),q);
+ SetPixelRed(mask_image,GetPixelAlpha(mask_image,q),q);
+ SetPixelGreen(mask_image,GetPixelAlpha(mask_image,q),q);
+ SetPixelBlue(mask_image,GetPixelAlpha(mask_image,q),q);
+ q+=GetPixelChannels(mask_image);
}
if (SyncCacheViewAuthenticPixels(mask_view,exception) == MagickFalse)
break;
@@ -1553,7 +1547,7 @@
ExceptionInfo
*sans;
- GetMagickPixelPacket(*image,&fill);
+ GetPixelInfo(*image,&fill);
if (*option == '+')
{
(void) QueryMagickColor("none",&fill,exception);
@@ -1582,7 +1576,7 @@
}
if (LocaleCompare("floodfill",option+1) == 0)
{
- MagickPixelPacket
+ PixelInfo
target;
/*
@@ -1911,7 +1905,7 @@
const char
*p;
- MagickPixelPacket
+ PixelInfo
black_point,
white_point;
@@ -2199,7 +2193,7 @@
{
if (LocaleCompare("opaque",option+1) == 0)
{
- MagickPixelPacket
+ PixelInfo
target;
(void) SyncImageSettings(mogrify_info,*image);
@@ -2970,13 +2964,13 @@
}
if (LocaleCompare("transparent",option+1) == 0)
{
- MagickPixelPacket
+ PixelInfo
target;
(void) SyncImageSettings(mogrify_info,*image);
(void) QueryMagickColor(argv[i+1],&target,exception);
(void) TransparentPaintImage(*image,&target,(Quantum)
- TransparentOpacity,*option == '-' ? MagickFalse : MagickTrue);
+ TransparentAlpha,*option == '-' ? MagickFalse : MagickTrue);
InheritException(exception,&(*image)->exception);
break;
}
@@ -3194,7 +3188,7 @@
quantize_info=DestroyQuantizeInfo(quantize_info);
draw_info=DestroyDrawInfo(draw_info);
mogrify_info=DestroyImageInfo(mogrify_info);
- status=(MagickStatusType) ((*image)->exception.severity ==
+ status=(MagickStatusType) ((*image)->exception.severity ==
UndefinedException ? 1 : 0);
return(status == 0 ? MagickFalse : MagickTrue);
}
@@ -7508,7 +7502,8 @@
*deconstruct_image;
(void) SyncImagesSettings(mogrify_info,*images);
- deconstruct_image=DeconstructImages(*images,exception);
+ deconstruct_image=CompareImageLayers(*images,CompareAnyLayer,
+ exception);
if (deconstruct_image == (Image *) NULL)
{
status=MagickFalse;
diff --git a/wand/mogrify.h b/MagickWand/mogrify.h
similarity index 100%
rename from wand/mogrify.h
rename to MagickWand/mogrify.h
diff --git a/wand/montage.c b/MagickWand/montage.c
similarity index 99%
rename from wand/montage.c
rename to MagickWand/montage.c
index 8bd6502..bd9fe71 100644
--- a/wand/montage.c
+++ b/MagickWand/montage.c
@@ -42,10 +42,10 @@
/*
Include declarations.
*/
-#include "wand/studio.h"
-#include "wand/MagickWand.h"
-#include "wand/mogrify-private.h"
-#include "magick/string-private.h"
+#include "MagickWand/studio.h"
+#include "MagickWand/MagickWand.h"
+#include "MagickWand/mogrify-private.h"
+#include "MagickCore/string-private.h"
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/wand/montage.h b/MagickWand/montage.h
similarity index 100%
rename from wand/montage.h
rename to MagickWand/montage.h
diff --git a/wand/pixel-iterator.c b/MagickWand/pixel-iterator.c
similarity index 93%
rename from wand/pixel-iterator.c
rename to MagickWand/pixel-iterator.c
index 329e15e..20ce1db 100644
--- a/wand/pixel-iterator.c
+++ b/MagickWand/pixel-iterator.c
@@ -46,12 +46,12 @@
/*
Include declarations.
*/
-#include "wand/studio.h"
-#include "wand/MagickWand.h"
-#include "wand/magick-wand-private.h"
-#include "wand/pixel-iterator.h"
-#include "wand/pixel-wand.h"
-#include "wand/wand.h"
+#include "MagickWand/studio.h"
+#include "MagickWand/MagickWand.h"
+#include "MagickWand/magick-wand-private.h"
+#include "MagickWand/pixel-iterator.h"
+#include "MagickWand/pixel-wand.h"
+#include "MagickWand/wand.h"
/*
Define declarations.
@@ -72,6 +72,9 @@
ExceptionInfo
*exception;
+ Image
+ *image;
+
CacheView
*view;
@@ -173,6 +176,8 @@
PixelIteratorId,(double) clone_iterator->id);
clone_iterator->exception=AcquireExceptionInfo();
InheritException(clone_iterator->exception,iterator->exception);
+ clone_iterator->image=CloneImage(iterator->image,0,0,MagickTrue,
+ iterator->exception);
clone_iterator->view=CloneCacheView(iterator->view);
clone_iterator->region=iterator->region;
clone_iterator->active=iterator->active;
@@ -215,6 +220,7 @@
assert(iterator->signature == WandSignature);
if (iterator->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",iterator->name);
+ iterator->image=DestroyImage(iterator->image);
iterator->view=DestroyCacheView(iterator->view);
iterator->pixel_wands=DestroyPixelWands(iterator->pixel_wands,
iterator->region.width);
@@ -322,6 +328,7 @@
(void) FormatLocaleString(iterator->name,MaxTextExtent,"%s-%.20g",
PixelIteratorId,(double) iterator->id);
iterator->exception=AcquireExceptionInfo();
+ iterator->image=CloneImage(image,0,0,MagickTrue,iterator->exception);
iterator->view=view;
SetGeometry(image,&iterator->region);
iterator->region.width=image->columns;
@@ -481,10 +488,7 @@
WandExport PixelWand **PixelGetCurrentIteratorRow(PixelIterator *iterator,
size_t *number_wands)
{
- register const IndexPacket
- *indexes;
-
- register const PixelPacket
+ register const Quantum
*pixels;
register ssize_t
@@ -499,23 +503,17 @@
pixels=GetCacheViewVirtualPixels(iterator->view,iterator->region.x,
iterator->region.y+iterator->y,iterator->region.width,1,
iterator->exception);
- if (pixels == (const PixelPacket *) NULL)
+ if (pixels == (const Quantum *) NULL)
{
InheritException(iterator->exception,GetCacheViewException(
iterator->view));
return((PixelWand **) NULL);
}
- indexes=GetCacheViewVirtualIndexQueue(iterator->view);
for (x=0; x < (ssize_t) iterator->region.width; x++)
- PixelSetQuantumColor(iterator->pixel_wands[x],pixels+x);
- if (GetCacheViewColorspace(iterator->view) == CMYKColorspace)
- for (x=0; x < (ssize_t) iterator->region.width; x++)
- PixelSetBlackQuantum(iterator->pixel_wands[x],
- GetPixelBlack(indexes+x));
- if (GetCacheViewStorageClass(iterator->view) == PseudoClass)
- for (x=0; x < (ssize_t) iterator->region.width; x++)
- PixelSetIndex(iterator->pixel_wands[x],
- GetPixelBlack(indexes+x));
+ {
+ PixelSetQuantumPixel(iterator->image,pixels,iterator->pixel_wands[x]);
+ pixels+=GetPixelChannels(iterator->image);
+ }
*number_wands=iterator->region.width;
return(iterator->pixel_wands);
}
@@ -671,10 +669,7 @@
WandExport PixelWand **PixelGetNextIteratorRow(PixelIterator *iterator,
size_t *number_wands)
{
- register const IndexPacket
- *indexes;
-
- register const PixelPacket
+ register const Quantum
*pixels;
register ssize_t
@@ -692,23 +687,17 @@
pixels=GetCacheViewVirtualPixels(iterator->view,iterator->region.x,
iterator->region.y+iterator->y,iterator->region.width,1,
iterator->exception);
- if (pixels == (const PixelPacket *) NULL)
+ if (pixels == (const Quantum *) NULL)
{
InheritException(iterator->exception,GetCacheViewException(
iterator->view));
return((PixelWand **) NULL);
}
- indexes=GetCacheViewVirtualIndexQueue(iterator->view);
for (x=0; x < (ssize_t) iterator->region.width; x++)
- PixelSetQuantumColor(iterator->pixel_wands[x],pixels+x);
- if (GetCacheViewColorspace(iterator->view) == CMYKColorspace)
- for (x=0; x < (ssize_t) iterator->region.width; x++)
- PixelSetBlackQuantum(iterator->pixel_wands[x],
- GetPixelBlack(indexes+x));
- if (GetCacheViewStorageClass(iterator->view) == PseudoClass)
- for (x=0; x < (ssize_t) iterator->region.width; x++)
- PixelSetIndex(iterator->pixel_wands[x],
- GetPixelIndex(indexes+x));
+ {
+ PixelSetQuantumPixel(iterator->image,pixels,iterator->pixel_wands[x]);
+ pixels+=GetPixelChannels(iterator->image);
+ }
*number_wands=iterator->region.width;
return(iterator->pixel_wands);
}
@@ -751,10 +740,7 @@
WandExport PixelWand **PixelGetPreviousIteratorRow(PixelIterator *iterator,
size_t *number_wands)
{
- register const IndexPacket
- *indexes;
-
- register const PixelPacket
+ register const Quantum
*pixels;
register ssize_t
@@ -772,23 +758,17 @@
pixels=GetCacheViewVirtualPixels(iterator->view,iterator->region.x,
iterator->region.y+iterator->y,iterator->region.width,1,
iterator->exception);
- if (pixels == (const PixelPacket *) NULL)
+ if (pixels == (const Quantum *) NULL)
{
InheritException(iterator->exception,GetCacheViewException(
iterator->view));
return((PixelWand **) NULL);
}
- indexes=GetCacheViewVirtualIndexQueue(iterator->view);
for (x=0; x < (ssize_t) iterator->region.width; x++)
- PixelSetQuantumColor(iterator->pixel_wands[x],pixels+x);
- if (GetCacheViewColorspace(iterator->view) == CMYKColorspace)
- for (x=0; x < (ssize_t) iterator->region.width; x++)
- PixelSetBlackQuantum(iterator->pixel_wands[x],
- GetPixelBlack(indexes+x));
- if (GetCacheViewStorageClass(iterator->view) == PseudoClass)
- for (x=0; x < (ssize_t) iterator->region.width; x++)
- PixelSetIndex(iterator->pixel_wands[x],
- GetPixelIndex(indexes+x));
+ {
+ PixelSetQuantumPixel(iterator->image,pixels,iterator->pixel_wands[x]);
+ pixels+=GetPixelChannels(iterator->image);
+ }
*number_wands=iterator->region.width;
return(iterator->pixel_wands);
}
@@ -955,13 +935,10 @@
ExceptionInfo
*exception;
- register IndexPacket
- *restrict indexes;
-
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict pixels;
assert(iterator != (const PixelIterator *) NULL);
@@ -973,19 +950,17 @@
exception=iterator->exception;
pixels=GetCacheViewAuthenticPixels(iterator->view,iterator->region.x,
iterator->region.y+iterator->y,iterator->region.width,1,exception);
- if (pixels == (PixelPacket *) NULL)
+ if (pixels == (Quantum *) NULL)
{
InheritException(iterator->exception,GetCacheViewException(
iterator->view));
return(MagickFalse);
}
- indexes=GetCacheViewAuthenticIndexQueue(iterator->view);
for (x=0; x < (ssize_t) iterator->region.width; x++)
- PixelGetQuantumColor(iterator->pixel_wands[x],pixels+x);
- if (GetCacheViewColorspace(iterator->view) == CMYKColorspace)
- for (x=0; x < (ssize_t) iterator->region.width; x++)
- SetPixelBlack(indexes+x,PixelGetBlackQuantum(
- iterator->pixel_wands[x]));
+ {
+ PixelGetQuantumPixel(iterator->image,iterator->pixel_wands[x],pixels);
+ pixels+=GetPixelChannels(iterator->image);
+ }
if (SyncCacheViewAuthenticPixels(iterator->view,exception) == MagickFalse)
{
InheritException(iterator->exception,GetCacheViewException(
diff --git a/wand/pixel-iterator.h b/MagickWand/pixel-iterator.h
similarity index 96%
rename from wand/pixel-iterator.h
rename to MagickWand/pixel-iterator.h
index c779903..0a2488c 100644
--- a/wand/pixel-iterator.h
+++ b/MagickWand/pixel-iterator.h
@@ -22,8 +22,8 @@
extern "C" {
#endif
-#include "wand/magick-wand.h"
-#include "wand/pixel-wand.h"
+#include "MagickWand/MagickWand.h"
+#include "MagickWand/pixel-wand.h"
typedef struct _PixelIterator
PixelIterator;
diff --git a/wand/pixel-wand-private.h b/MagickWand/pixel-wand-private.h
similarity index 100%
rename from wand/pixel-wand-private.h
rename to MagickWand/pixel-wand-private.h
diff --git a/wand/pixel-wand.c b/MagickWand/pixel-wand.c
similarity index 91%
rename from wand/pixel-wand.c
rename to MagickWand/pixel-wand.c
index 0fa9c00..7e81186 100644
--- a/wand/pixel-wand.c
+++ b/MagickWand/pixel-wand.c
@@ -46,11 +46,11 @@
/*
Include declarations.
*/
-#include "wand/studio.h"
-#include "wand/MagickWand.h"
-#include "wand/magick-wand-private.h"
-#include "wand/pixel-wand-private.h"
-#include "wand/wand.h"
+#include "MagickWand/studio.h"
+#include "MagickWand/MagickWand.h"
+#include "MagickWand/magick-wand-private.h"
+#include "MagickWand/pixel-wand-private.h"
+#include "MagickWand/wand.h"
/*
Define declarations.
@@ -71,7 +71,7 @@
ExceptionInfo
*exception;
- MagickPixelPacket
+ PixelInfo
pixel;
size_t
@@ -331,7 +331,7 @@
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",q->name);
p->pixel.fuzz=fuzz;
q->pixel.fuzz=fuzz;
- return(IsMagickColorSimilar(&p->pixel,&q->pixel));
+ return(IsFuzzyEquivalencePixelInfo(&p->pixel,&q->pixel));
}
/*
@@ -409,7 +409,7 @@
(void) FormatLocaleString(wand->name,MaxTextExtent,"%s-%.20g",PixelWandId,
(double) wand->id);
wand->exception=AcquireExceptionInfo();
- GetMagickPixelPacket((Image *) NULL,&wand->pixel);
+ GetPixelInfo((Image *) NULL,&wand->pixel);
wand->debug=IsEventLogging();
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
@@ -517,7 +517,7 @@
assert(wand->signature == WandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
- return((double) QuantumScale*(QuantumRange-wand->pixel.opacity));
+ return((double) QuantumScale*wand->pixel.alpha);
}
/*
@@ -548,7 +548,7 @@
assert(wand->signature == WandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
- return((Quantum) QuantumRange-ClampToQuantum(wand->pixel.opacity));
+ return(ClampToQuantum(wand->pixel.alpha));
}
/*
@@ -579,7 +579,7 @@
assert(wand->signature == WandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
- return((double) QuantumScale*wand->pixel.index);
+ return((double) QuantumScale*wand->pixel.black);
}
/*
@@ -610,7 +610,7 @@
assert(wand->signature == WandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
- return(ClampToQuantum(wand->pixel.index));
+ return(ClampToQuantum(wand->pixel.black));
}
/*
@@ -702,7 +702,7 @@
char
*color;
- MagickPixelPacket
+ PixelInfo
pixel;
assert(wand != (const PixelWand *) NULL);
@@ -753,10 +753,10 @@
(double) (QuantumScale*wand->pixel.blue));
if (wand->pixel.colorspace == CMYKColorspace)
(void) FormatLocaleString(color+strlen(color),MaxTextExtent,",%g",
- (double) (QuantumScale*wand->pixel.index));
+ (double) (QuantumScale*wand->pixel.black));
if (wand->pixel.matte != MagickFalse)
(void) FormatLocaleString(color+strlen(color),MaxTextExtent,",%g",
- (double) (QuantumScale*wand->pixel.opacity));
+ (double) (QuantumScale*wand->pixel.alpha));
return(ConstantString(color));
}
@@ -1087,20 +1087,20 @@
%
% The format of the PixelGetIndex method is:
%
-% IndexPacket PixelGetIndex(const PixelWand *wand)
+% Quantum PixelGetIndex(const PixelWand *wand)
%
% A description of each parameter follows:
%
% o wand: the pixel wand.
%
*/
-WandExport IndexPacket PixelGetIndex(const PixelWand *wand)
+WandExport Quantum PixelGetIndex(const PixelWand *wand)
{
assert(wand != (const PixelWand *) NULL);
assert(wand->signature == WandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
- return((IndexPacket) wand->pixel.index);
+ return((Quantum) wand->pixel.black);
}
/*
@@ -1180,7 +1180,7 @@
%
% The format of the PixelGetMagickColor method is:
%
-% void PixelGetMagickColor(PixelWand *wand,MagickPixelPacket *color)
+% void PixelGetMagickColor(PixelWand *wand,PixelInfo *color)
%
% A description of each parameter follows:
%
@@ -1190,13 +1190,13 @@
%
*/
WandExport void PixelGetMagickColor(const PixelWand *wand,
- MagickPixelPacket *color)
+ PixelInfo *color)
{
assert(wand != (const PixelWand *) NULL);
assert(wand->signature == WandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
- assert(color != (MagickPixelPacket *) NULL);
+ assert(color != (PixelInfo *) NULL);
*color=wand->pixel;
}
@@ -1228,7 +1228,7 @@
assert(wand->signature == WandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
- return((double) QuantumScale*wand->pixel.opacity);
+ return((double) QuantumScale*wand->pixel.alpha);
}
/*
@@ -1259,7 +1259,7 @@
assert(wand->signature == WandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
- return(ClampToQuantum(wand->pixel.opacity));
+ return(ClampToQuantum(wand->pixel.alpha));
}
/*
@@ -1267,47 +1267,103 @@
% %
% %
% %
-% P i x e l G e t Q u a n t u m C o l o r %
+% P i x e l G e t Q u a n t u m P a c k e t %
% %
% %
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% PixelGetQuantumColor() gets the color of the pixel wand as a PixelPacket.
+% PixelGetQuantumPacket() gets the packet of the pixel wand as a PixelPacket.
%
-% The format of the PixelGetQuantumColor method is:
+% The format of the PixelGetQuantumPacket method is:
%
-% void PixelGetQuantumColor(PixelWand *wand,PixelPacket *color)
+% void PixelGetQuantumPacket(PixelWand *wand,PixelPacket *packet)
%
% A description of each parameter follows:
%
% o wand: the pixel wand.
%
-% o color: The pixel wand color is returned here.
+% o packet: The pixel wand packet is returned here.
%
*/
-WandExport void PixelGetQuantumColor(const PixelWand *wand,PixelPacket *color)
+WandExport void PixelGetQuantumPacket(const PixelWand *wand,PixelPacket *packet)
{
assert(wand != (const PixelWand *) NULL);
assert(wand->signature == WandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
- assert(color != (PixelPacket *) NULL);
- color->opacity=ClampToQuantum(wand->pixel.opacity);
+ assert(packet != (PixelPacket *) NULL);
+ packet->alpha=ClampToQuantum(wand->pixel.alpha);
if (wand->pixel.colorspace == CMYKColorspace)
{
- color->red=ClampToQuantum((MagickRealType) QuantumRange-
- (wand->pixel.red*(QuantumRange-wand->pixel.index)+wand->pixel.index));
- color->green=ClampToQuantum((MagickRealType) QuantumRange-
- (wand->pixel.green*(QuantumRange-wand->pixel.index)+
- wand->pixel.index));
- color->blue=ClampToQuantum((MagickRealType) QuantumRange-
- (wand->pixel.blue*(QuantumRange-wand->pixel.index)+wand->pixel.index));
+ packet->red=ClampToQuantum((MagickRealType) QuantumRange-
+ (wand->pixel.red*(QuantumRange-wand->pixel.black)+
+ wand->pixel.black));
+ packet->green=ClampToQuantum((MagickRealType) QuantumRange-
+ (wand->pixel.green*(QuantumRange-wand->pixel.black)+
+ wand->pixel.black));
+ packet->blue=ClampToQuantum((MagickRealType) QuantumRange-
+ (wand->pixel.blue*(QuantumRange-wand->pixel.black)+
+ wand->pixel.black));
+ packet->black=ClampToQuantum(wand->pixel.black);
return;
}
- color->red=ClampToQuantum(wand->pixel.red);
- color->green=ClampToQuantum(wand->pixel.green);
- color->blue=ClampToQuantum(wand->pixel.blue);
+ packet->red=ClampToQuantum(wand->pixel.red);
+ packet->green=ClampToQuantum(wand->pixel.green);
+ packet->blue=ClampToQuantum(wand->pixel.blue);
+}
+
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% %
+% %
+% %
+% P i x e l G e t Q u a n t u m P i x e l %
+% %
+% %
+% %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% PixelGetQuantumPixel() gets the pixel of the pixel wand as a PixelPacket.
+%
+% The format of the PixelGetQuantumPixel method is:
+%
+% void PixelGetQuantumPixel(const Image *image,const PixelWand *wand,
+% Quantum *pixel)
+%
+% A description of each parameter follows:
+%
+% o wand: the pixel wand.
+%
+% o pixel: The pixel wand pixel is returned here.
+%
+*/
+WandExport void PixelGetQuantumPixel(const Image *image,const PixelWand *wand,
+ Quantum *pixel)
+{
+ assert(wand != (const PixelWand *) NULL);
+ assert(wand->signature == WandSignature);
+ if (wand->debug != MagickFalse)
+ (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
+ assert(pixel != (Quantum *) NULL);
+ SetPixelAlpha(image,ClampToQuantum(wand->pixel.alpha),pixel);
+ if (wand->pixel.colorspace == CMYKColorspace)
+ {
+ SetPixelRed(image,ClampToQuantum((MagickRealType) QuantumRange-
+ (wand->pixel.red*(QuantumRange-wand->pixel.black)+wand->pixel.black)),
+ pixel);
+ SetPixelGreen(image,ClampToQuantum((MagickRealType) QuantumRange-
+ (wand->pixel.green*(QuantumRange-wand->pixel.black)+wand->pixel.black)),
+ pixel);
+ SetPixelBlue(image,ClampToQuantum((MagickRealType) QuantumRange-
+ (wand->pixel.blue*(QuantumRange-wand->pixel.black)+wand->pixel.black)),
+ pixel);
+ SetPixelBlack(image,ClampToQuantum(wand->pixel.black),pixel);
+ return;
+ }
+ SetPixelRed(image,ClampToQuantum(wand->pixel.red),pixel);
+ SetPixelGreen(image,ClampToQuantum(wand->pixel.green),pixel);
+ SetPixelBlue(image,ClampToQuantum(wand->pixel.blue),pixel);
}
/*
@@ -1465,8 +1521,7 @@
assert(wand->signature == WandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
- wand->pixel.opacity=(MagickRealType) (QuantumRange-
- ClampToQuantum((MagickRealType) QuantumRange*alpha));
+ wand->pixel.alpha=ClampToQuantum(QuantumRange*alpha);
}
/*
@@ -1500,7 +1555,7 @@
assert(wand->signature == WandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
- wand->pixel.opacity=(MagickRealType) (QuantumRange-opacity);
+ wand->pixel.alpha=(MagickRealType) opacity;
}
/*
@@ -1533,7 +1588,7 @@
assert(wand->signature == WandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
- wand->pixel.index=(MagickRealType) ClampToQuantum((MagickRealType)
+ wand->pixel.black=(MagickRealType) ClampToQuantum((MagickRealType)
QuantumRange*black);
}
@@ -1567,7 +1622,7 @@
assert(wand->signature == WandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
- wand->pixel.index=(MagickRealType) black;
+ wand->pixel.black=(MagickRealType) black;
}
/*
@@ -1667,7 +1722,7 @@
MagickBooleanType
status;
- MagickPixelPacket
+ PixelInfo
pixel;
assert(wand != (const PixelWand *) NULL);
@@ -1973,7 +2028,7 @@
%
% The format of the PixelSetIndex method is:
%
-% void PixelSetIndex(PixelWand *wand,const IndexPacket index)
+% void PixelSetIndex(PixelWand *wand,const Quantum index)
%
% A description of each parameter follows:
%
@@ -1982,7 +2037,7 @@
% o index: the colormap index.
%
*/
-WandExport void PixelSetIndex(PixelWand *wand,const IndexPacket index)
+WandExport void PixelSetIndex(PixelWand *wand,const Quantum index)
{
assert(wand != (const PixelWand *) NULL);
assert(wand->signature == WandSignature);
@@ -2070,11 +2125,11 @@
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% PixelSetMagickColor() sets the color of the pixel wand.
+% PixelSetPixelInfo() sets the color of the pixel wand.
%
-% The format of the PixelSetMagickColor method is:
+% The format of the PixelSetPixelInfo method is:
%
-% PixelSetMagickColor(PixelWand *wand,const MagickPixelPacket *color)
+% PixelSetPixelInfo(PixelWand *wand,const PixelInfo *color)
%
% A description of each parameter follows:
%
@@ -2083,14 +2138,14 @@
% o color: the pixel wand color.
%
*/
-WandExport void PixelSetMagickColor(PixelWand *wand,
- const MagickPixelPacket *color)
+WandExport void PixelSetPixelInfo(PixelWand *wand,
+ const PixelInfo *color)
{
assert(wand != (const PixelWand *) NULL);
assert(wand->signature == WandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
- assert(color != (const MagickPixelPacket *) NULL);
+ assert(color != (const PixelInfo *) NULL);
wand->pixel=(*color);
}
@@ -2125,7 +2180,7 @@
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
wand->pixel.matte=MagickTrue;
- wand->pixel.opacity=(MagickRealType) ClampToQuantum((MagickRealType)
+ wand->pixel.alpha=(MagickRealType) ClampToQuantum((MagickRealType)
QuantumRange*opacity);
}
@@ -2160,7 +2215,7 @@
assert(wand->signature == WandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
- wand->pixel.opacity=(MagickRealType) opacity;
+ wand->pixel.alpha=(MagickRealType) opacity;
}
/*
@@ -2168,37 +2223,80 @@
% %
% %
% %
-% P i x e l S e t Q u a n t u m C o l o r %
+% P i x e l S e t Q u a n t u m P a c k e t %
% %
% %
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% PixelSetQuantumColor() sets the color of the pixel wand.
+% PixelSetQuantumPacket() sets the packet of the pixel wand.
%
-% The format of the PixelSetQuantumColor method is:
+% The format of the PixelSetQuantumPacket method is:
%
-% PixelSetQuantumColor(PixelWand *wand,const PixelPacket *color)
+% PixelSetQuantumPacket(PixelWand *wand,const PixelPacket *packet)
%
% A description of each parameter follows:
%
% o wand: the pixel wand.
%
-% o color: the pixel wand color.
+% o packet: the pixel wand packet.
%
*/
-WandExport void PixelSetQuantumColor(PixelWand *wand,const PixelPacket *color)
+WandExport void PixelSetQuantumPacket(PixelWand *wand,const PixelPacket *packet)
{
assert(wand != (const PixelWand *) NULL);
assert(wand->signature == WandSignature);
if (wand->debug != MagickFalse)
(void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
- assert(color != (PixelPacket *) NULL);
- wand->pixel.red=(MagickRealType) color->red;
- wand->pixel.green=(MagickRealType) color->green;
- wand->pixel.blue=(MagickRealType) color->blue;
- wand->pixel.opacity=(MagickRealType) color->opacity;
- wand->pixel.matte=color->opacity != OpaqueOpacity ? MagickTrue : MagickFalse;
+ assert(packet != (PixelPacket *) NULL);
+ wand->pixel.red=(MagickRealType) packet->red;
+ wand->pixel.green=(MagickRealType) packet->green;
+ wand->pixel.blue=(MagickRealType) packet->blue;
+ wand->pixel.black=(MagickRealType) packet->black;
+ wand->pixel.alpha=(MagickRealType) packet->alpha;
+ wand->pixel.matte=packet->alpha != OpaqueAlpha ? MagickTrue : MagickFalse;
+}
+
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% %
+% %
+% %
+% P i x e l S e t Q u a n t u m P i x e l %
+% %
+% %
+% %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% PixelSetQuantumPixel() sets the pixel of the pixel wand.
+%
+% The format of the PixelSetQuantumPixel method is:
+%
+% PixelSetQuantumPixel(const Image *image,const QixelPixel *pixel,
+% PixelWand *wand)
+%
+% A description of each parameter follows:
+%
+% o wand: the pixel wand.
+%
+% o pixel: the pixel wand pixel.
+%
+*/
+WandExport void PixelSetQuantumPixel(const Image *image,const Quantum *pixel,
+ PixelWand *wand)
+{
+ assert(wand != (const PixelWand *) NULL);
+ assert(wand->signature == WandSignature);
+ if (wand->debug != MagickFalse)
+ (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
+ assert(pixel != (Quantum *) NULL);
+ wand->pixel.red=(MagickRealType) GetPixelRed(image,pixel);
+ wand->pixel.green=(MagickRealType) GetPixelGreen(image,pixel);
+ wand->pixel.blue=(MagickRealType) GetPixelBlue(image,pixel);
+ wand->pixel.black=(MagickRealType) GetPixelBlack(image,pixel);
+ wand->pixel.alpha=(MagickRealType) GetPixelAlpha(image,pixel);
+ wand->pixel.matte=GetPixelAlpha(image,pixel) != OpaqueAlpha ? MagickTrue :
+ MagickFalse;
}
/*
diff --git a/wand/pixel-wand.h b/MagickWand/pixel-wand.h
similarity index 89%
rename from wand/pixel-wand.h
rename to MagickWand/pixel-wand.h
index 126a66e..74e7a6f 100644
--- a/wand/pixel-wand.h
+++ b/MagickWand/pixel-wand.h
@@ -45,9 +45,6 @@
extern WandExport ExceptionType
PixelGetExceptionType(const PixelWand *);
-extern WandExport IndexPacket
- PixelGetIndex(const PixelWand *);
-
extern WandExport MagickBooleanType
IsPixelWand(const PixelWand *),
IsPixelWandSimilar(PixelWand *,PixelWand *,const double),
@@ -68,6 +65,7 @@
PixelGetBlueQuantum(const PixelWand *),
PixelGetCyanQuantum(const PixelWand *),
PixelGetGreenQuantum(const PixelWand *),
+ PixelGetIndex(const PixelWand *),
PixelGetMagentaQuantum(const PixelWand *),
PixelGetOpacityQuantum(const PixelWand *),
PixelGetRedQuantum(const PixelWand *),
@@ -79,8 +77,9 @@
extern WandExport void
ClearPixelWand(PixelWand *),
PixelGetHSL(const PixelWand *,double *,double *,double *),
- PixelGetMagickColor(const PixelWand *,MagickPixelPacket *),
- PixelGetQuantumColor(const PixelWand *,PixelPacket *),
+ PixelGetMagickColor(const PixelWand *,PixelInfo *),
+ PixelGetQuantumPacket(const PixelWand *,PixelPacket *),
+ PixelGetQuantumPixel(const Image *,const PixelWand *,Quantum *),
PixelSetAlpha(PixelWand *,const double),
PixelSetAlphaQuantum(PixelWand *,const Quantum),
PixelSetBlack(PixelWand *,const double),
@@ -95,13 +94,14 @@
PixelSetGreen(PixelWand *,const double),
PixelSetGreenQuantum(PixelWand *,const Quantum),
PixelSetHSL(PixelWand *,const double,const double,const double),
- PixelSetIndex(PixelWand *,const IndexPacket),
+ PixelSetIndex(PixelWand *,const Quantum),
PixelSetMagenta(PixelWand *,const double),
PixelSetMagentaQuantum(PixelWand *,const Quantum),
- PixelSetMagickColor(PixelWand *,const MagickPixelPacket *),
+ PixelSetPixelInfo(PixelWand *,const PixelInfo *),
PixelSetOpacity(PixelWand *,const double),
PixelSetOpacityQuantum(PixelWand *,const Quantum),
- PixelSetQuantumColor(PixelWand *,const PixelPacket *),
+ PixelSetQuantumPacket(PixelWand *,const PixelPacket *),
+ PixelSetQuantumPixel(const Image *,const Quantum *,PixelWand *),
PixelSetRed(PixelWand *,const double),
PixelSetRedQuantum(PixelWand *,const Quantum),
PixelSetYellow(PixelWand *,const double),
diff --git a/wand/sequence.miff b/MagickWand/sequence.miff
similarity index 100%
rename from wand/sequence.miff
rename to MagickWand/sequence.miff
Binary files differ
diff --git a/wand/stream.c b/MagickWand/stream.c
similarity index 99%
rename from wand/stream.c
rename to MagickWand/stream.c
index 2107ab7..d68faf8 100644
--- a/wand/stream.c
+++ b/MagickWand/stream.c
@@ -44,10 +44,10 @@
/*
Include declarations.
*/
-#include "wand/studio.h"
-#include "wand/MagickWand.h"
-#include "wand/mogrify-private.h"
-#include "magick/stream-private.h"
+#include "MagickWand/studio.h"
+#include "MagickWand/MagickWand.h"
+#include "MagickWand/mogrify-private.h"
+#include "MagickCore/stream-private.h"
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/wand/stream.h b/MagickWand/stream.h
similarity index 100%
rename from wand/stream.h
rename to MagickWand/stream.h
diff --git a/wand/studio.h b/MagickWand/studio.h
similarity index 97%
rename from wand/studio.h
rename to MagickWand/studio.h
index e4628fe..09aa23b 100644
--- a/wand/studio.h
+++ b/MagickWand/studio.h
@@ -33,7 +33,7 @@
#if !defined(_MAGICKWAND_CONFIG_H)
# define _MAGICKWAND_CONFIG_H
# if !defined(vms) && !defined(macintosh)
-# include "magick/magick-config.h"
+# include "MagickCore/magick-config.h"
# else
# include "magick-config.h"
# endif
@@ -279,7 +279,7 @@
# if !defined(S_ISREG)
# define S_ISREG(mode) (((mode) & S_IFMT) == S_IFREG)
# endif
-# include "wand/MagickWand.h"
+# include "MagickWand/MagickWand.h"
# if !defined(MAGICKCORE_WINDOWS_SUPPORT)
# include <sys/time.h>
# if defined(MAGICKCORE_HAVE_SYS_TIMES_H)
@@ -299,7 +299,7 @@
# endif
# include <unix.h>
# endif
-# include "wand/MagickWand.h"
+# include "MagickWand/MagickWand.h"
#endif
#if defined(S_IRUSR) && defined(S_IWUSR)
@@ -311,13 +311,13 @@
#endif
#if defined(MAGICKCORE_WINDOWS_SUPPORT)
-# include "magick/nt-base.h"
+# include "MagickCore/nt-base.h"
#endif
#if defined(macintosh)
-# include "magick/mac.h"
+# include "MagickCore/mac.h"
#endif
#if defined(vms)
-# include "magick/vms.h"
+# include "MagickCore/vms.h"
#endif
#undef HAVE_CONFIG_H
diff --git a/wand/wand-view.c b/MagickWand/wand-view.c
similarity index 87%
rename from wand/wand-view.c
rename to MagickWand/wand-view.c
index d4c3caa..876f96c 100644
--- a/wand/wand-view.c
+++ b/MagickWand/wand-view.c
@@ -45,12 +45,12 @@
/*
Include declarations.
*/
-#include "wand/studio.h"
-#include "wand/MagickWand.h"
-#include "wand/magick-wand-private.h"
-#include "wand/wand.h"
-#include "magick/monitor-private.h"
-#include "magick/thread-private.h"
+#include "MagickWand/studio.h"
+#include "MagickWand/MagickWand.h"
+#include "MagickWand/magick-wand-private.h"
+#include "MagickWand/wand.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/thread-private.h"
/*
Define declarations.
*/
@@ -74,6 +74,9 @@
MagickWand
*wand;
+ Image
+ *image;
+
CacheView
*view;
@@ -136,6 +139,8 @@
(void) FormatLocaleString(clone_view->name,MaxTextExtent,"%s-%.20g",
WandViewId,(double) clone_view->id);
clone_view->description=ConstantString(wand_view->description);
+ clone_view->image=CloneImage(wand_view->image,0,0,MagickTrue,
+ wand_view->exception);
clone_view->view=CloneCacheView(wand_view->view);
clone_view->extent=wand_view->extent;
clone_view->number_threads=wand_view->number_threads;
@@ -194,6 +199,7 @@
assert(wand_view->signature == WandSignature);
wand_view->pixel_wands=DestroyPixelsThreadSet(wand_view->pixel_wands,
wand_view->extent.width,wand_view->number_threads);
+ wand_view->image=DestroyImage(wand_view->image);
wand_view->view=DestroyCacheView(wand_view->view);
wand_view->exception=DestroyExceptionInfo(wand_view->exception);
wand_view->signature=(~WandSignature);
@@ -262,7 +268,6 @@
Image
*destination_image,
- *duplex_image,
*source_image;
MagickBooleanType
@@ -279,7 +284,6 @@
if (transfer == (DuplexTransferWandViewMethod) NULL)
return(MagickFalse);
source_image=source->wand->images;
- duplex_image=duplex->wand->images;
destination_image=destination->wand->images;
if (SetImageStorageClass(destination_image,DirectClass) == MagickFalse)
return(MagickFalse);
@@ -297,89 +301,66 @@
MagickBooleanType
sync;
- register const IndexPacket
- *restrict duplex_indexes,
- *restrict indexes;
-
- register const PixelPacket
+ register const Quantum
*restrict duplex_pixels,
*restrict pixels;
- register IndexPacket
- *restrict destination_indexes;
-
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict destination_pixels;
if (status == MagickFalse)
continue;
pixels=GetCacheViewVirtualPixels(source->view,source->extent.x,y,
source->extent.width,1,source->exception);
- if (pixels == (const PixelPacket *) NULL)
+ if (pixels == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewVirtualIndexQueue(source->view);
for (x=0; x < (ssize_t) source->extent.width; x++)
- PixelSetQuantumColor(source->pixel_wands[id][x],pixels+x);
- if (source_image->colorspace == CMYKColorspace)
- for (x=0; x < (ssize_t) source->extent.width; x++)
- PixelSetBlackQuantum(source->pixel_wands[id][x],
- GetPixelBlack(indexes+x));
- if (source_image->storage_class == PseudoClass)
- for (x=0; x < (ssize_t) source->extent.width; x++)
- PixelSetIndex(source->pixel_wands[id][x],
- GetPixelIndex(indexes+x));
+ {
+ PixelSetQuantumPixel(source->image,pixels,source->pixel_wands[id][x]);
+ pixels+=GetPixelChannels(source->image);
+ }
duplex_pixels=GetCacheViewVirtualPixels(duplex->view,duplex->extent.x,y,
duplex->extent.width,1,duplex->exception);
- if (duplex_pixels == (const PixelPacket *) NULL)
+ if (duplex_pixels == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- duplex_indexes=GetCacheViewVirtualIndexQueue(duplex->view);
for (x=0; x < (ssize_t) duplex->extent.width; x++)
- PixelSetQuantumColor(duplex->pixel_wands[id][x],duplex_pixels+x);
- if (duplex_image->colorspace == CMYKColorspace)
- for (x=0; x < (ssize_t) duplex->extent.width; x++)
- PixelSetBlackQuantum(duplex->pixel_wands[id][x],
- GetPixelBlack(duplex_indexes+x));
- if (duplex_image->storage_class == PseudoClass)
- for (x=0; x < (ssize_t) duplex->extent.width; x++)
- PixelSetIndex(duplex->pixel_wands[id][x],
- GetPixelIndex(duplex_indexes+x));
+ {
+ PixelSetQuantumPixel(duplex->image,duplex_pixels,
+ duplex->pixel_wands[id][x]);
+ duplex_pixels+=GetPixelChannels(duplex->image);
+ }
destination_pixels=GetCacheViewAuthenticPixels(destination->view,
destination->extent.x,y,destination->extent.width,1,exception);
- if (destination_pixels == (PixelPacket *) NULL)
+ if (destination_pixels == (Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- destination_indexes=GetCacheViewAuthenticIndexQueue(destination->view);
for (x=0; x < (ssize_t) destination->extent.width; x++)
- PixelSetQuantumColor(destination->pixel_wands[id][x],
- destination_pixels+x);
- if (destination_image->colorspace == CMYKColorspace)
- for (x=0; x < (ssize_t) destination->extent.width; x++)
- PixelSetBlackQuantum(destination->pixel_wands[id][x],
- GetPixelBlack(destination_indexes+x));
- if (destination_image->storage_class == PseudoClass)
- for (x=0; x < (ssize_t) destination->extent.width; x++)
- PixelSetIndex(destination->pixel_wands[id][x],
- GetPixelIndex(destination_indexes+x));
+ {
+ PixelSetQuantumPixel(destination->image,destination_pixels,
+ destination->pixel_wands[id][x]);
+ destination_pixels+=GetPixelChannels(destination->image);
+ }
if (transfer(source,duplex,destination,y,id,context) == MagickFalse)
status=MagickFalse;
+ destination_pixels=GetCacheViewAuthenticPixels(destination->view,
+ destination->extent.x,y,destination->extent.width,1,exception);
for (x=0; x < (ssize_t) destination->extent.width; x++)
- PixelGetQuantumColor(destination->pixel_wands[id][x],
- destination_pixels+x);
- if (destination_image->colorspace == CMYKColorspace)
- for (x=0; x < (ssize_t) destination->extent.width; x++)
- SetPixelBlack(destination_indexes+x,PixelGetBlackQuantum(
- destination->pixel_wands[id][x]));
+ {
+ PixelGetQuantumPixel(destination->image,destination->pixel_wands[id][x],
+ destination_pixels);
+ destination_pixels+=GetPixelChannels(destination->image);
+ }
sync=SyncCacheViewAuthenticPixels(destination->view,exception);
if (sync == MagickFalse)
{
@@ -565,10 +546,7 @@
const int
id = GetOpenMPThreadId();
- register const IndexPacket
- *indexes;
-
- register const PixelPacket
+ register const Quantum
*pixels;
register ssize_t
@@ -578,22 +556,16 @@
continue;
pixels=GetCacheViewVirtualPixels(source->view,source->extent.x,y,
source->extent.width,1,source->exception);
- if (pixels == (const PixelPacket *) NULL)
+ if (pixels == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewVirtualIndexQueue(source->view);
for (x=0; x < (ssize_t) source->extent.width; x++)
- PixelSetQuantumColor(source->pixel_wands[id][x],pixels+x);
- if (source_image->colorspace == CMYKColorspace)
- for (x=0; x < (ssize_t) source->extent.width; x++)
- PixelSetBlackQuantum(source->pixel_wands[id][x],
- GetPixelBlack(indexes+x));
- if (source_image->storage_class == PseudoClass)
- for (x=0; x < (ssize_t) source->extent.width; x++)
- PixelSetIndex(source->pixel_wands[id][x],
- GetPixelIndex(indexes+x));
+ {
+ PixelSetQuantumPixel(source->image,pixels,source->pixel_wands[id][x]);
+ pixels+=GetPixelChannels(source->image);
+ }
if (get(source,y,id,context) == MagickFalse)
status=MagickFalse;
if (source_image->progress_monitor != (MagickProgressMonitor) NULL)
@@ -968,35 +940,31 @@
MagickBooleanType
sync;
- register IndexPacket
- *restrict indexes;
-
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict pixels;
if (status == MagickFalse)
continue;
pixels=GetCacheViewAuthenticPixels(destination->view,destination->extent.x,
y,destination->extent.width,1,exception);
- if (pixels == (PixelPacket *) NULL)
+ if (pixels == (Quantum *) NULL)
{
InheritException(destination->exception,GetCacheViewException(
destination->view));
status=MagickFalse;
continue;
}
- indexes=GetCacheViewAuthenticIndexQueue(destination->view);
if (set(destination,y,id,context) == MagickFalse)
status=MagickFalse;
for (x=0; x < (ssize_t) destination->extent.width; x++)
- PixelGetQuantumColor(destination->pixel_wands[id][x],pixels+x);
- if (destination_image->colorspace == CMYKColorspace)
- for (x=0; x < (ssize_t) destination->extent.width; x++)
- SetPixelBlack(indexes+x,PixelGetBlackQuantum(
- destination->pixel_wands[id][x]));
+ {
+ PixelGetQuantumPixel(destination->image,destination->pixel_wands[id][x],
+ pixels);
+ pixels+=GetPixelChannels(destination->image);
+ }
sync=SyncCacheViewAuthenticPixels(destination->view,exception);
if (sync == MagickFalse)
{
@@ -1145,68 +1113,52 @@
MagickBooleanType
sync;
- register const IndexPacket
- *restrict indexes;
-
- register const PixelPacket
+ register const Quantum
*restrict pixels;
- register IndexPacket
- *restrict destination_indexes;
-
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict destination_pixels;
if (status == MagickFalse)
continue;
pixels=GetCacheViewVirtualPixels(source->view,source->extent.x,y,
source->extent.width,1,source->exception);
- if (pixels == (const PixelPacket *) NULL)
+ if (pixels == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- indexes=GetCacheViewVirtualIndexQueue(source->view);
for (x=0; x < (ssize_t) source->extent.width; x++)
- PixelSetQuantumColor(source->pixel_wands[id][x],pixels+x);
- if (source_image->colorspace == CMYKColorspace)
- for (x=0; x < (ssize_t) source->extent.width; x++)
- PixelSetBlackQuantum(source->pixel_wands[id][x],
- GetPixelBlack(indexes+x));
- if (source_image->storage_class == PseudoClass)
- for (x=0; x < (ssize_t) source->extent.width; x++)
- PixelSetIndex(source->pixel_wands[id][x],
- GetPixelIndex(indexes+x));
+ {
+ PixelSetQuantumPixel(source->image,pixels,source->pixel_wands[id][x]);
+ pixels+=GetPixelChannels(source->image);
+ }
destination_pixels=GetCacheViewAuthenticPixels(destination->view,
destination->extent.x,y,destination->extent.width,1,exception);
- if (destination_pixels == (PixelPacket *) NULL)
+ if (destination_pixels == (Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- destination_indexes=GetCacheViewAuthenticIndexQueue(destination->view);
for (x=0; x < (ssize_t) destination->extent.width; x++)
- PixelSetQuantumColor(destination->pixel_wands[id][x],pixels+x);
- if (destination_image->colorspace == CMYKColorspace)
- for (x=0; x < (ssize_t) destination->extent.width; x++)
- PixelSetBlackQuantum(destination->pixel_wands[id][x],
- GetPixelBlack(indexes+x));
- if (destination_image->storage_class == PseudoClass)
- for (x=0; x < (ssize_t) destination->extent.width; x++)
- PixelSetIndex(destination->pixel_wands[id][x],
- GetPixelIndex(indexes+x));
+ {
+ PixelSetQuantumPixel(destination->image,destination_pixels,
+ destination->pixel_wands[id][x]);
+ destination_pixels+=GetPixelChannels(destination->image);
+ }
if (transfer(source,destination,y,id,context) == MagickFalse)
status=MagickFalse;
+ destination_pixels=GetCacheViewAuthenticPixels(destination->view,
+ destination->extent.x,y,destination->extent.width,1,exception);
for (x=0; x < (ssize_t) destination->extent.width; x++)
- PixelGetQuantumColor(destination->pixel_wands[id][x],
- destination_pixels+x);
- if (destination_image->colorspace == CMYKColorspace)
- for (x=0; x < (ssize_t) destination->extent.width; x++)
- SetPixelBlack(destination_indexes+x,PixelGetBlackQuantum(
- destination->pixel_wands[id][x]));
+ {
+ PixelGetQuantumPixel(destination->image,destination->pixel_wands[id][x],
+ destination_pixels);
+ destination_pixels+=GetPixelChannels(destination->image);
+ }
sync=SyncCacheViewAuthenticPixels(destination->view,exception);
if (sync == MagickFalse)
{
@@ -1310,41 +1262,35 @@
const int
id = GetOpenMPThreadId();
- register IndexPacket
- *restrict indexes;
-
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict pixels;
if (status == MagickFalse)
continue;
pixels=GetCacheViewAuthenticPixels(source->view,source->extent.x,y,
source->extent.width,1,exception);
- if (pixels == (PixelPacket *) NULL)
+ if (pixels == (Quantum *) NULL)
{
InheritException(source->exception,GetCacheViewException(
source->view));
status=MagickFalse;
continue;
}
- indexes=GetCacheViewAuthenticIndexQueue(source->view);
for (x=0; x < (ssize_t) source->extent.width; x++)
- PixelSetQuantumColor(source->pixel_wands[id][x],pixels+x);
- if (source_image->colorspace == CMYKColorspace)
- for (x=0; x < (ssize_t) source->extent.width; x++)
- PixelSetBlackQuantum(source->pixel_wands[id][x],
- GetPixelBlack(indexes+x));
+ {
+ PixelSetQuantumPixel(source->image,pixels,source->pixel_wands[id][x]);
+ pixels+=GetPixelChannels(source->image);
+ }
if (update(source,y,id,context) == MagickFalse)
status=MagickFalse;
for (x=0; x < (ssize_t) source->extent.width; x++)
- PixelGetQuantumColor(source->pixel_wands[id][x],pixels+x);
- if (source_image->colorspace == CMYKColorspace)
- for (x=0; x < (ssize_t) source->extent.width; x++)
- SetPixelBlack(indexes+x,PixelGetBlackQuantum(
- source->pixel_wands[id][x]));
+ {
+ PixelGetQuantumPixel(source->image,source->pixel_wands[id][x],pixels);
+ pixels+=GetPixelChannels(source->image);
+ }
if (SyncCacheViewAuthenticPixels(source->view,exception) == MagickFalse)
{
InheritException(source->exception,GetCacheViewException(source->view));
diff --git a/wand/wand-view.h b/MagickWand/wand-view.h
similarity index 100%
rename from wand/wand-view.h
rename to MagickWand/wand-view.h
diff --git a/wand/wand.c b/MagickWand/wand.c
similarity index 97%
rename from wand/wand.c
rename to MagickWand/wand.c
index d4bcb41..b5845b4 100644
--- a/wand/wand.c
+++ b/MagickWand/wand.c
@@ -39,10 +39,10 @@
/*
Include declarations.
*/
-#include "wand/studio.h"
-#include "wand/MagickWand.h"
-#include "wand/magick-wand-private.h"
-#include "wand/wand.h"
+#include "MagickWand/studio.h"
+#include "MagickWand/MagickWand.h"
+#include "MagickWand/magick-wand-private.h"
+#include "MagickWand/wand.h"
static SplayTreeInfo
*wand_ids = (SplayTreeInfo *) NULL;
diff --git a/wand/wand.h b/MagickWand/wand.h
similarity index 100%
rename from wand/wand.h
rename to MagickWand/wand.h
diff --git a/wand/wandtest.c b/MagickWand/wandtest.c
similarity index 99%
rename from wand/wandtest.c
rename to MagickWand/wandtest.c
index 044b4db..090c266 100644
--- a/wand/wandtest.c
+++ b/MagickWand/wandtest.c
@@ -47,7 +47,7 @@
Include declarations.
*/
#if !defined(_VISUALC_)
-#include <magick/magick-config.h>
+#include <MagickCore/magick-config.h>
#endif
#include <stdio.h>
#include <stdlib.h>
@@ -58,7 +58,7 @@
#include <sys\types.h>
#endif
#include <time.h>
-#include <wand/MagickWand.h>
+#include <MagickWand/MagickWand.h>
#define WandDelay 3
diff --git a/wand/wandtest.sh b/MagickWand/wandtest.sh
similarity index 91%
rename from wand/wandtest.sh
rename to MagickWand/wandtest.sh
index c7f85b9..63b0a18 100755
--- a/wand/wandtest.sh
+++ b/MagickWand/wandtest.sh
@@ -9,6 +9,6 @@
#
set -e # Exit on any error
-. ${srcdir}/wand/common.sh
+. ${srcdir}/MagickWand/common.sh
${MEMCHECK} ./wandtest wandtest_out.miff
diff --git a/Makefile.am b/Makefile.am
index e4de3c7..ae1340e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,12 +33,12 @@
# compiler, headers, and libraries are used as for a normal build.
DISTCHECK_CONFIGURE_FLAGS=$(DISTCHECK_CONFIG_FLAGS)
-DISTCLEANFILES = _configs.sed magick/magick-config.h
+DISTCLEANFILES = _configs.sed MagickCore/magick-config.h
## Make sure these will be cleaned even when they're not built by default.
CLEANFILES = \
$(LTDL_CLEANFILES) \
- $(WAND_CLEANFILES) \
+ $(MAGICKWAND_CLEANFILES) \
$(MAGICKPP_CLEANFILES) \
$(UTILITIES_CLEANFILES) \
$(TESTS_CLEANFILES)
@@ -48,8 +48,8 @@
# Binary scripts
bin_SCRIPTS = \
- $(MAGICK_BIN_SCRPTS) \
- $(WAND_BIN_SCRPTS) \
+ $(MAGICKCORE_BIN_SCRPTS) \
+ $(MAGICKWAND_BIN_SCRPTS) \
$(MAGICKPP_SCRPTS)
include_HEADERS = \
@@ -58,7 +58,7 @@
# Headers which are not installed but which are distributed
noinst_HEADERS = \
$(LIBLTDL_NOINST_HDRS) \
- $(MAGICK_NOINST_HDRS)
+ $(MAGICKCORE_NOINST_HDRS)
if WIN32_NATIVE_BUILD
SRCDIR='$(shell @WinPathScript@ $(srcdir)/)'
@@ -76,7 +76,7 @@
IDENTIFY="$(MEMCHECK) @abs_top_builddir@/utilities/identify" \
MONTAGE="$(MEMCHECK) @abs_top_builddir@/utilities/montage" \
VALIDATE="$(MEMCHECK) @abs_top_builddir@/tests/validate" \
- LD_LIBRARY_PATH="@abs_top_builddir@/magick/.libs:${LD_LIBRARY_PATH}" \
+ LD_LIBRARY_PATH="@abs_top_builddir@/MagickCore/.libs:${LD_LIBRARY_PATH}" \
MAGICK_CODER_MODULE_PATH='@MAGICK_CODER_MODULE_PATH@' \
MAGICK_CONFIGURE_PATH='@MAGICK_CONFIGURE_BUILD_PATH@@DIRSEP@@MAGICK_CONFIGURE_SRC_PATH@' \
MAGICK_FILTER_MODULE_PATH='@MAGICK_FILTER_MODULE_PATH@' \
@@ -93,7 +93,7 @@
TESTS = \
$(TESTS_TESTS) \
$(MAGICKPP_TESTS) \
- $(WAND_TESTS) \
+ $(MAGICKWAND_TESTS) \
$(UTILITIES_TESTS)
# Tests which are expected to fail
@@ -125,8 +125,8 @@
EXTRA_DIST = \
$(TOP_EXTRA_DIST) \
$(CONFIG_EXTRA_DIST) \
- $(MAGICK_EXTRA_DIST) \
- $(WAND_EXTRA_DIST) \
+ $(MAGICKCORE_EXTRA_DIST) \
+ $(MAGICKWAND_EXTRA_DIST) \
$(MAGICKPP_EXTRA_DIST) \
$(UTILITIES_EXTRA_DIST) \
$(TESTS_EXTRA_DIST)
@@ -141,16 +141,16 @@
check_PROGRAMS = \
$(TESTS_CHECK_PGRMS) \
$(MAGICKPP_CHECK_PGRMS) \
- $(WAND_CHECK_PGRMS)
+ $(MAGICKWAND_CHECK_PGRMS)
include m4/Makefile.am
include config/Makefile.am
include ltdl/Makefile.inc
include coders/Makefile.am
-include magick/Makefile.am
-include filters/Makefile.am
-include wand/Makefile.am
+include MagickCore/Makefile.am
+include MagickWand/Makefile.am
include Magick++/Makefile.am
+include filters/Makefile.am
include utilities/Makefile.am
include tests/Makefile.am
include PerlMagick/Makefile.am
@@ -160,14 +160,14 @@
# Files to install in Pkgconfig directory
pkgconfig_DATA = \
- $(MAGICK_PKGCONFIG) \
- $(WAND_PKGCONFIG) \
+ $(MAGICKCORE_PKGCONFIG) \
+ $(MAGICKWAND_PKGCONFIG) \
$(MAGICKPP_PKGCONFIG)
# Manual pages to install
man_MANS = \
- $(MAGICK_MANS) \
- $(WAND_MANS) \
+ $(MAGICKCORE_MANS) \
+ $(MAGICKWAND_MANS) \
$(MAGICKPP_MANS) \
$(UTILITIES_MANS)
@@ -262,16 +262,16 @@
rm -f -r $(DESTDIR)$(pkgdocdir)/$$dir ; \
done
-# Ensure that version.h at $(srcdir)/magick/version.h is kept up to date.
-magick-version: magick/version.h
+# Ensure that version.h at $(srcdir)/MagickCore/version.h is kept up to date.
+magick-version: MagickCore/version.h
@if test -f "$(srcdir)/VisualMagick/installer/inc/version.isx.in" ; then \
./config.status --file="$(srcdir)/../VisualMagick/installer/inc/version.isx" 2> /dev/null ; \
fi
@if test -n "$(VPATH)" ; then \
- cmp magick/version.h $(srcdir)/magick/version.h > /dev/null ; \
+ cmp MagickCore/version.h $(srcdir)/MagickCore/version.h > /dev/null ; \
if test $$? -eq 1 ; then \
- echo "Updating $(srcdir)/magick/version.h ..."; \
- cp magick/version.h $(srcdir)/magick/version.h ; \
+ echo "Updating $(srcdir)/MagickCore/version.h ..."; \
+ cp MagickCore/version.h $(srcdir)/MagickCore/version.h ; \
fi ; \
fi ; \
touch magick-version
diff --git a/Makefile.in b/Makefile.in
index 0c43649..8da6fda 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -115,7 +115,14 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-# Makefile for building ImageMagick filter modules.
+# Makefile for building MagickWand API.
+#
+
+#
+# Top Makefile for Magick++
+#
+# Copyright Bob Friesenhahn, 1999, 2000, 2002, 2004, 2008
+#
# Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization
# dedicated to making software imaging solutions freely available.
@@ -131,14 +138,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-# Makefile for building MagickWand API.
-#
-
-#
-# Top Makefile for Magick++
-#
-# Copyright Bob Friesenhahn, 1999, 2000, 2002, 2004, 2008
-#
+# Makefile for building ImageMagick filter modules.
# Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization
# dedicated to making software imaging solutions freely available.
@@ -215,24 +215,31 @@
host_triplet = @host@
target_triplet = @target@
bin_PROGRAMS = $(am__EXEEXT_1)
-TESTS = $(TESTS_TESTS) $(am__EXEEXT_6) $(WAND_TESTS)
+TESTS = $(TESTS_TESTS) $(am__EXEEXT_6) $(MAGICKWAND_TESTS)
XFAIL_TESTS = $(am__EXEEXT_7) $(am__EXEEXT_7)
check_PROGRAMS = $(am__EXEEXT_2) $(am__EXEEXT_4) $(am__EXEEXT_5)
-DIST_COMMON = $(am__configure_deps) $(am__include_HEADERS_DIST) \
+DIST_COMMON = $(MagickCoreinc_HEADERS) $(MagickWandinc_HEADERS) \
+ $(am__configure_deps) $(am__include_HEADERS_DIST) \
$(am__ltdlinclude_HEADERS_DIST) \
- $(am__magickppinc_HEADERS_DIST) \
- $(am__magickpptopinc_HEADERS_DIST) $(magickinc_HEADERS) \
+ $(am__magickppinc_HEADERS_DIST) $(magickpptopinc_HEADERS) \
$(noinst_HEADERS) $(srcdir)/ImageMagick.spec.in \
- $(srcdir)/Magick++/Makefile.am $(srcdir)/Makefile.am \
+ $(srcdir)/Magick++/Makefile.am \
+ $(srcdir)/MagickCore/Makefile.am \
+ $(srcdir)/MagickWand/Makefile.am $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/PerlMagick/Makefile.am \
$(srcdir)/coders/Makefile.am $(srcdir)/config/Makefile.am \
$(srcdir)/filters/Makefile.am $(srcdir)/ltdl/Makefile.inc \
$(srcdir)/m4/Makefile.am $(srcdir)/magick.sh.in \
- $(srcdir)/magick/Makefile.am $(srcdir)/tests/Makefile.am \
- $(srcdir)/utilities/Makefile.am $(srcdir)/wand/Makefile.am \
+ $(srcdir)/tests/Makefile.am $(srcdir)/utilities/Makefile.am \
$(top_srcdir)/Magick++/bin/Magick++-config.in \
$(top_srcdir)/Magick++/lib/ImageMagick++.pc.in \
$(top_srcdir)/Magick++/lib/Magick++.pc.in \
+ $(top_srcdir)/MagickCore/ImageMagick.pc.in \
+ $(top_srcdir)/MagickCore/MagickCore-config.in \
+ $(top_srcdir)/MagickCore/MagickCore.pc.in \
+ $(top_srcdir)/MagickCore/version.h.in \
+ $(top_srcdir)/MagickWand/MagickWand-config.in \
+ $(top_srcdir)/MagickWand/MagickWand.pc.in \
$(top_srcdir)/PerlMagick/Magick.pm.in \
$(top_srcdir)/PerlMagick/Makefile.PL.in \
$(top_srcdir)/PerlMagick/check.sh.in \
@@ -246,11 +253,6 @@
$(top_srcdir)/config/type-ghostscript.xml.in \
$(top_srcdir)/config/type-windows.xml.in \
$(top_srcdir)/config/type.xml.in $(top_srcdir)/configure \
- $(top_srcdir)/magick/ImageMagick.pc.in \
- $(top_srcdir)/magick/Magick-config.in \
- $(top_srcdir)/magick/MagickCore-config.in \
- $(top_srcdir)/magick/MagickCore.pc.in \
- $(top_srcdir)/magick/version.h.in \
$(top_srcdir)/utilities/ImageMagick.1.in \
$(top_srcdir)/utilities/animate.1.in \
$(top_srcdir)/utilities/compare.1.in \
@@ -262,14 +264,10 @@
$(top_srcdir)/utilities/import.1.in \
$(top_srcdir)/utilities/mogrify.1.in \
$(top_srcdir)/utilities/montage.1.in \
- $(top_srcdir)/utilities/stream.1.in \
- $(top_srcdir)/wand/MagickWand-config.in \
- $(top_srcdir)/wand/MagickWand.pc.in \
- $(top_srcdir)/wand/Wand-config.in \
- $(top_srcdir)/wand/Wand.pc.in $(wandinc_HEADERS) ChangeLog \
- config/compile config/config.guess config/config.sub \
- config/depcomp config/install-sh config/ltmain.sh \
- config/missing config/mkinstalldirs
+ $(top_srcdir)/utilities/stream.1.in ChangeLog config/compile \
+ config/config.guess config/config.sub config/depcomp \
+ config/install-sh config/ltmain.sh config/missing \
+ config/mkinstalldirs
@INSTALL_LTDL_TRUE@am__append_1 = ltdl/ltdl.h
@INSTALL_LTDL_TRUE@am__append_2 = ltdl/libltdl.la
@CONVENIENCE_LTDL_TRUE@am__append_3 = ltdl/libltdlc.la
@@ -307,16 +305,16 @@
config/MagickWand.dox config/type-dejavu.xml \
config/type-ghostscript.xml config/type-windows.xml \
config/type.xml ImageMagick.spec Magick++/bin/Magick++-config \
- magick/ImageMagick.pc Magick++/lib/ImageMagick++.pc \
- Magick++/lib/Magick++.pc magick/Magick-config \
- magick/MagickCore-config magick/MagickCore.pc magick/version.h \
- magick.sh PerlMagick/Magick.pm PerlMagick/Makefile.PL \
+ MagickCore/ImageMagick.pc Magick++/lib/ImageMagick++.pc \
+ Magick++/lib/Magick++.pc MagickCore/MagickCore-config \
+ MagickCore/MagickCore.pc MagickCore/version.h magick.sh \
+ PerlMagick/Magick.pm PerlMagick/Makefile.PL \
PerlMagick/check.sh utilities/animate.1 utilities/compare.1 \
utilities/composite.1 utilities/conjure.1 utilities/convert.1 \
utilities/display.1 utilities/identify.1 \
utilities/ImageMagick.1 utilities/import.1 utilities/mogrify.1 \
- utilities/montage.1 utilities/stream.1 wand/MagickWand-config \
- wand/MagickWand.pc wand/Wand-config wand/Wand.pc
+ utilities/montage.1 utilities/stream.1 \
+ MagickWand/MagickWand-config MagickWand/MagickWand.pc
CONFIG_CLEAN_VPATH_FILES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
@@ -344,9 +342,10 @@
"$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \
"$(DESTDIR)$(configlibdir)" "$(DESTDIR)$(configsharedir)" \
"$(DESTDIR)$(docdir)" "$(DESTDIR)$(pkgconfigdir)" \
- "$(DESTDIR)$(includedir)" "$(DESTDIR)$(ltdlincludedir)" \
- "$(DESTDIR)$(magickincdir)" "$(DESTDIR)$(magickppincdir)" \
- "$(DESTDIR)$(magickpptopincdir)" "$(DESTDIR)$(wandincdir)"
+ "$(DESTDIR)$(MagickCoreincdir)" \
+ "$(DESTDIR)$(MagickWandincdir)" "$(DESTDIR)$(includedir)" \
+ "$(DESTDIR)$(ltdlincludedir)" "$(DESTDIR)$(magickppincdir)" \
+ "$(DESTDIR)$(magickpptopincdir)"
LTLIBRARIES = $(coders_LTLIBRARIES) $(filters_LTLIBRARIES) \
$(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
Magick___lib_libMagick___la_DEPENDENCIES = $(MAGICKCORE_LIBS) \
@@ -372,6 +371,390 @@
$(Magick___lib_libMagick___la_LDFLAGS) $(LDFLAGS) -o $@
@WITH_MAGICK_PLUS_PLUS_TRUE@am_Magick___lib_libMagick___la_rpath = \
@WITH_MAGICK_PLUS_PLUS_TRUE@ -rpath $(libdir)
+am__DEPENDENCIES_1 =
+am__MagickCore_libMagickCore_la_SOURCES_DIST = \
+ MagickCore/MagickCore.h MagickCore/accelerate.c \
+ MagickCore/accelerate.h MagickCore/animate.c \
+ MagickCore/animate.h MagickCore/animate-private.h \
+ MagickCore/annotate.c MagickCore/annotate.h \
+ MagickCore/artifact.c MagickCore/artifact.h \
+ MagickCore/attribute.c MagickCore/attribute.h \
+ MagickCore/blob.c MagickCore/blob.h MagickCore/blob-private.h \
+ MagickCore/cache.c MagickCore/cache.h \
+ MagickCore/cache-private.h MagickCore/cache-view.c \
+ MagickCore/cache-view.h MagickCore/cipher.c \
+ MagickCore/cipher.h MagickCore/client.c MagickCore/client.h \
+ MagickCore/coder.c MagickCore/coder.h MagickCore/color.c \
+ MagickCore/color.h MagickCore/color-private.h \
+ MagickCore/colormap.c MagickCore/colormap.h \
+ MagickCore/colormap-private.h MagickCore/colorspace.c \
+ MagickCore/colorspace.h MagickCore/colorspace-private.h \
+ MagickCore/compare.c MagickCore/compare.h \
+ MagickCore/composite.c MagickCore/composite.h \
+ MagickCore/composite-private.h MagickCore/compress.c \
+ MagickCore/compress.h MagickCore/configure.c \
+ MagickCore/configure.h MagickCore/constitute.c \
+ MagickCore/constitute.h MagickCore/decorate.c \
+ MagickCore/decorate.h MagickCore/delegate.c \
+ MagickCore/delegate.h MagickCore/delegate-private.h \
+ MagickCore/deprecate.c MagickCore/deprecate.h \
+ MagickCore/display.c MagickCore/display.h \
+ MagickCore/display-private.h MagickCore/distort.c \
+ MagickCore/distort.h MagickCore/draw.c MagickCore/draw.h \
+ MagickCore/draw-private.h MagickCore/effect.c \
+ MagickCore/effect.h MagickCore/enhance.c MagickCore/enhance.h \
+ MagickCore/exception.c MagickCore/exception.h \
+ MagickCore/exception-private.h MagickCore/feature.c \
+ MagickCore/feature.h MagickCore/fourier.c MagickCore/fourier.h \
+ MagickCore/fx.c MagickCore/fx.h MagickCore/fx-private.h \
+ MagickCore/gem.c MagickCore/gem.h MagickCore/geometry.c \
+ MagickCore/geometry.h MagickCore/hashmap.c \
+ MagickCore/hashmap.h MagickCore/histogram.c \
+ MagickCore/histogram.h MagickCore/identify.c \
+ MagickCore/identify.h MagickCore/image.c MagickCore/image.h \
+ MagickCore/image-private.h MagickCore/image-view.c \
+ MagickCore/image-view.h MagickCore/layer.c MagickCore/layer.h \
+ MagickCore/list.c MagickCore/list.h MagickCore/locale.c \
+ MagickCore/locale_.h MagickCore/log.c MagickCore/log.h \
+ MagickCore/mac.h MagickCore/magic.c MagickCore/magic.h \
+ MagickCore/magick.c MagickCore/magick-config.h \
+ MagickCore/magick-type.h MagickCore/magick.h \
+ MagickCore/matrix.c MagickCore/matrix.h MagickCore/memory.c \
+ MagickCore/memory_.h MagickCore/methods.h MagickCore/mime.c \
+ MagickCore/mime.h MagickCore/module.c MagickCore/module.h \
+ MagickCore/monitor.c MagickCore/monitor.h \
+ MagickCore/monitor-private.h MagickCore/montage.c \
+ MagickCore/montage.h MagickCore/morphology.c \
+ MagickCore/morphology.h MagickCore/morphology-private.h \
+ MagickCore/nt-base.h MagickCore/nt-feature.h \
+ MagickCore/option.c MagickCore/option.h MagickCore/paint.c \
+ MagickCore/paint.h MagickCore/pixel.c MagickCore/pixel.h \
+ MagickCore/pixel-accessor.h MagickCore/policy.c \
+ MagickCore/policy.h MagickCore/PreRvIcccm.c \
+ MagickCore/PreRvIcccm.h MagickCore/prepress.c \
+ MagickCore/prepress.h MagickCore/property.c \
+ MagickCore/property.h MagickCore/profile.c \
+ MagickCore/profile.h MagickCore/quantize.c \
+ MagickCore/quantize.h MagickCore/quantum.c \
+ MagickCore/quantum.h MagickCore/quantum-export.c \
+ MagickCore/quantum-import.c MagickCore/quantum-private.h \
+ MagickCore/random.c MagickCore/random_.h \
+ MagickCore/random-private.h MagickCore/registry.c \
+ MagickCore/registry.h MagickCore/resample.c \
+ MagickCore/resample.h MagickCore/resample-private.h \
+ MagickCore/resize.c MagickCore/resize.h \
+ MagickCore/resize-private.h MagickCore/resource.c \
+ MagickCore/resource_.h MagickCore/segment.c \
+ MagickCore/segment.h MagickCore/semaphore.c \
+ MagickCore/semaphore.h MagickCore/semaphore-private.h \
+ MagickCore/shear.c MagickCore/shear.h MagickCore/signature.c \
+ MagickCore/signature.h MagickCore/signature-private.h \
+ MagickCore/splay-tree.c MagickCore/splay-tree.h \
+ MagickCore/static.c MagickCore/static.h MagickCore/statistic.c \
+ MagickCore/statistic.h MagickCore/stream.c MagickCore/stream.h \
+ MagickCore/stream-private.h MagickCore/string.c \
+ MagickCore/string_.h MagickCore/string-private.h \
+ MagickCore/studio.h MagickCore/thread.c MagickCore/thread_.h \
+ MagickCore/thread-private.h MagickCore/timer.c \
+ MagickCore/timer.h MagickCore/token.c MagickCore/token.h \
+ MagickCore/token-private.h MagickCore/transform.c \
+ MagickCore/transform.h MagickCore/threshold.c \
+ MagickCore/threshold.h MagickCore/type.c MagickCore/type.h \
+ MagickCore/utility.c MagickCore/utility.h MagickCore/version.c \
+ MagickCore/version.h MagickCore/vms.h MagickCore/widget.c \
+ MagickCore/widget.h MagickCore/xml-tree.c \
+ MagickCore/xml-tree.h MagickCore/xwindow.c \
+ MagickCore/xwindow.h MagickCore/nt-feature.c \
+ MagickCore/nt-base.c coders/aai.c coders/art.c coders/avs.c \
+ coders/bgr.c coders/bmp.c coders/braille.c coders/cals.c \
+ coders/caption.c coders/cin.c coders/cip.c coders/clip.c \
+ coders/cmyk.c coders/cut.c coders/dcm.c coders/dds.c \
+ coders/debug.c coders/dib.c coders/dng.c coders/dot.c \
+ coders/dpx.c coders/fax.c coders/fits.c coders/gif.c \
+ coders/gradient.c coders/gray.c coders/hald.c coders/hdr.c \
+ coders/histogram.c coders/hrz.c coders/html.c coders/icon.c \
+ coders/info.c coders/inline.c coders/ipl.c coders/label.c \
+ coders/mac.c coders/magick.c coders/map.c coders/mat.c \
+ coders/matte.c coders/meta.c coders/miff.c coders/mono.c \
+ coders/mpc.c coders/mpeg.c coders/mpr.c coders/msl.c \
+ coders/mtv.c coders/mvg.c coders/null.c coders/otb.c \
+ coders/palm.c coders/pattern.c coders/pcd.c coders/pcl.c \
+ coders/pcx.c coders/pdb.c coders/pdf.c coders/pes.c \
+ coders/pict.c coders/pix.c coders/plasma.c coders/pnm.c \
+ coders/preview.c coders/ps.c coders/ps2.c coders/ps3.c \
+ coders/psd.c coders/pwp.c coders/raw.c coders/rgb.c \
+ coders/rla.c coders/rle.c coders/scr.c coders/sct.c \
+ coders/sfw.c coders/sgi.c coders/stegano.c coders/sun.c \
+ coders/svg.c coders/tga.c coders/thumbnail.c coders/tile.c \
+ coders/tim.c coders/ttf.c coders/txt.c coders/uil.c \
+ coders/url.c coders/uyvy.c coders/vicar.c coders/vid.c \
+ coders/viff.c coders/wbmp.c coders/wpg.c coders/xbm.c \
+ coders/xc.c coders/xcf.c coders/xpm.c coders/xps.c \
+ coders/ycbcr.c coders/yuv.c coders/dps.c coders/djvu.c \
+ coders/exr.c coders/fpx.c coders/clipboard.c coders/emf.c \
+ coders/jbig.c coders/jpeg.c coders/jp2.c coders/png.c \
+ coders/ept.c coders/tiff.c coders/webp.c coders/wmf.c \
+ coders/x.c coders/xwd.c
+am__objects_1 = MagickCore/MagickCore_libMagickCore_la-accelerate.lo \
+ MagickCore/MagickCore_libMagickCore_la-animate.lo \
+ MagickCore/MagickCore_libMagickCore_la-annotate.lo \
+ MagickCore/MagickCore_libMagickCore_la-artifact.lo \
+ MagickCore/MagickCore_libMagickCore_la-attribute.lo \
+ MagickCore/MagickCore_libMagickCore_la-blob.lo \
+ MagickCore/MagickCore_libMagickCore_la-cache.lo \
+ MagickCore/MagickCore_libMagickCore_la-cache-view.lo \
+ MagickCore/MagickCore_libMagickCore_la-cipher.lo \
+ MagickCore/MagickCore_libMagickCore_la-client.lo \
+ MagickCore/MagickCore_libMagickCore_la-coder.lo \
+ MagickCore/MagickCore_libMagickCore_la-color.lo \
+ MagickCore/MagickCore_libMagickCore_la-colormap.lo \
+ MagickCore/MagickCore_libMagickCore_la-colorspace.lo \
+ MagickCore/MagickCore_libMagickCore_la-compare.lo \
+ MagickCore/MagickCore_libMagickCore_la-composite.lo \
+ MagickCore/MagickCore_libMagickCore_la-compress.lo \
+ MagickCore/MagickCore_libMagickCore_la-configure.lo \
+ MagickCore/MagickCore_libMagickCore_la-constitute.lo \
+ MagickCore/MagickCore_libMagickCore_la-decorate.lo \
+ MagickCore/MagickCore_libMagickCore_la-delegate.lo \
+ MagickCore/MagickCore_libMagickCore_la-deprecate.lo \
+ MagickCore/MagickCore_libMagickCore_la-display.lo \
+ MagickCore/MagickCore_libMagickCore_la-distort.lo \
+ MagickCore/MagickCore_libMagickCore_la-draw.lo \
+ MagickCore/MagickCore_libMagickCore_la-effect.lo \
+ MagickCore/MagickCore_libMagickCore_la-enhance.lo \
+ MagickCore/MagickCore_libMagickCore_la-exception.lo \
+ MagickCore/MagickCore_libMagickCore_la-feature.lo \
+ MagickCore/MagickCore_libMagickCore_la-fourier.lo \
+ MagickCore/MagickCore_libMagickCore_la-fx.lo \
+ MagickCore/MagickCore_libMagickCore_la-gem.lo \
+ MagickCore/MagickCore_libMagickCore_la-geometry.lo \
+ MagickCore/MagickCore_libMagickCore_la-hashmap.lo \
+ MagickCore/MagickCore_libMagickCore_la-histogram.lo \
+ MagickCore/MagickCore_libMagickCore_la-identify.lo \
+ MagickCore/MagickCore_libMagickCore_la-image.lo \
+ MagickCore/MagickCore_libMagickCore_la-image-view.lo \
+ MagickCore/MagickCore_libMagickCore_la-layer.lo \
+ MagickCore/MagickCore_libMagickCore_la-list.lo \
+ MagickCore/MagickCore_libMagickCore_la-locale.lo \
+ MagickCore/MagickCore_libMagickCore_la-log.lo \
+ MagickCore/MagickCore_libMagickCore_la-magic.lo \
+ MagickCore/MagickCore_libMagickCore_la-magick.lo \
+ MagickCore/MagickCore_libMagickCore_la-matrix.lo \
+ MagickCore/MagickCore_libMagickCore_la-memory.lo \
+ MagickCore/MagickCore_libMagickCore_la-mime.lo \
+ MagickCore/MagickCore_libMagickCore_la-module.lo \
+ MagickCore/MagickCore_libMagickCore_la-monitor.lo \
+ MagickCore/MagickCore_libMagickCore_la-montage.lo \
+ MagickCore/MagickCore_libMagickCore_la-morphology.lo \
+ MagickCore/MagickCore_libMagickCore_la-option.lo \
+ MagickCore/MagickCore_libMagickCore_la-paint.lo \
+ MagickCore/MagickCore_libMagickCore_la-pixel.lo \
+ MagickCore/MagickCore_libMagickCore_la-policy.lo \
+ MagickCore/MagickCore_libMagickCore_la-PreRvIcccm.lo \
+ MagickCore/MagickCore_libMagickCore_la-prepress.lo \
+ MagickCore/MagickCore_libMagickCore_la-property.lo \
+ MagickCore/MagickCore_libMagickCore_la-profile.lo \
+ MagickCore/MagickCore_libMagickCore_la-quantize.lo \
+ MagickCore/MagickCore_libMagickCore_la-quantum.lo \
+ MagickCore/MagickCore_libMagickCore_la-quantum-export.lo \
+ MagickCore/MagickCore_libMagickCore_la-quantum-import.lo \
+ MagickCore/MagickCore_libMagickCore_la-random.lo \
+ MagickCore/MagickCore_libMagickCore_la-registry.lo \
+ MagickCore/MagickCore_libMagickCore_la-resample.lo \
+ MagickCore/MagickCore_libMagickCore_la-resize.lo \
+ MagickCore/MagickCore_libMagickCore_la-resource.lo \
+ MagickCore/MagickCore_libMagickCore_la-segment.lo \
+ MagickCore/MagickCore_libMagickCore_la-semaphore.lo \
+ MagickCore/MagickCore_libMagickCore_la-shear.lo \
+ MagickCore/MagickCore_libMagickCore_la-signature.lo \
+ MagickCore/MagickCore_libMagickCore_la-splay-tree.lo \
+ MagickCore/MagickCore_libMagickCore_la-static.lo \
+ MagickCore/MagickCore_libMagickCore_la-statistic.lo \
+ MagickCore/MagickCore_libMagickCore_la-stream.lo \
+ MagickCore/MagickCore_libMagickCore_la-string.lo \
+ MagickCore/MagickCore_libMagickCore_la-thread.lo \
+ MagickCore/MagickCore_libMagickCore_la-timer.lo \
+ MagickCore/MagickCore_libMagickCore_la-token.lo \
+ MagickCore/MagickCore_libMagickCore_la-transform.lo \
+ MagickCore/MagickCore_libMagickCore_la-threshold.lo \
+ MagickCore/MagickCore_libMagickCore_la-type.lo \
+ MagickCore/MagickCore_libMagickCore_la-utility.lo \
+ MagickCore/MagickCore_libMagickCore_la-version.lo \
+ MagickCore/MagickCore_libMagickCore_la-widget.lo \
+ MagickCore/MagickCore_libMagickCore_la-xml-tree.lo \
+ MagickCore/MagickCore_libMagickCore_la-xwindow.lo
+@CYGWIN_BUILD_TRUE@@WIN32_NATIVE_BUILD_FALSE@am__objects_2 = MagickCore/MagickCore_libMagickCore_la-nt-feature.lo
+@WIN32_NATIVE_BUILD_TRUE@am__objects_2 = MagickCore/MagickCore_libMagickCore_la-nt-base.lo \
+@WIN32_NATIVE_BUILD_TRUE@ MagickCore/MagickCore_libMagickCore_la-nt-feature.lo
+@DPS_DELEGATE_TRUE@am__objects_3 = \
+@DPS_DELEGATE_TRUE@ coders/MagickCore_libMagickCore_la-dps.lo
+@DJVU_DELEGATE_TRUE@am__objects_4 = coders/MagickCore_libMagickCore_la-djvu.lo
+@OPENEXR_DELEGATE_TRUE@am__objects_5 = coders/MagickCore_libMagickCore_la-exr.lo
+@FPX_DELEGATE_TRUE@am__objects_6 = \
+@FPX_DELEGATE_TRUE@ coders/MagickCore_libMagickCore_la-fpx.lo
+@WINGDI32_DELEGATE_TRUE@am__objects_7 = coders/MagickCore_libMagickCore_la-clipboard.lo \
+@WINGDI32_DELEGATE_TRUE@ coders/MagickCore_libMagickCore_la-emf.lo
+@JBIG_DELEGATE_TRUE@am__objects_8 = coders/MagickCore_libMagickCore_la-jbig.lo
+@JPEG_DELEGATE_TRUE@am__objects_9 = coders/MagickCore_libMagickCore_la-jpeg.lo
+@JP2_DELEGATE_TRUE@am__objects_10 = \
+@JP2_DELEGATE_TRUE@ coders/MagickCore_libMagickCore_la-jp2.lo
+@PNG_DELEGATE_TRUE@am__objects_11 = \
+@PNG_DELEGATE_TRUE@ coders/MagickCore_libMagickCore_la-png.lo
+@TIFF_DELEGATE_TRUE@am__objects_12 = \
+@TIFF_DELEGATE_TRUE@ coders/MagickCore_libMagickCore_la-ept.lo \
+@TIFF_DELEGATE_TRUE@ coders/MagickCore_libMagickCore_la-tiff.lo
+@WEBP_DELEGATE_TRUE@am__objects_13 = coders/MagickCore_libMagickCore_la-webp.lo
+@WMF_DELEGATE_TRUE@am__objects_14 = \
+@WMF_DELEGATE_TRUE@ coders/MagickCore_libMagickCore_la-wmf.lo
+@X11_DELEGATE_TRUE@am__objects_15 = \
+@X11_DELEGATE_TRUE@ coders/MagickCore_libMagickCore_la-x.lo \
+@X11_DELEGATE_TRUE@ coders/MagickCore_libMagickCore_la-xwd.lo
+am__objects_16 = coders/MagickCore_libMagickCore_la-aai.lo \
+ coders/MagickCore_libMagickCore_la-art.lo \
+ coders/MagickCore_libMagickCore_la-avs.lo \
+ coders/MagickCore_libMagickCore_la-bgr.lo \
+ coders/MagickCore_libMagickCore_la-bmp.lo \
+ coders/MagickCore_libMagickCore_la-braille.lo \
+ coders/MagickCore_libMagickCore_la-cals.lo \
+ coders/MagickCore_libMagickCore_la-caption.lo \
+ coders/MagickCore_libMagickCore_la-cin.lo \
+ coders/MagickCore_libMagickCore_la-cip.lo \
+ coders/MagickCore_libMagickCore_la-clip.lo \
+ coders/MagickCore_libMagickCore_la-cmyk.lo \
+ coders/MagickCore_libMagickCore_la-cut.lo \
+ coders/MagickCore_libMagickCore_la-dcm.lo \
+ coders/MagickCore_libMagickCore_la-dds.lo \
+ coders/MagickCore_libMagickCore_la-debug.lo \
+ coders/MagickCore_libMagickCore_la-dib.lo \
+ coders/MagickCore_libMagickCore_la-dng.lo \
+ coders/MagickCore_libMagickCore_la-dot.lo \
+ coders/MagickCore_libMagickCore_la-dpx.lo \
+ coders/MagickCore_libMagickCore_la-fax.lo \
+ coders/MagickCore_libMagickCore_la-fits.lo \
+ coders/MagickCore_libMagickCore_la-gif.lo \
+ coders/MagickCore_libMagickCore_la-gradient.lo \
+ coders/MagickCore_libMagickCore_la-gray.lo \
+ coders/MagickCore_libMagickCore_la-hald.lo \
+ coders/MagickCore_libMagickCore_la-hdr.lo \
+ coders/MagickCore_libMagickCore_la-histogram.lo \
+ coders/MagickCore_libMagickCore_la-hrz.lo \
+ coders/MagickCore_libMagickCore_la-html.lo \
+ coders/MagickCore_libMagickCore_la-icon.lo \
+ coders/MagickCore_libMagickCore_la-info.lo \
+ coders/MagickCore_libMagickCore_la-inline.lo \
+ coders/MagickCore_libMagickCore_la-ipl.lo \
+ coders/MagickCore_libMagickCore_la-label.lo \
+ coders/MagickCore_libMagickCore_la-mac.lo \
+ coders/MagickCore_libMagickCore_la-magick.lo \
+ coders/MagickCore_libMagickCore_la-map.lo \
+ coders/MagickCore_libMagickCore_la-mat.lo \
+ coders/MagickCore_libMagickCore_la-matte.lo \
+ coders/MagickCore_libMagickCore_la-meta.lo \
+ coders/MagickCore_libMagickCore_la-miff.lo \
+ coders/MagickCore_libMagickCore_la-mono.lo \
+ coders/MagickCore_libMagickCore_la-mpc.lo \
+ coders/MagickCore_libMagickCore_la-mpeg.lo \
+ coders/MagickCore_libMagickCore_la-mpr.lo \
+ coders/MagickCore_libMagickCore_la-msl.lo \
+ coders/MagickCore_libMagickCore_la-mtv.lo \
+ coders/MagickCore_libMagickCore_la-mvg.lo \
+ coders/MagickCore_libMagickCore_la-null.lo \
+ coders/MagickCore_libMagickCore_la-otb.lo \
+ coders/MagickCore_libMagickCore_la-palm.lo \
+ coders/MagickCore_libMagickCore_la-pattern.lo \
+ coders/MagickCore_libMagickCore_la-pcd.lo \
+ coders/MagickCore_libMagickCore_la-pcl.lo \
+ coders/MagickCore_libMagickCore_la-pcx.lo \
+ coders/MagickCore_libMagickCore_la-pdb.lo \
+ coders/MagickCore_libMagickCore_la-pdf.lo \
+ coders/MagickCore_libMagickCore_la-pes.lo \
+ coders/MagickCore_libMagickCore_la-pict.lo \
+ coders/MagickCore_libMagickCore_la-pix.lo \
+ coders/MagickCore_libMagickCore_la-plasma.lo \
+ coders/MagickCore_libMagickCore_la-pnm.lo \
+ coders/MagickCore_libMagickCore_la-preview.lo \
+ coders/MagickCore_libMagickCore_la-ps.lo \
+ coders/MagickCore_libMagickCore_la-ps2.lo \
+ coders/MagickCore_libMagickCore_la-ps3.lo \
+ coders/MagickCore_libMagickCore_la-psd.lo \
+ coders/MagickCore_libMagickCore_la-pwp.lo \
+ coders/MagickCore_libMagickCore_la-raw.lo \
+ coders/MagickCore_libMagickCore_la-rgb.lo \
+ coders/MagickCore_libMagickCore_la-rla.lo \
+ coders/MagickCore_libMagickCore_la-rle.lo \
+ coders/MagickCore_libMagickCore_la-scr.lo \
+ coders/MagickCore_libMagickCore_la-sct.lo \
+ coders/MagickCore_libMagickCore_la-sfw.lo \
+ coders/MagickCore_libMagickCore_la-sgi.lo \
+ coders/MagickCore_libMagickCore_la-stegano.lo \
+ coders/MagickCore_libMagickCore_la-sun.lo \
+ coders/MagickCore_libMagickCore_la-svg.lo \
+ coders/MagickCore_libMagickCore_la-tga.lo \
+ coders/MagickCore_libMagickCore_la-thumbnail.lo \
+ coders/MagickCore_libMagickCore_la-tile.lo \
+ coders/MagickCore_libMagickCore_la-tim.lo \
+ coders/MagickCore_libMagickCore_la-ttf.lo \
+ coders/MagickCore_libMagickCore_la-txt.lo \
+ coders/MagickCore_libMagickCore_la-uil.lo \
+ coders/MagickCore_libMagickCore_la-url.lo \
+ coders/MagickCore_libMagickCore_la-uyvy.lo \
+ coders/MagickCore_libMagickCore_la-vicar.lo \
+ coders/MagickCore_libMagickCore_la-vid.lo \
+ coders/MagickCore_libMagickCore_la-viff.lo \
+ coders/MagickCore_libMagickCore_la-wbmp.lo \
+ coders/MagickCore_libMagickCore_la-wpg.lo \
+ coders/MagickCore_libMagickCore_la-xbm.lo \
+ coders/MagickCore_libMagickCore_la-xc.lo \
+ coders/MagickCore_libMagickCore_la-xcf.lo \
+ coders/MagickCore_libMagickCore_la-xpm.lo \
+ coders/MagickCore_libMagickCore_la-xps.lo \
+ coders/MagickCore_libMagickCore_la-ycbcr.lo \
+ coders/MagickCore_libMagickCore_la-yuv.lo $(am__objects_3) \
+ $(am__objects_4) $(am__objects_5) $(am__objects_6) \
+ $(am__objects_7) $(am__objects_8) $(am__objects_9) \
+ $(am__objects_10) $(am__objects_11) $(am__objects_12) \
+ $(am__objects_13) $(am__objects_14) $(am__objects_15)
+@WITH_MODULES_FALSE@am_MagickCore_libMagickCore_la_OBJECTS = \
+@WITH_MODULES_FALSE@ $(am__objects_1) $(am__objects_2) \
+@WITH_MODULES_FALSE@ $(am__objects_16)
+@WITH_MODULES_TRUE@am_MagickCore_libMagickCore_la_OBJECTS = \
+@WITH_MODULES_TRUE@ $(am__objects_1) $(am__objects_2)
+MagickCore_libMagickCore_la_OBJECTS = \
+ $(am_MagickCore_libMagickCore_la_OBJECTS)
+MagickCore_libMagickCore_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ $(AM_CFLAGS) $(CFLAGS) $(MagickCore_libMagickCore_la_LDFLAGS) \
+ $(LDFLAGS) -o $@
+MagickWand_libMagickWand_la_DEPENDENCIES = $(MAGICKCORE_LIBS) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
+am__objects_17 = MagickWand/MagickWand_libMagickWand_la-animate.lo \
+ MagickWand/MagickWand_libMagickWand_la-compare.lo \
+ MagickWand/MagickWand_libMagickWand_la-composite.lo \
+ MagickWand/MagickWand_libMagickWand_la-conjure.lo \
+ MagickWand/MagickWand_libMagickWand_la-convert.lo \
+ MagickWand/MagickWand_libMagickWand_la-deprecate.lo \
+ MagickWand/MagickWand_libMagickWand_la-display.lo \
+ MagickWand/MagickWand_libMagickWand_la-drawing-wand.lo \
+ MagickWand/MagickWand_libMagickWand_la-identify.lo \
+ MagickWand/MagickWand_libMagickWand_la-import.lo \
+ MagickWand/MagickWand_libMagickWand_la-magick-image.lo \
+ MagickWand/MagickWand_libMagickWand_la-magick-property.lo \
+ MagickWand/MagickWand_libMagickWand_la-magick-wand.lo \
+ MagickWand/MagickWand_libMagickWand_la-mogrify.lo \
+ MagickWand/MagickWand_libMagickWand_la-montage.lo \
+ MagickWand/MagickWand_libMagickWand_la-pixel-iterator.lo \
+ MagickWand/MagickWand_libMagickWand_la-pixel-wand.lo \
+ MagickWand/MagickWand_libMagickWand_la-stream.lo \
+ MagickWand/MagickWand_libMagickWand_la-wand.lo \
+ MagickWand/MagickWand_libMagickWand_la-wand-view.lo
+am_MagickWand_libMagickWand_la_OBJECTS = $(am__objects_17)
+MagickWand_libMagickWand_la_OBJECTS = \
+ $(am_MagickWand_libMagickWand_la_OBJECTS)
+MagickWand_libMagickWand_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ $(AM_CFLAGS) $(CFLAGS) $(MagickWand_libMagickWand_la_LDFLAGS) \
+ $(LDFLAGS) -o $@
coders_aai_la_DEPENDENCIES = $(MAGICKCORE_LIBS)
am_coders_aai_la_OBJECTS = coders/coders_aai_la-aai.lo
coders_aai_la_OBJECTS = $(am_coders_aai_la_OBJECTS)
@@ -453,7 +836,6 @@
$(AM_CFLAGS) $(CFLAGS) $(coders_clip_la_LDFLAGS) $(LDFLAGS) -o \
$@
@WITH_MODULES_TRUE@am_coders_clip_la_rpath = -rpath $(codersdir)
-am__DEPENDENCIES_1 =
coders_clipboard_la_DEPENDENCIES = $(MAGICKCORE_LIBS) \
$(am__DEPENDENCIES_1)
am_coders_clipboard_la_OBJECTS = \
@@ -1324,12 +1706,12 @@
-o $@
@INSTALL_LTDL_TRUE@am_ltdl_libltdl_la_rpath = -rpath $(libdir)
am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
-am__objects_1 = ltdl/loaders/ltdl_libltdlc_la-preopen.lo \
+am__objects_18 = ltdl/loaders/ltdl_libltdlc_la-preopen.lo \
ltdl/ltdl_libltdlc_la-lt__alloc.lo \
ltdl/ltdl_libltdlc_la-lt_dlloader.lo \
ltdl/ltdl_libltdlc_la-lt_error.lo \
ltdl/ltdl_libltdlc_la-ltdl.lo ltdl/ltdl_libltdlc_la-slist.lo
-am_ltdl_libltdlc_la_OBJECTS = $(am__objects_1)
+am_ltdl_libltdlc_la_OBJECTS = $(am__objects_18)
ltdl_libltdlc_la_OBJECTS = $(am_ltdl_libltdlc_la_OBJECTS)
ltdl_libltdlc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
@@ -1357,372 +1739,6 @@
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(AM_CFLAGS) $(CFLAGS) $(ltdl_shl_load_la_LDFLAGS) $(LDFLAGS) \
-o $@
-am__magick_libMagickCore_la_SOURCES_DIST = magick/ImageMagick.h \
- magick/MagickCore.h magick/accelerate.c magick/accelerate.h \
- magick/animate.c magick/animate.h magick/animate-private.h \
- magick/annotate.c magick/annotate.h magick/api.h \
- magick/artifact.c magick/artifact.h magick/attribute.c \
- magick/attribute.h magick/blob.c magick/blob.h \
- magick/blob-private.h magick/cache.c magick/cache.h \
- magick/cache-private.h magick/cache-view.c magick/cache-view.h \
- magick/cipher.c magick/cipher.h magick/client.c \
- magick/client.h magick/coder.c magick/coder.h magick/color.c \
- magick/color.h magick/color-private.h magick/colormap.c \
- magick/colormap.h magick/colormap-private.h \
- magick/colorspace.c magick/colorspace.h \
- magick/colorspace-private.h magick/compare.c magick/compare.h \
- magick/composite.c magick/composite.h \
- magick/composite-private.h magick/compress.c magick/compress.h \
- magick/configure.c magick/configure.h magick/constitute.c \
- magick/constitute.h magick/decorate.c magick/decorate.h \
- magick/delegate.c magick/delegate.h magick/delegate-private.h \
- magick/deprecate.c magick/deprecate.h magick/display.c \
- magick/display.h magick/display-private.h magick/distort.c \
- magick/distort.h magick/draw.c magick/draw.h \
- magick/draw-private.h magick/effect.c magick/effect.h \
- magick/enhance.c magick/enhance.h magick/exception.c \
- magick/exception.h magick/exception-private.h magick/feature.c \
- magick/feature.h magick/fourier.c magick/fourier.h magick/fx.c \
- magick/fx.h magick/fx-private.h magick/gem.c magick/gem.h \
- magick/geometry.c magick/geometry.h magick/hashmap.c \
- magick/hashmap.h magick/histogram.c magick/histogram.h \
- magick/identify.c magick/identify.h magick/image.c \
- magick/image.h magick/image-private.h magick/image-view.c \
- magick/image-view.h magick/layer.c magick/layer.h \
- magick/list.c magick/list.h magick/locale.c magick/locale_.h \
- magick/log.c magick/log.h magick/mac.h magick/magic.c \
- magick/magic.h magick/magick.c magick/magick-config.h \
- magick/magick-type.h magick/magick.h magick/matrix.c \
- magick/matrix.h magick/memory.c magick/memory_.h \
- magick/methods.h magick/mime.c magick/mime.h magick/module.c \
- magick/module.h magick/monitor.c magick/monitor.h \
- magick/monitor-private.h magick/montage.c magick/montage.h \
- magick/morphology.c magick/morphology.h \
- magick/morphology-private.h magick/nt-base.h \
- magick/nt-feature.h magick/option.c magick/option.h \
- magick/paint.c magick/paint.h magick/pixel.c magick/pixel.h \
- magick/pixel-private.h magick/policy.c magick/policy.h \
- magick/PreRvIcccm.c magick/PreRvIcccm.h magick/prepress.c \
- magick/prepress.h magick/property.c magick/property.h \
- magick/profile.c magick/profile.h magick/quantize.c \
- magick/quantize.h magick/quantum.c magick/quantum.h \
- magick/quantum-export.c magick/quantum-import.c \
- magick/quantum-private.h magick/random.c magick/random_.h \
- magick/random-private.h magick/registry.c magick/registry.h \
- magick/resample.c magick/resample.h magick/resample-private.h \
- magick/resize.c magick/resize.h magick/resize-private.h \
- magick/resource.c magick/resource_.h magick/segment.c \
- magick/segment.h magick/semaphore.c magick/semaphore.h \
- magick/semaphore-private.h magick/shear.c magick/shear.h \
- magick/signature.c magick/signature.h \
- magick/signature-private.h magick/splay-tree.c \
- magick/splay-tree.h magick/static.c magick/static.h \
- magick/statistic.c magick/statistic.h magick/stream.c \
- magick/stream.h magick/stream-private.h magick/string.c \
- magick/string_.h magick/string-private.h magick/studio.h \
- magick/thread.c magick/thread_.h magick/thread-private.h \
- magick/timer.c magick/timer.h magick/token.c magick/token.h \
- magick/token-private.h magick/transform.c magick/transform.h \
- magick/threshold.c magick/threshold.h magick/type.c \
- magick/type.h magick/utility.c magick/utility.h \
- magick/version.c magick/version.h magick/vms.h magick/widget.c \
- magick/widget.h magick/xml-tree.c magick/xml-tree.h \
- magick/xwindow.c magick/xwindow.h magick/nt-feature.c \
- magick/nt-base.c coders/aai.c coders/art.c coders/avs.c \
- coders/bgr.c coders/bmp.c coders/braille.c coders/cals.c \
- coders/caption.c coders/cin.c coders/cip.c coders/clip.c \
- coders/cmyk.c coders/cut.c coders/dcm.c coders/dds.c \
- coders/debug.c coders/dib.c coders/dng.c coders/dot.c \
- coders/dpx.c coders/fax.c coders/fits.c coders/gif.c \
- coders/gradient.c coders/gray.c coders/hald.c coders/hdr.c \
- coders/histogram.c coders/hrz.c coders/html.c coders/icon.c \
- coders/info.c coders/inline.c coders/ipl.c coders/label.c \
- coders/mac.c coders/magick.c coders/map.c coders/mat.c \
- coders/matte.c coders/meta.c coders/miff.c coders/mono.c \
- coders/mpc.c coders/mpeg.c coders/mpr.c coders/msl.c \
- coders/mtv.c coders/mvg.c coders/null.c coders/otb.c \
- coders/palm.c coders/pattern.c coders/pcd.c coders/pcl.c \
- coders/pcx.c coders/pdb.c coders/pdf.c coders/pes.c \
- coders/pict.c coders/pix.c coders/plasma.c coders/pnm.c \
- coders/preview.c coders/ps.c coders/ps2.c coders/ps3.c \
- coders/psd.c coders/pwp.c coders/raw.c coders/rgb.c \
- coders/rla.c coders/rle.c coders/scr.c coders/sct.c \
- coders/sfw.c coders/sgi.c coders/stegano.c coders/sun.c \
- coders/svg.c coders/tga.c coders/thumbnail.c coders/tile.c \
- coders/tim.c coders/ttf.c coders/txt.c coders/uil.c \
- coders/url.c coders/uyvy.c coders/vicar.c coders/vid.c \
- coders/viff.c coders/wbmp.c coders/wpg.c coders/xbm.c \
- coders/xc.c coders/xcf.c coders/xpm.c coders/xps.c \
- coders/ycbcr.c coders/yuv.c coders/dps.c coders/djvu.c \
- coders/exr.c coders/fpx.c coders/clipboard.c coders/emf.c \
- coders/jbig.c coders/jpeg.c coders/jp2.c coders/png.c \
- coders/ept.c coders/tiff.c coders/webp.c coders/wmf.c \
- coders/x.c coders/xwd.c filters/analyze.c
-am__objects_2 = magick/magick_libMagickCore_la-accelerate.lo \
- magick/magick_libMagickCore_la-animate.lo \
- magick/magick_libMagickCore_la-annotate.lo \
- magick/magick_libMagickCore_la-artifact.lo \
- magick/magick_libMagickCore_la-attribute.lo \
- magick/magick_libMagickCore_la-blob.lo \
- magick/magick_libMagickCore_la-cache.lo \
- magick/magick_libMagickCore_la-cache-view.lo \
- magick/magick_libMagickCore_la-cipher.lo \
- magick/magick_libMagickCore_la-client.lo \
- magick/magick_libMagickCore_la-coder.lo \
- magick/magick_libMagickCore_la-color.lo \
- magick/magick_libMagickCore_la-colormap.lo \
- magick/magick_libMagickCore_la-colorspace.lo \
- magick/magick_libMagickCore_la-compare.lo \
- magick/magick_libMagickCore_la-composite.lo \
- magick/magick_libMagickCore_la-compress.lo \
- magick/magick_libMagickCore_la-configure.lo \
- magick/magick_libMagickCore_la-constitute.lo \
- magick/magick_libMagickCore_la-decorate.lo \
- magick/magick_libMagickCore_la-delegate.lo \
- magick/magick_libMagickCore_la-deprecate.lo \
- magick/magick_libMagickCore_la-display.lo \
- magick/magick_libMagickCore_la-distort.lo \
- magick/magick_libMagickCore_la-draw.lo \
- magick/magick_libMagickCore_la-effect.lo \
- magick/magick_libMagickCore_la-enhance.lo \
- magick/magick_libMagickCore_la-exception.lo \
- magick/magick_libMagickCore_la-feature.lo \
- magick/magick_libMagickCore_la-fourier.lo \
- magick/magick_libMagickCore_la-fx.lo \
- magick/magick_libMagickCore_la-gem.lo \
- magick/magick_libMagickCore_la-geometry.lo \
- magick/magick_libMagickCore_la-hashmap.lo \
- magick/magick_libMagickCore_la-histogram.lo \
- magick/magick_libMagickCore_la-identify.lo \
- magick/magick_libMagickCore_la-image.lo \
- magick/magick_libMagickCore_la-image-view.lo \
- magick/magick_libMagickCore_la-layer.lo \
- magick/magick_libMagickCore_la-list.lo \
- magick/magick_libMagickCore_la-locale.lo \
- magick/magick_libMagickCore_la-log.lo \
- magick/magick_libMagickCore_la-magic.lo \
- magick/magick_libMagickCore_la-magick.lo \
- magick/magick_libMagickCore_la-matrix.lo \
- magick/magick_libMagickCore_la-memory.lo \
- magick/magick_libMagickCore_la-mime.lo \
- magick/magick_libMagickCore_la-module.lo \
- magick/magick_libMagickCore_la-monitor.lo \
- magick/magick_libMagickCore_la-montage.lo \
- magick/magick_libMagickCore_la-morphology.lo \
- magick/magick_libMagickCore_la-option.lo \
- magick/magick_libMagickCore_la-paint.lo \
- magick/magick_libMagickCore_la-pixel.lo \
- magick/magick_libMagickCore_la-policy.lo \
- magick/magick_libMagickCore_la-PreRvIcccm.lo \
- magick/magick_libMagickCore_la-prepress.lo \
- magick/magick_libMagickCore_la-property.lo \
- magick/magick_libMagickCore_la-profile.lo \
- magick/magick_libMagickCore_la-quantize.lo \
- magick/magick_libMagickCore_la-quantum.lo \
- magick/magick_libMagickCore_la-quantum-export.lo \
- magick/magick_libMagickCore_la-quantum-import.lo \
- magick/magick_libMagickCore_la-random.lo \
- magick/magick_libMagickCore_la-registry.lo \
- magick/magick_libMagickCore_la-resample.lo \
- magick/magick_libMagickCore_la-resize.lo \
- magick/magick_libMagickCore_la-resource.lo \
- magick/magick_libMagickCore_la-segment.lo \
- magick/magick_libMagickCore_la-semaphore.lo \
- magick/magick_libMagickCore_la-shear.lo \
- magick/magick_libMagickCore_la-signature.lo \
- magick/magick_libMagickCore_la-splay-tree.lo \
- magick/magick_libMagickCore_la-static.lo \
- magick/magick_libMagickCore_la-statistic.lo \
- magick/magick_libMagickCore_la-stream.lo \
- magick/magick_libMagickCore_la-string.lo \
- magick/magick_libMagickCore_la-thread.lo \
- magick/magick_libMagickCore_la-timer.lo \
- magick/magick_libMagickCore_la-token.lo \
- magick/magick_libMagickCore_la-transform.lo \
- magick/magick_libMagickCore_la-threshold.lo \
- magick/magick_libMagickCore_la-type.lo \
- magick/magick_libMagickCore_la-utility.lo \
- magick/magick_libMagickCore_la-version.lo \
- magick/magick_libMagickCore_la-widget.lo \
- magick/magick_libMagickCore_la-xml-tree.lo \
- magick/magick_libMagickCore_la-xwindow.lo
-@CYGWIN_BUILD_TRUE@@WIN32_NATIVE_BUILD_FALSE@am__objects_3 = magick/magick_libMagickCore_la-nt-feature.lo
-@WIN32_NATIVE_BUILD_TRUE@am__objects_3 = magick/magick_libMagickCore_la-nt-base.lo \
-@WIN32_NATIVE_BUILD_TRUE@ magick/magick_libMagickCore_la-nt-feature.lo
-@DPS_DELEGATE_TRUE@am__objects_4 = \
-@DPS_DELEGATE_TRUE@ coders/magick_libMagickCore_la-dps.lo
-@DJVU_DELEGATE_TRUE@am__objects_5 = \
-@DJVU_DELEGATE_TRUE@ coders/magick_libMagickCore_la-djvu.lo
-@OPENEXR_DELEGATE_TRUE@am__objects_6 = \
-@OPENEXR_DELEGATE_TRUE@ coders/magick_libMagickCore_la-exr.lo
-@FPX_DELEGATE_TRUE@am__objects_7 = \
-@FPX_DELEGATE_TRUE@ coders/magick_libMagickCore_la-fpx.lo
-@WINGDI32_DELEGATE_TRUE@am__objects_8 = coders/magick_libMagickCore_la-clipboard.lo \
-@WINGDI32_DELEGATE_TRUE@ coders/magick_libMagickCore_la-emf.lo
-@JBIG_DELEGATE_TRUE@am__objects_9 = \
-@JBIG_DELEGATE_TRUE@ coders/magick_libMagickCore_la-jbig.lo
-@JPEG_DELEGATE_TRUE@am__objects_10 = \
-@JPEG_DELEGATE_TRUE@ coders/magick_libMagickCore_la-jpeg.lo
-@JP2_DELEGATE_TRUE@am__objects_11 = \
-@JP2_DELEGATE_TRUE@ coders/magick_libMagickCore_la-jp2.lo
-@PNG_DELEGATE_TRUE@am__objects_12 = \
-@PNG_DELEGATE_TRUE@ coders/magick_libMagickCore_la-png.lo
-@TIFF_DELEGATE_TRUE@am__objects_13 = \
-@TIFF_DELEGATE_TRUE@ coders/magick_libMagickCore_la-ept.lo \
-@TIFF_DELEGATE_TRUE@ coders/magick_libMagickCore_la-tiff.lo
-@WEBP_DELEGATE_TRUE@am__objects_14 = \
-@WEBP_DELEGATE_TRUE@ coders/magick_libMagickCore_la-webp.lo
-@WMF_DELEGATE_TRUE@am__objects_15 = \
-@WMF_DELEGATE_TRUE@ coders/magick_libMagickCore_la-wmf.lo
-@X11_DELEGATE_TRUE@am__objects_16 = \
-@X11_DELEGATE_TRUE@ coders/magick_libMagickCore_la-x.lo \
-@X11_DELEGATE_TRUE@ coders/magick_libMagickCore_la-xwd.lo
-am__objects_17 = coders/magick_libMagickCore_la-aai.lo \
- coders/magick_libMagickCore_la-art.lo \
- coders/magick_libMagickCore_la-avs.lo \
- coders/magick_libMagickCore_la-bgr.lo \
- coders/magick_libMagickCore_la-bmp.lo \
- coders/magick_libMagickCore_la-braille.lo \
- coders/magick_libMagickCore_la-cals.lo \
- coders/magick_libMagickCore_la-caption.lo \
- coders/magick_libMagickCore_la-cin.lo \
- coders/magick_libMagickCore_la-cip.lo \
- coders/magick_libMagickCore_la-clip.lo \
- coders/magick_libMagickCore_la-cmyk.lo \
- coders/magick_libMagickCore_la-cut.lo \
- coders/magick_libMagickCore_la-dcm.lo \
- coders/magick_libMagickCore_la-dds.lo \
- coders/magick_libMagickCore_la-debug.lo \
- coders/magick_libMagickCore_la-dib.lo \
- coders/magick_libMagickCore_la-dng.lo \
- coders/magick_libMagickCore_la-dot.lo \
- coders/magick_libMagickCore_la-dpx.lo \
- coders/magick_libMagickCore_la-fax.lo \
- coders/magick_libMagickCore_la-fits.lo \
- coders/magick_libMagickCore_la-gif.lo \
- coders/magick_libMagickCore_la-gradient.lo \
- coders/magick_libMagickCore_la-gray.lo \
- coders/magick_libMagickCore_la-hald.lo \
- coders/magick_libMagickCore_la-hdr.lo \
- coders/magick_libMagickCore_la-histogram.lo \
- coders/magick_libMagickCore_la-hrz.lo \
- coders/magick_libMagickCore_la-html.lo \
- coders/magick_libMagickCore_la-icon.lo \
- coders/magick_libMagickCore_la-info.lo \
- coders/magick_libMagickCore_la-inline.lo \
- coders/magick_libMagickCore_la-ipl.lo \
- coders/magick_libMagickCore_la-label.lo \
- coders/magick_libMagickCore_la-mac.lo \
- coders/magick_libMagickCore_la-magick.lo \
- coders/magick_libMagickCore_la-map.lo \
- coders/magick_libMagickCore_la-mat.lo \
- coders/magick_libMagickCore_la-matte.lo \
- coders/magick_libMagickCore_la-meta.lo \
- coders/magick_libMagickCore_la-miff.lo \
- coders/magick_libMagickCore_la-mono.lo \
- coders/magick_libMagickCore_la-mpc.lo \
- coders/magick_libMagickCore_la-mpeg.lo \
- coders/magick_libMagickCore_la-mpr.lo \
- coders/magick_libMagickCore_la-msl.lo \
- coders/magick_libMagickCore_la-mtv.lo \
- coders/magick_libMagickCore_la-mvg.lo \
- coders/magick_libMagickCore_la-null.lo \
- coders/magick_libMagickCore_la-otb.lo \
- coders/magick_libMagickCore_la-palm.lo \
- coders/magick_libMagickCore_la-pattern.lo \
- coders/magick_libMagickCore_la-pcd.lo \
- coders/magick_libMagickCore_la-pcl.lo \
- coders/magick_libMagickCore_la-pcx.lo \
- coders/magick_libMagickCore_la-pdb.lo \
- coders/magick_libMagickCore_la-pdf.lo \
- coders/magick_libMagickCore_la-pes.lo \
- coders/magick_libMagickCore_la-pict.lo \
- coders/magick_libMagickCore_la-pix.lo \
- coders/magick_libMagickCore_la-plasma.lo \
- coders/magick_libMagickCore_la-pnm.lo \
- coders/magick_libMagickCore_la-preview.lo \
- coders/magick_libMagickCore_la-ps.lo \
- coders/magick_libMagickCore_la-ps2.lo \
- coders/magick_libMagickCore_la-ps3.lo \
- coders/magick_libMagickCore_la-psd.lo \
- coders/magick_libMagickCore_la-pwp.lo \
- coders/magick_libMagickCore_la-raw.lo \
- coders/magick_libMagickCore_la-rgb.lo \
- coders/magick_libMagickCore_la-rla.lo \
- coders/magick_libMagickCore_la-rle.lo \
- coders/magick_libMagickCore_la-scr.lo \
- coders/magick_libMagickCore_la-sct.lo \
- coders/magick_libMagickCore_la-sfw.lo \
- coders/magick_libMagickCore_la-sgi.lo \
- coders/magick_libMagickCore_la-stegano.lo \
- coders/magick_libMagickCore_la-sun.lo \
- coders/magick_libMagickCore_la-svg.lo \
- coders/magick_libMagickCore_la-tga.lo \
- coders/magick_libMagickCore_la-thumbnail.lo \
- coders/magick_libMagickCore_la-tile.lo \
- coders/magick_libMagickCore_la-tim.lo \
- coders/magick_libMagickCore_la-ttf.lo \
- coders/magick_libMagickCore_la-txt.lo \
- coders/magick_libMagickCore_la-uil.lo \
- coders/magick_libMagickCore_la-url.lo \
- coders/magick_libMagickCore_la-uyvy.lo \
- coders/magick_libMagickCore_la-vicar.lo \
- coders/magick_libMagickCore_la-vid.lo \
- coders/magick_libMagickCore_la-viff.lo \
- coders/magick_libMagickCore_la-wbmp.lo \
- coders/magick_libMagickCore_la-wpg.lo \
- coders/magick_libMagickCore_la-xbm.lo \
- coders/magick_libMagickCore_la-xc.lo \
- coders/magick_libMagickCore_la-xcf.lo \
- coders/magick_libMagickCore_la-xpm.lo \
- coders/magick_libMagickCore_la-xps.lo \
- coders/magick_libMagickCore_la-ycbcr.lo \
- coders/magick_libMagickCore_la-yuv.lo $(am__objects_4) \
- $(am__objects_5) $(am__objects_6) $(am__objects_7) \
- $(am__objects_8) $(am__objects_9) $(am__objects_10) \
- $(am__objects_11) $(am__objects_12) $(am__objects_13) \
- $(am__objects_14) $(am__objects_15) $(am__objects_16)
-am__objects_18 = filters/magick_libMagickCore_la-analyze.lo
-@WITH_MODULES_FALSE@am_magick_libMagickCore_la_OBJECTS = \
-@WITH_MODULES_FALSE@ $(am__objects_2) $(am__objects_3) \
-@WITH_MODULES_FALSE@ $(am__objects_17) $(am__objects_18)
-@WITH_MODULES_TRUE@am_magick_libMagickCore_la_OBJECTS = \
-@WITH_MODULES_TRUE@ $(am__objects_2) $(am__objects_3)
-magick_libMagickCore_la_OBJECTS = \
- $(am_magick_libMagickCore_la_OBJECTS)
-magick_libMagickCore_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
- $(AM_CFLAGS) $(CFLAGS) $(magick_libMagickCore_la_LDFLAGS) \
- $(LDFLAGS) -o $@
-wand_libMagickWand_la_DEPENDENCIES = $(MAGICKCORE_LIBS) \
- $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1)
-am__objects_19 = wand/wand_libMagickWand_la-animate.lo \
- wand/wand_libMagickWand_la-compare.lo \
- wand/wand_libMagickWand_la-composite.lo \
- wand/wand_libMagickWand_la-conjure.lo \
- wand/wand_libMagickWand_la-convert.lo \
- wand/wand_libMagickWand_la-deprecate.lo \
- wand/wand_libMagickWand_la-display.lo \
- wand/wand_libMagickWand_la-drawing-wand.lo \
- wand/wand_libMagickWand_la-identify.lo \
- wand/wand_libMagickWand_la-import.lo \
- wand/wand_libMagickWand_la-magick-image.lo \
- wand/wand_libMagickWand_la-magick-property.lo \
- wand/wand_libMagickWand_la-magick-wand.lo \
- wand/wand_libMagickWand_la-mogrify.lo \
- wand/wand_libMagickWand_la-montage.lo \
- wand/wand_libMagickWand_la-pixel-iterator.lo \
- wand/wand_libMagickWand_la-pixel-wand.lo \
- wand/wand_libMagickWand_la-stream.lo \
- wand/wand_libMagickWand_la-wand.lo \
- wand/wand_libMagickWand_la-wand-view.lo
-am_wand_libMagickWand_la_OBJECTS = $(am__objects_19)
-wand_libMagickWand_la_OBJECTS = $(am_wand_libMagickWand_la_OBJECTS)
-wand_libMagickWand_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
- $(AM_CFLAGS) $(CFLAGS) $(wand_libMagickWand_la_LDFLAGS) \
- $(LDFLAGS) -o $@
am__EXEEXT_1 = utilities/animate$(EXEEXT) utilities/compare$(EXEEXT) \
utilities/composite$(EXEEXT) utilities/conjure$(EXEEXT) \
utilities/convert$(EXEEXT) utilities/display$(EXEEXT) \
@@ -1748,7 +1764,8 @@
Magick++/tests/readWriteBlob$(EXEEXT) \
Magick++/tests/readWriteImages$(EXEEXT)
@WITH_MAGICK_PLUS_PLUS_TRUE@am__EXEEXT_4 = $(am__EXEEXT_3)
-am__EXEEXT_5 = wand/drawtest$(EXEEXT) wand/wandtest$(EXEEXT)
+am__EXEEXT_5 = MagickWand/drawtest$(EXEEXT) \
+ MagickWand/wandtest$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS)
am_Magick___demo_analyze_OBJECTS = Magick++/demo/analyze.$(OBJEXT)
Magick___demo_analyze_OBJECTS = $(am_Magick___demo_analyze_OBJECTS)
@@ -1837,6 +1854,20 @@
Magick___tests_readWriteImages_OBJECTS = \
$(am_Magick___tests_readWriteImages_OBJECTS)
Magick___tests_readWriteImages_DEPENDENCIES = $(am__DEPENDENCIES_3)
+am_MagickWand_drawtest_OBJECTS = MagickWand/drawtest.$(OBJEXT)
+MagickWand_drawtest_OBJECTS = $(am_MagickWand_drawtest_OBJECTS)
+MagickWand_drawtest_DEPENDENCIES = $(MAGICKWAND_LIBS)
+MagickWand_drawtest_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ $(AM_CFLAGS) $(CFLAGS) $(MagickWand_drawtest_LDFLAGS) \
+ $(LDFLAGS) -o $@
+am_MagickWand_wandtest_OBJECTS = MagickWand/wandtest.$(OBJEXT)
+MagickWand_wandtest_OBJECTS = $(am_MagickWand_wandtest_OBJECTS)
+MagickWand_wandtest_DEPENDENCIES = $(MAGICKWAND_LIBS)
+MagickWand_wandtest_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ $(AM_CFLAGS) $(CFLAGS) $(MagickWand_wandtest_LDFLAGS) \
+ $(LDFLAGS) -o $@
am_tests_validate_OBJECTS = tests/tests_validate-validate.$(OBJEXT)
tests_validate_OBJECTS = $(am_tests_validate_OBJECTS)
tests_validate_DEPENDENCIES = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
@@ -1919,18 +1950,6 @@
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(AM_CFLAGS) $(CFLAGS) $(utilities_stream_LDFLAGS) $(LDFLAGS) \
-o $@
-am_wand_drawtest_OBJECTS = wand/drawtest.$(OBJEXT)
-wand_drawtest_OBJECTS = $(am_wand_drawtest_OBJECTS)
-wand_drawtest_DEPENDENCIES = $(MAGICKWAND_LIBS)
-wand_drawtest_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(wand_drawtest_LDFLAGS) $(LDFLAGS) -o $@
-am_wand_wandtest_OBJECTS = wand/wandtest.$(OBJEXT)
-wand_wandtest_OBJECTS = $(am_wand_wandtest_OBJECTS)
-wand_wandtest_DEPENDENCIES = $(MAGICKWAND_LIBS)
-wand_wandtest_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- $(wand_wandtest_LDFLAGS) $(LDFLAGS) -o $@
SCRIPTS = $(bin_SCRIPTS)
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/config
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
@@ -1975,6 +1994,8 @@
am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
am__v_GEN_0 = @echo " GEN " $@;
SOURCES = $(Magick___lib_libMagick___la_SOURCES) \
+ $(MagickCore_libMagickCore_la_SOURCES) \
+ $(MagickWand_libMagickWand_la_SOURCES) \
$(coders_aai_la_SOURCES) $(coders_art_la_SOURCES) \
$(coders_avs_la_SOURCES) $(coders_bgr_la_SOURCES) \
$(coders_bmp_la_SOURCES) $(coders_braille_la_SOURCES) \
@@ -2038,8 +2059,6 @@
$(ltdl_dyld_la_SOURCES) $(ltdl_libltdl_la_SOURCES) \
$(ltdl_libltdlc_la_SOURCES) $(ltdl_load_add_on_la_SOURCES) \
$(ltdl_loadlibrary_la_SOURCES) $(ltdl_shl_load_la_SOURCES) \
- $(magick_libMagickCore_la_SOURCES) \
- $(wand_libMagickWand_la_SOURCES) \
$(Magick___demo_analyze_SOURCES) \
$(Magick___demo_button_SOURCES) $(Magick___demo_demo_SOURCES) \
$(Magick___demo_detrans_SOURCES) $(Magick___demo_flip_SOURCES) \
@@ -2058,14 +2077,16 @@
$(Magick___tests_morphImages_SOURCES) \
$(Magick___tests_readWriteBlob_SOURCES) \
$(Magick___tests_readWriteImages_SOURCES) \
+ $(MagickWand_drawtest_SOURCES) $(MagickWand_wandtest_SOURCES) \
$(tests_validate_SOURCES) $(utilities_animate_SOURCES) \
$(utilities_compare_SOURCES) $(utilities_composite_SOURCES) \
$(utilities_conjure_SOURCES) $(utilities_convert_SOURCES) \
$(utilities_display_SOURCES) $(utilities_identify_SOURCES) \
$(utilities_import_SOURCES) $(utilities_mogrify_SOURCES) \
- $(utilities_montage_SOURCES) $(utilities_stream_SOURCES) \
- $(wand_drawtest_SOURCES) $(wand_wandtest_SOURCES)
+ $(utilities_montage_SOURCES) $(utilities_stream_SOURCES)
DIST_SOURCES = $(Magick___lib_libMagick___la_SOURCES) \
+ $(am__MagickCore_libMagickCore_la_SOURCES_DIST) \
+ $(MagickWand_libMagickWand_la_SOURCES) \
$(coders_aai_la_SOURCES) $(coders_art_la_SOURCES) \
$(coders_avs_la_SOURCES) $(coders_bgr_la_SOURCES) \
$(coders_bmp_la_SOURCES) $(coders_braille_la_SOURCES) \
@@ -2129,8 +2150,6 @@
$(ltdl_dyld_la_SOURCES) $(ltdl_libltdl_la_SOURCES) \
$(ltdl_libltdlc_la_SOURCES) $(ltdl_load_add_on_la_SOURCES) \
$(ltdl_loadlibrary_la_SOURCES) $(ltdl_shl_load_la_SOURCES) \
- $(am__magick_libMagickCore_la_SOURCES_DIST) \
- $(wand_libMagickWand_la_SOURCES) \
$(Magick___demo_analyze_SOURCES) \
$(Magick___demo_button_SOURCES) $(Magick___demo_demo_SOURCES) \
$(Magick___demo_detrans_SOURCES) $(Magick___demo_flip_SOURCES) \
@@ -2149,13 +2168,13 @@
$(Magick___tests_morphImages_SOURCES) \
$(Magick___tests_readWriteBlob_SOURCES) \
$(Magick___tests_readWriteImages_SOURCES) \
+ $(MagickWand_drawtest_SOURCES) $(MagickWand_wandtest_SOURCES) \
$(tests_validate_SOURCES) $(utilities_animate_SOURCES) \
$(utilities_compare_SOURCES) $(utilities_composite_SOURCES) \
$(utilities_conjure_SOURCES) $(utilities_convert_SOURCES) \
$(utilities_display_SOURCES) $(utilities_identify_SOURCES) \
$(utilities_import_SOURCES) $(utilities_mogrify_SOURCES) \
- $(utilities_montage_SOURCES) $(utilities_stream_SOURCES) \
- $(wand_drawtest_SOURCES) $(wand_wandtest_SOURCES)
+ $(utilities_montage_SOURCES) $(utilities_stream_SOURCES)
man1dir = $(mandir)/man1
NROFF = nroff
MANS = $(man_MANS)
@@ -2164,18 +2183,11 @@
am__include_HEADERS_DIST = ltdl/ltdl.h
am__ltdlinclude_HEADERS_DIST = ltdl/libltdl/lt_system.h \
ltdl/libltdl/lt_error.h ltdl/libltdl/lt_dlloader.h
-am__magickppinc_HEADERS_DIST = Magick++/lib/Magick++/Blob.h \
- Magick++/lib/Magick++/CoderInfo.h \
- Magick++/lib/Magick++/Color.h Magick++/lib/Magick++/Drawable.h \
- Magick++/lib/Magick++/Exception.h \
- Magick++/lib/Magick++/Geometry.h Magick++/lib/Magick++/Image.h \
- Magick++/lib/Magick++/Include.h \
- Magick++/lib/Magick++/Montage.h Magick++/lib/Magick++/Pixels.h \
- Magick++/lib/Magick++/STL.h Magick++/lib/Magick++/TypeMetric.h
-am__magickpptopinc_HEADERS_DIST = Magick++/lib/Magick++.h
-HEADERS = $(include_HEADERS) $(ltdlinclude_HEADERS) \
- $(magickinc_HEADERS) $(magickppinc_HEADERS) \
- $(magickpptopinc_HEADERS) $(noinst_HEADERS) $(wandinc_HEADERS)
+am__magickppinc_HEADERS_DIST = Magick++/lib/Magick++.h
+HEADERS = $(MagickCoreinc_HEADERS) $(MagickWandinc_HEADERS) \
+ $(include_HEADERS) $(ltdlinclude_HEADERS) \
+ $(magickppinc_HEADERS) $(magickpptopinc_HEADERS) \
+ $(noinst_HEADERS)
ETAGS = etags
CTAGS = ctags
# If stdout is a non-dumb tty, use colors. If test -t is not supported,
@@ -2635,16 +2647,16 @@
# We want to preserve user-provided option variables so the same
# compiler, headers, and libraries are used as for a normal build.
DISTCHECK_CONFIGURE_FLAGS = $(DISTCHECK_CONFIG_FLAGS)
-DISTCLEANFILES = _configs.sed magick/magick-config.h
-CLEANFILES = $(LTDL_CLEANFILES) $(WAND_CLEANFILES) \
+DISTCLEANFILES = _configs.sed MagickCore/magick-config.h
+CLEANFILES = $(LTDL_CLEANFILES) $(MAGICKWAND_CLEANFILES) \
$(MAGICKPP_CLEANFILES) $(UTILITIES_CLEANFILES) \
$(TESTS_CLEANFILES) ltdl/libltdl.la ltdl/libltdlc.la \
ltdl/libdlloader.la $(ltdl_LIBOBJS) $(ltdl_LTLIBOBJS)
# Binary scripts
bin_SCRIPTS = \
- $(MAGICK_BIN_SCRPTS) \
- $(WAND_BIN_SCRPTS) \
+ $(MAGICKCORE_BIN_SCRPTS) \
+ $(MAGICKWAND_BIN_SCRPTS) \
$(MAGICKPP_SCRPTS)
include_HEADERS = $(LTDL_INSTALLHEADERS) $(am__append_1)
@@ -2652,7 +2664,7 @@
# Headers which are not installed but which are distributed
noinst_HEADERS = \
$(LIBLTDL_NOINST_HDRS) \
- $(MAGICK_NOINST_HDRS)
+ $(MAGICKCORE_NOINST_HDRS)
@WIN32_NATIVE_BUILD_FALSE@SRCDIR = "$(srcdir)/"
@WIN32_NATIVE_BUILD_TRUE@SRCDIR = '$(shell @WinPathScript@ $(srcdir)/)'
@@ -2667,7 +2679,7 @@
IDENTIFY="$(MEMCHECK) @abs_top_builddir@/utilities/identify" \
MONTAGE="$(MEMCHECK) @abs_top_builddir@/utilities/montage" \
VALIDATE="$(MEMCHECK) @abs_top_builddir@/tests/validate" \
- LD_LIBRARY_PATH="@abs_top_builddir@/magick/.libs:${LD_LIBRARY_PATH}" \
+ LD_LIBRARY_PATH="@abs_top_builddir@/MagickCore/.libs:${LD_LIBRARY_PATH}" \
MAGICK_CODER_MODULE_PATH='@MAGICK_CODER_MODULE_PATH@' \
MAGICK_CONFIGURE_PATH='@MAGICK_CONFIGURE_BUILD_PATH@@DIRSEP@@MAGICK_CONFIGURE_SRC_PATH@' \
MAGICK_FILTER_MODULE_PATH='@MAGICK_FILTER_MODULE_PATH@' \
@@ -2703,10 +2715,10 @@
# Additional files to distribute
EXTRA_DIST = $(TOP_EXTRA_DIST) $(CONFIG_EXTRA_DIST) \
- $(MAGICK_EXTRA_DIST) $(WAND_EXTRA_DIST) $(MAGICKPP_EXTRA_DIST) \
- $(UTILITIES_EXTRA_DIST) $(TESTS_EXTRA_DIST) ltdl/lt__dirent.c \
- ltdl/lt__strl.c ltdl/README ltdl/README ltdl/argz_.h \
- ltdl/argz.c
+ $(MAGICKCORE_EXTRA_DIST) $(MAGICKWAND_EXTRA_DIST) \
+ $(MAGICKPP_EXTRA_DIST) $(UTILITIES_EXTRA_DIST) \
+ $(TESTS_EXTRA_DIST) ltdl/lt__dirent.c ltdl/lt__strl.c \
+ ltdl/README ltdl/README ltdl/argz_.h ltdl/argz.c
lib_LTLIBRARIES = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) \
$(MAGICKPP_LIBS) $(am__append_2)
AM_LDFLAGS = -no-undefined
@@ -2842,33 +2854,33 @@
# Where coder modules get installed
codersdir = $(CODER_PATH)
-@DPS_DELEGATE_TRUE@MAGICK_DPS_MODULES = coders/dps.la
-@DPS_DELEGATE_TRUE@MAGICK_DPS_SRCS = coders/dps.c
-@DJVU_DELEGATE_TRUE@MAGICK_DJVU_MODULES = coders/djvu.la
-@DJVU_DELEGATE_TRUE@MAGICK_DJVU_SRCS = coders/djvu.c
-@OPENEXR_DELEGATE_TRUE@MAGICK_EXR_MODULES = coders/exr.la
-@OPENEXR_DELEGATE_TRUE@MAGICK_EXR_SRCS = coders/exr.c
-@FPX_DELEGATE_TRUE@MAGICK_FPX_MODULES = coders/fpx.la
-@FPX_DELEGATE_TRUE@MAGICK_FPX_SRCS = coders/fpx.c
-@JBIG_DELEGATE_TRUE@MAGICK_JBIG_MODULES = coders/jbig.la
-@JBIG_DELEGATE_TRUE@MAGICK_JBIG_SRCS = coders/jbig.c
-@JPEG_DELEGATE_TRUE@MAGICK_JPEG_MODULES = coders/jpeg.la
-@JPEG_DELEGATE_TRUE@MAGICK_JPEG_SRCS = coders/jpeg.c
-@JP2_DELEGATE_TRUE@MAGICK_JP2_MODULES = coders/jp2.la
-@JP2_DELEGATE_TRUE@MAGICK_JP2_SRCS = coders/jp2.c
-@PNG_DELEGATE_TRUE@MAGICK_PNG_MODULES = coders/png.la
-@PNG_DELEGATE_TRUE@MAGICK_PNG_SRCS = coders/png.c
-@TIFF_DELEGATE_TRUE@MAGICK_TIFF_MODULES = coders/ept.la coders/tiff.la
-@TIFF_DELEGATE_TRUE@MAGICK_TIFF_SRCS = coders/ept.c coders/tiff.c
-@WEBP_DELEGATE_TRUE@MAGICK_WEBP_MODULES = coders/webp.la
-@WEBP_DELEGATE_TRUE@MAGICK_WEBP_SRCS = coders/webp.c
-@WINGDI32_DELEGATE_TRUE@MAGICK_GDI32_MODULES = coders/clipboard.la coders/emf.la
-@WINGDI32_DELEGATE_TRUE@MAGICK_GDI32_SRCS = coders/clipboard.c coders/emf.c
-@WMF_DELEGATE_TRUE@MAGICK_WMF_MODULES = coders/wmf.la
-@WMF_DELEGATE_TRUE@MAGICK_WMF_SRCS = coders/wmf.c
-@X11_DELEGATE_TRUE@MAGICK_X11_MODULES = coders/x.la coders/xwd.la
-@X11_DELEGATE_TRUE@MAGICK_X11_SRCS = coders/x.c coders/xwd.c
-MAGICK_CODER_SRCS = \
+@DPS_DELEGATE_TRUE@MAGICKCORE_DPS_MODULES = coders/dps.la
+@DPS_DELEGATE_TRUE@MAGICKCORE_DPS_SRCS = coders/dps.c
+@DJVU_DELEGATE_TRUE@MAGICKCORE_DJVU_MODULES = coders/djvu.la
+@DJVU_DELEGATE_TRUE@MAGICKCORE_DJVU_SRCS = coders/djvu.c
+@OPENEXR_DELEGATE_TRUE@MAGICKCORE_EXR_MODULES = coders/exr.la
+@OPENEXR_DELEGATE_TRUE@MAGICKCORE_EXR_SRCS = coders/exr.c
+@FPX_DELEGATE_TRUE@MAGICKCORE_FPX_MODULES = coders/fpx.la
+@FPX_DELEGATE_TRUE@MAGICKCORE_FPX_SRCS = coders/fpx.c
+@JBIG_DELEGATE_TRUE@MAGICKCORE_JBIG_MODULES = coders/jbig.la
+@JBIG_DELEGATE_TRUE@MAGICKCORE_JBIG_SRCS = coders/jbig.c
+@JPEG_DELEGATE_TRUE@MAGICKCORE_JPEG_MODULES = coders/jpeg.la
+@JPEG_DELEGATE_TRUE@MAGICKCORE_JPEG_SRCS = coders/jpeg.c
+@JP2_DELEGATE_TRUE@MAGICKCORE_JP2_MODULES = coders/jp2.la
+@JP2_DELEGATE_TRUE@MAGICKCORE_JP2_SRCS = coders/jp2.c
+@PNG_DELEGATE_TRUE@MAGICKCORE_PNG_MODULES = coders/png.la
+@PNG_DELEGATE_TRUE@MAGICKCORE_PNG_SRCS = coders/png.c
+@TIFF_DELEGATE_TRUE@MAGICKCORE_TIFF_MODULES = coders/ept.la coders/tiff.la
+@TIFF_DELEGATE_TRUE@MAGICKCORE_TIFF_SRCS = coders/ept.c coders/tiff.c
+@WEBP_DELEGATE_TRUE@MAGICKCORE_WEBP_MODULES = coders/webp.la
+@WEBP_DELEGATE_TRUE@MAGICKCORE_WEBP_SRCS = coders/webp.c
+@WINGDI32_DELEGATE_TRUE@MAGICKCORE_GDI32_MODULES = coders/clipboard.la coders/emf.la
+@WINGDI32_DELEGATE_TRUE@MAGICKCORE_GDI32_SRCS = coders/clipboard.c coders/emf.c
+@WMF_DELEGATE_TRUE@MAGICKCORE_WMF_MODULES = coders/wmf.la
+@WMF_DELEGATE_TRUE@MAGICKCORE_WMF_SRCS = coders/wmf.c
+@X11_DELEGATE_TRUE@MAGICKCORE_X11_MODULES = coders/x.la coders/xwd.la
+@X11_DELEGATE_TRUE@MAGICKCORE_X11_SRCS = coders/x.c coders/xwd.c
+MAGICKCORE_CODER_SRCS = \
coders/aai.c \
coders/art.c \
coders/avs.c \
@@ -2970,19 +2982,19 @@
coders/xps.c \
coders/ycbcr.c \
coders/yuv.c \
- $(MAGICK_DPS_SRCS) \
- $(MAGICK_DJVU_SRCS) \
- $(MAGICK_EXR_SRCS) \
- $(MAGICK_FPX_SRCS) \
- $(MAGICK_GDI32_SRCS) \
- $(MAGICK_JBIG_SRCS) \
- $(MAGICK_JPEG_SRCS) \
- $(MAGICK_JP2_SRCS) \
- $(MAGICK_PNG_SRCS) \
- $(MAGICK_TIFF_SRCS) \
- $(MAGICK_WEBP_SRCS) \
- $(MAGICK_WMF_SRCS) \
- $(MAGICK_X11_SRCS)
+ $(MAGICKCORE_DPS_SRCS) \
+ $(MAGICKCORE_DJVU_SRCS) \
+ $(MAGICKCORE_EXR_SRCS) \
+ $(MAGICKCORE_FPX_SRCS) \
+ $(MAGICKCORE_GDI32_SRCS) \
+ $(MAGICKCORE_JBIG_SRCS) \
+ $(MAGICKCORE_JPEG_SRCS) \
+ $(MAGICKCORE_JP2_SRCS) \
+ $(MAGICKCORE_PNG_SRCS) \
+ $(MAGICKCORE_TIFF_SRCS) \
+ $(MAGICKCORE_WEBP_SRCS) \
+ $(MAGICKCORE_WMF_SRCS) \
+ $(MAGICKCORE_X11_SRCS)
@WITH_MODULES_FALSE@coders_LTLIBRARIES =
@WITH_MODULES_TRUE@coders_LTLIBRARIES = \
@@ -3087,19 +3099,19 @@
@WITH_MODULES_TRUE@ coders/xps.la \
@WITH_MODULES_TRUE@ coders/ycbcr.la \
@WITH_MODULES_TRUE@ coders/yuv.la \
-@WITH_MODULES_TRUE@ $(MAGICK_DPS_MODULES) \
-@WITH_MODULES_TRUE@ $(MAGICK_DJVU_MODULES) \
-@WITH_MODULES_TRUE@ $(MAGICK_EXR_MODULES) \
-@WITH_MODULES_TRUE@ $(MAGICK_FPX_MODULES) \
-@WITH_MODULES_TRUE@ $(MAGICK_GDI32_MODULES) \
-@WITH_MODULES_TRUE@ $(MAGICK_JBIG_MODULES) \
-@WITH_MODULES_TRUE@ $(MAGICK_JPEG_MODULES) \
-@WITH_MODULES_TRUE@ $(MAGICK_JP2_MODULES) \
-@WITH_MODULES_TRUE@ $(MAGICK_PNG_MODULES) \
-@WITH_MODULES_TRUE@ $(MAGICK_TIFF_MODULES) \
-@WITH_MODULES_TRUE@ $(MAGICK_WEBP_MODULES) \
-@WITH_MODULES_TRUE@ $(MAGICK_WMF_MODULES) \
-@WITH_MODULES_TRUE@ $(MAGICK_X11_MODULES)
+@WITH_MODULES_TRUE@ $(MAGICKCORE_DPS_MODULES) \
+@WITH_MODULES_TRUE@ $(MAGICKCORE_DJVU_MODULES) \
+@WITH_MODULES_TRUE@ $(MAGICKCORE_EXR_MODULES) \
+@WITH_MODULES_TRUE@ $(MAGICKCORE_FPX_MODULES) \
+@WITH_MODULES_TRUE@ $(MAGICKCORE_GDI32_MODULES) \
+@WITH_MODULES_TRUE@ $(MAGICKCORE_JBIG_MODULES) \
+@WITH_MODULES_TRUE@ $(MAGICKCORE_JPEG_MODULES) \
+@WITH_MODULES_TRUE@ $(MAGICKCORE_JP2_MODULES) \
+@WITH_MODULES_TRUE@ $(MAGICKCORE_PNG_MODULES) \
+@WITH_MODULES_TRUE@ $(MAGICKCORE_TIFF_MODULES) \
+@WITH_MODULES_TRUE@ $(MAGICKCORE_WEBP_MODULES) \
+@WITH_MODULES_TRUE@ $(MAGICKCORE_WMF_MODULES) \
+@WITH_MODULES_TRUE@ $(MAGICKCORE_X11_MODULES)
# AAI coder module
@@ -3803,560 +3815,529 @@
coders_yuv_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS)
coders_yuv_la_LDFLAGS = $(MODULECOMMONFLAGS)
coders_yuv_la_LIBADD = $(MAGICKCORE_LIBS)
-magickincdir = $(topincludedir)/magick
+MagickCoreincdir = $(topincludedir)/MagickCore
# Headers which are installed
-magickinc_HEADERS = \
- $(MAGICK_INCLUDE_HDRS)
+MagickCoreinc_HEADERS = \
+ $(MAGICKCORE_INCLUDE_HDRS)
-MAGICK_BIN_SCRPTS = \
- magick/Magick-config \
- magick/MagickCore-config
+MAGICKCORE_BIN_SCRPTS = \
+ MagickCore/MagickCore-config
-MAGICK_PKGCONFIG = \
- magick/ImageMagick.pc \
- magick/MagickCore.pc
+MAGICKCORE_PKGCONFIG = \
+ MagickCore/ImageMagick.pc \
+ MagickCore/MagickCore.pc
-MAGICK_MANS = \
- magick/Magick-config.1 \
- magick/MagickCore-config.1
+MAGICKCORE_MANS = \
+ MagickCore/MagickCore-config.1
-MAGICKCORE_LIBS = magick/libMagickCore.la
-@WITH_MODULES_FALSE@magick_libMagickCore_la_SOURCES = $(MAGICK_BASE_SRCS) $(MAGICK_PLATFORM_SRCS) $(MAGICK_CODER_SRCS) $(MAGICK_FILTER_SRCS)
-@WITH_MODULES_TRUE@magick_libMagickCore_la_SOURCES = $(MAGICK_BASE_SRCS) $(MAGICK_PLATFORM_SRCS)
-@WITH_MODULES_FALSE@magick_libMagickCore_la_LIBADD = $(MAGICK_DEP_LIBS) $(MAGICK_LIBLTDL)
-@WITH_MODULES_TRUE@magick_libMagickCore_la_LIBADD = $(MAGICK_DEP_LIBS) $(MAGICK_LIBLTDL)
-magick_libMagickCore_la_CPPFLAGS = -I$(top_builddir)/ltdl -I$(top_srcdir)/ltdl $(LIBRARY_EXTRA_CPPFLAGS)
-magick_libMagickCore_la_LDFLAGS = -no-undefined -export-symbols-regex ".*" \
+MAGICKCORE_LIBS = MagickCore/libMagickCore.la
+@WITH_MODULES_FALSE@MagickCore_libMagickCore_la_SOURCES = $(MAGICKCORE_BASE_SRCS) $(MAGICKCORE_PLATFORM_SRCS) $(MAGICKCORE_CODER_SRCS) $(MAGICKCORE_FILTER_SRCS)
+@WITH_MODULES_TRUE@MagickCore_libMagickCore_la_SOURCES = $(MAGICKCORE_BASE_SRCS) $(MAGICKCORE_PLATFORM_SRCS)
+@WITH_MODULES_FALSE@MagickCore_libMagickCore_la_LIBADD = $(MAGICK_DEP_LIBS) $(MAGICK_LIBLTDL)
+@WITH_MODULES_TRUE@MagickCore_libMagickCore_la_LIBADD = $(MAGICK_DEP_LIBS) $(MAGICK_LIBLTDL)
+MagickCore_libMagickCore_la_CPPFLAGS = -I$(top_builddir)/ltdl -I$(top_srcdir)/ltdl $(LIBRARY_EXTRA_CPPFLAGS)
+MagickCore_libMagickCore_la_LDFLAGS = -no-undefined -export-symbols-regex ".*" \
$(OSX_GCOV_LDFLAG) -version-info \
$(MAGICK_LIBRARY_CURRENT):$(MAGICK_LIBRARY_REVISION):$(MAGICK_LIBRARY_AGE)
-magick_libMagickCore_la_DEPENDENCIES = $(MAGICK_LTDLDEPS)
+MagickCore_libMagickCore_la_DEPENDENCIES = $(MAGICKCORE_LTDLDEPS)
# Library base sources
-MAGICK_BASE_SRCS = \
- magick/ImageMagick.h \
- magick/MagickCore.h \
- magick/accelerate.c \
- magick/accelerate.h \
- magick/animate.c \
- magick/animate.h \
- magick/animate-private.h \
- magick/annotate.c \
- magick/annotate.h \
- magick/api.h \
- magick/artifact.c \
- magick/artifact.h \
- magick/attribute.c \
- magick/attribute.h \
- magick/blob.c \
- magick/blob.h \
- magick/blob-private.h \
- magick/cache.c \
- magick/cache.h \
- magick/cache-private.h \
- magick/cache-view.c \
- magick/cache-view.h \
- magick/cipher.c \
- magick/cipher.h \
- magick/client.c \
- magick/client.h \
- magick/coder.c \
- magick/coder.h \
- magick/color.c \
- magick/color.h \
- magick/color-private.h \
- magick/colormap.c \
- magick/colormap.h \
- magick/colormap-private.h \
- magick/colorspace.c \
- magick/colorspace.h \
- magick/colorspace-private.h \
- magick/compare.c \
- magick/compare.h \
- magick/composite.c \
- magick/composite.h \
- magick/composite-private.h \
- magick/compress.c \
- magick/compress.h \
- magick/configure.c \
- magick/configure.h \
- magick/constitute.c \
- magick/constitute.h \
- magick/decorate.c \
- magick/decorate.h \
- magick/delegate.c \
- magick/delegate.h \
- magick/delegate-private.h \
- magick/deprecate.c \
- magick/deprecate.h \
- magick/display.c \
- magick/display.h \
- magick/display-private.h \
- magick/distort.c \
- magick/distort.h \
- magick/draw.c \
- magick/draw.h \
- magick/draw-private.h \
- magick/effect.c \
- magick/effect.h \
- magick/enhance.c \
- magick/enhance.h \
- magick/exception.c \
- magick/exception.h \
- magick/exception-private.h \
- magick/feature.c \
- magick/feature.h \
- magick/fourier.c \
- magick/fourier.h \
- magick/fx.c \
- magick/fx.h \
- magick/fx-private.h \
- magick/gem.c \
- magick/gem.h \
- magick/geometry.c \
- magick/geometry.h \
- magick/hashmap.c \
- magick/hashmap.h \
- magick/histogram.c \
- magick/histogram.h \
- magick/identify.c \
- magick/identify.h \
- magick/image.c \
- magick/image.h \
- magick/image-private.h \
- magick/image-view.c \
- magick/image-view.h \
- magick/layer.c \
- magick/layer.h \
- magick/list.c \
- magick/list.h \
- magick/locale.c \
- magick/locale_.h \
- magick/log.c \
- magick/log.h \
- magick/mac.h \
- magick/magic.c \
- magick/magic.h \
- magick/magick.c \
- magick/magick-config.h \
- magick/magick-type.h \
- magick/magick.h \
- magick/matrix.c \
- magick/matrix.h \
- magick/memory.c \
- magick/memory_.h \
- magick/methods.h \
- magick/mime.c \
- magick/mime.h \
- magick/module.c \
- magick/module.h \
- magick/monitor.c \
- magick/monitor.h \
- magick/monitor-private.h \
- magick/montage.c \
- magick/montage.h \
- magick/morphology.c \
- magick/morphology.h \
- magick/morphology-private.h \
- magick/nt-base.h \
- magick/nt-feature.h \
- magick/option.c \
- magick/option.h \
- magick/paint.c \
- magick/paint.h \
- magick/pixel.c \
- magick/pixel.h \
- magick/pixel-private.h \
- magick/policy.c \
- magick/policy.h \
- magick/PreRvIcccm.c \
- magick/PreRvIcccm.h \
- magick/prepress.c \
- magick/prepress.h \
- magick/property.c \
- magick/property.h \
- magick/profile.c \
- magick/profile.h \
- magick/quantize.c \
- magick/quantize.h \
- magick/quantum.c \
- magick/quantum.h \
- magick/quantum-export.c \
- magick/quantum-import.c \
- magick/quantum-private.h \
- magick/random.c \
- magick/random_.h \
- magick/random-private.h \
- magick/registry.c \
- magick/registry.h \
- magick/resample.c \
- magick/resample.h \
- magick/resample-private.h \
- magick/resize.c \
- magick/resize.h \
- magick/resize-private.h \
- magick/resource.c \
- magick/resource_.h \
- magick/segment.c \
- magick/segment.h \
- magick/semaphore.c \
- magick/semaphore.h \
- magick/semaphore-private.h \
- magick/shear.c \
- magick/shear.h \
- magick/signature.c \
- magick/signature.h \
- magick/signature-private.h \
- magick/splay-tree.c \
- magick/splay-tree.h \
- magick/static.c \
- magick/static.h \
- magick/statistic.c \
- magick/statistic.h \
- magick/stream.c \
- magick/stream.h \
- magick/stream-private.h \
- magick/string.c \
- magick/string_.h \
- magick/string-private.h \
- magick/studio.h \
- magick/thread.c \
- magick/thread_.h \
- magick/thread-private.h \
- magick/timer.c \
- magick/timer.h \
- magick/token.c \
- magick/token.h \
- magick/token-private.h \
- magick/transform.c \
- magick/transform.h \
- magick/threshold.c \
- magick/threshold.h \
- magick/type.c \
- magick/type.h \
- magick/utility.c \
- magick/utility.h \
- magick/version.c \
- magick/version.h \
- magick/vms.h \
- magick/widget.c \
- magick/widget.h \
- magick/xml-tree.c \
- magick/xml-tree.h \
- magick/xwindow.c \
- magick/xwindow.h
+MAGICKCORE_BASE_SRCS = \
+ MagickCore/MagickCore.h \
+ MagickCore/accelerate.c \
+ MagickCore/accelerate.h \
+ MagickCore/animate.c \
+ MagickCore/animate.h \
+ MagickCore/animate-private.h \
+ MagickCore/annotate.c \
+ MagickCore/annotate.h \
+ MagickCore/artifact.c \
+ MagickCore/artifact.h \
+ MagickCore/attribute.c \
+ MagickCore/attribute.h \
+ MagickCore/blob.c \
+ MagickCore/blob.h \
+ MagickCore/blob-private.h \
+ MagickCore/cache.c \
+ MagickCore/cache.h \
+ MagickCore/cache-private.h \
+ MagickCore/cache-view.c \
+ MagickCore/cache-view.h \
+ MagickCore/cipher.c \
+ MagickCore/cipher.h \
+ MagickCore/client.c \
+ MagickCore/client.h \
+ MagickCore/coder.c \
+ MagickCore/coder.h \
+ MagickCore/color.c \
+ MagickCore/color.h \
+ MagickCore/color-private.h \
+ MagickCore/colormap.c \
+ MagickCore/colormap.h \
+ MagickCore/colormap-private.h \
+ MagickCore/colorspace.c \
+ MagickCore/colorspace.h \
+ MagickCore/colorspace-private.h \
+ MagickCore/compare.c \
+ MagickCore/compare.h \
+ MagickCore/composite.c \
+ MagickCore/composite.h \
+ MagickCore/composite-private.h \
+ MagickCore/compress.c \
+ MagickCore/compress.h \
+ MagickCore/configure.c \
+ MagickCore/configure.h \
+ MagickCore/constitute.c \
+ MagickCore/constitute.h \
+ MagickCore/decorate.c \
+ MagickCore/decorate.h \
+ MagickCore/delegate.c \
+ MagickCore/delegate.h \
+ MagickCore/delegate-private.h \
+ MagickCore/deprecate.c \
+ MagickCore/deprecate.h \
+ MagickCore/display.c \
+ MagickCore/display.h \
+ MagickCore/display-private.h \
+ MagickCore/distort.c \
+ MagickCore/distort.h \
+ MagickCore/draw.c \
+ MagickCore/draw.h \
+ MagickCore/draw-private.h \
+ MagickCore/effect.c \
+ MagickCore/effect.h \
+ MagickCore/enhance.c \
+ MagickCore/enhance.h \
+ MagickCore/exception.c \
+ MagickCore/exception.h \
+ MagickCore/exception-private.h \
+ MagickCore/feature.c \
+ MagickCore/feature.h \
+ MagickCore/fourier.c \
+ MagickCore/fourier.h \
+ MagickCore/fx.c \
+ MagickCore/fx.h \
+ MagickCore/fx-private.h \
+ MagickCore/gem.c \
+ MagickCore/gem.h \
+ MagickCore/geometry.c \
+ MagickCore/geometry.h \
+ MagickCore/hashmap.c \
+ MagickCore/hashmap.h \
+ MagickCore/histogram.c \
+ MagickCore/histogram.h \
+ MagickCore/identify.c \
+ MagickCore/identify.h \
+ MagickCore/image.c \
+ MagickCore/image.h \
+ MagickCore/image-private.h \
+ MagickCore/image-view.c \
+ MagickCore/image-view.h \
+ MagickCore/layer.c \
+ MagickCore/layer.h \
+ MagickCore/list.c \
+ MagickCore/list.h \
+ MagickCore/locale.c \
+ MagickCore/locale_.h \
+ MagickCore/log.c \
+ MagickCore/log.h \
+ MagickCore/mac.h \
+ MagickCore/magic.c \
+ MagickCore/magic.h \
+ MagickCore/magick.c \
+ MagickCore/magick-config.h \
+ MagickCore/magick-type.h \
+ MagickCore/magick.h \
+ MagickCore/matrix.c \
+ MagickCore/matrix.h \
+ MagickCore/memory.c \
+ MagickCore/memory_.h \
+ MagickCore/methods.h \
+ MagickCore/mime.c \
+ MagickCore/mime.h \
+ MagickCore/module.c \
+ MagickCore/module.h \
+ MagickCore/monitor.c \
+ MagickCore/monitor.h \
+ MagickCore/monitor-private.h \
+ MagickCore/montage.c \
+ MagickCore/montage.h \
+ MagickCore/morphology.c \
+ MagickCore/morphology.h \
+ MagickCore/morphology-private.h \
+ MagickCore/nt-base.h \
+ MagickCore/nt-feature.h \
+ MagickCore/option.c \
+ MagickCore/option.h \
+ MagickCore/paint.c \
+ MagickCore/paint.h \
+ MagickCore/pixel.c \
+ MagickCore/pixel.h \
+ MagickCore/pixel-accessor.h \
+ MagickCore/policy.c \
+ MagickCore/policy.h \
+ MagickCore/PreRvIcccm.c \
+ MagickCore/PreRvIcccm.h \
+ MagickCore/prepress.c \
+ MagickCore/prepress.h \
+ MagickCore/property.c \
+ MagickCore/property.h \
+ MagickCore/profile.c \
+ MagickCore/profile.h \
+ MagickCore/quantize.c \
+ MagickCore/quantize.h \
+ MagickCore/quantum.c \
+ MagickCore/quantum.h \
+ MagickCore/quantum-export.c \
+ MagickCore/quantum-import.c \
+ MagickCore/quantum-private.h \
+ MagickCore/random.c \
+ MagickCore/random_.h \
+ MagickCore/random-private.h \
+ MagickCore/registry.c \
+ MagickCore/registry.h \
+ MagickCore/resample.c \
+ MagickCore/resample.h \
+ MagickCore/resample-private.h \
+ MagickCore/resize.c \
+ MagickCore/resize.h \
+ MagickCore/resize-private.h \
+ MagickCore/resource.c \
+ MagickCore/resource_.h \
+ MagickCore/segment.c \
+ MagickCore/segment.h \
+ MagickCore/semaphore.c \
+ MagickCore/semaphore.h \
+ MagickCore/semaphore-private.h \
+ MagickCore/shear.c \
+ MagickCore/shear.h \
+ MagickCore/signature.c \
+ MagickCore/signature.h \
+ MagickCore/signature-private.h \
+ MagickCore/splay-tree.c \
+ MagickCore/splay-tree.h \
+ MagickCore/static.c \
+ MagickCore/static.h \
+ MagickCore/statistic.c \
+ MagickCore/statistic.h \
+ MagickCore/stream.c \
+ MagickCore/stream.h \
+ MagickCore/stream-private.h \
+ MagickCore/string.c \
+ MagickCore/string_.h \
+ MagickCore/string-private.h \
+ MagickCore/studio.h \
+ MagickCore/thread.c \
+ MagickCore/thread_.h \
+ MagickCore/thread-private.h \
+ MagickCore/timer.c \
+ MagickCore/timer.h \
+ MagickCore/token.c \
+ MagickCore/token.h \
+ MagickCore/token-private.h \
+ MagickCore/transform.c \
+ MagickCore/transform.h \
+ MagickCore/threshold.c \
+ MagickCore/threshold.h \
+ MagickCore/type.c \
+ MagickCore/type.h \
+ MagickCore/utility.c \
+ MagickCore/utility.h \
+ MagickCore/version.c \
+ MagickCore/version.h \
+ MagickCore/vms.h \
+ MagickCore/widget.c \
+ MagickCore/widget.h \
+ MagickCore/xml-tree.c \
+ MagickCore/xml-tree.h \
+ MagickCore/xwindow.c \
+ MagickCore/xwindow.h
-@CYGWIN_BUILD_FALSE@@WIN32_NATIVE_BUILD_FALSE@MAGICK_PLATFORM_SRCS =
-@CYGWIN_BUILD_TRUE@@WIN32_NATIVE_BUILD_FALSE@MAGICK_PLATFORM_SRCS = \
-@CYGWIN_BUILD_TRUE@@WIN32_NATIVE_BUILD_FALSE@ magick/nt-feature.c \
-@CYGWIN_BUILD_TRUE@@WIN32_NATIVE_BUILD_FALSE@ magick/nt-feature.h
+@CYGWIN_BUILD_FALSE@@WIN32_NATIVE_BUILD_FALSE@MAGICKCORE_PLATFORM_SRCS =
+@CYGWIN_BUILD_TRUE@@WIN32_NATIVE_BUILD_FALSE@MAGICKCORE_PLATFORM_SRCS = \
+@CYGWIN_BUILD_TRUE@@WIN32_NATIVE_BUILD_FALSE@ MagickCore/nt-feature.c \
+@CYGWIN_BUILD_TRUE@@WIN32_NATIVE_BUILD_FALSE@ MagickCore/nt-feature.h
-@WIN32_NATIVE_BUILD_TRUE@MAGICK_PLATFORM_SRCS = \
-@WIN32_NATIVE_BUILD_TRUE@ magick/nt-base.c \
-@WIN32_NATIVE_BUILD_TRUE@ magick/nt-base.h \
-@WIN32_NATIVE_BUILD_TRUE@ magick/nt-feature.c \
-@WIN32_NATIVE_BUILD_TRUE@ magick/nt-feature.h
+@WIN32_NATIVE_BUILD_TRUE@MAGICKCORE_PLATFORM_SRCS = \
+@WIN32_NATIVE_BUILD_TRUE@ MagickCore/nt-base.c \
+@WIN32_NATIVE_BUILD_TRUE@ MagickCore/nt-base.h \
+@WIN32_NATIVE_BUILD_TRUE@ MagickCore/nt-feature.c \
+@WIN32_NATIVE_BUILD_TRUE@ MagickCore/nt-feature.h
-MAGICK_INCLUDE_HDRS = \
- magick/ImageMagick.h \
- magick/MagickCore.h \
- magick/PreRvIcccm.h \
- magick/accelerate.h \
- magick/animate.h \
- magick/annotate.h \
- magick/api.h \
- magick/artifact.h \
- magick/attribute.h \
- magick/blob.h \
- magick/cache.h \
- magick/cache-view.h \
- magick/cipher.h \
- magick/client.h \
- magick/coder.h \
- magick/color.h \
- magick/colormap.h \
- magick/colorspace.h \
- magick/compare.h \
- magick/composite.h \
- magick/compress.h \
- magick/configure.h \
- magick/constitute.h \
- magick/decorate.h \
- magick/delegate.h \
- magick/deprecate.h \
- magick/display.h \
- magick/distort.h \
- magick/draw.h \
- magick/effect.h \
- magick/enhance.h \
- magick/exception.h \
- magick/feature.h \
- magick/fourier.h \
- magick/fx.h \
- magick/gem.h \
- magick/geometry.h \
- magick/hashmap.h \
- magick/histogram.h \
- magick/identify.h \
- magick/image.h \
- magick/image-view.h \
- magick/layer.h \
- magick/list.h \
- magick/locale_.h \
- magick/log.h \
- magick/magic.h \
- magick/magick.h \
- magick/magick-config.h \
- magick/magick-type.h \
- magick/matrix.h \
- magick/memory_.h \
- magick/methods.h \
- magick/mime.h \
- magick/module.h \
- magick/monitor.h \
- magick/montage.h \
- magick/morphology.h \
- magick/option.h \
- magick/paint.h \
- magick/pixel.h \
- magick/policy.h \
- magick/prepress.h \
- magick/profile.h \
- magick/property.h \
- magick/quantize.h \
- magick/quantum.h \
- magick/random_.h \
- magick/registry.h \
- magick/resample.h \
- magick/resize.h \
- magick/resource_.h \
- magick/segment.h \
- magick/semaphore.h \
- magick/shear.h \
- magick/signature.h \
- magick/splay-tree.h \
- magick/statistic.h \
- magick/stream.h \
- magick/string_.h \
- magick/timer.h \
- magick/token.h \
- magick/transform.h \
- magick/threshold.h \
- magick/type.h \
- magick/utility.h \
- magick/version.h \
- magick/widget.h \
- magick/xml-tree.h \
- magick/xwindow.h
+MAGICKCORE_INCLUDE_HDRS = \
+ MagickCore/MagickCore.h \
+ MagickCore/PreRvIcccm.h \
+ MagickCore/accelerate.h \
+ MagickCore/animate.h \
+ MagickCore/annotate.h \
+ MagickCore/artifact.h \
+ MagickCore/attribute.h \
+ MagickCore/blob.h \
+ MagickCore/cache.h \
+ MagickCore/cache-view.h \
+ MagickCore/cipher.h \
+ MagickCore/client.h \
+ MagickCore/coder.h \
+ MagickCore/color.h \
+ MagickCore/colormap.h \
+ MagickCore/colorspace.h \
+ MagickCore/compare.h \
+ MagickCore/composite.h \
+ MagickCore/compress.h \
+ MagickCore/configure.h \
+ MagickCore/constitute.h \
+ MagickCore/decorate.h \
+ MagickCore/delegate.h \
+ MagickCore/deprecate.h \
+ MagickCore/display.h \
+ MagickCore/distort.h \
+ MagickCore/draw.h \
+ MagickCore/effect.h \
+ MagickCore/enhance.h \
+ MagickCore/exception.h \
+ MagickCore/feature.h \
+ MagickCore/fourier.h \
+ MagickCore/fx.h \
+ MagickCore/gem.h \
+ MagickCore/geometry.h \
+ MagickCore/hashmap.h \
+ MagickCore/histogram.h \
+ MagickCore/identify.h \
+ MagickCore/image.h \
+ MagickCore/image-view.h \
+ MagickCore/layer.h \
+ MagickCore/list.h \
+ MagickCore/locale_.h \
+ MagickCore/log.h \
+ MagickCore/magic.h \
+ MagickCore/magick.h \
+ MagickCore/magick-config.h \
+ MagickCore/magick-type.h \
+ MagickCore/matrix.h \
+ MagickCore/memory_.h \
+ MagickCore/methods.h \
+ MagickCore/mime.h \
+ MagickCore/module.h \
+ MagickCore/monitor.h \
+ MagickCore/montage.h \
+ MagickCore/morphology.h \
+ MagickCore/option.h \
+ MagickCore/paint.h \
+ MagickCore/pixel.h \
+ MagickCore/pixel-accessor.h \
+ MagickCore/policy.h \
+ MagickCore/prepress.h \
+ MagickCore/profile.h \
+ MagickCore/property.h \
+ MagickCore/quantize.h \
+ MagickCore/quantum.h \
+ MagickCore/random_.h \
+ MagickCore/registry.h \
+ MagickCore/resample.h \
+ MagickCore/resize.h \
+ MagickCore/resource_.h \
+ MagickCore/segment.h \
+ MagickCore/semaphore.h \
+ MagickCore/shear.h \
+ MagickCore/signature.h \
+ MagickCore/splay-tree.h \
+ MagickCore/statistic.h \
+ MagickCore/stream.h \
+ MagickCore/string_.h \
+ MagickCore/timer.h \
+ MagickCore/token.h \
+ MagickCore/transform.h \
+ MagickCore/threshold.h \
+ MagickCore/type.h \
+ MagickCore/utility.h \
+ MagickCore/version.h \
+ MagickCore/widget.h \
+ MagickCore/xml-tree.h \
+ MagickCore/xwindow.h
-MAGICK_NOINST_HDRS = \
- magick/animate-private.h \
- magick/blob-private.h \
- magick/cache-private.h \
- magick/color-private.h \
- magick/colormap-private.h \
- magick/colorspace-private.h \
- magick/composite-private.h \
- magick/delegate-private.h \
- magick/display-private.h \
- magick/draw-private.h \
- magick/exception-private.h \
- magick/fx-private.h \
- magick/image-private.h \
- magick/mac.h \
- magick/mime-private.h \
- magick/monitor-private.h \
- magick/morphology-private.h \
- magick/nt-base.h \
- magick/nt-feature.h \
- magick/pixel-private.h \
- magick/quantum-private.h \
- magick/random-private.h \
- magick/resample-private.h \
- magick/resize-private.h \
- magick/semaphore-private.h \
- magick/signature-private.h \
- magick/static.h \
- magick/stream-private.h \
- magick/string-private.h \
- magick/studio.h \
- magick/thread_.h \
- magick/thread-private.h \
- magick/token-private.h \
- magick/xwindow-private.h \
- magick/vms.h
+MAGICKCORE_NOINST_HDRS = \
+ MagickCore/animate-private.h \
+ MagickCore/blob-private.h \
+ MagickCore/cache-private.h \
+ MagickCore/color-private.h \
+ MagickCore/colormap-private.h \
+ MagickCore/colorspace-private.h \
+ MagickCore/composite-private.h \
+ MagickCore/delegate-private.h \
+ MagickCore/display-private.h \
+ MagickCore/draw-private.h \
+ MagickCore/exception-private.h \
+ MagickCore/fx-private.h \
+ MagickCore/image-private.h \
+ MagickCore/mac.h \
+ MagickCore/mime-private.h \
+ MagickCore/monitor-private.h \
+ MagickCore/morphology-private.h \
+ MagickCore/nt-base.h \
+ MagickCore/nt-feature.h \
+ MagickCore/quantum-private.h \
+ MagickCore/random-private.h \
+ MagickCore/resample-private.h \
+ MagickCore/resize-private.h \
+ MagickCore/semaphore-private.h \
+ MagickCore/signature-private.h \
+ MagickCore/static.h \
+ MagickCore/stream-private.h \
+ MagickCore/string-private.h \
+ MagickCore/studio.h \
+ MagickCore/thread_.h \
+ MagickCore/thread-private.h \
+ MagickCore/token-private.h \
+ MagickCore/xwindow-private.h \
+ MagickCore/vms.h
-MAGICK_EXTRA_DIST = \
- magick/Magick-config.in \
- magick/MagickCore-config.in \
- $(MAGICK_MANS) \
- magick/ImageMagick.pc.in \
- magick/MagickCore.pc.in \
- magick/Make.com \
- magick/config.h_vms \
- magick/mac.c \
- magick/nt-base.c \
- magick/nt-feature.c \
- magick/vms.c \
- magick/xwdfile.h_vms
+MAGICKCORE_EXTRA_DIST = \
+ MagickCore/MagickCore-config.in \
+ $(MAGICKCORE_MANS) \
+ MagickCore/ImageMagick.pc.in \
+ MagickCore/MagickCore.pc.in \
+ MagickCore/Make.com \
+ MagickCore/config.h_vms \
+ MagickCore/mac.c \
+ MagickCore/nt-base.c \
+ MagickCore/nt-feature.c \
+ MagickCore/vms.c \
+ MagickCore/xwdfile.h_vms
# Install magick-config.h
-MAGICK_INSTALL_DATA_LOCAL_TARGETS = magick-install-data-local
+MAGICKCORE_INSTALL_DATA_LOCAL_TARGETS = MagickCore-install-data-local
# Uninstall magick-config.h
-MAGICK_UNINSTALL_LOCAL_TARGETS = magick-uninstall-local
+MAGICKCORE_UNINSTALL_LOCAL_TARGETS = MagickCore-uninstall-local
+MagickWandincdir = $(topincludedir)/MagickWand
+MAGICKWAND_SOURCES = \
+ MagickWand/MagickWand.h \
+ MagickWand/animate.c \
+ MagickWand/animate.h \
+ MagickWand/compare.c \
+ MagickWand/compare.h \
+ MagickWand/composite.c \
+ MagickWand/composite.h \
+ MagickWand/conjure.c \
+ MagickWand/conjure.h \
+ MagickWand/convert.c \
+ MagickWand/convert.h \
+ MagickWand/deprecate.h \
+ MagickWand/deprecate.c \
+ MagickWand/display.c \
+ MagickWand/display.h \
+ MagickWand/drawing-wand.c \
+ MagickWand/drawing-wand.h \
+ MagickWand/identify.c \
+ MagickWand/identify.h \
+ MagickWand/import.c \
+ MagickWand/import.h \
+ MagickWand/magick-image.c \
+ MagickWand/magick-image.h \
+ MagickWand/magick-property.c \
+ MagickWand/magick-property.h \
+ MagickWand/magick-wand.c \
+ MagickWand/magick-wand-private.h \
+ MagickWand/mogrify.c \
+ MagickWand/mogrify.h \
+ MagickWand/mogrify-private.h \
+ MagickWand/montage.c \
+ MagickWand/montage.h \
+ MagickWand/pixel-iterator.c \
+ MagickWand/pixel-iterator.h \
+ MagickWand/pixel-wand.c \
+ MagickWand/pixel-wand.h \
+ MagickWand/pixel-wand-private.h \
+ MagickWand/stream.c \
+ MagickWand/stream.h \
+ MagickWand/studio.h \
+ MagickWand/wand.c \
+ MagickWand/wand.h \
+ MagickWand/wand-view.c \
+ MagickWand/wand-view.h
-# Where filter modules get installed
-filtersdir = $(FILTER_PATH)
-MAGICK_FILTER_SRCS = \
- filters/analyze.c
+MAGICKWAND_INCLUDE_HDRS = \
+ MagickWand/MagickWand.h \
+ MagickWand/animate.h \
+ MagickWand/compare.h \
+ MagickWand/composite.h \
+ MagickWand/conjure.h \
+ MagickWand/convert.h \
+ MagickWand/deprecate.h \
+ MagickWand/display.h \
+ MagickWand/drawing-wand.h \
+ MagickWand/identify.h \
+ MagickWand/import.h \
+ MagickWand/magick-image.h \
+ MagickWand/magick-property.h \
+ MagickWand/mogrify.h \
+ MagickWand/montage.h \
+ MagickWand/pixel-iterator.h \
+ MagickWand/pixel-wand.h \
+ MagickWand/stream.h \
+ MagickWand/wand-view.h
-@WITH_MODULES_FALSE@filters_LTLIBRARIES =
-@WITH_MODULES_TRUE@filters_LTLIBRARIES = \
-@WITH_MODULES_TRUE@ filters/analyze.la
-
-
-# analyze filter module
-filters_analyze_la_SOURCES = filters/analyze.c
-filters_analyze_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS)
-filters_analyze_la_LDFLAGS = $(MODULECOMMONFLAGS)
-filters_analyze_la_LIBADD = $(MAGICKCORE_LIBS) $(MATH_LIBS)
-wandincdir = $(topincludedir)/wand
-WAND_SOURCES = \
- wand/MagickWand.h \
- wand/animate.c \
- wand/animate.h \
- wand/compare.c \
- wand/compare.h \
- wand/composite.c \
- wand/composite.h \
- wand/conjure.c \
- wand/conjure.h \
- wand/convert.c \
- wand/convert.h \
- wand/deprecate.h \
- wand/deprecate.c \
- wand/display.c \
- wand/display.h \
- wand/drawing-wand.c \
- wand/drawing-wand.h \
- wand/identify.c \
- wand/identify.h \
- wand/import.c \
- wand/import.h \
- wand/magick-image.c \
- wand/magick-image.h \
- wand/magick-property.c \
- wand/magick-property.h \
- wand/magick-wand.c \
- wand/magick-wand.h \
- wand/magick-wand-private.h \
- wand/mogrify.c \
- wand/mogrify.h \
- wand/mogrify-private.h \
- wand/montage.c \
- wand/montage.h \
- wand/pixel-iterator.c \
- wand/pixel-iterator.h \
- wand/pixel-wand.c \
- wand/pixel-wand.h \
- wand/pixel-wand-private.h \
- wand/stream.c \
- wand/stream.h \
- wand/studio.h \
- wand/wand.c \
- wand/wand.h \
- wand/wand-view.c \
- wand/wand-view.h
-
-WAND_INCLUDE_HDRS = \
- wand/MagickWand.h \
- wand/animate.h \
- wand/compare.h \
- wand/composite.h \
- wand/conjure.h \
- wand/convert.h \
- wand/deprecate.h \
- wand/display.h \
- wand/drawing-wand.h \
- wand/identify.h \
- wand/import.h \
- wand/magick-image.h \
- wand/magick-property.h \
- wand/magick-wand.h \
- wand/magick_wand.h \
- wand/mogrify.h \
- wand/montage.h \
- wand/pixel-iterator.h \
- wand/pixel-wand.h \
- wand/stream.h \
- wand/wand-view.h
-
-WAND_NOINST_HDRS = \
- wand/mogrify-private.h \
- wand/magick-wand-private.h \
- wand/pixel-wand-private.h \
- wand/studio.h \
- wand/wand.h
+MAGICKWAND_NOINST_HDRS = \
+ MagickWand/mogrify-private.h \
+ MagickWand/magick-wand-private.h \
+ MagickWand/pixel-wand-private.h \
+ MagickWand/studio.h \
+ MagickWand/wand.h
# Headers which are installed
-wandinc_HEADERS = \
- $(WAND_INCLUDE_HDRS)
+MagickWandinc_HEADERS = \
+ $(MAGICKWAND_INCLUDE_HDRS)
-WAND_BIN_SCRPTS = \
- wand/Wand-config \
- wand/MagickWand-config
+MAGICKWAND_BIN_SCRPTS = \
+ MagickWand/MagickWand-config
-WAND_PKGCONFIG = \
- wand/MagickWand.pc \
- wand/Wand.pc
+MAGICKWAND_PKGCONFIG = \
+ MagickWand/MagickWand.pc
-WAND_MANS = \
- wand/MagickWand-config.1 \
- wand/Wand-config.1
+MAGICKWAND_MANS = \
+ MagickWand/MagickWand-config.1
-WAND_BUILT_SRCS =
-MAGICKWAND_LIBS = wand/libMagickWand.la
-wand_libMagickWand_la_SOURCES = $(WAND_SOURCES)
-wand_libMagickWand_la_CPPFLAGS = $(LIBRARY_EXTRA_CPPFLAGS)
-wand_libMagickWand_la_LDFLAGS = -no-undefined -export-symbols-regex ".*" \
+MAGICKWAND_BUILT_SRCS =
+MAGICKWAND_LIBS = MagickWand/libMagickWand.la
+MagickWand_libMagickWand_la_SOURCES = $(MAGICKWAND_SOURCES)
+MagickWand_libMagickWand_la_CPPFLAGS = $(LIBRARY_EXTRA_CPPFLAGS)
+MagickWand_libMagickWand_la_LDFLAGS = -no-undefined -export-symbols-regex ".*" \
-version-info \
$(MAGICK_LIBRARY_CURRENT):$(MAGICK_LIBRARY_REVISION):$(MAGICK_LIBRARY_AGE)
-wand_libMagickWand_la_LIBADD = $(MAGICKCORE_LIBS) $(X11_LIBS) $(GOMP_LIBS) $(MATH_LIBS)
-WAND_EXTRA_DIST = \
- wand/ChangeLog \
- wand/input_256c.miff \
- wand/input_bilevel.miff \
- wand/input_gray.miff \
- wand/input_truecolor.miff \
- wand/MagickWand-config.1 \
- wand/MagickWand.pc.in \
- wand/sequence.miff \
- wand/Wand-config.1 \
- wand/Wand.pc.in \
- wand/common.sh \
- $(WAND_TESTS)
+MagickWand_libMagickWand_la_LIBADD = $(MAGICKCORE_LIBS) $(X11_LIBS) $(GOMP_LIBS) $(MATH_LIBS)
+MAGICKWAND_EXTRA_DIST = \
+ MagickWand/ChangeLog \
+ MagickWand/input_256c.miff \
+ MagickWand/input_bilevel.miff \
+ MagickWand/input_gray.miff \
+ MagickWand/input_truecolor.miff \
+ MagickWand/MagickWand-config.1 \
+ MagickWand/MagickWand.pc.in \
+ MagickWand/sequence.miff \
+ MagickWand/common.sh \
+ $(MAGICKWAND_TESTS)
-wand_drawtest_SOURCES = wand/drawtest.c
-wand_drawtest_LDFLAGS = $(LDFLAGS)
-wand_drawtest_LDADD = $(MAGICKWAND_LIBS)
-wand_wandtest_SOURCES = wand/wandtest.c
-wand_wandtest_LDFLAGS = $(LDFLAGS)
-wand_wandtest_LDADD = $(MAGICKWAND_LIBS)
-WAND_CHECK_PGRMS = \
- wand/drawtest \
- wand/wandtest
+MagickWand_drawtest_SOURCES = MagickWand/drawtest.c
+MagickWand_drawtest_LDFLAGS = $(LDFLAGS)
+MagickWand_drawtest_LDADD = $(MAGICKWAND_LIBS)
+MagickWand_wandtest_SOURCES = MagickWand/wandtest.c
+MagickWand_wandtest_LDFLAGS = $(LDFLAGS)
+MagickWand_wandtest_LDADD = $(MAGICKWAND_LIBS)
+MAGICKWAND_CHECK_PGRMS = \
+ MagickWand/drawtest \
+ MagickWand/wandtest
-WAND_TESTS = \
- wand/drawtest.sh \
- wand/wandtest.sh
+MAGICKWAND_TESTS = \
+ MagickWand/drawtest.sh \
+ MagickWand/wandtest.sh
-WAND_CLEANFILES = \
- wand/*_out.*
+MAGICKWAND_CLEANFILES = \
+ MagickWand/*_out.*
@WITH_MAGICK_PLUS_PLUS_FALSE@MAGICKPP_LIBS =
@WITH_MAGICK_PLUS_PLUS_TRUE@MAGICKPP_LIBS = Magick++/lib/libMagick++.la
@@ -4370,8 +4351,6 @@
@WITH_MAGICK_PLUS_PLUS_TRUE@MAGICKPP_SCRPTS = $(MAGICKPP_SCRIPTS_OPT)
@WITH_MAGICK_PLUS_PLUS_FALSE@MAGICKPP_TESTS =
@WITH_MAGICK_PLUS_PLUS_TRUE@MAGICKPP_TESTS = $(MAGICKPP_TEST_SCRIPTS_OPT)
-@WITH_MAGICK_PLUS_PLUS_FALSE@MAGICKPP_TOP_INCHEADERS =
-@WITH_MAGICK_PLUS_PLUS_TRUE@MAGICKPP_TOP_INCHEADERS = $(MAGICKPP_TOP_INCHEADERS_OPT)
@WITH_MAGICK_PLUS_PLUS_FALSE@MAGICKPP_INCHEADERS =
@WITH_MAGICK_PLUS_PLUS_TRUE@MAGICKPP_INCHEADERS = $(MAGICKPP_INCHEADERS_OPT)
MAGICKPP_SCRIPTS_OPT = \
@@ -4485,25 +4464,11 @@
Magick++/lib/Magick++/TypeMetric.h
magickpptopincdir = $(topincludedir)
-magickpptopinc_HEADERS = $(MAGICKPP_TOP_INCHEADERS)
-MAGICKPP_TOP_INCHEADERS_OPT = \
- Magick++/lib/Magick++.h
-
+magickpptopinc_HEADERS =
magickppincdir = $(topincludedir)/Magick++
magickppinc_HEADERS = $(MAGICKPP_INCHEADERS)
MAGICKPP_INCHEADERS_OPT = \
- Magick++/lib/Magick++/Blob.h \
- Magick++/lib/Magick++/CoderInfo.h \
- Magick++/lib/Magick++/Color.h \
- Magick++/lib/Magick++/Drawable.h \
- Magick++/lib/Magick++/Exception.h \
- Magick++/lib/Magick++/Geometry.h \
- Magick++/lib/Magick++/Image.h \
- Magick++/lib/Magick++/Include.h \
- Magick++/lib/Magick++/Montage.h \
- Magick++/lib/Magick++/Pixels.h \
- Magick++/lib/Magick++/STL.h \
- Magick++/lib/Magick++/TypeMetric.h
+ Magick++/lib/Magick++.h
Magick___lib_libMagick___la_LDFLAGS = -no-undefined \
-version-info $(MAGICK_LIBRARY_CURRENT):$(MAGICK_LIBRARY_REVISION):$(MAGICK_LIBRARY_AGE)
@@ -4575,6 +4540,22 @@
Magick___tests_readWriteImages_SOURCES = Magick++/tests/readWriteImages.cpp
Magick___tests_readWriteImages_LDADD = $(MAGICKPP_LIBS)
MAGICKPP_LOCAL_TARGETS = www/Magick++/NEWS.html www/Magick++/ChangeLog.html
+
+# Where filter modules get installed
+filtersdir = $(FILTER_PATH)
+MAGICK_FILTER_SRCS = \
+ filters/analyze.c
+
+@WITH_MODULES_FALSE@filters_LTLIBRARIES =
+@WITH_MODULES_TRUE@filters_LTLIBRARIES = \
+@WITH_MODULES_TRUE@ filters/analyze.la
+
+
+# analyze filter module
+filters_analyze_la_SOURCES = filters/analyze.c
+filters_analyze_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS)
+filters_analyze_la_LDFLAGS = $(MODULECOMMONFLAGS)
+filters_analyze_la_LIBADD = $(MAGICKCORE_LIBS) $(MATH_LIBS)
UTILITIES_PGMS = \
utilities/animate \
utilities/compare \
@@ -4702,15 +4683,15 @@
# Files to install in Pkgconfig directory
pkgconfig_DATA = \
- $(MAGICK_PKGCONFIG) \
- $(WAND_PKGCONFIG) \
+ $(MAGICKCORE_PKGCONFIG) \
+ $(MAGICKWAND_PKGCONFIG) \
$(MAGICKPP_PKGCONFIG)
# Manual pages to install
man_MANS = \
- $(MAGICK_MANS) \
- $(WAND_MANS) \
+ $(MAGICKCORE_MANS) \
+ $(MAGICKWAND_MANS) \
$(MAGICKPP_MANS) \
$(UTILITIES_MANS)
@@ -4769,7 +4750,7 @@
.SUFFIXES: .c .cpp .html .lo .log .o .obj .sh .sh$(EXEEXT)
am--refresh:
@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/m4/Makefile.am $(srcdir)/config/Makefile.am $(srcdir)/ltdl/Makefile.inc $(srcdir)/coders/Makefile.am $(srcdir)/magick/Makefile.am $(srcdir)/filters/Makefile.am $(srcdir)/wand/Makefile.am $(srcdir)/Magick++/Makefile.am $(srcdir)/utilities/Makefile.am $(srcdir)/tests/Makefile.am $(srcdir)/PerlMagick/Makefile.am $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/m4/Makefile.am $(srcdir)/config/Makefile.am $(srcdir)/ltdl/Makefile.inc $(srcdir)/coders/Makefile.am $(srcdir)/MagickCore/Makefile.am $(srcdir)/MagickWand/Makefile.am $(srcdir)/Magick++/Makefile.am $(srcdir)/filters/Makefile.am $(srcdir)/utilities/Makefile.am $(srcdir)/tests/Makefile.am $(srcdir)/PerlMagick/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
*$$dep*) \
@@ -4840,19 +4821,17 @@
cd $(top_builddir) && $(SHELL) ./config.status $@
Magick++/bin/Magick++-config: $(top_builddir)/config.status $(top_srcdir)/Magick++/bin/Magick++-config.in
cd $(top_builddir) && $(SHELL) ./config.status $@
-magick/ImageMagick.pc: $(top_builddir)/config.status $(top_srcdir)/magick/ImageMagick.pc.in
+MagickCore/ImageMagick.pc: $(top_builddir)/config.status $(top_srcdir)/MagickCore/ImageMagick.pc.in
cd $(top_builddir) && $(SHELL) ./config.status $@
Magick++/lib/ImageMagick++.pc: $(top_builddir)/config.status $(top_srcdir)/Magick++/lib/ImageMagick++.pc.in
cd $(top_builddir) && $(SHELL) ./config.status $@
Magick++/lib/Magick++.pc: $(top_builddir)/config.status $(top_srcdir)/Magick++/lib/Magick++.pc.in
cd $(top_builddir) && $(SHELL) ./config.status $@
-magick/Magick-config: $(top_builddir)/config.status $(top_srcdir)/magick/Magick-config.in
+MagickCore/MagickCore-config: $(top_builddir)/config.status $(top_srcdir)/MagickCore/MagickCore-config.in
cd $(top_builddir) && $(SHELL) ./config.status $@
-magick/MagickCore-config: $(top_builddir)/config.status $(top_srcdir)/magick/MagickCore-config.in
+MagickCore/MagickCore.pc: $(top_builddir)/config.status $(top_srcdir)/MagickCore/MagickCore.pc.in
cd $(top_builddir) && $(SHELL) ./config.status $@
-magick/MagickCore.pc: $(top_builddir)/config.status $(top_srcdir)/magick/MagickCore.pc.in
- cd $(top_builddir) && $(SHELL) ./config.status $@
-magick/version.h: $(top_builddir)/config.status $(top_srcdir)/magick/version.h.in
+MagickCore/version.h: $(top_builddir)/config.status $(top_srcdir)/MagickCore/version.h.in
cd $(top_builddir) && $(SHELL) ./config.status $@
magick.sh: $(top_builddir)/config.status $(srcdir)/magick.sh.in
cd $(top_builddir) && $(SHELL) ./config.status $@
@@ -4886,13 +4865,9 @@
cd $(top_builddir) && $(SHELL) ./config.status $@
utilities/stream.1: $(top_builddir)/config.status $(top_srcdir)/utilities/stream.1.in
cd $(top_builddir) && $(SHELL) ./config.status $@
-wand/MagickWand-config: $(top_builddir)/config.status $(top_srcdir)/wand/MagickWand-config.in
+MagickWand/MagickWand-config: $(top_builddir)/config.status $(top_srcdir)/MagickWand/MagickWand-config.in
cd $(top_builddir) && $(SHELL) ./config.status $@
-wand/MagickWand.pc: $(top_builddir)/config.status $(top_srcdir)/wand/MagickWand.pc.in
- cd $(top_builddir) && $(SHELL) ./config.status $@
-wand/Wand-config: $(top_builddir)/config.status $(top_srcdir)/wand/Wand-config.in
- cd $(top_builddir) && $(SHELL) ./config.status $@
-wand/Wand.pc: $(top_builddir)/config.status $(top_srcdir)/wand/Wand.pc.in
+MagickWand/MagickWand.pc: $(top_builddir)/config.status $(top_srcdir)/MagickWand/MagickWand.pc.in
cd $(top_builddir) && $(SHELL) ./config.status $@
install-codersLTLIBRARIES: $(coders_LTLIBRARIES)
@$(NORMAL_INSTALL)
@@ -5036,12 +5011,592 @@
Magick++/lib/$(DEPDIR)/$(am__dirstamp)
Magick++/lib/libMagick++.la: $(Magick___lib_libMagick___la_OBJECTS) $(Magick___lib_libMagick___la_DEPENDENCIES) Magick++/lib/$(am__dirstamp)
$(AM_V_CXXLD)$(Magick___lib_libMagick___la_LINK) $(am_Magick___lib_libMagick___la_rpath) $(Magick___lib_libMagick___la_OBJECTS) $(Magick___lib_libMagick___la_LIBADD) $(LIBS)
+MagickCore/$(am__dirstamp):
+ @$(MKDIR_P) MagickCore
+ @: > MagickCore/$(am__dirstamp)
+MagickCore/$(DEPDIR)/$(am__dirstamp):
+ @$(MKDIR_P) MagickCore/$(DEPDIR)
+ @: > MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-accelerate.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-animate.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-annotate.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-artifact.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-attribute.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-blob.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-cache.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-cache-view.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-cipher.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-client.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-coder.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-color.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-colormap.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-colorspace.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-compare.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-composite.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-compress.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-configure.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-constitute.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-decorate.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-delegate.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-deprecate.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-display.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-distort.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-draw.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-effect.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-enhance.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-exception.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-feature.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-fourier.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-fx.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-gem.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-geometry.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-hashmap.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-histogram.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-identify.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-image.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-image-view.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-layer.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-list.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-locale.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-log.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-magic.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-magick.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-matrix.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-memory.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-mime.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-module.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-monitor.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-montage.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-morphology.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-option.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-paint.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-pixel.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-policy.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-PreRvIcccm.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-prepress.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-property.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-profile.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-quantize.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-quantum.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-quantum-export.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-quantum-import.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-random.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-registry.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-resample.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-resize.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-resource.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-segment.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-semaphore.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-shear.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-signature.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-splay-tree.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-static.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-statistic.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-stream.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-string.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-thread.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-timer.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-token.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-transform.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-threshold.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-type.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-utility.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-version.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-widget.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-xml-tree.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-xwindow.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-nt-feature.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
+MagickCore/MagickCore_libMagickCore_la-nt-base.lo: \
+ MagickCore/$(am__dirstamp) \
+ MagickCore/$(DEPDIR)/$(am__dirstamp)
coders/$(am__dirstamp):
@$(MKDIR_P) coders
@: > coders/$(am__dirstamp)
coders/$(DEPDIR)/$(am__dirstamp):
@$(MKDIR_P) coders/$(DEPDIR)
@: > coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-aai.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-art.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-avs.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-bgr.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-bmp.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-braille.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-cals.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-caption.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-cin.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-cip.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-clip.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-cmyk.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-cut.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-dcm.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-dds.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-debug.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-dib.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-dng.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-dot.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-dpx.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-fax.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-fits.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-gif.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-gradient.lo: \
+ coders/$(am__dirstamp) coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-gray.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-hald.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-hdr.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-histogram.lo: \
+ coders/$(am__dirstamp) coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-hrz.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-html.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-icon.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-info.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-inline.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-ipl.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-label.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-mac.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-magick.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-map.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-mat.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-matte.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-meta.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-miff.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-mono.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-mpc.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-mpeg.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-mpr.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-msl.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-mtv.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-mvg.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-null.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-otb.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-palm.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-pattern.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-pcd.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-pcl.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-pcx.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-pdb.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-pdf.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-pes.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-pict.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-pix.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-plasma.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-pnm.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-preview.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-ps.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-ps2.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-ps3.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-psd.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-pwp.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-raw.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-rgb.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-rla.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-rle.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-scr.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-sct.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-sfw.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-sgi.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-stegano.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-sun.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-svg.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-tga.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-thumbnail.lo: \
+ coders/$(am__dirstamp) coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-tile.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-tim.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-ttf.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-txt.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-uil.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-url.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-uyvy.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-vicar.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-vid.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-viff.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-wbmp.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-wpg.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-xbm.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-xc.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-xcf.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-xpm.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-xps.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-ycbcr.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-yuv.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-dps.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-djvu.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-exr.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-fpx.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-clipboard.lo: \
+ coders/$(am__dirstamp) coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-emf.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-jbig.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-jpeg.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-jp2.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-png.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-ept.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-tiff.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-webp.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-wmf.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-x.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+coders/MagickCore_libMagickCore_la-xwd.lo: coders/$(am__dirstamp) \
+ coders/$(DEPDIR)/$(am__dirstamp)
+MagickCore/libMagickCore.la: $(MagickCore_libMagickCore_la_OBJECTS) $(MagickCore_libMagickCore_la_DEPENDENCIES) MagickCore/$(am__dirstamp)
+ $(AM_V_CCLD)$(MagickCore_libMagickCore_la_LINK) -rpath $(libdir) $(MagickCore_libMagickCore_la_OBJECTS) $(MagickCore_libMagickCore_la_LIBADD) $(LIBS)
+MagickWand/$(am__dirstamp):
+ @$(MKDIR_P) MagickWand
+ @: > MagickWand/$(am__dirstamp)
+MagickWand/$(DEPDIR)/$(am__dirstamp):
+ @$(MKDIR_P) MagickWand/$(DEPDIR)
+ @: > MagickWand/$(DEPDIR)/$(am__dirstamp)
+MagickWand/MagickWand_libMagickWand_la-animate.lo: \
+ MagickWand/$(am__dirstamp) \
+ MagickWand/$(DEPDIR)/$(am__dirstamp)
+MagickWand/MagickWand_libMagickWand_la-compare.lo: \
+ MagickWand/$(am__dirstamp) \
+ MagickWand/$(DEPDIR)/$(am__dirstamp)
+MagickWand/MagickWand_libMagickWand_la-composite.lo: \
+ MagickWand/$(am__dirstamp) \
+ MagickWand/$(DEPDIR)/$(am__dirstamp)
+MagickWand/MagickWand_libMagickWand_la-conjure.lo: \
+ MagickWand/$(am__dirstamp) \
+ MagickWand/$(DEPDIR)/$(am__dirstamp)
+MagickWand/MagickWand_libMagickWand_la-convert.lo: \
+ MagickWand/$(am__dirstamp) \
+ MagickWand/$(DEPDIR)/$(am__dirstamp)
+MagickWand/MagickWand_libMagickWand_la-deprecate.lo: \
+ MagickWand/$(am__dirstamp) \
+ MagickWand/$(DEPDIR)/$(am__dirstamp)
+MagickWand/MagickWand_libMagickWand_la-display.lo: \
+ MagickWand/$(am__dirstamp) \
+ MagickWand/$(DEPDIR)/$(am__dirstamp)
+MagickWand/MagickWand_libMagickWand_la-drawing-wand.lo: \
+ MagickWand/$(am__dirstamp) \
+ MagickWand/$(DEPDIR)/$(am__dirstamp)
+MagickWand/MagickWand_libMagickWand_la-identify.lo: \
+ MagickWand/$(am__dirstamp) \
+ MagickWand/$(DEPDIR)/$(am__dirstamp)
+MagickWand/MagickWand_libMagickWand_la-import.lo: \
+ MagickWand/$(am__dirstamp) \
+ MagickWand/$(DEPDIR)/$(am__dirstamp)
+MagickWand/MagickWand_libMagickWand_la-magick-image.lo: \
+ MagickWand/$(am__dirstamp) \
+ MagickWand/$(DEPDIR)/$(am__dirstamp)
+MagickWand/MagickWand_libMagickWand_la-magick-property.lo: \
+ MagickWand/$(am__dirstamp) \
+ MagickWand/$(DEPDIR)/$(am__dirstamp)
+MagickWand/MagickWand_libMagickWand_la-magick-wand.lo: \
+ MagickWand/$(am__dirstamp) \
+ MagickWand/$(DEPDIR)/$(am__dirstamp)
+MagickWand/MagickWand_libMagickWand_la-mogrify.lo: \
+ MagickWand/$(am__dirstamp) \
+ MagickWand/$(DEPDIR)/$(am__dirstamp)
+MagickWand/MagickWand_libMagickWand_la-montage.lo: \
+ MagickWand/$(am__dirstamp) \
+ MagickWand/$(DEPDIR)/$(am__dirstamp)
+MagickWand/MagickWand_libMagickWand_la-pixel-iterator.lo: \
+ MagickWand/$(am__dirstamp) \
+ MagickWand/$(DEPDIR)/$(am__dirstamp)
+MagickWand/MagickWand_libMagickWand_la-pixel-wand.lo: \
+ MagickWand/$(am__dirstamp) \
+ MagickWand/$(DEPDIR)/$(am__dirstamp)
+MagickWand/MagickWand_libMagickWand_la-stream.lo: \
+ MagickWand/$(am__dirstamp) \
+ MagickWand/$(DEPDIR)/$(am__dirstamp)
+MagickWand/MagickWand_libMagickWand_la-wand.lo: \
+ MagickWand/$(am__dirstamp) \
+ MagickWand/$(DEPDIR)/$(am__dirstamp)
+MagickWand/MagickWand_libMagickWand_la-wand-view.lo: \
+ MagickWand/$(am__dirstamp) \
+ MagickWand/$(DEPDIR)/$(am__dirstamp)
+MagickWand/libMagickWand.la: $(MagickWand_libMagickWand_la_OBJECTS) $(MagickWand_libMagickWand_la_DEPENDENCIES) MagickWand/$(am__dirstamp)
+ $(AM_V_CCLD)$(MagickWand_libMagickWand_la_LINK) -rpath $(libdir) $(MagickWand_libMagickWand_la_OBJECTS) $(MagickWand_libMagickWand_la_LIBADD) $(LIBS)
coders/coders_aai_la-aai.lo: coders/$(am__dirstamp) \
coders/$(DEPDIR)/$(am__dirstamp)
coders/aai.la: $(coders_aai_la_OBJECTS) $(coders_aai_la_DEPENDENCIES) coders/$(am__dirstamp)
@@ -5585,478 +6140,6 @@
ltdl/loaders/$(DEPDIR)/$(am__dirstamp)
ltdl/shl_load.la: $(ltdl_shl_load_la_OBJECTS) $(ltdl_shl_load_la_DEPENDENCIES) ltdl/$(am__dirstamp)
$(AM_V_CCLD)$(ltdl_shl_load_la_LINK) $(ltdl_shl_load_la_OBJECTS) $(ltdl_shl_load_la_LIBADD) $(LIBS)
-magick/$(am__dirstamp):
- @$(MKDIR_P) magick
- @: > magick/$(am__dirstamp)
-magick/$(DEPDIR)/$(am__dirstamp):
- @$(MKDIR_P) magick/$(DEPDIR)
- @: > magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-accelerate.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-animate.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-annotate.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-artifact.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-attribute.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-blob.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-cache.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-cache-view.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-cipher.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-client.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-coder.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-color.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-colormap.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-colorspace.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-compare.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-composite.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-compress.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-configure.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-constitute.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-decorate.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-delegate.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-deprecate.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-display.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-distort.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-draw.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-effect.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-enhance.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-exception.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-feature.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-fourier.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-fx.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-gem.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-geometry.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-hashmap.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-histogram.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-identify.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-image.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-image-view.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-layer.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-list.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-locale.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-log.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-magic.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-magick.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-matrix.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-memory.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-mime.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-module.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-monitor.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-montage.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-morphology.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-option.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-paint.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-pixel.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-policy.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-PreRvIcccm.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-prepress.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-property.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-profile.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-quantize.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-quantum.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-quantum-export.lo: \
- magick/$(am__dirstamp) magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-quantum-import.lo: \
- magick/$(am__dirstamp) magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-random.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-registry.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-resample.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-resize.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-resource.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-segment.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-semaphore.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-shear.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-signature.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-splay-tree.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-static.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-statistic.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-stream.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-string.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-thread.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-timer.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-token.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-transform.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-threshold.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-type.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-utility.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-version.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-widget.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-xml-tree.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-xwindow.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-nt-feature.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-magick/magick_libMagickCore_la-nt-base.lo: magick/$(am__dirstamp) \
- magick/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-aai.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-art.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-avs.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-bgr.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-bmp.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-braille.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-cals.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-caption.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-cin.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-cip.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-clip.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-cmyk.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-cut.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-dcm.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-dds.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-debug.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-dib.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-dng.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-dot.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-dpx.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-fax.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-fits.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-gif.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-gradient.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-gray.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-hald.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-hdr.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-histogram.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-hrz.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-html.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-icon.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-info.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-inline.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-ipl.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-label.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-mac.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-magick.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-map.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-mat.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-matte.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-meta.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-miff.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-mono.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-mpc.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-mpeg.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-mpr.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-msl.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-mtv.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-mvg.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-null.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-otb.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-palm.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-pattern.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-pcd.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-pcl.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-pcx.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-pdb.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-pdf.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-pes.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-pict.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-pix.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-plasma.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-pnm.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-preview.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-ps.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-ps2.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-ps3.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-psd.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-pwp.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-raw.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-rgb.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-rla.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-rle.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-scr.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-sct.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-sfw.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-sgi.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-stegano.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-sun.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-svg.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-tga.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-thumbnail.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-tile.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-tim.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-ttf.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-txt.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-uil.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-url.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-uyvy.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-vicar.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-vid.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-viff.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-wbmp.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-wpg.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-xbm.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-xc.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-xcf.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-xpm.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-xps.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-ycbcr.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-yuv.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-dps.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-djvu.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-exr.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-fpx.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-clipboard.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-emf.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-jbig.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-jpeg.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-jp2.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-png.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-ept.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-tiff.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-webp.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-wmf.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-x.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-coders/magick_libMagickCore_la-xwd.lo: coders/$(am__dirstamp) \
- coders/$(DEPDIR)/$(am__dirstamp)
-filters/magick_libMagickCore_la-analyze.lo: filters/$(am__dirstamp) \
- filters/$(DEPDIR)/$(am__dirstamp)
-magick/libMagickCore.la: $(magick_libMagickCore_la_OBJECTS) $(magick_libMagickCore_la_DEPENDENCIES) magick/$(am__dirstamp)
- $(AM_V_CCLD)$(magick_libMagickCore_la_LINK) -rpath $(libdir) $(magick_libMagickCore_la_OBJECTS) $(magick_libMagickCore_la_LIBADD) $(LIBS)
-wand/$(am__dirstamp):
- @$(MKDIR_P) wand
- @: > wand/$(am__dirstamp)
-wand/$(DEPDIR)/$(am__dirstamp):
- @$(MKDIR_P) wand/$(DEPDIR)
- @: > wand/$(DEPDIR)/$(am__dirstamp)
-wand/wand_libMagickWand_la-animate.lo: wand/$(am__dirstamp) \
- wand/$(DEPDIR)/$(am__dirstamp)
-wand/wand_libMagickWand_la-compare.lo: wand/$(am__dirstamp) \
- wand/$(DEPDIR)/$(am__dirstamp)
-wand/wand_libMagickWand_la-composite.lo: wand/$(am__dirstamp) \
- wand/$(DEPDIR)/$(am__dirstamp)
-wand/wand_libMagickWand_la-conjure.lo: wand/$(am__dirstamp) \
- wand/$(DEPDIR)/$(am__dirstamp)
-wand/wand_libMagickWand_la-convert.lo: wand/$(am__dirstamp) \
- wand/$(DEPDIR)/$(am__dirstamp)
-wand/wand_libMagickWand_la-deprecate.lo: wand/$(am__dirstamp) \
- wand/$(DEPDIR)/$(am__dirstamp)
-wand/wand_libMagickWand_la-display.lo: wand/$(am__dirstamp) \
- wand/$(DEPDIR)/$(am__dirstamp)
-wand/wand_libMagickWand_la-drawing-wand.lo: wand/$(am__dirstamp) \
- wand/$(DEPDIR)/$(am__dirstamp)
-wand/wand_libMagickWand_la-identify.lo: wand/$(am__dirstamp) \
- wand/$(DEPDIR)/$(am__dirstamp)
-wand/wand_libMagickWand_la-import.lo: wand/$(am__dirstamp) \
- wand/$(DEPDIR)/$(am__dirstamp)
-wand/wand_libMagickWand_la-magick-image.lo: wand/$(am__dirstamp) \
- wand/$(DEPDIR)/$(am__dirstamp)
-wand/wand_libMagickWand_la-magick-property.lo: wand/$(am__dirstamp) \
- wand/$(DEPDIR)/$(am__dirstamp)
-wand/wand_libMagickWand_la-magick-wand.lo: wand/$(am__dirstamp) \
- wand/$(DEPDIR)/$(am__dirstamp)
-wand/wand_libMagickWand_la-mogrify.lo: wand/$(am__dirstamp) \
- wand/$(DEPDIR)/$(am__dirstamp)
-wand/wand_libMagickWand_la-montage.lo: wand/$(am__dirstamp) \
- wand/$(DEPDIR)/$(am__dirstamp)
-wand/wand_libMagickWand_la-pixel-iterator.lo: wand/$(am__dirstamp) \
- wand/$(DEPDIR)/$(am__dirstamp)
-wand/wand_libMagickWand_la-pixel-wand.lo: wand/$(am__dirstamp) \
- wand/$(DEPDIR)/$(am__dirstamp)
-wand/wand_libMagickWand_la-stream.lo: wand/$(am__dirstamp) \
- wand/$(DEPDIR)/$(am__dirstamp)
-wand/wand_libMagickWand_la-wand.lo: wand/$(am__dirstamp) \
- wand/$(DEPDIR)/$(am__dirstamp)
-wand/wand_libMagickWand_la-wand-view.lo: wand/$(am__dirstamp) \
- wand/$(DEPDIR)/$(am__dirstamp)
-wand/libMagickWand.la: $(wand_libMagickWand_la_OBJECTS) $(wand_libMagickWand_la_DEPENDENCIES) wand/$(am__dirstamp)
- $(AM_V_CCLD)$(wand_libMagickWand_la_LINK) -rpath $(libdir) $(wand_libMagickWand_la_OBJECTS) $(wand_libMagickWand_la_LIBADD) $(LIBS)
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
@@ -6232,6 +6315,16 @@
Magick++/tests/readWriteImages$(EXEEXT): $(Magick___tests_readWriteImages_OBJECTS) $(Magick___tests_readWriteImages_DEPENDENCIES) Magick++/tests/$(am__dirstamp)
@rm -f Magick++/tests/readWriteImages$(EXEEXT)
$(AM_V_CXXLD)$(CXXLINK) $(Magick___tests_readWriteImages_OBJECTS) $(Magick___tests_readWriteImages_LDADD) $(LIBS)
+MagickWand/drawtest.$(OBJEXT): MagickWand/$(am__dirstamp) \
+ MagickWand/$(DEPDIR)/$(am__dirstamp)
+MagickWand/drawtest$(EXEEXT): $(MagickWand_drawtest_OBJECTS) $(MagickWand_drawtest_DEPENDENCIES) MagickWand/$(am__dirstamp)
+ @rm -f MagickWand/drawtest$(EXEEXT)
+ $(AM_V_CCLD)$(MagickWand_drawtest_LINK) $(MagickWand_drawtest_OBJECTS) $(MagickWand_drawtest_LDADD) $(LIBS)
+MagickWand/wandtest.$(OBJEXT): MagickWand/$(am__dirstamp) \
+ MagickWand/$(DEPDIR)/$(am__dirstamp)
+MagickWand/wandtest$(EXEEXT): $(MagickWand_wandtest_OBJECTS) $(MagickWand_wandtest_DEPENDENCIES) MagickWand/$(am__dirstamp)
+ @rm -f MagickWand/wandtest$(EXEEXT)
+ $(AM_V_CCLD)$(MagickWand_wandtest_LINK) $(MagickWand_wandtest_OBJECTS) $(MagickWand_wandtest_LDADD) $(LIBS)
tests/$(am__dirstamp):
@$(MKDIR_P) tests
@: > tests/$(am__dirstamp)
@@ -6304,16 +6397,6 @@
utilities/stream$(EXEEXT): $(utilities_stream_OBJECTS) $(utilities_stream_DEPENDENCIES) utilities/$(am__dirstamp)
@rm -f utilities/stream$(EXEEXT)
$(AM_V_CCLD)$(utilities_stream_LINK) $(utilities_stream_OBJECTS) $(utilities_stream_LDADD) $(LIBS)
-wand/drawtest.$(OBJEXT): wand/$(am__dirstamp) \
- wand/$(DEPDIR)/$(am__dirstamp)
-wand/drawtest$(EXEEXT): $(wand_drawtest_OBJECTS) $(wand_drawtest_DEPENDENCIES) wand/$(am__dirstamp)
- @rm -f wand/drawtest$(EXEEXT)
- $(AM_V_CCLD)$(wand_drawtest_LINK) $(wand_drawtest_OBJECTS) $(wand_drawtest_LDADD) $(LIBS)
-wand/wandtest.$(OBJEXT): wand/$(am__dirstamp) \
- wand/$(DEPDIR)/$(am__dirstamp)
-wand/wandtest$(EXEEXT): $(wand_wandtest_OBJECTS) $(wand_wandtest_DEPENDENCIES) wand/$(am__dirstamp)
- @rm -f wand/wandtest$(EXEEXT)
- $(AM_V_CCLD)$(wand_wandtest_LINK) $(wand_wandtest_OBJECTS) $(wand_wandtest_LDADD) $(LIBS)
install-binSCRIPTS: $(bin_SCRIPTS)
@$(NORMAL_INSTALL)
test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
@@ -6404,6 +6487,462 @@
-rm -f Magick++/tests/morphImages.$(OBJEXT)
-rm -f Magick++/tests/readWriteBlob.$(OBJEXT)
-rm -f Magick++/tests/readWriteImages.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-PreRvIcccm.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-PreRvIcccm.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-accelerate.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-accelerate.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-animate.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-animate.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-annotate.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-annotate.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-artifact.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-artifact.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-attribute.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-attribute.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-blob.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-blob.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-cache-view.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-cache-view.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-cache.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-cache.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-cipher.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-cipher.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-client.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-client.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-coder.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-coder.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-color.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-color.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-colormap.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-colormap.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-colorspace.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-colorspace.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-compare.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-compare.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-composite.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-composite.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-compress.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-compress.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-configure.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-configure.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-constitute.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-constitute.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-decorate.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-decorate.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-delegate.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-delegate.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-deprecate.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-deprecate.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-display.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-display.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-distort.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-distort.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-draw.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-draw.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-effect.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-effect.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-enhance.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-enhance.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-exception.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-exception.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-feature.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-feature.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-fourier.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-fourier.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-fx.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-fx.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-gem.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-gem.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-geometry.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-geometry.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-hashmap.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-hashmap.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-histogram.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-histogram.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-identify.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-identify.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-image-view.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-image-view.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-image.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-image.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-layer.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-layer.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-list.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-list.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-locale.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-locale.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-log.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-log.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-magic.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-magic.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-magick.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-magick.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-matrix.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-matrix.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-memory.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-memory.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-mime.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-mime.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-module.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-module.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-monitor.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-monitor.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-montage.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-montage.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-morphology.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-morphology.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-nt-base.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-nt-base.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-nt-feature.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-nt-feature.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-option.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-option.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-paint.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-paint.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-pixel.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-pixel.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-policy.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-policy.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-prepress.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-prepress.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-profile.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-profile.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-property.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-property.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-quantize.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-quantize.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-quantum-export.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-quantum-export.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-quantum-import.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-quantum-import.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-quantum.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-quantum.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-random.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-random.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-registry.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-registry.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-resample.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-resample.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-resize.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-resize.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-resource.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-resource.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-segment.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-segment.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-semaphore.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-semaphore.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-shear.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-shear.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-signature.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-signature.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-splay-tree.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-splay-tree.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-static.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-static.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-statistic.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-statistic.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-stream.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-stream.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-string.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-string.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-thread.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-thread.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-threshold.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-threshold.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-timer.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-timer.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-token.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-token.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-transform.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-transform.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-type.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-type.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-utility.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-utility.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-version.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-version.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-widget.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-widget.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-xml-tree.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-xml-tree.lo
+ -rm -f MagickCore/MagickCore_libMagickCore_la-xwindow.$(OBJEXT)
+ -rm -f MagickCore/MagickCore_libMagickCore_la-xwindow.lo
+ -rm -f MagickWand/MagickWand_libMagickWand_la-animate.$(OBJEXT)
+ -rm -f MagickWand/MagickWand_libMagickWand_la-animate.lo
+ -rm -f MagickWand/MagickWand_libMagickWand_la-compare.$(OBJEXT)
+ -rm -f MagickWand/MagickWand_libMagickWand_la-compare.lo
+ -rm -f MagickWand/MagickWand_libMagickWand_la-composite.$(OBJEXT)
+ -rm -f MagickWand/MagickWand_libMagickWand_la-composite.lo
+ -rm -f MagickWand/MagickWand_libMagickWand_la-conjure.$(OBJEXT)
+ -rm -f MagickWand/MagickWand_libMagickWand_la-conjure.lo
+ -rm -f MagickWand/MagickWand_libMagickWand_la-convert.$(OBJEXT)
+ -rm -f MagickWand/MagickWand_libMagickWand_la-convert.lo
+ -rm -f MagickWand/MagickWand_libMagickWand_la-deprecate.$(OBJEXT)
+ -rm -f MagickWand/MagickWand_libMagickWand_la-deprecate.lo
+ -rm -f MagickWand/MagickWand_libMagickWand_la-display.$(OBJEXT)
+ -rm -f MagickWand/MagickWand_libMagickWand_la-display.lo
+ -rm -f MagickWand/MagickWand_libMagickWand_la-drawing-wand.$(OBJEXT)
+ -rm -f MagickWand/MagickWand_libMagickWand_la-drawing-wand.lo
+ -rm -f MagickWand/MagickWand_libMagickWand_la-identify.$(OBJEXT)
+ -rm -f MagickWand/MagickWand_libMagickWand_la-identify.lo
+ -rm -f MagickWand/MagickWand_libMagickWand_la-import.$(OBJEXT)
+ -rm -f MagickWand/MagickWand_libMagickWand_la-import.lo
+ -rm -f MagickWand/MagickWand_libMagickWand_la-magick-image.$(OBJEXT)
+ -rm -f MagickWand/MagickWand_libMagickWand_la-magick-image.lo
+ -rm -f MagickWand/MagickWand_libMagickWand_la-magick-property.$(OBJEXT)
+ -rm -f MagickWand/MagickWand_libMagickWand_la-magick-property.lo
+ -rm -f MagickWand/MagickWand_libMagickWand_la-magick-wand.$(OBJEXT)
+ -rm -f MagickWand/MagickWand_libMagickWand_la-magick-wand.lo
+ -rm -f MagickWand/MagickWand_libMagickWand_la-mogrify.$(OBJEXT)
+ -rm -f MagickWand/MagickWand_libMagickWand_la-mogrify.lo
+ -rm -f MagickWand/MagickWand_libMagickWand_la-montage.$(OBJEXT)
+ -rm -f MagickWand/MagickWand_libMagickWand_la-montage.lo
+ -rm -f MagickWand/MagickWand_libMagickWand_la-pixel-iterator.$(OBJEXT)
+ -rm -f MagickWand/MagickWand_libMagickWand_la-pixel-iterator.lo
+ -rm -f MagickWand/MagickWand_libMagickWand_la-pixel-wand.$(OBJEXT)
+ -rm -f MagickWand/MagickWand_libMagickWand_la-pixel-wand.lo
+ -rm -f MagickWand/MagickWand_libMagickWand_la-stream.$(OBJEXT)
+ -rm -f MagickWand/MagickWand_libMagickWand_la-stream.lo
+ -rm -f MagickWand/MagickWand_libMagickWand_la-wand-view.$(OBJEXT)
+ -rm -f MagickWand/MagickWand_libMagickWand_la-wand-view.lo
+ -rm -f MagickWand/MagickWand_libMagickWand_la-wand.$(OBJEXT)
+ -rm -f MagickWand/MagickWand_libMagickWand_la-wand.lo
+ -rm -f MagickWand/drawtest.$(OBJEXT)
+ -rm -f MagickWand/wandtest.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-aai.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-aai.lo
+ -rm -f coders/MagickCore_libMagickCore_la-art.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-art.lo
+ -rm -f coders/MagickCore_libMagickCore_la-avs.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-avs.lo
+ -rm -f coders/MagickCore_libMagickCore_la-bgr.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-bgr.lo
+ -rm -f coders/MagickCore_libMagickCore_la-bmp.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-bmp.lo
+ -rm -f coders/MagickCore_libMagickCore_la-braille.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-braille.lo
+ -rm -f coders/MagickCore_libMagickCore_la-cals.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-cals.lo
+ -rm -f coders/MagickCore_libMagickCore_la-caption.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-caption.lo
+ -rm -f coders/MagickCore_libMagickCore_la-cin.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-cin.lo
+ -rm -f coders/MagickCore_libMagickCore_la-cip.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-cip.lo
+ -rm -f coders/MagickCore_libMagickCore_la-clip.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-clip.lo
+ -rm -f coders/MagickCore_libMagickCore_la-clipboard.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-clipboard.lo
+ -rm -f coders/MagickCore_libMagickCore_la-cmyk.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-cmyk.lo
+ -rm -f coders/MagickCore_libMagickCore_la-cut.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-cut.lo
+ -rm -f coders/MagickCore_libMagickCore_la-dcm.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-dcm.lo
+ -rm -f coders/MagickCore_libMagickCore_la-dds.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-dds.lo
+ -rm -f coders/MagickCore_libMagickCore_la-debug.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-debug.lo
+ -rm -f coders/MagickCore_libMagickCore_la-dib.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-dib.lo
+ -rm -f coders/MagickCore_libMagickCore_la-djvu.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-djvu.lo
+ -rm -f coders/MagickCore_libMagickCore_la-dng.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-dng.lo
+ -rm -f coders/MagickCore_libMagickCore_la-dot.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-dot.lo
+ -rm -f coders/MagickCore_libMagickCore_la-dps.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-dps.lo
+ -rm -f coders/MagickCore_libMagickCore_la-dpx.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-dpx.lo
+ -rm -f coders/MagickCore_libMagickCore_la-emf.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-emf.lo
+ -rm -f coders/MagickCore_libMagickCore_la-ept.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-ept.lo
+ -rm -f coders/MagickCore_libMagickCore_la-exr.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-exr.lo
+ -rm -f coders/MagickCore_libMagickCore_la-fax.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-fax.lo
+ -rm -f coders/MagickCore_libMagickCore_la-fits.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-fits.lo
+ -rm -f coders/MagickCore_libMagickCore_la-fpx.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-fpx.lo
+ -rm -f coders/MagickCore_libMagickCore_la-gif.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-gif.lo
+ -rm -f coders/MagickCore_libMagickCore_la-gradient.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-gradient.lo
+ -rm -f coders/MagickCore_libMagickCore_la-gray.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-gray.lo
+ -rm -f coders/MagickCore_libMagickCore_la-hald.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-hald.lo
+ -rm -f coders/MagickCore_libMagickCore_la-hdr.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-hdr.lo
+ -rm -f coders/MagickCore_libMagickCore_la-histogram.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-histogram.lo
+ -rm -f coders/MagickCore_libMagickCore_la-hrz.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-hrz.lo
+ -rm -f coders/MagickCore_libMagickCore_la-html.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-html.lo
+ -rm -f coders/MagickCore_libMagickCore_la-icon.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-icon.lo
+ -rm -f coders/MagickCore_libMagickCore_la-info.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-info.lo
+ -rm -f coders/MagickCore_libMagickCore_la-inline.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-inline.lo
+ -rm -f coders/MagickCore_libMagickCore_la-ipl.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-ipl.lo
+ -rm -f coders/MagickCore_libMagickCore_la-jbig.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-jbig.lo
+ -rm -f coders/MagickCore_libMagickCore_la-jp2.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-jp2.lo
+ -rm -f coders/MagickCore_libMagickCore_la-jpeg.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-jpeg.lo
+ -rm -f coders/MagickCore_libMagickCore_la-label.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-label.lo
+ -rm -f coders/MagickCore_libMagickCore_la-mac.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-mac.lo
+ -rm -f coders/MagickCore_libMagickCore_la-magick.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-magick.lo
+ -rm -f coders/MagickCore_libMagickCore_la-map.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-map.lo
+ -rm -f coders/MagickCore_libMagickCore_la-mat.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-mat.lo
+ -rm -f coders/MagickCore_libMagickCore_la-matte.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-matte.lo
+ -rm -f coders/MagickCore_libMagickCore_la-meta.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-meta.lo
+ -rm -f coders/MagickCore_libMagickCore_la-miff.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-miff.lo
+ -rm -f coders/MagickCore_libMagickCore_la-mono.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-mono.lo
+ -rm -f coders/MagickCore_libMagickCore_la-mpc.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-mpc.lo
+ -rm -f coders/MagickCore_libMagickCore_la-mpeg.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-mpeg.lo
+ -rm -f coders/MagickCore_libMagickCore_la-mpr.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-mpr.lo
+ -rm -f coders/MagickCore_libMagickCore_la-msl.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-msl.lo
+ -rm -f coders/MagickCore_libMagickCore_la-mtv.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-mtv.lo
+ -rm -f coders/MagickCore_libMagickCore_la-mvg.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-mvg.lo
+ -rm -f coders/MagickCore_libMagickCore_la-null.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-null.lo
+ -rm -f coders/MagickCore_libMagickCore_la-otb.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-otb.lo
+ -rm -f coders/MagickCore_libMagickCore_la-palm.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-palm.lo
+ -rm -f coders/MagickCore_libMagickCore_la-pattern.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-pattern.lo
+ -rm -f coders/MagickCore_libMagickCore_la-pcd.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-pcd.lo
+ -rm -f coders/MagickCore_libMagickCore_la-pcl.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-pcl.lo
+ -rm -f coders/MagickCore_libMagickCore_la-pcx.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-pcx.lo
+ -rm -f coders/MagickCore_libMagickCore_la-pdb.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-pdb.lo
+ -rm -f coders/MagickCore_libMagickCore_la-pdf.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-pdf.lo
+ -rm -f coders/MagickCore_libMagickCore_la-pes.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-pes.lo
+ -rm -f coders/MagickCore_libMagickCore_la-pict.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-pict.lo
+ -rm -f coders/MagickCore_libMagickCore_la-pix.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-pix.lo
+ -rm -f coders/MagickCore_libMagickCore_la-plasma.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-plasma.lo
+ -rm -f coders/MagickCore_libMagickCore_la-png.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-png.lo
+ -rm -f coders/MagickCore_libMagickCore_la-pnm.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-pnm.lo
+ -rm -f coders/MagickCore_libMagickCore_la-preview.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-preview.lo
+ -rm -f coders/MagickCore_libMagickCore_la-ps.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-ps.lo
+ -rm -f coders/MagickCore_libMagickCore_la-ps2.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-ps2.lo
+ -rm -f coders/MagickCore_libMagickCore_la-ps3.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-ps3.lo
+ -rm -f coders/MagickCore_libMagickCore_la-psd.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-psd.lo
+ -rm -f coders/MagickCore_libMagickCore_la-pwp.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-pwp.lo
+ -rm -f coders/MagickCore_libMagickCore_la-raw.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-raw.lo
+ -rm -f coders/MagickCore_libMagickCore_la-rgb.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-rgb.lo
+ -rm -f coders/MagickCore_libMagickCore_la-rla.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-rla.lo
+ -rm -f coders/MagickCore_libMagickCore_la-rle.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-rle.lo
+ -rm -f coders/MagickCore_libMagickCore_la-scr.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-scr.lo
+ -rm -f coders/MagickCore_libMagickCore_la-sct.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-sct.lo
+ -rm -f coders/MagickCore_libMagickCore_la-sfw.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-sfw.lo
+ -rm -f coders/MagickCore_libMagickCore_la-sgi.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-sgi.lo
+ -rm -f coders/MagickCore_libMagickCore_la-stegano.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-stegano.lo
+ -rm -f coders/MagickCore_libMagickCore_la-sun.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-sun.lo
+ -rm -f coders/MagickCore_libMagickCore_la-svg.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-svg.lo
+ -rm -f coders/MagickCore_libMagickCore_la-tga.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-tga.lo
+ -rm -f coders/MagickCore_libMagickCore_la-thumbnail.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-thumbnail.lo
+ -rm -f coders/MagickCore_libMagickCore_la-tiff.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-tiff.lo
+ -rm -f coders/MagickCore_libMagickCore_la-tile.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-tile.lo
+ -rm -f coders/MagickCore_libMagickCore_la-tim.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-tim.lo
+ -rm -f coders/MagickCore_libMagickCore_la-ttf.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-ttf.lo
+ -rm -f coders/MagickCore_libMagickCore_la-txt.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-txt.lo
+ -rm -f coders/MagickCore_libMagickCore_la-uil.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-uil.lo
+ -rm -f coders/MagickCore_libMagickCore_la-url.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-url.lo
+ -rm -f coders/MagickCore_libMagickCore_la-uyvy.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-uyvy.lo
+ -rm -f coders/MagickCore_libMagickCore_la-vicar.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-vicar.lo
+ -rm -f coders/MagickCore_libMagickCore_la-vid.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-vid.lo
+ -rm -f coders/MagickCore_libMagickCore_la-viff.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-viff.lo
+ -rm -f coders/MagickCore_libMagickCore_la-wbmp.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-wbmp.lo
+ -rm -f coders/MagickCore_libMagickCore_la-webp.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-webp.lo
+ -rm -f coders/MagickCore_libMagickCore_la-wmf.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-wmf.lo
+ -rm -f coders/MagickCore_libMagickCore_la-wpg.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-wpg.lo
+ -rm -f coders/MagickCore_libMagickCore_la-x.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-x.lo
+ -rm -f coders/MagickCore_libMagickCore_la-xbm.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-xbm.lo
+ -rm -f coders/MagickCore_libMagickCore_la-xc.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-xc.lo
+ -rm -f coders/MagickCore_libMagickCore_la-xcf.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-xcf.lo
+ -rm -f coders/MagickCore_libMagickCore_la-xpm.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-xpm.lo
+ -rm -f coders/MagickCore_libMagickCore_la-xps.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-xps.lo
+ -rm -f coders/MagickCore_libMagickCore_la-xwd.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-xwd.lo
+ -rm -f coders/MagickCore_libMagickCore_la-ycbcr.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-ycbcr.lo
+ -rm -f coders/MagickCore_libMagickCore_la-yuv.$(OBJEXT)
+ -rm -f coders/MagickCore_libMagickCore_la-yuv.lo
-rm -f coders/coders_aai_la-aai.$(OBJEXT)
-rm -f coders/coders_aai_la-aai.lo
-rm -f coders/coders_art_la-art.$(OBJEXT)
@@ -6638,244 +7177,8 @@
-rm -f coders/coders_ycbcr_la-ycbcr.lo
-rm -f coders/coders_yuv_la-yuv.$(OBJEXT)
-rm -f coders/coders_yuv_la-yuv.lo
- -rm -f coders/magick_libMagickCore_la-aai.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-aai.lo
- -rm -f coders/magick_libMagickCore_la-art.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-art.lo
- -rm -f coders/magick_libMagickCore_la-avs.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-avs.lo
- -rm -f coders/magick_libMagickCore_la-bgr.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-bgr.lo
- -rm -f coders/magick_libMagickCore_la-bmp.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-bmp.lo
- -rm -f coders/magick_libMagickCore_la-braille.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-braille.lo
- -rm -f coders/magick_libMagickCore_la-cals.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-cals.lo
- -rm -f coders/magick_libMagickCore_la-caption.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-caption.lo
- -rm -f coders/magick_libMagickCore_la-cin.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-cin.lo
- -rm -f coders/magick_libMagickCore_la-cip.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-cip.lo
- -rm -f coders/magick_libMagickCore_la-clip.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-clip.lo
- -rm -f coders/magick_libMagickCore_la-clipboard.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-clipboard.lo
- -rm -f coders/magick_libMagickCore_la-cmyk.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-cmyk.lo
- -rm -f coders/magick_libMagickCore_la-cut.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-cut.lo
- -rm -f coders/magick_libMagickCore_la-dcm.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-dcm.lo
- -rm -f coders/magick_libMagickCore_la-dds.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-dds.lo
- -rm -f coders/magick_libMagickCore_la-debug.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-debug.lo
- -rm -f coders/magick_libMagickCore_la-dib.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-dib.lo
- -rm -f coders/magick_libMagickCore_la-djvu.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-djvu.lo
- -rm -f coders/magick_libMagickCore_la-dng.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-dng.lo
- -rm -f coders/magick_libMagickCore_la-dot.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-dot.lo
- -rm -f coders/magick_libMagickCore_la-dps.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-dps.lo
- -rm -f coders/magick_libMagickCore_la-dpx.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-dpx.lo
- -rm -f coders/magick_libMagickCore_la-emf.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-emf.lo
- -rm -f coders/magick_libMagickCore_la-ept.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-ept.lo
- -rm -f coders/magick_libMagickCore_la-exr.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-exr.lo
- -rm -f coders/magick_libMagickCore_la-fax.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-fax.lo
- -rm -f coders/magick_libMagickCore_la-fits.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-fits.lo
- -rm -f coders/magick_libMagickCore_la-fpx.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-fpx.lo
- -rm -f coders/magick_libMagickCore_la-gif.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-gif.lo
- -rm -f coders/magick_libMagickCore_la-gradient.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-gradient.lo
- -rm -f coders/magick_libMagickCore_la-gray.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-gray.lo
- -rm -f coders/magick_libMagickCore_la-hald.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-hald.lo
- -rm -f coders/magick_libMagickCore_la-hdr.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-hdr.lo
- -rm -f coders/magick_libMagickCore_la-histogram.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-histogram.lo
- -rm -f coders/magick_libMagickCore_la-hrz.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-hrz.lo
- -rm -f coders/magick_libMagickCore_la-html.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-html.lo
- -rm -f coders/magick_libMagickCore_la-icon.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-icon.lo
- -rm -f coders/magick_libMagickCore_la-info.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-info.lo
- -rm -f coders/magick_libMagickCore_la-inline.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-inline.lo
- -rm -f coders/magick_libMagickCore_la-ipl.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-ipl.lo
- -rm -f coders/magick_libMagickCore_la-jbig.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-jbig.lo
- -rm -f coders/magick_libMagickCore_la-jp2.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-jp2.lo
- -rm -f coders/magick_libMagickCore_la-jpeg.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-jpeg.lo
- -rm -f coders/magick_libMagickCore_la-label.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-label.lo
- -rm -f coders/magick_libMagickCore_la-mac.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-mac.lo
- -rm -f coders/magick_libMagickCore_la-magick.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-magick.lo
- -rm -f coders/magick_libMagickCore_la-map.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-map.lo
- -rm -f coders/magick_libMagickCore_la-mat.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-mat.lo
- -rm -f coders/magick_libMagickCore_la-matte.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-matte.lo
- -rm -f coders/magick_libMagickCore_la-meta.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-meta.lo
- -rm -f coders/magick_libMagickCore_la-miff.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-miff.lo
- -rm -f coders/magick_libMagickCore_la-mono.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-mono.lo
- -rm -f coders/magick_libMagickCore_la-mpc.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-mpc.lo
- -rm -f coders/magick_libMagickCore_la-mpeg.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-mpeg.lo
- -rm -f coders/magick_libMagickCore_la-mpr.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-mpr.lo
- -rm -f coders/magick_libMagickCore_la-msl.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-msl.lo
- -rm -f coders/magick_libMagickCore_la-mtv.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-mtv.lo
- -rm -f coders/magick_libMagickCore_la-mvg.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-mvg.lo
- -rm -f coders/magick_libMagickCore_la-null.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-null.lo
- -rm -f coders/magick_libMagickCore_la-otb.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-otb.lo
- -rm -f coders/magick_libMagickCore_la-palm.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-palm.lo
- -rm -f coders/magick_libMagickCore_la-pattern.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-pattern.lo
- -rm -f coders/magick_libMagickCore_la-pcd.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-pcd.lo
- -rm -f coders/magick_libMagickCore_la-pcl.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-pcl.lo
- -rm -f coders/magick_libMagickCore_la-pcx.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-pcx.lo
- -rm -f coders/magick_libMagickCore_la-pdb.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-pdb.lo
- -rm -f coders/magick_libMagickCore_la-pdf.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-pdf.lo
- -rm -f coders/magick_libMagickCore_la-pes.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-pes.lo
- -rm -f coders/magick_libMagickCore_la-pict.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-pict.lo
- -rm -f coders/magick_libMagickCore_la-pix.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-pix.lo
- -rm -f coders/magick_libMagickCore_la-plasma.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-plasma.lo
- -rm -f coders/magick_libMagickCore_la-png.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-png.lo
- -rm -f coders/magick_libMagickCore_la-pnm.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-pnm.lo
- -rm -f coders/magick_libMagickCore_la-preview.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-preview.lo
- -rm -f coders/magick_libMagickCore_la-ps.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-ps.lo
- -rm -f coders/magick_libMagickCore_la-ps2.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-ps2.lo
- -rm -f coders/magick_libMagickCore_la-ps3.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-ps3.lo
- -rm -f coders/magick_libMagickCore_la-psd.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-psd.lo
- -rm -f coders/magick_libMagickCore_la-pwp.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-pwp.lo
- -rm -f coders/magick_libMagickCore_la-raw.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-raw.lo
- -rm -f coders/magick_libMagickCore_la-rgb.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-rgb.lo
- -rm -f coders/magick_libMagickCore_la-rla.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-rla.lo
- -rm -f coders/magick_libMagickCore_la-rle.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-rle.lo
- -rm -f coders/magick_libMagickCore_la-scr.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-scr.lo
- -rm -f coders/magick_libMagickCore_la-sct.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-sct.lo
- -rm -f coders/magick_libMagickCore_la-sfw.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-sfw.lo
- -rm -f coders/magick_libMagickCore_la-sgi.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-sgi.lo
- -rm -f coders/magick_libMagickCore_la-stegano.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-stegano.lo
- -rm -f coders/magick_libMagickCore_la-sun.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-sun.lo
- -rm -f coders/magick_libMagickCore_la-svg.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-svg.lo
- -rm -f coders/magick_libMagickCore_la-tga.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-tga.lo
- -rm -f coders/magick_libMagickCore_la-thumbnail.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-thumbnail.lo
- -rm -f coders/magick_libMagickCore_la-tiff.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-tiff.lo
- -rm -f coders/magick_libMagickCore_la-tile.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-tile.lo
- -rm -f coders/magick_libMagickCore_la-tim.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-tim.lo
- -rm -f coders/magick_libMagickCore_la-ttf.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-ttf.lo
- -rm -f coders/magick_libMagickCore_la-txt.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-txt.lo
- -rm -f coders/magick_libMagickCore_la-uil.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-uil.lo
- -rm -f coders/magick_libMagickCore_la-url.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-url.lo
- -rm -f coders/magick_libMagickCore_la-uyvy.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-uyvy.lo
- -rm -f coders/magick_libMagickCore_la-vicar.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-vicar.lo
- -rm -f coders/magick_libMagickCore_la-vid.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-vid.lo
- -rm -f coders/magick_libMagickCore_la-viff.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-viff.lo
- -rm -f coders/magick_libMagickCore_la-wbmp.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-wbmp.lo
- -rm -f coders/magick_libMagickCore_la-webp.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-webp.lo
- -rm -f coders/magick_libMagickCore_la-wmf.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-wmf.lo
- -rm -f coders/magick_libMagickCore_la-wpg.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-wpg.lo
- -rm -f coders/magick_libMagickCore_la-x.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-x.lo
- -rm -f coders/magick_libMagickCore_la-xbm.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-xbm.lo
- -rm -f coders/magick_libMagickCore_la-xc.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-xc.lo
- -rm -f coders/magick_libMagickCore_la-xcf.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-xcf.lo
- -rm -f coders/magick_libMagickCore_la-xpm.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-xpm.lo
- -rm -f coders/magick_libMagickCore_la-xps.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-xps.lo
- -rm -f coders/magick_libMagickCore_la-xwd.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-xwd.lo
- -rm -f coders/magick_libMagickCore_la-ycbcr.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-ycbcr.lo
- -rm -f coders/magick_libMagickCore_la-yuv.$(OBJEXT)
- -rm -f coders/magick_libMagickCore_la-yuv.lo
-rm -f filters/filters_analyze_la-analyze.$(OBJEXT)
-rm -f filters/filters_analyze_la-analyze.lo
- -rm -f filters/magick_libMagickCore_la-analyze.$(OBJEXT)
- -rm -f filters/magick_libMagickCore_la-analyze.lo
-rm -f ltdl/loaders/dld_link.$(OBJEXT)
-rm -f ltdl/loaders/dld_link.lo
-rm -f ltdl/loaders/dlopen.$(OBJEXT)
@@ -6912,186 +7215,6 @@
-rm -f ltdl/ltdl_libltdlc_la-ltdl.lo
-rm -f ltdl/ltdl_libltdlc_la-slist.$(OBJEXT)
-rm -f ltdl/ltdl_libltdlc_la-slist.lo
- -rm -f magick/magick_libMagickCore_la-PreRvIcccm.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-PreRvIcccm.lo
- -rm -f magick/magick_libMagickCore_la-accelerate.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-accelerate.lo
- -rm -f magick/magick_libMagickCore_la-animate.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-animate.lo
- -rm -f magick/magick_libMagickCore_la-annotate.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-annotate.lo
- -rm -f magick/magick_libMagickCore_la-artifact.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-artifact.lo
- -rm -f magick/magick_libMagickCore_la-attribute.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-attribute.lo
- -rm -f magick/magick_libMagickCore_la-blob.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-blob.lo
- -rm -f magick/magick_libMagickCore_la-cache-view.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-cache-view.lo
- -rm -f magick/magick_libMagickCore_la-cache.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-cache.lo
- -rm -f magick/magick_libMagickCore_la-cipher.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-cipher.lo
- -rm -f magick/magick_libMagickCore_la-client.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-client.lo
- -rm -f magick/magick_libMagickCore_la-coder.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-coder.lo
- -rm -f magick/magick_libMagickCore_la-color.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-color.lo
- -rm -f magick/magick_libMagickCore_la-colormap.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-colormap.lo
- -rm -f magick/magick_libMagickCore_la-colorspace.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-colorspace.lo
- -rm -f magick/magick_libMagickCore_la-compare.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-compare.lo
- -rm -f magick/magick_libMagickCore_la-composite.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-composite.lo
- -rm -f magick/magick_libMagickCore_la-compress.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-compress.lo
- -rm -f magick/magick_libMagickCore_la-configure.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-configure.lo
- -rm -f magick/magick_libMagickCore_la-constitute.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-constitute.lo
- -rm -f magick/magick_libMagickCore_la-decorate.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-decorate.lo
- -rm -f magick/magick_libMagickCore_la-delegate.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-delegate.lo
- -rm -f magick/magick_libMagickCore_la-deprecate.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-deprecate.lo
- -rm -f magick/magick_libMagickCore_la-display.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-display.lo
- -rm -f magick/magick_libMagickCore_la-distort.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-distort.lo
- -rm -f magick/magick_libMagickCore_la-draw.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-draw.lo
- -rm -f magick/magick_libMagickCore_la-effect.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-effect.lo
- -rm -f magick/magick_libMagickCore_la-enhance.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-enhance.lo
- -rm -f magick/magick_libMagickCore_la-exception.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-exception.lo
- -rm -f magick/magick_libMagickCore_la-feature.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-feature.lo
- -rm -f magick/magick_libMagickCore_la-fourier.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-fourier.lo
- -rm -f magick/magick_libMagickCore_la-fx.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-fx.lo
- -rm -f magick/magick_libMagickCore_la-gem.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-gem.lo
- -rm -f magick/magick_libMagickCore_la-geometry.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-geometry.lo
- -rm -f magick/magick_libMagickCore_la-hashmap.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-hashmap.lo
- -rm -f magick/magick_libMagickCore_la-histogram.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-histogram.lo
- -rm -f magick/magick_libMagickCore_la-identify.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-identify.lo
- -rm -f magick/magick_libMagickCore_la-image-view.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-image-view.lo
- -rm -f magick/magick_libMagickCore_la-image.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-image.lo
- -rm -f magick/magick_libMagickCore_la-layer.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-layer.lo
- -rm -f magick/magick_libMagickCore_la-list.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-list.lo
- -rm -f magick/magick_libMagickCore_la-locale.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-locale.lo
- -rm -f magick/magick_libMagickCore_la-log.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-log.lo
- -rm -f magick/magick_libMagickCore_la-magic.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-magic.lo
- -rm -f magick/magick_libMagickCore_la-magick.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-magick.lo
- -rm -f magick/magick_libMagickCore_la-matrix.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-matrix.lo
- -rm -f magick/magick_libMagickCore_la-memory.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-memory.lo
- -rm -f magick/magick_libMagickCore_la-mime.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-mime.lo
- -rm -f magick/magick_libMagickCore_la-module.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-module.lo
- -rm -f magick/magick_libMagickCore_la-monitor.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-monitor.lo
- -rm -f magick/magick_libMagickCore_la-montage.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-montage.lo
- -rm -f magick/magick_libMagickCore_la-morphology.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-morphology.lo
- -rm -f magick/magick_libMagickCore_la-nt-base.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-nt-base.lo
- -rm -f magick/magick_libMagickCore_la-nt-feature.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-nt-feature.lo
- -rm -f magick/magick_libMagickCore_la-option.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-option.lo
- -rm -f magick/magick_libMagickCore_la-paint.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-paint.lo
- -rm -f magick/magick_libMagickCore_la-pixel.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-pixel.lo
- -rm -f magick/magick_libMagickCore_la-policy.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-policy.lo
- -rm -f magick/magick_libMagickCore_la-prepress.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-prepress.lo
- -rm -f magick/magick_libMagickCore_la-profile.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-profile.lo
- -rm -f magick/magick_libMagickCore_la-property.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-property.lo
- -rm -f magick/magick_libMagickCore_la-quantize.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-quantize.lo
- -rm -f magick/magick_libMagickCore_la-quantum-export.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-quantum-export.lo
- -rm -f magick/magick_libMagickCore_la-quantum-import.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-quantum-import.lo
- -rm -f magick/magick_libMagickCore_la-quantum.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-quantum.lo
- -rm -f magick/magick_libMagickCore_la-random.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-random.lo
- -rm -f magick/magick_libMagickCore_la-registry.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-registry.lo
- -rm -f magick/magick_libMagickCore_la-resample.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-resample.lo
- -rm -f magick/magick_libMagickCore_la-resize.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-resize.lo
- -rm -f magick/magick_libMagickCore_la-resource.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-resource.lo
- -rm -f magick/magick_libMagickCore_la-segment.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-segment.lo
- -rm -f magick/magick_libMagickCore_la-semaphore.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-semaphore.lo
- -rm -f magick/magick_libMagickCore_la-shear.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-shear.lo
- -rm -f magick/magick_libMagickCore_la-signature.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-signature.lo
- -rm -f magick/magick_libMagickCore_la-splay-tree.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-splay-tree.lo
- -rm -f magick/magick_libMagickCore_la-static.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-static.lo
- -rm -f magick/magick_libMagickCore_la-statistic.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-statistic.lo
- -rm -f magick/magick_libMagickCore_la-stream.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-stream.lo
- -rm -f magick/magick_libMagickCore_la-string.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-string.lo
- -rm -f magick/magick_libMagickCore_la-thread.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-thread.lo
- -rm -f magick/magick_libMagickCore_la-threshold.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-threshold.lo
- -rm -f magick/magick_libMagickCore_la-timer.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-timer.lo
- -rm -f magick/magick_libMagickCore_la-token.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-token.lo
- -rm -f magick/magick_libMagickCore_la-transform.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-transform.lo
- -rm -f magick/magick_libMagickCore_la-type.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-type.lo
- -rm -f magick/magick_libMagickCore_la-utility.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-utility.lo
- -rm -f magick/magick_libMagickCore_la-version.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-version.lo
- -rm -f magick/magick_libMagickCore_la-widget.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-widget.lo
- -rm -f magick/magick_libMagickCore_la-xml-tree.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-xml-tree.lo
- -rm -f magick/magick_libMagickCore_la-xwindow.$(OBJEXT)
- -rm -f magick/magick_libMagickCore_la-xwindow.lo
-rm -f tests/tests_validate-validate.$(OBJEXT)
-rm -f utilities/animate.$(OBJEXT)
-rm -f utilities/compare.$(OBJEXT)
@@ -7104,48 +7227,6 @@
-rm -f utilities/mogrify.$(OBJEXT)
-rm -f utilities/montage.$(OBJEXT)
-rm -f utilities/stream.$(OBJEXT)
- -rm -f wand/drawtest.$(OBJEXT)
- -rm -f wand/wand_libMagickWand_la-animate.$(OBJEXT)
- -rm -f wand/wand_libMagickWand_la-animate.lo
- -rm -f wand/wand_libMagickWand_la-compare.$(OBJEXT)
- -rm -f wand/wand_libMagickWand_la-compare.lo
- -rm -f wand/wand_libMagickWand_la-composite.$(OBJEXT)
- -rm -f wand/wand_libMagickWand_la-composite.lo
- -rm -f wand/wand_libMagickWand_la-conjure.$(OBJEXT)
- -rm -f wand/wand_libMagickWand_la-conjure.lo
- -rm -f wand/wand_libMagickWand_la-convert.$(OBJEXT)
- -rm -f wand/wand_libMagickWand_la-convert.lo
- -rm -f wand/wand_libMagickWand_la-deprecate.$(OBJEXT)
- -rm -f wand/wand_libMagickWand_la-deprecate.lo
- -rm -f wand/wand_libMagickWand_la-display.$(OBJEXT)
- -rm -f wand/wand_libMagickWand_la-display.lo
- -rm -f wand/wand_libMagickWand_la-drawing-wand.$(OBJEXT)
- -rm -f wand/wand_libMagickWand_la-drawing-wand.lo
- -rm -f wand/wand_libMagickWand_la-identify.$(OBJEXT)
- -rm -f wand/wand_libMagickWand_la-identify.lo
- -rm -f wand/wand_libMagickWand_la-import.$(OBJEXT)
- -rm -f wand/wand_libMagickWand_la-import.lo
- -rm -f wand/wand_libMagickWand_la-magick-image.$(OBJEXT)
- -rm -f wand/wand_libMagickWand_la-magick-image.lo
- -rm -f wand/wand_libMagickWand_la-magick-property.$(OBJEXT)
- -rm -f wand/wand_libMagickWand_la-magick-property.lo
- -rm -f wand/wand_libMagickWand_la-magick-wand.$(OBJEXT)
- -rm -f wand/wand_libMagickWand_la-magick-wand.lo
- -rm -f wand/wand_libMagickWand_la-mogrify.$(OBJEXT)
- -rm -f wand/wand_libMagickWand_la-mogrify.lo
- -rm -f wand/wand_libMagickWand_la-montage.$(OBJEXT)
- -rm -f wand/wand_libMagickWand_la-montage.lo
- -rm -f wand/wand_libMagickWand_la-pixel-iterator.$(OBJEXT)
- -rm -f wand/wand_libMagickWand_la-pixel-iterator.lo
- -rm -f wand/wand_libMagickWand_la-pixel-wand.$(OBJEXT)
- -rm -f wand/wand_libMagickWand_la-pixel-wand.lo
- -rm -f wand/wand_libMagickWand_la-stream.$(OBJEXT)
- -rm -f wand/wand_libMagickWand_la-stream.lo
- -rm -f wand/wand_libMagickWand_la-wand-view.$(OBJEXT)
- -rm -f wand/wand_libMagickWand_la-wand-view.lo
- -rm -f wand/wand_libMagickWand_la-wand.$(OBJEXT)
- -rm -f wand/wand_libMagickWand_la-wand.lo
- -rm -f wand/wandtest.$(OBJEXT)
distclean-compile:
-rm -f *.tab.c
@@ -7187,6 +7268,235 @@
@AMDEP_TRUE@@am__include@ @am__quote@Magick++/tests/$(DEPDIR)/morphImages.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@Magick++/tests/$(DEPDIR)/readWriteBlob.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@Magick++/tests/$(DEPDIR)/readWriteImages.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-PreRvIcccm.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-accelerate.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-animate.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-annotate.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-artifact.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-attribute.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-blob.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-cache-view.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-cache.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-cipher.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-client.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-coder.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-color.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-colormap.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-colorspace.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-compare.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-composite.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-compress.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-configure.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-constitute.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-decorate.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-delegate.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-deprecate.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-display.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-distort.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-draw.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-effect.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-enhance.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-exception.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-feature.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-fourier.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-fx.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-gem.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-geometry.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-hashmap.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-histogram.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-identify.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-image-view.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-image.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-layer.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-list.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-locale.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-log.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-magic.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-magick.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-matrix.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-memory.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-mime.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-module.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-monitor.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-montage.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-morphology.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-nt-base.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-nt-feature.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-option.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-paint.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-pixel.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-policy.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-prepress.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-profile.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-property.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-quantize.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-quantum-export.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-quantum-import.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-quantum.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-random.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-registry.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-resample.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-resize.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-resource.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-segment.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-semaphore.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-shear.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-signature.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-splay-tree.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-static.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-statistic.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-stream.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-string.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-thread.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-threshold.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-timer.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-token.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-transform.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-type.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-utility.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-version.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-widget.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-xml-tree.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-xwindow.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-animate.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-compare.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-composite.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-conjure.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-convert.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-deprecate.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-display.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-drawing-wand.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-identify.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-import.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-magick-image.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-magick-property.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-magick-wand.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-mogrify.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-montage.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-pixel-iterator.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-pixel-wand.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-stream.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-wand-view.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-wand.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickWand/$(DEPDIR)/drawtest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickWand/$(DEPDIR)/wandtest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-aai.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-art.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-avs.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-bgr.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-bmp.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-braille.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-cals.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-caption.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-cin.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-cip.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-clip.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-clipboard.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-cmyk.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-cut.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-dcm.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-dds.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-debug.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-dib.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-djvu.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-dng.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-dot.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-dps.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-dpx.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-emf.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-ept.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-exr.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-fax.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-fits.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-fpx.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-gif.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-gradient.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-gray.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-hald.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-hdr.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-histogram.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-hrz.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-html.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-icon.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-info.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-inline.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-ipl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-jbig.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-jp2.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-jpeg.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-label.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-mac.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-magick.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-map.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-mat.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-matte.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-meta.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-miff.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-mono.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-mpc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-mpeg.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-mpr.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-msl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-mtv.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-mvg.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-null.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-otb.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-palm.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-pattern.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-pcd.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-pcl.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-pcx.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-pdb.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-pdf.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-pes.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-pict.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-pix.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-plasma.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-png.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-pnm.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-preview.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-ps.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-ps2.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-ps3.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-psd.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-pwp.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-raw.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-rgb.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-rla.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-rle.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-scr.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-sct.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-sfw.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-sgi.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-stegano.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-sun.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-svg.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-tga.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-thumbnail.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-tiff.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-tile.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-tim.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-ttf.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-txt.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-uil.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-url.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-uyvy.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-vicar.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-vid.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-viff.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-wbmp.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-webp.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-wmf.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-wpg.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-x.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-xbm.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-xc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-xcf.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-xpm.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-xps.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-xwd.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-ycbcr.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/MagickCore_libMagickCore_la-yuv.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_aai_la-aai.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_art_la-art.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_avs_la-avs.Plo@am__quote@
@@ -7304,125 +7614,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_xwd_la-xwd.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_ycbcr_la-ycbcr.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/coders_yuv_la-yuv.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-aai.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-art.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-avs.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-bgr.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-bmp.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-braille.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-cals.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-caption.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-cin.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-cip.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-clip.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-clipboard.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-cmyk.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-cut.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-dcm.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-dds.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-debug.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-dib.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-djvu.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-dng.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-dot.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-dps.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-dpx.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-emf.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-ept.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-exr.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-fax.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-fits.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-fpx.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-gif.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-gradient.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-gray.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-hald.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-hdr.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-histogram.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-hrz.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-html.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-icon.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-info.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-inline.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-ipl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-jbig.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-jp2.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-jpeg.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-label.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-mac.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-magick.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-map.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-mat.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-matte.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-meta.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-miff.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-mono.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-mpc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-mpeg.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-mpr.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-msl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-mtv.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-mvg.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-null.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-otb.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-palm.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-pattern.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-pcd.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-pcl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-pcx.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-pdb.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-pdf.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-pes.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-pict.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-pix.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-plasma.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-png.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-pnm.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-preview.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-ps.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-ps2.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-ps3.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-psd.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-pwp.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-raw.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-rgb.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-rla.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-rle.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-scr.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-sct.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-sfw.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-sgi.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-stegano.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-sun.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-svg.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-tga.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-thumbnail.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-tiff.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-tile.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-tim.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-ttf.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-txt.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-uil.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-url.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-uyvy.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-vicar.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-vid.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-viff.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-wbmp.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-webp.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-wmf.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-wpg.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-x.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-xbm.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-xc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-xcf.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-xpm.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-xps.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-xwd.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-ycbcr.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@coders/$(DEPDIR)/magick_libMagickCore_la-yuv.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@filters/$(DEPDIR)/filters_analyze_la-analyze.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@filters/$(DEPDIR)/magick_libMagickCore_la-analyze.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@ltdl/$(DEPDIR)/ltdl_libltdl_la-lt__alloc.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@ltdl/$(DEPDIR)/ltdl_libltdl_la-lt_dlloader.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@ltdl/$(DEPDIR)/ltdl_libltdl_la-lt_error.Plo@am__quote@
@@ -7441,96 +7633,6 @@
@AMDEP_TRUE@@am__include@ @am__quote@ltdl/loaders/$(DEPDIR)/ltdl_libltdl_la-preopen.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@ltdl/loaders/$(DEPDIR)/ltdl_libltdlc_la-preopen.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@ltdl/loaders/$(DEPDIR)/shl_load.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-PreRvIcccm.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-accelerate.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-animate.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-annotate.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-artifact.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-attribute.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-blob.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-cache-view.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-cache.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-cipher.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-client.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-coder.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-color.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-colormap.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-colorspace.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-compare.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-composite.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-compress.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-configure.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-constitute.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-decorate.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-delegate.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-deprecate.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-display.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-distort.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-draw.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-effect.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-enhance.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-exception.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-feature.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-fourier.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-fx.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-gem.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-geometry.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-hashmap.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-histogram.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-identify.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-image-view.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-image.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-layer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-list.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-locale.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-log.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-magic.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-magick.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-matrix.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-memory.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-mime.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-module.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-monitor.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-montage.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-morphology.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-nt-base.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-nt-feature.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-option.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-paint.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-pixel.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-policy.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-prepress.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-profile.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-property.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-quantize.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-quantum-export.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-quantum-import.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-quantum.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-random.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-registry.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-resample.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-resize.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-resource.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-segment.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-semaphore.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-shear.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-signature.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-splay-tree.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-static.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-statistic.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-stream.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-string.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-thread.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-threshold.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-timer.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-token.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-transform.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-type.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-utility.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-version.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-widget.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-xml-tree.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@magick/$(DEPDIR)/magick_libMagickCore_la-xwindow.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/tests_validate-validate.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@utilities/$(DEPDIR)/animate.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@utilities/$(DEPDIR)/compare.Po@am__quote@
@@ -7543,28 +7645,6 @@
@AMDEP_TRUE@@am__include@ @am__quote@utilities/$(DEPDIR)/mogrify.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@utilities/$(DEPDIR)/montage.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@utilities/$(DEPDIR)/stream.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@wand/$(DEPDIR)/drawtest.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@wand/$(DEPDIR)/wand_libMagickWand_la-animate.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@wand/$(DEPDIR)/wand_libMagickWand_la-compare.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@wand/$(DEPDIR)/wand_libMagickWand_la-composite.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@wand/$(DEPDIR)/wand_libMagickWand_la-conjure.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@wand/$(DEPDIR)/wand_libMagickWand_la-convert.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@wand/$(DEPDIR)/wand_libMagickWand_la-deprecate.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@wand/$(DEPDIR)/wand_libMagickWand_la-display.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@wand/$(DEPDIR)/wand_libMagickWand_la-drawing-wand.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@wand/$(DEPDIR)/wand_libMagickWand_la-identify.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@wand/$(DEPDIR)/wand_libMagickWand_la-import.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@wand/$(DEPDIR)/wand_libMagickWand_la-magick-image.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@wand/$(DEPDIR)/wand_libMagickWand_la-magick-property.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@wand/$(DEPDIR)/wand_libMagickWand_la-magick-wand.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@wand/$(DEPDIR)/wand_libMagickWand_la-mogrify.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@wand/$(DEPDIR)/wand_libMagickWand_la-montage.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@wand/$(DEPDIR)/wand_libMagickWand_la-pixel-iterator.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@wand/$(DEPDIR)/wand_libMagickWand_la-pixel-wand.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@wand/$(DEPDIR)/wand_libMagickWand_la-stream.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@wand/$(DEPDIR)/wand_libMagickWand_la-wand-view.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@wand/$(DEPDIR)/wand_libMagickWand_la-wand.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@wand/$(DEPDIR)/wandtest.Po@am__quote@
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@@ -7593,6 +7673,1822 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
+MagickCore/MagickCore_libMagickCore_la-accelerate.lo: MagickCore/accelerate.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-accelerate.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-accelerate.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-accelerate.lo `test -f 'MagickCore/accelerate.c' || echo '$(srcdir)/'`MagickCore/accelerate.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-accelerate.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-accelerate.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/accelerate.c' object='MagickCore/MagickCore_libMagickCore_la-accelerate.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-accelerate.lo `test -f 'MagickCore/accelerate.c' || echo '$(srcdir)/'`MagickCore/accelerate.c
+
+MagickCore/MagickCore_libMagickCore_la-animate.lo: MagickCore/animate.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-animate.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-animate.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-animate.lo `test -f 'MagickCore/animate.c' || echo '$(srcdir)/'`MagickCore/animate.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-animate.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-animate.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/animate.c' object='MagickCore/MagickCore_libMagickCore_la-animate.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-animate.lo `test -f 'MagickCore/animate.c' || echo '$(srcdir)/'`MagickCore/animate.c
+
+MagickCore/MagickCore_libMagickCore_la-annotate.lo: MagickCore/annotate.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-annotate.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-annotate.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-annotate.lo `test -f 'MagickCore/annotate.c' || echo '$(srcdir)/'`MagickCore/annotate.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-annotate.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-annotate.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/annotate.c' object='MagickCore/MagickCore_libMagickCore_la-annotate.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-annotate.lo `test -f 'MagickCore/annotate.c' || echo '$(srcdir)/'`MagickCore/annotate.c
+
+MagickCore/MagickCore_libMagickCore_la-artifact.lo: MagickCore/artifact.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-artifact.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-artifact.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-artifact.lo `test -f 'MagickCore/artifact.c' || echo '$(srcdir)/'`MagickCore/artifact.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-artifact.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-artifact.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/artifact.c' object='MagickCore/MagickCore_libMagickCore_la-artifact.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-artifact.lo `test -f 'MagickCore/artifact.c' || echo '$(srcdir)/'`MagickCore/artifact.c
+
+MagickCore/MagickCore_libMagickCore_la-attribute.lo: MagickCore/attribute.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-attribute.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-attribute.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-attribute.lo `test -f 'MagickCore/attribute.c' || echo '$(srcdir)/'`MagickCore/attribute.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-attribute.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-attribute.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/attribute.c' object='MagickCore/MagickCore_libMagickCore_la-attribute.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-attribute.lo `test -f 'MagickCore/attribute.c' || echo '$(srcdir)/'`MagickCore/attribute.c
+
+MagickCore/MagickCore_libMagickCore_la-blob.lo: MagickCore/blob.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-blob.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-blob.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-blob.lo `test -f 'MagickCore/blob.c' || echo '$(srcdir)/'`MagickCore/blob.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-blob.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-blob.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/blob.c' object='MagickCore/MagickCore_libMagickCore_la-blob.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-blob.lo `test -f 'MagickCore/blob.c' || echo '$(srcdir)/'`MagickCore/blob.c
+
+MagickCore/MagickCore_libMagickCore_la-cache.lo: MagickCore/cache.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-cache.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-cache.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-cache.lo `test -f 'MagickCore/cache.c' || echo '$(srcdir)/'`MagickCore/cache.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-cache.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-cache.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/cache.c' object='MagickCore/MagickCore_libMagickCore_la-cache.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-cache.lo `test -f 'MagickCore/cache.c' || echo '$(srcdir)/'`MagickCore/cache.c
+
+MagickCore/MagickCore_libMagickCore_la-cache-view.lo: MagickCore/cache-view.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-cache-view.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-cache-view.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-cache-view.lo `test -f 'MagickCore/cache-view.c' || echo '$(srcdir)/'`MagickCore/cache-view.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-cache-view.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-cache-view.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/cache-view.c' object='MagickCore/MagickCore_libMagickCore_la-cache-view.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-cache-view.lo `test -f 'MagickCore/cache-view.c' || echo '$(srcdir)/'`MagickCore/cache-view.c
+
+MagickCore/MagickCore_libMagickCore_la-cipher.lo: MagickCore/cipher.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-cipher.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-cipher.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-cipher.lo `test -f 'MagickCore/cipher.c' || echo '$(srcdir)/'`MagickCore/cipher.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-cipher.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-cipher.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/cipher.c' object='MagickCore/MagickCore_libMagickCore_la-cipher.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-cipher.lo `test -f 'MagickCore/cipher.c' || echo '$(srcdir)/'`MagickCore/cipher.c
+
+MagickCore/MagickCore_libMagickCore_la-client.lo: MagickCore/client.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-client.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-client.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-client.lo `test -f 'MagickCore/client.c' || echo '$(srcdir)/'`MagickCore/client.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-client.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-client.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/client.c' object='MagickCore/MagickCore_libMagickCore_la-client.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-client.lo `test -f 'MagickCore/client.c' || echo '$(srcdir)/'`MagickCore/client.c
+
+MagickCore/MagickCore_libMagickCore_la-coder.lo: MagickCore/coder.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-coder.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-coder.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-coder.lo `test -f 'MagickCore/coder.c' || echo '$(srcdir)/'`MagickCore/coder.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-coder.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-coder.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/coder.c' object='MagickCore/MagickCore_libMagickCore_la-coder.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-coder.lo `test -f 'MagickCore/coder.c' || echo '$(srcdir)/'`MagickCore/coder.c
+
+MagickCore/MagickCore_libMagickCore_la-color.lo: MagickCore/color.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-color.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-color.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-color.lo `test -f 'MagickCore/color.c' || echo '$(srcdir)/'`MagickCore/color.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-color.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-color.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/color.c' object='MagickCore/MagickCore_libMagickCore_la-color.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-color.lo `test -f 'MagickCore/color.c' || echo '$(srcdir)/'`MagickCore/color.c
+
+MagickCore/MagickCore_libMagickCore_la-colormap.lo: MagickCore/colormap.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-colormap.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-colormap.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-colormap.lo `test -f 'MagickCore/colormap.c' || echo '$(srcdir)/'`MagickCore/colormap.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-colormap.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-colormap.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/colormap.c' object='MagickCore/MagickCore_libMagickCore_la-colormap.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-colormap.lo `test -f 'MagickCore/colormap.c' || echo '$(srcdir)/'`MagickCore/colormap.c
+
+MagickCore/MagickCore_libMagickCore_la-colorspace.lo: MagickCore/colorspace.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-colorspace.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-colorspace.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-colorspace.lo `test -f 'MagickCore/colorspace.c' || echo '$(srcdir)/'`MagickCore/colorspace.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-colorspace.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-colorspace.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/colorspace.c' object='MagickCore/MagickCore_libMagickCore_la-colorspace.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-colorspace.lo `test -f 'MagickCore/colorspace.c' || echo '$(srcdir)/'`MagickCore/colorspace.c
+
+MagickCore/MagickCore_libMagickCore_la-compare.lo: MagickCore/compare.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-compare.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-compare.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-compare.lo `test -f 'MagickCore/compare.c' || echo '$(srcdir)/'`MagickCore/compare.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-compare.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-compare.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/compare.c' object='MagickCore/MagickCore_libMagickCore_la-compare.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-compare.lo `test -f 'MagickCore/compare.c' || echo '$(srcdir)/'`MagickCore/compare.c
+
+MagickCore/MagickCore_libMagickCore_la-composite.lo: MagickCore/composite.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-composite.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-composite.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-composite.lo `test -f 'MagickCore/composite.c' || echo '$(srcdir)/'`MagickCore/composite.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-composite.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-composite.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/composite.c' object='MagickCore/MagickCore_libMagickCore_la-composite.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-composite.lo `test -f 'MagickCore/composite.c' || echo '$(srcdir)/'`MagickCore/composite.c
+
+MagickCore/MagickCore_libMagickCore_la-compress.lo: MagickCore/compress.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-compress.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-compress.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-compress.lo `test -f 'MagickCore/compress.c' || echo '$(srcdir)/'`MagickCore/compress.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-compress.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-compress.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/compress.c' object='MagickCore/MagickCore_libMagickCore_la-compress.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-compress.lo `test -f 'MagickCore/compress.c' || echo '$(srcdir)/'`MagickCore/compress.c
+
+MagickCore/MagickCore_libMagickCore_la-configure.lo: MagickCore/configure.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-configure.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-configure.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-configure.lo `test -f 'MagickCore/configure.c' || echo '$(srcdir)/'`MagickCore/configure.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-configure.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-configure.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/configure.c' object='MagickCore/MagickCore_libMagickCore_la-configure.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-configure.lo `test -f 'MagickCore/configure.c' || echo '$(srcdir)/'`MagickCore/configure.c
+
+MagickCore/MagickCore_libMagickCore_la-constitute.lo: MagickCore/constitute.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-constitute.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-constitute.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-constitute.lo `test -f 'MagickCore/constitute.c' || echo '$(srcdir)/'`MagickCore/constitute.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-constitute.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-constitute.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/constitute.c' object='MagickCore/MagickCore_libMagickCore_la-constitute.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-constitute.lo `test -f 'MagickCore/constitute.c' || echo '$(srcdir)/'`MagickCore/constitute.c
+
+MagickCore/MagickCore_libMagickCore_la-decorate.lo: MagickCore/decorate.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-decorate.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-decorate.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-decorate.lo `test -f 'MagickCore/decorate.c' || echo '$(srcdir)/'`MagickCore/decorate.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-decorate.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-decorate.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/decorate.c' object='MagickCore/MagickCore_libMagickCore_la-decorate.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-decorate.lo `test -f 'MagickCore/decorate.c' || echo '$(srcdir)/'`MagickCore/decorate.c
+
+MagickCore/MagickCore_libMagickCore_la-delegate.lo: MagickCore/delegate.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-delegate.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-delegate.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-delegate.lo `test -f 'MagickCore/delegate.c' || echo '$(srcdir)/'`MagickCore/delegate.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-delegate.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-delegate.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/delegate.c' object='MagickCore/MagickCore_libMagickCore_la-delegate.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-delegate.lo `test -f 'MagickCore/delegate.c' || echo '$(srcdir)/'`MagickCore/delegate.c
+
+MagickCore/MagickCore_libMagickCore_la-deprecate.lo: MagickCore/deprecate.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-deprecate.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-deprecate.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-deprecate.lo `test -f 'MagickCore/deprecate.c' || echo '$(srcdir)/'`MagickCore/deprecate.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-deprecate.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-deprecate.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/deprecate.c' object='MagickCore/MagickCore_libMagickCore_la-deprecate.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-deprecate.lo `test -f 'MagickCore/deprecate.c' || echo '$(srcdir)/'`MagickCore/deprecate.c
+
+MagickCore/MagickCore_libMagickCore_la-display.lo: MagickCore/display.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-display.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-display.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-display.lo `test -f 'MagickCore/display.c' || echo '$(srcdir)/'`MagickCore/display.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-display.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-display.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/display.c' object='MagickCore/MagickCore_libMagickCore_la-display.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-display.lo `test -f 'MagickCore/display.c' || echo '$(srcdir)/'`MagickCore/display.c
+
+MagickCore/MagickCore_libMagickCore_la-distort.lo: MagickCore/distort.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-distort.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-distort.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-distort.lo `test -f 'MagickCore/distort.c' || echo '$(srcdir)/'`MagickCore/distort.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-distort.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-distort.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/distort.c' object='MagickCore/MagickCore_libMagickCore_la-distort.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-distort.lo `test -f 'MagickCore/distort.c' || echo '$(srcdir)/'`MagickCore/distort.c
+
+MagickCore/MagickCore_libMagickCore_la-draw.lo: MagickCore/draw.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-draw.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-draw.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-draw.lo `test -f 'MagickCore/draw.c' || echo '$(srcdir)/'`MagickCore/draw.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-draw.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-draw.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/draw.c' object='MagickCore/MagickCore_libMagickCore_la-draw.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-draw.lo `test -f 'MagickCore/draw.c' || echo '$(srcdir)/'`MagickCore/draw.c
+
+MagickCore/MagickCore_libMagickCore_la-effect.lo: MagickCore/effect.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-effect.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-effect.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-effect.lo `test -f 'MagickCore/effect.c' || echo '$(srcdir)/'`MagickCore/effect.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-effect.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-effect.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/effect.c' object='MagickCore/MagickCore_libMagickCore_la-effect.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-effect.lo `test -f 'MagickCore/effect.c' || echo '$(srcdir)/'`MagickCore/effect.c
+
+MagickCore/MagickCore_libMagickCore_la-enhance.lo: MagickCore/enhance.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-enhance.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-enhance.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-enhance.lo `test -f 'MagickCore/enhance.c' || echo '$(srcdir)/'`MagickCore/enhance.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-enhance.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-enhance.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/enhance.c' object='MagickCore/MagickCore_libMagickCore_la-enhance.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-enhance.lo `test -f 'MagickCore/enhance.c' || echo '$(srcdir)/'`MagickCore/enhance.c
+
+MagickCore/MagickCore_libMagickCore_la-exception.lo: MagickCore/exception.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-exception.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-exception.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-exception.lo `test -f 'MagickCore/exception.c' || echo '$(srcdir)/'`MagickCore/exception.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-exception.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-exception.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/exception.c' object='MagickCore/MagickCore_libMagickCore_la-exception.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-exception.lo `test -f 'MagickCore/exception.c' || echo '$(srcdir)/'`MagickCore/exception.c
+
+MagickCore/MagickCore_libMagickCore_la-feature.lo: MagickCore/feature.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-feature.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-feature.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-feature.lo `test -f 'MagickCore/feature.c' || echo '$(srcdir)/'`MagickCore/feature.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-feature.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-feature.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/feature.c' object='MagickCore/MagickCore_libMagickCore_la-feature.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-feature.lo `test -f 'MagickCore/feature.c' || echo '$(srcdir)/'`MagickCore/feature.c
+
+MagickCore/MagickCore_libMagickCore_la-fourier.lo: MagickCore/fourier.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-fourier.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-fourier.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-fourier.lo `test -f 'MagickCore/fourier.c' || echo '$(srcdir)/'`MagickCore/fourier.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-fourier.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-fourier.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/fourier.c' object='MagickCore/MagickCore_libMagickCore_la-fourier.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-fourier.lo `test -f 'MagickCore/fourier.c' || echo '$(srcdir)/'`MagickCore/fourier.c
+
+MagickCore/MagickCore_libMagickCore_la-fx.lo: MagickCore/fx.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-fx.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-fx.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-fx.lo `test -f 'MagickCore/fx.c' || echo '$(srcdir)/'`MagickCore/fx.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-fx.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-fx.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/fx.c' object='MagickCore/MagickCore_libMagickCore_la-fx.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-fx.lo `test -f 'MagickCore/fx.c' || echo '$(srcdir)/'`MagickCore/fx.c
+
+MagickCore/MagickCore_libMagickCore_la-gem.lo: MagickCore/gem.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-gem.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-gem.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-gem.lo `test -f 'MagickCore/gem.c' || echo '$(srcdir)/'`MagickCore/gem.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-gem.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-gem.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/gem.c' object='MagickCore/MagickCore_libMagickCore_la-gem.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-gem.lo `test -f 'MagickCore/gem.c' || echo '$(srcdir)/'`MagickCore/gem.c
+
+MagickCore/MagickCore_libMagickCore_la-geometry.lo: MagickCore/geometry.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-geometry.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-geometry.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-geometry.lo `test -f 'MagickCore/geometry.c' || echo '$(srcdir)/'`MagickCore/geometry.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-geometry.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-geometry.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/geometry.c' object='MagickCore/MagickCore_libMagickCore_la-geometry.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-geometry.lo `test -f 'MagickCore/geometry.c' || echo '$(srcdir)/'`MagickCore/geometry.c
+
+MagickCore/MagickCore_libMagickCore_la-hashmap.lo: MagickCore/hashmap.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-hashmap.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-hashmap.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-hashmap.lo `test -f 'MagickCore/hashmap.c' || echo '$(srcdir)/'`MagickCore/hashmap.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-hashmap.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-hashmap.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/hashmap.c' object='MagickCore/MagickCore_libMagickCore_la-hashmap.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-hashmap.lo `test -f 'MagickCore/hashmap.c' || echo '$(srcdir)/'`MagickCore/hashmap.c
+
+MagickCore/MagickCore_libMagickCore_la-histogram.lo: MagickCore/histogram.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-histogram.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-histogram.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-histogram.lo `test -f 'MagickCore/histogram.c' || echo '$(srcdir)/'`MagickCore/histogram.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-histogram.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-histogram.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/histogram.c' object='MagickCore/MagickCore_libMagickCore_la-histogram.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-histogram.lo `test -f 'MagickCore/histogram.c' || echo '$(srcdir)/'`MagickCore/histogram.c
+
+MagickCore/MagickCore_libMagickCore_la-identify.lo: MagickCore/identify.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-identify.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-identify.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-identify.lo `test -f 'MagickCore/identify.c' || echo '$(srcdir)/'`MagickCore/identify.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-identify.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-identify.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/identify.c' object='MagickCore/MagickCore_libMagickCore_la-identify.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-identify.lo `test -f 'MagickCore/identify.c' || echo '$(srcdir)/'`MagickCore/identify.c
+
+MagickCore/MagickCore_libMagickCore_la-image.lo: MagickCore/image.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-image.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-image.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-image.lo `test -f 'MagickCore/image.c' || echo '$(srcdir)/'`MagickCore/image.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-image.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-image.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/image.c' object='MagickCore/MagickCore_libMagickCore_la-image.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-image.lo `test -f 'MagickCore/image.c' || echo '$(srcdir)/'`MagickCore/image.c
+
+MagickCore/MagickCore_libMagickCore_la-image-view.lo: MagickCore/image-view.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-image-view.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-image-view.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-image-view.lo `test -f 'MagickCore/image-view.c' || echo '$(srcdir)/'`MagickCore/image-view.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-image-view.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-image-view.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/image-view.c' object='MagickCore/MagickCore_libMagickCore_la-image-view.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-image-view.lo `test -f 'MagickCore/image-view.c' || echo '$(srcdir)/'`MagickCore/image-view.c
+
+MagickCore/MagickCore_libMagickCore_la-layer.lo: MagickCore/layer.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-layer.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-layer.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-layer.lo `test -f 'MagickCore/layer.c' || echo '$(srcdir)/'`MagickCore/layer.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-layer.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-layer.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/layer.c' object='MagickCore/MagickCore_libMagickCore_la-layer.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-layer.lo `test -f 'MagickCore/layer.c' || echo '$(srcdir)/'`MagickCore/layer.c
+
+MagickCore/MagickCore_libMagickCore_la-list.lo: MagickCore/list.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-list.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-list.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-list.lo `test -f 'MagickCore/list.c' || echo '$(srcdir)/'`MagickCore/list.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-list.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-list.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/list.c' object='MagickCore/MagickCore_libMagickCore_la-list.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-list.lo `test -f 'MagickCore/list.c' || echo '$(srcdir)/'`MagickCore/list.c
+
+MagickCore/MagickCore_libMagickCore_la-locale.lo: MagickCore/locale.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-locale.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-locale.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-locale.lo `test -f 'MagickCore/locale.c' || echo '$(srcdir)/'`MagickCore/locale.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-locale.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-locale.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/locale.c' object='MagickCore/MagickCore_libMagickCore_la-locale.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-locale.lo `test -f 'MagickCore/locale.c' || echo '$(srcdir)/'`MagickCore/locale.c
+
+MagickCore/MagickCore_libMagickCore_la-log.lo: MagickCore/log.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-log.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-log.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-log.lo `test -f 'MagickCore/log.c' || echo '$(srcdir)/'`MagickCore/log.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-log.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-log.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/log.c' object='MagickCore/MagickCore_libMagickCore_la-log.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-log.lo `test -f 'MagickCore/log.c' || echo '$(srcdir)/'`MagickCore/log.c
+
+MagickCore/MagickCore_libMagickCore_la-magic.lo: MagickCore/magic.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-magic.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-magic.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-magic.lo `test -f 'MagickCore/magic.c' || echo '$(srcdir)/'`MagickCore/magic.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-magic.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-magic.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/magic.c' object='MagickCore/MagickCore_libMagickCore_la-magic.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-magic.lo `test -f 'MagickCore/magic.c' || echo '$(srcdir)/'`MagickCore/magic.c
+
+MagickCore/MagickCore_libMagickCore_la-magick.lo: MagickCore/magick.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-magick.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-magick.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-magick.lo `test -f 'MagickCore/magick.c' || echo '$(srcdir)/'`MagickCore/magick.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-magick.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-magick.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/magick.c' object='MagickCore/MagickCore_libMagickCore_la-magick.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-magick.lo `test -f 'MagickCore/magick.c' || echo '$(srcdir)/'`MagickCore/magick.c
+
+MagickCore/MagickCore_libMagickCore_la-matrix.lo: MagickCore/matrix.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-matrix.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-matrix.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-matrix.lo `test -f 'MagickCore/matrix.c' || echo '$(srcdir)/'`MagickCore/matrix.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-matrix.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-matrix.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/matrix.c' object='MagickCore/MagickCore_libMagickCore_la-matrix.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-matrix.lo `test -f 'MagickCore/matrix.c' || echo '$(srcdir)/'`MagickCore/matrix.c
+
+MagickCore/MagickCore_libMagickCore_la-memory.lo: MagickCore/memory.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-memory.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-memory.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-memory.lo `test -f 'MagickCore/memory.c' || echo '$(srcdir)/'`MagickCore/memory.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-memory.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-memory.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/memory.c' object='MagickCore/MagickCore_libMagickCore_la-memory.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-memory.lo `test -f 'MagickCore/memory.c' || echo '$(srcdir)/'`MagickCore/memory.c
+
+MagickCore/MagickCore_libMagickCore_la-mime.lo: MagickCore/mime.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-mime.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-mime.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-mime.lo `test -f 'MagickCore/mime.c' || echo '$(srcdir)/'`MagickCore/mime.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-mime.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-mime.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/mime.c' object='MagickCore/MagickCore_libMagickCore_la-mime.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-mime.lo `test -f 'MagickCore/mime.c' || echo '$(srcdir)/'`MagickCore/mime.c
+
+MagickCore/MagickCore_libMagickCore_la-module.lo: MagickCore/module.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-module.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-module.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-module.lo `test -f 'MagickCore/module.c' || echo '$(srcdir)/'`MagickCore/module.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-module.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-module.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/module.c' object='MagickCore/MagickCore_libMagickCore_la-module.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-module.lo `test -f 'MagickCore/module.c' || echo '$(srcdir)/'`MagickCore/module.c
+
+MagickCore/MagickCore_libMagickCore_la-monitor.lo: MagickCore/monitor.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-monitor.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-monitor.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-monitor.lo `test -f 'MagickCore/monitor.c' || echo '$(srcdir)/'`MagickCore/monitor.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-monitor.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-monitor.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/monitor.c' object='MagickCore/MagickCore_libMagickCore_la-monitor.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-monitor.lo `test -f 'MagickCore/monitor.c' || echo '$(srcdir)/'`MagickCore/monitor.c
+
+MagickCore/MagickCore_libMagickCore_la-montage.lo: MagickCore/montage.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-montage.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-montage.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-montage.lo `test -f 'MagickCore/montage.c' || echo '$(srcdir)/'`MagickCore/montage.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-montage.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-montage.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/montage.c' object='MagickCore/MagickCore_libMagickCore_la-montage.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-montage.lo `test -f 'MagickCore/montage.c' || echo '$(srcdir)/'`MagickCore/montage.c
+
+MagickCore/MagickCore_libMagickCore_la-morphology.lo: MagickCore/morphology.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-morphology.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-morphology.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-morphology.lo `test -f 'MagickCore/morphology.c' || echo '$(srcdir)/'`MagickCore/morphology.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-morphology.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-morphology.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/morphology.c' object='MagickCore/MagickCore_libMagickCore_la-morphology.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-morphology.lo `test -f 'MagickCore/morphology.c' || echo '$(srcdir)/'`MagickCore/morphology.c
+
+MagickCore/MagickCore_libMagickCore_la-option.lo: MagickCore/option.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-option.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-option.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-option.lo `test -f 'MagickCore/option.c' || echo '$(srcdir)/'`MagickCore/option.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-option.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-option.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/option.c' object='MagickCore/MagickCore_libMagickCore_la-option.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-option.lo `test -f 'MagickCore/option.c' || echo '$(srcdir)/'`MagickCore/option.c
+
+MagickCore/MagickCore_libMagickCore_la-paint.lo: MagickCore/paint.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-paint.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-paint.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-paint.lo `test -f 'MagickCore/paint.c' || echo '$(srcdir)/'`MagickCore/paint.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-paint.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-paint.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/paint.c' object='MagickCore/MagickCore_libMagickCore_la-paint.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-paint.lo `test -f 'MagickCore/paint.c' || echo '$(srcdir)/'`MagickCore/paint.c
+
+MagickCore/MagickCore_libMagickCore_la-pixel.lo: MagickCore/pixel.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-pixel.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-pixel.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-pixel.lo `test -f 'MagickCore/pixel.c' || echo '$(srcdir)/'`MagickCore/pixel.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-pixel.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-pixel.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/pixel.c' object='MagickCore/MagickCore_libMagickCore_la-pixel.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-pixel.lo `test -f 'MagickCore/pixel.c' || echo '$(srcdir)/'`MagickCore/pixel.c
+
+MagickCore/MagickCore_libMagickCore_la-policy.lo: MagickCore/policy.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-policy.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-policy.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-policy.lo `test -f 'MagickCore/policy.c' || echo '$(srcdir)/'`MagickCore/policy.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-policy.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-policy.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/policy.c' object='MagickCore/MagickCore_libMagickCore_la-policy.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-policy.lo `test -f 'MagickCore/policy.c' || echo '$(srcdir)/'`MagickCore/policy.c
+
+MagickCore/MagickCore_libMagickCore_la-PreRvIcccm.lo: MagickCore/PreRvIcccm.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-PreRvIcccm.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-PreRvIcccm.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-PreRvIcccm.lo `test -f 'MagickCore/PreRvIcccm.c' || echo '$(srcdir)/'`MagickCore/PreRvIcccm.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-PreRvIcccm.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-PreRvIcccm.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/PreRvIcccm.c' object='MagickCore/MagickCore_libMagickCore_la-PreRvIcccm.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-PreRvIcccm.lo `test -f 'MagickCore/PreRvIcccm.c' || echo '$(srcdir)/'`MagickCore/PreRvIcccm.c
+
+MagickCore/MagickCore_libMagickCore_la-prepress.lo: MagickCore/prepress.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-prepress.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-prepress.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-prepress.lo `test -f 'MagickCore/prepress.c' || echo '$(srcdir)/'`MagickCore/prepress.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-prepress.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-prepress.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/prepress.c' object='MagickCore/MagickCore_libMagickCore_la-prepress.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-prepress.lo `test -f 'MagickCore/prepress.c' || echo '$(srcdir)/'`MagickCore/prepress.c
+
+MagickCore/MagickCore_libMagickCore_la-property.lo: MagickCore/property.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-property.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-property.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-property.lo `test -f 'MagickCore/property.c' || echo '$(srcdir)/'`MagickCore/property.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-property.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-property.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/property.c' object='MagickCore/MagickCore_libMagickCore_la-property.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-property.lo `test -f 'MagickCore/property.c' || echo '$(srcdir)/'`MagickCore/property.c
+
+MagickCore/MagickCore_libMagickCore_la-profile.lo: MagickCore/profile.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-profile.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-profile.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-profile.lo `test -f 'MagickCore/profile.c' || echo '$(srcdir)/'`MagickCore/profile.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-profile.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-profile.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/profile.c' object='MagickCore/MagickCore_libMagickCore_la-profile.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-profile.lo `test -f 'MagickCore/profile.c' || echo '$(srcdir)/'`MagickCore/profile.c
+
+MagickCore/MagickCore_libMagickCore_la-quantize.lo: MagickCore/quantize.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-quantize.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-quantize.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-quantize.lo `test -f 'MagickCore/quantize.c' || echo '$(srcdir)/'`MagickCore/quantize.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-quantize.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-quantize.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/quantize.c' object='MagickCore/MagickCore_libMagickCore_la-quantize.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-quantize.lo `test -f 'MagickCore/quantize.c' || echo '$(srcdir)/'`MagickCore/quantize.c
+
+MagickCore/MagickCore_libMagickCore_la-quantum.lo: MagickCore/quantum.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-quantum.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-quantum.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-quantum.lo `test -f 'MagickCore/quantum.c' || echo '$(srcdir)/'`MagickCore/quantum.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-quantum.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-quantum.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/quantum.c' object='MagickCore/MagickCore_libMagickCore_la-quantum.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-quantum.lo `test -f 'MagickCore/quantum.c' || echo '$(srcdir)/'`MagickCore/quantum.c
+
+MagickCore/MagickCore_libMagickCore_la-quantum-export.lo: MagickCore/quantum-export.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-quantum-export.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-quantum-export.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-quantum-export.lo `test -f 'MagickCore/quantum-export.c' || echo '$(srcdir)/'`MagickCore/quantum-export.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-quantum-export.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-quantum-export.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/quantum-export.c' object='MagickCore/MagickCore_libMagickCore_la-quantum-export.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-quantum-export.lo `test -f 'MagickCore/quantum-export.c' || echo '$(srcdir)/'`MagickCore/quantum-export.c
+
+MagickCore/MagickCore_libMagickCore_la-quantum-import.lo: MagickCore/quantum-import.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-quantum-import.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-quantum-import.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-quantum-import.lo `test -f 'MagickCore/quantum-import.c' || echo '$(srcdir)/'`MagickCore/quantum-import.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-quantum-import.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-quantum-import.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/quantum-import.c' object='MagickCore/MagickCore_libMagickCore_la-quantum-import.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-quantum-import.lo `test -f 'MagickCore/quantum-import.c' || echo '$(srcdir)/'`MagickCore/quantum-import.c
+
+MagickCore/MagickCore_libMagickCore_la-random.lo: MagickCore/random.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-random.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-random.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-random.lo `test -f 'MagickCore/random.c' || echo '$(srcdir)/'`MagickCore/random.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-random.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-random.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/random.c' object='MagickCore/MagickCore_libMagickCore_la-random.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-random.lo `test -f 'MagickCore/random.c' || echo '$(srcdir)/'`MagickCore/random.c
+
+MagickCore/MagickCore_libMagickCore_la-registry.lo: MagickCore/registry.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-registry.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-registry.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-registry.lo `test -f 'MagickCore/registry.c' || echo '$(srcdir)/'`MagickCore/registry.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-registry.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-registry.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/registry.c' object='MagickCore/MagickCore_libMagickCore_la-registry.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-registry.lo `test -f 'MagickCore/registry.c' || echo '$(srcdir)/'`MagickCore/registry.c
+
+MagickCore/MagickCore_libMagickCore_la-resample.lo: MagickCore/resample.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-resample.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-resample.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-resample.lo `test -f 'MagickCore/resample.c' || echo '$(srcdir)/'`MagickCore/resample.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-resample.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-resample.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/resample.c' object='MagickCore/MagickCore_libMagickCore_la-resample.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-resample.lo `test -f 'MagickCore/resample.c' || echo '$(srcdir)/'`MagickCore/resample.c
+
+MagickCore/MagickCore_libMagickCore_la-resize.lo: MagickCore/resize.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-resize.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-resize.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-resize.lo `test -f 'MagickCore/resize.c' || echo '$(srcdir)/'`MagickCore/resize.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-resize.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-resize.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/resize.c' object='MagickCore/MagickCore_libMagickCore_la-resize.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-resize.lo `test -f 'MagickCore/resize.c' || echo '$(srcdir)/'`MagickCore/resize.c
+
+MagickCore/MagickCore_libMagickCore_la-resource.lo: MagickCore/resource.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-resource.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-resource.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-resource.lo `test -f 'MagickCore/resource.c' || echo '$(srcdir)/'`MagickCore/resource.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-resource.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-resource.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/resource.c' object='MagickCore/MagickCore_libMagickCore_la-resource.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-resource.lo `test -f 'MagickCore/resource.c' || echo '$(srcdir)/'`MagickCore/resource.c
+
+MagickCore/MagickCore_libMagickCore_la-segment.lo: MagickCore/segment.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-segment.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-segment.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-segment.lo `test -f 'MagickCore/segment.c' || echo '$(srcdir)/'`MagickCore/segment.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-segment.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-segment.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/segment.c' object='MagickCore/MagickCore_libMagickCore_la-segment.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-segment.lo `test -f 'MagickCore/segment.c' || echo '$(srcdir)/'`MagickCore/segment.c
+
+MagickCore/MagickCore_libMagickCore_la-semaphore.lo: MagickCore/semaphore.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-semaphore.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-semaphore.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-semaphore.lo `test -f 'MagickCore/semaphore.c' || echo '$(srcdir)/'`MagickCore/semaphore.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-semaphore.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-semaphore.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/semaphore.c' object='MagickCore/MagickCore_libMagickCore_la-semaphore.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-semaphore.lo `test -f 'MagickCore/semaphore.c' || echo '$(srcdir)/'`MagickCore/semaphore.c
+
+MagickCore/MagickCore_libMagickCore_la-shear.lo: MagickCore/shear.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-shear.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-shear.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-shear.lo `test -f 'MagickCore/shear.c' || echo '$(srcdir)/'`MagickCore/shear.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-shear.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-shear.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/shear.c' object='MagickCore/MagickCore_libMagickCore_la-shear.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-shear.lo `test -f 'MagickCore/shear.c' || echo '$(srcdir)/'`MagickCore/shear.c
+
+MagickCore/MagickCore_libMagickCore_la-signature.lo: MagickCore/signature.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-signature.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-signature.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-signature.lo `test -f 'MagickCore/signature.c' || echo '$(srcdir)/'`MagickCore/signature.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-signature.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-signature.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/signature.c' object='MagickCore/MagickCore_libMagickCore_la-signature.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-signature.lo `test -f 'MagickCore/signature.c' || echo '$(srcdir)/'`MagickCore/signature.c
+
+MagickCore/MagickCore_libMagickCore_la-splay-tree.lo: MagickCore/splay-tree.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-splay-tree.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-splay-tree.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-splay-tree.lo `test -f 'MagickCore/splay-tree.c' || echo '$(srcdir)/'`MagickCore/splay-tree.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-splay-tree.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-splay-tree.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/splay-tree.c' object='MagickCore/MagickCore_libMagickCore_la-splay-tree.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-splay-tree.lo `test -f 'MagickCore/splay-tree.c' || echo '$(srcdir)/'`MagickCore/splay-tree.c
+
+MagickCore/MagickCore_libMagickCore_la-static.lo: MagickCore/static.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-static.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-static.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-static.lo `test -f 'MagickCore/static.c' || echo '$(srcdir)/'`MagickCore/static.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-static.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-static.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/static.c' object='MagickCore/MagickCore_libMagickCore_la-static.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-static.lo `test -f 'MagickCore/static.c' || echo '$(srcdir)/'`MagickCore/static.c
+
+MagickCore/MagickCore_libMagickCore_la-statistic.lo: MagickCore/statistic.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-statistic.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-statistic.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-statistic.lo `test -f 'MagickCore/statistic.c' || echo '$(srcdir)/'`MagickCore/statistic.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-statistic.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-statistic.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/statistic.c' object='MagickCore/MagickCore_libMagickCore_la-statistic.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-statistic.lo `test -f 'MagickCore/statistic.c' || echo '$(srcdir)/'`MagickCore/statistic.c
+
+MagickCore/MagickCore_libMagickCore_la-stream.lo: MagickCore/stream.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-stream.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-stream.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-stream.lo `test -f 'MagickCore/stream.c' || echo '$(srcdir)/'`MagickCore/stream.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-stream.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-stream.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/stream.c' object='MagickCore/MagickCore_libMagickCore_la-stream.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-stream.lo `test -f 'MagickCore/stream.c' || echo '$(srcdir)/'`MagickCore/stream.c
+
+MagickCore/MagickCore_libMagickCore_la-string.lo: MagickCore/string.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-string.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-string.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-string.lo `test -f 'MagickCore/string.c' || echo '$(srcdir)/'`MagickCore/string.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-string.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-string.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/string.c' object='MagickCore/MagickCore_libMagickCore_la-string.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-string.lo `test -f 'MagickCore/string.c' || echo '$(srcdir)/'`MagickCore/string.c
+
+MagickCore/MagickCore_libMagickCore_la-thread.lo: MagickCore/thread.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-thread.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-thread.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-thread.lo `test -f 'MagickCore/thread.c' || echo '$(srcdir)/'`MagickCore/thread.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-thread.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-thread.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/thread.c' object='MagickCore/MagickCore_libMagickCore_la-thread.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-thread.lo `test -f 'MagickCore/thread.c' || echo '$(srcdir)/'`MagickCore/thread.c
+
+MagickCore/MagickCore_libMagickCore_la-timer.lo: MagickCore/timer.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-timer.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-timer.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-timer.lo `test -f 'MagickCore/timer.c' || echo '$(srcdir)/'`MagickCore/timer.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-timer.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-timer.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/timer.c' object='MagickCore/MagickCore_libMagickCore_la-timer.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-timer.lo `test -f 'MagickCore/timer.c' || echo '$(srcdir)/'`MagickCore/timer.c
+
+MagickCore/MagickCore_libMagickCore_la-token.lo: MagickCore/token.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-token.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-token.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-token.lo `test -f 'MagickCore/token.c' || echo '$(srcdir)/'`MagickCore/token.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-token.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-token.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/token.c' object='MagickCore/MagickCore_libMagickCore_la-token.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-token.lo `test -f 'MagickCore/token.c' || echo '$(srcdir)/'`MagickCore/token.c
+
+MagickCore/MagickCore_libMagickCore_la-transform.lo: MagickCore/transform.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-transform.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-transform.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-transform.lo `test -f 'MagickCore/transform.c' || echo '$(srcdir)/'`MagickCore/transform.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-transform.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-transform.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/transform.c' object='MagickCore/MagickCore_libMagickCore_la-transform.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-transform.lo `test -f 'MagickCore/transform.c' || echo '$(srcdir)/'`MagickCore/transform.c
+
+MagickCore/MagickCore_libMagickCore_la-threshold.lo: MagickCore/threshold.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-threshold.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-threshold.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-threshold.lo `test -f 'MagickCore/threshold.c' || echo '$(srcdir)/'`MagickCore/threshold.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-threshold.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-threshold.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/threshold.c' object='MagickCore/MagickCore_libMagickCore_la-threshold.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-threshold.lo `test -f 'MagickCore/threshold.c' || echo '$(srcdir)/'`MagickCore/threshold.c
+
+MagickCore/MagickCore_libMagickCore_la-type.lo: MagickCore/type.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-type.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-type.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-type.lo `test -f 'MagickCore/type.c' || echo '$(srcdir)/'`MagickCore/type.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-type.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-type.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/type.c' object='MagickCore/MagickCore_libMagickCore_la-type.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-type.lo `test -f 'MagickCore/type.c' || echo '$(srcdir)/'`MagickCore/type.c
+
+MagickCore/MagickCore_libMagickCore_la-utility.lo: MagickCore/utility.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-utility.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-utility.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-utility.lo `test -f 'MagickCore/utility.c' || echo '$(srcdir)/'`MagickCore/utility.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-utility.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-utility.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/utility.c' object='MagickCore/MagickCore_libMagickCore_la-utility.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-utility.lo `test -f 'MagickCore/utility.c' || echo '$(srcdir)/'`MagickCore/utility.c
+
+MagickCore/MagickCore_libMagickCore_la-version.lo: MagickCore/version.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-version.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-version.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-version.lo `test -f 'MagickCore/version.c' || echo '$(srcdir)/'`MagickCore/version.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-version.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-version.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/version.c' object='MagickCore/MagickCore_libMagickCore_la-version.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-version.lo `test -f 'MagickCore/version.c' || echo '$(srcdir)/'`MagickCore/version.c
+
+MagickCore/MagickCore_libMagickCore_la-widget.lo: MagickCore/widget.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-widget.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-widget.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-widget.lo `test -f 'MagickCore/widget.c' || echo '$(srcdir)/'`MagickCore/widget.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-widget.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-widget.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/widget.c' object='MagickCore/MagickCore_libMagickCore_la-widget.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-widget.lo `test -f 'MagickCore/widget.c' || echo '$(srcdir)/'`MagickCore/widget.c
+
+MagickCore/MagickCore_libMagickCore_la-xml-tree.lo: MagickCore/xml-tree.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-xml-tree.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-xml-tree.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-xml-tree.lo `test -f 'MagickCore/xml-tree.c' || echo '$(srcdir)/'`MagickCore/xml-tree.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-xml-tree.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-xml-tree.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/xml-tree.c' object='MagickCore/MagickCore_libMagickCore_la-xml-tree.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-xml-tree.lo `test -f 'MagickCore/xml-tree.c' || echo '$(srcdir)/'`MagickCore/xml-tree.c
+
+MagickCore/MagickCore_libMagickCore_la-xwindow.lo: MagickCore/xwindow.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-xwindow.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-xwindow.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-xwindow.lo `test -f 'MagickCore/xwindow.c' || echo '$(srcdir)/'`MagickCore/xwindow.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-xwindow.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-xwindow.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/xwindow.c' object='MagickCore/MagickCore_libMagickCore_la-xwindow.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-xwindow.lo `test -f 'MagickCore/xwindow.c' || echo '$(srcdir)/'`MagickCore/xwindow.c
+
+MagickCore/MagickCore_libMagickCore_la-nt-feature.lo: MagickCore/nt-feature.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-nt-feature.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-nt-feature.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-nt-feature.lo `test -f 'MagickCore/nt-feature.c' || echo '$(srcdir)/'`MagickCore/nt-feature.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-nt-feature.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-nt-feature.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/nt-feature.c' object='MagickCore/MagickCore_libMagickCore_la-nt-feature.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-nt-feature.lo `test -f 'MagickCore/nt-feature.c' || echo '$(srcdir)/'`MagickCore/nt-feature.c
+
+MagickCore/MagickCore_libMagickCore_la-nt-base.lo: MagickCore/nt-base.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickCore/MagickCore_libMagickCore_la-nt-base.lo -MD -MP -MF MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-nt-base.Tpo -c -o MagickCore/MagickCore_libMagickCore_la-nt-base.lo `test -f 'MagickCore/nt-base.c' || echo '$(srcdir)/'`MagickCore/nt-base.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-nt-base.Tpo MagickCore/$(DEPDIR)/MagickCore_libMagickCore_la-nt-base.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickCore/nt-base.c' object='MagickCore/MagickCore_libMagickCore_la-nt-base.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickCore/MagickCore_libMagickCore_la-nt-base.lo `test -f 'MagickCore/nt-base.c' || echo '$(srcdir)/'`MagickCore/nt-base.c
+
+coders/MagickCore_libMagickCore_la-aai.lo: coders/aai.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-aai.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-aai.Tpo -c -o coders/MagickCore_libMagickCore_la-aai.lo `test -f 'coders/aai.c' || echo '$(srcdir)/'`coders/aai.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-aai.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-aai.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/aai.c' object='coders/MagickCore_libMagickCore_la-aai.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-aai.lo `test -f 'coders/aai.c' || echo '$(srcdir)/'`coders/aai.c
+
+coders/MagickCore_libMagickCore_la-art.lo: coders/art.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-art.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-art.Tpo -c -o coders/MagickCore_libMagickCore_la-art.lo `test -f 'coders/art.c' || echo '$(srcdir)/'`coders/art.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-art.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-art.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/art.c' object='coders/MagickCore_libMagickCore_la-art.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-art.lo `test -f 'coders/art.c' || echo '$(srcdir)/'`coders/art.c
+
+coders/MagickCore_libMagickCore_la-avs.lo: coders/avs.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-avs.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-avs.Tpo -c -o coders/MagickCore_libMagickCore_la-avs.lo `test -f 'coders/avs.c' || echo '$(srcdir)/'`coders/avs.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-avs.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-avs.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/avs.c' object='coders/MagickCore_libMagickCore_la-avs.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-avs.lo `test -f 'coders/avs.c' || echo '$(srcdir)/'`coders/avs.c
+
+coders/MagickCore_libMagickCore_la-bgr.lo: coders/bgr.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-bgr.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-bgr.Tpo -c -o coders/MagickCore_libMagickCore_la-bgr.lo `test -f 'coders/bgr.c' || echo '$(srcdir)/'`coders/bgr.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-bgr.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-bgr.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/bgr.c' object='coders/MagickCore_libMagickCore_la-bgr.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-bgr.lo `test -f 'coders/bgr.c' || echo '$(srcdir)/'`coders/bgr.c
+
+coders/MagickCore_libMagickCore_la-bmp.lo: coders/bmp.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-bmp.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-bmp.Tpo -c -o coders/MagickCore_libMagickCore_la-bmp.lo `test -f 'coders/bmp.c' || echo '$(srcdir)/'`coders/bmp.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-bmp.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-bmp.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/bmp.c' object='coders/MagickCore_libMagickCore_la-bmp.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-bmp.lo `test -f 'coders/bmp.c' || echo '$(srcdir)/'`coders/bmp.c
+
+coders/MagickCore_libMagickCore_la-braille.lo: coders/braille.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-braille.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-braille.Tpo -c -o coders/MagickCore_libMagickCore_la-braille.lo `test -f 'coders/braille.c' || echo '$(srcdir)/'`coders/braille.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-braille.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-braille.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/braille.c' object='coders/MagickCore_libMagickCore_la-braille.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-braille.lo `test -f 'coders/braille.c' || echo '$(srcdir)/'`coders/braille.c
+
+coders/MagickCore_libMagickCore_la-cals.lo: coders/cals.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-cals.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-cals.Tpo -c -o coders/MagickCore_libMagickCore_la-cals.lo `test -f 'coders/cals.c' || echo '$(srcdir)/'`coders/cals.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-cals.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-cals.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/cals.c' object='coders/MagickCore_libMagickCore_la-cals.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-cals.lo `test -f 'coders/cals.c' || echo '$(srcdir)/'`coders/cals.c
+
+coders/MagickCore_libMagickCore_la-caption.lo: coders/caption.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-caption.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-caption.Tpo -c -o coders/MagickCore_libMagickCore_la-caption.lo `test -f 'coders/caption.c' || echo '$(srcdir)/'`coders/caption.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-caption.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-caption.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/caption.c' object='coders/MagickCore_libMagickCore_la-caption.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-caption.lo `test -f 'coders/caption.c' || echo '$(srcdir)/'`coders/caption.c
+
+coders/MagickCore_libMagickCore_la-cin.lo: coders/cin.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-cin.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-cin.Tpo -c -o coders/MagickCore_libMagickCore_la-cin.lo `test -f 'coders/cin.c' || echo '$(srcdir)/'`coders/cin.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-cin.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-cin.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/cin.c' object='coders/MagickCore_libMagickCore_la-cin.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-cin.lo `test -f 'coders/cin.c' || echo '$(srcdir)/'`coders/cin.c
+
+coders/MagickCore_libMagickCore_la-cip.lo: coders/cip.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-cip.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-cip.Tpo -c -o coders/MagickCore_libMagickCore_la-cip.lo `test -f 'coders/cip.c' || echo '$(srcdir)/'`coders/cip.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-cip.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-cip.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/cip.c' object='coders/MagickCore_libMagickCore_la-cip.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-cip.lo `test -f 'coders/cip.c' || echo '$(srcdir)/'`coders/cip.c
+
+coders/MagickCore_libMagickCore_la-clip.lo: coders/clip.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-clip.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-clip.Tpo -c -o coders/MagickCore_libMagickCore_la-clip.lo `test -f 'coders/clip.c' || echo '$(srcdir)/'`coders/clip.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-clip.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-clip.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/clip.c' object='coders/MagickCore_libMagickCore_la-clip.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-clip.lo `test -f 'coders/clip.c' || echo '$(srcdir)/'`coders/clip.c
+
+coders/MagickCore_libMagickCore_la-cmyk.lo: coders/cmyk.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-cmyk.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-cmyk.Tpo -c -o coders/MagickCore_libMagickCore_la-cmyk.lo `test -f 'coders/cmyk.c' || echo '$(srcdir)/'`coders/cmyk.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-cmyk.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-cmyk.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/cmyk.c' object='coders/MagickCore_libMagickCore_la-cmyk.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-cmyk.lo `test -f 'coders/cmyk.c' || echo '$(srcdir)/'`coders/cmyk.c
+
+coders/MagickCore_libMagickCore_la-cut.lo: coders/cut.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-cut.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-cut.Tpo -c -o coders/MagickCore_libMagickCore_la-cut.lo `test -f 'coders/cut.c' || echo '$(srcdir)/'`coders/cut.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-cut.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-cut.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/cut.c' object='coders/MagickCore_libMagickCore_la-cut.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-cut.lo `test -f 'coders/cut.c' || echo '$(srcdir)/'`coders/cut.c
+
+coders/MagickCore_libMagickCore_la-dcm.lo: coders/dcm.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-dcm.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-dcm.Tpo -c -o coders/MagickCore_libMagickCore_la-dcm.lo `test -f 'coders/dcm.c' || echo '$(srcdir)/'`coders/dcm.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-dcm.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-dcm.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/dcm.c' object='coders/MagickCore_libMagickCore_la-dcm.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-dcm.lo `test -f 'coders/dcm.c' || echo '$(srcdir)/'`coders/dcm.c
+
+coders/MagickCore_libMagickCore_la-dds.lo: coders/dds.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-dds.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-dds.Tpo -c -o coders/MagickCore_libMagickCore_la-dds.lo `test -f 'coders/dds.c' || echo '$(srcdir)/'`coders/dds.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-dds.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-dds.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/dds.c' object='coders/MagickCore_libMagickCore_la-dds.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-dds.lo `test -f 'coders/dds.c' || echo '$(srcdir)/'`coders/dds.c
+
+coders/MagickCore_libMagickCore_la-debug.lo: coders/debug.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-debug.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-debug.Tpo -c -o coders/MagickCore_libMagickCore_la-debug.lo `test -f 'coders/debug.c' || echo '$(srcdir)/'`coders/debug.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-debug.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-debug.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/debug.c' object='coders/MagickCore_libMagickCore_la-debug.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-debug.lo `test -f 'coders/debug.c' || echo '$(srcdir)/'`coders/debug.c
+
+coders/MagickCore_libMagickCore_la-dib.lo: coders/dib.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-dib.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-dib.Tpo -c -o coders/MagickCore_libMagickCore_la-dib.lo `test -f 'coders/dib.c' || echo '$(srcdir)/'`coders/dib.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-dib.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-dib.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/dib.c' object='coders/MagickCore_libMagickCore_la-dib.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-dib.lo `test -f 'coders/dib.c' || echo '$(srcdir)/'`coders/dib.c
+
+coders/MagickCore_libMagickCore_la-dng.lo: coders/dng.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-dng.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-dng.Tpo -c -o coders/MagickCore_libMagickCore_la-dng.lo `test -f 'coders/dng.c' || echo '$(srcdir)/'`coders/dng.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-dng.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-dng.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/dng.c' object='coders/MagickCore_libMagickCore_la-dng.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-dng.lo `test -f 'coders/dng.c' || echo '$(srcdir)/'`coders/dng.c
+
+coders/MagickCore_libMagickCore_la-dot.lo: coders/dot.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-dot.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-dot.Tpo -c -o coders/MagickCore_libMagickCore_la-dot.lo `test -f 'coders/dot.c' || echo '$(srcdir)/'`coders/dot.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-dot.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-dot.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/dot.c' object='coders/MagickCore_libMagickCore_la-dot.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-dot.lo `test -f 'coders/dot.c' || echo '$(srcdir)/'`coders/dot.c
+
+coders/MagickCore_libMagickCore_la-dpx.lo: coders/dpx.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-dpx.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-dpx.Tpo -c -o coders/MagickCore_libMagickCore_la-dpx.lo `test -f 'coders/dpx.c' || echo '$(srcdir)/'`coders/dpx.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-dpx.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-dpx.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/dpx.c' object='coders/MagickCore_libMagickCore_la-dpx.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-dpx.lo `test -f 'coders/dpx.c' || echo '$(srcdir)/'`coders/dpx.c
+
+coders/MagickCore_libMagickCore_la-fax.lo: coders/fax.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-fax.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-fax.Tpo -c -o coders/MagickCore_libMagickCore_la-fax.lo `test -f 'coders/fax.c' || echo '$(srcdir)/'`coders/fax.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-fax.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-fax.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/fax.c' object='coders/MagickCore_libMagickCore_la-fax.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-fax.lo `test -f 'coders/fax.c' || echo '$(srcdir)/'`coders/fax.c
+
+coders/MagickCore_libMagickCore_la-fits.lo: coders/fits.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-fits.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-fits.Tpo -c -o coders/MagickCore_libMagickCore_la-fits.lo `test -f 'coders/fits.c' || echo '$(srcdir)/'`coders/fits.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-fits.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-fits.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/fits.c' object='coders/MagickCore_libMagickCore_la-fits.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-fits.lo `test -f 'coders/fits.c' || echo '$(srcdir)/'`coders/fits.c
+
+coders/MagickCore_libMagickCore_la-gif.lo: coders/gif.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-gif.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-gif.Tpo -c -o coders/MagickCore_libMagickCore_la-gif.lo `test -f 'coders/gif.c' || echo '$(srcdir)/'`coders/gif.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-gif.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-gif.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/gif.c' object='coders/MagickCore_libMagickCore_la-gif.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-gif.lo `test -f 'coders/gif.c' || echo '$(srcdir)/'`coders/gif.c
+
+coders/MagickCore_libMagickCore_la-gradient.lo: coders/gradient.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-gradient.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-gradient.Tpo -c -o coders/MagickCore_libMagickCore_la-gradient.lo `test -f 'coders/gradient.c' || echo '$(srcdir)/'`coders/gradient.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-gradient.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-gradient.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/gradient.c' object='coders/MagickCore_libMagickCore_la-gradient.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-gradient.lo `test -f 'coders/gradient.c' || echo '$(srcdir)/'`coders/gradient.c
+
+coders/MagickCore_libMagickCore_la-gray.lo: coders/gray.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-gray.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-gray.Tpo -c -o coders/MagickCore_libMagickCore_la-gray.lo `test -f 'coders/gray.c' || echo '$(srcdir)/'`coders/gray.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-gray.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-gray.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/gray.c' object='coders/MagickCore_libMagickCore_la-gray.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-gray.lo `test -f 'coders/gray.c' || echo '$(srcdir)/'`coders/gray.c
+
+coders/MagickCore_libMagickCore_la-hald.lo: coders/hald.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-hald.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-hald.Tpo -c -o coders/MagickCore_libMagickCore_la-hald.lo `test -f 'coders/hald.c' || echo '$(srcdir)/'`coders/hald.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-hald.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-hald.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/hald.c' object='coders/MagickCore_libMagickCore_la-hald.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-hald.lo `test -f 'coders/hald.c' || echo '$(srcdir)/'`coders/hald.c
+
+coders/MagickCore_libMagickCore_la-hdr.lo: coders/hdr.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-hdr.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-hdr.Tpo -c -o coders/MagickCore_libMagickCore_la-hdr.lo `test -f 'coders/hdr.c' || echo '$(srcdir)/'`coders/hdr.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-hdr.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-hdr.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/hdr.c' object='coders/MagickCore_libMagickCore_la-hdr.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-hdr.lo `test -f 'coders/hdr.c' || echo '$(srcdir)/'`coders/hdr.c
+
+coders/MagickCore_libMagickCore_la-histogram.lo: coders/histogram.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-histogram.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-histogram.Tpo -c -o coders/MagickCore_libMagickCore_la-histogram.lo `test -f 'coders/histogram.c' || echo '$(srcdir)/'`coders/histogram.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-histogram.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-histogram.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/histogram.c' object='coders/MagickCore_libMagickCore_la-histogram.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-histogram.lo `test -f 'coders/histogram.c' || echo '$(srcdir)/'`coders/histogram.c
+
+coders/MagickCore_libMagickCore_la-hrz.lo: coders/hrz.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-hrz.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-hrz.Tpo -c -o coders/MagickCore_libMagickCore_la-hrz.lo `test -f 'coders/hrz.c' || echo '$(srcdir)/'`coders/hrz.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-hrz.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-hrz.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/hrz.c' object='coders/MagickCore_libMagickCore_la-hrz.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-hrz.lo `test -f 'coders/hrz.c' || echo '$(srcdir)/'`coders/hrz.c
+
+coders/MagickCore_libMagickCore_la-html.lo: coders/html.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-html.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-html.Tpo -c -o coders/MagickCore_libMagickCore_la-html.lo `test -f 'coders/html.c' || echo '$(srcdir)/'`coders/html.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-html.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-html.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/html.c' object='coders/MagickCore_libMagickCore_la-html.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-html.lo `test -f 'coders/html.c' || echo '$(srcdir)/'`coders/html.c
+
+coders/MagickCore_libMagickCore_la-icon.lo: coders/icon.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-icon.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-icon.Tpo -c -o coders/MagickCore_libMagickCore_la-icon.lo `test -f 'coders/icon.c' || echo '$(srcdir)/'`coders/icon.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-icon.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-icon.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/icon.c' object='coders/MagickCore_libMagickCore_la-icon.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-icon.lo `test -f 'coders/icon.c' || echo '$(srcdir)/'`coders/icon.c
+
+coders/MagickCore_libMagickCore_la-info.lo: coders/info.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-info.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-info.Tpo -c -o coders/MagickCore_libMagickCore_la-info.lo `test -f 'coders/info.c' || echo '$(srcdir)/'`coders/info.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-info.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-info.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/info.c' object='coders/MagickCore_libMagickCore_la-info.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-info.lo `test -f 'coders/info.c' || echo '$(srcdir)/'`coders/info.c
+
+coders/MagickCore_libMagickCore_la-inline.lo: coders/inline.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-inline.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-inline.Tpo -c -o coders/MagickCore_libMagickCore_la-inline.lo `test -f 'coders/inline.c' || echo '$(srcdir)/'`coders/inline.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-inline.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-inline.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/inline.c' object='coders/MagickCore_libMagickCore_la-inline.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-inline.lo `test -f 'coders/inline.c' || echo '$(srcdir)/'`coders/inline.c
+
+coders/MagickCore_libMagickCore_la-ipl.lo: coders/ipl.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-ipl.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-ipl.Tpo -c -o coders/MagickCore_libMagickCore_la-ipl.lo `test -f 'coders/ipl.c' || echo '$(srcdir)/'`coders/ipl.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-ipl.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-ipl.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/ipl.c' object='coders/MagickCore_libMagickCore_la-ipl.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-ipl.lo `test -f 'coders/ipl.c' || echo '$(srcdir)/'`coders/ipl.c
+
+coders/MagickCore_libMagickCore_la-label.lo: coders/label.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-label.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-label.Tpo -c -o coders/MagickCore_libMagickCore_la-label.lo `test -f 'coders/label.c' || echo '$(srcdir)/'`coders/label.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-label.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-label.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/label.c' object='coders/MagickCore_libMagickCore_la-label.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-label.lo `test -f 'coders/label.c' || echo '$(srcdir)/'`coders/label.c
+
+coders/MagickCore_libMagickCore_la-mac.lo: coders/mac.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-mac.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-mac.Tpo -c -o coders/MagickCore_libMagickCore_la-mac.lo `test -f 'coders/mac.c' || echo '$(srcdir)/'`coders/mac.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-mac.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-mac.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/mac.c' object='coders/MagickCore_libMagickCore_la-mac.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-mac.lo `test -f 'coders/mac.c' || echo '$(srcdir)/'`coders/mac.c
+
+coders/MagickCore_libMagickCore_la-magick.lo: coders/magick.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-magick.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-magick.Tpo -c -o coders/MagickCore_libMagickCore_la-magick.lo `test -f 'coders/magick.c' || echo '$(srcdir)/'`coders/magick.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-magick.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-magick.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/magick.c' object='coders/MagickCore_libMagickCore_la-magick.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-magick.lo `test -f 'coders/magick.c' || echo '$(srcdir)/'`coders/magick.c
+
+coders/MagickCore_libMagickCore_la-map.lo: coders/map.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-map.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-map.Tpo -c -o coders/MagickCore_libMagickCore_la-map.lo `test -f 'coders/map.c' || echo '$(srcdir)/'`coders/map.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-map.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-map.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/map.c' object='coders/MagickCore_libMagickCore_la-map.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-map.lo `test -f 'coders/map.c' || echo '$(srcdir)/'`coders/map.c
+
+coders/MagickCore_libMagickCore_la-mat.lo: coders/mat.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-mat.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-mat.Tpo -c -o coders/MagickCore_libMagickCore_la-mat.lo `test -f 'coders/mat.c' || echo '$(srcdir)/'`coders/mat.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-mat.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-mat.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/mat.c' object='coders/MagickCore_libMagickCore_la-mat.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-mat.lo `test -f 'coders/mat.c' || echo '$(srcdir)/'`coders/mat.c
+
+coders/MagickCore_libMagickCore_la-matte.lo: coders/matte.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-matte.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-matte.Tpo -c -o coders/MagickCore_libMagickCore_la-matte.lo `test -f 'coders/matte.c' || echo '$(srcdir)/'`coders/matte.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-matte.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-matte.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/matte.c' object='coders/MagickCore_libMagickCore_la-matte.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-matte.lo `test -f 'coders/matte.c' || echo '$(srcdir)/'`coders/matte.c
+
+coders/MagickCore_libMagickCore_la-meta.lo: coders/meta.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-meta.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-meta.Tpo -c -o coders/MagickCore_libMagickCore_la-meta.lo `test -f 'coders/meta.c' || echo '$(srcdir)/'`coders/meta.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-meta.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-meta.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/meta.c' object='coders/MagickCore_libMagickCore_la-meta.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-meta.lo `test -f 'coders/meta.c' || echo '$(srcdir)/'`coders/meta.c
+
+coders/MagickCore_libMagickCore_la-miff.lo: coders/miff.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-miff.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-miff.Tpo -c -o coders/MagickCore_libMagickCore_la-miff.lo `test -f 'coders/miff.c' || echo '$(srcdir)/'`coders/miff.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-miff.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-miff.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/miff.c' object='coders/MagickCore_libMagickCore_la-miff.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-miff.lo `test -f 'coders/miff.c' || echo '$(srcdir)/'`coders/miff.c
+
+coders/MagickCore_libMagickCore_la-mono.lo: coders/mono.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-mono.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-mono.Tpo -c -o coders/MagickCore_libMagickCore_la-mono.lo `test -f 'coders/mono.c' || echo '$(srcdir)/'`coders/mono.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-mono.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-mono.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/mono.c' object='coders/MagickCore_libMagickCore_la-mono.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-mono.lo `test -f 'coders/mono.c' || echo '$(srcdir)/'`coders/mono.c
+
+coders/MagickCore_libMagickCore_la-mpc.lo: coders/mpc.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-mpc.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-mpc.Tpo -c -o coders/MagickCore_libMagickCore_la-mpc.lo `test -f 'coders/mpc.c' || echo '$(srcdir)/'`coders/mpc.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-mpc.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-mpc.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/mpc.c' object='coders/MagickCore_libMagickCore_la-mpc.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-mpc.lo `test -f 'coders/mpc.c' || echo '$(srcdir)/'`coders/mpc.c
+
+coders/MagickCore_libMagickCore_la-mpeg.lo: coders/mpeg.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-mpeg.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-mpeg.Tpo -c -o coders/MagickCore_libMagickCore_la-mpeg.lo `test -f 'coders/mpeg.c' || echo '$(srcdir)/'`coders/mpeg.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-mpeg.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-mpeg.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/mpeg.c' object='coders/MagickCore_libMagickCore_la-mpeg.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-mpeg.lo `test -f 'coders/mpeg.c' || echo '$(srcdir)/'`coders/mpeg.c
+
+coders/MagickCore_libMagickCore_la-mpr.lo: coders/mpr.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-mpr.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-mpr.Tpo -c -o coders/MagickCore_libMagickCore_la-mpr.lo `test -f 'coders/mpr.c' || echo '$(srcdir)/'`coders/mpr.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-mpr.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-mpr.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/mpr.c' object='coders/MagickCore_libMagickCore_la-mpr.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-mpr.lo `test -f 'coders/mpr.c' || echo '$(srcdir)/'`coders/mpr.c
+
+coders/MagickCore_libMagickCore_la-msl.lo: coders/msl.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-msl.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-msl.Tpo -c -o coders/MagickCore_libMagickCore_la-msl.lo `test -f 'coders/msl.c' || echo '$(srcdir)/'`coders/msl.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-msl.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-msl.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/msl.c' object='coders/MagickCore_libMagickCore_la-msl.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-msl.lo `test -f 'coders/msl.c' || echo '$(srcdir)/'`coders/msl.c
+
+coders/MagickCore_libMagickCore_la-mtv.lo: coders/mtv.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-mtv.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-mtv.Tpo -c -o coders/MagickCore_libMagickCore_la-mtv.lo `test -f 'coders/mtv.c' || echo '$(srcdir)/'`coders/mtv.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-mtv.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-mtv.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/mtv.c' object='coders/MagickCore_libMagickCore_la-mtv.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-mtv.lo `test -f 'coders/mtv.c' || echo '$(srcdir)/'`coders/mtv.c
+
+coders/MagickCore_libMagickCore_la-mvg.lo: coders/mvg.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-mvg.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-mvg.Tpo -c -o coders/MagickCore_libMagickCore_la-mvg.lo `test -f 'coders/mvg.c' || echo '$(srcdir)/'`coders/mvg.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-mvg.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-mvg.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/mvg.c' object='coders/MagickCore_libMagickCore_la-mvg.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-mvg.lo `test -f 'coders/mvg.c' || echo '$(srcdir)/'`coders/mvg.c
+
+coders/MagickCore_libMagickCore_la-null.lo: coders/null.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-null.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-null.Tpo -c -o coders/MagickCore_libMagickCore_la-null.lo `test -f 'coders/null.c' || echo '$(srcdir)/'`coders/null.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-null.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-null.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/null.c' object='coders/MagickCore_libMagickCore_la-null.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-null.lo `test -f 'coders/null.c' || echo '$(srcdir)/'`coders/null.c
+
+coders/MagickCore_libMagickCore_la-otb.lo: coders/otb.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-otb.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-otb.Tpo -c -o coders/MagickCore_libMagickCore_la-otb.lo `test -f 'coders/otb.c' || echo '$(srcdir)/'`coders/otb.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-otb.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-otb.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/otb.c' object='coders/MagickCore_libMagickCore_la-otb.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-otb.lo `test -f 'coders/otb.c' || echo '$(srcdir)/'`coders/otb.c
+
+coders/MagickCore_libMagickCore_la-palm.lo: coders/palm.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-palm.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-palm.Tpo -c -o coders/MagickCore_libMagickCore_la-palm.lo `test -f 'coders/palm.c' || echo '$(srcdir)/'`coders/palm.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-palm.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-palm.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/palm.c' object='coders/MagickCore_libMagickCore_la-palm.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-palm.lo `test -f 'coders/palm.c' || echo '$(srcdir)/'`coders/palm.c
+
+coders/MagickCore_libMagickCore_la-pattern.lo: coders/pattern.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-pattern.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-pattern.Tpo -c -o coders/MagickCore_libMagickCore_la-pattern.lo `test -f 'coders/pattern.c' || echo '$(srcdir)/'`coders/pattern.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-pattern.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-pattern.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/pattern.c' object='coders/MagickCore_libMagickCore_la-pattern.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-pattern.lo `test -f 'coders/pattern.c' || echo '$(srcdir)/'`coders/pattern.c
+
+coders/MagickCore_libMagickCore_la-pcd.lo: coders/pcd.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-pcd.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-pcd.Tpo -c -o coders/MagickCore_libMagickCore_la-pcd.lo `test -f 'coders/pcd.c' || echo '$(srcdir)/'`coders/pcd.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-pcd.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-pcd.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/pcd.c' object='coders/MagickCore_libMagickCore_la-pcd.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-pcd.lo `test -f 'coders/pcd.c' || echo '$(srcdir)/'`coders/pcd.c
+
+coders/MagickCore_libMagickCore_la-pcl.lo: coders/pcl.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-pcl.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-pcl.Tpo -c -o coders/MagickCore_libMagickCore_la-pcl.lo `test -f 'coders/pcl.c' || echo '$(srcdir)/'`coders/pcl.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-pcl.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-pcl.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/pcl.c' object='coders/MagickCore_libMagickCore_la-pcl.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-pcl.lo `test -f 'coders/pcl.c' || echo '$(srcdir)/'`coders/pcl.c
+
+coders/MagickCore_libMagickCore_la-pcx.lo: coders/pcx.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-pcx.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-pcx.Tpo -c -o coders/MagickCore_libMagickCore_la-pcx.lo `test -f 'coders/pcx.c' || echo '$(srcdir)/'`coders/pcx.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-pcx.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-pcx.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/pcx.c' object='coders/MagickCore_libMagickCore_la-pcx.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-pcx.lo `test -f 'coders/pcx.c' || echo '$(srcdir)/'`coders/pcx.c
+
+coders/MagickCore_libMagickCore_la-pdb.lo: coders/pdb.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-pdb.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-pdb.Tpo -c -o coders/MagickCore_libMagickCore_la-pdb.lo `test -f 'coders/pdb.c' || echo '$(srcdir)/'`coders/pdb.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-pdb.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-pdb.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/pdb.c' object='coders/MagickCore_libMagickCore_la-pdb.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-pdb.lo `test -f 'coders/pdb.c' || echo '$(srcdir)/'`coders/pdb.c
+
+coders/MagickCore_libMagickCore_la-pdf.lo: coders/pdf.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-pdf.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-pdf.Tpo -c -o coders/MagickCore_libMagickCore_la-pdf.lo `test -f 'coders/pdf.c' || echo '$(srcdir)/'`coders/pdf.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-pdf.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-pdf.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/pdf.c' object='coders/MagickCore_libMagickCore_la-pdf.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-pdf.lo `test -f 'coders/pdf.c' || echo '$(srcdir)/'`coders/pdf.c
+
+coders/MagickCore_libMagickCore_la-pes.lo: coders/pes.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-pes.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-pes.Tpo -c -o coders/MagickCore_libMagickCore_la-pes.lo `test -f 'coders/pes.c' || echo '$(srcdir)/'`coders/pes.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-pes.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-pes.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/pes.c' object='coders/MagickCore_libMagickCore_la-pes.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-pes.lo `test -f 'coders/pes.c' || echo '$(srcdir)/'`coders/pes.c
+
+coders/MagickCore_libMagickCore_la-pict.lo: coders/pict.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-pict.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-pict.Tpo -c -o coders/MagickCore_libMagickCore_la-pict.lo `test -f 'coders/pict.c' || echo '$(srcdir)/'`coders/pict.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-pict.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-pict.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/pict.c' object='coders/MagickCore_libMagickCore_la-pict.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-pict.lo `test -f 'coders/pict.c' || echo '$(srcdir)/'`coders/pict.c
+
+coders/MagickCore_libMagickCore_la-pix.lo: coders/pix.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-pix.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-pix.Tpo -c -o coders/MagickCore_libMagickCore_la-pix.lo `test -f 'coders/pix.c' || echo '$(srcdir)/'`coders/pix.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-pix.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-pix.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/pix.c' object='coders/MagickCore_libMagickCore_la-pix.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-pix.lo `test -f 'coders/pix.c' || echo '$(srcdir)/'`coders/pix.c
+
+coders/MagickCore_libMagickCore_la-plasma.lo: coders/plasma.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-plasma.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-plasma.Tpo -c -o coders/MagickCore_libMagickCore_la-plasma.lo `test -f 'coders/plasma.c' || echo '$(srcdir)/'`coders/plasma.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-plasma.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-plasma.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/plasma.c' object='coders/MagickCore_libMagickCore_la-plasma.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-plasma.lo `test -f 'coders/plasma.c' || echo '$(srcdir)/'`coders/plasma.c
+
+coders/MagickCore_libMagickCore_la-pnm.lo: coders/pnm.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-pnm.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-pnm.Tpo -c -o coders/MagickCore_libMagickCore_la-pnm.lo `test -f 'coders/pnm.c' || echo '$(srcdir)/'`coders/pnm.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-pnm.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-pnm.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/pnm.c' object='coders/MagickCore_libMagickCore_la-pnm.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-pnm.lo `test -f 'coders/pnm.c' || echo '$(srcdir)/'`coders/pnm.c
+
+coders/MagickCore_libMagickCore_la-preview.lo: coders/preview.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-preview.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-preview.Tpo -c -o coders/MagickCore_libMagickCore_la-preview.lo `test -f 'coders/preview.c' || echo '$(srcdir)/'`coders/preview.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-preview.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-preview.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/preview.c' object='coders/MagickCore_libMagickCore_la-preview.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-preview.lo `test -f 'coders/preview.c' || echo '$(srcdir)/'`coders/preview.c
+
+coders/MagickCore_libMagickCore_la-ps.lo: coders/ps.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-ps.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-ps.Tpo -c -o coders/MagickCore_libMagickCore_la-ps.lo `test -f 'coders/ps.c' || echo '$(srcdir)/'`coders/ps.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-ps.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-ps.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/ps.c' object='coders/MagickCore_libMagickCore_la-ps.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-ps.lo `test -f 'coders/ps.c' || echo '$(srcdir)/'`coders/ps.c
+
+coders/MagickCore_libMagickCore_la-ps2.lo: coders/ps2.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-ps2.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-ps2.Tpo -c -o coders/MagickCore_libMagickCore_la-ps2.lo `test -f 'coders/ps2.c' || echo '$(srcdir)/'`coders/ps2.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-ps2.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-ps2.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/ps2.c' object='coders/MagickCore_libMagickCore_la-ps2.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-ps2.lo `test -f 'coders/ps2.c' || echo '$(srcdir)/'`coders/ps2.c
+
+coders/MagickCore_libMagickCore_la-ps3.lo: coders/ps3.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-ps3.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-ps3.Tpo -c -o coders/MagickCore_libMagickCore_la-ps3.lo `test -f 'coders/ps3.c' || echo '$(srcdir)/'`coders/ps3.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-ps3.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-ps3.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/ps3.c' object='coders/MagickCore_libMagickCore_la-ps3.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-ps3.lo `test -f 'coders/ps3.c' || echo '$(srcdir)/'`coders/ps3.c
+
+coders/MagickCore_libMagickCore_la-psd.lo: coders/psd.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-psd.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-psd.Tpo -c -o coders/MagickCore_libMagickCore_la-psd.lo `test -f 'coders/psd.c' || echo '$(srcdir)/'`coders/psd.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-psd.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-psd.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/psd.c' object='coders/MagickCore_libMagickCore_la-psd.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-psd.lo `test -f 'coders/psd.c' || echo '$(srcdir)/'`coders/psd.c
+
+coders/MagickCore_libMagickCore_la-pwp.lo: coders/pwp.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-pwp.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-pwp.Tpo -c -o coders/MagickCore_libMagickCore_la-pwp.lo `test -f 'coders/pwp.c' || echo '$(srcdir)/'`coders/pwp.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-pwp.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-pwp.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/pwp.c' object='coders/MagickCore_libMagickCore_la-pwp.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-pwp.lo `test -f 'coders/pwp.c' || echo '$(srcdir)/'`coders/pwp.c
+
+coders/MagickCore_libMagickCore_la-raw.lo: coders/raw.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-raw.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-raw.Tpo -c -o coders/MagickCore_libMagickCore_la-raw.lo `test -f 'coders/raw.c' || echo '$(srcdir)/'`coders/raw.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-raw.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-raw.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/raw.c' object='coders/MagickCore_libMagickCore_la-raw.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-raw.lo `test -f 'coders/raw.c' || echo '$(srcdir)/'`coders/raw.c
+
+coders/MagickCore_libMagickCore_la-rgb.lo: coders/rgb.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-rgb.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-rgb.Tpo -c -o coders/MagickCore_libMagickCore_la-rgb.lo `test -f 'coders/rgb.c' || echo '$(srcdir)/'`coders/rgb.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-rgb.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-rgb.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/rgb.c' object='coders/MagickCore_libMagickCore_la-rgb.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-rgb.lo `test -f 'coders/rgb.c' || echo '$(srcdir)/'`coders/rgb.c
+
+coders/MagickCore_libMagickCore_la-rla.lo: coders/rla.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-rla.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-rla.Tpo -c -o coders/MagickCore_libMagickCore_la-rla.lo `test -f 'coders/rla.c' || echo '$(srcdir)/'`coders/rla.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-rla.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-rla.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/rla.c' object='coders/MagickCore_libMagickCore_la-rla.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-rla.lo `test -f 'coders/rla.c' || echo '$(srcdir)/'`coders/rla.c
+
+coders/MagickCore_libMagickCore_la-rle.lo: coders/rle.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-rle.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-rle.Tpo -c -o coders/MagickCore_libMagickCore_la-rle.lo `test -f 'coders/rle.c' || echo '$(srcdir)/'`coders/rle.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-rle.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-rle.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/rle.c' object='coders/MagickCore_libMagickCore_la-rle.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-rle.lo `test -f 'coders/rle.c' || echo '$(srcdir)/'`coders/rle.c
+
+coders/MagickCore_libMagickCore_la-scr.lo: coders/scr.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-scr.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-scr.Tpo -c -o coders/MagickCore_libMagickCore_la-scr.lo `test -f 'coders/scr.c' || echo '$(srcdir)/'`coders/scr.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-scr.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-scr.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/scr.c' object='coders/MagickCore_libMagickCore_la-scr.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-scr.lo `test -f 'coders/scr.c' || echo '$(srcdir)/'`coders/scr.c
+
+coders/MagickCore_libMagickCore_la-sct.lo: coders/sct.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-sct.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-sct.Tpo -c -o coders/MagickCore_libMagickCore_la-sct.lo `test -f 'coders/sct.c' || echo '$(srcdir)/'`coders/sct.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-sct.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-sct.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/sct.c' object='coders/MagickCore_libMagickCore_la-sct.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-sct.lo `test -f 'coders/sct.c' || echo '$(srcdir)/'`coders/sct.c
+
+coders/MagickCore_libMagickCore_la-sfw.lo: coders/sfw.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-sfw.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-sfw.Tpo -c -o coders/MagickCore_libMagickCore_la-sfw.lo `test -f 'coders/sfw.c' || echo '$(srcdir)/'`coders/sfw.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-sfw.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-sfw.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/sfw.c' object='coders/MagickCore_libMagickCore_la-sfw.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-sfw.lo `test -f 'coders/sfw.c' || echo '$(srcdir)/'`coders/sfw.c
+
+coders/MagickCore_libMagickCore_la-sgi.lo: coders/sgi.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-sgi.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-sgi.Tpo -c -o coders/MagickCore_libMagickCore_la-sgi.lo `test -f 'coders/sgi.c' || echo '$(srcdir)/'`coders/sgi.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-sgi.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-sgi.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/sgi.c' object='coders/MagickCore_libMagickCore_la-sgi.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-sgi.lo `test -f 'coders/sgi.c' || echo '$(srcdir)/'`coders/sgi.c
+
+coders/MagickCore_libMagickCore_la-stegano.lo: coders/stegano.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-stegano.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-stegano.Tpo -c -o coders/MagickCore_libMagickCore_la-stegano.lo `test -f 'coders/stegano.c' || echo '$(srcdir)/'`coders/stegano.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-stegano.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-stegano.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/stegano.c' object='coders/MagickCore_libMagickCore_la-stegano.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-stegano.lo `test -f 'coders/stegano.c' || echo '$(srcdir)/'`coders/stegano.c
+
+coders/MagickCore_libMagickCore_la-sun.lo: coders/sun.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-sun.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-sun.Tpo -c -o coders/MagickCore_libMagickCore_la-sun.lo `test -f 'coders/sun.c' || echo '$(srcdir)/'`coders/sun.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-sun.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-sun.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/sun.c' object='coders/MagickCore_libMagickCore_la-sun.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-sun.lo `test -f 'coders/sun.c' || echo '$(srcdir)/'`coders/sun.c
+
+coders/MagickCore_libMagickCore_la-svg.lo: coders/svg.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-svg.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-svg.Tpo -c -o coders/MagickCore_libMagickCore_la-svg.lo `test -f 'coders/svg.c' || echo '$(srcdir)/'`coders/svg.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-svg.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-svg.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/svg.c' object='coders/MagickCore_libMagickCore_la-svg.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-svg.lo `test -f 'coders/svg.c' || echo '$(srcdir)/'`coders/svg.c
+
+coders/MagickCore_libMagickCore_la-tga.lo: coders/tga.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-tga.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-tga.Tpo -c -o coders/MagickCore_libMagickCore_la-tga.lo `test -f 'coders/tga.c' || echo '$(srcdir)/'`coders/tga.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-tga.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-tga.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/tga.c' object='coders/MagickCore_libMagickCore_la-tga.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-tga.lo `test -f 'coders/tga.c' || echo '$(srcdir)/'`coders/tga.c
+
+coders/MagickCore_libMagickCore_la-thumbnail.lo: coders/thumbnail.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-thumbnail.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-thumbnail.Tpo -c -o coders/MagickCore_libMagickCore_la-thumbnail.lo `test -f 'coders/thumbnail.c' || echo '$(srcdir)/'`coders/thumbnail.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-thumbnail.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-thumbnail.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/thumbnail.c' object='coders/MagickCore_libMagickCore_la-thumbnail.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-thumbnail.lo `test -f 'coders/thumbnail.c' || echo '$(srcdir)/'`coders/thumbnail.c
+
+coders/MagickCore_libMagickCore_la-tile.lo: coders/tile.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-tile.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-tile.Tpo -c -o coders/MagickCore_libMagickCore_la-tile.lo `test -f 'coders/tile.c' || echo '$(srcdir)/'`coders/tile.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-tile.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-tile.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/tile.c' object='coders/MagickCore_libMagickCore_la-tile.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-tile.lo `test -f 'coders/tile.c' || echo '$(srcdir)/'`coders/tile.c
+
+coders/MagickCore_libMagickCore_la-tim.lo: coders/tim.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-tim.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-tim.Tpo -c -o coders/MagickCore_libMagickCore_la-tim.lo `test -f 'coders/tim.c' || echo '$(srcdir)/'`coders/tim.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-tim.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-tim.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/tim.c' object='coders/MagickCore_libMagickCore_la-tim.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-tim.lo `test -f 'coders/tim.c' || echo '$(srcdir)/'`coders/tim.c
+
+coders/MagickCore_libMagickCore_la-ttf.lo: coders/ttf.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-ttf.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-ttf.Tpo -c -o coders/MagickCore_libMagickCore_la-ttf.lo `test -f 'coders/ttf.c' || echo '$(srcdir)/'`coders/ttf.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-ttf.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-ttf.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/ttf.c' object='coders/MagickCore_libMagickCore_la-ttf.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-ttf.lo `test -f 'coders/ttf.c' || echo '$(srcdir)/'`coders/ttf.c
+
+coders/MagickCore_libMagickCore_la-txt.lo: coders/txt.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-txt.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-txt.Tpo -c -o coders/MagickCore_libMagickCore_la-txt.lo `test -f 'coders/txt.c' || echo '$(srcdir)/'`coders/txt.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-txt.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-txt.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/txt.c' object='coders/MagickCore_libMagickCore_la-txt.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-txt.lo `test -f 'coders/txt.c' || echo '$(srcdir)/'`coders/txt.c
+
+coders/MagickCore_libMagickCore_la-uil.lo: coders/uil.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-uil.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-uil.Tpo -c -o coders/MagickCore_libMagickCore_la-uil.lo `test -f 'coders/uil.c' || echo '$(srcdir)/'`coders/uil.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-uil.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-uil.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/uil.c' object='coders/MagickCore_libMagickCore_la-uil.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-uil.lo `test -f 'coders/uil.c' || echo '$(srcdir)/'`coders/uil.c
+
+coders/MagickCore_libMagickCore_la-url.lo: coders/url.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-url.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-url.Tpo -c -o coders/MagickCore_libMagickCore_la-url.lo `test -f 'coders/url.c' || echo '$(srcdir)/'`coders/url.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-url.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-url.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/url.c' object='coders/MagickCore_libMagickCore_la-url.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-url.lo `test -f 'coders/url.c' || echo '$(srcdir)/'`coders/url.c
+
+coders/MagickCore_libMagickCore_la-uyvy.lo: coders/uyvy.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-uyvy.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-uyvy.Tpo -c -o coders/MagickCore_libMagickCore_la-uyvy.lo `test -f 'coders/uyvy.c' || echo '$(srcdir)/'`coders/uyvy.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-uyvy.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-uyvy.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/uyvy.c' object='coders/MagickCore_libMagickCore_la-uyvy.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-uyvy.lo `test -f 'coders/uyvy.c' || echo '$(srcdir)/'`coders/uyvy.c
+
+coders/MagickCore_libMagickCore_la-vicar.lo: coders/vicar.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-vicar.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-vicar.Tpo -c -o coders/MagickCore_libMagickCore_la-vicar.lo `test -f 'coders/vicar.c' || echo '$(srcdir)/'`coders/vicar.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-vicar.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-vicar.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/vicar.c' object='coders/MagickCore_libMagickCore_la-vicar.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-vicar.lo `test -f 'coders/vicar.c' || echo '$(srcdir)/'`coders/vicar.c
+
+coders/MagickCore_libMagickCore_la-vid.lo: coders/vid.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-vid.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-vid.Tpo -c -o coders/MagickCore_libMagickCore_la-vid.lo `test -f 'coders/vid.c' || echo '$(srcdir)/'`coders/vid.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-vid.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-vid.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/vid.c' object='coders/MagickCore_libMagickCore_la-vid.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-vid.lo `test -f 'coders/vid.c' || echo '$(srcdir)/'`coders/vid.c
+
+coders/MagickCore_libMagickCore_la-viff.lo: coders/viff.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-viff.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-viff.Tpo -c -o coders/MagickCore_libMagickCore_la-viff.lo `test -f 'coders/viff.c' || echo '$(srcdir)/'`coders/viff.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-viff.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-viff.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/viff.c' object='coders/MagickCore_libMagickCore_la-viff.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-viff.lo `test -f 'coders/viff.c' || echo '$(srcdir)/'`coders/viff.c
+
+coders/MagickCore_libMagickCore_la-wbmp.lo: coders/wbmp.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-wbmp.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-wbmp.Tpo -c -o coders/MagickCore_libMagickCore_la-wbmp.lo `test -f 'coders/wbmp.c' || echo '$(srcdir)/'`coders/wbmp.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-wbmp.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-wbmp.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/wbmp.c' object='coders/MagickCore_libMagickCore_la-wbmp.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-wbmp.lo `test -f 'coders/wbmp.c' || echo '$(srcdir)/'`coders/wbmp.c
+
+coders/MagickCore_libMagickCore_la-wpg.lo: coders/wpg.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-wpg.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-wpg.Tpo -c -o coders/MagickCore_libMagickCore_la-wpg.lo `test -f 'coders/wpg.c' || echo '$(srcdir)/'`coders/wpg.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-wpg.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-wpg.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/wpg.c' object='coders/MagickCore_libMagickCore_la-wpg.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-wpg.lo `test -f 'coders/wpg.c' || echo '$(srcdir)/'`coders/wpg.c
+
+coders/MagickCore_libMagickCore_la-xbm.lo: coders/xbm.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-xbm.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-xbm.Tpo -c -o coders/MagickCore_libMagickCore_la-xbm.lo `test -f 'coders/xbm.c' || echo '$(srcdir)/'`coders/xbm.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-xbm.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-xbm.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/xbm.c' object='coders/MagickCore_libMagickCore_la-xbm.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-xbm.lo `test -f 'coders/xbm.c' || echo '$(srcdir)/'`coders/xbm.c
+
+coders/MagickCore_libMagickCore_la-xc.lo: coders/xc.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-xc.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-xc.Tpo -c -o coders/MagickCore_libMagickCore_la-xc.lo `test -f 'coders/xc.c' || echo '$(srcdir)/'`coders/xc.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-xc.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-xc.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/xc.c' object='coders/MagickCore_libMagickCore_la-xc.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-xc.lo `test -f 'coders/xc.c' || echo '$(srcdir)/'`coders/xc.c
+
+coders/MagickCore_libMagickCore_la-xcf.lo: coders/xcf.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-xcf.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-xcf.Tpo -c -o coders/MagickCore_libMagickCore_la-xcf.lo `test -f 'coders/xcf.c' || echo '$(srcdir)/'`coders/xcf.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-xcf.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-xcf.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/xcf.c' object='coders/MagickCore_libMagickCore_la-xcf.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-xcf.lo `test -f 'coders/xcf.c' || echo '$(srcdir)/'`coders/xcf.c
+
+coders/MagickCore_libMagickCore_la-xpm.lo: coders/xpm.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-xpm.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-xpm.Tpo -c -o coders/MagickCore_libMagickCore_la-xpm.lo `test -f 'coders/xpm.c' || echo '$(srcdir)/'`coders/xpm.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-xpm.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-xpm.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/xpm.c' object='coders/MagickCore_libMagickCore_la-xpm.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-xpm.lo `test -f 'coders/xpm.c' || echo '$(srcdir)/'`coders/xpm.c
+
+coders/MagickCore_libMagickCore_la-xps.lo: coders/xps.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-xps.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-xps.Tpo -c -o coders/MagickCore_libMagickCore_la-xps.lo `test -f 'coders/xps.c' || echo '$(srcdir)/'`coders/xps.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-xps.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-xps.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/xps.c' object='coders/MagickCore_libMagickCore_la-xps.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-xps.lo `test -f 'coders/xps.c' || echo '$(srcdir)/'`coders/xps.c
+
+coders/MagickCore_libMagickCore_la-ycbcr.lo: coders/ycbcr.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-ycbcr.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-ycbcr.Tpo -c -o coders/MagickCore_libMagickCore_la-ycbcr.lo `test -f 'coders/ycbcr.c' || echo '$(srcdir)/'`coders/ycbcr.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-ycbcr.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-ycbcr.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/ycbcr.c' object='coders/MagickCore_libMagickCore_la-ycbcr.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-ycbcr.lo `test -f 'coders/ycbcr.c' || echo '$(srcdir)/'`coders/ycbcr.c
+
+coders/MagickCore_libMagickCore_la-yuv.lo: coders/yuv.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-yuv.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-yuv.Tpo -c -o coders/MagickCore_libMagickCore_la-yuv.lo `test -f 'coders/yuv.c' || echo '$(srcdir)/'`coders/yuv.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-yuv.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-yuv.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/yuv.c' object='coders/MagickCore_libMagickCore_la-yuv.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-yuv.lo `test -f 'coders/yuv.c' || echo '$(srcdir)/'`coders/yuv.c
+
+coders/MagickCore_libMagickCore_la-dps.lo: coders/dps.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-dps.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-dps.Tpo -c -o coders/MagickCore_libMagickCore_la-dps.lo `test -f 'coders/dps.c' || echo '$(srcdir)/'`coders/dps.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-dps.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-dps.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/dps.c' object='coders/MagickCore_libMagickCore_la-dps.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-dps.lo `test -f 'coders/dps.c' || echo '$(srcdir)/'`coders/dps.c
+
+coders/MagickCore_libMagickCore_la-djvu.lo: coders/djvu.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-djvu.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-djvu.Tpo -c -o coders/MagickCore_libMagickCore_la-djvu.lo `test -f 'coders/djvu.c' || echo '$(srcdir)/'`coders/djvu.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-djvu.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-djvu.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/djvu.c' object='coders/MagickCore_libMagickCore_la-djvu.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-djvu.lo `test -f 'coders/djvu.c' || echo '$(srcdir)/'`coders/djvu.c
+
+coders/MagickCore_libMagickCore_la-exr.lo: coders/exr.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-exr.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-exr.Tpo -c -o coders/MagickCore_libMagickCore_la-exr.lo `test -f 'coders/exr.c' || echo '$(srcdir)/'`coders/exr.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-exr.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-exr.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/exr.c' object='coders/MagickCore_libMagickCore_la-exr.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-exr.lo `test -f 'coders/exr.c' || echo '$(srcdir)/'`coders/exr.c
+
+coders/MagickCore_libMagickCore_la-fpx.lo: coders/fpx.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-fpx.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-fpx.Tpo -c -o coders/MagickCore_libMagickCore_la-fpx.lo `test -f 'coders/fpx.c' || echo '$(srcdir)/'`coders/fpx.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-fpx.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-fpx.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/fpx.c' object='coders/MagickCore_libMagickCore_la-fpx.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-fpx.lo `test -f 'coders/fpx.c' || echo '$(srcdir)/'`coders/fpx.c
+
+coders/MagickCore_libMagickCore_la-clipboard.lo: coders/clipboard.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-clipboard.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-clipboard.Tpo -c -o coders/MagickCore_libMagickCore_la-clipboard.lo `test -f 'coders/clipboard.c' || echo '$(srcdir)/'`coders/clipboard.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-clipboard.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-clipboard.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/clipboard.c' object='coders/MagickCore_libMagickCore_la-clipboard.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-clipboard.lo `test -f 'coders/clipboard.c' || echo '$(srcdir)/'`coders/clipboard.c
+
+coders/MagickCore_libMagickCore_la-emf.lo: coders/emf.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-emf.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-emf.Tpo -c -o coders/MagickCore_libMagickCore_la-emf.lo `test -f 'coders/emf.c' || echo '$(srcdir)/'`coders/emf.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-emf.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-emf.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/emf.c' object='coders/MagickCore_libMagickCore_la-emf.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-emf.lo `test -f 'coders/emf.c' || echo '$(srcdir)/'`coders/emf.c
+
+coders/MagickCore_libMagickCore_la-jbig.lo: coders/jbig.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-jbig.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-jbig.Tpo -c -o coders/MagickCore_libMagickCore_la-jbig.lo `test -f 'coders/jbig.c' || echo '$(srcdir)/'`coders/jbig.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-jbig.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-jbig.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/jbig.c' object='coders/MagickCore_libMagickCore_la-jbig.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-jbig.lo `test -f 'coders/jbig.c' || echo '$(srcdir)/'`coders/jbig.c
+
+coders/MagickCore_libMagickCore_la-jpeg.lo: coders/jpeg.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-jpeg.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-jpeg.Tpo -c -o coders/MagickCore_libMagickCore_la-jpeg.lo `test -f 'coders/jpeg.c' || echo '$(srcdir)/'`coders/jpeg.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-jpeg.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-jpeg.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/jpeg.c' object='coders/MagickCore_libMagickCore_la-jpeg.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-jpeg.lo `test -f 'coders/jpeg.c' || echo '$(srcdir)/'`coders/jpeg.c
+
+coders/MagickCore_libMagickCore_la-jp2.lo: coders/jp2.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-jp2.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-jp2.Tpo -c -o coders/MagickCore_libMagickCore_la-jp2.lo `test -f 'coders/jp2.c' || echo '$(srcdir)/'`coders/jp2.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-jp2.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-jp2.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/jp2.c' object='coders/MagickCore_libMagickCore_la-jp2.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-jp2.lo `test -f 'coders/jp2.c' || echo '$(srcdir)/'`coders/jp2.c
+
+coders/MagickCore_libMagickCore_la-png.lo: coders/png.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-png.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-png.Tpo -c -o coders/MagickCore_libMagickCore_la-png.lo `test -f 'coders/png.c' || echo '$(srcdir)/'`coders/png.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-png.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-png.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/png.c' object='coders/MagickCore_libMagickCore_la-png.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-png.lo `test -f 'coders/png.c' || echo '$(srcdir)/'`coders/png.c
+
+coders/MagickCore_libMagickCore_la-ept.lo: coders/ept.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-ept.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-ept.Tpo -c -o coders/MagickCore_libMagickCore_la-ept.lo `test -f 'coders/ept.c' || echo '$(srcdir)/'`coders/ept.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-ept.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-ept.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/ept.c' object='coders/MagickCore_libMagickCore_la-ept.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-ept.lo `test -f 'coders/ept.c' || echo '$(srcdir)/'`coders/ept.c
+
+coders/MagickCore_libMagickCore_la-tiff.lo: coders/tiff.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-tiff.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-tiff.Tpo -c -o coders/MagickCore_libMagickCore_la-tiff.lo `test -f 'coders/tiff.c' || echo '$(srcdir)/'`coders/tiff.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-tiff.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-tiff.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/tiff.c' object='coders/MagickCore_libMagickCore_la-tiff.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-tiff.lo `test -f 'coders/tiff.c' || echo '$(srcdir)/'`coders/tiff.c
+
+coders/MagickCore_libMagickCore_la-webp.lo: coders/webp.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-webp.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-webp.Tpo -c -o coders/MagickCore_libMagickCore_la-webp.lo `test -f 'coders/webp.c' || echo '$(srcdir)/'`coders/webp.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-webp.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-webp.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/webp.c' object='coders/MagickCore_libMagickCore_la-webp.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-webp.lo `test -f 'coders/webp.c' || echo '$(srcdir)/'`coders/webp.c
+
+coders/MagickCore_libMagickCore_la-wmf.lo: coders/wmf.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-wmf.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-wmf.Tpo -c -o coders/MagickCore_libMagickCore_la-wmf.lo `test -f 'coders/wmf.c' || echo '$(srcdir)/'`coders/wmf.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-wmf.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-wmf.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/wmf.c' object='coders/MagickCore_libMagickCore_la-wmf.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-wmf.lo `test -f 'coders/wmf.c' || echo '$(srcdir)/'`coders/wmf.c
+
+coders/MagickCore_libMagickCore_la-x.lo: coders/x.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-x.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-x.Tpo -c -o coders/MagickCore_libMagickCore_la-x.lo `test -f 'coders/x.c' || echo '$(srcdir)/'`coders/x.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-x.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-x.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/x.c' object='coders/MagickCore_libMagickCore_la-x.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-x.lo `test -f 'coders/x.c' || echo '$(srcdir)/'`coders/x.c
+
+coders/MagickCore_libMagickCore_la-xwd.lo: coders/xwd.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/MagickCore_libMagickCore_la-xwd.lo -MD -MP -MF coders/$(DEPDIR)/MagickCore_libMagickCore_la-xwd.Tpo -c -o coders/MagickCore_libMagickCore_la-xwd.lo `test -f 'coders/xwd.c' || echo '$(srcdir)/'`coders/xwd.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/MagickCore_libMagickCore_la-xwd.Tpo coders/$(DEPDIR)/MagickCore_libMagickCore_la-xwd.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/xwd.c' object='coders/MagickCore_libMagickCore_la-xwd.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickCore_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/MagickCore_libMagickCore_la-xwd.lo `test -f 'coders/xwd.c' || echo '$(srcdir)/'`coders/xwd.c
+
+MagickWand/MagickWand_libMagickWand_la-animate.lo: MagickWand/animate.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickWand/MagickWand_libMagickWand_la-animate.lo -MD -MP -MF MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-animate.Tpo -c -o MagickWand/MagickWand_libMagickWand_la-animate.lo `test -f 'MagickWand/animate.c' || echo '$(srcdir)/'`MagickWand/animate.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-animate.Tpo MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-animate.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickWand/animate.c' object='MagickWand/MagickWand_libMagickWand_la-animate.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickWand/MagickWand_libMagickWand_la-animate.lo `test -f 'MagickWand/animate.c' || echo '$(srcdir)/'`MagickWand/animate.c
+
+MagickWand/MagickWand_libMagickWand_la-compare.lo: MagickWand/compare.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickWand/MagickWand_libMagickWand_la-compare.lo -MD -MP -MF MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-compare.Tpo -c -o MagickWand/MagickWand_libMagickWand_la-compare.lo `test -f 'MagickWand/compare.c' || echo '$(srcdir)/'`MagickWand/compare.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-compare.Tpo MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-compare.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickWand/compare.c' object='MagickWand/MagickWand_libMagickWand_la-compare.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickWand/MagickWand_libMagickWand_la-compare.lo `test -f 'MagickWand/compare.c' || echo '$(srcdir)/'`MagickWand/compare.c
+
+MagickWand/MagickWand_libMagickWand_la-composite.lo: MagickWand/composite.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickWand/MagickWand_libMagickWand_la-composite.lo -MD -MP -MF MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-composite.Tpo -c -o MagickWand/MagickWand_libMagickWand_la-composite.lo `test -f 'MagickWand/composite.c' || echo '$(srcdir)/'`MagickWand/composite.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-composite.Tpo MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-composite.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickWand/composite.c' object='MagickWand/MagickWand_libMagickWand_la-composite.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickWand/MagickWand_libMagickWand_la-composite.lo `test -f 'MagickWand/composite.c' || echo '$(srcdir)/'`MagickWand/composite.c
+
+MagickWand/MagickWand_libMagickWand_la-conjure.lo: MagickWand/conjure.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickWand/MagickWand_libMagickWand_la-conjure.lo -MD -MP -MF MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-conjure.Tpo -c -o MagickWand/MagickWand_libMagickWand_la-conjure.lo `test -f 'MagickWand/conjure.c' || echo '$(srcdir)/'`MagickWand/conjure.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-conjure.Tpo MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-conjure.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickWand/conjure.c' object='MagickWand/MagickWand_libMagickWand_la-conjure.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickWand/MagickWand_libMagickWand_la-conjure.lo `test -f 'MagickWand/conjure.c' || echo '$(srcdir)/'`MagickWand/conjure.c
+
+MagickWand/MagickWand_libMagickWand_la-convert.lo: MagickWand/convert.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickWand/MagickWand_libMagickWand_la-convert.lo -MD -MP -MF MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-convert.Tpo -c -o MagickWand/MagickWand_libMagickWand_la-convert.lo `test -f 'MagickWand/convert.c' || echo '$(srcdir)/'`MagickWand/convert.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-convert.Tpo MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-convert.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickWand/convert.c' object='MagickWand/MagickWand_libMagickWand_la-convert.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickWand/MagickWand_libMagickWand_la-convert.lo `test -f 'MagickWand/convert.c' || echo '$(srcdir)/'`MagickWand/convert.c
+
+MagickWand/MagickWand_libMagickWand_la-deprecate.lo: MagickWand/deprecate.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickWand/MagickWand_libMagickWand_la-deprecate.lo -MD -MP -MF MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-deprecate.Tpo -c -o MagickWand/MagickWand_libMagickWand_la-deprecate.lo `test -f 'MagickWand/deprecate.c' || echo '$(srcdir)/'`MagickWand/deprecate.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-deprecate.Tpo MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-deprecate.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickWand/deprecate.c' object='MagickWand/MagickWand_libMagickWand_la-deprecate.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickWand/MagickWand_libMagickWand_la-deprecate.lo `test -f 'MagickWand/deprecate.c' || echo '$(srcdir)/'`MagickWand/deprecate.c
+
+MagickWand/MagickWand_libMagickWand_la-display.lo: MagickWand/display.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickWand/MagickWand_libMagickWand_la-display.lo -MD -MP -MF MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-display.Tpo -c -o MagickWand/MagickWand_libMagickWand_la-display.lo `test -f 'MagickWand/display.c' || echo '$(srcdir)/'`MagickWand/display.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-display.Tpo MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-display.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickWand/display.c' object='MagickWand/MagickWand_libMagickWand_la-display.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickWand/MagickWand_libMagickWand_la-display.lo `test -f 'MagickWand/display.c' || echo '$(srcdir)/'`MagickWand/display.c
+
+MagickWand/MagickWand_libMagickWand_la-drawing-wand.lo: MagickWand/drawing-wand.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickWand/MagickWand_libMagickWand_la-drawing-wand.lo -MD -MP -MF MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-drawing-wand.Tpo -c -o MagickWand/MagickWand_libMagickWand_la-drawing-wand.lo `test -f 'MagickWand/drawing-wand.c' || echo '$(srcdir)/'`MagickWand/drawing-wand.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-drawing-wand.Tpo MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-drawing-wand.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickWand/drawing-wand.c' object='MagickWand/MagickWand_libMagickWand_la-drawing-wand.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickWand/MagickWand_libMagickWand_la-drawing-wand.lo `test -f 'MagickWand/drawing-wand.c' || echo '$(srcdir)/'`MagickWand/drawing-wand.c
+
+MagickWand/MagickWand_libMagickWand_la-identify.lo: MagickWand/identify.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickWand/MagickWand_libMagickWand_la-identify.lo -MD -MP -MF MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-identify.Tpo -c -o MagickWand/MagickWand_libMagickWand_la-identify.lo `test -f 'MagickWand/identify.c' || echo '$(srcdir)/'`MagickWand/identify.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-identify.Tpo MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-identify.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickWand/identify.c' object='MagickWand/MagickWand_libMagickWand_la-identify.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickWand/MagickWand_libMagickWand_la-identify.lo `test -f 'MagickWand/identify.c' || echo '$(srcdir)/'`MagickWand/identify.c
+
+MagickWand/MagickWand_libMagickWand_la-import.lo: MagickWand/import.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickWand/MagickWand_libMagickWand_la-import.lo -MD -MP -MF MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-import.Tpo -c -o MagickWand/MagickWand_libMagickWand_la-import.lo `test -f 'MagickWand/import.c' || echo '$(srcdir)/'`MagickWand/import.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-import.Tpo MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-import.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickWand/import.c' object='MagickWand/MagickWand_libMagickWand_la-import.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickWand/MagickWand_libMagickWand_la-import.lo `test -f 'MagickWand/import.c' || echo '$(srcdir)/'`MagickWand/import.c
+
+MagickWand/MagickWand_libMagickWand_la-magick-image.lo: MagickWand/magick-image.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickWand/MagickWand_libMagickWand_la-magick-image.lo -MD -MP -MF MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-magick-image.Tpo -c -o MagickWand/MagickWand_libMagickWand_la-magick-image.lo `test -f 'MagickWand/magick-image.c' || echo '$(srcdir)/'`MagickWand/magick-image.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-magick-image.Tpo MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-magick-image.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickWand/magick-image.c' object='MagickWand/MagickWand_libMagickWand_la-magick-image.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickWand/MagickWand_libMagickWand_la-magick-image.lo `test -f 'MagickWand/magick-image.c' || echo '$(srcdir)/'`MagickWand/magick-image.c
+
+MagickWand/MagickWand_libMagickWand_la-magick-property.lo: MagickWand/magick-property.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickWand/MagickWand_libMagickWand_la-magick-property.lo -MD -MP -MF MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-magick-property.Tpo -c -o MagickWand/MagickWand_libMagickWand_la-magick-property.lo `test -f 'MagickWand/magick-property.c' || echo '$(srcdir)/'`MagickWand/magick-property.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-magick-property.Tpo MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-magick-property.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickWand/magick-property.c' object='MagickWand/MagickWand_libMagickWand_la-magick-property.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickWand/MagickWand_libMagickWand_la-magick-property.lo `test -f 'MagickWand/magick-property.c' || echo '$(srcdir)/'`MagickWand/magick-property.c
+
+MagickWand/MagickWand_libMagickWand_la-magick-wand.lo: MagickWand/magick-wand.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickWand/MagickWand_libMagickWand_la-magick-wand.lo -MD -MP -MF MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-magick-wand.Tpo -c -o MagickWand/MagickWand_libMagickWand_la-magick-wand.lo `test -f 'MagickWand/magick-wand.c' || echo '$(srcdir)/'`MagickWand/magick-wand.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-magick-wand.Tpo MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-magick-wand.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickWand/magick-wand.c' object='MagickWand/MagickWand_libMagickWand_la-magick-wand.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickWand/MagickWand_libMagickWand_la-magick-wand.lo `test -f 'MagickWand/magick-wand.c' || echo '$(srcdir)/'`MagickWand/magick-wand.c
+
+MagickWand/MagickWand_libMagickWand_la-mogrify.lo: MagickWand/mogrify.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickWand/MagickWand_libMagickWand_la-mogrify.lo -MD -MP -MF MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-mogrify.Tpo -c -o MagickWand/MagickWand_libMagickWand_la-mogrify.lo `test -f 'MagickWand/mogrify.c' || echo '$(srcdir)/'`MagickWand/mogrify.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-mogrify.Tpo MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-mogrify.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickWand/mogrify.c' object='MagickWand/MagickWand_libMagickWand_la-mogrify.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickWand/MagickWand_libMagickWand_la-mogrify.lo `test -f 'MagickWand/mogrify.c' || echo '$(srcdir)/'`MagickWand/mogrify.c
+
+MagickWand/MagickWand_libMagickWand_la-montage.lo: MagickWand/montage.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickWand/MagickWand_libMagickWand_la-montage.lo -MD -MP -MF MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-montage.Tpo -c -o MagickWand/MagickWand_libMagickWand_la-montage.lo `test -f 'MagickWand/montage.c' || echo '$(srcdir)/'`MagickWand/montage.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-montage.Tpo MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-montage.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickWand/montage.c' object='MagickWand/MagickWand_libMagickWand_la-montage.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickWand/MagickWand_libMagickWand_la-montage.lo `test -f 'MagickWand/montage.c' || echo '$(srcdir)/'`MagickWand/montage.c
+
+MagickWand/MagickWand_libMagickWand_la-pixel-iterator.lo: MagickWand/pixel-iterator.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickWand/MagickWand_libMagickWand_la-pixel-iterator.lo -MD -MP -MF MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-pixel-iterator.Tpo -c -o MagickWand/MagickWand_libMagickWand_la-pixel-iterator.lo `test -f 'MagickWand/pixel-iterator.c' || echo '$(srcdir)/'`MagickWand/pixel-iterator.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-pixel-iterator.Tpo MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-pixel-iterator.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickWand/pixel-iterator.c' object='MagickWand/MagickWand_libMagickWand_la-pixel-iterator.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickWand/MagickWand_libMagickWand_la-pixel-iterator.lo `test -f 'MagickWand/pixel-iterator.c' || echo '$(srcdir)/'`MagickWand/pixel-iterator.c
+
+MagickWand/MagickWand_libMagickWand_la-pixel-wand.lo: MagickWand/pixel-wand.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickWand/MagickWand_libMagickWand_la-pixel-wand.lo -MD -MP -MF MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-pixel-wand.Tpo -c -o MagickWand/MagickWand_libMagickWand_la-pixel-wand.lo `test -f 'MagickWand/pixel-wand.c' || echo '$(srcdir)/'`MagickWand/pixel-wand.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-pixel-wand.Tpo MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-pixel-wand.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickWand/pixel-wand.c' object='MagickWand/MagickWand_libMagickWand_la-pixel-wand.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickWand/MagickWand_libMagickWand_la-pixel-wand.lo `test -f 'MagickWand/pixel-wand.c' || echo '$(srcdir)/'`MagickWand/pixel-wand.c
+
+MagickWand/MagickWand_libMagickWand_la-stream.lo: MagickWand/stream.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickWand/MagickWand_libMagickWand_la-stream.lo -MD -MP -MF MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-stream.Tpo -c -o MagickWand/MagickWand_libMagickWand_la-stream.lo `test -f 'MagickWand/stream.c' || echo '$(srcdir)/'`MagickWand/stream.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-stream.Tpo MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-stream.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickWand/stream.c' object='MagickWand/MagickWand_libMagickWand_la-stream.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickWand/MagickWand_libMagickWand_la-stream.lo `test -f 'MagickWand/stream.c' || echo '$(srcdir)/'`MagickWand/stream.c
+
+MagickWand/MagickWand_libMagickWand_la-wand.lo: MagickWand/wand.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickWand/MagickWand_libMagickWand_la-wand.lo -MD -MP -MF MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-wand.Tpo -c -o MagickWand/MagickWand_libMagickWand_la-wand.lo `test -f 'MagickWand/wand.c' || echo '$(srcdir)/'`MagickWand/wand.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-wand.Tpo MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-wand.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickWand/wand.c' object='MagickWand/MagickWand_libMagickWand_la-wand.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickWand/MagickWand_libMagickWand_la-wand.lo `test -f 'MagickWand/wand.c' || echo '$(srcdir)/'`MagickWand/wand.c
+
+MagickWand/MagickWand_libMagickWand_la-wand-view.lo: MagickWand/wand-view.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickWand/MagickWand_libMagickWand_la-wand-view.lo -MD -MP -MF MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-wand-view.Tpo -c -o MagickWand/MagickWand_libMagickWand_la-wand-view.lo `test -f 'MagickWand/wand-view.c' || echo '$(srcdir)/'`MagickWand/wand-view.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-wand-view.Tpo MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-wand-view.Plo
+@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='MagickWand/wand-view.c' object='MagickWand/MagickWand_libMagickWand_la-wand-view.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickWand/MagickWand_libMagickWand_la-wand-view.lo `test -f 'MagickWand/wand-view.c' || echo '$(srcdir)/'`MagickWand/wand-view.c
+
coders/coders_aai_la-aai.lo: coders/aai.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(coders_aai_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/coders_aai_la-aai.lo -MD -MP -MF coders/$(DEPDIR)/coders_aai_la-aai.Tpo -c -o coders/coders_aai_la-aai.lo `test -f 'coders/aai.c' || echo '$(srcdir)/'`coders/aai.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/coders_aai_la-aai.Tpo coders/$(DEPDIR)/coders_aai_la-aai.Plo
@@ -8633,1830 +10529,6 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ltdl_libltdlc_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ltdl/ltdl_libltdlc_la-slist.lo `test -f 'ltdl/slist.c' || echo '$(srcdir)/'`ltdl/slist.c
-magick/magick_libMagickCore_la-accelerate.lo: magick/accelerate.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-accelerate.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-accelerate.Tpo -c -o magick/magick_libMagickCore_la-accelerate.lo `test -f 'magick/accelerate.c' || echo '$(srcdir)/'`magick/accelerate.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-accelerate.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-accelerate.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/accelerate.c' object='magick/magick_libMagickCore_la-accelerate.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-accelerate.lo `test -f 'magick/accelerate.c' || echo '$(srcdir)/'`magick/accelerate.c
-
-magick/magick_libMagickCore_la-animate.lo: magick/animate.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-animate.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-animate.Tpo -c -o magick/magick_libMagickCore_la-animate.lo `test -f 'magick/animate.c' || echo '$(srcdir)/'`magick/animate.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-animate.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-animate.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/animate.c' object='magick/magick_libMagickCore_la-animate.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-animate.lo `test -f 'magick/animate.c' || echo '$(srcdir)/'`magick/animate.c
-
-magick/magick_libMagickCore_la-annotate.lo: magick/annotate.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-annotate.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-annotate.Tpo -c -o magick/magick_libMagickCore_la-annotate.lo `test -f 'magick/annotate.c' || echo '$(srcdir)/'`magick/annotate.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-annotate.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-annotate.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/annotate.c' object='magick/magick_libMagickCore_la-annotate.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-annotate.lo `test -f 'magick/annotate.c' || echo '$(srcdir)/'`magick/annotate.c
-
-magick/magick_libMagickCore_la-artifact.lo: magick/artifact.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-artifact.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-artifact.Tpo -c -o magick/magick_libMagickCore_la-artifact.lo `test -f 'magick/artifact.c' || echo '$(srcdir)/'`magick/artifact.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-artifact.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-artifact.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/artifact.c' object='magick/magick_libMagickCore_la-artifact.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-artifact.lo `test -f 'magick/artifact.c' || echo '$(srcdir)/'`magick/artifact.c
-
-magick/magick_libMagickCore_la-attribute.lo: magick/attribute.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-attribute.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-attribute.Tpo -c -o magick/magick_libMagickCore_la-attribute.lo `test -f 'magick/attribute.c' || echo '$(srcdir)/'`magick/attribute.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-attribute.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-attribute.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/attribute.c' object='magick/magick_libMagickCore_la-attribute.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-attribute.lo `test -f 'magick/attribute.c' || echo '$(srcdir)/'`magick/attribute.c
-
-magick/magick_libMagickCore_la-blob.lo: magick/blob.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-blob.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-blob.Tpo -c -o magick/magick_libMagickCore_la-blob.lo `test -f 'magick/blob.c' || echo '$(srcdir)/'`magick/blob.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-blob.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-blob.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/blob.c' object='magick/magick_libMagickCore_la-blob.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-blob.lo `test -f 'magick/blob.c' || echo '$(srcdir)/'`magick/blob.c
-
-magick/magick_libMagickCore_la-cache.lo: magick/cache.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-cache.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-cache.Tpo -c -o magick/magick_libMagickCore_la-cache.lo `test -f 'magick/cache.c' || echo '$(srcdir)/'`magick/cache.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-cache.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-cache.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/cache.c' object='magick/magick_libMagickCore_la-cache.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-cache.lo `test -f 'magick/cache.c' || echo '$(srcdir)/'`magick/cache.c
-
-magick/magick_libMagickCore_la-cache-view.lo: magick/cache-view.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-cache-view.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-cache-view.Tpo -c -o magick/magick_libMagickCore_la-cache-view.lo `test -f 'magick/cache-view.c' || echo '$(srcdir)/'`magick/cache-view.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-cache-view.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-cache-view.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/cache-view.c' object='magick/magick_libMagickCore_la-cache-view.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-cache-view.lo `test -f 'magick/cache-view.c' || echo '$(srcdir)/'`magick/cache-view.c
-
-magick/magick_libMagickCore_la-cipher.lo: magick/cipher.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-cipher.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-cipher.Tpo -c -o magick/magick_libMagickCore_la-cipher.lo `test -f 'magick/cipher.c' || echo '$(srcdir)/'`magick/cipher.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-cipher.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-cipher.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/cipher.c' object='magick/magick_libMagickCore_la-cipher.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-cipher.lo `test -f 'magick/cipher.c' || echo '$(srcdir)/'`magick/cipher.c
-
-magick/magick_libMagickCore_la-client.lo: magick/client.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-client.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-client.Tpo -c -o magick/magick_libMagickCore_la-client.lo `test -f 'magick/client.c' || echo '$(srcdir)/'`magick/client.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-client.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-client.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/client.c' object='magick/magick_libMagickCore_la-client.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-client.lo `test -f 'magick/client.c' || echo '$(srcdir)/'`magick/client.c
-
-magick/magick_libMagickCore_la-coder.lo: magick/coder.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-coder.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-coder.Tpo -c -o magick/magick_libMagickCore_la-coder.lo `test -f 'magick/coder.c' || echo '$(srcdir)/'`magick/coder.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-coder.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-coder.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/coder.c' object='magick/magick_libMagickCore_la-coder.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-coder.lo `test -f 'magick/coder.c' || echo '$(srcdir)/'`magick/coder.c
-
-magick/magick_libMagickCore_la-color.lo: magick/color.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-color.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-color.Tpo -c -o magick/magick_libMagickCore_la-color.lo `test -f 'magick/color.c' || echo '$(srcdir)/'`magick/color.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-color.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-color.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/color.c' object='magick/magick_libMagickCore_la-color.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-color.lo `test -f 'magick/color.c' || echo '$(srcdir)/'`magick/color.c
-
-magick/magick_libMagickCore_la-colormap.lo: magick/colormap.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-colormap.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-colormap.Tpo -c -o magick/magick_libMagickCore_la-colormap.lo `test -f 'magick/colormap.c' || echo '$(srcdir)/'`magick/colormap.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-colormap.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-colormap.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/colormap.c' object='magick/magick_libMagickCore_la-colormap.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-colormap.lo `test -f 'magick/colormap.c' || echo '$(srcdir)/'`magick/colormap.c
-
-magick/magick_libMagickCore_la-colorspace.lo: magick/colorspace.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-colorspace.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-colorspace.Tpo -c -o magick/magick_libMagickCore_la-colorspace.lo `test -f 'magick/colorspace.c' || echo '$(srcdir)/'`magick/colorspace.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-colorspace.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-colorspace.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/colorspace.c' object='magick/magick_libMagickCore_la-colorspace.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-colorspace.lo `test -f 'magick/colorspace.c' || echo '$(srcdir)/'`magick/colorspace.c
-
-magick/magick_libMagickCore_la-compare.lo: magick/compare.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-compare.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-compare.Tpo -c -o magick/magick_libMagickCore_la-compare.lo `test -f 'magick/compare.c' || echo '$(srcdir)/'`magick/compare.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-compare.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-compare.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/compare.c' object='magick/magick_libMagickCore_la-compare.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-compare.lo `test -f 'magick/compare.c' || echo '$(srcdir)/'`magick/compare.c
-
-magick/magick_libMagickCore_la-composite.lo: magick/composite.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-composite.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-composite.Tpo -c -o magick/magick_libMagickCore_la-composite.lo `test -f 'magick/composite.c' || echo '$(srcdir)/'`magick/composite.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-composite.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-composite.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/composite.c' object='magick/magick_libMagickCore_la-composite.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-composite.lo `test -f 'magick/composite.c' || echo '$(srcdir)/'`magick/composite.c
-
-magick/magick_libMagickCore_la-compress.lo: magick/compress.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-compress.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-compress.Tpo -c -o magick/magick_libMagickCore_la-compress.lo `test -f 'magick/compress.c' || echo '$(srcdir)/'`magick/compress.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-compress.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-compress.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/compress.c' object='magick/magick_libMagickCore_la-compress.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-compress.lo `test -f 'magick/compress.c' || echo '$(srcdir)/'`magick/compress.c
-
-magick/magick_libMagickCore_la-configure.lo: magick/configure.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-configure.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-configure.Tpo -c -o magick/magick_libMagickCore_la-configure.lo `test -f 'magick/configure.c' || echo '$(srcdir)/'`magick/configure.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-configure.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-configure.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/configure.c' object='magick/magick_libMagickCore_la-configure.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-configure.lo `test -f 'magick/configure.c' || echo '$(srcdir)/'`magick/configure.c
-
-magick/magick_libMagickCore_la-constitute.lo: magick/constitute.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-constitute.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-constitute.Tpo -c -o magick/magick_libMagickCore_la-constitute.lo `test -f 'magick/constitute.c' || echo '$(srcdir)/'`magick/constitute.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-constitute.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-constitute.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/constitute.c' object='magick/magick_libMagickCore_la-constitute.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-constitute.lo `test -f 'magick/constitute.c' || echo '$(srcdir)/'`magick/constitute.c
-
-magick/magick_libMagickCore_la-decorate.lo: magick/decorate.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-decorate.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-decorate.Tpo -c -o magick/magick_libMagickCore_la-decorate.lo `test -f 'magick/decorate.c' || echo '$(srcdir)/'`magick/decorate.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-decorate.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-decorate.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/decorate.c' object='magick/magick_libMagickCore_la-decorate.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-decorate.lo `test -f 'magick/decorate.c' || echo '$(srcdir)/'`magick/decorate.c
-
-magick/magick_libMagickCore_la-delegate.lo: magick/delegate.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-delegate.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-delegate.Tpo -c -o magick/magick_libMagickCore_la-delegate.lo `test -f 'magick/delegate.c' || echo '$(srcdir)/'`magick/delegate.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-delegate.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-delegate.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/delegate.c' object='magick/magick_libMagickCore_la-delegate.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-delegate.lo `test -f 'magick/delegate.c' || echo '$(srcdir)/'`magick/delegate.c
-
-magick/magick_libMagickCore_la-deprecate.lo: magick/deprecate.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-deprecate.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-deprecate.Tpo -c -o magick/magick_libMagickCore_la-deprecate.lo `test -f 'magick/deprecate.c' || echo '$(srcdir)/'`magick/deprecate.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-deprecate.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-deprecate.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/deprecate.c' object='magick/magick_libMagickCore_la-deprecate.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-deprecate.lo `test -f 'magick/deprecate.c' || echo '$(srcdir)/'`magick/deprecate.c
-
-magick/magick_libMagickCore_la-display.lo: magick/display.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-display.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-display.Tpo -c -o magick/magick_libMagickCore_la-display.lo `test -f 'magick/display.c' || echo '$(srcdir)/'`magick/display.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-display.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-display.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/display.c' object='magick/magick_libMagickCore_la-display.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-display.lo `test -f 'magick/display.c' || echo '$(srcdir)/'`magick/display.c
-
-magick/magick_libMagickCore_la-distort.lo: magick/distort.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-distort.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-distort.Tpo -c -o magick/magick_libMagickCore_la-distort.lo `test -f 'magick/distort.c' || echo '$(srcdir)/'`magick/distort.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-distort.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-distort.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/distort.c' object='magick/magick_libMagickCore_la-distort.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-distort.lo `test -f 'magick/distort.c' || echo '$(srcdir)/'`magick/distort.c
-
-magick/magick_libMagickCore_la-draw.lo: magick/draw.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-draw.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-draw.Tpo -c -o magick/magick_libMagickCore_la-draw.lo `test -f 'magick/draw.c' || echo '$(srcdir)/'`magick/draw.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-draw.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-draw.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/draw.c' object='magick/magick_libMagickCore_la-draw.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-draw.lo `test -f 'magick/draw.c' || echo '$(srcdir)/'`magick/draw.c
-
-magick/magick_libMagickCore_la-effect.lo: magick/effect.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-effect.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-effect.Tpo -c -o magick/magick_libMagickCore_la-effect.lo `test -f 'magick/effect.c' || echo '$(srcdir)/'`magick/effect.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-effect.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-effect.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/effect.c' object='magick/magick_libMagickCore_la-effect.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-effect.lo `test -f 'magick/effect.c' || echo '$(srcdir)/'`magick/effect.c
-
-magick/magick_libMagickCore_la-enhance.lo: magick/enhance.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-enhance.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-enhance.Tpo -c -o magick/magick_libMagickCore_la-enhance.lo `test -f 'magick/enhance.c' || echo '$(srcdir)/'`magick/enhance.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-enhance.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-enhance.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/enhance.c' object='magick/magick_libMagickCore_la-enhance.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-enhance.lo `test -f 'magick/enhance.c' || echo '$(srcdir)/'`magick/enhance.c
-
-magick/magick_libMagickCore_la-exception.lo: magick/exception.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-exception.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-exception.Tpo -c -o magick/magick_libMagickCore_la-exception.lo `test -f 'magick/exception.c' || echo '$(srcdir)/'`magick/exception.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-exception.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-exception.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/exception.c' object='magick/magick_libMagickCore_la-exception.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-exception.lo `test -f 'magick/exception.c' || echo '$(srcdir)/'`magick/exception.c
-
-magick/magick_libMagickCore_la-feature.lo: magick/feature.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-feature.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-feature.Tpo -c -o magick/magick_libMagickCore_la-feature.lo `test -f 'magick/feature.c' || echo '$(srcdir)/'`magick/feature.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-feature.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-feature.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/feature.c' object='magick/magick_libMagickCore_la-feature.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-feature.lo `test -f 'magick/feature.c' || echo '$(srcdir)/'`magick/feature.c
-
-magick/magick_libMagickCore_la-fourier.lo: magick/fourier.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-fourier.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-fourier.Tpo -c -o magick/magick_libMagickCore_la-fourier.lo `test -f 'magick/fourier.c' || echo '$(srcdir)/'`magick/fourier.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-fourier.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-fourier.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/fourier.c' object='magick/magick_libMagickCore_la-fourier.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-fourier.lo `test -f 'magick/fourier.c' || echo '$(srcdir)/'`magick/fourier.c
-
-magick/magick_libMagickCore_la-fx.lo: magick/fx.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-fx.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-fx.Tpo -c -o magick/magick_libMagickCore_la-fx.lo `test -f 'magick/fx.c' || echo '$(srcdir)/'`magick/fx.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-fx.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-fx.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/fx.c' object='magick/magick_libMagickCore_la-fx.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-fx.lo `test -f 'magick/fx.c' || echo '$(srcdir)/'`magick/fx.c
-
-magick/magick_libMagickCore_la-gem.lo: magick/gem.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-gem.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-gem.Tpo -c -o magick/magick_libMagickCore_la-gem.lo `test -f 'magick/gem.c' || echo '$(srcdir)/'`magick/gem.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-gem.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-gem.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/gem.c' object='magick/magick_libMagickCore_la-gem.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-gem.lo `test -f 'magick/gem.c' || echo '$(srcdir)/'`magick/gem.c
-
-magick/magick_libMagickCore_la-geometry.lo: magick/geometry.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-geometry.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-geometry.Tpo -c -o magick/magick_libMagickCore_la-geometry.lo `test -f 'magick/geometry.c' || echo '$(srcdir)/'`magick/geometry.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-geometry.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-geometry.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/geometry.c' object='magick/magick_libMagickCore_la-geometry.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-geometry.lo `test -f 'magick/geometry.c' || echo '$(srcdir)/'`magick/geometry.c
-
-magick/magick_libMagickCore_la-hashmap.lo: magick/hashmap.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-hashmap.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-hashmap.Tpo -c -o magick/magick_libMagickCore_la-hashmap.lo `test -f 'magick/hashmap.c' || echo '$(srcdir)/'`magick/hashmap.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-hashmap.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-hashmap.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/hashmap.c' object='magick/magick_libMagickCore_la-hashmap.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-hashmap.lo `test -f 'magick/hashmap.c' || echo '$(srcdir)/'`magick/hashmap.c
-
-magick/magick_libMagickCore_la-histogram.lo: magick/histogram.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-histogram.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-histogram.Tpo -c -o magick/magick_libMagickCore_la-histogram.lo `test -f 'magick/histogram.c' || echo '$(srcdir)/'`magick/histogram.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-histogram.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-histogram.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/histogram.c' object='magick/magick_libMagickCore_la-histogram.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-histogram.lo `test -f 'magick/histogram.c' || echo '$(srcdir)/'`magick/histogram.c
-
-magick/magick_libMagickCore_la-identify.lo: magick/identify.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-identify.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-identify.Tpo -c -o magick/magick_libMagickCore_la-identify.lo `test -f 'magick/identify.c' || echo '$(srcdir)/'`magick/identify.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-identify.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-identify.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/identify.c' object='magick/magick_libMagickCore_la-identify.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-identify.lo `test -f 'magick/identify.c' || echo '$(srcdir)/'`magick/identify.c
-
-magick/magick_libMagickCore_la-image.lo: magick/image.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-image.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-image.Tpo -c -o magick/magick_libMagickCore_la-image.lo `test -f 'magick/image.c' || echo '$(srcdir)/'`magick/image.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-image.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-image.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/image.c' object='magick/magick_libMagickCore_la-image.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-image.lo `test -f 'magick/image.c' || echo '$(srcdir)/'`magick/image.c
-
-magick/magick_libMagickCore_la-image-view.lo: magick/image-view.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-image-view.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-image-view.Tpo -c -o magick/magick_libMagickCore_la-image-view.lo `test -f 'magick/image-view.c' || echo '$(srcdir)/'`magick/image-view.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-image-view.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-image-view.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/image-view.c' object='magick/magick_libMagickCore_la-image-view.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-image-view.lo `test -f 'magick/image-view.c' || echo '$(srcdir)/'`magick/image-view.c
-
-magick/magick_libMagickCore_la-layer.lo: magick/layer.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-layer.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-layer.Tpo -c -o magick/magick_libMagickCore_la-layer.lo `test -f 'magick/layer.c' || echo '$(srcdir)/'`magick/layer.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-layer.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-layer.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/layer.c' object='magick/magick_libMagickCore_la-layer.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-layer.lo `test -f 'magick/layer.c' || echo '$(srcdir)/'`magick/layer.c
-
-magick/magick_libMagickCore_la-list.lo: magick/list.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-list.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-list.Tpo -c -o magick/magick_libMagickCore_la-list.lo `test -f 'magick/list.c' || echo '$(srcdir)/'`magick/list.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-list.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-list.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/list.c' object='magick/magick_libMagickCore_la-list.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-list.lo `test -f 'magick/list.c' || echo '$(srcdir)/'`magick/list.c
-
-magick/magick_libMagickCore_la-locale.lo: magick/locale.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-locale.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-locale.Tpo -c -o magick/magick_libMagickCore_la-locale.lo `test -f 'magick/locale.c' || echo '$(srcdir)/'`magick/locale.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-locale.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-locale.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/locale.c' object='magick/magick_libMagickCore_la-locale.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-locale.lo `test -f 'magick/locale.c' || echo '$(srcdir)/'`magick/locale.c
-
-magick/magick_libMagickCore_la-log.lo: magick/log.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-log.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-log.Tpo -c -o magick/magick_libMagickCore_la-log.lo `test -f 'magick/log.c' || echo '$(srcdir)/'`magick/log.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-log.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-log.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/log.c' object='magick/magick_libMagickCore_la-log.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-log.lo `test -f 'magick/log.c' || echo '$(srcdir)/'`magick/log.c
-
-magick/magick_libMagickCore_la-magic.lo: magick/magic.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-magic.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-magic.Tpo -c -o magick/magick_libMagickCore_la-magic.lo `test -f 'magick/magic.c' || echo '$(srcdir)/'`magick/magic.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-magic.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-magic.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/magic.c' object='magick/magick_libMagickCore_la-magic.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-magic.lo `test -f 'magick/magic.c' || echo '$(srcdir)/'`magick/magic.c
-
-magick/magick_libMagickCore_la-magick.lo: magick/magick.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-magick.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-magick.Tpo -c -o magick/magick_libMagickCore_la-magick.lo `test -f 'magick/magick.c' || echo '$(srcdir)/'`magick/magick.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-magick.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-magick.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/magick.c' object='magick/magick_libMagickCore_la-magick.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-magick.lo `test -f 'magick/magick.c' || echo '$(srcdir)/'`magick/magick.c
-
-magick/magick_libMagickCore_la-matrix.lo: magick/matrix.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-matrix.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-matrix.Tpo -c -o magick/magick_libMagickCore_la-matrix.lo `test -f 'magick/matrix.c' || echo '$(srcdir)/'`magick/matrix.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-matrix.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-matrix.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/matrix.c' object='magick/magick_libMagickCore_la-matrix.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-matrix.lo `test -f 'magick/matrix.c' || echo '$(srcdir)/'`magick/matrix.c
-
-magick/magick_libMagickCore_la-memory.lo: magick/memory.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-memory.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-memory.Tpo -c -o magick/magick_libMagickCore_la-memory.lo `test -f 'magick/memory.c' || echo '$(srcdir)/'`magick/memory.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-memory.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-memory.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/memory.c' object='magick/magick_libMagickCore_la-memory.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-memory.lo `test -f 'magick/memory.c' || echo '$(srcdir)/'`magick/memory.c
-
-magick/magick_libMagickCore_la-mime.lo: magick/mime.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-mime.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-mime.Tpo -c -o magick/magick_libMagickCore_la-mime.lo `test -f 'magick/mime.c' || echo '$(srcdir)/'`magick/mime.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-mime.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-mime.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/mime.c' object='magick/magick_libMagickCore_la-mime.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-mime.lo `test -f 'magick/mime.c' || echo '$(srcdir)/'`magick/mime.c
-
-magick/magick_libMagickCore_la-module.lo: magick/module.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-module.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-module.Tpo -c -o magick/magick_libMagickCore_la-module.lo `test -f 'magick/module.c' || echo '$(srcdir)/'`magick/module.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-module.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-module.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/module.c' object='magick/magick_libMagickCore_la-module.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-module.lo `test -f 'magick/module.c' || echo '$(srcdir)/'`magick/module.c
-
-magick/magick_libMagickCore_la-monitor.lo: magick/monitor.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-monitor.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-monitor.Tpo -c -o magick/magick_libMagickCore_la-monitor.lo `test -f 'magick/monitor.c' || echo '$(srcdir)/'`magick/monitor.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-monitor.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-monitor.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/monitor.c' object='magick/magick_libMagickCore_la-monitor.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-monitor.lo `test -f 'magick/monitor.c' || echo '$(srcdir)/'`magick/monitor.c
-
-magick/magick_libMagickCore_la-montage.lo: magick/montage.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-montage.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-montage.Tpo -c -o magick/magick_libMagickCore_la-montage.lo `test -f 'magick/montage.c' || echo '$(srcdir)/'`magick/montage.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-montage.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-montage.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/montage.c' object='magick/magick_libMagickCore_la-montage.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-montage.lo `test -f 'magick/montage.c' || echo '$(srcdir)/'`magick/montage.c
-
-magick/magick_libMagickCore_la-morphology.lo: magick/morphology.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-morphology.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-morphology.Tpo -c -o magick/magick_libMagickCore_la-morphology.lo `test -f 'magick/morphology.c' || echo '$(srcdir)/'`magick/morphology.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-morphology.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-morphology.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/morphology.c' object='magick/magick_libMagickCore_la-morphology.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-morphology.lo `test -f 'magick/morphology.c' || echo '$(srcdir)/'`magick/morphology.c
-
-magick/magick_libMagickCore_la-option.lo: magick/option.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-option.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-option.Tpo -c -o magick/magick_libMagickCore_la-option.lo `test -f 'magick/option.c' || echo '$(srcdir)/'`magick/option.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-option.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-option.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/option.c' object='magick/magick_libMagickCore_la-option.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-option.lo `test -f 'magick/option.c' || echo '$(srcdir)/'`magick/option.c
-
-magick/magick_libMagickCore_la-paint.lo: magick/paint.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-paint.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-paint.Tpo -c -o magick/magick_libMagickCore_la-paint.lo `test -f 'magick/paint.c' || echo '$(srcdir)/'`magick/paint.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-paint.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-paint.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/paint.c' object='magick/magick_libMagickCore_la-paint.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-paint.lo `test -f 'magick/paint.c' || echo '$(srcdir)/'`magick/paint.c
-
-magick/magick_libMagickCore_la-pixel.lo: magick/pixel.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-pixel.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-pixel.Tpo -c -o magick/magick_libMagickCore_la-pixel.lo `test -f 'magick/pixel.c' || echo '$(srcdir)/'`magick/pixel.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-pixel.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-pixel.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/pixel.c' object='magick/magick_libMagickCore_la-pixel.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-pixel.lo `test -f 'magick/pixel.c' || echo '$(srcdir)/'`magick/pixel.c
-
-magick/magick_libMagickCore_la-policy.lo: magick/policy.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-policy.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-policy.Tpo -c -o magick/magick_libMagickCore_la-policy.lo `test -f 'magick/policy.c' || echo '$(srcdir)/'`magick/policy.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-policy.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-policy.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/policy.c' object='magick/magick_libMagickCore_la-policy.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-policy.lo `test -f 'magick/policy.c' || echo '$(srcdir)/'`magick/policy.c
-
-magick/magick_libMagickCore_la-PreRvIcccm.lo: magick/PreRvIcccm.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-PreRvIcccm.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-PreRvIcccm.Tpo -c -o magick/magick_libMagickCore_la-PreRvIcccm.lo `test -f 'magick/PreRvIcccm.c' || echo '$(srcdir)/'`magick/PreRvIcccm.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-PreRvIcccm.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-PreRvIcccm.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/PreRvIcccm.c' object='magick/magick_libMagickCore_la-PreRvIcccm.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-PreRvIcccm.lo `test -f 'magick/PreRvIcccm.c' || echo '$(srcdir)/'`magick/PreRvIcccm.c
-
-magick/magick_libMagickCore_la-prepress.lo: magick/prepress.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-prepress.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-prepress.Tpo -c -o magick/magick_libMagickCore_la-prepress.lo `test -f 'magick/prepress.c' || echo '$(srcdir)/'`magick/prepress.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-prepress.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-prepress.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/prepress.c' object='magick/magick_libMagickCore_la-prepress.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-prepress.lo `test -f 'magick/prepress.c' || echo '$(srcdir)/'`magick/prepress.c
-
-magick/magick_libMagickCore_la-property.lo: magick/property.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-property.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-property.Tpo -c -o magick/magick_libMagickCore_la-property.lo `test -f 'magick/property.c' || echo '$(srcdir)/'`magick/property.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-property.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-property.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/property.c' object='magick/magick_libMagickCore_la-property.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-property.lo `test -f 'magick/property.c' || echo '$(srcdir)/'`magick/property.c
-
-magick/magick_libMagickCore_la-profile.lo: magick/profile.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-profile.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-profile.Tpo -c -o magick/magick_libMagickCore_la-profile.lo `test -f 'magick/profile.c' || echo '$(srcdir)/'`magick/profile.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-profile.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-profile.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/profile.c' object='magick/magick_libMagickCore_la-profile.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-profile.lo `test -f 'magick/profile.c' || echo '$(srcdir)/'`magick/profile.c
-
-magick/magick_libMagickCore_la-quantize.lo: magick/quantize.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-quantize.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-quantize.Tpo -c -o magick/magick_libMagickCore_la-quantize.lo `test -f 'magick/quantize.c' || echo '$(srcdir)/'`magick/quantize.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-quantize.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-quantize.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/quantize.c' object='magick/magick_libMagickCore_la-quantize.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-quantize.lo `test -f 'magick/quantize.c' || echo '$(srcdir)/'`magick/quantize.c
-
-magick/magick_libMagickCore_la-quantum.lo: magick/quantum.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-quantum.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-quantum.Tpo -c -o magick/magick_libMagickCore_la-quantum.lo `test -f 'magick/quantum.c' || echo '$(srcdir)/'`magick/quantum.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-quantum.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-quantum.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/quantum.c' object='magick/magick_libMagickCore_la-quantum.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-quantum.lo `test -f 'magick/quantum.c' || echo '$(srcdir)/'`magick/quantum.c
-
-magick/magick_libMagickCore_la-quantum-export.lo: magick/quantum-export.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-quantum-export.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-quantum-export.Tpo -c -o magick/magick_libMagickCore_la-quantum-export.lo `test -f 'magick/quantum-export.c' || echo '$(srcdir)/'`magick/quantum-export.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-quantum-export.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-quantum-export.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/quantum-export.c' object='magick/magick_libMagickCore_la-quantum-export.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-quantum-export.lo `test -f 'magick/quantum-export.c' || echo '$(srcdir)/'`magick/quantum-export.c
-
-magick/magick_libMagickCore_la-quantum-import.lo: magick/quantum-import.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-quantum-import.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-quantum-import.Tpo -c -o magick/magick_libMagickCore_la-quantum-import.lo `test -f 'magick/quantum-import.c' || echo '$(srcdir)/'`magick/quantum-import.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-quantum-import.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-quantum-import.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/quantum-import.c' object='magick/magick_libMagickCore_la-quantum-import.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-quantum-import.lo `test -f 'magick/quantum-import.c' || echo '$(srcdir)/'`magick/quantum-import.c
-
-magick/magick_libMagickCore_la-random.lo: magick/random.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-random.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-random.Tpo -c -o magick/magick_libMagickCore_la-random.lo `test -f 'magick/random.c' || echo '$(srcdir)/'`magick/random.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-random.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-random.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/random.c' object='magick/magick_libMagickCore_la-random.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-random.lo `test -f 'magick/random.c' || echo '$(srcdir)/'`magick/random.c
-
-magick/magick_libMagickCore_la-registry.lo: magick/registry.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-registry.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-registry.Tpo -c -o magick/magick_libMagickCore_la-registry.lo `test -f 'magick/registry.c' || echo '$(srcdir)/'`magick/registry.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-registry.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-registry.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/registry.c' object='magick/magick_libMagickCore_la-registry.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-registry.lo `test -f 'magick/registry.c' || echo '$(srcdir)/'`magick/registry.c
-
-magick/magick_libMagickCore_la-resample.lo: magick/resample.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-resample.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-resample.Tpo -c -o magick/magick_libMagickCore_la-resample.lo `test -f 'magick/resample.c' || echo '$(srcdir)/'`magick/resample.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-resample.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-resample.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/resample.c' object='magick/magick_libMagickCore_la-resample.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-resample.lo `test -f 'magick/resample.c' || echo '$(srcdir)/'`magick/resample.c
-
-magick/magick_libMagickCore_la-resize.lo: magick/resize.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-resize.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-resize.Tpo -c -o magick/magick_libMagickCore_la-resize.lo `test -f 'magick/resize.c' || echo '$(srcdir)/'`magick/resize.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-resize.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-resize.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/resize.c' object='magick/magick_libMagickCore_la-resize.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-resize.lo `test -f 'magick/resize.c' || echo '$(srcdir)/'`magick/resize.c
-
-magick/magick_libMagickCore_la-resource.lo: magick/resource.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-resource.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-resource.Tpo -c -o magick/magick_libMagickCore_la-resource.lo `test -f 'magick/resource.c' || echo '$(srcdir)/'`magick/resource.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-resource.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-resource.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/resource.c' object='magick/magick_libMagickCore_la-resource.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-resource.lo `test -f 'magick/resource.c' || echo '$(srcdir)/'`magick/resource.c
-
-magick/magick_libMagickCore_la-segment.lo: magick/segment.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-segment.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-segment.Tpo -c -o magick/magick_libMagickCore_la-segment.lo `test -f 'magick/segment.c' || echo '$(srcdir)/'`magick/segment.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-segment.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-segment.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/segment.c' object='magick/magick_libMagickCore_la-segment.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-segment.lo `test -f 'magick/segment.c' || echo '$(srcdir)/'`magick/segment.c
-
-magick/magick_libMagickCore_la-semaphore.lo: magick/semaphore.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-semaphore.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-semaphore.Tpo -c -o magick/magick_libMagickCore_la-semaphore.lo `test -f 'magick/semaphore.c' || echo '$(srcdir)/'`magick/semaphore.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-semaphore.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-semaphore.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/semaphore.c' object='magick/magick_libMagickCore_la-semaphore.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-semaphore.lo `test -f 'magick/semaphore.c' || echo '$(srcdir)/'`magick/semaphore.c
-
-magick/magick_libMagickCore_la-shear.lo: magick/shear.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-shear.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-shear.Tpo -c -o magick/magick_libMagickCore_la-shear.lo `test -f 'magick/shear.c' || echo '$(srcdir)/'`magick/shear.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-shear.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-shear.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/shear.c' object='magick/magick_libMagickCore_la-shear.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-shear.lo `test -f 'magick/shear.c' || echo '$(srcdir)/'`magick/shear.c
-
-magick/magick_libMagickCore_la-signature.lo: magick/signature.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-signature.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-signature.Tpo -c -o magick/magick_libMagickCore_la-signature.lo `test -f 'magick/signature.c' || echo '$(srcdir)/'`magick/signature.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-signature.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-signature.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/signature.c' object='magick/magick_libMagickCore_la-signature.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-signature.lo `test -f 'magick/signature.c' || echo '$(srcdir)/'`magick/signature.c
-
-magick/magick_libMagickCore_la-splay-tree.lo: magick/splay-tree.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-splay-tree.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-splay-tree.Tpo -c -o magick/magick_libMagickCore_la-splay-tree.lo `test -f 'magick/splay-tree.c' || echo '$(srcdir)/'`magick/splay-tree.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-splay-tree.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-splay-tree.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/splay-tree.c' object='magick/magick_libMagickCore_la-splay-tree.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-splay-tree.lo `test -f 'magick/splay-tree.c' || echo '$(srcdir)/'`magick/splay-tree.c
-
-magick/magick_libMagickCore_la-static.lo: magick/static.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-static.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-static.Tpo -c -o magick/magick_libMagickCore_la-static.lo `test -f 'magick/static.c' || echo '$(srcdir)/'`magick/static.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-static.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-static.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/static.c' object='magick/magick_libMagickCore_la-static.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-static.lo `test -f 'magick/static.c' || echo '$(srcdir)/'`magick/static.c
-
-magick/magick_libMagickCore_la-statistic.lo: magick/statistic.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-statistic.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-statistic.Tpo -c -o magick/magick_libMagickCore_la-statistic.lo `test -f 'magick/statistic.c' || echo '$(srcdir)/'`magick/statistic.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-statistic.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-statistic.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/statistic.c' object='magick/magick_libMagickCore_la-statistic.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-statistic.lo `test -f 'magick/statistic.c' || echo '$(srcdir)/'`magick/statistic.c
-
-magick/magick_libMagickCore_la-stream.lo: magick/stream.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-stream.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-stream.Tpo -c -o magick/magick_libMagickCore_la-stream.lo `test -f 'magick/stream.c' || echo '$(srcdir)/'`magick/stream.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-stream.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-stream.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/stream.c' object='magick/magick_libMagickCore_la-stream.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-stream.lo `test -f 'magick/stream.c' || echo '$(srcdir)/'`magick/stream.c
-
-magick/magick_libMagickCore_la-string.lo: magick/string.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-string.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-string.Tpo -c -o magick/magick_libMagickCore_la-string.lo `test -f 'magick/string.c' || echo '$(srcdir)/'`magick/string.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-string.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-string.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/string.c' object='magick/magick_libMagickCore_la-string.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-string.lo `test -f 'magick/string.c' || echo '$(srcdir)/'`magick/string.c
-
-magick/magick_libMagickCore_la-thread.lo: magick/thread.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-thread.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-thread.Tpo -c -o magick/magick_libMagickCore_la-thread.lo `test -f 'magick/thread.c' || echo '$(srcdir)/'`magick/thread.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-thread.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-thread.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/thread.c' object='magick/magick_libMagickCore_la-thread.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-thread.lo `test -f 'magick/thread.c' || echo '$(srcdir)/'`magick/thread.c
-
-magick/magick_libMagickCore_la-timer.lo: magick/timer.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-timer.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-timer.Tpo -c -o magick/magick_libMagickCore_la-timer.lo `test -f 'magick/timer.c' || echo '$(srcdir)/'`magick/timer.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-timer.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-timer.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/timer.c' object='magick/magick_libMagickCore_la-timer.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-timer.lo `test -f 'magick/timer.c' || echo '$(srcdir)/'`magick/timer.c
-
-magick/magick_libMagickCore_la-token.lo: magick/token.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-token.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-token.Tpo -c -o magick/magick_libMagickCore_la-token.lo `test -f 'magick/token.c' || echo '$(srcdir)/'`magick/token.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-token.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-token.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/token.c' object='magick/magick_libMagickCore_la-token.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-token.lo `test -f 'magick/token.c' || echo '$(srcdir)/'`magick/token.c
-
-magick/magick_libMagickCore_la-transform.lo: magick/transform.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-transform.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-transform.Tpo -c -o magick/magick_libMagickCore_la-transform.lo `test -f 'magick/transform.c' || echo '$(srcdir)/'`magick/transform.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-transform.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-transform.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/transform.c' object='magick/magick_libMagickCore_la-transform.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-transform.lo `test -f 'magick/transform.c' || echo '$(srcdir)/'`magick/transform.c
-
-magick/magick_libMagickCore_la-threshold.lo: magick/threshold.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-threshold.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-threshold.Tpo -c -o magick/magick_libMagickCore_la-threshold.lo `test -f 'magick/threshold.c' || echo '$(srcdir)/'`magick/threshold.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-threshold.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-threshold.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/threshold.c' object='magick/magick_libMagickCore_la-threshold.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-threshold.lo `test -f 'magick/threshold.c' || echo '$(srcdir)/'`magick/threshold.c
-
-magick/magick_libMagickCore_la-type.lo: magick/type.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-type.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-type.Tpo -c -o magick/magick_libMagickCore_la-type.lo `test -f 'magick/type.c' || echo '$(srcdir)/'`magick/type.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-type.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-type.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/type.c' object='magick/magick_libMagickCore_la-type.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-type.lo `test -f 'magick/type.c' || echo '$(srcdir)/'`magick/type.c
-
-magick/magick_libMagickCore_la-utility.lo: magick/utility.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-utility.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-utility.Tpo -c -o magick/magick_libMagickCore_la-utility.lo `test -f 'magick/utility.c' || echo '$(srcdir)/'`magick/utility.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-utility.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-utility.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/utility.c' object='magick/magick_libMagickCore_la-utility.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-utility.lo `test -f 'magick/utility.c' || echo '$(srcdir)/'`magick/utility.c
-
-magick/magick_libMagickCore_la-version.lo: magick/version.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-version.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-version.Tpo -c -o magick/magick_libMagickCore_la-version.lo `test -f 'magick/version.c' || echo '$(srcdir)/'`magick/version.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-version.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-version.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/version.c' object='magick/magick_libMagickCore_la-version.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-version.lo `test -f 'magick/version.c' || echo '$(srcdir)/'`magick/version.c
-
-magick/magick_libMagickCore_la-widget.lo: magick/widget.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-widget.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-widget.Tpo -c -o magick/magick_libMagickCore_la-widget.lo `test -f 'magick/widget.c' || echo '$(srcdir)/'`magick/widget.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-widget.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-widget.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/widget.c' object='magick/magick_libMagickCore_la-widget.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-widget.lo `test -f 'magick/widget.c' || echo '$(srcdir)/'`magick/widget.c
-
-magick/magick_libMagickCore_la-xml-tree.lo: magick/xml-tree.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-xml-tree.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-xml-tree.Tpo -c -o magick/magick_libMagickCore_la-xml-tree.lo `test -f 'magick/xml-tree.c' || echo '$(srcdir)/'`magick/xml-tree.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-xml-tree.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-xml-tree.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/xml-tree.c' object='magick/magick_libMagickCore_la-xml-tree.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-xml-tree.lo `test -f 'magick/xml-tree.c' || echo '$(srcdir)/'`magick/xml-tree.c
-
-magick/magick_libMagickCore_la-xwindow.lo: magick/xwindow.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-xwindow.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-xwindow.Tpo -c -o magick/magick_libMagickCore_la-xwindow.lo `test -f 'magick/xwindow.c' || echo '$(srcdir)/'`magick/xwindow.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-xwindow.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-xwindow.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/xwindow.c' object='magick/magick_libMagickCore_la-xwindow.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-xwindow.lo `test -f 'magick/xwindow.c' || echo '$(srcdir)/'`magick/xwindow.c
-
-magick/magick_libMagickCore_la-nt-feature.lo: magick/nt-feature.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-nt-feature.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-nt-feature.Tpo -c -o magick/magick_libMagickCore_la-nt-feature.lo `test -f 'magick/nt-feature.c' || echo '$(srcdir)/'`magick/nt-feature.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-nt-feature.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-nt-feature.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/nt-feature.c' object='magick/magick_libMagickCore_la-nt-feature.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-nt-feature.lo `test -f 'magick/nt-feature.c' || echo '$(srcdir)/'`magick/nt-feature.c
-
-magick/magick_libMagickCore_la-nt-base.lo: magick/nt-base.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT magick/magick_libMagickCore_la-nt-base.lo -MD -MP -MF magick/$(DEPDIR)/magick_libMagickCore_la-nt-base.Tpo -c -o magick/magick_libMagickCore_la-nt-base.lo `test -f 'magick/nt-base.c' || echo '$(srcdir)/'`magick/nt-base.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) magick/$(DEPDIR)/magick_libMagickCore_la-nt-base.Tpo magick/$(DEPDIR)/magick_libMagickCore_la-nt-base.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='magick/nt-base.c' object='magick/magick_libMagickCore_la-nt-base.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o magick/magick_libMagickCore_la-nt-base.lo `test -f 'magick/nt-base.c' || echo '$(srcdir)/'`magick/nt-base.c
-
-coders/magick_libMagickCore_la-aai.lo: coders/aai.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-aai.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-aai.Tpo -c -o coders/magick_libMagickCore_la-aai.lo `test -f 'coders/aai.c' || echo '$(srcdir)/'`coders/aai.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-aai.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-aai.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/aai.c' object='coders/magick_libMagickCore_la-aai.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-aai.lo `test -f 'coders/aai.c' || echo '$(srcdir)/'`coders/aai.c
-
-coders/magick_libMagickCore_la-art.lo: coders/art.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-art.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-art.Tpo -c -o coders/magick_libMagickCore_la-art.lo `test -f 'coders/art.c' || echo '$(srcdir)/'`coders/art.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-art.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-art.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/art.c' object='coders/magick_libMagickCore_la-art.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-art.lo `test -f 'coders/art.c' || echo '$(srcdir)/'`coders/art.c
-
-coders/magick_libMagickCore_la-avs.lo: coders/avs.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-avs.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-avs.Tpo -c -o coders/magick_libMagickCore_la-avs.lo `test -f 'coders/avs.c' || echo '$(srcdir)/'`coders/avs.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-avs.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-avs.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/avs.c' object='coders/magick_libMagickCore_la-avs.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-avs.lo `test -f 'coders/avs.c' || echo '$(srcdir)/'`coders/avs.c
-
-coders/magick_libMagickCore_la-bgr.lo: coders/bgr.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-bgr.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-bgr.Tpo -c -o coders/magick_libMagickCore_la-bgr.lo `test -f 'coders/bgr.c' || echo '$(srcdir)/'`coders/bgr.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-bgr.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-bgr.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/bgr.c' object='coders/magick_libMagickCore_la-bgr.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-bgr.lo `test -f 'coders/bgr.c' || echo '$(srcdir)/'`coders/bgr.c
-
-coders/magick_libMagickCore_la-bmp.lo: coders/bmp.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-bmp.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-bmp.Tpo -c -o coders/magick_libMagickCore_la-bmp.lo `test -f 'coders/bmp.c' || echo '$(srcdir)/'`coders/bmp.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-bmp.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-bmp.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/bmp.c' object='coders/magick_libMagickCore_la-bmp.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-bmp.lo `test -f 'coders/bmp.c' || echo '$(srcdir)/'`coders/bmp.c
-
-coders/magick_libMagickCore_la-braille.lo: coders/braille.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-braille.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-braille.Tpo -c -o coders/magick_libMagickCore_la-braille.lo `test -f 'coders/braille.c' || echo '$(srcdir)/'`coders/braille.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-braille.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-braille.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/braille.c' object='coders/magick_libMagickCore_la-braille.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-braille.lo `test -f 'coders/braille.c' || echo '$(srcdir)/'`coders/braille.c
-
-coders/magick_libMagickCore_la-cals.lo: coders/cals.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-cals.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-cals.Tpo -c -o coders/magick_libMagickCore_la-cals.lo `test -f 'coders/cals.c' || echo '$(srcdir)/'`coders/cals.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-cals.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-cals.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/cals.c' object='coders/magick_libMagickCore_la-cals.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-cals.lo `test -f 'coders/cals.c' || echo '$(srcdir)/'`coders/cals.c
-
-coders/magick_libMagickCore_la-caption.lo: coders/caption.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-caption.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-caption.Tpo -c -o coders/magick_libMagickCore_la-caption.lo `test -f 'coders/caption.c' || echo '$(srcdir)/'`coders/caption.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-caption.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-caption.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/caption.c' object='coders/magick_libMagickCore_la-caption.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-caption.lo `test -f 'coders/caption.c' || echo '$(srcdir)/'`coders/caption.c
-
-coders/magick_libMagickCore_la-cin.lo: coders/cin.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-cin.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-cin.Tpo -c -o coders/magick_libMagickCore_la-cin.lo `test -f 'coders/cin.c' || echo '$(srcdir)/'`coders/cin.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-cin.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-cin.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/cin.c' object='coders/magick_libMagickCore_la-cin.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-cin.lo `test -f 'coders/cin.c' || echo '$(srcdir)/'`coders/cin.c
-
-coders/magick_libMagickCore_la-cip.lo: coders/cip.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-cip.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-cip.Tpo -c -o coders/magick_libMagickCore_la-cip.lo `test -f 'coders/cip.c' || echo '$(srcdir)/'`coders/cip.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-cip.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-cip.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/cip.c' object='coders/magick_libMagickCore_la-cip.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-cip.lo `test -f 'coders/cip.c' || echo '$(srcdir)/'`coders/cip.c
-
-coders/magick_libMagickCore_la-clip.lo: coders/clip.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-clip.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-clip.Tpo -c -o coders/magick_libMagickCore_la-clip.lo `test -f 'coders/clip.c' || echo '$(srcdir)/'`coders/clip.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-clip.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-clip.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/clip.c' object='coders/magick_libMagickCore_la-clip.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-clip.lo `test -f 'coders/clip.c' || echo '$(srcdir)/'`coders/clip.c
-
-coders/magick_libMagickCore_la-cmyk.lo: coders/cmyk.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-cmyk.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-cmyk.Tpo -c -o coders/magick_libMagickCore_la-cmyk.lo `test -f 'coders/cmyk.c' || echo '$(srcdir)/'`coders/cmyk.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-cmyk.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-cmyk.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/cmyk.c' object='coders/magick_libMagickCore_la-cmyk.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-cmyk.lo `test -f 'coders/cmyk.c' || echo '$(srcdir)/'`coders/cmyk.c
-
-coders/magick_libMagickCore_la-cut.lo: coders/cut.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-cut.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-cut.Tpo -c -o coders/magick_libMagickCore_la-cut.lo `test -f 'coders/cut.c' || echo '$(srcdir)/'`coders/cut.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-cut.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-cut.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/cut.c' object='coders/magick_libMagickCore_la-cut.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-cut.lo `test -f 'coders/cut.c' || echo '$(srcdir)/'`coders/cut.c
-
-coders/magick_libMagickCore_la-dcm.lo: coders/dcm.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-dcm.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-dcm.Tpo -c -o coders/magick_libMagickCore_la-dcm.lo `test -f 'coders/dcm.c' || echo '$(srcdir)/'`coders/dcm.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-dcm.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-dcm.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/dcm.c' object='coders/magick_libMagickCore_la-dcm.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-dcm.lo `test -f 'coders/dcm.c' || echo '$(srcdir)/'`coders/dcm.c
-
-coders/magick_libMagickCore_la-dds.lo: coders/dds.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-dds.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-dds.Tpo -c -o coders/magick_libMagickCore_la-dds.lo `test -f 'coders/dds.c' || echo '$(srcdir)/'`coders/dds.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-dds.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-dds.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/dds.c' object='coders/magick_libMagickCore_la-dds.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-dds.lo `test -f 'coders/dds.c' || echo '$(srcdir)/'`coders/dds.c
-
-coders/magick_libMagickCore_la-debug.lo: coders/debug.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-debug.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-debug.Tpo -c -o coders/magick_libMagickCore_la-debug.lo `test -f 'coders/debug.c' || echo '$(srcdir)/'`coders/debug.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-debug.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-debug.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/debug.c' object='coders/magick_libMagickCore_la-debug.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-debug.lo `test -f 'coders/debug.c' || echo '$(srcdir)/'`coders/debug.c
-
-coders/magick_libMagickCore_la-dib.lo: coders/dib.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-dib.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-dib.Tpo -c -o coders/magick_libMagickCore_la-dib.lo `test -f 'coders/dib.c' || echo '$(srcdir)/'`coders/dib.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-dib.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-dib.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/dib.c' object='coders/magick_libMagickCore_la-dib.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-dib.lo `test -f 'coders/dib.c' || echo '$(srcdir)/'`coders/dib.c
-
-coders/magick_libMagickCore_la-dng.lo: coders/dng.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-dng.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-dng.Tpo -c -o coders/magick_libMagickCore_la-dng.lo `test -f 'coders/dng.c' || echo '$(srcdir)/'`coders/dng.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-dng.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-dng.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/dng.c' object='coders/magick_libMagickCore_la-dng.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-dng.lo `test -f 'coders/dng.c' || echo '$(srcdir)/'`coders/dng.c
-
-coders/magick_libMagickCore_la-dot.lo: coders/dot.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-dot.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-dot.Tpo -c -o coders/magick_libMagickCore_la-dot.lo `test -f 'coders/dot.c' || echo '$(srcdir)/'`coders/dot.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-dot.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-dot.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/dot.c' object='coders/magick_libMagickCore_la-dot.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-dot.lo `test -f 'coders/dot.c' || echo '$(srcdir)/'`coders/dot.c
-
-coders/magick_libMagickCore_la-dpx.lo: coders/dpx.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-dpx.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-dpx.Tpo -c -o coders/magick_libMagickCore_la-dpx.lo `test -f 'coders/dpx.c' || echo '$(srcdir)/'`coders/dpx.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-dpx.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-dpx.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/dpx.c' object='coders/magick_libMagickCore_la-dpx.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-dpx.lo `test -f 'coders/dpx.c' || echo '$(srcdir)/'`coders/dpx.c
-
-coders/magick_libMagickCore_la-fax.lo: coders/fax.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-fax.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-fax.Tpo -c -o coders/magick_libMagickCore_la-fax.lo `test -f 'coders/fax.c' || echo '$(srcdir)/'`coders/fax.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-fax.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-fax.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/fax.c' object='coders/magick_libMagickCore_la-fax.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-fax.lo `test -f 'coders/fax.c' || echo '$(srcdir)/'`coders/fax.c
-
-coders/magick_libMagickCore_la-fits.lo: coders/fits.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-fits.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-fits.Tpo -c -o coders/magick_libMagickCore_la-fits.lo `test -f 'coders/fits.c' || echo '$(srcdir)/'`coders/fits.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-fits.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-fits.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/fits.c' object='coders/magick_libMagickCore_la-fits.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-fits.lo `test -f 'coders/fits.c' || echo '$(srcdir)/'`coders/fits.c
-
-coders/magick_libMagickCore_la-gif.lo: coders/gif.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-gif.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-gif.Tpo -c -o coders/magick_libMagickCore_la-gif.lo `test -f 'coders/gif.c' || echo '$(srcdir)/'`coders/gif.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-gif.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-gif.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/gif.c' object='coders/magick_libMagickCore_la-gif.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-gif.lo `test -f 'coders/gif.c' || echo '$(srcdir)/'`coders/gif.c
-
-coders/magick_libMagickCore_la-gradient.lo: coders/gradient.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-gradient.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-gradient.Tpo -c -o coders/magick_libMagickCore_la-gradient.lo `test -f 'coders/gradient.c' || echo '$(srcdir)/'`coders/gradient.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-gradient.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-gradient.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/gradient.c' object='coders/magick_libMagickCore_la-gradient.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-gradient.lo `test -f 'coders/gradient.c' || echo '$(srcdir)/'`coders/gradient.c
-
-coders/magick_libMagickCore_la-gray.lo: coders/gray.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-gray.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-gray.Tpo -c -o coders/magick_libMagickCore_la-gray.lo `test -f 'coders/gray.c' || echo '$(srcdir)/'`coders/gray.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-gray.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-gray.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/gray.c' object='coders/magick_libMagickCore_la-gray.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-gray.lo `test -f 'coders/gray.c' || echo '$(srcdir)/'`coders/gray.c
-
-coders/magick_libMagickCore_la-hald.lo: coders/hald.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-hald.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-hald.Tpo -c -o coders/magick_libMagickCore_la-hald.lo `test -f 'coders/hald.c' || echo '$(srcdir)/'`coders/hald.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-hald.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-hald.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/hald.c' object='coders/magick_libMagickCore_la-hald.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-hald.lo `test -f 'coders/hald.c' || echo '$(srcdir)/'`coders/hald.c
-
-coders/magick_libMagickCore_la-hdr.lo: coders/hdr.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-hdr.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-hdr.Tpo -c -o coders/magick_libMagickCore_la-hdr.lo `test -f 'coders/hdr.c' || echo '$(srcdir)/'`coders/hdr.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-hdr.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-hdr.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/hdr.c' object='coders/magick_libMagickCore_la-hdr.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-hdr.lo `test -f 'coders/hdr.c' || echo '$(srcdir)/'`coders/hdr.c
-
-coders/magick_libMagickCore_la-histogram.lo: coders/histogram.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-histogram.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-histogram.Tpo -c -o coders/magick_libMagickCore_la-histogram.lo `test -f 'coders/histogram.c' || echo '$(srcdir)/'`coders/histogram.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-histogram.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-histogram.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/histogram.c' object='coders/magick_libMagickCore_la-histogram.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-histogram.lo `test -f 'coders/histogram.c' || echo '$(srcdir)/'`coders/histogram.c
-
-coders/magick_libMagickCore_la-hrz.lo: coders/hrz.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-hrz.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-hrz.Tpo -c -o coders/magick_libMagickCore_la-hrz.lo `test -f 'coders/hrz.c' || echo '$(srcdir)/'`coders/hrz.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-hrz.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-hrz.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/hrz.c' object='coders/magick_libMagickCore_la-hrz.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-hrz.lo `test -f 'coders/hrz.c' || echo '$(srcdir)/'`coders/hrz.c
-
-coders/magick_libMagickCore_la-html.lo: coders/html.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-html.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-html.Tpo -c -o coders/magick_libMagickCore_la-html.lo `test -f 'coders/html.c' || echo '$(srcdir)/'`coders/html.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-html.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-html.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/html.c' object='coders/magick_libMagickCore_la-html.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-html.lo `test -f 'coders/html.c' || echo '$(srcdir)/'`coders/html.c
-
-coders/magick_libMagickCore_la-icon.lo: coders/icon.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-icon.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-icon.Tpo -c -o coders/magick_libMagickCore_la-icon.lo `test -f 'coders/icon.c' || echo '$(srcdir)/'`coders/icon.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-icon.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-icon.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/icon.c' object='coders/magick_libMagickCore_la-icon.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-icon.lo `test -f 'coders/icon.c' || echo '$(srcdir)/'`coders/icon.c
-
-coders/magick_libMagickCore_la-info.lo: coders/info.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-info.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-info.Tpo -c -o coders/magick_libMagickCore_la-info.lo `test -f 'coders/info.c' || echo '$(srcdir)/'`coders/info.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-info.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-info.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/info.c' object='coders/magick_libMagickCore_la-info.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-info.lo `test -f 'coders/info.c' || echo '$(srcdir)/'`coders/info.c
-
-coders/magick_libMagickCore_la-inline.lo: coders/inline.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-inline.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-inline.Tpo -c -o coders/magick_libMagickCore_la-inline.lo `test -f 'coders/inline.c' || echo '$(srcdir)/'`coders/inline.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-inline.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-inline.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/inline.c' object='coders/magick_libMagickCore_la-inline.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-inline.lo `test -f 'coders/inline.c' || echo '$(srcdir)/'`coders/inline.c
-
-coders/magick_libMagickCore_la-ipl.lo: coders/ipl.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-ipl.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-ipl.Tpo -c -o coders/magick_libMagickCore_la-ipl.lo `test -f 'coders/ipl.c' || echo '$(srcdir)/'`coders/ipl.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-ipl.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-ipl.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/ipl.c' object='coders/magick_libMagickCore_la-ipl.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-ipl.lo `test -f 'coders/ipl.c' || echo '$(srcdir)/'`coders/ipl.c
-
-coders/magick_libMagickCore_la-label.lo: coders/label.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-label.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-label.Tpo -c -o coders/magick_libMagickCore_la-label.lo `test -f 'coders/label.c' || echo '$(srcdir)/'`coders/label.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-label.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-label.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/label.c' object='coders/magick_libMagickCore_la-label.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-label.lo `test -f 'coders/label.c' || echo '$(srcdir)/'`coders/label.c
-
-coders/magick_libMagickCore_la-mac.lo: coders/mac.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-mac.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-mac.Tpo -c -o coders/magick_libMagickCore_la-mac.lo `test -f 'coders/mac.c' || echo '$(srcdir)/'`coders/mac.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-mac.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-mac.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/mac.c' object='coders/magick_libMagickCore_la-mac.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-mac.lo `test -f 'coders/mac.c' || echo '$(srcdir)/'`coders/mac.c
-
-coders/magick_libMagickCore_la-magick.lo: coders/magick.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-magick.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-magick.Tpo -c -o coders/magick_libMagickCore_la-magick.lo `test -f 'coders/magick.c' || echo '$(srcdir)/'`coders/magick.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-magick.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-magick.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/magick.c' object='coders/magick_libMagickCore_la-magick.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-magick.lo `test -f 'coders/magick.c' || echo '$(srcdir)/'`coders/magick.c
-
-coders/magick_libMagickCore_la-map.lo: coders/map.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-map.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-map.Tpo -c -o coders/magick_libMagickCore_la-map.lo `test -f 'coders/map.c' || echo '$(srcdir)/'`coders/map.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-map.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-map.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/map.c' object='coders/magick_libMagickCore_la-map.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-map.lo `test -f 'coders/map.c' || echo '$(srcdir)/'`coders/map.c
-
-coders/magick_libMagickCore_la-mat.lo: coders/mat.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-mat.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-mat.Tpo -c -o coders/magick_libMagickCore_la-mat.lo `test -f 'coders/mat.c' || echo '$(srcdir)/'`coders/mat.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-mat.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-mat.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/mat.c' object='coders/magick_libMagickCore_la-mat.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-mat.lo `test -f 'coders/mat.c' || echo '$(srcdir)/'`coders/mat.c
-
-coders/magick_libMagickCore_la-matte.lo: coders/matte.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-matte.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-matte.Tpo -c -o coders/magick_libMagickCore_la-matte.lo `test -f 'coders/matte.c' || echo '$(srcdir)/'`coders/matte.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-matte.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-matte.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/matte.c' object='coders/magick_libMagickCore_la-matte.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-matte.lo `test -f 'coders/matte.c' || echo '$(srcdir)/'`coders/matte.c
-
-coders/magick_libMagickCore_la-meta.lo: coders/meta.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-meta.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-meta.Tpo -c -o coders/magick_libMagickCore_la-meta.lo `test -f 'coders/meta.c' || echo '$(srcdir)/'`coders/meta.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-meta.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-meta.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/meta.c' object='coders/magick_libMagickCore_la-meta.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-meta.lo `test -f 'coders/meta.c' || echo '$(srcdir)/'`coders/meta.c
-
-coders/magick_libMagickCore_la-miff.lo: coders/miff.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-miff.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-miff.Tpo -c -o coders/magick_libMagickCore_la-miff.lo `test -f 'coders/miff.c' || echo '$(srcdir)/'`coders/miff.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-miff.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-miff.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/miff.c' object='coders/magick_libMagickCore_la-miff.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-miff.lo `test -f 'coders/miff.c' || echo '$(srcdir)/'`coders/miff.c
-
-coders/magick_libMagickCore_la-mono.lo: coders/mono.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-mono.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-mono.Tpo -c -o coders/magick_libMagickCore_la-mono.lo `test -f 'coders/mono.c' || echo '$(srcdir)/'`coders/mono.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-mono.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-mono.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/mono.c' object='coders/magick_libMagickCore_la-mono.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-mono.lo `test -f 'coders/mono.c' || echo '$(srcdir)/'`coders/mono.c
-
-coders/magick_libMagickCore_la-mpc.lo: coders/mpc.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-mpc.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-mpc.Tpo -c -o coders/magick_libMagickCore_la-mpc.lo `test -f 'coders/mpc.c' || echo '$(srcdir)/'`coders/mpc.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-mpc.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-mpc.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/mpc.c' object='coders/magick_libMagickCore_la-mpc.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-mpc.lo `test -f 'coders/mpc.c' || echo '$(srcdir)/'`coders/mpc.c
-
-coders/magick_libMagickCore_la-mpeg.lo: coders/mpeg.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-mpeg.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-mpeg.Tpo -c -o coders/magick_libMagickCore_la-mpeg.lo `test -f 'coders/mpeg.c' || echo '$(srcdir)/'`coders/mpeg.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-mpeg.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-mpeg.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/mpeg.c' object='coders/magick_libMagickCore_la-mpeg.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-mpeg.lo `test -f 'coders/mpeg.c' || echo '$(srcdir)/'`coders/mpeg.c
-
-coders/magick_libMagickCore_la-mpr.lo: coders/mpr.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-mpr.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-mpr.Tpo -c -o coders/magick_libMagickCore_la-mpr.lo `test -f 'coders/mpr.c' || echo '$(srcdir)/'`coders/mpr.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-mpr.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-mpr.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/mpr.c' object='coders/magick_libMagickCore_la-mpr.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-mpr.lo `test -f 'coders/mpr.c' || echo '$(srcdir)/'`coders/mpr.c
-
-coders/magick_libMagickCore_la-msl.lo: coders/msl.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-msl.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-msl.Tpo -c -o coders/magick_libMagickCore_la-msl.lo `test -f 'coders/msl.c' || echo '$(srcdir)/'`coders/msl.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-msl.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-msl.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/msl.c' object='coders/magick_libMagickCore_la-msl.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-msl.lo `test -f 'coders/msl.c' || echo '$(srcdir)/'`coders/msl.c
-
-coders/magick_libMagickCore_la-mtv.lo: coders/mtv.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-mtv.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-mtv.Tpo -c -o coders/magick_libMagickCore_la-mtv.lo `test -f 'coders/mtv.c' || echo '$(srcdir)/'`coders/mtv.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-mtv.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-mtv.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/mtv.c' object='coders/magick_libMagickCore_la-mtv.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-mtv.lo `test -f 'coders/mtv.c' || echo '$(srcdir)/'`coders/mtv.c
-
-coders/magick_libMagickCore_la-mvg.lo: coders/mvg.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-mvg.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-mvg.Tpo -c -o coders/magick_libMagickCore_la-mvg.lo `test -f 'coders/mvg.c' || echo '$(srcdir)/'`coders/mvg.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-mvg.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-mvg.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/mvg.c' object='coders/magick_libMagickCore_la-mvg.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-mvg.lo `test -f 'coders/mvg.c' || echo '$(srcdir)/'`coders/mvg.c
-
-coders/magick_libMagickCore_la-null.lo: coders/null.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-null.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-null.Tpo -c -o coders/magick_libMagickCore_la-null.lo `test -f 'coders/null.c' || echo '$(srcdir)/'`coders/null.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-null.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-null.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/null.c' object='coders/magick_libMagickCore_la-null.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-null.lo `test -f 'coders/null.c' || echo '$(srcdir)/'`coders/null.c
-
-coders/magick_libMagickCore_la-otb.lo: coders/otb.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-otb.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-otb.Tpo -c -o coders/magick_libMagickCore_la-otb.lo `test -f 'coders/otb.c' || echo '$(srcdir)/'`coders/otb.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-otb.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-otb.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/otb.c' object='coders/magick_libMagickCore_la-otb.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-otb.lo `test -f 'coders/otb.c' || echo '$(srcdir)/'`coders/otb.c
-
-coders/magick_libMagickCore_la-palm.lo: coders/palm.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-palm.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-palm.Tpo -c -o coders/magick_libMagickCore_la-palm.lo `test -f 'coders/palm.c' || echo '$(srcdir)/'`coders/palm.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-palm.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-palm.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/palm.c' object='coders/magick_libMagickCore_la-palm.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-palm.lo `test -f 'coders/palm.c' || echo '$(srcdir)/'`coders/palm.c
-
-coders/magick_libMagickCore_la-pattern.lo: coders/pattern.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-pattern.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-pattern.Tpo -c -o coders/magick_libMagickCore_la-pattern.lo `test -f 'coders/pattern.c' || echo '$(srcdir)/'`coders/pattern.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-pattern.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-pattern.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/pattern.c' object='coders/magick_libMagickCore_la-pattern.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-pattern.lo `test -f 'coders/pattern.c' || echo '$(srcdir)/'`coders/pattern.c
-
-coders/magick_libMagickCore_la-pcd.lo: coders/pcd.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-pcd.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-pcd.Tpo -c -o coders/magick_libMagickCore_la-pcd.lo `test -f 'coders/pcd.c' || echo '$(srcdir)/'`coders/pcd.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-pcd.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-pcd.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/pcd.c' object='coders/magick_libMagickCore_la-pcd.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-pcd.lo `test -f 'coders/pcd.c' || echo '$(srcdir)/'`coders/pcd.c
-
-coders/magick_libMagickCore_la-pcl.lo: coders/pcl.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-pcl.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-pcl.Tpo -c -o coders/magick_libMagickCore_la-pcl.lo `test -f 'coders/pcl.c' || echo '$(srcdir)/'`coders/pcl.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-pcl.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-pcl.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/pcl.c' object='coders/magick_libMagickCore_la-pcl.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-pcl.lo `test -f 'coders/pcl.c' || echo '$(srcdir)/'`coders/pcl.c
-
-coders/magick_libMagickCore_la-pcx.lo: coders/pcx.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-pcx.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-pcx.Tpo -c -o coders/magick_libMagickCore_la-pcx.lo `test -f 'coders/pcx.c' || echo '$(srcdir)/'`coders/pcx.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-pcx.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-pcx.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/pcx.c' object='coders/magick_libMagickCore_la-pcx.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-pcx.lo `test -f 'coders/pcx.c' || echo '$(srcdir)/'`coders/pcx.c
-
-coders/magick_libMagickCore_la-pdb.lo: coders/pdb.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-pdb.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-pdb.Tpo -c -o coders/magick_libMagickCore_la-pdb.lo `test -f 'coders/pdb.c' || echo '$(srcdir)/'`coders/pdb.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-pdb.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-pdb.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/pdb.c' object='coders/magick_libMagickCore_la-pdb.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-pdb.lo `test -f 'coders/pdb.c' || echo '$(srcdir)/'`coders/pdb.c
-
-coders/magick_libMagickCore_la-pdf.lo: coders/pdf.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-pdf.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-pdf.Tpo -c -o coders/magick_libMagickCore_la-pdf.lo `test -f 'coders/pdf.c' || echo '$(srcdir)/'`coders/pdf.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-pdf.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-pdf.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/pdf.c' object='coders/magick_libMagickCore_la-pdf.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-pdf.lo `test -f 'coders/pdf.c' || echo '$(srcdir)/'`coders/pdf.c
-
-coders/magick_libMagickCore_la-pes.lo: coders/pes.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-pes.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-pes.Tpo -c -o coders/magick_libMagickCore_la-pes.lo `test -f 'coders/pes.c' || echo '$(srcdir)/'`coders/pes.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-pes.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-pes.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/pes.c' object='coders/magick_libMagickCore_la-pes.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-pes.lo `test -f 'coders/pes.c' || echo '$(srcdir)/'`coders/pes.c
-
-coders/magick_libMagickCore_la-pict.lo: coders/pict.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-pict.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-pict.Tpo -c -o coders/magick_libMagickCore_la-pict.lo `test -f 'coders/pict.c' || echo '$(srcdir)/'`coders/pict.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-pict.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-pict.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/pict.c' object='coders/magick_libMagickCore_la-pict.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-pict.lo `test -f 'coders/pict.c' || echo '$(srcdir)/'`coders/pict.c
-
-coders/magick_libMagickCore_la-pix.lo: coders/pix.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-pix.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-pix.Tpo -c -o coders/magick_libMagickCore_la-pix.lo `test -f 'coders/pix.c' || echo '$(srcdir)/'`coders/pix.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-pix.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-pix.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/pix.c' object='coders/magick_libMagickCore_la-pix.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-pix.lo `test -f 'coders/pix.c' || echo '$(srcdir)/'`coders/pix.c
-
-coders/magick_libMagickCore_la-plasma.lo: coders/plasma.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-plasma.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-plasma.Tpo -c -o coders/magick_libMagickCore_la-plasma.lo `test -f 'coders/plasma.c' || echo '$(srcdir)/'`coders/plasma.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-plasma.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-plasma.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/plasma.c' object='coders/magick_libMagickCore_la-plasma.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-plasma.lo `test -f 'coders/plasma.c' || echo '$(srcdir)/'`coders/plasma.c
-
-coders/magick_libMagickCore_la-pnm.lo: coders/pnm.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-pnm.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-pnm.Tpo -c -o coders/magick_libMagickCore_la-pnm.lo `test -f 'coders/pnm.c' || echo '$(srcdir)/'`coders/pnm.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-pnm.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-pnm.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/pnm.c' object='coders/magick_libMagickCore_la-pnm.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-pnm.lo `test -f 'coders/pnm.c' || echo '$(srcdir)/'`coders/pnm.c
-
-coders/magick_libMagickCore_la-preview.lo: coders/preview.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-preview.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-preview.Tpo -c -o coders/magick_libMagickCore_la-preview.lo `test -f 'coders/preview.c' || echo '$(srcdir)/'`coders/preview.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-preview.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-preview.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/preview.c' object='coders/magick_libMagickCore_la-preview.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-preview.lo `test -f 'coders/preview.c' || echo '$(srcdir)/'`coders/preview.c
-
-coders/magick_libMagickCore_la-ps.lo: coders/ps.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-ps.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-ps.Tpo -c -o coders/magick_libMagickCore_la-ps.lo `test -f 'coders/ps.c' || echo '$(srcdir)/'`coders/ps.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-ps.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-ps.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/ps.c' object='coders/magick_libMagickCore_la-ps.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-ps.lo `test -f 'coders/ps.c' || echo '$(srcdir)/'`coders/ps.c
-
-coders/magick_libMagickCore_la-ps2.lo: coders/ps2.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-ps2.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-ps2.Tpo -c -o coders/magick_libMagickCore_la-ps2.lo `test -f 'coders/ps2.c' || echo '$(srcdir)/'`coders/ps2.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-ps2.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-ps2.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/ps2.c' object='coders/magick_libMagickCore_la-ps2.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-ps2.lo `test -f 'coders/ps2.c' || echo '$(srcdir)/'`coders/ps2.c
-
-coders/magick_libMagickCore_la-ps3.lo: coders/ps3.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-ps3.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-ps3.Tpo -c -o coders/magick_libMagickCore_la-ps3.lo `test -f 'coders/ps3.c' || echo '$(srcdir)/'`coders/ps3.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-ps3.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-ps3.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/ps3.c' object='coders/magick_libMagickCore_la-ps3.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-ps3.lo `test -f 'coders/ps3.c' || echo '$(srcdir)/'`coders/ps3.c
-
-coders/magick_libMagickCore_la-psd.lo: coders/psd.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-psd.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-psd.Tpo -c -o coders/magick_libMagickCore_la-psd.lo `test -f 'coders/psd.c' || echo '$(srcdir)/'`coders/psd.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-psd.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-psd.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/psd.c' object='coders/magick_libMagickCore_la-psd.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-psd.lo `test -f 'coders/psd.c' || echo '$(srcdir)/'`coders/psd.c
-
-coders/magick_libMagickCore_la-pwp.lo: coders/pwp.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-pwp.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-pwp.Tpo -c -o coders/magick_libMagickCore_la-pwp.lo `test -f 'coders/pwp.c' || echo '$(srcdir)/'`coders/pwp.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-pwp.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-pwp.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/pwp.c' object='coders/magick_libMagickCore_la-pwp.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-pwp.lo `test -f 'coders/pwp.c' || echo '$(srcdir)/'`coders/pwp.c
-
-coders/magick_libMagickCore_la-raw.lo: coders/raw.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-raw.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-raw.Tpo -c -o coders/magick_libMagickCore_la-raw.lo `test -f 'coders/raw.c' || echo '$(srcdir)/'`coders/raw.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-raw.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-raw.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/raw.c' object='coders/magick_libMagickCore_la-raw.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-raw.lo `test -f 'coders/raw.c' || echo '$(srcdir)/'`coders/raw.c
-
-coders/magick_libMagickCore_la-rgb.lo: coders/rgb.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-rgb.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-rgb.Tpo -c -o coders/magick_libMagickCore_la-rgb.lo `test -f 'coders/rgb.c' || echo '$(srcdir)/'`coders/rgb.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-rgb.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-rgb.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/rgb.c' object='coders/magick_libMagickCore_la-rgb.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-rgb.lo `test -f 'coders/rgb.c' || echo '$(srcdir)/'`coders/rgb.c
-
-coders/magick_libMagickCore_la-rla.lo: coders/rla.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-rla.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-rla.Tpo -c -o coders/magick_libMagickCore_la-rla.lo `test -f 'coders/rla.c' || echo '$(srcdir)/'`coders/rla.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-rla.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-rla.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/rla.c' object='coders/magick_libMagickCore_la-rla.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-rla.lo `test -f 'coders/rla.c' || echo '$(srcdir)/'`coders/rla.c
-
-coders/magick_libMagickCore_la-rle.lo: coders/rle.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-rle.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-rle.Tpo -c -o coders/magick_libMagickCore_la-rle.lo `test -f 'coders/rle.c' || echo '$(srcdir)/'`coders/rle.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-rle.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-rle.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/rle.c' object='coders/magick_libMagickCore_la-rle.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-rle.lo `test -f 'coders/rle.c' || echo '$(srcdir)/'`coders/rle.c
-
-coders/magick_libMagickCore_la-scr.lo: coders/scr.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-scr.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-scr.Tpo -c -o coders/magick_libMagickCore_la-scr.lo `test -f 'coders/scr.c' || echo '$(srcdir)/'`coders/scr.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-scr.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-scr.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/scr.c' object='coders/magick_libMagickCore_la-scr.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-scr.lo `test -f 'coders/scr.c' || echo '$(srcdir)/'`coders/scr.c
-
-coders/magick_libMagickCore_la-sct.lo: coders/sct.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-sct.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-sct.Tpo -c -o coders/magick_libMagickCore_la-sct.lo `test -f 'coders/sct.c' || echo '$(srcdir)/'`coders/sct.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-sct.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-sct.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/sct.c' object='coders/magick_libMagickCore_la-sct.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-sct.lo `test -f 'coders/sct.c' || echo '$(srcdir)/'`coders/sct.c
-
-coders/magick_libMagickCore_la-sfw.lo: coders/sfw.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-sfw.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-sfw.Tpo -c -o coders/magick_libMagickCore_la-sfw.lo `test -f 'coders/sfw.c' || echo '$(srcdir)/'`coders/sfw.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-sfw.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-sfw.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/sfw.c' object='coders/magick_libMagickCore_la-sfw.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-sfw.lo `test -f 'coders/sfw.c' || echo '$(srcdir)/'`coders/sfw.c
-
-coders/magick_libMagickCore_la-sgi.lo: coders/sgi.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-sgi.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-sgi.Tpo -c -o coders/magick_libMagickCore_la-sgi.lo `test -f 'coders/sgi.c' || echo '$(srcdir)/'`coders/sgi.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-sgi.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-sgi.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/sgi.c' object='coders/magick_libMagickCore_la-sgi.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-sgi.lo `test -f 'coders/sgi.c' || echo '$(srcdir)/'`coders/sgi.c
-
-coders/magick_libMagickCore_la-stegano.lo: coders/stegano.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-stegano.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-stegano.Tpo -c -o coders/magick_libMagickCore_la-stegano.lo `test -f 'coders/stegano.c' || echo '$(srcdir)/'`coders/stegano.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-stegano.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-stegano.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/stegano.c' object='coders/magick_libMagickCore_la-stegano.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-stegano.lo `test -f 'coders/stegano.c' || echo '$(srcdir)/'`coders/stegano.c
-
-coders/magick_libMagickCore_la-sun.lo: coders/sun.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-sun.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-sun.Tpo -c -o coders/magick_libMagickCore_la-sun.lo `test -f 'coders/sun.c' || echo '$(srcdir)/'`coders/sun.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-sun.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-sun.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/sun.c' object='coders/magick_libMagickCore_la-sun.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-sun.lo `test -f 'coders/sun.c' || echo '$(srcdir)/'`coders/sun.c
-
-coders/magick_libMagickCore_la-svg.lo: coders/svg.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-svg.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-svg.Tpo -c -o coders/magick_libMagickCore_la-svg.lo `test -f 'coders/svg.c' || echo '$(srcdir)/'`coders/svg.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-svg.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-svg.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/svg.c' object='coders/magick_libMagickCore_la-svg.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-svg.lo `test -f 'coders/svg.c' || echo '$(srcdir)/'`coders/svg.c
-
-coders/magick_libMagickCore_la-tga.lo: coders/tga.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-tga.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-tga.Tpo -c -o coders/magick_libMagickCore_la-tga.lo `test -f 'coders/tga.c' || echo '$(srcdir)/'`coders/tga.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-tga.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-tga.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/tga.c' object='coders/magick_libMagickCore_la-tga.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-tga.lo `test -f 'coders/tga.c' || echo '$(srcdir)/'`coders/tga.c
-
-coders/magick_libMagickCore_la-thumbnail.lo: coders/thumbnail.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-thumbnail.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-thumbnail.Tpo -c -o coders/magick_libMagickCore_la-thumbnail.lo `test -f 'coders/thumbnail.c' || echo '$(srcdir)/'`coders/thumbnail.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-thumbnail.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-thumbnail.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/thumbnail.c' object='coders/magick_libMagickCore_la-thumbnail.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-thumbnail.lo `test -f 'coders/thumbnail.c' || echo '$(srcdir)/'`coders/thumbnail.c
-
-coders/magick_libMagickCore_la-tile.lo: coders/tile.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-tile.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-tile.Tpo -c -o coders/magick_libMagickCore_la-tile.lo `test -f 'coders/tile.c' || echo '$(srcdir)/'`coders/tile.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-tile.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-tile.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/tile.c' object='coders/magick_libMagickCore_la-tile.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-tile.lo `test -f 'coders/tile.c' || echo '$(srcdir)/'`coders/tile.c
-
-coders/magick_libMagickCore_la-tim.lo: coders/tim.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-tim.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-tim.Tpo -c -o coders/magick_libMagickCore_la-tim.lo `test -f 'coders/tim.c' || echo '$(srcdir)/'`coders/tim.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-tim.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-tim.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/tim.c' object='coders/magick_libMagickCore_la-tim.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-tim.lo `test -f 'coders/tim.c' || echo '$(srcdir)/'`coders/tim.c
-
-coders/magick_libMagickCore_la-ttf.lo: coders/ttf.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-ttf.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-ttf.Tpo -c -o coders/magick_libMagickCore_la-ttf.lo `test -f 'coders/ttf.c' || echo '$(srcdir)/'`coders/ttf.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-ttf.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-ttf.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/ttf.c' object='coders/magick_libMagickCore_la-ttf.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-ttf.lo `test -f 'coders/ttf.c' || echo '$(srcdir)/'`coders/ttf.c
-
-coders/magick_libMagickCore_la-txt.lo: coders/txt.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-txt.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-txt.Tpo -c -o coders/magick_libMagickCore_la-txt.lo `test -f 'coders/txt.c' || echo '$(srcdir)/'`coders/txt.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-txt.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-txt.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/txt.c' object='coders/magick_libMagickCore_la-txt.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-txt.lo `test -f 'coders/txt.c' || echo '$(srcdir)/'`coders/txt.c
-
-coders/magick_libMagickCore_la-uil.lo: coders/uil.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-uil.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-uil.Tpo -c -o coders/magick_libMagickCore_la-uil.lo `test -f 'coders/uil.c' || echo '$(srcdir)/'`coders/uil.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-uil.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-uil.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/uil.c' object='coders/magick_libMagickCore_la-uil.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-uil.lo `test -f 'coders/uil.c' || echo '$(srcdir)/'`coders/uil.c
-
-coders/magick_libMagickCore_la-url.lo: coders/url.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-url.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-url.Tpo -c -o coders/magick_libMagickCore_la-url.lo `test -f 'coders/url.c' || echo '$(srcdir)/'`coders/url.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-url.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-url.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/url.c' object='coders/magick_libMagickCore_la-url.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-url.lo `test -f 'coders/url.c' || echo '$(srcdir)/'`coders/url.c
-
-coders/magick_libMagickCore_la-uyvy.lo: coders/uyvy.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-uyvy.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-uyvy.Tpo -c -o coders/magick_libMagickCore_la-uyvy.lo `test -f 'coders/uyvy.c' || echo '$(srcdir)/'`coders/uyvy.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-uyvy.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-uyvy.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/uyvy.c' object='coders/magick_libMagickCore_la-uyvy.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-uyvy.lo `test -f 'coders/uyvy.c' || echo '$(srcdir)/'`coders/uyvy.c
-
-coders/magick_libMagickCore_la-vicar.lo: coders/vicar.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-vicar.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-vicar.Tpo -c -o coders/magick_libMagickCore_la-vicar.lo `test -f 'coders/vicar.c' || echo '$(srcdir)/'`coders/vicar.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-vicar.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-vicar.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/vicar.c' object='coders/magick_libMagickCore_la-vicar.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-vicar.lo `test -f 'coders/vicar.c' || echo '$(srcdir)/'`coders/vicar.c
-
-coders/magick_libMagickCore_la-vid.lo: coders/vid.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-vid.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-vid.Tpo -c -o coders/magick_libMagickCore_la-vid.lo `test -f 'coders/vid.c' || echo '$(srcdir)/'`coders/vid.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-vid.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-vid.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/vid.c' object='coders/magick_libMagickCore_la-vid.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-vid.lo `test -f 'coders/vid.c' || echo '$(srcdir)/'`coders/vid.c
-
-coders/magick_libMagickCore_la-viff.lo: coders/viff.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-viff.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-viff.Tpo -c -o coders/magick_libMagickCore_la-viff.lo `test -f 'coders/viff.c' || echo '$(srcdir)/'`coders/viff.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-viff.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-viff.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/viff.c' object='coders/magick_libMagickCore_la-viff.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-viff.lo `test -f 'coders/viff.c' || echo '$(srcdir)/'`coders/viff.c
-
-coders/magick_libMagickCore_la-wbmp.lo: coders/wbmp.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-wbmp.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-wbmp.Tpo -c -o coders/magick_libMagickCore_la-wbmp.lo `test -f 'coders/wbmp.c' || echo '$(srcdir)/'`coders/wbmp.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-wbmp.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-wbmp.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/wbmp.c' object='coders/magick_libMagickCore_la-wbmp.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-wbmp.lo `test -f 'coders/wbmp.c' || echo '$(srcdir)/'`coders/wbmp.c
-
-coders/magick_libMagickCore_la-wpg.lo: coders/wpg.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-wpg.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-wpg.Tpo -c -o coders/magick_libMagickCore_la-wpg.lo `test -f 'coders/wpg.c' || echo '$(srcdir)/'`coders/wpg.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-wpg.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-wpg.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/wpg.c' object='coders/magick_libMagickCore_la-wpg.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-wpg.lo `test -f 'coders/wpg.c' || echo '$(srcdir)/'`coders/wpg.c
-
-coders/magick_libMagickCore_la-xbm.lo: coders/xbm.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-xbm.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-xbm.Tpo -c -o coders/magick_libMagickCore_la-xbm.lo `test -f 'coders/xbm.c' || echo '$(srcdir)/'`coders/xbm.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-xbm.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-xbm.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/xbm.c' object='coders/magick_libMagickCore_la-xbm.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-xbm.lo `test -f 'coders/xbm.c' || echo '$(srcdir)/'`coders/xbm.c
-
-coders/magick_libMagickCore_la-xc.lo: coders/xc.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-xc.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-xc.Tpo -c -o coders/magick_libMagickCore_la-xc.lo `test -f 'coders/xc.c' || echo '$(srcdir)/'`coders/xc.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-xc.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-xc.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/xc.c' object='coders/magick_libMagickCore_la-xc.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-xc.lo `test -f 'coders/xc.c' || echo '$(srcdir)/'`coders/xc.c
-
-coders/magick_libMagickCore_la-xcf.lo: coders/xcf.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-xcf.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-xcf.Tpo -c -o coders/magick_libMagickCore_la-xcf.lo `test -f 'coders/xcf.c' || echo '$(srcdir)/'`coders/xcf.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-xcf.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-xcf.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/xcf.c' object='coders/magick_libMagickCore_la-xcf.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-xcf.lo `test -f 'coders/xcf.c' || echo '$(srcdir)/'`coders/xcf.c
-
-coders/magick_libMagickCore_la-xpm.lo: coders/xpm.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-xpm.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-xpm.Tpo -c -o coders/magick_libMagickCore_la-xpm.lo `test -f 'coders/xpm.c' || echo '$(srcdir)/'`coders/xpm.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-xpm.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-xpm.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/xpm.c' object='coders/magick_libMagickCore_la-xpm.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-xpm.lo `test -f 'coders/xpm.c' || echo '$(srcdir)/'`coders/xpm.c
-
-coders/magick_libMagickCore_la-xps.lo: coders/xps.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-xps.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-xps.Tpo -c -o coders/magick_libMagickCore_la-xps.lo `test -f 'coders/xps.c' || echo '$(srcdir)/'`coders/xps.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-xps.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-xps.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/xps.c' object='coders/magick_libMagickCore_la-xps.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-xps.lo `test -f 'coders/xps.c' || echo '$(srcdir)/'`coders/xps.c
-
-coders/magick_libMagickCore_la-ycbcr.lo: coders/ycbcr.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-ycbcr.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-ycbcr.Tpo -c -o coders/magick_libMagickCore_la-ycbcr.lo `test -f 'coders/ycbcr.c' || echo '$(srcdir)/'`coders/ycbcr.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-ycbcr.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-ycbcr.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/ycbcr.c' object='coders/magick_libMagickCore_la-ycbcr.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-ycbcr.lo `test -f 'coders/ycbcr.c' || echo '$(srcdir)/'`coders/ycbcr.c
-
-coders/magick_libMagickCore_la-yuv.lo: coders/yuv.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-yuv.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-yuv.Tpo -c -o coders/magick_libMagickCore_la-yuv.lo `test -f 'coders/yuv.c' || echo '$(srcdir)/'`coders/yuv.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-yuv.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-yuv.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/yuv.c' object='coders/magick_libMagickCore_la-yuv.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-yuv.lo `test -f 'coders/yuv.c' || echo '$(srcdir)/'`coders/yuv.c
-
-coders/magick_libMagickCore_la-dps.lo: coders/dps.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-dps.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-dps.Tpo -c -o coders/magick_libMagickCore_la-dps.lo `test -f 'coders/dps.c' || echo '$(srcdir)/'`coders/dps.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-dps.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-dps.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/dps.c' object='coders/magick_libMagickCore_la-dps.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-dps.lo `test -f 'coders/dps.c' || echo '$(srcdir)/'`coders/dps.c
-
-coders/magick_libMagickCore_la-djvu.lo: coders/djvu.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-djvu.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-djvu.Tpo -c -o coders/magick_libMagickCore_la-djvu.lo `test -f 'coders/djvu.c' || echo '$(srcdir)/'`coders/djvu.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-djvu.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-djvu.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/djvu.c' object='coders/magick_libMagickCore_la-djvu.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-djvu.lo `test -f 'coders/djvu.c' || echo '$(srcdir)/'`coders/djvu.c
-
-coders/magick_libMagickCore_la-exr.lo: coders/exr.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-exr.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-exr.Tpo -c -o coders/magick_libMagickCore_la-exr.lo `test -f 'coders/exr.c' || echo '$(srcdir)/'`coders/exr.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-exr.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-exr.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/exr.c' object='coders/magick_libMagickCore_la-exr.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-exr.lo `test -f 'coders/exr.c' || echo '$(srcdir)/'`coders/exr.c
-
-coders/magick_libMagickCore_la-fpx.lo: coders/fpx.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-fpx.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-fpx.Tpo -c -o coders/magick_libMagickCore_la-fpx.lo `test -f 'coders/fpx.c' || echo '$(srcdir)/'`coders/fpx.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-fpx.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-fpx.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/fpx.c' object='coders/magick_libMagickCore_la-fpx.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-fpx.lo `test -f 'coders/fpx.c' || echo '$(srcdir)/'`coders/fpx.c
-
-coders/magick_libMagickCore_la-clipboard.lo: coders/clipboard.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-clipboard.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-clipboard.Tpo -c -o coders/magick_libMagickCore_la-clipboard.lo `test -f 'coders/clipboard.c' || echo '$(srcdir)/'`coders/clipboard.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-clipboard.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-clipboard.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/clipboard.c' object='coders/magick_libMagickCore_la-clipboard.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-clipboard.lo `test -f 'coders/clipboard.c' || echo '$(srcdir)/'`coders/clipboard.c
-
-coders/magick_libMagickCore_la-emf.lo: coders/emf.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-emf.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-emf.Tpo -c -o coders/magick_libMagickCore_la-emf.lo `test -f 'coders/emf.c' || echo '$(srcdir)/'`coders/emf.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-emf.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-emf.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/emf.c' object='coders/magick_libMagickCore_la-emf.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-emf.lo `test -f 'coders/emf.c' || echo '$(srcdir)/'`coders/emf.c
-
-coders/magick_libMagickCore_la-jbig.lo: coders/jbig.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-jbig.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-jbig.Tpo -c -o coders/magick_libMagickCore_la-jbig.lo `test -f 'coders/jbig.c' || echo '$(srcdir)/'`coders/jbig.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-jbig.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-jbig.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/jbig.c' object='coders/magick_libMagickCore_la-jbig.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-jbig.lo `test -f 'coders/jbig.c' || echo '$(srcdir)/'`coders/jbig.c
-
-coders/magick_libMagickCore_la-jpeg.lo: coders/jpeg.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-jpeg.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-jpeg.Tpo -c -o coders/magick_libMagickCore_la-jpeg.lo `test -f 'coders/jpeg.c' || echo '$(srcdir)/'`coders/jpeg.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-jpeg.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-jpeg.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/jpeg.c' object='coders/magick_libMagickCore_la-jpeg.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-jpeg.lo `test -f 'coders/jpeg.c' || echo '$(srcdir)/'`coders/jpeg.c
-
-coders/magick_libMagickCore_la-jp2.lo: coders/jp2.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-jp2.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-jp2.Tpo -c -o coders/magick_libMagickCore_la-jp2.lo `test -f 'coders/jp2.c' || echo '$(srcdir)/'`coders/jp2.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-jp2.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-jp2.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/jp2.c' object='coders/magick_libMagickCore_la-jp2.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-jp2.lo `test -f 'coders/jp2.c' || echo '$(srcdir)/'`coders/jp2.c
-
-coders/magick_libMagickCore_la-png.lo: coders/png.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-png.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-png.Tpo -c -o coders/magick_libMagickCore_la-png.lo `test -f 'coders/png.c' || echo '$(srcdir)/'`coders/png.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-png.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-png.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/png.c' object='coders/magick_libMagickCore_la-png.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-png.lo `test -f 'coders/png.c' || echo '$(srcdir)/'`coders/png.c
-
-coders/magick_libMagickCore_la-ept.lo: coders/ept.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-ept.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-ept.Tpo -c -o coders/magick_libMagickCore_la-ept.lo `test -f 'coders/ept.c' || echo '$(srcdir)/'`coders/ept.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-ept.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-ept.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/ept.c' object='coders/magick_libMagickCore_la-ept.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-ept.lo `test -f 'coders/ept.c' || echo '$(srcdir)/'`coders/ept.c
-
-coders/magick_libMagickCore_la-tiff.lo: coders/tiff.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-tiff.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-tiff.Tpo -c -o coders/magick_libMagickCore_la-tiff.lo `test -f 'coders/tiff.c' || echo '$(srcdir)/'`coders/tiff.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-tiff.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-tiff.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/tiff.c' object='coders/magick_libMagickCore_la-tiff.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-tiff.lo `test -f 'coders/tiff.c' || echo '$(srcdir)/'`coders/tiff.c
-
-coders/magick_libMagickCore_la-webp.lo: coders/webp.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-webp.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-webp.Tpo -c -o coders/magick_libMagickCore_la-webp.lo `test -f 'coders/webp.c' || echo '$(srcdir)/'`coders/webp.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-webp.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-webp.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/webp.c' object='coders/magick_libMagickCore_la-webp.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-webp.lo `test -f 'coders/webp.c' || echo '$(srcdir)/'`coders/webp.c
-
-coders/magick_libMagickCore_la-wmf.lo: coders/wmf.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-wmf.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-wmf.Tpo -c -o coders/magick_libMagickCore_la-wmf.lo `test -f 'coders/wmf.c' || echo '$(srcdir)/'`coders/wmf.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-wmf.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-wmf.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/wmf.c' object='coders/magick_libMagickCore_la-wmf.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-wmf.lo `test -f 'coders/wmf.c' || echo '$(srcdir)/'`coders/wmf.c
-
-coders/magick_libMagickCore_la-x.lo: coders/x.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-x.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-x.Tpo -c -o coders/magick_libMagickCore_la-x.lo `test -f 'coders/x.c' || echo '$(srcdir)/'`coders/x.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-x.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-x.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/x.c' object='coders/magick_libMagickCore_la-x.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-x.lo `test -f 'coders/x.c' || echo '$(srcdir)/'`coders/x.c
-
-coders/magick_libMagickCore_la-xwd.lo: coders/xwd.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT coders/magick_libMagickCore_la-xwd.lo -MD -MP -MF coders/$(DEPDIR)/magick_libMagickCore_la-xwd.Tpo -c -o coders/magick_libMagickCore_la-xwd.lo `test -f 'coders/xwd.c' || echo '$(srcdir)/'`coders/xwd.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) coders/$(DEPDIR)/magick_libMagickCore_la-xwd.Tpo coders/$(DEPDIR)/magick_libMagickCore_la-xwd.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coders/xwd.c' object='coders/magick_libMagickCore_la-xwd.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o coders/magick_libMagickCore_la-xwd.lo `test -f 'coders/xwd.c' || echo '$(srcdir)/'`coders/xwd.c
-
-filters/magick_libMagickCore_la-analyze.lo: filters/analyze.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT filters/magick_libMagickCore_la-analyze.lo -MD -MP -MF filters/$(DEPDIR)/magick_libMagickCore_la-analyze.Tpo -c -o filters/magick_libMagickCore_la-analyze.lo `test -f 'filters/analyze.c' || echo '$(srcdir)/'`filters/analyze.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) filters/$(DEPDIR)/magick_libMagickCore_la-analyze.Tpo filters/$(DEPDIR)/magick_libMagickCore_la-analyze.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='filters/analyze.c' object='filters/magick_libMagickCore_la-analyze.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(magick_libMagickCore_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o filters/magick_libMagickCore_la-analyze.lo `test -f 'filters/analyze.c' || echo '$(srcdir)/'`filters/analyze.c
-
-wand/wand_libMagickWand_la-animate.lo: wand/animate.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(wand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT wand/wand_libMagickWand_la-animate.lo -MD -MP -MF wand/$(DEPDIR)/wand_libMagickWand_la-animate.Tpo -c -o wand/wand_libMagickWand_la-animate.lo `test -f 'wand/animate.c' || echo '$(srcdir)/'`wand/animate.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) wand/$(DEPDIR)/wand_libMagickWand_la-animate.Tpo wand/$(DEPDIR)/wand_libMagickWand_la-animate.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wand/animate.c' object='wand/wand_libMagickWand_la-animate.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(wand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o wand/wand_libMagickWand_la-animate.lo `test -f 'wand/animate.c' || echo '$(srcdir)/'`wand/animate.c
-
-wand/wand_libMagickWand_la-compare.lo: wand/compare.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(wand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT wand/wand_libMagickWand_la-compare.lo -MD -MP -MF wand/$(DEPDIR)/wand_libMagickWand_la-compare.Tpo -c -o wand/wand_libMagickWand_la-compare.lo `test -f 'wand/compare.c' || echo '$(srcdir)/'`wand/compare.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) wand/$(DEPDIR)/wand_libMagickWand_la-compare.Tpo wand/$(DEPDIR)/wand_libMagickWand_la-compare.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wand/compare.c' object='wand/wand_libMagickWand_la-compare.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(wand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o wand/wand_libMagickWand_la-compare.lo `test -f 'wand/compare.c' || echo '$(srcdir)/'`wand/compare.c
-
-wand/wand_libMagickWand_la-composite.lo: wand/composite.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(wand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT wand/wand_libMagickWand_la-composite.lo -MD -MP -MF wand/$(DEPDIR)/wand_libMagickWand_la-composite.Tpo -c -o wand/wand_libMagickWand_la-composite.lo `test -f 'wand/composite.c' || echo '$(srcdir)/'`wand/composite.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) wand/$(DEPDIR)/wand_libMagickWand_la-composite.Tpo wand/$(DEPDIR)/wand_libMagickWand_la-composite.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wand/composite.c' object='wand/wand_libMagickWand_la-composite.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(wand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o wand/wand_libMagickWand_la-composite.lo `test -f 'wand/composite.c' || echo '$(srcdir)/'`wand/composite.c
-
-wand/wand_libMagickWand_la-conjure.lo: wand/conjure.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(wand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT wand/wand_libMagickWand_la-conjure.lo -MD -MP -MF wand/$(DEPDIR)/wand_libMagickWand_la-conjure.Tpo -c -o wand/wand_libMagickWand_la-conjure.lo `test -f 'wand/conjure.c' || echo '$(srcdir)/'`wand/conjure.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) wand/$(DEPDIR)/wand_libMagickWand_la-conjure.Tpo wand/$(DEPDIR)/wand_libMagickWand_la-conjure.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wand/conjure.c' object='wand/wand_libMagickWand_la-conjure.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(wand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o wand/wand_libMagickWand_la-conjure.lo `test -f 'wand/conjure.c' || echo '$(srcdir)/'`wand/conjure.c
-
-wand/wand_libMagickWand_la-convert.lo: wand/convert.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(wand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT wand/wand_libMagickWand_la-convert.lo -MD -MP -MF wand/$(DEPDIR)/wand_libMagickWand_la-convert.Tpo -c -o wand/wand_libMagickWand_la-convert.lo `test -f 'wand/convert.c' || echo '$(srcdir)/'`wand/convert.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) wand/$(DEPDIR)/wand_libMagickWand_la-convert.Tpo wand/$(DEPDIR)/wand_libMagickWand_la-convert.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wand/convert.c' object='wand/wand_libMagickWand_la-convert.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(wand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o wand/wand_libMagickWand_la-convert.lo `test -f 'wand/convert.c' || echo '$(srcdir)/'`wand/convert.c
-
-wand/wand_libMagickWand_la-deprecate.lo: wand/deprecate.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(wand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT wand/wand_libMagickWand_la-deprecate.lo -MD -MP -MF wand/$(DEPDIR)/wand_libMagickWand_la-deprecate.Tpo -c -o wand/wand_libMagickWand_la-deprecate.lo `test -f 'wand/deprecate.c' || echo '$(srcdir)/'`wand/deprecate.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) wand/$(DEPDIR)/wand_libMagickWand_la-deprecate.Tpo wand/$(DEPDIR)/wand_libMagickWand_la-deprecate.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wand/deprecate.c' object='wand/wand_libMagickWand_la-deprecate.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(wand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o wand/wand_libMagickWand_la-deprecate.lo `test -f 'wand/deprecate.c' || echo '$(srcdir)/'`wand/deprecate.c
-
-wand/wand_libMagickWand_la-display.lo: wand/display.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(wand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT wand/wand_libMagickWand_la-display.lo -MD -MP -MF wand/$(DEPDIR)/wand_libMagickWand_la-display.Tpo -c -o wand/wand_libMagickWand_la-display.lo `test -f 'wand/display.c' || echo '$(srcdir)/'`wand/display.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) wand/$(DEPDIR)/wand_libMagickWand_la-display.Tpo wand/$(DEPDIR)/wand_libMagickWand_la-display.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wand/display.c' object='wand/wand_libMagickWand_la-display.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(wand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o wand/wand_libMagickWand_la-display.lo `test -f 'wand/display.c' || echo '$(srcdir)/'`wand/display.c
-
-wand/wand_libMagickWand_la-drawing-wand.lo: wand/drawing-wand.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(wand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT wand/wand_libMagickWand_la-drawing-wand.lo -MD -MP -MF wand/$(DEPDIR)/wand_libMagickWand_la-drawing-wand.Tpo -c -o wand/wand_libMagickWand_la-drawing-wand.lo `test -f 'wand/drawing-wand.c' || echo '$(srcdir)/'`wand/drawing-wand.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) wand/$(DEPDIR)/wand_libMagickWand_la-drawing-wand.Tpo wand/$(DEPDIR)/wand_libMagickWand_la-drawing-wand.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wand/drawing-wand.c' object='wand/wand_libMagickWand_la-drawing-wand.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(wand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o wand/wand_libMagickWand_la-drawing-wand.lo `test -f 'wand/drawing-wand.c' || echo '$(srcdir)/'`wand/drawing-wand.c
-
-wand/wand_libMagickWand_la-identify.lo: wand/identify.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(wand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT wand/wand_libMagickWand_la-identify.lo -MD -MP -MF wand/$(DEPDIR)/wand_libMagickWand_la-identify.Tpo -c -o wand/wand_libMagickWand_la-identify.lo `test -f 'wand/identify.c' || echo '$(srcdir)/'`wand/identify.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) wand/$(DEPDIR)/wand_libMagickWand_la-identify.Tpo wand/$(DEPDIR)/wand_libMagickWand_la-identify.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wand/identify.c' object='wand/wand_libMagickWand_la-identify.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(wand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o wand/wand_libMagickWand_la-identify.lo `test -f 'wand/identify.c' || echo '$(srcdir)/'`wand/identify.c
-
-wand/wand_libMagickWand_la-import.lo: wand/import.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(wand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT wand/wand_libMagickWand_la-import.lo -MD -MP -MF wand/$(DEPDIR)/wand_libMagickWand_la-import.Tpo -c -o wand/wand_libMagickWand_la-import.lo `test -f 'wand/import.c' || echo '$(srcdir)/'`wand/import.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) wand/$(DEPDIR)/wand_libMagickWand_la-import.Tpo wand/$(DEPDIR)/wand_libMagickWand_la-import.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wand/import.c' object='wand/wand_libMagickWand_la-import.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(wand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o wand/wand_libMagickWand_la-import.lo `test -f 'wand/import.c' || echo '$(srcdir)/'`wand/import.c
-
-wand/wand_libMagickWand_la-magick-image.lo: wand/magick-image.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(wand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT wand/wand_libMagickWand_la-magick-image.lo -MD -MP -MF wand/$(DEPDIR)/wand_libMagickWand_la-magick-image.Tpo -c -o wand/wand_libMagickWand_la-magick-image.lo `test -f 'wand/magick-image.c' || echo '$(srcdir)/'`wand/magick-image.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) wand/$(DEPDIR)/wand_libMagickWand_la-magick-image.Tpo wand/$(DEPDIR)/wand_libMagickWand_la-magick-image.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wand/magick-image.c' object='wand/wand_libMagickWand_la-magick-image.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(wand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o wand/wand_libMagickWand_la-magick-image.lo `test -f 'wand/magick-image.c' || echo '$(srcdir)/'`wand/magick-image.c
-
-wand/wand_libMagickWand_la-magick-property.lo: wand/magick-property.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(wand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT wand/wand_libMagickWand_la-magick-property.lo -MD -MP -MF wand/$(DEPDIR)/wand_libMagickWand_la-magick-property.Tpo -c -o wand/wand_libMagickWand_la-magick-property.lo `test -f 'wand/magick-property.c' || echo '$(srcdir)/'`wand/magick-property.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) wand/$(DEPDIR)/wand_libMagickWand_la-magick-property.Tpo wand/$(DEPDIR)/wand_libMagickWand_la-magick-property.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wand/magick-property.c' object='wand/wand_libMagickWand_la-magick-property.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(wand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o wand/wand_libMagickWand_la-magick-property.lo `test -f 'wand/magick-property.c' || echo '$(srcdir)/'`wand/magick-property.c
-
-wand/wand_libMagickWand_la-magick-wand.lo: wand/magick-wand.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(wand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT wand/wand_libMagickWand_la-magick-wand.lo -MD -MP -MF wand/$(DEPDIR)/wand_libMagickWand_la-magick-wand.Tpo -c -o wand/wand_libMagickWand_la-magick-wand.lo `test -f 'wand/magick-wand.c' || echo '$(srcdir)/'`wand/magick-wand.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) wand/$(DEPDIR)/wand_libMagickWand_la-magick-wand.Tpo wand/$(DEPDIR)/wand_libMagickWand_la-magick-wand.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wand/magick-wand.c' object='wand/wand_libMagickWand_la-magick-wand.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(wand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o wand/wand_libMagickWand_la-magick-wand.lo `test -f 'wand/magick-wand.c' || echo '$(srcdir)/'`wand/magick-wand.c
-
-wand/wand_libMagickWand_la-mogrify.lo: wand/mogrify.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(wand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT wand/wand_libMagickWand_la-mogrify.lo -MD -MP -MF wand/$(DEPDIR)/wand_libMagickWand_la-mogrify.Tpo -c -o wand/wand_libMagickWand_la-mogrify.lo `test -f 'wand/mogrify.c' || echo '$(srcdir)/'`wand/mogrify.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) wand/$(DEPDIR)/wand_libMagickWand_la-mogrify.Tpo wand/$(DEPDIR)/wand_libMagickWand_la-mogrify.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wand/mogrify.c' object='wand/wand_libMagickWand_la-mogrify.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(wand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o wand/wand_libMagickWand_la-mogrify.lo `test -f 'wand/mogrify.c' || echo '$(srcdir)/'`wand/mogrify.c
-
-wand/wand_libMagickWand_la-montage.lo: wand/montage.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(wand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT wand/wand_libMagickWand_la-montage.lo -MD -MP -MF wand/$(DEPDIR)/wand_libMagickWand_la-montage.Tpo -c -o wand/wand_libMagickWand_la-montage.lo `test -f 'wand/montage.c' || echo '$(srcdir)/'`wand/montage.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) wand/$(DEPDIR)/wand_libMagickWand_la-montage.Tpo wand/$(DEPDIR)/wand_libMagickWand_la-montage.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wand/montage.c' object='wand/wand_libMagickWand_la-montage.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(wand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o wand/wand_libMagickWand_la-montage.lo `test -f 'wand/montage.c' || echo '$(srcdir)/'`wand/montage.c
-
-wand/wand_libMagickWand_la-pixel-iterator.lo: wand/pixel-iterator.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(wand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT wand/wand_libMagickWand_la-pixel-iterator.lo -MD -MP -MF wand/$(DEPDIR)/wand_libMagickWand_la-pixel-iterator.Tpo -c -o wand/wand_libMagickWand_la-pixel-iterator.lo `test -f 'wand/pixel-iterator.c' || echo '$(srcdir)/'`wand/pixel-iterator.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) wand/$(DEPDIR)/wand_libMagickWand_la-pixel-iterator.Tpo wand/$(DEPDIR)/wand_libMagickWand_la-pixel-iterator.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wand/pixel-iterator.c' object='wand/wand_libMagickWand_la-pixel-iterator.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(wand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o wand/wand_libMagickWand_la-pixel-iterator.lo `test -f 'wand/pixel-iterator.c' || echo '$(srcdir)/'`wand/pixel-iterator.c
-
-wand/wand_libMagickWand_la-pixel-wand.lo: wand/pixel-wand.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(wand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT wand/wand_libMagickWand_la-pixel-wand.lo -MD -MP -MF wand/$(DEPDIR)/wand_libMagickWand_la-pixel-wand.Tpo -c -o wand/wand_libMagickWand_la-pixel-wand.lo `test -f 'wand/pixel-wand.c' || echo '$(srcdir)/'`wand/pixel-wand.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) wand/$(DEPDIR)/wand_libMagickWand_la-pixel-wand.Tpo wand/$(DEPDIR)/wand_libMagickWand_la-pixel-wand.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wand/pixel-wand.c' object='wand/wand_libMagickWand_la-pixel-wand.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(wand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o wand/wand_libMagickWand_la-pixel-wand.lo `test -f 'wand/pixel-wand.c' || echo '$(srcdir)/'`wand/pixel-wand.c
-
-wand/wand_libMagickWand_la-stream.lo: wand/stream.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(wand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT wand/wand_libMagickWand_la-stream.lo -MD -MP -MF wand/$(DEPDIR)/wand_libMagickWand_la-stream.Tpo -c -o wand/wand_libMagickWand_la-stream.lo `test -f 'wand/stream.c' || echo '$(srcdir)/'`wand/stream.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) wand/$(DEPDIR)/wand_libMagickWand_la-stream.Tpo wand/$(DEPDIR)/wand_libMagickWand_la-stream.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wand/stream.c' object='wand/wand_libMagickWand_la-stream.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(wand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o wand/wand_libMagickWand_la-stream.lo `test -f 'wand/stream.c' || echo '$(srcdir)/'`wand/stream.c
-
-wand/wand_libMagickWand_la-wand.lo: wand/wand.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(wand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT wand/wand_libMagickWand_la-wand.lo -MD -MP -MF wand/$(DEPDIR)/wand_libMagickWand_la-wand.Tpo -c -o wand/wand_libMagickWand_la-wand.lo `test -f 'wand/wand.c' || echo '$(srcdir)/'`wand/wand.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) wand/$(DEPDIR)/wand_libMagickWand_la-wand.Tpo wand/$(DEPDIR)/wand_libMagickWand_la-wand.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wand/wand.c' object='wand/wand_libMagickWand_la-wand.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(wand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o wand/wand_libMagickWand_la-wand.lo `test -f 'wand/wand.c' || echo '$(srcdir)/'`wand/wand.c
-
-wand/wand_libMagickWand_la-wand-view.lo: wand/wand-view.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(wand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT wand/wand_libMagickWand_la-wand-view.lo -MD -MP -MF wand/$(DEPDIR)/wand_libMagickWand_la-wand-view.Tpo -c -o wand/wand_libMagickWand_la-wand-view.lo `test -f 'wand/wand-view.c' || echo '$(srcdir)/'`wand/wand-view.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) wand/$(DEPDIR)/wand_libMagickWand_la-wand-view.Tpo wand/$(DEPDIR)/wand_libMagickWand_la-wand-view.Plo
-@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='wand/wand-view.c' object='wand/wand_libMagickWand_la-wand-view.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(wand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o wand/wand_libMagickWand_la-wand-view.lo `test -f 'wand/wand-view.c' || echo '$(srcdir)/'`wand/wand-view.c
-
tests/tests_validate-validate.o: tests/validate.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(tests_validate_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tests/tests_validate-validate.o -MD -MP -MF tests/$(DEPDIR)/tests_validate-validate.Tpo -c -o tests/tests_validate-validate.o `test -f 'tests/validate.c' || echo '$(srcdir)/'`tests/validate.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) tests/$(DEPDIR)/tests_validate-validate.Tpo tests/$(DEPDIR)/tests_validate-validate.Po
@@ -10508,14 +10580,14 @@
-rm -rf Magick++/demo/.libs Magick++/demo/_libs
-rm -rf Magick++/lib/.libs Magick++/lib/_libs
-rm -rf Magick++/tests/.libs Magick++/tests/_libs
+ -rm -rf MagickCore/.libs MagickCore/_libs
+ -rm -rf MagickWand/.libs MagickWand/_libs
-rm -rf coders/.libs coders/_libs
-rm -rf filters/.libs filters/_libs
-rm -rf ltdl/.libs ltdl/_libs
-rm -rf ltdl/loaders/.libs ltdl/loaders/_libs
- -rm -rf magick/.libs magick/_libs
-rm -rf tests/.libs tests/_libs
-rm -rf utilities/.libs utilities/_libs
- -rm -rf wand/.libs wand/_libs
distclean-libtool:
-rm -f libtool config.lt
@@ -10637,6 +10709,46 @@
test -n "$$files" || exit 0; \
echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \
cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files
+install-MagickCoreincHEADERS: $(MagickCoreinc_HEADERS)
+ @$(NORMAL_INSTALL)
+ test -z "$(MagickCoreincdir)" || $(MKDIR_P) "$(DESTDIR)$(MagickCoreincdir)"
+ @list='$(MagickCoreinc_HEADERS)'; test -n "$(MagickCoreincdir)" || list=; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(MagickCoreincdir)'"; \
+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(MagickCoreincdir)" || exit $$?; \
+ done
+
+uninstall-MagickCoreincHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(MagickCoreinc_HEADERS)'; test -n "$(MagickCoreincdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(MagickCoreincdir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(MagickCoreincdir)" && rm -f $$files
+install-MagickWandincHEADERS: $(MagickWandinc_HEADERS)
+ @$(NORMAL_INSTALL)
+ test -z "$(MagickWandincdir)" || $(MKDIR_P) "$(DESTDIR)$(MagickWandincdir)"
+ @list='$(MagickWandinc_HEADERS)'; test -n "$(MagickWandincdir)" || list=; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(MagickWandincdir)'"; \
+ $(INSTALL_HEADER) $$files "$(DESTDIR)$(MagickWandincdir)" || exit $$?; \
+ done
+
+uninstall-MagickWandincHEADERS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(MagickWandinc_HEADERS)'; test -n "$(MagickWandincdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(MagickWandincdir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(MagickWandincdir)" && rm -f $$files
install-includeHEADERS: $(include_HEADERS)
@$(NORMAL_INSTALL)
test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
@@ -10677,26 +10789,6 @@
test -n "$$files" || exit 0; \
echo " ( cd '$(DESTDIR)$(ltdlincludedir)' && rm -f" $$files ")"; \
cd "$(DESTDIR)$(ltdlincludedir)" && rm -f $$files
-install-magickincHEADERS: $(magickinc_HEADERS)
- @$(NORMAL_INSTALL)
- test -z "$(magickincdir)" || $(MKDIR_P) "$(DESTDIR)$(magickincdir)"
- @list='$(magickinc_HEADERS)'; test -n "$(magickincdir)" || list=; \
- for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- echo "$$d$$p"; \
- done | $(am__base_list) | \
- while read files; do \
- echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(magickincdir)'"; \
- $(INSTALL_HEADER) $$files "$(DESTDIR)$(magickincdir)" || exit $$?; \
- done
-
-uninstall-magickincHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(magickinc_HEADERS)'; test -n "$(magickincdir)" || list=; \
- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(magickincdir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(magickincdir)" && rm -f $$files
install-magickppincHEADERS: $(magickppinc_HEADERS)
@$(NORMAL_INSTALL)
test -z "$(magickppincdir)" || $(MKDIR_P) "$(DESTDIR)$(magickppincdir)"
@@ -10737,26 +10829,6 @@
test -n "$$files" || exit 0; \
echo " ( cd '$(DESTDIR)$(magickpptopincdir)' && rm -f" $$files ")"; \
cd "$(DESTDIR)$(magickpptopincdir)" && rm -f $$files
-install-wandincHEADERS: $(wandinc_HEADERS)
- @$(NORMAL_INSTALL)
- test -z "$(wandincdir)" || $(MKDIR_P) "$(DESTDIR)$(wandincdir)"
- @list='$(wandinc_HEADERS)'; test -n "$(wandincdir)" || list=; \
- for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- echo "$$d$$p"; \
- done | $(am__base_list) | \
- while read files; do \
- echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(wandincdir)'"; \
- $(INSTALL_HEADER) $$files "$(DESTDIR)$(wandincdir)" || exit $$?; \
- done
-
-uninstall-wandincHEADERS:
- @$(NORMAL_UNINSTALL)
- @list='$(wandinc_HEADERS)'; test -n "$(wandincdir)" || list=; \
- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(wandincdir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(wandincdir)" && rm -f $$files
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -11141,7 +11213,7 @@
install-binPROGRAMS: install-libLTLIBRARIES
installdirs:
- for dir in "$(DESTDIR)$(codersdir)" "$(DESTDIR)$(filtersdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(configlibdir)" "$(DESTDIR)$(configsharedir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(ltdlincludedir)" "$(DESTDIR)$(magickincdir)" "$(DESTDIR)$(magickppincdir)" "$(DESTDIR)$(magickpptopincdir)" "$(DESTDIR)$(wandincdir)"; do \
+ for dir in "$(DESTDIR)$(codersdir)" "$(DESTDIR)$(filtersdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(configlibdir)" "$(DESTDIR)$(configsharedir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(MagickCoreincdir)" "$(DESTDIR)$(MagickWandincdir)" "$(DESTDIR)$(includedir)" "$(DESTDIR)$(ltdlincludedir)" "$(DESTDIR)$(magickppincdir)" "$(DESTDIR)$(magickpptopincdir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: $(BUILT_SOURCES)
@@ -11178,6 +11250,10 @@
-rm -f Magick++/lib/$(am__dirstamp)
-rm -f Magick++/tests/$(DEPDIR)/$(am__dirstamp)
-rm -f Magick++/tests/$(am__dirstamp)
+ -rm -f MagickCore/$(DEPDIR)/$(am__dirstamp)
+ -rm -f MagickCore/$(am__dirstamp)
+ -rm -f MagickWand/$(DEPDIR)/$(am__dirstamp)
+ -rm -f MagickWand/$(am__dirstamp)
-rm -f coders/$(DEPDIR)/$(am__dirstamp)
-rm -f coders/$(am__dirstamp)
-rm -f filters/$(DEPDIR)/$(am__dirstamp)
@@ -11186,14 +11262,10 @@
-rm -f ltdl/$(am__dirstamp)
-rm -f ltdl/loaders/$(DEPDIR)/$(am__dirstamp)
-rm -f ltdl/loaders/$(am__dirstamp)
- -rm -f magick/$(DEPDIR)/$(am__dirstamp)
- -rm -f magick/$(am__dirstamp)
-rm -f tests/$(DEPDIR)/$(am__dirstamp)
-rm -f tests/$(am__dirstamp)
-rm -f utilities/$(DEPDIR)/$(am__dirstamp)
-rm -f utilities/$(am__dirstamp)
- -rm -f wand/$(DEPDIR)/$(am__dirstamp)
- -rm -f wand/$(am__dirstamp)
-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
maintainer-clean-generic:
@@ -11209,7 +11281,7 @@
distclean: distclean-am
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
- -rm -rf Magick++/demo/$(DEPDIR) Magick++/lib/$(DEPDIR) Magick++/tests/$(DEPDIR) coders/$(DEPDIR) filters/$(DEPDIR) ltdl/$(DEPDIR) ltdl/loaders/$(DEPDIR) magick/$(DEPDIR) tests/$(DEPDIR) utilities/$(DEPDIR) wand/$(DEPDIR)
+ -rm -rf Magick++/demo/$(DEPDIR) Magick++/lib/$(DEPDIR) Magick++/tests/$(DEPDIR) MagickCore/$(DEPDIR) MagickWand/$(DEPDIR) coders/$(DEPDIR) filters/$(DEPDIR) ltdl/$(DEPDIR) ltdl/loaders/$(DEPDIR) tests/$(DEPDIR) utilities/$(DEPDIR)
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-hdr distclean-libtool distclean-local distclean-tags
@@ -11224,12 +11296,13 @@
info-am:
-install-data-am: install-codersLTLIBRARIES install-configlibDATA \
- install-configshareDATA install-data-local install-docDATA \
- install-filtersLTLIBRARIES install-includeHEADERS \
- install-ltdlincludeHEADERS install-magickincHEADERS \
+install-data-am: install-MagickCoreincHEADERS \
+ install-MagickWandincHEADERS install-codersLTLIBRARIES \
+ install-configlibDATA install-configshareDATA \
+ install-data-local install-docDATA install-filtersLTLIBRARIES \
+ install-includeHEADERS install-ltdlincludeHEADERS \
install-magickppincHEADERS install-magickpptopincHEADERS \
- install-man install-pkgconfigDATA install-wandincHEADERS
+ install-man install-pkgconfigDATA
install-dvi: install-dvi-am
@@ -11261,7 +11334,7 @@
maintainer-clean: maintainer-clean-am
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf $(top_srcdir)/autom4te.cache
- -rm -rf Magick++/demo/$(DEPDIR) Magick++/lib/$(DEPDIR) Magick++/tests/$(DEPDIR) coders/$(DEPDIR) filters/$(DEPDIR) ltdl/$(DEPDIR) ltdl/loaders/$(DEPDIR) magick/$(DEPDIR) tests/$(DEPDIR) utilities/$(DEPDIR) wand/$(DEPDIR)
+ -rm -rf Magick++/demo/$(DEPDIR) Magick++/lib/$(DEPDIR) Magick++/tests/$(DEPDIR) MagickCore/$(DEPDIR) MagickWand/$(DEPDIR) coders/$(DEPDIR) filters/$(DEPDIR) ltdl/$(DEPDIR) ltdl/loaders/$(DEPDIR) tests/$(DEPDIR) utilities/$(DEPDIR)
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic \
maintainer-clean-local
@@ -11279,14 +11352,15 @@
ps-am:
-uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
- uninstall-codersLTLIBRARIES uninstall-configlibDATA \
- uninstall-configshareDATA uninstall-docDATA \
- uninstall-filtersLTLIBRARIES uninstall-includeHEADERS \
- uninstall-libLTLIBRARIES uninstall-local \
- uninstall-ltdlincludeHEADERS uninstall-magickincHEADERS \
+uninstall-am: uninstall-MagickCoreincHEADERS \
+ uninstall-MagickWandincHEADERS uninstall-binPROGRAMS \
+ uninstall-binSCRIPTS uninstall-codersLTLIBRARIES \
+ uninstall-configlibDATA uninstall-configshareDATA \
+ uninstall-docDATA uninstall-filtersLTLIBRARIES \
+ uninstall-includeHEADERS uninstall-libLTLIBRARIES \
+ uninstall-local uninstall-ltdlincludeHEADERS \
uninstall-magickppincHEADERS uninstall-magickpptopincHEADERS \
- uninstall-man uninstall-pkgconfigDATA uninstall-wandincHEADERS
+ uninstall-man uninstall-pkgconfigDATA
uninstall-man: uninstall-man1
@@ -11303,7 +11377,8 @@
distclean-compile distclean-generic distclean-hdr \
distclean-libtool distclean-local distclean-tags \
distcleancheck distdir distuninstallcheck dvi dvi-am html \
- html-am info info-am install install-am install-binPROGRAMS \
+ html-am info info-am install install-MagickCoreincHEADERS \
+ install-MagickWandincHEADERS install-am install-binPROGRAMS \
install-binSCRIPTS install-codersLTLIBRARIES \
install-configlibDATA install-configshareDATA install-data \
install-data-am install-data-local install-docDATA install-dvi \
@@ -11311,23 +11386,22 @@
install-filtersLTLIBRARIES install-html install-html-am \
install-includeHEADERS install-info install-info-am \
install-libLTLIBRARIES install-ltdlincludeHEADERS \
- install-magickincHEADERS install-magickppincHEADERS \
- install-magickpptopincHEADERS install-man install-man1 \
- install-pdf install-pdf-am install-pkgconfigDATA install-ps \
- install-ps-am install-strip install-wandincHEADERS \
+ install-magickppincHEADERS install-magickpptopincHEADERS \
+ install-man install-man1 install-pdf install-pdf-am \
+ install-pkgconfigDATA install-ps install-ps-am install-strip \
installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic maintainer-clean-local mostlyclean \
mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
pdf pdf-am ps ps-am recheck recheck-html tags uninstall \
+ uninstall-MagickCoreincHEADERS uninstall-MagickWandincHEADERS \
uninstall-am uninstall-binPROGRAMS uninstall-binSCRIPTS \
uninstall-codersLTLIBRARIES uninstall-configlibDATA \
uninstall-configshareDATA uninstall-docDATA \
uninstall-filtersLTLIBRARIES uninstall-includeHEADERS \
uninstall-libLTLIBRARIES uninstall-local \
- uninstall-ltdlincludeHEADERS uninstall-magickincHEADERS \
- uninstall-magickppincHEADERS uninstall-magickpptopincHEADERS \
- uninstall-man uninstall-man1 uninstall-pkgconfigDATA \
- uninstall-wandincHEADERS
+ uninstall-ltdlincludeHEADERS uninstall-magickppincHEADERS \
+ uninstall-magickpptopincHEADERS uninstall-man uninstall-man1 \
+ uninstall-pkgconfigDATA
# We need the following in order to create an <argz.h> when the system
@@ -11337,11 +11411,23 @@
$(mkinstalldirs) . ltdl/
cp $(srcdir)/ltdl/argz_.h $@-t
mv $@-t $@
-magick-install-data-local:
- $(mkinstalldirs) $(DESTDIR)$(magickincdir)
- $(INSTALL_HEADER) magick/magick-config.h $(DESTDIR)$(magickincdir)/magick-config.h
-magick-uninstall-local:
- rm -f $(DESTDIR)$(magickincdir)/magick-config.h
+MagickCore-install-data-local:
+ $(mkinstalldirs) $(DESTDIR)$(MagickCoreincdir)
+ $(INSTALL_HEADER) MagickCore/magick-config.h $(DESTDIR)$(MagickCoreincdir)/magick-config.h
+MagickCore-uninstall-local:
+ rm -f $(DESTDIR)$(MagickCoreincdir)/magick-config.h
+ Magick++/lib/Magick++/Blob.h \
+ Magick++/lib/Magick++/CoderInfo.h \
+ Magick++/lib/Magick++/Color.h \
+ Magick++/lib/Magick++/Drawable.h \
+ Magick++/lib/Magick++/Exception.h \
+ Magick++/lib/Magick++/Geometry.h \
+ Magick++/lib/Magick++/Image.h \
+ Magick++/lib/Magick++/Include.h \
+ Magick++/lib/Magick++/Montage.h \
+ Magick++/lib/Magick++/Pixels.h \
+ Magick++/lib/Magick++/STL.h \
+ Magick++/lib/Magick++/TypeMetric.h
# If source files missing, see if they can be obtained via VPATH
perl-sources:
@@ -11482,16 +11568,16 @@
rm -f -r $(DESTDIR)$(pkgdocdir)/$$dir ; \
done
-# Ensure that version.h at $(srcdir)/magick/version.h is kept up to date.
-magick-version: magick/version.h
+# Ensure that version.h at $(srcdir)/MagickCore/version.h is kept up to date.
+magick-version: MagickCore/version.h
@if test -f "$(srcdir)/VisualMagick/installer/inc/version.isx.in" ; then \
./config.status --file="$(srcdir)/../VisualMagick/installer/inc/version.isx" 2> /dev/null ; \
fi
@if test -n "$(VPATH)" ; then \
- cmp magick/version.h $(srcdir)/magick/version.h > /dev/null ; \
+ cmp MagickCore/version.h $(srcdir)/MagickCore/version.h > /dev/null ; \
if test $$? -eq 1 ; then \
- echo "Updating $(srcdir)/magick/version.h ..."; \
- cp magick/version.h $(srcdir)/magick/version.h ; \
+ echo "Updating $(srcdir)/MagickCore/version.h ..."; \
+ cp MagickCore/version.h $(srcdir)/MagickCore/version.h ; \
fi ; \
fi ; \
touch magick-version
diff --git a/PerlMagick/Magick.pm b/PerlMagick/Magick.pm
index 0c6f245..63b8963 100644
--- a/PerlMagick/Magick.pm
+++ b/PerlMagick/Magick.pm
@@ -109,7 +109,7 @@
A web page has been set up for this extension. See:
- file:///usr/local/share/doc/ImageMagick-6.7.1//www/perl-magick.html
+ file:///usr/local/share/doc/ImageMagick-7.0.0//www/perl-magick.html
http://www.imagemagick.org/script/perl-magick.php
If you have problems, go to
diff --git a/QuickStart.txt b/QuickStart.txt
index 9e0a336..3a2e552 100644
--- a/QuickStart.txt
+++ b/QuickStart.txt
@@ -27,15 +27,15 @@
Set the MAGICK_HOME environment variable to the path where you extracted the
ImageMagick files. For example
- export MAGICK_HOME="$HOME/ImageMagick-6.7.1"
+ export MAGICK_HOME="$HOME/ImageMagick-7.0.0"
On Linux and Solaris machines set the LD_LIBRARY_PATH environment variable:
- export LD_LIBRARY_PATH="$HOME/ImageMagick-6.7.1/lib"
+ export LD_LIBRARY_PATH="$HOME/ImageMagick-7.0.0/lib"
On Mac OS X (Darwin) machines set the DYLD_LIBRARY_PATH environment variable:
- export DYLD_LIBRARY_PATH="$HOME/ImageMagick-6.7.1/lib"
+ export DYLD_LIBRARY_PATH="$HOME/ImageMagick-7.0.0/lib"
Now, test ImageMagick to see if it is working
@@ -44,7 +44,7 @@
To install PerlMagick type
- cd ImageMagick-6.7.1/PerlMagick
+ cd ImageMagick-7.0.0/PerlMagick
perl Makefile.PL
make
make install
@@ -68,7 +68,7 @@
$MAGICK_CONFIGURE_PATH
$MAGICK_HOME/etc/ImageMagick
- $MAGICK_HOME/share/ImageMagick-6.7.1/config
+ $MAGICK_HOME/share/ImageMagick-7.0.0/config
$HOME/.magick/
<client path>/etc/ImageMagick/
<current directory>/
@@ -81,7 +81,7 @@
$MAGICK_CONFIGURE_PATH
$MAGICK_HOME/etc/ImageMagick
- $MAGICK_HOME/share/ImageMagick-6.7.1/config
+ $MAGICK_HOME/share/ImageMagick-7.0.0/config
$HOME/.magick/
<client path>/etc/ImageMagick/
<current directory>/
@@ -98,7 +98,7 @@
$HOME/.magick/
<client path>/../etc/ImageMagick/modules-Q16/coders/
$MAGICK_HOME/etc/ImageMagick/modules-Q16/coders
- $MAGICK_HOME/share/ImageMagick-6.7.1/modules-Q16/coders
+ $MAGICK_HOME/share/ImageMagick-7.0.0/modules-Q16/coders
$HOME/.magick/
<client path>/etc/ImageMagick/modules-Q16/coders
<current directory>/
@@ -107,10 +107,10 @@
Download one of
- ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-6.7.1-0-Q16-windows-dll.exe
- ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-6.7.1-0-Q16-windows-static.exe
- ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-6.7.1-0-Q8-windows-dll.exe
- ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-6.7.1-0-Q8-windows-static.exe
+ ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.0-0-Q16-windows-dll.exe
+ ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.0-0-Q16-windows-static.exe
+ ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.0-0-Q8-windows-dll.exe
+ ftp://ftp.imagemagick.org/pub/ImageMagick/binaries/ImageMagick-7.0.0-0-Q8-windows-static.exe
and execute it (or "open" it from your browser) to start the installation
program.
diff --git a/coders/Makefile.am b/coders/Makefile.am
index 4151a53..4715037 100644
--- a/coders/Makefile.am
+++ b/coders/Makefile.am
@@ -18,71 +18,71 @@
codersdir = $(CODER_PATH)
if DPS_DELEGATE
-MAGICK_DPS_MODULES = coders/dps.la
-MAGICK_DPS_SRCS = coders/dps.c
+MAGICKCORE_DPS_MODULES = coders/dps.la
+MAGICKCORE_DPS_SRCS = coders/dps.c
endif
if DJVU_DELEGATE
-MAGICK_DJVU_MODULES = coders/djvu.la
-MAGICK_DJVU_SRCS = coders/djvu.c
+MAGICKCORE_DJVU_MODULES = coders/djvu.la
+MAGICKCORE_DJVU_SRCS = coders/djvu.c
endif
if OPENEXR_DELEGATE
-MAGICK_EXR_MODULES = coders/exr.la
-MAGICK_EXR_SRCS = coders/exr.c
+MAGICKCORE_EXR_MODULES = coders/exr.la
+MAGICKCORE_EXR_SRCS = coders/exr.c
endif
if FPX_DELEGATE
-MAGICK_FPX_MODULES = coders/fpx.la
-MAGICK_FPX_SRCS = coders/fpx.c
+MAGICKCORE_FPX_MODULES = coders/fpx.la
+MAGICKCORE_FPX_SRCS = coders/fpx.c
endif
if JBIG_DELEGATE
-MAGICK_JBIG_MODULES = coders/jbig.la
-MAGICK_JBIG_SRCS = coders/jbig.c
+MAGICKCORE_JBIG_MODULES = coders/jbig.la
+MAGICKCORE_JBIG_SRCS = coders/jbig.c
endif
if JPEG_DELEGATE
-MAGICK_JPEG_MODULES = coders/jpeg.la
-MAGICK_JPEG_SRCS = coders/jpeg.c
+MAGICKCORE_JPEG_MODULES = coders/jpeg.la
+MAGICKCORE_JPEG_SRCS = coders/jpeg.c
endif
if JP2_DELEGATE
-MAGICK_JP2_MODULES = coders/jp2.la
-MAGICK_JP2_SRCS = coders/jp2.c
+MAGICKCORE_JP2_MODULES = coders/jp2.la
+MAGICKCORE_JP2_SRCS = coders/jp2.c
endif
if PNG_DELEGATE
-MAGICK_PNG_MODULES = coders/png.la
-MAGICK_PNG_SRCS = coders/png.c
+MAGICKCORE_PNG_MODULES = coders/png.la
+MAGICKCORE_PNG_SRCS = coders/png.c
endif
if TIFF_DELEGATE
-MAGICK_TIFF_MODULES = coders/ept.la coders/tiff.la
-MAGICK_TIFF_SRCS = coders/ept.c coders/tiff.c
+MAGICKCORE_TIFF_MODULES = coders/ept.la coders/tiff.la
+MAGICKCORE_TIFF_SRCS = coders/ept.c coders/tiff.c
endif
if WEBP_DELEGATE
-MAGICK_WEBP_MODULES = coders/webp.la
-MAGICK_WEBP_SRCS = coders/webp.c
+MAGICKCORE_WEBP_MODULES = coders/webp.la
+MAGICKCORE_WEBP_SRCS = coders/webp.c
endif
if WINGDI32_DELEGATE
-MAGICK_GDI32_MODULES = coders/clipboard.la coders/emf.la
-MAGICK_GDI32_SRCS = coders/clipboard.c coders/emf.c
+MAGICKCORE_GDI32_MODULES = coders/clipboard.la coders/emf.la
+MAGICKCORE_GDI32_SRCS = coders/clipboard.c coders/emf.c
endif
if WMF_DELEGATE
-MAGICK_WMF_MODULES = coders/wmf.la
-MAGICK_WMF_SRCS = coders/wmf.c
+MAGICKCORE_WMF_MODULES = coders/wmf.la
+MAGICKCORE_WMF_SRCS = coders/wmf.c
endif
if X11_DELEGATE
-MAGICK_X11_MODULES = coders/x.la coders/xwd.la
-MAGICK_X11_SRCS = coders/x.c coders/xwd.c
+MAGICKCORE_X11_MODULES = coders/x.la coders/xwd.la
+MAGICKCORE_X11_SRCS = coders/x.c coders/xwd.c
endif
-MAGICK_CODER_SRCS = \
+MAGICKCORE_CODER_SRCS = \
coders/aai.c \
coders/art.c \
coders/avs.c \
@@ -184,19 +184,19 @@
coders/xps.c \
coders/ycbcr.c \
coders/yuv.c \
- $(MAGICK_DPS_SRCS) \
- $(MAGICK_DJVU_SRCS) \
- $(MAGICK_EXR_SRCS) \
- $(MAGICK_FPX_SRCS) \
- $(MAGICK_GDI32_SRCS) \
- $(MAGICK_JBIG_SRCS) \
- $(MAGICK_JPEG_SRCS) \
- $(MAGICK_JP2_SRCS) \
- $(MAGICK_PNG_SRCS) \
- $(MAGICK_TIFF_SRCS) \
- $(MAGICK_WEBP_SRCS) \
- $(MAGICK_WMF_SRCS) \
- $(MAGICK_X11_SRCS)
+ $(MAGICKCORE_DPS_SRCS) \
+ $(MAGICKCORE_DJVU_SRCS) \
+ $(MAGICKCORE_EXR_SRCS) \
+ $(MAGICKCORE_FPX_SRCS) \
+ $(MAGICKCORE_GDI32_SRCS) \
+ $(MAGICKCORE_JBIG_SRCS) \
+ $(MAGICKCORE_JPEG_SRCS) \
+ $(MAGICKCORE_JP2_SRCS) \
+ $(MAGICKCORE_PNG_SRCS) \
+ $(MAGICKCORE_TIFF_SRCS) \
+ $(MAGICKCORE_WEBP_SRCS) \
+ $(MAGICKCORE_WMF_SRCS) \
+ $(MAGICKCORE_X11_SRCS)
if WITH_MODULES
coders_LTLIBRARIES = \
@@ -301,19 +301,19 @@
coders/xps.la \
coders/ycbcr.la \
coders/yuv.la \
- $(MAGICK_DPS_MODULES) \
- $(MAGICK_DJVU_MODULES) \
- $(MAGICK_EXR_MODULES) \
- $(MAGICK_FPX_MODULES) \
- $(MAGICK_GDI32_MODULES) \
- $(MAGICK_JBIG_MODULES) \
- $(MAGICK_JPEG_MODULES) \
- $(MAGICK_JP2_MODULES) \
- $(MAGICK_PNG_MODULES) \
- $(MAGICK_TIFF_MODULES) \
- $(MAGICK_WEBP_MODULES) \
- $(MAGICK_WMF_MODULES) \
- $(MAGICK_X11_MODULES)
+ $(MAGICKCORE_DPS_MODULES) \
+ $(MAGICKCORE_DJVU_MODULES) \
+ $(MAGICKCORE_EXR_MODULES) \
+ $(MAGICKCORE_FPX_MODULES) \
+ $(MAGICKCORE_GDI32_MODULES) \
+ $(MAGICKCORE_JBIG_MODULES) \
+ $(MAGICKCORE_JPEG_MODULES) \
+ $(MAGICKCORE_JP2_MODULES) \
+ $(MAGICKCORE_PNG_MODULES) \
+ $(MAGICKCORE_TIFF_MODULES) \
+ $(MAGICKCORE_WEBP_MODULES) \
+ $(MAGICKCORE_WMF_MODULES) \
+ $(MAGICKCORE_X11_MODULES)
else
coders_LTLIBRARIES =
endif # WITH_MODULES
diff --git a/coders/aai.c b/coders/aai.c
index 4e838b7..e0a01e7 100644
--- a/coders/aai.c
+++ b/coders/aai.c
@@ -39,24 +39,26 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/colorspace.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/pixel.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
/*
Forward declarations.
@@ -101,7 +103,7 @@
register ssize_t
x;
- register PixelPacket
+ register Quantum
*q;
register unsigned char
@@ -168,19 +170,19 @@
ThrowReaderException(CorruptImageError,"UnableToReadImageData");
p=pixels;
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelBlue(q,ScaleCharToQuantum(*p++));
- SetPixelGreen(q,ScaleCharToQuantum(*p++));
- SetPixelRed(q,ScaleCharToQuantum(*p++));
+ SetPixelBlue(image,ScaleCharToQuantum(*p++),q);
+ SetPixelGreen(image,ScaleCharToQuantum(*p++),q);
+ SetPixelRed(image,ScaleCharToQuantum(*p++),q);
if (*p == 254)
*p=255;
- SetPixelAlpha(q,ScaleCharToQuantum(*p++));
- if (q->opacity != OpaqueOpacity)
+ SetPixelAlpha(image,ScaleCharToQuantum(*p++),q);
+ if (GetPixelAlpha(image,q) != OpaqueAlpha)
image->matte=MagickTrue;
- q++;
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -321,7 +323,7 @@
MagickOffsetType
scene;
- register const PixelPacket
+ register const Quantum
*restrict p;
register ssize_t
@@ -372,19 +374,19 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
q=pixels;
for (x=0; x < (ssize_t) image->columns; x++)
{
- *q++=ScaleQuantumToChar(GetPixelBlue(p));
- *q++=ScaleQuantumToChar(GetPixelGreen(p));
- *q++=ScaleQuantumToChar(GetPixelRed(p));
- *q=ScaleQuantumToChar((Quantum) (QuantumRange-(image->matte !=
- MagickFalse ? GetPixelOpacity(p) : OpaqueOpacity)));
+ *q++=ScaleQuantumToChar(GetPixelBlue(image,p));
+ *q++=ScaleQuantumToChar(GetPixelGreen(image,p));
+ *q++=ScaleQuantumToChar(GetPixelRed(image,p));
+ *q=ScaleQuantumToChar((Quantum) (image->matte != MagickFalse ?
+ GetPixelAlpha(image,p) : OpaqueAlpha));
if (*q == 255)
*q=254;
- p++;
+ p+=GetPixelChannels(image);
q++;
}
count=WriteBlob(image,(size_t) (q-pixels),pixels);
diff --git a/coders/art.c b/coders/art.c
index 5157d33..aa25dd0 100644
--- a/coders/art.c
+++ b/coders/art.c
@@ -39,26 +39,26 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/color-private.h"
-#include "magick/colormap.h"
-#include "magick/colorspace.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colormap.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
/*
Forward declarations.
@@ -161,11 +161,11 @@
length=GetQuantumExtent(image,quantum_info,quantum_type);
for (y=0; y < (ssize_t) image->rows; y++)
{
- register PixelPacket
+ register Quantum
*restrict q;
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
count=ReadBlob(image,length,pixels);
if (count != (ssize_t) length)
@@ -282,7 +282,7 @@
QuantumInfo
*quantum_info;
- register const PixelPacket
+ register const Quantum
*p;
ssize_t
@@ -329,9 +329,9 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- (void) ExportQuantumPixels(image,(const CacheView *) NULL,quantum_info,
+ (void) ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
GrayQuantum,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
diff --git a/coders/avs.c b/coders/avs.c
index 1e01764..cc22df2 100644
--- a/coders/avs.c
+++ b/coders/avs.c
@@ -39,24 +39,25 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/colorspace.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
/*
Forward declarations.
@@ -98,7 +99,7 @@
MagickBooleanType
status;
- register PixelPacket
+ register Quantum
*q;
register ssize_t
@@ -168,17 +169,17 @@
ThrowReaderException(CorruptImageError,"UnableToReadImageData");
p=pixels;
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelAlpha(q,ScaleCharToQuantum(*p++));
- SetPixelRed(q,ScaleCharToQuantum(*p++));
- SetPixelGreen(q,ScaleCharToQuantum(*p++));
- SetPixelBlue(q,ScaleCharToQuantum(*p++));
- if (q->opacity != OpaqueOpacity)
+ SetPixelAlpha(image,ScaleCharToQuantum(*p++),q);
+ SetPixelRed(image,ScaleCharToQuantum(*p++),q);
+ SetPixelGreen(image,ScaleCharToQuantum(*p++),q);
+ SetPixelBlue(image,ScaleCharToQuantum(*p++),q);
+ if (GetPixelAlpha(image,q) != OpaqueAlpha)
image->matte=MagickTrue;
- q++;
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -319,7 +320,7 @@
MagickOffsetType
scene;
- register const PixelPacket
+ register const Quantum
*restrict p;
register ssize_t
@@ -370,17 +371,17 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
q=pixels;
for (x=0; x < (ssize_t) image->columns; x++)
{
- *q++=ScaleQuantumToChar((Quantum) (QuantumRange-(image->matte !=
- MagickFalse ? GetPixelOpacity(p) : OpaqueOpacity)));
- *q++=ScaleQuantumToChar(GetPixelRed(p));
- *q++=ScaleQuantumToChar(GetPixelGreen(p));
- *q++=ScaleQuantumToChar(GetPixelBlue(p));
- p++;
+ *q++=ScaleQuantumToChar((Quantum) (image->matte != MagickFalse ?
+ GetPixelAlpha(image,p) : OpaqueAlpha));
+ *q++=ScaleQuantumToChar(GetPixelRed(image,p));
+ *q++=ScaleQuantumToChar(GetPixelGreen(image,p));
+ *q++=ScaleQuantumToChar(GetPixelBlue(image,p));
+ p+=GetPixelChannels(image);
}
count=WriteBlob(image,(size_t) (q-pixels),pixels);
if (count != (ssize_t) (q-pixels))
diff --git a/coders/bgr.c b/coders/bgr.c
index d7244a2..3ff1429 100644
--- a/coders/bgr.c
+++ b/coders/bgr.c
@@ -39,28 +39,28 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/colorspace.h"
-#include "magick/constitute.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/pixel-private.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/statistic.h"
-#include "magick/string_.h"
-#include "magick/module.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/statistic.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/utility.h"
/*
Forward declarations.
@@ -211,10 +211,10 @@
}
for (y=0; y < (ssize_t) image->extract_info.height; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -228,7 +228,7 @@
}
q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
quantum_info,quantum_type,pixels,exception);
@@ -241,19 +241,19 @@
canvas_image->columns,1,exception);
q=QueueAuthenticPixels(image,0,y-image->extract_info.y,
image->columns,1,exception);
- if ((p == (const PixelPacket *) NULL) ||
- (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) ||
+ (q == (const Quantum *) NULL))
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelRed(q,GetPixelRed(p));
- SetPixelGreen(q,GetPixelGreen(p));
- SetPixelBlue(q,GetPixelBlue(p));
- SetPixelOpacity(q,OpaqueOpacity);
+ SetPixelRed(image,GetPixelRed(canvas_image,p),q);
+ SetPixelGreen(image,GetPixelGreen(canvas_image,p),q);
+ SetPixelBlue(image,GetPixelBlue(canvas_image,p),q);
+ SetPixelAlpha(image,OpaqueAlpha,q);
if (image->matte != MagickFalse)
- SetPixelOpacity(q,GetPixelOpacity(p));
- p++;
- q++;
+ SetPixelAlpha(image,GetPixelAlpha(canvas_image,p),q);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -290,10 +290,10 @@
}
for (y=0; y < (ssize_t) image->extract_info.height; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -310,7 +310,7 @@
quantum_type=quantum_types[i];
q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
quantum_info,quantum_type,pixels,exception);
@@ -323,8 +323,8 @@
canvas_image->columns,1,exception);
q=GetAuthenticPixels(image,0,y-image->extract_info.y,
image->columns,1,exception);
- if ((p == (const PixelPacket *) NULL) ||
- (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) ||
+ (q == (const Quantum *) NULL))
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
@@ -332,34 +332,34 @@
{
case RedQuantum:
{
- SetPixelRed(q,GetPixelRed(p));
+ SetPixelRed(image,GetPixelRed(canvas_image,p),q);
break;
}
case GreenQuantum:
{
- SetPixelGreen(q,GetPixelGreen(p));
+ SetPixelGreen(image,GetPixelGreen(canvas_image,p),q);
break;
}
case BlueQuantum:
{
- SetPixelBlue(q,GetPixelBlue(p));
+ SetPixelBlue(image,GetPixelBlue(canvas_image,p),q);
break;
}
case OpacityQuantum:
{
- SetPixelOpacity(q,GetPixelOpacity(p));
+ SetPixelAlpha(image,GetPixelAlpha(canvas_image,p),q);
break;
}
case AlphaQuantum:
{
- SetPixelAlpha(q,GetPixelAlpha(p));
+ SetPixelAlpha(image,GetPixelAlpha(canvas_image,p),q);
break;
}
default:
break;
}
- p++;
- q++;
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -388,10 +388,10 @@
}
for (y=0; y < (ssize_t) image->extract_info.height; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -405,7 +405,7 @@
}
q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
quantum_info,RedQuantum,pixels,exception);
@@ -418,14 +418,14 @@
canvas_image->columns,1,exception);
q=GetAuthenticPixels(image,0,y-image->extract_info.y,
image->columns,1,exception);
- if ((p == (const PixelPacket *) NULL) ||
- (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) ||
+ (q == (const Quantum *) NULL))
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelRed(q,GetPixelRed(p));
- p++;
- q++;
+ SetPixelRed(image,GetPixelRed(canvas_image,p),q);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -440,10 +440,10 @@
}
for (y=0; y < (ssize_t) image->extract_info.height; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -457,7 +457,7 @@
}
q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
quantum_info,GreenQuantum,pixels,exception);
@@ -470,14 +470,14 @@
canvas_image->columns,1,exception);
q=GetAuthenticPixels(image,0,y-image->extract_info.y,
image->columns,1,exception);
- if ((p == (const PixelPacket *) NULL) ||
- (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) ||
+ (q == (const Quantum *) NULL))
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelGreen(q,GetPixelGreen(p));
- p++;
- q++;
+ SetPixelGreen(image,GetPixelGreen(canvas_image,p),q);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -492,10 +492,10 @@
}
for (y=0; y < (ssize_t) image->extract_info.height; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -509,7 +509,7 @@
}
q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
quantum_info,BlueQuantum,pixels,exception);
@@ -522,14 +522,14 @@
canvas_image->columns,1,exception);
q=GetAuthenticPixels(image,0,y-image->extract_info.y,
image->columns,1,exception);
- if ((p == (const PixelPacket *) NULL) ||
- (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) ||
+ (q == (const Quantum *) NULL))
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelBlue(q,GetPixelBlue(p));
- p++;
- q++;
+ SetPixelBlue(image,GetPixelBlue(canvas_image,p),q);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -552,10 +552,10 @@
{
for (y=0; y < (ssize_t) image->extract_info.height; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -569,7 +569,7 @@
}
q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
quantum_info,AlphaQuantum,pixels,exception);
@@ -583,14 +583,14 @@
exception);
q=GetAuthenticPixels(image,0,y-image->extract_info.y,
image->columns,1,exception);
- if ((p == (const PixelPacket *) NULL) ||
- (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) ||
+ (q == (const Quantum *) NULL))
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelOpacity(q,GetPixelOpacity(p));
- p++;
- q++;
+ SetPixelAlpha(image,GetPixelAlpha(canvas_image,p),q);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -640,10 +640,10 @@
count=ReadBlob(image,length,pixels);
for (y=0; y < (ssize_t) image->extract_info.height; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -657,7 +657,7 @@
}
q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
quantum_info,BlueQuantum,pixels,exception);
@@ -670,14 +670,14 @@
canvas_image->columns,1,exception);
q=GetAuthenticPixels(image,0,y-image->extract_info.y,
image->columns,1,exception);
- if ((p == (const PixelPacket *) NULL) ||
- (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) ||
+ (q == (const Quantum *) NULL))
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelRed(q,GetPixelRed(p));
- p++;
- q++;
+ SetPixelRed(image,GetPixelRed(canvas_image,p),q);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -711,10 +711,10 @@
count=ReadBlob(image,length,pixels);
for (y=0; y < (ssize_t) image->extract_info.height; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -728,7 +728,7 @@
}
q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
quantum_info,GreenQuantum,pixels,exception);
@@ -741,14 +741,14 @@
canvas_image->columns,1,exception);
q=GetAuthenticPixels(image,0,y-image->extract_info.y,
image->columns,1,exception);
- if ((p == (const PixelPacket *) NULL) ||
- (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) ||
+ (q == (const Quantum *) NULL))
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelGreen(q,GetPixelGreen(p));
- p++;
- q++;
+ SetPixelGreen(image,GetPixelGreen(canvas_image,p),q);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -782,10 +782,10 @@
count=ReadBlob(image,length,pixels);
for (y=0; y < (ssize_t) image->extract_info.height; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -799,7 +799,7 @@
}
q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
quantum_info,RedQuantum,pixels,exception);
@@ -812,14 +812,14 @@
canvas_image->columns,1,exception);
q=GetAuthenticPixels(image,0,y-image->extract_info.y,
image->columns,1,exception);
- if ((p == (const PixelPacket *) NULL) ||
- (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) ||
+ (q == (const Quantum *) NULL))
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelBlue(q,GetPixelBlue(p));
- p++;
- q++;
+ SetPixelBlue(image,GetPixelBlue(canvas_image,p),q);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -855,10 +855,10 @@
count=ReadBlob(image,length,pixels);
for (y=0; y < (ssize_t) image->extract_info.height; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -872,7 +872,7 @@
}
q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
quantum_info,BlueQuantum,pixels,exception);
@@ -885,14 +885,14 @@
0,canvas_image->columns,1,exception);
q=GetAuthenticPixels(image,0,y-image->extract_info.y,
image->columns,1,exception);
- if ((p == (const PixelPacket *) NULL) ||
- (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) ||
+ (q == (const Quantum *) NULL))
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelOpacity(q,GetPixelOpacity(p));
- p++;
- q++;
+ SetPixelAlpha(image,GetPixelAlpha(canvas_image,p),q);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -1105,7 +1105,7 @@
(void) TransformImageColorspace(image,RGBColorspace);
if ((LocaleCompare(image_info->magick,"BGRA") == 0) &&
(image->matte == MagickFalse))
- (void) SetImageAlphaChannel(image,ResetAlphaChannel);
+ (void) SetImageAlphaChannel(image,OpaqueAlphaChannel);
quantum_info=AcquireQuantumInfo(image_info,image);
if (quantum_info == (QuantumInfo *) NULL)
ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed");
@@ -1120,14 +1120,14 @@
*/
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,quantum_type,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ quantum_type,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
break;
@@ -1148,31 +1148,31 @@
*/
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,BlueQuantum,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ BlueQuantum,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,GreenQuantum,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ GreenQuantum,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,RedQuantum,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ RedQuantum,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
break;
if (quantum_type == BGRAQuantum)
{
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,AlphaQuantum,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ AlphaQuantum,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
break;
@@ -1194,14 +1194,14 @@
*/
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,RedQuantum,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ RedQuantum,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
break;
@@ -1214,14 +1214,14 @@
}
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,GreenQuantum,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ GreenQuantum,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
break;
@@ -1234,14 +1234,14 @@
}
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,BlueQuantum,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ BlueQuantum,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
break;
@@ -1256,14 +1256,14 @@
{
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,AlphaQuantum,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ AlphaQuantum,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
break;
@@ -1298,14 +1298,14 @@
return(status);
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,BlueQuantum,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ BlueQuantum,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
break;
@@ -1324,14 +1324,14 @@
return(status);
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,GreenQuantum,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ GreenQuantum,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
break;
@@ -1350,14 +1350,14 @@
return(status);
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,RedQuantum,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ RedQuantum,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
break;
@@ -1379,15 +1379,15 @@
return(status);
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
p=GetVirtualPixels(image,0,y,image->columns,1,
&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,AlphaQuantum,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ AlphaQuantum,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
break;
diff --git a/coders/bmp.c b/coders/bmp.c
index 1681da4..f45f9e7 100644
--- a/coders/bmp.c
+++ b/coders/bmp.c
@@ -40,30 +40,31 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/colormap-private.h"
-#include "magick/color-private.h"
-#include "magick/colormap.h"
-#include "magick/colorspace.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/log.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/profile.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
-#include "magick/transform.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/colormap-private.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colormap.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/log.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/profile.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/transform.h"
/*
Macro definitions (from Windows wingdi.h).
@@ -490,9 +491,6 @@
Image
*image;
- IndexPacket
- index;
-
MagickBooleanType
status;
@@ -500,10 +498,10 @@
offset,
start_position;
- register IndexPacket
- *indexes;
+ Quantum
+ index;
- register PixelPacket
+ register Quantum
*q;
register ssize_t
@@ -972,8 +970,8 @@
while (((bmp_info.blue_mask << shift.blue) & 0x80000000UL) == 0)
shift.blue++;
if (bmp_info.alpha_mask != 0)
- while (((bmp_info.alpha_mask << shift.opacity) & 0x80000000UL) == 0)
- shift.opacity++;
+ while (((bmp_info.alpha_mask << shift.alpha) & 0x80000000UL) == 0)
+ shift.alpha++;
sample=shift.red;
while (((bmp_info.red_mask << sample) & 0x80000000UL) != 0)
sample++;
@@ -986,10 +984,10 @@
while (((bmp_info.blue_mask << sample) & 0x80000000UL) != 0)
sample++;
quantum_bits.blue=(Quantum) (sample-shift.blue);
- sample=shift.opacity;
+ sample=shift.alpha;
while (((bmp_info.alpha_mask << sample) & 0x80000000UL) != 0)
sample++;
- quantum_bits.opacity=(Quantum) (sample-shift.opacity);
+ quantum_bits.alpha=(Quantum) (sample-shift.alpha);
}
switch (bmp_info.bits_per_pixel)
{
@@ -1002,16 +1000,15 @@
{
p=pixels+(image->rows-y-1)*bytes_per_line;
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
for (x=0; x < ((ssize_t) image->columns-7); x+=8)
{
for (bit=0; bit < 8; bit++)
{
- index=(IndexPacket) (((*p) & (0x80 >> bit)) != 0 ? 0x01 : 0x00);
- SetPixelIndex(indexes+x+bit,index);
- q++;
+ index=(Quantum) (((*p) & (0x80 >> bit)) != 0 ? 0x01 : 0x00);
+ SetPixelIndex(image,index,q);
+ q+=GetPixelChannels(image);
}
p++;
}
@@ -1019,8 +1016,9 @@
{
for (bit=0; bit < (image->columns % 8); bit++)
{
- index=(IndexPacket) (((*p) & (0x80 >> bit)) != 0 ? 0x01 : 0x00);
- SetPixelIndex(indexes+x+bit,index);
+ index=(Quantum) (((*p) & (0x80 >> bit)) != 0 ? 0x01 : 0x00);
+ SetPixelIndex(image,index,q);
+ q+=GetPixelChannels(image);
}
p++;
}
@@ -1046,21 +1044,23 @@
{
p=pixels+(image->rows-y-1)*bytes_per_line;
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
for (x=0; x < ((ssize_t) image->columns-1); x+=2)
{
index=ConstrainColormapIndex(image,(*p >> 4) & 0x0f);
- SetPixelIndex(indexes+x,index);
+ SetPixelIndex(image,index,q);
+ q+=GetPixelChannels(image);
index=ConstrainColormapIndex(image,*p & 0x0f);
- SetPixelIndex(indexes+x+1,index);
+ SetPixelIndex(image,index,q);
+ q+=GetPixelChannels(image);
p++;
}
if ((image->columns % 2) != 0)
{
index=ConstrainColormapIndex(image,(*p >> 4) & 0xf);
- SetPixelIndex(indexes+x,index);
+ SetPixelIndex(image,index,q);
+ q+=GetPixelChannels(image);
p++;
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -1088,16 +1088,13 @@
{
p=pixels+(image->rows-y-1)*bytes_per_line;
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
for (x = (ssize_t)image->columns; x != 0; --x)
{
- index=ConstrainColormapIndex(image,*p);
- SetPixelIndex(indexes,index);
- indexes++;
- p++;
- q++;
+ index=ConstrainColormapIndex(image,*p++);
+ SetPixelIndex(image,index,q);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -1134,7 +1131,7 @@
{
p=pixels+(image->rows-y-1)*bytes_per_line;
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
@@ -1157,18 +1154,17 @@
blue|=((blue & 0xe000) >> 5);
if (quantum_bits.blue <= 8)
blue|=((blue & 0xff00) >> 8);
- opacity=((pixel & bmp_info.alpha_mask) << shift.opacity) >> 16;
- if (quantum_bits.opacity <= 8)
+ opacity=((pixel & bmp_info.alpha_mask) << shift.alpha) >> 16;
+ if (quantum_bits.alpha <= 8)
opacity|=((opacity & 0xff00) >> 8);
- SetPixelRed(q,ScaleShortToQuantum((unsigned short) red));
- SetPixelGreen(q,ScaleShortToQuantum((unsigned short)
- green));
- SetPixelBlue(q,ScaleShortToQuantum((unsigned short) blue));
- SetPixelOpacity(q,OpaqueOpacity);
+ SetPixelRed(image,ScaleShortToQuantum((unsigned short) red),q);
+ SetPixelGreen(image,ScaleShortToQuantum((unsigned short) green),q);
+ SetPixelBlue(image,ScaleShortToQuantum((unsigned short) blue),q);
+ SetPixelAlpha(image,OpaqueAlpha,q);
if (image->matte != MagickFalse)
- SetPixelAlpha(q,ScaleShortToQuantum((unsigned short)
- opacity));
- q++;
+ SetPixelAlpha(image,
+ ScaleShortToQuantum((unsigned short) opacity),q);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -1193,15 +1189,15 @@
{
p=pixels+(image->rows-y-1)*bytes_per_line;
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelBlue(q,ScaleCharToQuantum(*p++));
- SetPixelGreen(q,ScaleCharToQuantum(*p++));
- SetPixelRed(q,ScaleCharToQuantum(*p++));
- SetPixelOpacity(q,OpaqueOpacity);
- q++;
+ SetPixelBlue(image,ScaleCharToQuantum(*p++),q);
+ SetPixelGreen(image,ScaleCharToQuantum(*p++),q);
+ SetPixelRed(image,ScaleCharToQuantum(*p++),q);
+ SetPixelAlpha(image,OpaqueAlpha,q);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -1236,7 +1232,7 @@
p=pixels+(image->rows-y-1)*bytes_per_line;
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
@@ -1253,18 +1249,17 @@
blue=((pixel & bmp_info.blue_mask) << shift.blue) >> 16;
if (quantum_bits.blue == 8)
blue|=(blue >> 8);
- opacity=((pixel & bmp_info.alpha_mask) << shift.opacity) >> 16;
- if (quantum_bits.opacity == 8)
+ opacity=((pixel & bmp_info.alpha_mask) << shift.alpha) >> 16;
+ if (quantum_bits.alpha == 8)
opacity|=(opacity >> 8);
- SetPixelRed(q,ScaleShortToQuantum((unsigned short) red));
- SetPixelGreen(q,ScaleShortToQuantum((unsigned short)
- green));
- SetPixelBlue(q,ScaleShortToQuantum((unsigned short) blue));
- SetPixelOpacity(q,OpaqueOpacity);
+ SetPixelRed(image,ScaleShortToQuantum((unsigned short) red),q);
+ SetPixelGreen(image,ScaleShortToQuantum((unsigned short) green),q);
+ SetPixelBlue(image,ScaleShortToQuantum((unsigned short) blue),q);
+ SetPixelAlpha(image,OpaqueAlpha,q);
if (image->matte != MagickFalse)
- SetPixelAlpha(q,ScaleShortToQuantum((unsigned short)
- opacity));
- q++;
+ SetPixelAlpha(image,
+ ScaleShortToQuantum((unsigned short) opacity),q);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -1467,10 +1462,7 @@
MagickOffsetType
scene;
- register const IndexPacket
- *indexes;
-
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
@@ -1645,17 +1637,19 @@
*/
for (y=0; y < (ssize_t) image->rows; y++)
{
+ ssize_t
+ offset;
+
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetVirtualIndexQueue(image);
q=pixels+(image->rows-y-1)*bytes_per_line;
bit=0;
byte=0;
for (x=0; x < (ssize_t) image->columns; x++)
{
byte<<=1;
- byte|=GetPixelIndex(indexes+x) != 0 ? 0x01 : 0x00;
+ byte|=GetPixelIndex(image,p) != 0 ? 0x01 : 0x00;
bit++;
if (bit == 8)
{
@@ -1663,13 +1657,15 @@
bit=0;
byte=0;
}
+ p+=GetPixelChannels(image);
}
if (bit != 0)
{
*q++=(unsigned char) (byte << (8-bit));
x++;
}
- for (x=(ssize_t) (image->columns+7)/8; x < (ssize_t) bytes_per_line; x++)
+ offset=(ssize_t) (image->columns+7)/8;
+ for (x=offset; x < (ssize_t) bytes_per_line; x++)
*q++=0x00;
if (image->previous == (Image *) NULL)
{
@@ -1684,8 +1680,9 @@
case 4:
{
size_t
+ byte,
nibble,
- byte;
+ offset;
/*
Convert PseudoClass image to a BMP monochrome image.
@@ -1693,16 +1690,15 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetVirtualIndexQueue(image);
q=pixels+(image->rows-y-1)*bytes_per_line;
nibble=0;
byte=0;
for (x=0; x < (ssize_t) image->columns; x++)
{
byte<<=4;
- byte|=((size_t) GetPixelIndex(indexes+x) & 0x0f);
+ byte|=((size_t) GetPixelIndex(image,p) & 0x0f);
nibble++;
if (nibble == 2)
{
@@ -1710,13 +1706,15 @@
nibble=0;
byte=0;
}
- }
- if (nibble != 0)
- {
- *q++=(unsigned char) (byte << 4);
- x++;
- }
- for (x=(ssize_t) (image->columns+1)/2; x < (ssize_t) bytes_per_line; x++)
+ p+=GetPixelChannels(image);
+ }
+ if (nibble != 0)
+ {
+ *q++=(unsigned char) (byte << 4);
+ x++;
+ }
+ offset=(ssize_t) (image->columns+1)/2;
+ for (x=offset; x < (ssize_t) bytes_per_line; x++)
*q++=0x00;
if (image->previous == (Image *) NULL)
{
@@ -1736,12 +1734,14 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetVirtualIndexQueue(image);
q=pixels+(image->rows-y-1)*bytes_per_line;
for (x=0; x < (ssize_t) image->columns; x++)
- *q++=(unsigned char) GetPixelIndex(indexes+x);
+ {
+ *q++=(unsigned char) GetPixelIndex(image,p);
+ p+=GetPixelChannels(image);
+ }
for ( ; x < (ssize_t) bytes_per_line; x++)
*q++=0x00;
if (image->previous == (Image *) NULL)
@@ -1762,15 +1762,15 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
q=pixels+(image->rows-y-1)*bytes_per_line;
for (x=0; x < (ssize_t) image->columns; x++)
{
- *q++=ScaleQuantumToChar(GetPixelBlue(p));
- *q++=ScaleQuantumToChar(GetPixelGreen(p));
- *q++=ScaleQuantumToChar(GetPixelRed(p));
- p++;
+ *q++=ScaleQuantumToChar(GetPixelBlue(image,p));
+ *q++=ScaleQuantumToChar(GetPixelGreen(image,p));
+ *q++=ScaleQuantumToChar(GetPixelRed(image,p));
+ p+=GetPixelChannels(image);
}
for (x=3L*(ssize_t) image->columns; x < (ssize_t) bytes_per_line; x++)
*q++=0x00;
@@ -1792,16 +1792,16 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
q=pixels+(image->rows-y-1)*bytes_per_line;
for (x=0; x < (ssize_t) image->columns; x++)
{
- *q++=ScaleQuantumToChar(GetPixelBlue(p));
- *q++=ScaleQuantumToChar(GetPixelGreen(p));
- *q++=ScaleQuantumToChar(GetPixelRed(p));
- *q++=ScaleQuantumToChar(QuantumRange-GetPixelOpacity(p));
- p++;
+ *q++=ScaleQuantumToChar(GetPixelBlue(image,p));
+ *q++=ScaleQuantumToChar(GetPixelGreen(image,p));
+ *q++=ScaleQuantumToChar(GetPixelRed(image,p));
+ *q++=ScaleQuantumToChar(GetPixelAlpha(image,p));
+ p+=GetPixelChannels(image);
}
if (image->previous == (Image *) NULL)
{
diff --git a/coders/braille.c b/coders/braille.c
index be405b2..7da9ada 100644
--- a/coders/braille.c
+++ b/coders/braille.c
@@ -37,28 +37,29 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/color-private.h"
-#include "magick/colorspace.h"
-#include "magick/constitute.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/module.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/property.h"
-#include "magick/quantize.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/property.h"
+#include "MagickCore/quantize.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/utility.h"
/*
Forward declarations.
@@ -175,9 +176,6 @@
const char
*value;
- IndexPacket
- polarity;
-
int
unicode = 0,
iso_11548_1 = 0;
@@ -185,10 +183,10 @@
MagickBooleanType
status;
- register const IndexPacket
- *indexes;
+ Quantum
+ polarity;
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
@@ -250,11 +248,11 @@
(void) SetImageType(image,BilevelType);
polarity = 0;
if (image->storage_class == PseudoClass) {
- polarity=(IndexPacket) (PixelIntensityToQuantum(&image->colormap[0]) >=
+ polarity=(Quantum) (GetPixelPacketIntensity(&image->colormap[0]) >=
(Quantum) (QuantumRange/2));
if (image->colors == 2)
- polarity=(IndexPacket) (PixelIntensityToQuantum(&image->colormap[0]) >=
- PixelIntensityToQuantum(&image->colormap[1]));
+ polarity=(Quantum) (GetPixelPacketIntensity(&image->colormap[0]) >=
+ GetPixelPacketIntensity(&image->colormap[1]));
}
for (y=0; y < (ssize_t) image->rows; y+=(ssize_t) cell_height)
{
@@ -262,9 +260,8 @@
cell_height = (size_t) (image->rows-y);
p=GetVirtualPixels(image,0,y,image->columns,cell_height,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetVirtualIndexQueue(image);
for (x=0; x < (ssize_t) image->columns; x+=2)
{
unsigned char cell = 0;
@@ -274,9 +271,9 @@
{
#define do_cell(dx,dy,bit) do { \
if (image->storage_class == PseudoClass) \
- cell |= (GetPixelIndex(indexes+x+dx+dy*image->columns) == polarity) << bit; \
+ cell |= (GetPixelIndex(image,p+x+dx+dy*image->columns) == polarity) << bit; \
else \
- cell |= (GetPixelGreen(p+x+dx+dy*image->columns) == 0) << bit; \
+ cell |= (GetPixelGreen(image,p+x+dx+dy*image->columns) == 0) << bit; \
} while (0)
do_cell(0,0,0);
diff --git a/coders/cals.c b/coders/cals.c
index 2801b1c..8e88534 100644
--- a/coders/cals.c
+++ b/coders/cals.c
@@ -44,27 +44,27 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/colorspace.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/geometry.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/option.h"
-#include "magick/quantum-private.h"
-#include "magick/resource_.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/option.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
#if defined(MAGICKCORE_TIFF_DELEGATE)
/*
diff --git a/coders/caption.c b/coders/caption.c
index 7d6006c..bdf09d8 100644
--- a/coders/caption.c
+++ b/coders/caption.c
@@ -39,24 +39,24 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/annotate.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/draw.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/option.h"
-#include "magick/property.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/annotate.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/draw.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/option.h"
+#include "MagickCore/property.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/coders/cin.c b/coders/cin.c
index f7d802f..1f07ed3 100644
--- a/coders/cin.c
+++ b/coders/cin.c
@@ -46,29 +46,29 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/colorspace.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/option.h"
-#include "magick/profile.h"
-#include "magick/property.h"
-#include "magick/quantum-private.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/string-private.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/option.h"
+#include "MagickCore/profile.h"
+#include "MagickCore/property.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/string-private.h"
+#include "MagickCore/module.h"
/*
Typedef declaration.
@@ -401,7 +401,7 @@
register ssize_t
i;
- register PixelPacket
+ register Quantum
*q;
size_t
@@ -707,7 +707,7 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
count=ReadBlob(image,length,pixels);
if ((size_t) count != length)
@@ -856,7 +856,7 @@
QuantumType
quantum_type;
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
@@ -1149,9 +1149,9 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- (void) ExportQuantumPixels(image,(const CacheView *) NULL,quantum_info,
+ (void) ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
quantum_type,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
diff --git a/coders/cip.c b/coders/cip.c
index 142b958..3071f0b 100644
--- a/coders/cip.c
+++ b/coders/cip.c
@@ -38,29 +38,30 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/color-private.h"
-#include "magick/colorspace.h"
-#include "magick/constitute.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/property.h"
-#include "magick/quantize.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/property.h"
+#include "MagickCore/quantize.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/utility.h"
/*
Forward declarations.
@@ -173,7 +174,7 @@
MagickBooleanType
status;
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
@@ -232,15 +233,15 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < ((ssize_t) image->columns-3); x+=4)
{
byte=(unsigned char)
- ((((size_t) (4*PixelIntensityToQuantum(p+3)/QuantumRange) & 0x03) << 6) |
- (((size_t) (4*PixelIntensityToQuantum(p+2)/QuantumRange) & 0x03) << 4) |
- (((size_t) (4*PixelIntensityToQuantum(p+1)/QuantumRange) & 0x03) << 2) |
- (((size_t) (4*PixelIntensityToQuantum(p+0)/QuantumRange) & 0x03) << 0));
+ ((((size_t) (4*GetPixelIntensity(image,p+3)/QuantumRange) & 0x03) << 6) |
+ (((size_t) (4*GetPixelIntensity(image,p+2)/QuantumRange) & 0x03) << 4) |
+ (((size_t) (4*GetPixelIntensity(image,p+1)/QuantumRange) & 0x03) << 2) |
+ (((size_t) (4*GetPixelIntensity(image,p+0)/QuantumRange) & 0x03) << 0));
(void) FormatLocaleString(buffer,MaxTextExtent,"%02x",byte);
(void) WriteBlobString(image,buffer);
p+=4;
@@ -249,10 +250,10 @@
{
i=(ssize_t) image->columns % 4;
byte=(unsigned char)
- ((((size_t) (4*PixelIntensityToQuantum(p+MagickMin(i,3))/QuantumRange) & 0x03) << 6) |
- (((size_t) (4*PixelIntensityToQuantum(p+MagickMin(i,2))/QuantumRange) & 0x03) << 4) |
- (((size_t) (4*PixelIntensityToQuantum(p+MagickMin(i,1))/QuantumRange) & 0x03) << 2) |
- (((size_t) (4*PixelIntensityToQuantum(p+MagickMin(i,0))/QuantumRange) & 0x03) << 0));
+ ((((size_t) (4*GetPixelIntensity(image,p+MagickMin(i,3))/QuantumRange) & 0x03) << 6) |
+ (((size_t) (4*GetPixelIntensity(image,p+MagickMin(i,2))/QuantumRange) & 0x03) << 4) |
+ (((size_t) (4*GetPixelIntensity(image,p+MagickMin(i,1))/QuantumRange) & 0x03) << 2) |
+ (((size_t) (4*GetPixelIntensity(image,p+MagickMin(i,0))/QuantumRange) & 0x03) << 0));
(void) FormatLocaleString(buffer,MaxTextExtent,"%02x",~byte);
(void) WriteBlobString(image,buffer);
}
diff --git a/coders/clip.c b/coders/clip.c
index 632e90a..93a8780 100644
--- a/coders/clip.c
+++ b/coders/clip.c
@@ -39,20 +39,20 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/constitute.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
/*
Forward declarations.
diff --git a/coders/clipboard.c b/coders/clipboard.c
index 4b8bbae..cd737db 100644
--- a/coders/clipboard.c
+++ b/coders/clipboard.c
@@ -39,7 +39,7 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
+#include "MagickCore/studio.h"
#if defined(MAGICKCORE_WINGDI32_DELEGATE)
# if defined(__CYGWIN__)
# include <windows.h>
@@ -48,21 +48,21 @@
# include <wingdi.h>
# endif
#endif
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/nt-feature.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/nt-feature.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
/*
Forward declarations.
@@ -109,7 +109,7 @@
register ssize_t
x;
- register PixelPacket
+ register Quantum
*q;
ssize_t
@@ -209,16 +209,16 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelRed(q,ScaleCharToQuantum(pBits->rgbRed));
- SetPixelGreen(q,ScaleCharToQuantum(pBits->rgbGreen));
- SetPixelBlue(q,ScaleCharToQuantum(pBits->rgbBlue));
- SetPixelOpacity(q,OpaqueOpacity);
+ SetPixelRed(image,ScaleCharToQuantum(pBits->rgbRed),q);
+ SetPixelGreen(image,ScaleCharToQuantum(pBits->rgbGreen),q);
+ SetPixelBlue(image,ScaleCharToQuantum(pBits->rgbBlue),q);
+ SetPixelAlpha(image,OpaqueAlpha,q);
pBits++;
- q++;
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
diff --git a/coders/cmyk.c b/coders/cmyk.c
index 4ed1cef..d736168 100644
--- a/coders/cmyk.c
+++ b/coders/cmyk.c
@@ -39,28 +39,28 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/colorspace.h"
-#include "magick/constitute.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/pixel-private.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/statistic.h"
-#include "magick/string_.h"
-#include "magick/module.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/statistic.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/utility.h"
/*
Forward declarations.
@@ -211,16 +211,10 @@
}
for (y=0; y < (ssize_t) image->extract_info.height; y++)
{
- register const IndexPacket
- *restrict canvas_indexes;
-
- register const PixelPacket
+ register const Quantum
*restrict p;
- register IndexPacket
- *restrict indexes;
-
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -234,7 +228,7 @@
}
q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
quantum_info,quantum_type,pixels,exception);
@@ -247,23 +241,20 @@
canvas_image->columns,1,exception);
q=QueueAuthenticPixels(image,0,y-image->extract_info.y,
image->columns,1,exception);
- if ((p == (const PixelPacket *) NULL) ||
- (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) ||
+ (q == (const Quantum *) NULL))
break;
- canvas_indexes=GetVirtualIndexQueue(canvas_image);
- indexes=GetAuthenticIndexQueue(image);
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelRed(q,GetPixelRed(p));
- SetPixelGreen(q,GetPixelGreen(p));
- SetPixelBlue(q,GetPixelBlue(p));
- SetPixelBlack(indexes+x,GetPixelBlack(
- canvas_indexes+image->extract_info.x+x));
- SetPixelOpacity(q,OpaqueOpacity);
+ SetPixelRed(image,GetPixelRed(canvas_image,p),q);
+ SetPixelGreen(image,GetPixelGreen(canvas_image,p),q);
+ SetPixelBlue(image,GetPixelBlue(canvas_image,p),q);
+ SetPixelBlack(image,GetPixelBlack(canvas_image,p),q);
+ SetPixelAlpha(image,OpaqueAlpha,q);
if (image->matte != MagickFalse)
- SetPixelOpacity(q,GetPixelOpacity(p));
- p++;
- q++;
+ SetPixelAlpha(image,GetPixelAlpha(canvas_image,p),q);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -301,16 +292,10 @@
}
for (y=0; y < (ssize_t) image->extract_info.height; y++)
{
- register const IndexPacket
- *restrict canvas_indexes;
-
- register const PixelPacket
+ register const Quantum
*restrict p;
- register IndexPacket
- *restrict indexes;
-
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -327,7 +312,7 @@
quantum_type=quantum_types[i];
q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
quantum_info,quantum_type,pixels,exception);
@@ -340,46 +325,43 @@
0,canvas_image->columns,1,exception);
q=GetAuthenticPixels(image,0,y-image->extract_info.y,
image->columns,1,exception);
- if ((p == (const PixelPacket *) NULL) ||
- (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) ||
+ (q == (const Quantum *) NULL))
break;
- canvas_indexes=GetVirtualIndexQueue(canvas_image);
- indexes=GetAuthenticIndexQueue(image);
for (x=0; x < (ssize_t) image->columns; x++)
{
switch (quantum_type)
{
case CyanQuantum:
{
- SetPixelCyan(q,GetPixelCyan(p));
+ SetPixelCyan(image,GetPixelCyan(canvas_image,p),q);
break;
}
case MagentaQuantum:
{
- SetPixelMagenta(q,GetPixelMagenta(p));
+ SetPixelMagenta(image,GetPixelMagenta(canvas_image,p),q);
break;
}
case YellowQuantum:
{
- SetPixelYellow(q,GetPixelYellow(p));
+ SetPixelYellow(image,GetPixelYellow(canvas_image,p),q);
break;
}
case BlackQuantum:
{
- SetPixelIndex(indexes+x,GetPixelIndex(
- canvas_indexes+image->extract_info.x+x));
+ SetPixelBlack(image,GetPixelBlack(canvas_image,p),q);
break;
}
case OpacityQuantum:
{
- SetPixelOpacity(q,GetPixelOpacity(p));
+ SetPixelAlpha(image,GetPixelAlpha(canvas_image,p),q);
break;
}
default:
break;
}
- p++;
- q++;
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -408,10 +390,10 @@
}
for (y=0; y < (ssize_t) image->extract_info.height; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -425,7 +407,7 @@
}
q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
quantum_info,CyanQuantum,pixels,exception);
@@ -438,14 +420,14 @@
canvas_image->columns,1,exception);
q=GetAuthenticPixels(image,0,y-image->extract_info.y,
image->columns,1,exception);
- if ((p == (const PixelPacket *) NULL) ||
- (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) ||
+ (q == (const Quantum *) NULL))
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelRed(q,GetPixelRed(p));
- p++;
- q++;
+ SetPixelRed(image,GetPixelRed(canvas_image,p),q);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -460,10 +442,10 @@
}
for (y=0; y < (ssize_t) image->extract_info.height; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -477,7 +459,7 @@
}
q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
quantum_info,MagentaQuantum,pixels,exception);
@@ -490,14 +472,14 @@
canvas_image->columns,1,exception);
q=GetAuthenticPixels(image,0,y-image->extract_info.y,
image->columns,1,exception);
- if ((p == (const PixelPacket *) NULL) ||
- (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) ||
+ (q == (const Quantum *) NULL))
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelGreen(q,GetPixelGreen(p));
- p++;
- q++;
+ SetPixelGreen(image,GetPixelGreen(canvas_image,p),q);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -512,10 +494,10 @@
}
for (y=0; y < (ssize_t) image->extract_info.height; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -529,7 +511,7 @@
}
q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
quantum_info,YellowQuantum,pixels,exception);
@@ -542,14 +524,14 @@
canvas_image->columns,1,exception);
q=GetAuthenticPixels(image,0,y-image->extract_info.y,
image->columns,1,exception);
- if ((p == (const PixelPacket *) NULL) ||
- (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) ||
+ (q == (const Quantum *) NULL))
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelBlue(q,GetPixelBlue(p));
- p++;
- q++;
+ SetPixelBlue(image,GetPixelBlue(canvas_image,p),q);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -564,16 +546,10 @@
}
for (y=0; y < (ssize_t) image->extract_info.height; y++)
{
- register const IndexPacket
- *restrict canvas_indexes;
-
- register const PixelPacket
+ register const Quantum
*restrict p;
- register IndexPacket
- *restrict indexes;
-
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -587,7 +563,7 @@
}
q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
quantum_info,BlackQuantum,pixels,exception);
@@ -600,17 +576,14 @@
canvas_image->columns,1,exception);
q=GetAuthenticPixels(image,0,y-image->extract_info.y,
image->columns,1,exception);
- if ((p == (const PixelPacket *) NULL) ||
- (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) ||
+ (q == (const Quantum *) NULL))
break;
- canvas_indexes=GetVirtualIndexQueue(canvas_image);
- indexes=GetAuthenticIndexQueue(image);
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelIndex(indexes+x,GetPixelIndex(
- canvas_indexes+image->extract_info.x+x));
- p++;
- q++;
+ SetPixelBlack(image,GetPixelBlack(canvas_image,p),q);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -627,10 +600,10 @@
{
for (y=0; y < (ssize_t) image->extract_info.height; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -644,7 +617,7 @@
}
q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
quantum_info,AlphaQuantum,pixels,exception);
@@ -658,14 +631,14 @@
exception);
q=GetAuthenticPixels(image,0,y-image->extract_info.y,
image->columns,1,exception);
- if ((p == (const PixelPacket *) NULL) ||
- (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) ||
+ (q == (const Quantum *) NULL))
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelOpacity(q,GetPixelOpacity(p));
- p++;
- q++;
+ SetPixelAlpha(image,GetPixelAlpha(canvas_image,p),q);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -715,10 +688,10 @@
count=ReadBlob(image,length,pixels);
for (y=0; y < (ssize_t) image->extract_info.height; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -732,7 +705,7 @@
}
q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
quantum_info,CyanQuantum,pixels,exception);
@@ -745,14 +718,14 @@
canvas_image->columns,1,exception);
q=GetAuthenticPixels(image,0,y-image->extract_info.y,
image->columns,1,exception);
- if ((p == (const PixelPacket *) NULL) ||
- (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) ||
+ (q == (const Quantum *) NULL))
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelRed(q,GetPixelRed(p));
- p++;
- q++;
+ SetPixelRed(image,GetPixelRed(canvas_image,p),q);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -786,10 +759,10 @@
count=ReadBlob(image,length,pixels);
for (y=0; y < (ssize_t) image->extract_info.height; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -803,7 +776,7 @@
}
q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
quantum_info,MagentaQuantum,pixels,exception);
@@ -816,14 +789,14 @@
canvas_image->columns,1,exception);
q=GetAuthenticPixels(image,0,y-image->extract_info.y,
image->columns,1,exception);
- if ((p == (const PixelPacket *) NULL) ||
- (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) ||
+ (q == (const Quantum *) NULL))
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelGreen(q,GetPixelGreen(p));
- p++;
- q++;
+ SetPixelGreen(image,GetPixelGreen(canvas_image,p),q);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -857,10 +830,10 @@
count=ReadBlob(image,length,pixels);
for (y=0; y < (ssize_t) image->extract_info.height; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -874,7 +847,7 @@
}
q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
quantum_info,YellowQuantum,pixels,exception);
@@ -887,14 +860,14 @@
canvas_image->columns,1,exception);
q=GetAuthenticPixels(image,0,y-image->extract_info.y,
image->columns,1,exception);
- if ((p == (const PixelPacket *) NULL) ||
- (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) ||
+ (q == (const Quantum *) NULL))
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelBlue(q,GetPixelBlue(p));
- p++;
- q++;
+ SetPixelBlue(image,GetPixelBlue(canvas_image,p),q);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -928,16 +901,10 @@
count=ReadBlob(image,length,pixels);
for (y=0; y < (ssize_t) image->extract_info.height; y++)
{
- register const IndexPacket
- *restrict canvas_indexes;
-
- register const PixelPacket
+ register const Quantum
*restrict p;
- register IndexPacket
- *restrict indexes;
-
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -951,7 +918,7 @@
}
q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
quantum_info,BlackQuantum,pixels,exception);
@@ -964,17 +931,14 @@
canvas_image->columns,1,exception);
q=GetAuthenticPixels(image,0,y-image->extract_info.y,
image->columns,1,exception);
- if ((p == (const PixelPacket *) NULL) ||
- (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) ||
+ (q == (const Quantum *) NULL))
break;
- canvas_indexes=GetVirtualIndexQueue(canvas_image);
- indexes=GetAuthenticIndexQueue(image);
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelIndex(indexes+x,GetPixelIndex(
- canvas_indexes+image->extract_info.x+x));
- p++;
- q++;
+ SetPixelBlack(image,GetPixelBlack(canvas_image,p),q);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -1010,10 +974,10 @@
count=ReadBlob(image,length,pixels);
for (y=0; y < (ssize_t) image->extract_info.height; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -1027,7 +991,7 @@
}
q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
quantum_info,YellowQuantum,pixels,exception);
@@ -1040,14 +1004,14 @@
0,canvas_image->columns,1,exception);
q=GetAuthenticPixels(image,0,y-image->extract_info.y,
image->columns,1,exception);
- if ((p == (const PixelPacket *) NULL) ||
- (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) ||
+ (q == (const Quantum *) NULL))
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelOpacity(q,GetPixelOpacity(p));
- p++;
- q++;
+ SetPixelAlpha(image,GetPixelAlpha(canvas_image,p),q);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -1262,7 +1226,7 @@
(void) TransformImageColorspace(image,CMYKColorspace);
if ((LocaleCompare(image_info->magick,"CMYKA") == 0) &&
(image->matte == MagickFalse))
- (void) SetImageAlphaChannel(image,ResetAlphaChannel);
+ (void) SetImageAlphaChannel(image,OpaqueAlphaChannel);
quantum_info=AcquireQuantumInfo(image_info,image);
if (quantum_info == (QuantumInfo *) NULL)
ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed");
@@ -1277,14 +1241,14 @@
*/
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,quantum_type,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ quantum_type,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
break;
@@ -1305,36 +1269,36 @@
*/
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,CyanQuantum,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ CyanQuantum,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,MagentaQuantum,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ MagentaQuantum,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,YellowQuantum,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ YellowQuantum,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,BlackQuantum,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ BlackQuantum,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
break;
if (quantum_type == CMYKAQuantum)
{
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,AlphaQuantum,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ AlphaQuantum,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
break;
@@ -1356,14 +1320,14 @@
*/
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,CyanQuantum,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ CyanQuantum,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
break;
@@ -1376,14 +1340,14 @@
}
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,MagentaQuantum,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ MagentaQuantum,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
break;
@@ -1396,14 +1360,14 @@
}
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,YellowQuantum,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ YellowQuantum,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
break;
@@ -1416,14 +1380,14 @@
}
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,BlackQuantum,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ BlackQuantum,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
break;
@@ -1438,14 +1402,14 @@
{
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,AlphaQuantum,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ AlphaQuantum,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
break;
@@ -1480,14 +1444,14 @@
return(status);
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,CyanQuantum,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ CyanQuantum,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
break;
@@ -1506,14 +1470,14 @@
return(status);
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,MagentaQuantum,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ MagentaQuantum,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
break;
@@ -1532,14 +1496,14 @@
return(status);
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,YellowQuantum,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ YellowQuantum,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
break;
@@ -1558,14 +1522,14 @@
return(status);
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,BlackQuantum,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ BlackQuantum,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
break;
@@ -1586,15 +1550,15 @@
return(status);
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
p=GetVirtualPixels(image,0,y,image->columns,1,
&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,AlphaQuantum,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ AlphaQuantum,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
break;
diff --git a/coders/cut.c b/coders/cut.c
index 7b53802..091d499 100644
--- a/coders/cut.c
+++ b/coders/cut.c
@@ -47,26 +47,28 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/color.h"
-#include "magick/color-private.h"
-#include "magick/colormap.h"
-#include "magick/colormap-private.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/attribute.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/color.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colormap.h"
+#include "MagickCore/colormap-private.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/utility.h"
typedef struct
{
@@ -98,26 +100,25 @@
*exception;
size_t bit; ssize_t x;
- register PixelPacket *q;
- IndexPacket index;
- register IndexPacket *indexes;
+ register Quantum *q;
+ Quantum index;
- index=(IndexPacket) 0;
+ index=0;
exception=(&image->exception);
switch (depth)
{
case 1: /* Convert bitmap scanline. */
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
for (x=0; x < ((ssize_t) image->columns-7); x+=8)
{
for (bit=0; bit < 8; bit++)
{
- index=(IndexPacket) ((((*p) & (0x80 >> bit)) != 0) ? 0x01 : 0x00);
- SetPixelIndex(indexes+x+bit,index);
+ index=(Quantum) ((((*p) & (0x80 >> bit)) != 0) ? 0x01 : 0x00);
+ SetPixelIndex(image,index,q);
+ q+=GetPixelChannels(image);
}
p++;
}
@@ -125,8 +126,9 @@
{
for (bit=0; bit < (image->columns % 8); bit++)
{
- index=(IndexPacket) ((((*p) & (0x80 >> bit)) != 0) ? 0x01 : 0x00);
- SetPixelIndex(indexes+x+bit,index);
+ index=(Quantum) ((((*p) & (0x80 >> bit)) != 0) ? 0x01 : 0x00);
+ SetPixelIndex(image,index,q);
+ q+=GetPixelChannels(image);
}
p++;
}
@@ -137,35 +139,41 @@
case 2: /* Convert PseudoColor scanline. */
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
for (x=0; x < ((ssize_t) image->columns-1); x+=2)
- {
- index=ConstrainColormapIndex(image,(*p >> 6) & 0x3);
- SetPixelIndex(indexes+x,index);
- index=ConstrainColormapIndex(image,(*p >> 4) & 0x3);
- SetPixelIndex(indexes+x,index);
- index=ConstrainColormapIndex(image,(*p >> 2) & 0x3);
- SetPixelIndex(indexes+x,index);
- index=ConstrainColormapIndex(image,(*p) & 0x3);
- SetPixelIndex(indexes+x+1,index);
- p++;
- }
+ {
+ index=ConstrainColormapIndex(image,(*p >> 6) & 0x3);
+ SetPixelIndex(image,index,q);
+ q+=GetPixelChannels(image);
+ index=ConstrainColormapIndex(image,(*p >> 4) & 0x3);
+ SetPixelIndex(image,index,q);
+ q+=GetPixelChannels(image);
+ index=ConstrainColormapIndex(image,(*p >> 2) & 0x3);
+ SetPixelIndex(image,index,q);
+ q+=GetPixelChannels(image);
+ index=ConstrainColormapIndex(image,(*p) & 0x3);
+ SetPixelIndex(image,index,q);
+ q+=GetPixelChannels(image);
+ p++;
+ }
if ((image->columns % 4) != 0)
{
index=ConstrainColormapIndex(image,(*p >> 6) & 0x3);
- SetPixelIndex(indexes+x,index);
+ SetPixelIndex(image,index,q);
+ q+=GetPixelChannels(image);
if ((image->columns % 4) >= 1)
{
index=ConstrainColormapIndex(image,(*p >> 4) & 0x3);
- SetPixelIndex(indexes+x,index);
+ SetPixelIndex(image,index,q);
+ q+=GetPixelChannels(image);
if ((image->columns % 4) >= 2)
{
index=ConstrainColormapIndex(image,(*p >> 2) & 0x3);
- SetPixelIndex(indexes+x,index);
+ SetPixelIndex(image,index,q);
+ q+=GetPixelChannels(image);
}
}
p++;
@@ -178,21 +186,23 @@
case 4: /* Convert PseudoColor scanline. */
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
for (x=0; x < ((ssize_t) image->columns-1); x+=2)
- {
+ {
index=ConstrainColormapIndex(image,(*p >> 4) & 0xf);
- SetPixelIndex(indexes+x,index);
+ SetPixelIndex(image,index,q);
+ q+=GetPixelChannels(image);
index=ConstrainColormapIndex(image,(*p) & 0xf);
- SetPixelIndex(indexes+x+1,index);
+ SetPixelIndex(image,index,q);
+ q+=GetPixelChannels(image);
p++;
}
if ((image->columns % 2) != 0)
{
index=ConstrainColormapIndex(image,(*p >> 4) & 0xf);
- SetPixelIndex(indexes+x,index);
+ SetPixelIndex(image,index,q);
+ q+=GetPixelChannels(image);
p++;
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -202,13 +212,13 @@
case 8: /* Convert PseudoColor scanline. */
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL) break;
- indexes=GetAuthenticIndexQueue(image);
+ if (q == (const Quantum *) NULL) break;
for (x=0; x < (ssize_t) image->columns; x++)
{
index=ConstrainColormapIndex(image,*p);
- SetPixelIndex(indexes+x,index);
+ SetPixelIndex(image,index,q);
p++;
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -230,7 +240,7 @@
intensity,
scale_intensity;
- register PixelPacket
+ register Quantum
*q;
ssize_t
@@ -245,11 +255,11 @@
q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
for (x=0; x < (ssize_t) image->columns; x++)
{
- if (intensity < GetPixelRed(q))
- intensity=GetPixelRed(q);
+ if (intensity < GetPixelRed(image,q))
+ intensity=GetPixelRed(image,q);
if (intensity >= scale_intensity)
return(255);
- q++;
+ q+=GetPixelChannels(image);
}
}
if (intensity < ScaleCharToQuantum(2))
@@ -302,7 +312,7 @@
ssize_t i,j;
ssize_t ldblk;
unsigned char *BImgBuff=NULL,*ptrB;
- PixelPacket *q;
+ register Quantum *q;
/*
Open image file.
@@ -552,7 +562,7 @@
if(palette==NULL)
{ /*attempt to detect binary (black&white) images*/
if ((image->storage_class == PseudoClass) &&
- (IsGrayImage(image,&image->exception) != MagickFalse))
+ (IsImageGray(image,&image->exception) != MagickFalse))
{
if(GetCutColors(image)==2)
{
@@ -573,13 +583,13 @@
q=QueueAuthenticPixels(image,0,i,image->columns,1,exception);
for (j=0; j < (ssize_t)image->columns; j++)
{
- if (GetPixelRed(q) == ScaleCharToQuantum(1))
+ if (GetPixelRed(image,q) == ScaleCharToQuantum(1))
{
- SetPixelRed(q,QuantumRange);
- SetPixelGreen(q,QuantumRange);
- SetPixelBlue(q,QuantumRange);
+ SetPixelRed(image,QuantumRange,q);
+ SetPixelGreen(image,QuantumRange,q);
+ SetPixelBlue(image,QuantumRange,q);
}
- q++;
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse) goto Finish;
}
diff --git a/coders/dcm.c b/coders/dcm.c
index c0529c2..b207379 100644
--- a/coders/dcm.c
+++ b/coders/dcm.c
@@ -39,33 +39,34 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/property.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/color.h"
-#include "magick/color-private.h"
-#include "magick/colormap.h"
-#include "magick/colormap-private.h"
-#include "magick/constitute.h"
-#include "magick/enhance.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/option.h"
-#include "magick/resource_.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/string-private.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/property.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/color.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colormap.h"
+#include "MagickCore/colormap-private.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/enhance.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/option.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/string-private.h"
+#include "MagickCore/module.h"
/*
Dicom medical image declarations.
@@ -2822,14 +2823,11 @@
Quantum
*scale;
- register IndexPacket
- *indexes;
-
register ssize_t
i,
x;
- register PixelPacket
+ register Quantum
*q;
register unsigned char
@@ -3721,7 +3719,7 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
@@ -3729,32 +3727,32 @@
{
case 0:
{
- SetPixelRed(q,ScaleCharToQuantum((unsigned char)
- ReadDCMByte(stream_info,image)));
+ SetPixelRed(image,ScaleCharToQuantum((unsigned char)
+ ReadDCMByte(stream_info,image)),q);
break;
}
case 1:
{
- SetPixelGreen(q,ScaleCharToQuantum((unsigned char)
- ReadDCMByte(stream_info,image)));
+ SetPixelGreen(image,ScaleCharToQuantum((unsigned char)
+ ReadDCMByte(stream_info,image)),q);
break;
}
case 2:
{
- SetPixelBlue(q,ScaleCharToQuantum((unsigned char)
- ReadDCMByte(stream_info,image)));
+ SetPixelBlue(image,ScaleCharToQuantum((unsigned char)
+ ReadDCMByte(stream_info,image)),q);
break;
}
case 3:
{
- SetPixelAlpha(q,ScaleCharToQuantum((unsigned char)
- ReadDCMByte(stream_info,image)));
+ SetPixelAlpha(image,ScaleCharToQuantum((unsigned char)
+ ReadDCMByte(stream_info,image)),q);
break;
}
default:
break;
}
- q++;
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -3796,9 +3794,8 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
for (x=0; x < (ssize_t) image->columns; x++)
{
if (samples_per_pixel == 1)
@@ -3869,7 +3866,7 @@
}
index&=mask;
index=(int) ConstrainColormapIndex(image,(size_t) index);
- SetPixelIndex(indexes+x,index);
+ SetPixelIndex(image,index,q);
pixel.red=1UL*image->colormap[index].red;
pixel.green=1UL*image->colormap[index].green;
pixel.blue=1UL*image->colormap[index].blue;
@@ -3907,10 +3904,10 @@
pixel.blue=scale[pixel.blue];
}
}
- SetPixelRed(q,pixel.red);
- SetPixelGreen(q,pixel.green);
- SetPixelBlue(q,pixel.blue);
- q++;
+ SetPixelRed(image,pixel.red,q);
+ SetPixelGreen(image,pixel.green,q);
+ SetPixelBlue(image,pixel.blue,q);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -3926,9 +3923,8 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
for (x=0; x < (ssize_t) image->columns; x++)
{
if (samples_per_pixel == 1)
@@ -3999,9 +3995,8 @@
}
index&=mask;
index=(int) ConstrainColormapIndex(image,(size_t) index);
- SetPixelIndex(indexes+x,(((size_t)
- GetPixelIndex(indexes+x)) | (((size_t) index) <<
- 8)));
+ SetPixelIndex(image,(((size_t) GetPixelIndex(image,q)) |
+ (((size_t) index) << 8)),q);
pixel.red=1UL*image->colormap[index].red;
pixel.green=1UL*image->colormap[index].green;
pixel.blue=1UL*image->colormap[index].blue;
@@ -4039,13 +4034,13 @@
pixel.blue=scale[pixel.blue];
}
}
- SetPixelRed(q,(((size_t) GetPixelRed(q)) |
- (((size_t) pixel.red) << 8)));
- SetPixelGreen(q,(((size_t) GetPixelGreen(q)) |
- (((size_t) pixel.green) << 8)));
- SetPixelBlue(q,(((size_t) GetPixelBlue(q)) |
- (((size_t) pixel.blue) << 8)));
- q++;
+ SetPixelRed(image,(((size_t) GetPixelRed(image,q)) |
+ (((size_t) pixel.red) << 8)),q);
+ SetPixelGreen(image,(((size_t) GetPixelGreen(image,q)) |
+ (((size_t) pixel.green) << 8)),q);
+ SetPixelBlue(image,(((size_t) GetPixelBlue(image,q)) |
+ (((size_t) pixel.blue) << 8)),q);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
diff --git a/coders/dds.c b/coders/dds.c
index 298c527..dc7a796 100644
--- a/coders/dds.c
+++ b/coders/dds.c
@@ -39,44 +39,45 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/colorspace.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/log.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/profile.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
-#include "magick/transform.h"
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/colorspace.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/compress.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/quantum.h"
-#include "magick/static.h"
-#include "magick/string_.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/log.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/profile.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/transform.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/compress.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantum.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
/*
Definitions
@@ -498,7 +499,7 @@
ExceptionInfo
*exception;
- PixelPacket
+ register Quantum
*q;
register ssize_t
@@ -528,7 +529,7 @@
q = QueueAuthenticPixels(image, x, y, Min(4, dds_info->width - x),
Min(4, dds_info->height - y),exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
return MagickFalse;
/* Read 8 bytes of data from the image */
@@ -543,17 +544,17 @@
{
for (i = 0; i < 4; i++)
{
- if ((x + i) < (ssize_t) dds_info->width && (y + j) < (ssize_t) dds_info->height)
+ if ((x + i) < (ssize_t) dds_info->width &&
+ (y + j) < (ssize_t) dds_info->height)
{
code = (unsigned char) ((bits >> ((j*4+i)*2)) & 0x3);
- SetPixelRed(q,ScaleCharToQuantum(colors.r[code]));
- SetPixelGreen(q,ScaleCharToQuantum(colors.g[code]));
- SetPixelBlue(q,ScaleCharToQuantum(colors.b[code]));
- SetPixelOpacity(q,ScaleCharToQuantum(colors.a[code]));
- if (colors.a[code] && image->matte == MagickFalse)
- /* Correct matte */
- image->matte = MagickTrue;
- q++;
+ SetPixelRed(image,ScaleCharToQuantum(colors.r[code]),q);
+ SetPixelGreen(image,ScaleCharToQuantum(colors.g[code]),q);
+ SetPixelBlue(image,ScaleCharToQuantum(colors.b[code]),q);
+ SetPixelAlpha(image,ScaleCharToQuantum(colors.a[code]),q);
+ if (colors.a[code] && (image->matte == MagickFalse))
+ image->matte=MagickTrue; /* Correct matte */
+ q+=GetPixelChannels(image);
}
}
}
@@ -576,11 +577,7 @@
ExceptionInfo
*exception;
- ssize_t
- j,
- y;
-
- PixelPacket
+ register Quantum
*q;
register ssize_t
@@ -596,6 +593,10 @@
bits,
code;
+ ssize_t
+ j,
+ y;
+
unsigned short
c0,
c1;
@@ -609,7 +610,7 @@
q = QueueAuthenticPixels(image, x, y, Min(4, dds_info->width - x),
Min(4, dds_info->height - y),exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (Quantum *) NULL)
return MagickFalse;
/* Read alpha values (8 bytes) */
@@ -631,9 +632,9 @@
if ((x + i) < (ssize_t) dds_info->width && (y + j) < (ssize_t) dds_info->height)
{
code = (bits >> ((4*j+i)*2)) & 0x3;
- SetPixelRed(q,ScaleCharToQuantum(colors.r[code]));
- SetPixelGreen(q,ScaleCharToQuantum(colors.g[code]));
- SetPixelBlue(q,ScaleCharToQuantum(colors.b[code]));
+ SetPixelRed(image,ScaleCharToQuantum(colors.r[code]),q);
+ SetPixelGreen(image,ScaleCharToQuantum(colors.g[code]),q);
+ SetPixelBlue(image,ScaleCharToQuantum(colors.b[code]),q);
/*
Extract alpha value: multiply 0..15 by 17 to get range 0..255
*/
@@ -641,9 +642,8 @@
alpha = 17U * (unsigned char) ((a0 >> (4*(4*j+i))) & 0xf);
else
alpha = 17U * (unsigned char) ((a1 >> (4*(4*(j-2)+i))) & 0xf);
- SetPixelAlpha(q,ScaleCharToQuantum((unsigned char)
- alpha));
- q++;
+ SetPixelAlpha(image,ScaleCharToQuantum((unsigned char) alpha),q);
+ q+=GetPixelChannels(image);
}
}
}
@@ -666,14 +666,10 @@
ExceptionInfo
*exception;
- ssize_t
- j,
- y;
-
MagickSizeType
alpha_bits;
- PixelPacket
+ register Quantum
*q;
register ssize_t
@@ -690,6 +686,10 @@
code,
alpha_code;
+ ssize_t
+ j,
+ y;
+
unsigned short
c0,
c1;
@@ -703,7 +703,7 @@
q = QueueAuthenticPixels(image, x, y, Min(4, dds_info->width - x),
Min(4, dds_info->height - y),exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
return MagickFalse;
/* Read alpha values (8 bytes) */
@@ -725,12 +725,13 @@
{
for (i = 0; i < 4; i++)
{
- if ((x + i) < (ssize_t) dds_info->width && (y + j) < (ssize_t) dds_info->height)
+ if ((x + i) < (ssize_t) dds_info->width &&
+ (y + j) < (ssize_t) dds_info->height)
{
code = (bits >> ((4*j+i)*2)) & 0x3;
- SetPixelRed(q,ScaleCharToQuantum(colors.r[code]));
- SetPixelGreen(q,ScaleCharToQuantum(colors.g[code]));
- SetPixelBlue(q,ScaleCharToQuantum(colors.b[code]));
+ SetPixelRed(image,ScaleCharToQuantum(colors.r[code]),q);
+ SetPixelGreen(image,ScaleCharToQuantum(colors.g[code]),q);
+ SetPixelBlue(image,ScaleCharToQuantum(colors.b[code]),q);
/* Extract alpha value */
alpha_code = (size_t) (alpha_bits >> (3*(4*j+i))) & 0x7;
if (alpha_code == 0)
@@ -745,9 +746,8 @@
alpha = 255;
else
alpha = (((6-alpha_code) * a0 + (alpha_code-1) * a1) / 5);
- SetPixelAlpha(q,ScaleCharToQuantum((unsigned char)
- alpha));
- q++;
+ SetPixelAlpha(image,ScaleCharToQuantum((unsigned char) alpha),q);
+ q+=GetPixelChannels(image);
}
}
}
@@ -770,7 +770,7 @@
ssize_t
x, y;
- PixelPacket
+ register Quantum
*q;
exception=(&image->exception);
@@ -778,20 +778,20 @@
{
q = QueueAuthenticPixels(image, 0, y, dds_info->width, 1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (Quantum *) NULL)
return MagickFalse;
for (x = 0; x < (ssize_t) dds_info->width; x++)
{
- SetPixelBlue(q,ScaleCharToQuantum((unsigned char)
- ReadBlobByte(image)));
- SetPixelGreen(q,ScaleCharToQuantum((unsigned char)
- ReadBlobByte(image)));
- SetPixelRed(q,ScaleCharToQuantum((unsigned char)
- ReadBlobByte(image)));
+ SetPixelBlue(image,ScaleCharToQuantum((unsigned char)
+ ReadBlobByte(image)),q);
+ SetPixelGreen(image,ScaleCharToQuantum((unsigned char)
+ ReadBlobByte(image)),q);
+ SetPixelRed(image,ScaleCharToQuantum((unsigned char)
+ ReadBlobByte(image)),q);
if (dds_info->pixelformat.rgb_bitcount == 32)
(void) ReadBlobByte(image);
- q++;
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -811,7 +811,7 @@
ssize_t
x, y;
- PixelPacket
+ register Quantum
*q;
exception=(&image->exception);
@@ -819,20 +819,20 @@
{
q = QueueAuthenticPixels(image, 0, y, dds_info->width, 1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (Quantum *) NULL)
return MagickFalse;
for (x = 0; x < (ssize_t) dds_info->width; x++)
{
- SetPixelBlue(q,ScaleCharToQuantum((unsigned char)
- ReadBlobByte(image)));
- SetPixelGreen(q,ScaleCharToQuantum((unsigned char)
- ReadBlobByte(image)));
- SetPixelRed(q,ScaleCharToQuantum((unsigned char)
- ReadBlobByte(image)));
- SetPixelAlpha(q,ScaleCharToQuantum((unsigned char)
- ReadBlobByte(image)));
- q++;
+ SetPixelBlue(image,ScaleCharToQuantum((unsigned char)
+ ReadBlobByte(image)),q);
+ SetPixelGreen(image,ScaleCharToQuantum((unsigned char)
+ ReadBlobByte(image)),q);
+ SetPixelRed(image,ScaleCharToQuantum((unsigned char)
+ ReadBlobByte(image)),q);
+ SetPixelAlpha(image,ScaleCharToQuantum((unsigned char)
+ ReadBlobByte(image)),q);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -849,12 +849,12 @@
*/
static void SkipDXTMipmaps(Image *image, DDSInfo *dds_info, int texel_size)
{
- register ssize_t
- i;
-
MagickOffsetType
offset;
+ register ssize_t
+ i;
+
size_t
h,
w;
diff --git a/coders/debug.c b/coders/debug.c
index 9fe5a3b..db0d9f6 100644
--- a/coders/debug.c
+++ b/coders/debug.c
@@ -39,34 +39,34 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/annotate.h"
-#include "magick/attribute.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/color.h"
-#include "magick/color-private.h"
-#include "magick/colorspace.h"
-#include "magick/constitute.h"
-#include "magick/draw.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/geometry.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/option.h"
-#include "magick/pixel-private.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/statistic.h"
-#include "magick/string_.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/annotate.h"
+#include "MagickCore/attribute.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/color.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/draw.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/option.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/statistic.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
/*
Forward declarations.
@@ -178,13 +178,10 @@
MagickOffsetType
scene;
- MagickPixelPacket
+ PixelInfo
pixel;
- register const IndexPacket
- *indexes;
-
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
@@ -214,21 +211,20 @@
(void) FormatLocaleString(buffer,MaxTextExtent,
"# ImageMagick pixel debugging: %.20g,%.20g,%.20g,%s\n",(double)
image->columns,(double) image->rows,(double)
- GetQuantumRange(image->depth),colorspace);
+ ((MagickOffsetType) GetQuantumRange(image->depth)),colorspace);
(void) WriteBlobString(image,buffer);
- GetMagickPixelPacket(image,&pixel);
+ GetPixelInfo(image,&pixel);
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetVirtualIndexQueue(image);
for (x=0; x < (ssize_t) image->columns; x++)
{
(void) FormatLocaleString(buffer,MaxTextExtent,"%.20g,%.20g: ",(double)
x,(double) y);
(void) WriteBlobString(image,buffer);
- SetMagickPixelPacket(image,p,indexes+x,&pixel);
+ SetPixelInfo(image,p,&pixel);
(void) FormatLocaleString(tuple,MaxTextExtent,"%.20g,%.20g,%.20g ",
(double) pixel.red,(double) pixel.green,(double) pixel.blue);
if (pixel.colorspace == CMYKColorspace)
@@ -237,7 +233,7 @@
black[MaxTextExtent];
(void) FormatLocaleString(black,MaxTextExtent,",%.20g ",
- (double) pixel.index);
+ (double) pixel.black);
(void) ConcatenateMagickString(tuple,black,MaxTextExtent);
}
if (pixel.matte != MagickFalse)
@@ -246,12 +242,12 @@
alpha[MaxTextExtent];
(void) FormatLocaleString(alpha,MaxTextExtent,",%.20g ",
- (double) (QuantumRange-pixel.opacity));
+ (double) pixel.alpha);
(void) ConcatenateMagickString(tuple,alpha,MaxTextExtent);
}
(void) WriteBlobString(image,tuple);
(void) WriteBlobString(image,"\n");
- p++;
+ p+=GetPixelChannels(image);
}
status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
image->rows);
diff --git a/coders/dib.c b/coders/dib.c
index 918c9a9..507d586 100644
--- a/coders/dib.c
+++ b/coders/dib.c
@@ -39,32 +39,34 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/color.h"
-#include "magick/color-private.h"
-#include "magick/colormap.h"
-#include "magick/colormap-private.h"
-#include "magick/colorspace.h"
-#include "magick/draw.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/geometry.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/log.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
-#include "magick/transform.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/attribute.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/color.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colormap.h"
+#include "MagickCore/colormap-private.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/draw.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/log.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/transform.h"
/*
Typedef declarations.
@@ -457,23 +459,16 @@
Image
*image;
- IndexPacket
- index;
-
- ssize_t
- bit,
- y;
-
MagickBooleanType
status;
- register IndexPacket
- *indexes;
+ Quantum
+ index;
register ssize_t
x;
- register PixelPacket
+ register Quantum
*q;
register ssize_t
@@ -487,7 +482,10 @@
length;
ssize_t
- count;
+ bit,
+ count,
+ y;
+
unsigned char
*pixels;
@@ -649,15 +647,15 @@
{
p=pixels+(image->rows-y-1)*bytes_per_line;
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
for (x=0; x < ((ssize_t) image->columns-7); x+=8)
{
for (bit=0; bit < 8; bit++)
{
- index=(IndexPacket) ((*p) & (0x80 >> bit) ? 0x01 : 0x00);
- SetPixelIndex(indexes+x+bit,index);
+ index=(Quantum) ((*p) & (0x80 >> bit) ? 0x01 : 0x00);
+ SetPixelIndex(image,index,q);
+ q+=GetPixelChannels(image);
}
p++;
}
@@ -665,8 +663,9 @@
{
for (bit=0; bit < (ssize_t) (image->columns % 8); bit++)
{
- index=(IndexPacket) ((*p) & (0x80 >> bit) ? 0x01 : 0x00);
- SetPixelIndex(indexes+x+bit,index);
+ index=(Quantum) ((*p) & (0x80 >> bit) ? 0x01 : 0x00);
+ SetPixelIndex(image,index,q);
+ q+=GetPixelChannels(image);
}
p++;
}
@@ -692,21 +691,23 @@
{
p=pixels+(image->rows-y-1)*bytes_per_line;
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
for (x=0; x < ((ssize_t) image->columns-1); x+=2)
{
index=ConstrainColormapIndex(image,(*p >> 4) & 0xf);
- SetPixelIndex(indexes+x,index);
+ SetPixelIndex(image,index,q);
+ q+=GetPixelChannels(image);
index=ConstrainColormapIndex(image,*p & 0xf);
- SetPixelIndex(indexes+x+1,index);
+ SetPixelIndex(image,index,q);
p++;
+ q+=GetPixelChannels(image);
}
if ((image->columns % 2) != 0)
{
index=ConstrainColormapIndex(image,(*p >> 4) & 0xf);
- SetPixelIndex(indexes+x,index);
+ SetPixelIndex(image,index,q);
+ q+=GetPixelChannels(image);
p++;
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -734,15 +735,14 @@
{
p=pixels+(image->rows-y-1)*bytes_per_line;
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
for (x=0; x < (ssize_t) image->columns; x++)
{
index=ConstrainColormapIndex(image,*p);
- SetPixelIndex(indexes+x,index);
+ SetPixelIndex(image,index,q);
p++;
- q++;
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -772,7 +772,7 @@
{
p=pixels+(image->rows-y-1)*bytes_per_line;
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
@@ -780,23 +780,23 @@
word|=(*p++ << 8);
if (dib_info.red_mask == 0)
{
- SetPixelRed(q,ScaleCharToQuantum(ScaleColor5to8(
- (unsigned char) ((word >> 10) & 0x1f))));
- SetPixelGreen(q,ScaleCharToQuantum(ScaleColor5to8(
- (unsigned char) ((word >> 5) & 0x1f))));
- SetPixelBlue(q,ScaleCharToQuantum(ScaleColor5to8(
- (unsigned char) (word & 0x1f))));
+ SetPixelRed(image,ScaleCharToQuantum(ScaleColor5to8(
+ (unsigned char) ((word >> 10) & 0x1f))),q);
+ SetPixelGreen(image,ScaleCharToQuantum(ScaleColor5to8(
+ (unsigned char) ((word >> 5) & 0x1f))),q);
+ SetPixelBlue(image,ScaleCharToQuantum(ScaleColor5to8(
+ (unsigned char) (word & 0x1f))),q);
}
else
{
- SetPixelRed(q,ScaleCharToQuantum(ScaleColor5to8(
- (unsigned char) ((word >> 11) & 0x1f))));
- SetPixelGreen(q,ScaleCharToQuantum(ScaleColor6to8(
- (unsigned char) ((word >> 5) & 0x3f))));
- SetPixelBlue(q,ScaleCharToQuantum(ScaleColor5to8(
- (unsigned char) (word & 0x1f))));
+ SetPixelRed(image,ScaleCharToQuantum(ScaleColor5to8(
+ (unsigned char) ((word >> 11) & 0x1f))),q);
+ SetPixelGreen(image,ScaleCharToQuantum(ScaleColor6to8(
+ (unsigned char) ((word >> 5) & 0x3f))),q);
+ SetPixelBlue(image,ScaleCharToQuantum(ScaleColor5to8(
+ (unsigned char) (word & 0x1f))),q);
}
- q++;
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -820,16 +820,16 @@
{
p=pixels+(image->rows-y-1)*bytes_per_line;
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelBlue(q,ScaleCharToQuantum(*p++));
- SetPixelGreen(q,ScaleCharToQuantum(*p++));
- SetPixelRed(q,ScaleCharToQuantum(*p++));
+ SetPixelBlue(image,ScaleCharToQuantum(*p++),q);
+ SetPixelGreen(image,ScaleCharToQuantum(*p++),q);
+ SetPixelRed(image,ScaleCharToQuantum(*p++),q);
if (image->matte != MagickFalse)
- SetPixelOpacity(q,ScaleCharToQuantum(*p++));
- q++;
+ SetPixelAlpha(image,ScaleCharToQuantum(*p++),q);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -968,10 +968,7 @@
MagickBooleanType
status;
- register const IndexPacket
- *indexes;
-
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
@@ -1024,7 +1021,7 @@
dib_info.bits_per_pixel=8;
if (image_info->depth > 8)
dib_info.bits_per_pixel=16;
- if (IsMonochromeImage(image,&image->exception) != MagickFalse)
+ if (IsImageMonochrome(image,&image->exception) != MagickFalse)
dib_info.bits_per_pixel=1;
dib_info.number_colors=(dib_info.bits_per_pixel == 16) ? 0 :
(1UL << dib_info.bits_per_pixel);
@@ -1078,16 +1075,15 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetVirtualIndexQueue(image);
q=pixels+(image->rows-y-1)*bytes_per_line;
bit=0;
byte=0;
for (x=0; x < (ssize_t) image->columns; x++)
{
byte<<=1;
- byte|=GetPixelIndex(indexes+x) != 0 ? 0x01 : 0x00;
+ byte|=GetPixelIndex(image,p) != 0 ? 0x01 : 0x00;
bit++;
if (bit == 8)
{
@@ -1095,7 +1091,7 @@
bit=0;
byte=0;
}
- p++;
+ p+=GetPixelChannels(image);
}
if (bit != 0)
{
@@ -1119,12 +1115,14 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetVirtualIndexQueue(image);
q=pixels+(image->rows-y-1)*bytes_per_line;
for (x=0; x < (ssize_t) image->columns; x++)
- *q++=(unsigned char) GetPixelIndex(indexes+x);
+ {
+ *q++=(unsigned char) GetPixelIndex(image,p);
+ p+=GetPixelChannels(image);
+ }
for ( ; x < (ssize_t) bytes_per_line; x++)
*q++=0x00;
status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
@@ -1144,20 +1142,19 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
q=pixels+(image->rows-y-1)*bytes_per_line;
for (x=0; x < (ssize_t) image->columns; x++)
{
word=(unsigned short) ((ScaleColor8to5((unsigned char)
- ScaleQuantumToChar(GetPixelRed(p))) << 11) |
- (ScaleColor8to6((unsigned char) ScaleQuantumToChar(
- GetPixelGreen(p))) << 5) | (ScaleColor8to5((unsigned char)
- ScaleQuantumToChar((unsigned char) GetPixelBlue(p)) <<
- 0)));
+ ScaleQuantumToChar(GetPixelRed(image,p))) << 11) | (ScaleColor8to6(
+ (unsigned char) ScaleQuantumToChar(GetPixelGreen(image,p))) << 5) |
+ (ScaleColor8to5((unsigned char) ScaleQuantumToChar((unsigned char)
+ GetPixelBlue(image,p)) << 0)));
*q++=(unsigned char)(word & 0xff);
*q++=(unsigned char)(word >> 8);
- p++;
+ p+=GetPixelChannels(image);
}
for (x=(ssize_t) (2*image->columns); x < (ssize_t) bytes_per_line; x++)
*q++=0x00;
@@ -1177,17 +1174,17 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
q=pixels+(image->rows-y-1)*bytes_per_line;
for (x=0; x < (ssize_t) image->columns; x++)
{
- *q++=ScaleQuantumToChar(GetPixelBlue(p));
- *q++=ScaleQuantumToChar(GetPixelGreen(p));
- *q++=ScaleQuantumToChar(GetPixelRed(p));
+ *q++=ScaleQuantumToChar(GetPixelBlue(image,p));
+ *q++=ScaleQuantumToChar(GetPixelGreen(image,p));
+ *q++=ScaleQuantumToChar(GetPixelRed(image,p));
if (image->matte != MagickFalse)
- *q++=ScaleQuantumToChar(GetPixelOpacity(p));
- p++;
+ *q++=ScaleQuantumToChar(GetPixelAlpha(image,p));
+ p+=GetPixelChannels(image);
}
if (dib_info.bits_per_pixel == 24)
for (x=(ssize_t) (3*image->columns); x < (ssize_t) bytes_per_line; x++)
diff --git a/coders/djvu.c b/coders/djvu.c
index 54a2330..5d6ae78 100644
--- a/coders/djvu.c
+++ b/coders/djvu.c
@@ -39,23 +39,24 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/colormap.h"
-#include "magick/constitute.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/colormap.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
#if defined(MAGICKCORE_DJVU_DELEGATE)
#include <libdjvu/ddjvuapi.h>
#endif
@@ -389,15 +390,13 @@
#if DEBUG
printf("%s: expanding BITONAL page/image\n", __FUNCTION__);
#endif
- register IndexPacket *indexes;
size_t bit, byte;
for (y=0; y < (ssize_t) image->rows; y++)
{
- PixelPacket * o = QueueAuthenticPixels(image,0,y,image->columns,1,&image->exception);
- if (o == (PixelPacket *) NULL)
+ Quantum * o = QueueAuthenticPixels(image,0,y,image->columns,1,&image->exception);
+ if (o == (Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
bit=0;
byte=0;
@@ -406,12 +405,12 @@
{
if (bit == 0) byte= (size_t) q[(y * stride) + (x / 8)];
- if (indexes != (IndexPacket *) NULL)
- SetPixelIndex(indexes+x,(IndexPacket) (((byte & 0x01) != 0) ? 0x00 : 0x01));
+ SetPixelIndex(image,(Quantum) (((byte & 0x01) != 0) ? 0x00 : 0x01),o);
bit++;
if (bit == 8)
bit=0;
byte>>=1;
+ o+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,&image->exception) == MagickFalse)
break;
@@ -428,7 +427,7 @@
/* old: */
char* r;
#else
- register PixelPacket *r;
+ register Quantum *r;
unsigned char *s;
#endif
s=q;
@@ -438,14 +437,14 @@
if (i % 1000 == 0) printf("%d\n",i);
#endif
r = QueueAuthenticPixels(image,0,i,image->columns,1,&image->exception);
- if (r == (PixelPacket *) NULL)
+ if (r == (Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelRed(r,ScaleCharToQuantum(*s++));
- SetPixelGreen(r,ScaleCharToQuantum(*s++));
- SetPixelBlue(r,ScaleCharToQuantum(*s++));
- r++;
+ SetPixelRed(image,ScaleCharToQuantum(*s++),r);
+ SetPixelGreen(image,ScaleCharToQuantum(*s++),r);
+ SetPixelBlue(image,ScaleCharToQuantum(*s++),r);
+ r+=GetPixelChannels(image);
}
SyncAuthenticPixels(image,&image->exception);
@@ -581,7 +580,7 @@
/* Read one DJVU image */
image = lc->image;
- /* register PixelPacket *q; */
+ /* register Quantum *q; */
logging=LogMagickEvent(CoderEvent,GetMagickModule(), " enter ReadOneDJVUImage()");
(void) logging;
@@ -695,7 +694,6 @@
if (!image->ping)
SyncImage(image);
- /* indexes=GetAuthenticIndexQueue(image); */
/* mmc: ??? Convert PNM pixels to runlength-encoded MIFF packets. */
/* image->colors = */
diff --git a/coders/dng.c b/coders/dng.c
index 8937a36..7864121 100644
--- a/coders/dng.c
+++ b/coders/dng.c
@@ -38,29 +38,29 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/constitute.h"
-#include "magick/delegate.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/geometry.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/layer.h"
-#include "magick/list.h"
-#include "magick/log.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/resource_.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
-#include "magick/transform.h"
-#include "magick/utility.h"
-#include "magick/xml-tree.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/delegate.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/layer.h"
+#include "MagickCore/list.h"
+#include "MagickCore/log.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/transform.h"
+#include "MagickCore/utility.h"
+#include "MagickCore/xml-tree.h"
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/coders/dot.c b/coders/dot.c
index b978112..180d8f2 100644
--- a/coders/dot.c
+++ b/coders/dot.c
@@ -39,28 +39,28 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/client.h"
-#include "magick/constitute.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/option.h"
-#include "magick/resource_.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
-#include "magick/utility.h"
-#include "magick/xwindow-private.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/client.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/option.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/utility.h"
+#include "MagickCore/xwindow-private.h"
#if defined(MAGICKCORE_GVC_DELEGATE)
#undef HAVE_CONFIG_H
#include <gvc.h>
diff --git a/coders/dps.c b/coders/dps.c
index bead8ec..7bb4e37 100644
--- a/coders/dps.c
+++ b/coders/dps.c
@@ -39,26 +39,26 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/client.h"
-#include "magick/colormap.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
-#include "magick/utility.h"
-#include "magick/xwindow-private.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/client.h"
+#include "MagickCore/colormap.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/utility.h"
+#include "MagickCore/xwindow-private.h"
#if defined(MAGICKCORE_DPS_DELEGATE)
#include <DPS/dpsXclient.h>
#include <DPS/dpsXpreview.h>
@@ -120,13 +120,10 @@
Pixmap
pixmap;
- register IndexPacket
- *indexes;
-
register ssize_t
i;
- register PixelPacket
+ register Quantum
*q;
register size_t
@@ -376,18 +373,18 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
pixel=XGetPixel(dps_image,x,y);
index=(pixel >> red_shift) & red_mask;
- SetPixelRed(q,ScaleShortToQuantum(colors[index].red));
+ SetPixelRed(image,ScaleShortToQuantum(colors[index].red),q);
index=(pixel >> green_shift) & green_mask;
- SetPixelGreen(q,ScaleShortToQuantum(colors[index].green));
+ SetPixelGreen(image,ScaleShortToQuantum(colors[index].green),q);
index=(pixel >> blue_shift) & blue_mask;
- SetPixelBlue(q,ScaleShortToQuantum(colors[index].blue));
- q++;
+ SetPixelBlue(image,ScaleShortToQuantum(colors[index].blue),q);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -398,23 +395,21 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
pixel=XGetPixel(dps_image,x,y);
color=(pixel >> red_shift) & red_mask;
color=(color*65535L)/red_mask;
- SetPixelRed(q,ScaleShortToQuantum((unsigned short) color));
+ SetPixelRed(image,ScaleShortToQuantum((unsigned short) color),q);
color=(pixel >> green_shift) & green_mask;
color=(color*65535L)/green_mask;
- SetPixelGreen(q,ScaleShortToQuantum((unsigned short)
- color));
+ SetPixelGreen(image,ScaleShortToQuantum((unsigned short) color),q);
color=(pixel >> blue_shift) & blue_mask;
color=(color*65535L)/blue_mask;
- SetPixelBlue(q,ScaleShortToQuantum((unsigned short)
- color));
- q++;
+ SetPixelBlue(image,ScaleShortToQuantum((unsigned short) color),q);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -451,12 +446,13 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
for (x=0; x < (ssize_t) image->columns; x++)
- SetPixelIndex(indexes+x,(unsigned short)
- XGetPixel(dps_image,x,y));
+ {
+ SetPixelIndex(image,(unsigned short) XGetPixel(dps_image,x,y),q);
+ q+=GetPixelChannels(image);
+ }
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
if (SetImageProgress(image,LoadImageTag,y,image->rows) == MagickFalse)
@@ -497,14 +493,14 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelOpacity(q,OpaqueOpacity);
+ SetPixelAlpha(image,OpaqueAlpha,q);
if (XGetPixel(matte_image,x,y) == 0)
- SetPixelOpacity(q,TransparentOpacity);
- q++;
+ SetPixelAlpha(image,TransparentAlpha,q);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
diff --git a/coders/dpx.c b/coders/dpx.c
index 2bf2dca..a4155c0 100644
--- a/coders/dpx.c
+++ b/coders/dpx.c
@@ -39,29 +39,30 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/colorspace.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/geometry.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/module.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/option.h"
-#include "magick/profile.h"
-#include "magick/property.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/string-private.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/attribute.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/option.h"
+#include "MagickCore/profile.h"
+#include "MagickCore/property.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/string-private.h"
/*
Typedef declaration.
@@ -1077,7 +1078,7 @@
MagickBooleanType
sync;
- register PixelPacket
+ register Quantum
*q;
size_t
@@ -1111,7 +1112,7 @@
if (count != (ssize_t) extent)
status=MagickFalse;
q=QueueAuthenticPixels(image,0,offset,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
@@ -1300,7 +1301,7 @@
QuantumType
quantum_type;
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
@@ -1468,7 +1469,7 @@
dpx.image.image_element[i].descriptor=RGBAComponentType;
if ((image_info->type != TrueColorType) &&
(image->matte == MagickFalse) &&
- (IsGrayImage(image,&image->exception) != MagickFalse))
+ (IsImageGray(image,&image->exception) != MagickFalse))
dpx.image.image_element[i].descriptor=LumaComponentType;
break;
}
@@ -1800,7 +1801,7 @@
image->depth,MagickTrue);
if ((image_info->type != UndefinedType) &&
(image_info->type != TrueColorType) && (image->matte == MagickFalse) &&
- (IsGrayImage(image,&image->exception) != MagickFalse))
+ (IsImageGray(image,&image->exception) != MagickFalse))
{
quantum_type=GrayQuantum;
extent=GetBytesPerRow(image->columns,1UL,image->depth,MagickTrue);
@@ -1809,9 +1810,9 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- (void) ExportQuantumPixels(image,(const CacheView *) NULL,quantum_info,
+ (void) ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
quantum_type,pixels,&image->exception);
count=WriteBlob(image,extent,pixels);
if (count != (ssize_t) extent)
diff --git a/coders/emf.c b/coders/emf.c
index f4dfcce..7df34b6 100644
--- a/coders/emf.c
+++ b/coders/emf.c
@@ -37,7 +37,7 @@
* Include declarations.
*/
-#include "magick/studio.h"
+#include "MagickCore/studio.h"
#if defined(MAGICKCORE_WINGDI32_DELEGATE)
# if defined(__CYGWIN__)
# include <windows.h>
@@ -46,22 +46,22 @@
# endif
#endif
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/geometry.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/pixel.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/pixel.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -453,7 +453,7 @@
register ssize_t
x;
- register PixelPacket
+ register Quantum
*q;
RGBQUAD
@@ -609,16 +609,16 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelRed(q,ScaleCharToQuantum(pBits->rgbRed));
- SetPixelGreen(q,ScaleCharToQuantum(pBits->rgbGreen));
- SetPixelBlue(q,ScaleCharToQuantum(pBits->rgbBlue));
- SetPixelOpacity(q,OpaqueOpacity);
+ SetPixelRed(image,ScaleCharToQuantum(pBits->rgbRed),q);
+ SetPixelGreen(image,ScaleCharToQuantum(pBits->rgbGreen),q);
+ SetPixelBlue(image,ScaleCharToQuantum(pBits->rgbBlue),q);
+ SetPixelAlpha(image,OpaqueAlpha,q);
pBits++;
- q++;
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
diff --git a/coders/ept.c b/coders/ept.c
index 572f38d..964bfa3 100644
--- a/coders/ept.c
+++ b/coders/ept.c
@@ -39,32 +39,32 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/color.h"
-#include "magick/constitute.h"
-#include "magick/draw.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/delegate.h"
-#include "magick/geometry.h"
-#include "magick/histogram.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/quantize.h"
-#include "magick/resource_.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
-#include "magick/transform.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/color.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/draw.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/delegate.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/histogram.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/quantize.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/transform.h"
+#include "MagickCore/utility.h"
/*
Typedef declarations.
diff --git a/coders/exr.c b/coders/exr.c
index df9137e..7cd528c 100644
--- a/coders/exr.c
+++ b/coders/exr.c
@@ -39,24 +39,25 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/property.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
-#include "magick/resource_.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/property.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/utility.h"
#if defined(MAGICKCORE_OPENEXR_DELEGATE)
#include <ImfCRgbaFile.h>
@@ -157,7 +158,7 @@
register ssize_t
x;
- register PixelPacket
+ register Quantum
*q;
ssize_t
@@ -217,22 +218,22 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
ImfInputSetFrameBuffer(file,scanline-min_x-image->columns*(min_y+y),1,
image->columns);
ImfInputReadPixels(file,min_y+y,min_y+y);
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelRed(q,ClampToQuantum((MagickRealType) QuantumRange*
- ImfHalfToFloat(scanline[x].r)));
- SetPixelGreen(q,ClampToQuantum((MagickRealType) QuantumRange*
- ImfHalfToFloat(scanline[x].g)));
- SetPixelBlue(q,ClampToQuantum((MagickRealType) QuantumRange*
- ImfHalfToFloat(scanline[x].b)));
- SetPixelAlpha(q,ClampToQuantum((MagickRealType) QuantumRange*
- ImfHalfToFloat(scanline[x].a)));
- q++;
+ SetPixelRed(image,ClampToQuantum((MagickRealType) QuantumRange*
+ ImfHalfToFloat(scanline[x].r)),q);
+ SetPixelGreen(image,ClampToQuantum((MagickRealType) QuantumRange*
+ ImfHalfToFloat(scanline[x].g)),q);
+ SetPixelBlue(image,ClampToQuantum((MagickRealType) QuantumRange*
+ ImfHalfToFloat(scanline[x].b)),q);
+ SetPixelAlpha(image,ClampToQuantum((MagickRealType) QuantumRange*
+ ImfHalfToFloat(scanline[x].a)),q);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -362,7 +363,7 @@
MagickBooleanType
status;
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
@@ -427,23 +428,22 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- ImfFloatToHalf(QuantumScale*GetPixelRed(p),&half_quantum);
+ ImfFloatToHalf(QuantumScale*GetPixelRed(image,p),&half_quantum);
scanline[x].r=half_quantum;
- ImfFloatToHalf(QuantumScale*GetPixelGreen(p),&half_quantum);
+ ImfFloatToHalf(QuantumScale*GetPixelGreen(image,p),&half_quantum);
scanline[x].g=half_quantum;
- ImfFloatToHalf(QuantumScale*GetPixelBlue(p),&half_quantum);
+ ImfFloatToHalf(QuantumScale*GetPixelBlue(image,p),&half_quantum);
scanline[x].b=half_quantum;
if (image->matte == MagickFalse)
ImfFloatToHalf(1.0,&half_quantum);
else
- ImfFloatToHalf(1.0-QuantumScale*GetPixelOpacity(p),
- &half_quantum);
+ ImfFloatToHalf(QuantumScale*GetPixelAlpha(image,p),&half_quantum);
scanline[x].a=half_quantum;
- p++;
+ p+=GetPixelChannels(image);
}
ImfOutputSetFrameBuffer(file,scanline-(y*image->columns),1,image->columns);
ImfOutputWritePixels(file,1);
diff --git a/coders/fax.c b/coders/fax.c
index 9f29732..78660b8 100644
--- a/coders/fax.c
+++ b/coders/fax.c
@@ -39,25 +39,25 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/colormap.h"
-#include "magick/colorspace.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/compress.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/colormap.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/compress.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
/*
Forward declarations.
diff --git a/coders/fits.c b/coders/fits.c
index 91201c1..edbde04 100644
--- a/coders/fits.c
+++ b/coders/fits.c
@@ -39,32 +39,32 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/attribute.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/color-private.h"
-#include "magick/colorspace.h"
-#include "magick/constitute.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/module.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/pixel-private.h"
-#include "magick/pixel-private.h"
-#include "magick/property.h"
-#include "magick/static.h"
-#include "magick/statistic.h"
-#include "magick/string_.h"
-#include "magick/string-private.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/attribute.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/property.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/statistic.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/string-private.h"
+#include "MagickCore/module.h"
/*
Forward declarations.
@@ -269,7 +269,7 @@
i,
x;
- register PixelPacket
+ register Quantum
*q;
ssize_t
@@ -438,23 +438,23 @@
for (y=(ssize_t) image->rows-1; y >= 0; y--)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
pixel=GetFITSPixel(image,fits_info.bits_per_pixel);
- SetPixelRed(q,ClampToQuantum(scale*(fits_info.scale*(pixel-
- fits_info.min_data)+fits_info.zero)));
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- q++;
+ SetPixelRed(image,ClampToQuantum(scale*(fits_info.scale*
+ (pixel-fits_info.min_data)+fits_info.zero)),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
if (image->previous == (Image *) NULL)
{
status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
- image->rows);
+ image->rows);
if (status == MagickFalse)
break;
}
@@ -606,7 +606,7 @@
QuantumInfo
*quantum_info;
- register const PixelPacket
+ register const Quantum
*p;
size_t
@@ -659,7 +659,7 @@
(void) strncpy(fits_info+offset,header,strlen(header));
offset+=80;
(void) FormatLocaleString(header,FITSBlocksize,"NAXIS = %10lu",
- IsGrayImage(image,&image->exception) != MagickFalse ? 2UL : 3UL);
+ IsImageGray(image,&image->exception) != MagickFalse ? 2UL : 3UL);
(void) strncpy(fits_info+offset,header,strlen(header));
offset+=80;
(void) FormatLocaleString(header,FITSBlocksize,"NAXIS1 = %10lu",
@@ -670,7 +670,7 @@
(unsigned long) image->rows);
(void) strncpy(fits_info+offset,header,strlen(header));
offset+=80;
- if (IsGrayImage(image,&image->exception) == MagickFalse)
+ if (IsImageGray(image,&image->exception) == MagickFalse)
{
(void) FormatLocaleString(header,FITSBlocksize,
"NAXIS3 = %10lu",3UL);
@@ -709,15 +709,15 @@
Convert image to fits scale PseudoColor class.
*/
pixels=GetQuantumPixels(quantum_info);
- if (IsGrayImage(image,&image->exception) != MagickFalse)
+ if (IsImageGray(image,&image->exception) != MagickFalse)
{
length=GetQuantumExtent(image,quantum_info,GrayQuantum);
for (y=(ssize_t) image->rows-1; y >= 0; y--)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,quantum_info,
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
GrayQuantum,pixels,&image->exception);
if (image->depth == 16)
SetFITSUnsignedPixels(image->columns,image->depth,pixels);
@@ -739,9 +739,9 @@
for (y=(ssize_t) image->rows-1; y >= 0; y--)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,quantum_info,
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
RedQuantum,pixels,&image->exception);
if (image->depth == 16)
SetFITSUnsignedPixels(image->columns,image->depth,pixels);
@@ -760,9 +760,9 @@
for (y=(ssize_t) image->rows-1; y >= 0; y--)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,quantum_info,
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
GreenQuantum,pixels,&image->exception);
if (image->depth == 16)
SetFITSUnsignedPixels(image->columns,image->depth,pixels);
@@ -781,9 +781,9 @@
for (y=(ssize_t) image->rows-1; y >= 0; y--)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,quantum_info,
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
BlueQuantum,pixels,&image->exception);
if (image->depth == 16)
SetFITSUnsignedPixels(image->columns,image->depth,pixels);
diff --git a/coders/fpx.c b/coders/fpx.c
index b0e8969..b2482a5 100644
--- a/coders/fpx.c
+++ b/coders/fpx.c
@@ -39,30 +39,30 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/property.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/color.h"
-#include "magick/color-private.h"
-#include "magick/colorspace.h"
-#include "magick/constitute.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/geometry.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/pixel.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/property.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/color.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/pixel.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
#if defined(MAGICKCORE_FPX_DELEGATE)
#if !defined(vms) && !defined(macintosh) && !defined(MAGICKCORE_WINDOWS_SUPPORT)
#include <fpxlib.h>
@@ -166,20 +166,17 @@
Image
*image;
- IndexPacket
- index;
-
MagickBooleanType
status;
- register IndexPacket
- *indexes;
+ Quantum
+ index;
register ssize_t
i,
x;
- register PixelPacket
+ register Quantum
*q;
register unsigned char
@@ -424,9 +421,8 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
if ((y % tile_height) == 0)
{
/*
@@ -459,22 +455,22 @@
{
if (fpx_info.numberOfComponents > 2)
{
- SetPixelRed(q,ScaleCharToQuantum(*r));
- SetPixelGreen(q,ScaleCharToQuantum(*g));
- SetPixelBlue(q,ScaleCharToQuantum(*b));
+ SetPixelRed(image,ScaleCharToQuantum(*r),q);
+ SetPixelGreen(image,ScaleCharToQuantum(*g),q);
+ SetPixelBlue(image,ScaleCharToQuantum(*b),q);
}
else
{
index=ScaleCharToQuantum(*r);
- SetPixelIndex(indexes+x,index);
- SetPixelRed(q,index);
- SetPixelGreen(q,index);
- SetPixelBlue(q,index);
+ SetPixelBlack(image,index,q);
+ SetPixelRed(image,index,q);
+ SetPixelGreen(image,index,q);
+ SetPixelBlue(image,index,q);
}
- SetPixelOpacity(q,OpaqueOpacity);
+ SetPixelAlpha(image,OpaqueAlpha,q);
if (image->matte != MagickFalse)
- SetPixelAlpha(q,ScaleCharToQuantum(*a));
- q++;
+ SetPixelAlpha(image,ScaleCharToQuantum(*a),q);
+ q+=GetPixelChannels(image);
r+=red_component->columnStride;
g+=green_component->columnStride;
b+=blue_component->columnStride;
@@ -814,7 +810,7 @@
QuantumType
quantum_type;
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
@@ -863,7 +859,7 @@
if (image->matte != MagickFalse)
colorspace.numberOfComponents=4;
if ((image_info->type != TrueColorType) &&
- IsGrayImage(image,&image->exception))
+ IsImageGray(image,&image->exception))
{
colorspace.numberOfComponents=1;
colorspace.theComponents[0].myColor=MONOCHROME;
@@ -990,9 +986,9 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,quantum_info,
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
quantum_type,pixels,&image->exception);
fpx_status=FPX_WriteImageLine(flashpix,&fpx_info);
if (fpx_status != FPX_OK)
diff --git a/coders/gif.c b/coders/gif.c
index 7b803f0..5a18d4f 100644
--- a/coders/gif.c
+++ b/coders/gif.c
@@ -39,32 +39,35 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/color.h"
-#include "magick/color-private.h"
-#include "magick/colormap.h"
-#include "magick/colormap-private.h"
-#include "magick/colorspace.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/profile.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/option.h"
-#include "magick/property.h"
-#include "magick/quantize.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/attribute.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/color.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colormap.h"
+#include "MagickCore/colormap-private.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/profile.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/option.h"
+#include "MagickCore/pixel.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/property.h"
+#include "MagickCore/quantize.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
/*
Define declarations.
@@ -388,25 +391,25 @@
ExceptionInfo
*exception;
- IndexPacket
- index;
-
int
c;
+ LZWInfo
+ *lzw_info;
+
+ Quantum
+ index;
+
+ size_t
+ pass;
+
ssize_t
offset,
y;
- LZWInfo
- *lzw_info;
-
unsigned char
data_size;
- size_t
- pass;
-
/*
Allocate decoder tables.
*/
@@ -426,31 +429,27 @@
offset=0;
for (y=0; y < (ssize_t) image->rows; y++)
{
- register IndexPacket
- *restrict indexes;
-
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
q=GetAuthenticPixels(image,0,offset,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
for (x=0; x < (ssize_t) image->columns; )
{
c=ReadBlobLZWByte(lzw_info);
if (c < 0)
break;
index=ConstrainColormapIndex(image,(size_t) c);
- SetPixelIndex(indexes+x,index);
- SetPixelRGBO(q,image->colormap+(ssize_t) index);
- SetPixelOpacity(q,(ssize_t) index == opacity ?
- TransparentOpacity : OpaqueOpacity);
+ SetPixelIndex(image,index,q);
+ SetPixelPacket(image,image->colormap+(ssize_t) index,q);
+ SetPixelAlpha(image,(ssize_t) index == opacity ? TransparentAlpha :
+ OpaqueAlpha,q);
x++;
- q++;
+ q+=GetPixelChannels(image);
}
if (x < (ssize_t) image->columns)
break;
@@ -574,7 +573,7 @@
} \
}
- IndexPacket
+ Quantum
index;
register ssize_t
@@ -654,28 +653,27 @@
waiting_code=0;
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const IndexPacket
- *restrict indexes;
-
- register const PixelPacket
+ register const Quantum
*restrict p;
register ssize_t
x;
p=GetVirtualPixels(image,0,offset,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetVirtualIndexQueue(image);
if (y == 0)
- waiting_code=(short) (*indexes);
+ {
+ waiting_code=(short) GetPixelIndex(image,p);
+ p+=GetPixelChannels(image);
+ }
for (x=(ssize_t) (y == 0 ? 1 : 0); x < (ssize_t) image->columns; x++)
{
/*
Probe hash table.
*/
- index=(IndexPacket) ((size_t) GetPixelIndex(indexes+x) & 0xff);
- p++;
+ index=(Quantum) ((size_t) GetPixelIndex(image,p) & 0xff);
+ p+=GetPixelChannels(image);
k=(ssize_t) (((size_t) index << (MaxGIFBits-8))+waiting_code);
if (k >= MaxHashTable)
k-=MaxHashTable;
@@ -1271,7 +1269,7 @@
image->colormap[i].blue=ScaleCharToQuantum(*p++);
if (i == opacity)
{
- image->colormap[i].opacity=(Quantum) TransparentOpacity;
+ image->colormap[i].alpha=(Quantum) TransparentAlpha;
image->transparent_color=image->colormap[opacity];
}
}
@@ -1310,7 +1308,7 @@
image->colormap[i].green=ScaleCharToQuantum(*p++);
image->colormap[i].blue=ScaleCharToQuantum(*p++);
if (i == opacity)
- image->colormap[i].opacity=(Quantum) TransparentOpacity;
+ image->colormap[i].alpha=(Quantum) TransparentAlpha;
}
colormap=(unsigned char *) RelinquishMagickMemory(colormap);
}
@@ -1558,7 +1556,7 @@
if (image->colorspace != RGBColorspace)
(void) TransformImageColorspace(image,RGBColorspace);
opacity=(-1);
- if (IsOpaqueImage(image,&image->exception) != MagickFalse)
+ if (IsImageOpaque(image,&image->exception) != MagickFalse)
{
if ((image->storage_class == DirectClass) || (image->colors > 256))
(void) SetImageType(image,PaletteType);
@@ -1575,17 +1573,17 @@
if ((image->storage_class == DirectClass) || (image->colors > 256))
(void) SetImageType(image,PaletteBilevelMatteType);
for (i=0; i < (ssize_t) image->colors; i++)
- if (image->colormap[i].opacity != OpaqueOpacity)
+ if (image->colormap[i].alpha != OpaqueAlpha)
{
if (opacity < 0)
{
opacity=i;
continue;
}
- alpha=(MagickRealType) TransparentOpacity-(MagickRealType)
- image->colormap[i].opacity;
- beta=(MagickRealType) TransparentOpacity-(MagickRealType)
- image->colormap[opacity].opacity;
+ alpha=(MagickRealType) TransparentAlpha-(MagickRealType)
+ image->colormap[i].alpha;
+ beta=(MagickRealType) TransparentAlpha-(MagickRealType)
+ image->colormap[opacity].alpha;
if (alpha < beta)
opacity=i;
}
@@ -1593,17 +1591,17 @@
{
(void) SetImageType(image,PaletteBilevelMatteType);
for (i=0; i < (ssize_t) image->colors; i++)
- if (image->colormap[i].opacity != OpaqueOpacity)
+ if (image->colormap[i].alpha != OpaqueAlpha)
{
if (opacity < 0)
{
opacity=i;
continue;
}
- alpha=(Quantum) TransparentOpacity-(MagickRealType)
- image->colormap[i].opacity;
- beta=(Quantum) TransparentOpacity-(MagickRealType)
- image->colormap[opacity].opacity;
+ alpha=(Quantum) TransparentAlpha-(MagickRealType)
+ image->colormap[i].alpha;
+ beta=(Quantum) TransparentAlpha-(MagickRealType)
+ image->colormap[opacity].alpha;
if (alpha < beta)
opacity=i;
}
@@ -1644,7 +1642,7 @@
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 (IsColorEqual(&image->background_color,image->colormap+j))
+ if (IsPixelPacketEquivalent(&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 16bbe3b..424bca5 100644
--- a/coders/gradient.c
+++ b/coders/gradient.c
@@ -39,26 +39,26 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/color.h"
-#include "magick/color-private.h"
-#include "magick/draw.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/paint.h"
-#include "magick/pixel-private.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
-#include "magick/studio.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/color.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/draw.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/paint.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/studio.h"
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -114,7 +114,7 @@
image=AcquireImage(image_info);
if ((image->columns == 0) || (image->rows == 0))
ThrowReaderException(OptionError,"MustSpecifyImageSize");
- (void) SetImageOpacity(image,(Quantum) TransparentOpacity);
+ (void) SetImageOpacity(image,(Quantum) TransparentAlpha);
(void) CopyMagickString(image->filename,image_info->filename,MaxTextExtent);
(void) CopyMagickString(colorname,image_info->filename,MaxTextExtent);
(void) sscanf(image_info->filename,"%[^-]",colorname);
@@ -124,7 +124,7 @@
return((Image *) NULL);
}
(void) CopyMagickString(colorname,"white",MaxTextExtent);
- if (PixelIntensityToQuantum(&start_color) > (Quantum) (QuantumRange/2))
+ if (GetPixelPacketIntensity(&start_color) > (Quantum) (QuantumRange/2))
(void) CopyMagickString(colorname,"black",MaxTextExtent);
(void) sscanf(image_info->filename,"%*[^-]-%s",colorname);
if (QueryColorDatabase(colorname,&stop_color,exception) == MagickFalse)
diff --git a/coders/gray.c b/coders/gray.c
index f73ed5e..d6bfe83 100644
--- a/coders/gray.c
+++ b/coders/gray.c
@@ -39,28 +39,28 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/colorspace.h"
-#include "magick/constitute.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/pixel.h"
-#include "magick/pixel-private.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/statistic.h"
-#include "magick/string_.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/pixel.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/statistic.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
/*
Forward declarations.
@@ -190,13 +190,13 @@
}
for (y=0; y < (ssize_t) image->extract_info.height; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
if (count != (ssize_t) length)
@@ -206,7 +206,7 @@
break;
}
q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,quantum_info,
quantum_type,pixels,exception);
@@ -219,15 +219,16 @@
image->columns,1,exception);
q=QueueAuthenticPixels(image,0,y-image->extract_info.y,image->columns,
1,exception);
- if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) ||
+ (q == (const Quantum *) NULL))
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelRed(q,GetPixelRed(p));
- SetPixelGreen(q,GetPixelGreen(p));
- SetPixelBlue(q,GetPixelBlue(p));
- p++;
- q++;
+ SetPixelRed(image,GetPixelRed(canvas_image,p),q);
+ SetPixelGreen(image,GetPixelGreen(canvas_image,p),q);
+ SetPixelBlue(image,GetPixelBlue(canvas_image,p),q);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -415,13 +416,13 @@
pixels=GetQuantumPixels(quantum_info);
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,quantum_info,
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
quantum_type,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
diff --git a/coders/hald.c b/coders/hald.c
index 9fc5c65..95d075b 100644
--- a/coders/hald.c
+++ b/coders/hald.c
@@ -39,25 +39,26 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/colorspace.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/module.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/string-private.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/string-private.h"
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -129,14 +130,14 @@
green,
red;
- register PixelPacket
+ register Quantum
*restrict q;
if (status == MagickFalse)
continue;
q=QueueAuthenticPixels(image,0,y,image->columns,(size_t) level,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
@@ -146,14 +147,12 @@
{
for (red=0; red < (ssize_t) cube_size; red++)
{
- SetPixelRed(q,ClampToQuantum(QuantumRange*red/
- (cube_size-1.0)));
- SetPixelGreen(q,ClampToQuantum(QuantumRange*green/
- (cube_size-1.0)));
- SetPixelBlue(q,ClampToQuantum(QuantumRange*blue/
- (cube_size-1.0)));
- SetPixelOpacity(q,OpaqueOpacity);
- q++;
+ SetPixelRed(image,ClampToQuantum(QuantumRange*red/(cube_size-1.0)),q);
+ SetPixelGreen(image,ClampToQuantum(QuantumRange*green/
+ (cube_size-1.0)),q);
+ SetPixelBlue(image,ClampToQuantum(QuantumRange*blue/(cube_size-1.0)),q);
+ SetPixelAlpha(image,OpaqueAlpha,q);
+ q+=GetPixelChannels(image);
}
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
diff --git a/coders/hdr.c b/coders/hdr.c
index 16a79b4..1e7feb5 100644
--- a/coders/hdr.c
+++ b/coders/hdr.c
@@ -39,26 +39,27 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/colorspace.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/property.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/string-private.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/property.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/string-private.h"
+#include "MagickCore/module.h"
/*
Forward declarations.
@@ -151,7 +152,7 @@
status,
value_expected;
- register PixelPacket
+ register Quantum
*q;
register unsigned char
@@ -443,7 +444,7 @@
}
}
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
i=0;
for (x=0; x < (ssize_t) image->columns; x++)
@@ -462,17 +463,17 @@
pixel[2]=pixels[i++];
pixel[3]=pixels[i++];
}
- SetPixelRed(q,0);
- SetPixelGreen(q,0);
- SetPixelBlue(q,0);
+ SetPixelRed(image,0,q);
+ SetPixelGreen(image,0,q);
+ SetPixelBlue(image,0,q);
if (pixel[3] != 0)
{
gamma=pow(2.0,pixel[3]-(128.0+8.0));
- SetPixelRed(q,ClampToQuantum(QuantumRange*gamma*pixel[0]));
- SetPixelGreen(q,ClampToQuantum(QuantumRange*gamma*pixel[1]));
- SetPixelBlue(q,ClampToQuantum(QuantumRange*gamma*pixel[2]));
+ SetPixelRed(image,ClampToQuantum(QuantumRange*gamma*pixel[0]),q);
+ SetPixelGreen(image,ClampToQuantum(QuantumRange*gamma*pixel[1]),q);
+ SetPixelBlue(image,ClampToQuantum(QuantumRange*gamma*pixel[2]),q);
}
- q++;
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -651,7 +652,7 @@
MagickBooleanType
status;
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
@@ -730,7 +731,7 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
if ((image->columns >= 8) && (image->columns <= 0x7ffff))
{
@@ -752,22 +753,20 @@
pixel[1]=0;
pixel[2]=0;
pixel[3]=0;
- gamma=QuantumScale*GetPixelRed(p);
- if ((QuantumScale*GetPixelGreen(p)) > gamma)
- gamma=QuantumScale*GetPixelGreen(p);
- if ((QuantumScale*GetPixelBlue(p)) > gamma)
- gamma=QuantumScale*GetPixelBlue(p);
+ gamma=QuantumScale*GetPixelRed(image,p);
+ if ((QuantumScale*GetPixelGreen(image,p)) > gamma)
+ gamma=QuantumScale*GetPixelGreen(image,p);
+ if ((QuantumScale*GetPixelBlue(image,p)) > gamma)
+ gamma=QuantumScale*GetPixelBlue(image,p);
if (gamma > MagickEpsilon)
{
int
exponent;
gamma=frexp(gamma,&exponent)*256.0/gamma;
- pixel[0]=(unsigned char) (gamma*QuantumScale*GetPixelRed(p));
- pixel[1]=(unsigned char) (gamma*QuantumScale*
- GetPixelGreen(p));
- pixel[2]=(unsigned char) (gamma*QuantumScale*
- GetPixelBlue(p));
+ pixel[0]=(unsigned char) (gamma*QuantumScale*GetPixelRed(image,p));
+ pixel[1]=(unsigned char) (gamma*QuantumScale*GetPixelGreen(image,p));
+ pixel[2]=(unsigned char) (gamma*QuantumScale*GetPixelBlue(image,p));
pixel[3]=(unsigned char) (exponent+128);
}
if ((image->columns >= 8) && (image->columns <= 0x7ffff))
@@ -784,7 +783,7 @@
pixels[i++]=pixel[2];
pixels[i++]=pixel[3];
}
- p++;
+ p+=GetPixelChannels(image);
}
if ((image->columns >= 8) && (image->columns <= 0x7ffff))
{
diff --git a/coders/histogram.c b/coders/histogram.c
index 71f8d81..a07b588 100644
--- a/coders/histogram.c
+++ b/coders/histogram.c
@@ -39,31 +39,32 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/property.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/color.h"
-#include "magick/color-private.h"
-#include "magick/constitute.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/geometry.h"
-#include "magick/histogram.h"
-#include "magick/image-private.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/option.h"
-#include "magick/resource_.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/statistic.h"
-#include "magick/string_.h"
-#include "magick/module.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/property.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/color.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/histogram.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/option.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/static.h"
+#include "MagickCore/statistic.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/utility.h"
/*
Forward declarations.
@@ -200,7 +201,7 @@
MagickBooleanType
status;
- MagickPixelPacket
+ PixelInfo
*histogram;
MagickRealType
@@ -210,10 +211,10 @@
RectangleInfo
geometry;
- register const PixelPacket
+ register const Quantum
*p;
- register PixelPacket
+ register Quantum
*q,
*r;
@@ -251,9 +252,9 @@
*/
length=MagickMax((size_t) ScaleQuantumToChar((Quantum) QuantumRange)+1UL,
histogram_image->columns);
- histogram=(MagickPixelPacket *) AcquireQuantumMemory(length,
+ histogram=(PixelInfo *) AcquireQuantumMemory(length,
sizeof(*histogram));
- if (histogram == (MagickPixelPacket *) NULL)
+ if (histogram == (PixelInfo *) NULL)
{
histogram_image=DestroyImage(histogram_image);
ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed");
@@ -266,17 +267,17 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
if ((channel & RedChannel) != 0)
- histogram[ScaleQuantumToChar(GetPixelRed(p))].red++;
+ histogram[ScaleQuantumToChar(GetPixelRed(image,p))].red++;
if ((channel & GreenChannel) != 0)
- histogram[ScaleQuantumToChar(GetPixelGreen(p))].green++;
+ histogram[ScaleQuantumToChar(GetPixelGreen(image,p))].green++;
if ((channel & BlueChannel) != 0)
- histogram[ScaleQuantumToChar(GetPixelBlue(p))].blue++;
- p++;
+ histogram[ScaleQuantumToChar(GetPixelBlue(image,p))].blue++;
+ p+=GetPixelChannels(image);
}
}
maximum=histogram[0].red;
@@ -300,7 +301,7 @@
for (x=0; x < (ssize_t) histogram_image->columns; x++)
{
q=GetAuthenticPixels(histogram_image,x,0,1,histogram_image->rows,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
if ((channel & RedChannel) != 0)
{
@@ -308,7 +309,7 @@
r=q+y;
for ( ; y < (ssize_t) histogram_image->rows; y++)
{
- SetPixelRed(r,QuantumRange);
+ SetPixelRed(histogram_image,QuantumRange,r);
r++;
}
}
@@ -318,7 +319,7 @@
r=q+y;
for ( ; y < (ssize_t) histogram_image->rows; y++)
{
- SetPixelGreen(r,QuantumRange);
+ SetPixelGreen(histogram_image,QuantumRange,r);
r++;
}
}
@@ -328,7 +329,7 @@
r=q+y;
for ( ; y < (ssize_t) histogram_image->rows; y++)
{
- SetPixelBlue(r,QuantumRange);
+ SetPixelBlue(histogram_image,QuantumRange,r);
r++;
}
}
@@ -341,7 +342,7 @@
/*
Relinquish resources.
*/
- histogram=(MagickPixelPacket *) RelinquishMagickMemory(histogram);
+ histogram=(PixelInfo *) RelinquishMagickMemory(histogram);
option=GetImageOption(image_info,"histogram:unique-colors");
if ((option == (const char *) NULL) || (IsMagickTrue(option) != MagickFalse))
{
diff --git a/coders/hrz.c b/coders/hrz.c
index 13ab46f..cf1292c 100644
--- a/coders/hrz.c
+++ b/coders/hrz.c
@@ -39,24 +39,25 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/colorspace.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
/*
Forward declarations.
@@ -101,7 +102,7 @@
register ssize_t
x;
- register PixelPacket
+ register Quantum
*q;
register unsigned char
@@ -152,15 +153,15 @@
ThrowReaderException(CorruptImageError,"UnableToReadImageData");
p=pixels;
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelRed(q,4*ScaleCharToQuantum(*p++));
- SetPixelGreen(q,4*ScaleCharToQuantum(*p++));
- SetPixelBlue(q,4*ScaleCharToQuantum(*p++));
- SetPixelOpacity(q,OpaqueOpacity);
- q++;
+ SetPixelRed(image,4*ScaleCharToQuantum(*p++),q);
+ SetPixelGreen(image,4*ScaleCharToQuantum(*p++),q);
+ SetPixelBlue(image,4*ScaleCharToQuantum(*p++),q);
+ SetPixelAlpha(image,OpaqueAlpha,q);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -268,7 +269,7 @@
MagickBooleanType
status;
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
@@ -318,15 +319,15 @@
for (y=0; y < (ssize_t) hrz_image->rows; y++)
{
p=GetVirtualPixels(hrz_image,0,y,hrz_image->columns,1,&image->exception);
- if (p == (PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
q=pixels;
for (x=0; x < (ssize_t) hrz_image->columns; x++)
{
- *q++=ScaleQuantumToChar(GetPixelRed(p))/4;
- *q++=ScaleQuantumToChar(GetPixelGreen(p))/4;
- *q++=ScaleQuantumToChar(GetPixelBlue(p))/4;
- p++;
+ *q++=ScaleQuantumToChar(GetPixelRed(hrz_image,p))/4;
+ *q++=ScaleQuantumToChar(GetPixelGreen(hrz_image,p))/4;
+ *q++=ScaleQuantumToChar(GetPixelBlue(hrz_image,p))/4;
+ p+=GetPixelChannels(hrz_image);
}
count=WriteBlob(image,(size_t) (q-pixels),pixels);
if (count != (ssize_t) (q-pixels))
diff --git a/coders/html.c b/coders/html.c
index 3bf0706..d9a2762 100644
--- a/coders/html.c
+++ b/coders/html.c
@@ -40,25 +40,25 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/color-private.h"
-#include "magick/colorspace.h"
-#include "magick/constitute.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/geometry.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/paint.h"
-#include "magick/property.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/paint.h"
+#include "MagickCore/property.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/utility.h"
/*
Forward declarations.
diff --git a/coders/icon.c b/coders/icon.c
index ca636ff..3a7e7aa 100644
--- a/coders/icon.c
+++ b/coders/icon.c
@@ -39,28 +39,29 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/colormap.h"
-#include "magick/colorspace.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/log.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/nt-feature.h"
-#include "magick/quantize.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/colormap.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/log.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/nt-feature.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantize.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
/*
Define declarations.
@@ -183,14 +184,11 @@
MagickBooleanType
status;
- register IndexPacket
- *indexes;
-
register ssize_t
i,
x;
- register PixelPacket
+ register Quantum
*q;
register unsigned char
@@ -402,22 +400,27 @@
for (y=(ssize_t) image->rows-1; y >= 0; y--)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
for (x=0; x < (ssize_t) (image->columns-7); x+=8)
{
byte=(size_t) ReadBlobByte(image);
for (bit=0; bit < 8; bit++)
- SetPixelIndex(indexes+x+bit,
- ((byte & (0x80 >> bit)) != 0 ? 0x01 : 0x00));
+ {
+ SetPixelIndex(image,((byte & (0x80 >> bit)) != 0 ? 0x01 :
+ 0x00),q);
+ q+=GetPixelChannels(image);
+ }
}
if ((image->columns % 8) != 0)
{
byte=(size_t) ReadBlobByte(image);
for (bit=0; bit < (image->columns % 8); bit++)
- SetPixelIndex(indexes+x+bit,
- ((byte & (0x80 >> bit)) != 0 ? 0x01 : 0x00));
+ {
+ SetPixelIndex(image,((byte & (0x80 >> bit)) != 0 ? 0x01 :
+ 0x00),q);
+ q+=GetPixelChannels(image);
+ }
}
for (x=0; x < (ssize_t) scanline_pad; x++)
(void) ReadBlobByte(image);
@@ -441,19 +444,21 @@
for (y=(ssize_t) image->rows-1; y >= 0; y--)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
for (x=0; x < ((ssize_t) image->columns-1); x+=2)
{
byte=(size_t) ReadBlobByte(image);
- SetPixelIndex(indexes+x,((byte >> 4) & 0xf));
- SetPixelIndex(indexes+x+1,((byte) & 0xf));
+ SetPixelIndex(image,((byte >> 4) & 0xf),q);
+ q+=GetPixelChannels(image);
+ SetPixelIndex(image,((byte) & 0xf),q);
+ q+=GetPixelChannels(image);
}
if ((image->columns % 2) != 0)
{
byte=(size_t) ReadBlobByte(image);
- SetPixelIndex(indexes+x,((byte >> 4) & 0xf));
+ SetPixelIndex(image,((byte >> 4) & 0xf),q);
+ q+=GetPixelChannels(image);
}
for (x=0; x < (ssize_t) scanline_pad; x++)
(void) ReadBlobByte(image);
@@ -477,13 +482,13 @@
for (y=(ssize_t) image->rows-1; y >= 0; y--)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
for (x=0; x < (ssize_t) image->columns; x++)
{
byte=(size_t) ReadBlobByte(image);
- SetPixelIndex(indexes+x,byte);
+ SetPixelIndex(image,byte,q);
+ q+=GetPixelChannels(image);
}
for (x=0; x < (ssize_t) scanline_pad; x++)
(void) ReadBlobByte(image);
@@ -507,14 +512,14 @@
for (y=(ssize_t) image->rows-1; y >= 0; y--)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
for (x=0; x < (ssize_t) image->columns; x++)
{
byte=(size_t) ReadBlobByte(image);
byte|=(size_t) (ReadBlobByte(image) << 8);
- SetPixelIndex(indexes+x,byte);
+ SetPixelIndex(image,byte,q);
+ q+=GetPixelChannels(image);
}
for (x=0; x < (ssize_t) scanline_pad; x++)
(void) ReadBlobByte(image);
@@ -539,20 +544,20 @@
for (y=(ssize_t) image->rows-1; y >= 0; y--)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelBlue(q,ScaleCharToQuantum((unsigned char)
- ReadBlobByte(image)));
- SetPixelGreen(q,ScaleCharToQuantum((unsigned char)
- ReadBlobByte(image)));
- SetPixelRed(q,ScaleCharToQuantum((unsigned char)
- ReadBlobByte(image)));
+ SetPixelBlue(image,ScaleCharToQuantum((unsigned char)
+ ReadBlobByte(image)),q);
+ SetPixelGreen(image,ScaleCharToQuantum((unsigned char)
+ ReadBlobByte(image)),q);
+ SetPixelRed(image,ScaleCharToQuantum((unsigned char)
+ ReadBlobByte(image)),q);
if (icon_info.bits_per_pixel == 32)
- SetPixelAlpha(q,ScaleCharToQuantum((unsigned char)
- ReadBlobByte(image)));
- q++;
+ SetPixelAlpha(image,ScaleCharToQuantum((unsigned char)
+ ReadBlobByte(image)),q);
+ q+=GetPixelChannels(image);
}
if (icon_info.bits_per_pixel == 24)
for (x=0; x < (ssize_t) scanline_pad; x++)
@@ -583,21 +588,27 @@
for (y=(ssize_t) image->rows-1; y >= 0; y--)
{
q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
for (x=0; x < ((ssize_t) image->columns-7); x+=8)
{
byte=(size_t) ReadBlobByte(image);
for (bit=0; bit < 8; bit++)
- SetPixelOpacity(q+x+bit,(((byte & (0x80 >> bit)) !=
- 0) ? TransparentOpacity : OpaqueOpacity));
+ {
+ SetPixelAlpha(image,(((byte & (0x80 >> bit)) != 0) ?
+ TransparentAlpha : OpaqueAlpha),q);
+ q+=GetPixelChannels(image);
+ }
}
if ((image->columns % 8) != 0)
{
byte=(size_t) ReadBlobByte(image);
for (bit=0; bit < (image->columns % 8); bit++)
- SetPixelOpacity(q+x+bit,(((byte & (0x80 >> bit)) !=
- 0) ? TransparentOpacity : OpaqueOpacity));
+ {
+ SetPixelAlpha(image,(((byte & (0x80 >> bit)) != 0) ?
+ TransparentAlpha : OpaqueAlpha),q);
+ q+=GetPixelChannels(image);
+ }
}
if ((image->columns % 32) != 0)
for (x=0; x < (ssize_t) ((32-(image->columns % 32))/8); x++)
@@ -768,10 +779,7 @@
offset,
scene;
- register const IndexPacket
- *indexes;
-
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
@@ -991,16 +999,15 @@
for (y=0; y < (ssize_t) next->rows; y++)
{
p=GetVirtualPixels(next,0,y,next->columns,1,&next->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetVirtualIndexQueue(next);
q=pixels+(next->rows-y-1)*bytes_per_line;
bit=0;
byte=0;
for (x=0; x < (ssize_t) next->columns; x++)
{
byte<<=1;
- byte|=GetPixelIndex(indexes+x) != 0 ? 0x01 : 0x00;
+ byte|=GetPixelIndex(next,p) != 0 ? 0x01 : 0x00;
bit++;
if (bit == 8)
{
@@ -1008,7 +1015,8 @@
bit=0;
byte=0;
}
- }
+ p+=GetPixelChannels(image);
+ }
if (bit != 0)
*q++=(unsigned char) (byte << (8-bit));
if (next->previous == (Image *) NULL)
@@ -1032,16 +1040,15 @@
for (y=0; y < (ssize_t) next->rows; y++)
{
p=GetVirtualPixels(next,0,y,next->columns,1,&next->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetVirtualIndexQueue(next);
q=pixels+(next->rows-y-1)*bytes_per_line;
nibble=0;
byte=0;
for (x=0; x < (ssize_t) next->columns; x++)
{
byte<<=4;
- byte|=((size_t) GetPixelIndex(indexes+x) & 0x0f);
+ byte|=((size_t) GetPixelIndex(next,p) & 0x0f);
nibble++;
if (nibble == 2)
{
@@ -1049,7 +1056,8 @@
nibble=0;
byte=0;
}
- }
+ p+=GetPixelChannels(image);
+ }
if (nibble != 0)
*q++=(unsigned char) (byte << 4);
if (next->previous == (Image *) NULL)
@@ -1069,12 +1077,14 @@
for (y=0; y < (ssize_t) next->rows; y++)
{
p=GetVirtualPixels(next,0,y,next->columns,1,&next->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetVirtualIndexQueue(next);
q=pixels+(next->rows-y-1)*bytes_per_line;
for (x=0; x < (ssize_t) next->columns; x++)
- *q++=(unsigned char) GetPixelIndex(indexes+x);
+ {
+ *q++=(unsigned char) GetPixelIndex(next,p);
+ p+=GetPixelChannels(image);
+ }
if (next->previous == (Image *) NULL)
{
status=SetImageProgress(next,SaveImageTag,y,next->rows);
@@ -1093,19 +1103,19 @@
for (y=0; y < (ssize_t) next->rows; y++)
{
p=GetVirtualPixels(next,0,y,next->columns,1,&next->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
q=pixels+(next->rows-y-1)*bytes_per_line;
for (x=0; x < (ssize_t) next->columns; x++)
{
- *q++=ScaleQuantumToChar(GetPixelBlue(p));
- *q++=ScaleQuantumToChar(GetPixelGreen(p));
- *q++=ScaleQuantumToChar(GetPixelRed(p));
+ *q++=ScaleQuantumToChar(GetPixelBlue(next,p));
+ *q++=ScaleQuantumToChar(GetPixelGreen(next,p));
+ *q++=ScaleQuantumToChar(GetPixelRed(next,p));
if (next->matte == MagickFalse)
*q++=ScaleQuantumToChar(QuantumRange);
else
- *q++=ScaleQuantumToChar(GetPixelAlpha(p));
- p++;
+ *q++=ScaleQuantumToChar(GetPixelAlpha(next,p));
+ p+=GetPixelChannels(next);
}
if (icon_info.bits_per_pixel == 24)
for (x=3L*(ssize_t) next->columns; x < (ssize_t) bytes_per_line; x++)
@@ -1184,7 +1194,7 @@
for (y=((ssize_t) next->rows - 1); y >= 0; y--)
{
p=GetVirtualPixels(next,0,y,next->columns,1,&next->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
bit=0;
byte=0;
@@ -1192,7 +1202,7 @@
{
byte<<=1;
if ((next->matte == MagickTrue) &&
- (GetPixelOpacity(p) == (Quantum) TransparentOpacity))
+ (GetPixelAlpha(next,p) == (Quantum) TransparentAlpha))
byte|=0x01;
bit++;
if (bit == 8)
@@ -1201,7 +1211,7 @@
bit=0;
byte=0;
}
- p++;
+ p+=GetPixelChannels(next);
}
if (bit != 0)
(void) WriteBlobByte(image,(unsigned char) (byte << (8-bit)));
diff --git a/coders/info.c b/coders/info.c
index 7c2ec84..8937169 100644
--- a/coders/info.c
+++ b/coders/info.c
@@ -39,27 +39,27 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/property.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/colorspace.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/identify.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/option.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/property.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/identify.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/option.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/utility.h"
/*
Forward declarations.
diff --git a/coders/inline.c b/coders/inline.c
index 1973964..4ed5e8c 100644
--- a/coders/inline.c
+++ b/coders/inline.c
@@ -39,26 +39,26 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/client.h"
-#include "magick/display.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/option.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
-#include "magick/utility.h"
-#include "magick/xwindow.h"
-#include "magick/xwindow-private.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/client.h"
+#include "MagickCore/display.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/option.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/utility.h"
+#include "MagickCore/xwindow.h"
+#include "MagickCore/xwindow-private.h"
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/coders/ipl.c b/coders/ipl.c
index 73cc42a..2c777cb 100644
--- a/coders/ipl.c
+++ b/coders/ipl.c
@@ -41,26 +41,26 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/colorspace.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/option.h"
-#include "magick/property.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/option.h"
+#include "MagickCore/property.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
/*
Tyedef declarations
@@ -178,7 +178,7 @@
Image *image;
MagickBooleanType status;
- register PixelPacket *q;
+ register Quantum *q;
unsigned char magick[12], *pixels;
ssize_t count;
ssize_t y;
@@ -340,7 +340,7 @@
for(y = 0; y < (ssize_t) image->rows; y++){
(void) ReadBlob(image, length*image->depth/8, pixels);
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
(void) ImportQuantumPixels(image,(CacheView *) NULL,quantum_info,
GrayQuantum,pixels,exception);
@@ -352,7 +352,7 @@
for(y = 0; y < (ssize_t) image->rows; y++){
(void) ReadBlob(image, length*image->depth/8, pixels);
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
(void) ImportQuantumPixels(image,(CacheView *) NULL,quantum_info,
RedQuantum,pixels,exception);
@@ -362,7 +362,7 @@
for(y = 0; y < (ssize_t) image->rows; y++){
(void) ReadBlob(image, length*image->depth/8, pixels);
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
(void) ImportQuantumPixels(image,(CacheView *) NULL,quantum_info,
GreenQuantum,pixels,exception);
@@ -372,7 +372,7 @@
for(y = 0; y < (ssize_t) image->rows; y++){
(void) ReadBlob(image, length*image->depth/8, pixels);
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
(void) ImportQuantumPixels(image,(CacheView *) NULL,quantum_info,
BlueQuantum,pixels,exception);
@@ -508,7 +508,7 @@
MagickOffsetType
scene;
- register const PixelPacket
+ register const Quantum
*p;
QuantumInfo
@@ -621,10 +621,10 @@
if(ipl_info.colors == 1){
/* Red frame */
for(y = 0; y < (ssize_t) ipl_info.height; y++){
- p=GetAuthenticPixels(image,0,y,image->columns,1,exception);
- if (p == (PixelPacket *) NULL)
+ p=GetVirtualPixels(image,0,y,image->columns,1,exception);
+ if (p == (const Quantum *) NULL)
break;
- (void) ExportQuantumPixels(image,(const CacheView *) NULL, quantum_info,
+ (void) ExportQuantumPixels(image,(CacheView *) NULL, quantum_info,
GrayQuantum, pixels,&image->exception);
(void) WriteBlob(image, image->columns*image->depth/8, pixels);
}
@@ -633,10 +633,10 @@
if(ipl_info.colors == 3){
/* Red frame */
for(y = 0; y < (ssize_t) ipl_info.height; y++){
- p=GetAuthenticPixels(image,0,y,image->columns,1,exception);
- if (p == (PixelPacket *) NULL)
+ p=GetVirtualPixels(image,0,y,image->columns,1,exception);
+ if (p == (const Quantum *) NULL)
break;
- (void) ExportQuantumPixels(image,(const CacheView *) NULL, quantum_info,
+ (void) ExportQuantumPixels(image,(CacheView *) NULL, quantum_info,
RedQuantum, pixels,&image->exception);
(void) WriteBlob(image, image->columns*image->depth/8, pixels);
}
@@ -644,18 +644,18 @@
/* Green frame */
for(y = 0; y < (ssize_t) ipl_info.height; y++){
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- (void) ExportQuantumPixels(image,(const CacheView *) NULL, quantum_info,
+ (void) ExportQuantumPixels(image,(CacheView *) NULL, quantum_info,
GreenQuantum, pixels,&image->exception);
(void) WriteBlob(image, image->columns*image->depth/8, pixels);
}
/* Blue frame */
for(y = 0; y < (ssize_t) ipl_info.height; y++){
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- (void) ExportQuantumPixels(image,(const CacheView *) NULL, quantum_info,
+ (void) ExportQuantumPixels(image,(CacheView *) NULL, quantum_info,
BlueQuantum, pixels,&image->exception);
(void) WriteBlob(image, image->columns*image->depth/8, pixels);
if (image->previous == (Image *) NULL)
diff --git a/coders/jbig.c b/coders/jbig.c
index 3610b08..c739679 100644
--- a/coders/jbig.c
+++ b/coders/jbig.c
@@ -39,29 +39,30 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/color-private.h"
-#include "magick/colormap.h"
-#include "magick/colorspace.h"
-#include "magick/constitute.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/geometry.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/nt-feature.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colormap.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/nt-feature.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
#if defined(MAGICKCORE_JBIG_DELEGATE)
#include "jbig.h"
#endif
@@ -108,26 +109,22 @@
Image
*image;
- IndexPacket
- index;
-
MagickStatusType
status;
- register IndexPacket
- *indexes;
+ Quantum
+ index;
register ssize_t
x;
- register PixelPacket
+ register Quantum
*q;
register unsigned char
*p;
ssize_t
- count,
length,
y;
@@ -181,7 +178,6 @@
if (length == 0)
break;
p=buffer;
- count=0;
while ((length > 0) && ((status == JBG_EAGAIN) || (status == JBG_EOK)))
{
size_t
@@ -223,9 +219,8 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
bit=0;
byte=0;
for (x=0; x < (ssize_t) image->columns; x++)
@@ -237,9 +232,9 @@
byte<<=1;
if (bit == 8)
bit=0;
- SetPixelIndex(indexes+x,index);
- SetPixelRGBO(q,image->colormap+(ssize_t) index);
- q++;
+ SetPixelIndex(image,index,q);
+ SetPixelPacket(image,image->colormap+(ssize_t) index,q);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -403,10 +398,7 @@
MagickOffsetType
scene;
- register const IndexPacket
- *indexes;
-
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
@@ -463,15 +455,14 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetVirtualIndexQueue(image);
bit=0;
byte=0;
for (x=0; x < (ssize_t) image->columns; x++)
{
byte<<=1;
- if (PixelIntensity(p) < (QuantumRange/2.0))
+ if (GetPixelIntensity(image,p) < (QuantumRange/2.0))
byte|=0x01;
bit++;
if (bit == 8)
@@ -480,7 +471,7 @@
bit=0;
byte=0;
}
- p++;
+ p+=GetPixelChannels(image);
}
if (bit != 0)
*q++=byte << (8-bit);
@@ -506,12 +497,8 @@
x_resolution,
y_resolution;
- ssize_t
- sans_offset;
-
x_resolution=640;
y_resolution=480;
- sans_offset=0;
if (image_info->density != (char *) NULL)
{
GeometryInfo
diff --git a/coders/jp2.c b/coders/jp2.c
index 9c535df..c22d97e 100644
--- a/coders/jp2.c
+++ b/coders/jp2.c
@@ -39,30 +39,31 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/attribute.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/colorspace.h"
-#include "magick/color.h"
-#include "magick/color-private.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/option.h"
-#include "magick/profile.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/statistic.h"
-#include "magick/string_.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/attribute.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/color.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/option.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/profile.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/statistic.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
#if defined(MAGICKCORE_JP2_DELEGATE)
#ifndef JAS_IMAGE_CM_GRAY
#define JAS_IMAGE_CM_GRAY JAS_IMAGE_CS_GRAY
@@ -358,7 +359,7 @@
i,
x;
- register PixelPacket
+ register Quantum
*q;
size_t
@@ -520,7 +521,7 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
for (i=0; i < (ssize_t) number_components; i++)
(void) jas_image_readcmpt(jp2_image,(short) components[i],0,
@@ -536,11 +537,10 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
pixel=(QuantumAny) jas_matrix_getv(pixels[0],x/x_step[0]);
- SetPixelRed(q,ScaleAnyToQuantum((QuantumAny) pixel,
- range[0]));
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- q++;
+ SetPixelRed(image,ScaleAnyToQuantum((QuantumAny) pixel,range[0]),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ q+=GetPixelChannels(image);
}
break;
}
@@ -552,15 +552,12 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
pixel=(QuantumAny) jas_matrix_getv(pixels[0],x/x_step[0]);
- SetPixelRed(q,ScaleAnyToQuantum((QuantumAny) pixel,
- range[0]));
+ SetPixelRed(image,ScaleAnyToQuantum((QuantumAny) pixel,range[0]),q);
pixel=(QuantumAny) jas_matrix_getv(pixels[1],x/x_step[1]);
- SetPixelGreen(q,ScaleAnyToQuantum((QuantumAny) pixel,
- range[1]));
+ SetPixelGreen(image,ScaleAnyToQuantum((QuantumAny) pixel,range[1]),q);
pixel=(QuantumAny) jas_matrix_getv(pixels[2],x/x_step[2]);
- SetPixelBlue(q,ScaleAnyToQuantum((QuantumAny) pixel,
- range[2]));
- q++;
+ SetPixelBlue(image,ScaleAnyToQuantum((QuantumAny) pixel,range[2]),q);
+ q+=GetPixelChannels(image);
}
break;
}
@@ -572,18 +569,14 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
pixel=(QuantumAny) jas_matrix_getv(pixels[0],x/x_step[0]);
- SetPixelRed(q,ScaleAnyToQuantum((QuantumAny) pixel,
- range[0]));
+ SetPixelRed(image,ScaleAnyToQuantum((QuantumAny) pixel,range[0]),q);
pixel=(QuantumAny) jas_matrix_getv(pixels[1],x/x_step[1]);
- SetPixelGreen(q,ScaleAnyToQuantum((QuantumAny) pixel,
- range[1]));
+ SetPixelGreen(image,ScaleAnyToQuantum((QuantumAny) pixel,range[1]),q);
pixel=(QuantumAny) jas_matrix_getv(pixels[2],x/x_step[2]);
- SetPixelBlue(q,ScaleAnyToQuantum((QuantumAny) pixel,
- range[2]));
+ SetPixelBlue(image,ScaleAnyToQuantum((QuantumAny) pixel,range[2]),q);
pixel=(QuantumAny) jas_matrix_getv(pixels[3],x/x_step[3]);
- SetPixelAlpha(q,ScaleAnyToQuantum((QuantumAny) pixel,
- range[3]));
- q++;
+ SetPixelAlpha(image,ScaleAnyToQuantum((QuantumAny) pixel,range[3]),q);
+ q+=GetPixelChannels(image);
}
break;
}
@@ -827,7 +820,7 @@
QuantumAny
range;
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
@@ -863,7 +856,7 @@
ThrowWriterException(DelegateError,"UnableToManageJP2Stream");
number_components=image->matte ? 4UL : 3UL;
if ((image_info->type != TrueColorType) &&
- (IsGrayImage(image,&image->exception) != MagickFalse))
+ (IsImageGray(image,&image->exception) != MagickFalse))
number_components=1;
if ((image->columns != (unsigned int) image->columns) ||
(image->rows != (unsigned int) image->rows))
@@ -926,26 +919,26 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
if (number_components == 1)
jas_matrix_setv(pixels[0],x,(jas_seqent_t) ScaleQuantumToAny(
- PixelIntensityToQuantum(p),range));
+ GetPixelIntensity(image,p),range));
else
{
- jas_matrix_setv(pixels[0],x,(jas_seqent_t)
- ScaleQuantumToAny(GetPixelRed(p),range));
- jas_matrix_setv(pixels[1],x,(jas_seqent_t)
- ScaleQuantumToAny(GetPixelGreen(p),range));
- jas_matrix_setv(pixels[2],x,(jas_seqent_t)
- ScaleQuantumToAny(GetPixelBlue(p),range));
+ jas_matrix_setv(pixels[0],x,(jas_seqent_t) ScaleQuantumToAny(
+ GetPixelRed(image,p),range));
+ jas_matrix_setv(pixels[1],x,(jas_seqent_t) ScaleQuantumToAny(
+ GetPixelGreen(image,p),range));
+ jas_matrix_setv(pixels[2],x,(jas_seqent_t) ScaleQuantumToAny(
+ GetPixelBlue(image,p),range));
if (number_components > 3)
- jas_matrix_setv(pixels[3],x,(jas_seqent_t)
- ScaleQuantumToAny((Quantum) (GetPixelAlpha(p)),range));
+ jas_matrix_setv(pixels[3],x,(jas_seqent_t) ScaleQuantumToAny(
+ GetPixelAlpha(image,p),range));
}
- p++;
+ p+=GetPixelChannels(image);
}
for (i=0; i < (ssize_t) number_components; i++)
(void) jas_image_writecmpt(jp2_image,(short) i,0,(unsigned int) y,
diff --git a/coders/jpeg.c b/coders/jpeg.c
index 34a318b..e059453 100644
--- a/coders/jpeg.c
+++ b/coders/jpeg.c
@@ -43,38 +43,40 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/color.h"
-#include "magick/colormap-private.h"
-#include "magick/color-private.h"
-#include "magick/colormap.h"
-#include "magick/colorspace.h"
-#include "magick/constitute.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/geometry.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/log.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/module.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/option.h"
-#include "magick/profile.h"
-#include "magick/property.h"
-#include "magick/quantum-private.h"
-#include "magick/resource_.h"
-#include "magick/splay-tree.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/string-private.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/attribute.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/color.h"
+#include "MagickCore/colormap-private.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colormap.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/log.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/option.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/profile.h"
+#include "MagickCore/property.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/splay-tree.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/string-private.h"
+#include "MagickCore/utility.h"
#include <setjmp.h>
#if defined(MAGICKCORE_JPEG_DELEGATE)
#define JPEG_INTERNAL_OPTIONS
@@ -905,9 +907,6 @@
Image
*image;
- IndexPacket
- index;
-
JSAMPLE
*jpeg_pixels;
@@ -921,6 +920,9 @@
MagickSizeType
number_pixels;
+ Quantum
+ index;
+
register ssize_t
i;
@@ -1198,7 +1200,7 @@
image->colormap[i].red=ScaleCharToQuantum(jpeg_info.colormap[0][i]);
image->colormap[i].green=image->colormap[i].red;
image->colormap[i].blue=image->colormap[i].red;
- image->colormap[i].opacity=OpaqueOpacity;
+ image->colormap[i].alpha=OpaqueAlpha;
}
else
for (i=0; i < (ssize_t) image->colors; i++)
@@ -1206,19 +1208,16 @@
image->colormap[i].red=ScaleCharToQuantum(jpeg_info.colormap[0][i]);
image->colormap[i].green=ScaleCharToQuantum(jpeg_info.colormap[1][i]);
image->colormap[i].blue=ScaleCharToQuantum(jpeg_info.colormap[2][i]);
- image->colormap[i].opacity=OpaqueOpacity;
+ image->colormap[i].alpha=OpaqueAlpha;
}
}
scanline[0]=(JSAMPROW) jpeg_pixels;
for (y=0; y < (ssize_t) image->rows; y++)
{
- register IndexPacket
- *restrict indexes;
-
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
if (jpeg_read_scanlines(&jpeg_info,scanline,1) != 1)
@@ -1229,9 +1228,8 @@
}
p=jpeg_pixels;
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
if (jpeg_info.data_precision > 8)
{
if (jpeg_info.output_components == 1)
@@ -1245,37 +1243,37 @@
else
pixel=(size_t) ((GETJSAMPLE(*p) ^ 0x80) << 4);
index=ConstrainColormapIndex(image,pixel);
- SetPixelIndex(indexes+x,index);
- SetPixelRGBO(q,image->colormap+(ssize_t) index);
+ SetPixelIndex(image,index,q);
+ SetPixelPacket(image,image->colormap+(ssize_t) index,q);
p++;
- q++;
+ q+=GetPixelChannels(image);
}
else
if (image->colorspace != CMYKColorspace)
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelRed(q,ScaleShortToQuantum((unsigned char)
- (GETJSAMPLE(*p++) << 4)));
- SetPixelGreen(q,ScaleShortToQuantum((unsigned char)
- (GETJSAMPLE(*p++) << 4)));
- SetPixelBlue(q,ScaleShortToQuantum((unsigned char)
- (GETJSAMPLE(*p++) << 4)));
- SetPixelOpacity(q,OpaqueOpacity);
- q++;
+ SetPixelRed(image,ScaleShortToQuantum((unsigned char)
+ (GETJSAMPLE(*p++) << 4)),q);
+ SetPixelGreen(image,ScaleShortToQuantum((unsigned char)
+ (GETJSAMPLE(*p++) << 4)),q);
+ SetPixelBlue(image,ScaleShortToQuantum((unsigned char)
+ (GETJSAMPLE(*p++) << 4)),q);
+ SetPixelAlpha(image,OpaqueAlpha,q);
+ q+=GetPixelChannels(image);
}
else
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelCyan(q,QuantumRange-ScaleShortToQuantum(
- (unsigned char) (GETJSAMPLE(*p++) << 4)));
- SetPixelMagenta(q,QuantumRange-ScaleShortToQuantum(
- (unsigned char) (GETJSAMPLE(*p++) << 4)));
- SetPixelYellow(q,QuantumRange-ScaleShortToQuantum(
- (unsigned char) (GETJSAMPLE(*p++) << 4)));
- SetPixelBlack(indexes+x,QuantumRange-ScaleShortToQuantum(
- (unsigned char) (GETJSAMPLE(*p++) << 4)));
- SetPixelOpacity(q,OpaqueOpacity);
- q++;
+ SetPixelCyan(image,QuantumRange-ScaleShortToQuantum(
+ (unsigned char) (GETJSAMPLE(*p++) << 4)),q);
+ SetPixelMagenta(image,QuantumRange-ScaleShortToQuantum(
+ (unsigned char) (GETJSAMPLE(*p++) << 4)),q);
+ SetPixelYellow(image,QuantumRange-ScaleShortToQuantum(
+ (unsigned char) (GETJSAMPLE(*p++) << 4)),q);
+ SetPixelBlack(image,QuantumRange-ScaleShortToQuantum(
+ (unsigned char) (GETJSAMPLE(*p++) << 4)),q);
+ SetPixelAlpha(image,OpaqueAlpha,q);
+ q+=GetPixelChannels(image);
}
}
else
@@ -1283,37 +1281,37 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
index=ConstrainColormapIndex(image,(size_t) GETJSAMPLE(*p));
- SetPixelIndex(indexes+x,index);
- SetPixelRGBO(q,image->colormap+(ssize_t) index);
+ SetPixelIndex(image,index,q);
+ SetPixelPacket(image,image->colormap+(ssize_t) index,q);
p++;
- q++;
+ q+=GetPixelChannels(image);
}
else
if (image->colorspace != CMYKColorspace)
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelRed(q,ScaleCharToQuantum((unsigned char)
- GETJSAMPLE(*p++)));
- SetPixelGreen(q,ScaleCharToQuantum((unsigned char)
- GETJSAMPLE(*p++)));
- SetPixelBlue(q,ScaleCharToQuantum((unsigned char)
- GETJSAMPLE(*p++)));
- SetPixelOpacity(q,OpaqueOpacity);
- q++;
+ SetPixelRed(image,ScaleCharToQuantum((unsigned char)
+ GETJSAMPLE(*p++)),q);
+ SetPixelGreen(image,ScaleCharToQuantum((unsigned char)
+ GETJSAMPLE(*p++)),q);
+ SetPixelBlue(image,ScaleCharToQuantum((unsigned char)
+ GETJSAMPLE(*p++)),q);
+ SetPixelAlpha(image,OpaqueAlpha,q);
+ q+=GetPixelChannels(image);
}
else
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelCyan(q,QuantumRange-ScaleCharToQuantum(
- (unsigned char) GETJSAMPLE(*p++)));
- SetPixelMagenta(q,QuantumRange-ScaleCharToQuantum(
- (unsigned char) GETJSAMPLE(*p++)));
- SetPixelYellow(q,QuantumRange-ScaleCharToQuantum(
- (unsigned char) GETJSAMPLE(*p++)));
- SetPixelBlack(indexes+x,QuantumRange-ScaleCharToQuantum(
- (unsigned char) GETJSAMPLE(*p++)));
- SetPixelOpacity(q,OpaqueOpacity);
- q++;
+ SetPixelCyan(image,QuantumRange-ScaleCharToQuantum(
+ (unsigned char) GETJSAMPLE(*p++)),q);
+ SetPixelMagenta(image,QuantumRange-ScaleCharToQuantum(
+ (unsigned char) GETJSAMPLE(*p++)),q);
+ SetPixelYellow(image,QuantumRange-ScaleCharToQuantum(
+ (unsigned char) GETJSAMPLE(*p++)),q);
+ SetPixelBlack(image,QuantumRange-ScaleCharToQuantum(
+ (unsigned char) GETJSAMPLE(*p++)),q);
+ SetPixelAlpha(image,OpaqueAlpha,q);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -1814,7 +1812,7 @@
}
}
if ((image_info->type != TrueColorType) &&
- (IsGrayImage(image,&image->exception) != MagickFalse))
+ (IsImageGray(image,&image->exception) != MagickFalse))
{
jpeg_info.input_components=1;
jpeg_info.in_color_space=JCS_GRAYSCALE;
@@ -2213,22 +2211,22 @@
(jpeg_info.in_color_space == JCS_YCbCr))
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
x;
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
q=jpeg_pixels;
for (x=0; x < (ssize_t) image->columns; x++)
{
- *q++=(JSAMPLE) ScaleQuantumToChar(GetPixelRed(p));
- *q++=(JSAMPLE) ScaleQuantumToChar(GetPixelGreen(p));
- *q++=(JSAMPLE) ScaleQuantumToChar(GetPixelBlue(p));
- p++;
+ *q++=(JSAMPLE) ScaleQuantumToChar(GetPixelRed(image,p));
+ *q++=(JSAMPLE) ScaleQuantumToChar(GetPixelGreen(image,p));
+ *q++=(JSAMPLE) ScaleQuantumToChar(GetPixelBlue(image,p));
+ p+=GetPixelChannels(image);
}
(void) jpeg_write_scanlines(&jpeg_info,scanline,1);
status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
@@ -2240,20 +2238,20 @@
if (jpeg_info.in_color_space == JCS_GRAYSCALE)
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
x;
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
q=jpeg_pixels;
for (x=0; x < (ssize_t) image->columns; x++)
{
- *q++=(JSAMPLE) ScaleQuantumToChar(PixelIntensityToQuantum(p));
- p++;
+ *q++=(JSAMPLE) ScaleQuantumToChar(GetPixelIntensity(image,p));
+ p+=GetPixelChannels(image);
}
(void) jpeg_write_scanlines(&jpeg_info,scanline,1);
status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
@@ -2264,34 +2262,30 @@
else
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const IndexPacket
- *indexes;
-
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
x;
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
q=jpeg_pixels;
- indexes=GetVirtualIndexQueue(image);
for (x=0; x < (ssize_t) image->columns; x++)
{
/*
Convert DirectClass packets to contiguous CMYK scanlines.
*/
*q++=(JSAMPLE) (ScaleQuantumToChar((Quantum) (QuantumRange-
- GetPixelRed(p))));
+ GetPixelRed(image,p))));
*q++=(JSAMPLE) (ScaleQuantumToChar((Quantum) (QuantumRange-
- GetPixelGreen(p))));
+ GetPixelGreen(image,p))));
*q++=(JSAMPLE) (ScaleQuantumToChar((Quantum) (QuantumRange-
- GetPixelBlue(p))));
+ GetPixelBlue(image,p))));
*q++=(JSAMPLE) (ScaleQuantumToChar((Quantum) (QuantumRange-
- GetPixelIndex(indexes+x))));
- p++;
+ GetPixelBlack(image,p))));
+ p+=GetPixelChannels(image);
}
(void) jpeg_write_scanlines(&jpeg_info,scanline,1);
status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
@@ -2304,21 +2298,21 @@
if (jpeg_info.in_color_space == JCS_GRAYSCALE)
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
x;
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
q=jpeg_pixels;
for (x=0; x < (ssize_t) image->columns; x++)
{
- *q++=(JSAMPLE) (ScaleQuantumToShort(PixelIntensityToQuantum(p)) >>
+ *q++=(JSAMPLE) (ScaleQuantumToShort(GetPixelIntensity(image,p)) >>
4);
- p++;
+ p+=GetPixelChannels(image);
}
(void) jpeg_write_scanlines(&jpeg_info,scanline,1);
status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
@@ -2331,25 +2325,22 @@
(jpeg_info.in_color_space == JCS_YCbCr))
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
x;
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
q=jpeg_pixels;
for (x=0; x < (ssize_t) image->columns; x++)
{
- *q++=(JSAMPLE) (ScaleQuantumToShort(GetPixelRed(p)) >>
- 4);
- *q++=(JSAMPLE) (ScaleQuantumToShort(GetPixelGreen(p)) >>
- 4);
- *q++=(JSAMPLE) (ScaleQuantumToShort(GetPixelBlue(p)) >>
- 4);
- p++;
+ *q++=(JSAMPLE) (ScaleQuantumToShort(GetPixelRed(image,p)) >> 4);
+ *q++=(JSAMPLE) (ScaleQuantumToShort(GetPixelGreen(image,p)) >> 4);
+ *q++=(JSAMPLE) (ScaleQuantumToShort(GetPixelBlue(image,p)) >> 4);
+ p+=GetPixelChannels(image);
}
(void) jpeg_write_scanlines(&jpeg_info,scanline,1);
status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
@@ -2360,34 +2351,30 @@
else
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const IndexPacket
- *indexes;
-
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
x;
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
q=jpeg_pixels;
- indexes=GetVirtualIndexQueue(image);
for (x=0; x < (ssize_t) image->columns; x++)
{
/*
Convert DirectClass packets to contiguous CMYK scanlines.
*/
*q++=(JSAMPLE) (4095-(ScaleQuantumToShort(
- GetPixelRed(p)) >> 4));
+ GetPixelRed(image,p)) >> 4));
*q++=(JSAMPLE) (4095-(ScaleQuantumToShort(
- GetPixelGreen(p)) >> 4));
+ GetPixelGreen(image,p)) >> 4));
*q++=(JSAMPLE) (4095-(ScaleQuantumToShort(
- GetPixelBlue(p)) >> 4));
+ GetPixelBlue(image,p)) >> 4));
*q++=(JSAMPLE) (4095-(ScaleQuantumToShort(
- GetPixelIndex(indexes+x)) >> 4));
- p++;
+ GetPixelBlack(image,p)) >> 4));
+ p+=GetPixelChannels(image);
}
(void) jpeg_write_scanlines(&jpeg_info,scanline,1);
status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
diff --git a/coders/label.c b/coders/label.c
index fed0dda..b557aea 100644
--- a/coders/label.c
+++ b/coders/label.c
@@ -39,24 +39,24 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/annotate.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/draw.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/property.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/annotate.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/draw.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/property.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/utility.h"
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/coders/mac.c b/coders/mac.c
index 5d7761f..9d92162 100644
--- a/coders/mac.c
+++ b/coders/mac.c
@@ -40,25 +40,26 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/colormap.h"
-#include "magick/colorspace.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/colormap.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -94,10 +95,7 @@
MagickBooleanType
status;
- register IndexPacket
- *indexes;
-
- register PixelPacket
+ register Quantum
*q;
register ssize_t
@@ -181,9 +179,8 @@
if (offset >= (ssize_t) length)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
p=pixels;
bit=0;
byte=0;
@@ -191,12 +188,12 @@
{
if (bit == 0)
byte=(*p++);
- SetPixelIndex(indexes+x,((byte & 0x80) != 0 ?
- 0x01 : 0x00));
+ SetPixelIndex(image,((byte & 0x80) != 0 ? 0x01 : 0x00),q);
bit++;
byte<<=1;
if (bit == 8)
bit=0;
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -217,9 +214,8 @@
if (offset >= (ssize_t) length)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
p=pixels;
bit=0;
byte=0;
@@ -227,12 +223,12 @@
{
if (bit == 0)
byte=(*p++);
- SetPixelIndex(indexes+x,((byte & 0x80) != 0 ?
- 0x01 : 0x00));
+ SetPixelIndex(image,((byte & 0x80) != 0 ? 0x01 : 0x00),q);
bit++;
byte<<=1;
if (bit == 8)
bit=0;
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
diff --git a/coders/magick.c b/coders/magick.c
index 14deb37..9a74e8c 100644
--- a/coders/magick.c
+++ b/coders/magick.c
@@ -39,20 +39,20 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
/*
Predefined ImageMagick images.
diff --git a/coders/map.c b/coders/map.c
index 11ef7a9..3d226d5 100644
--- a/coders/map.c
+++ b/coders/map.c
@@ -39,29 +39,30 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/attribute.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/color.h"
-#include "magick/color-private.h"
-#include "magick/colormap.h"
-#include "magick/colormap-private.h"
-#include "magick/colorspace.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/histogram.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/statistic.h"
-#include "magick/string_.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/attribute.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/color.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colormap.h"
+#include "MagickCore/colormap-private.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/histogram.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/statistic.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
/*
Forward declarations.
@@ -100,19 +101,16 @@
Image
*image;
- IndexPacket
- index;
-
MagickBooleanType
status;
- register IndexPacket
- *indexes;
+ Quantum
+ index;
register ssize_t
x;
- register PixelPacket
+ register Quantum
*q;
register ssize_t
@@ -212,9 +210,8 @@
{
p=pixels;
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
count=ReadBlob(image,(size_t) packet_size*image->columns,pixels);
if (count != (ssize_t) (packet_size*image->columns))
break;
@@ -227,8 +224,9 @@
index=ConstrainColormapIndex(image,((size_t) index << 8)+(*p));
p++;
}
- SetPixelIndex(indexes+x,index);
- SetPixelRGBO(q,image->colormap+(ssize_t) index);
+ SetPixelIndex(image,index,q);
+ SetPixelPacket(image,image->colormap+(ssize_t) index,q);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -337,10 +335,7 @@
MagickBooleanType
status;
- register const IndexPacket
- *indexes;
-
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
@@ -419,15 +414,15 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetVirtualIndexQueue(image);
q=pixels;
for (x=0; x < (ssize_t) image->columns; x++)
{
if (image->colors > 256)
- *q++=(unsigned char) ((size_t) GetPixelIndex(indexes+x) >> 8);
- *q++=(unsigned char) GetPixelIndex(indexes+x);
+ *q++=(unsigned char) ((size_t) GetPixelIndex(image,p) >> 8);
+ *q++=(unsigned char) GetPixelIndex(image,p);
+ p+=GetPixelChannels(image);
}
(void) WriteBlob(image,(size_t) (q-pixels),pixels);
}
diff --git a/coders/mat.c b/coders/mat.c
index c9c3217..b6aa1ef 100644
--- a/coders/mat.c
+++ b/coders/mat.c
@@ -47,30 +47,32 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/color-private.h"
-#include "magick/colormap.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/quantum-private.h"
-#include "magick/option.h"
-#include "magick/pixel.h"
-#include "magick/resource_.h"
-#include "magick/shear.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
-#include "magick/transform.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/attribute.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colormap.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/option.h"
+#include "MagickCore/pixel.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/shear.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/transform.h"
#if defined(MAGICKCORE_ZLIB_DELEGATE)
#include "zlib.h"
#endif
@@ -182,7 +184,7 @@
double f;
int x;
- register PixelPacket *q;
+ register Quantum *q;
if (MinVal == 0)
MinVal = -1;
@@ -191,48 +193,48 @@
exception=(&image->exception);
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
return;
for (x = 0; x < (ssize_t) image->columns; x++)
{
if (*p > 0)
{
- f = (*p / MaxVal) * (QuantumRange - GetPixelRed(q));
- if (f + GetPixelRed(q) > QuantumRange)
- SetPixelRed(q,QuantumRange);
+ f = (*p / MaxVal) * (QuantumRange-GetPixelRed(image,q));
+ if (f + GetPixelRed(image,q) > QuantumRange)
+ SetPixelRed(image,QuantumRange,q);
else
- SetPixelRed(q,GetPixelRed(q)+(int) f);
- if ((int) f / 2.0 > GetPixelGreen(q))
+ SetPixelRed(image,GetPixelRed(image,q)+(int) f,q);
+ if ((int) f / 2.0 > GetPixelGreen(image,q))
{
- SetPixelGreen(q,0);
- SetPixelBlue(q,0);
+ SetPixelGreen(image,0,q);
+ SetPixelBlue(image,0,q);
}
else
{
- SetPixelBlue(q,GetPixelBlue(q)-(int) (f/2.0));
- SetPixelGreen(q,GetPixelBlue(q));
+ SetPixelBlue(image,GetPixelBlue(image,q)-(int) (f/2.0),q);
+ SetPixelGreen(image,GetPixelBlue(image,q),q);
}
}
if (*p < 0)
{
- f = (*p / MaxVal) * (QuantumRange - GetPixelBlue(q));
- if (f + GetPixelBlue(q) > QuantumRange)
- SetPixelBlue(q,QuantumRange);
+ f = (*p / MaxVal) * (QuantumRange-GetPixelBlue(image,q));
+ if (f+GetPixelBlue(image,q) > QuantumRange)
+ SetPixelBlue(image,QuantumRange,q);
else
- SetPixelBlue(q,GetPixelBlue(q)+(int) f);
- if ((int) f / 2.0 > q->green)
+ SetPixelBlue(image,GetPixelBlue(image,q)+(int) f,q);
+ if ((int) f / 2.0 > GetPixelGreen(image,q))
{
- SetPixelRed(q,0);
- SetPixelGreen(q,0);
+ SetPixelRed(image,0,q);
+ SetPixelGreen(image,0,q);
}
else
{
- SetPixelRed(q,GetPixelRed(q)-(int) (f/2.0));
- SetPixelGreen(q,GetPixelRed(q));
+ SetPixelRed(image,GetPixelRed(image,q)-(int) (f/2.0),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
}
}
p++;
- q++;
+ q+=GetPixelChannels(image);
}
if (!SyncAuthenticPixels(image,exception))
return;
@@ -248,7 +250,7 @@
double f;
int x;
- register PixelPacket *q;
+ register Quantum *q;
if (MinVal == 0)
MinVal = -1;
@@ -257,44 +259,45 @@
exception=(&image->exception);
q = QueueAuthenticPixels(image, 0, y, image->columns, 1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
return;
for (x = 0; x < (ssize_t) image->columns; x++)
{
if (*p > 0)
{
- f = (*p / MaxVal) * (QuantumRange - GetPixelRed(q));
- if (f + GetPixelRed(q) > QuantumRange)
- SetPixelRed(q,QuantumRange);
+ f = (*p / MaxVal) * (QuantumRange-GetPixelRed(image,q));
+ if (f+GetPixelRed(image,q) > QuantumRange)
+ SetPixelRed(image,QuantumRange,q);
else
- SetPixelRed(q,GetPixelRed(q)+(int) f);
- if ((int) f / 2.0 > GetPixelGreen(q))
+ SetPixelRed(image,GetPixelRed(image,q)+(int) f,q);
+ if ((int) f / 2.0 > GetPixelGreen(image,q))
{
- SetPixelGreen(q,0);
- SetPixelBlue(q,0);
+ SetPixelGreen(image,0,q);
+ SetPixelBlue(image,0,q);
}
else
{
- SetPixelBlue(q,GetPixelBlue(q)-(int) (f/2.0));
- SetPixelGreen(q,GetPixelBlue(q));
+ SetPixelBlue(image,GetPixelBlue(image,q)-(int) (f/2.0),q);
+ SetPixelGreen(image,GetPixelBlue(image,q),q);
}
}
if (*p < 0)
{
- f = (*p / MaxVal) * (QuantumRange - GetPixelBlue(q));
- if (f + GetPixelBlue(q) > QuantumRange)
- SetPixelBlue(q,QuantumRange);
+ f = (*p / MaxVal) * (QuantumRange - GetPixelBlue(image,q));
+ if (f + GetPixelBlue(image,q) > QuantumRange)
+ SetPixelBlue(image,QuantumRange,q);
else
- SetPixelBlue(q,GetPixelBlue(q)+(int) f);
- if ((int) f / 2.0 > q->green)
+ SetPixelBlue(image,GetPixelBlue(image,q)+
+ (int) f,q);
+ if ((int) f / 2.0 > GetPixelGreen(image,q))
{
- SetPixelGreen(q,0);
- SetPixelRed(q,0);
+ SetPixelGreen(image,0,q);
+ SetPixelRed(image,0,q);
}
else
{
- SetPixelRed(q,GetPixelRed(q)-(int) (f/2.0));
- SetPixelGreen(q,GetPixelRed(q));
+ SetPixelRed(image,GetPixelRed(image,q)-(int) (f/2.0),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
}
}
p++;
@@ -417,16 +420,16 @@
}
-static void FixSignedValues(PixelPacket *q, int y)
+static void FixSignedValues(const Image *image,Quantum *q, int y)
{
while(y-->0)
{
/* Please note that negative values will overflow
Q=8; QuantumRange=255: <0;127> + 127+1 = <128; 255>
<-1;-128> + 127+1 = <0; 127> */
- SetPixelRed(q,GetPixelRed(q)+QuantumRange/2+1);
- SetPixelGreen(q,GetPixelGreen(q)+QuantumRange/2+1);
- SetPixelBlue(q,GetPixelBlue(q)+QuantumRange/2+1);
+ SetPixelRed(image,GetPixelRed(image,q)+QuantumRange/2+1,q);
+ SetPixelGreen(image,GetPixelGreen(image,q)+QuantumRange/2+1,q);
+ SetPixelBlue(image,GetPixelBlue(image,q)+QuantumRange/2+1,q);
q++;
}
}
@@ -604,7 +607,7 @@
{
Image *image, *image2=NULL,
*rotated_image;
- PixelPacket *q;
+ register Quantum *q;
unsigned int status;
MATHeader MATLAB_HDR;
@@ -885,7 +888,7 @@
for (i = 0; i < (ssize_t) MATLAB_HDR.SizeY; i++)
{
q=QueueAuthenticPixels(image,0,MATLAB_HDR.SizeY-i-1,image->columns,1,exception);
- if (q == (PixelPacket *)NULL)
+ if (q == (const Quantum *)NULL)
{
if (logging) (void)LogMagickEvent(CoderEvent,GetMagickModule(),
" MAT set image pixels returns unexpected NULL on a row %u.", (unsigned)(MATLAB_HDR.SizeY-i-1));
@@ -916,7 +919,7 @@
if (z<=1 && /* fix only during a last pass z==0 || z==1 */
(CellType==miINT8 || CellType==miINT16 || CellType==miINT32 || CellType==miINT64))
- FixSignedValues(q,MATLAB_HDR.SizeX);
+ FixSignedValues(image,q,MATLAB_HDR.SizeX);
}
if (!SyncAuthenticPixels(image,exception))
@@ -1159,7 +1162,7 @@
ssize_t y;
unsigned z;
- const PixelPacket *p;
+ register const Quantum *p;
unsigned int status;
int logging;
@@ -1213,7 +1216,7 @@
if (image->colorspace != RGBColorspace)
(void) TransformImageColorspace(image,RGBColorspace);
- is_gray = IsGrayImage(image,&image->exception);
+ is_gray = IsImageGray(image,&image->exception);
z = is_gray ? 0 : 3;
/*
@@ -1257,9 +1260,9 @@
for (y=0; y < (ssize_t)image->columns; y++)
{
p=GetVirtualPixels(image,y,0,1,image->rows,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- (void) ExportQuantumPixels(image,(const CacheView *) NULL,quantum_info,
+ (void) ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
z2qtype[z],pixels,exception);
(void) WriteBlob(image,image->rows,pixels);
}
diff --git a/coders/matte.c b/coders/matte.c
index cadddcb..43da963 100644
--- a/coders/matte.c
+++ b/coders/matte.c
@@ -39,23 +39,24 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/constitute.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
/*
Forward declarations.
@@ -162,13 +163,13 @@
MagickBooleanType
status;
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
x;
- register PixelPacket
+ register Quantum
*q;
ssize_t
@@ -190,16 +191,16 @@
{
p=GetVirtualPixels(image,0,y,image->columns,1,exception);
q=QueueAuthenticPixels(matte_image,0,y,matte_image->columns,1,exception);
- if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelRed(q,GetPixelOpacity(p));
- SetPixelGreen(q,GetPixelOpacity(p));
- SetPixelBlue(q,GetPixelOpacity(p));
- SetPixelOpacity(q,OpaqueOpacity);
- p++;
- q++;
+ SetPixelRed(matte_image,GetPixelAlpha(image,p),q);
+ SetPixelGreen(matte_image,GetPixelAlpha(image,p),q);
+ SetPixelBlue(matte_image,GetPixelAlpha(image,p),q);
+ SetPixelAlpha(matte_image,OpaqueAlpha,q);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(matte_image);
}
if (SyncAuthenticPixels(matte_image,exception) == MagickFalse)
break;
diff --git a/coders/meta.c b/coders/meta.c
index b918eb0..03fbbf4 100644
--- a/coders/meta.c
+++ b/coders/meta.c
@@ -39,25 +39,25 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/module.h"
-#include "magick/profile.h"
-#include "magick/splay-tree.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/string-private.h"
-#include "magick/token.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/profile.h"
+#include "MagickCore/splay-tree.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/string-private.h"
+#include "MagickCore/token.h"
+#include "MagickCore/utility.h"
/*
Forward declarations.
diff --git a/coders/miff.c b/coders/miff.c
index 1305b92..25d28cc 100644
--- a/coders/miff.c
+++ b/coders/miff.c
@@ -39,38 +39,39 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/attribute.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/color.h"
-#include "magick/color-private.h"
-#include "magick/colormap.h"
-#include "magick/colormap-private.h"
-#include "magick/colorspace.h"
-#include "magick/constitute.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/hashmap.h"
-#include "magick/geometry.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/module.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/option.h"
-#include "magick/pixel.h"
-#include "magick/profile.h"
-#include "magick/property.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/statistic.h"
-#include "magick/string_.h"
-#include "magick/string-private.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/attribute.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/color.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colormap.h"
+#include "MagickCore/colormap-private.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/hashmap.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/option.h"
+#include "MagickCore/pixel.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/profile.h"
+#include "MagickCore/property.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/statistic.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/string-private.h"
#if defined(MAGICKCORE_BZLIB_DELEGATE)
#include "bzlib.h"
#endif
@@ -198,7 +199,7 @@
}
static void PushRunlengthPacket(Image *image,const unsigned char *pixels,
- size_t *length,PixelPacket *pixel,IndexPacket *index)
+ size_t *length,PixelInfo *pixel)
{
const unsigned char
*p;
@@ -206,25 +207,25 @@
p=pixels;
if (image->storage_class == PseudoClass)
{
- *index=(IndexPacket) 0;
+ pixel->index=0;
switch (image->depth)
{
case 32:
{
- *index=ConstrainColormapIndex(image,
+ pixel->index=ConstrainColormapIndex(image,
(*p << 24) | (*(p+1) << 16) | (*(p+2) << 8) | *(p+3));
p+=4;
break;
}
case 16:
{
- *index=ConstrainColormapIndex(image,(*p << 8) | *(p+1));
+ pixel->index=ConstrainColormapIndex(image,(*p << 8) | *(p+1));
p+=2;
break;
}
case 8:
{
- *index=ConstrainColormapIndex(image,*p);
+ pixel->index=ConstrainColormapIndex(image,*p);
p++;
break;
}
@@ -232,7 +233,6 @@
(void) ThrowMagickException(&image->exception,GetMagickModule(),
CorruptImageError,"ImageDepthNotSupported","`%s'",image->filename);
}
- *pixel=image->colormap[(ssize_t) *index];
switch (image->depth)
{
case 8:
@@ -243,7 +243,7 @@
if (image->matte != MagickFalse)
{
p=PushCharPixel(p,&quantum);
- pixel->opacity=ScaleCharToQuantum(quantum);
+ pixel->alpha=ScaleCharToQuantum(quantum);
}
break;
}
@@ -255,7 +255,7 @@
if (image->matte != MagickFalse)
{
p=PushShortPixel(MSBEndian,p,&quantum);
- pixel->opacity=(Quantum) (quantum >> (image->depth-
+ pixel->alpha=(Quantum) (quantum >> (image->depth-
MAGICKCORE_QUANTUM_DEPTH));
}
break;
@@ -268,7 +268,7 @@
if (image->matte != MagickFalse)
{
p=PushLongPixel(MSBEndian,p,&quantum);
- pixel->opacity=(Quantum) (quantum >> (image->depth-
+ pixel->alpha=(Quantum) (quantum >> (image->depth-
MAGICKCORE_QUANTUM_DEPTH));
}
break;
@@ -288,20 +288,20 @@
quantum;
p=PushCharPixel(p,&quantum);
- SetPixelRed(pixel,ScaleCharToQuantum(quantum));
+ pixel->red=ScaleCharToQuantum(quantum);
p=PushCharPixel(p,&quantum);
- SetPixelGreen(pixel,ScaleCharToQuantum(quantum));
+ pixel->green=ScaleCharToQuantum(quantum);
p=PushCharPixel(p,&quantum);
- SetPixelBlue(pixel,ScaleCharToQuantum(quantum));
- if (image->matte != MagickFalse)
- {
- p=PushCharPixel(p,&quantum);
- SetPixelOpacity(pixel,ScaleCharToQuantum(quantum));
- }
+ pixel->blue=ScaleCharToQuantum(quantum);
if (image->colorspace == CMYKColorspace)
{
p=PushCharPixel(p,&quantum);
- SetPixelBlack(index,ScaleCharToQuantum(quantum));
+ pixel->black=ScaleCharToQuantum(quantum);
+ }
+ if (image->matte != MagickFalse)
+ {
+ p=PushCharPixel(p,&quantum);
+ pixel->alpha=ScaleCharToQuantum(quantum);
}
break;
}
@@ -311,25 +311,20 @@
quantum;
p=PushShortPixel(MSBEndian,p,&quantum);
- SetPixelRed(pixel,quantum >> (image->depth-
- MAGICKCORE_QUANTUM_DEPTH));
+ pixel->red=quantum >> (image->depth-MAGICKCORE_QUANTUM_DEPTH);
p=PushShortPixel(MSBEndian,p,&quantum);
- SetPixelGreen(pixel,quantum >> (image->depth-
- MAGICKCORE_QUANTUM_DEPTH));
+ pixel->green=quantum >> (image->depth-MAGICKCORE_QUANTUM_DEPTH);
p=PushShortPixel(MSBEndian,p,&quantum);
- SetPixelBlue(pixel,quantum >> (image->depth-
- MAGICKCORE_QUANTUM_DEPTH));
- if (image->matte != MagickFalse)
- {
- p=PushShortPixel(MSBEndian,p,&quantum);
- SetPixelOpacity(pixel,quantum >> (image->depth-
- MAGICKCORE_QUANTUM_DEPTH));
- }
+ pixel->blue=quantum >> (image->depth-MAGICKCORE_QUANTUM_DEPTH);
if (image->colorspace == CMYKColorspace)
{
p=PushShortPixel(MSBEndian,p,&quantum);
- SetPixelBlack(index,quantum >> (image->depth-
- MAGICKCORE_QUANTUM_DEPTH));
+ pixel->black=quantum >> (image->depth-MAGICKCORE_QUANTUM_DEPTH);
+ }
+ if (image->matte != MagickFalse)
+ {
+ p=PushShortPixel(MSBEndian,p,&quantum);
+ pixel->alpha=quantum >> (image->depth-MAGICKCORE_QUANTUM_DEPTH);
}
break;
}
@@ -339,25 +334,20 @@
quantum;
p=PushLongPixel(MSBEndian,p,&quantum);
- SetPixelRed(pixel,quantum >> (image->depth-
- MAGICKCORE_QUANTUM_DEPTH));
+ pixel->red=quantum >> (image->depth-MAGICKCORE_QUANTUM_DEPTH);
p=PushLongPixel(MSBEndian,p,&quantum);
- SetPixelGreen(pixel,quantum >> (image->depth-
- MAGICKCORE_QUANTUM_DEPTH));
+ pixel->green=quantum >> (image->depth-MAGICKCORE_QUANTUM_DEPTH);
p=PushLongPixel(MSBEndian,p,&quantum);
- SetPixelBlue(pixel,quantum >> (image->depth-
- MAGICKCORE_QUANTUM_DEPTH));
- if (image->matte != MagickFalse)
- {
- p=PushLongPixel(MSBEndian,p,&quantum);
- SetPixelOpacity(pixel,quantum >> (image->depth-
- MAGICKCORE_QUANTUM_DEPTH));
- }
+ pixel->blue=quantum >> (image->depth-MAGICKCORE_QUANTUM_DEPTH);
if (image->colorspace == CMYKColorspace)
{
p=PushLongPixel(MSBEndian,p,&quantum);
- SetPixelIndex(index,quantum >> (image->depth-
- MAGICKCORE_QUANTUM_DEPTH));
+ pixel->black=quantum >> (image->depth-MAGICKCORE_QUANTUM_DEPTH);
+ }
+ if (image->matte != MagickFalse)
+ {
+ p=PushLongPixel(MSBEndian,p,&quantum);
+ pixel->alpha=quantum >> (image->depth-MAGICKCORE_QUANTUM_DEPTH);
}
break;
}
@@ -421,9 +411,6 @@
Image
*image;
- IndexPacket
- index;
-
int
c,
code;
@@ -443,12 +430,12 @@
MagickBooleanType
status;
+ PixelInfo
+ pixel;
+
MagickStatusType
flags;
- PixelPacket
- pixel;
-
QuantumFormatType
quantum_format;
@@ -1303,34 +1290,27 @@
#endif
case RLECompression:
{
- (void) ResetMagickMemory(&pixel,0,sizeof(pixel));
- pixel.opacity=(Quantum) TransparentOpacity;
- index=(IndexPacket) 0;
+ GetPixelInfo(image,&pixel);
break;
}
default:
break;
}
pixels=GetQuantumPixels(quantum_info);
- index=(IndexPacket) 0;
length=0;
for (y=0; y < (ssize_t) image->rows; y++)
{
- register IndexPacket
- *restrict indexes;
-
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
if (status == MagickFalse)
break;
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
switch (image->compression)
{
#if defined(MAGICKCORE_BZLIB_DELEGATE)
@@ -1417,17 +1397,22 @@
if (length == 0)
{
count=ReadBlob(image,packet_size,pixels);
- PushRunlengthPacket(image,pixels,&length,&pixel,&index);
+ PushRunlengthPacket(image,pixels,&length,&pixel);
}
length--;
- if ((image->storage_class == PseudoClass) ||
- (image->colorspace == CMYKColorspace))
- SetPixelIndex(indexes+x,index);
- SetPixelRed(q,pixel.red);
- SetPixelGreen(q,pixel.green);
- SetPixelBlue(q,pixel.blue);
- SetPixelOpacity(q,pixel.opacity);
- q++;
+ if (image->storage_class == PseudoClass)
+ SetPixelIndex(image,pixel.index,q);
+ else
+ {
+ SetPixelRed(image,pixel.red,q);
+ SetPixelGreen(image,pixel.green,q);
+ SetPixelBlue(image,pixel.blue,q);
+ if (image->colorspace == CMYKColorspace)
+ SetPixelBlack(image,pixel.black,q);
+ }
+ if (image->matte != MagickFalse)
+ SetPixelAlpha(image,pixel.alpha,q);
+ q+=GetPixelChannels(image);
}
break;
}
@@ -1651,7 +1636,7 @@
*/
static unsigned char *PopRunlengthPacket(Image *image,unsigned char *pixels,
- size_t length,PixelPacket pixel,IndexPacket index)
+ size_t length,PixelInfo *pixel)
{
if (image->storage_class != DirectClass)
{
@@ -1659,14 +1644,14 @@
{
case 32:
{
- *pixels++=(unsigned char) ((size_t) index >> 24);
- *pixels++=(unsigned char) ((size_t) index >> 16);
+ *pixels++=(unsigned char) ((size_t) pixel->index >> 24);
+ *pixels++=(unsigned char) ((size_t) pixel->index >> 16);
}
case 16:
- *pixels++=(unsigned char) ((size_t) index >> 8);
+ *pixels++=(unsigned char) ((size_t) pixel->index >> 8);
case 8:
{
- *pixels++=(unsigned char) index;
+ *pixels++=(unsigned char) pixel->index;
break;
}
default:
@@ -1682,7 +1667,7 @@
if (image->matte != MagickFalse)
{
- value=ScaleQuantumToLong(pixel.opacity);
+ value=ScaleQuantumToLong(pixel->alpha);
pixels=PopLongPixel(MSBEndian,value,pixels);
}
break;
@@ -1694,7 +1679,7 @@
if (image->matte != MagickFalse)
{
- value=ScaleQuantumToShort(pixel.opacity);
+ value=ScaleQuantumToShort(pixel->alpha);
pixels=PopShortPixel(MSBEndian,value,pixels);
}
break;
@@ -1706,7 +1691,7 @@
if (image->matte != MagickFalse)
{
- value=(unsigned char) ScaleQuantumToChar(pixel.opacity);
+ value=(unsigned char) ScaleQuantumToChar(pixel->alpha);
pixels=PopCharPixel(value,pixels);
}
break;
@@ -1725,20 +1710,20 @@
unsigned int
value;
- value=ScaleQuantumToLong(pixel.red);
+ value=ScaleQuantumToLong(pixel->red);
pixels=PopLongPixel(MSBEndian,value,pixels);
- value=ScaleQuantumToLong(pixel.green);
+ value=ScaleQuantumToLong(pixel->green);
pixels=PopLongPixel(MSBEndian,value,pixels);
- value=ScaleQuantumToLong(pixel.blue);
+ value=ScaleQuantumToLong(pixel->blue);
pixels=PopLongPixel(MSBEndian,value,pixels);
- if (image->matte != MagickFalse)
- {
- value=ScaleQuantumToLong(pixel.opacity);
- pixels=PopLongPixel(MSBEndian,value,pixels);
- }
if (image->colorspace == CMYKColorspace)
{
- value=ScaleQuantumToLong(index);
+ value=ScaleQuantumToLong(pixel->black);
+ pixels=PopLongPixel(MSBEndian,value,pixels);
+ }
+ if (image->matte != MagickFalse)
+ {
+ value=ScaleQuantumToLong(pixel->alpha);
pixels=PopLongPixel(MSBEndian,value,pixels);
}
break;
@@ -1748,20 +1733,20 @@
unsigned short
value;
- value=ScaleQuantumToShort(pixel.red);
+ value=ScaleQuantumToShort(pixel->red);
pixels=PopShortPixel(MSBEndian,value,pixels);
- value=ScaleQuantumToShort(pixel.green);
+ value=ScaleQuantumToShort(pixel->green);
pixels=PopShortPixel(MSBEndian,value,pixels);
- value=ScaleQuantumToShort(pixel.blue);
+ value=ScaleQuantumToShort(pixel->blue);
pixels=PopShortPixel(MSBEndian,value,pixels);
- if (image->matte != MagickFalse)
- {
- value=ScaleQuantumToShort(pixel.opacity);
- pixels=PopShortPixel(MSBEndian,value,pixels);
- }
if (image->colorspace == CMYKColorspace)
{
- value=ScaleQuantumToShort(index);
+ value=ScaleQuantumToShort(pixel->black);
+ pixels=PopShortPixel(MSBEndian,value,pixels);
+ }
+ if (image->matte != MagickFalse)
+ {
+ value=ScaleQuantumToShort(pixel->alpha);
pixels=PopShortPixel(MSBEndian,value,pixels);
}
break;
@@ -1771,20 +1756,20 @@
unsigned char
value;
- value=(unsigned char) ScaleQuantumToChar(pixel.red);
+ value=(unsigned char) ScaleQuantumToChar(pixel->red);
pixels=PopCharPixel(value,pixels);
- value=(unsigned char) ScaleQuantumToChar(pixel.green);
+ value=(unsigned char) ScaleQuantumToChar(pixel->green);
pixels=PopCharPixel(value,pixels);
- value=(unsigned char) ScaleQuantumToChar(pixel.blue);
+ value=(unsigned char) ScaleQuantumToChar(pixel->blue);
pixels=PopCharPixel(value,pixels);
- if (image->matte != MagickFalse)
- {
- value=(unsigned char) ScaleQuantumToChar(pixel.opacity);
- pixels=PopCharPixel(value,pixels);
- }
if (image->colorspace == CMYKColorspace)
{
- value=(unsigned char) ScaleQuantumToChar(index);
+ value=(unsigned char) ScaleQuantumToChar(pixel->black);
+ pixels=PopCharPixel(value,pixels);
+ }
+ if (image->matte != MagickFalse)
+ {
+ value=(unsigned char) ScaleQuantumToChar(pixel->alpha);
pixels=PopCharPixel(value,pixels);
}
break;
@@ -1815,9 +1800,6 @@
*property,
*value;
- IndexPacket
- index;
-
int
code;
@@ -1836,8 +1818,9 @@
MagickOffsetType
scene;
- PixelPacket
- pixel;
+ PixelInfo
+ pixel,
+ target;
QuantumInfo
*quantum_info;
@@ -1900,7 +1883,7 @@
if ((image->storage_class == PseudoClass) &&
(image->colors > (size_t) (GetQuantumRange(image->depth)+1)))
(void) SetImageStorageClass(image,DirectClass);
- if (IsGrayImage(image,&image->exception) != MagickFalse)
+ if (IsImageGray(image,&image->exception) != MagickFalse)
{
image->storage_class=DirectClass;
(void) SetImageColorspace(image,GRAYColorspace);
@@ -1924,6 +1907,7 @@
{
if (quantum_info->format == FloatingPointQuantumFormat)
compression=NoCompression;
+ GetPixelInfo(image,&target);
break;
}
default:
@@ -2316,10 +2300,7 @@
pixels=GetQuantumPixels(quantum_info);
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const IndexPacket
- *restrict indexes;
-
- register const PixelPacket
+ register const Quantum
*restrict p;
register ssize_t
@@ -2328,9 +2309,8 @@
if (status == MagickFalse)
break;
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetVirtualIndexQueue(image);
q=pixels;
switch (compression)
{
@@ -2339,8 +2319,8 @@
{
bzip_info.next_in=(char *) pixels;
bzip_info.avail_in=(unsigned int) (packet_size*image->columns);
- (void) ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,quantum_type,pixels,&image->exception);
+ (void) ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ quantum_type,pixels,&image->exception);
do
{
bzip_info.next_out=(char *) compress_pixels;
@@ -2364,8 +2344,8 @@
{
lzma_info.next_in=pixels;
lzma_info.avail_in=packet_size*image->columns;
- (void) ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,quantum_type,pixels,&image->exception);
+ (void) ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ quantum_type,pixels,&image->exception);
do
{
lzma_info.next_out=compress_pixels;
@@ -2389,8 +2369,8 @@
{
zip_info.next_in=pixels;
zip_info.avail_in=(uInt) (packet_size*image->columns);
- (void) ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,quantum_type,pixels,&image->exception);
+ (void) ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ quantum_type,pixels,&image->exception);
do
{
zip_info.next_out=compress_pixels;
@@ -2410,39 +2390,31 @@
#endif
case RLECompression:
{
- pixel=(*p);
- index=(IndexPacket) 0;
- if (indexes != (IndexPacket *) NULL)
- index=(*indexes);
- length=255;
- for (x=0; x < (ssize_t) image->columns; x++)
+ length=0;
+ SetPixelInfo(image,p,&pixel);
+ p+=GetPixelChannels(image);
+ for (x=1; x < (ssize_t) image->columns; x++)
{
- if ((length < 255) && (x < (ssize_t) (image->columns-1)) &&
- (IsColorEqual(p,&pixel) != MagickFalse) &&
- ((image->matte == MagickFalse) ||
- (GetPixelOpacity(p) == pixel.opacity)) &&
- ((indexes == (IndexPacket *) NULL) ||
- (index == GetPixelIndex(indexes+x))))
+ SetPixelInfo(image,p,&target);
+ if ((length < 255) &&
+ (IsPixelInfoEquivalent(&pixel,&target) != MagickFalse))
length++;
else
{
- if (x > 0)
- q=PopRunlengthPacket(image,q,length,pixel,index);
+ q=PopRunlengthPacket(image,q,length,&pixel);
length=0;
}
- pixel=(*p);
- if (indexes != (IndexPacket *) NULL)
- index=GetPixelIndex(indexes+x);
- p++;
+ SetPixelInfo(image,p,&pixel);
+ p+=GetPixelChannels(image);
}
- q=PopRunlengthPacket(image,q,length,pixel,index);
+ q=PopRunlengthPacket(image,q,length,&pixel);
(void) WriteBlob(image,(size_t) (q-pixels),pixels);
break;
}
default:
{
- (void) ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,quantum_type,pixels,&image->exception);
+ (void) ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ quantum_type,pixels,&image->exception);
(void) WriteBlob(image,packet_size*image->columns,pixels);
break;
}
diff --git a/coders/mono.c b/coders/mono.c
index 3af6cbe..c5c0d95 100644
--- a/coders/mono.c
+++ b/coders/mono.c
@@ -39,26 +39,27 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/color-private.h"
-#include "magick/colormap.h"
-#include "magick/colorspace.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colormap.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
/*
Forward declarations.
@@ -102,10 +103,7 @@
MagickBooleanType
status;
- register IndexPacket
- *indexes;
-
- register PixelPacket
+ register Quantum
*q;
register ssize_t
@@ -157,9 +155,8 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
bit=0;
byte=0;
for (x=0; x < (ssize_t) image->columns; x++)
@@ -167,18 +164,19 @@
if (bit == 0)
byte=(size_t) ReadBlobByte(image);
if (image_info->endian == LSBEndian)
- SetPixelIndex(indexes+x,((byte & 0x01) != 0) ? 0x00 : 0x01);
+ SetPixelIndex(image,((byte & 0x01) != 0) ? 0x00 : 0x01,q);
else
- SetPixelIndex(indexes+x,((byte & 0x01) != 0) ? 0x01 : 0x00);
+ SetPixelIndex(image,((byte & 0x01) != 0) ? 0x01 : 0x00,q);
bit++;
if (bit == 8)
bit=0;
byte>>=1;
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
- image->rows);
+ image->rows);
if (status == MagickFalse)
break;
}
@@ -285,7 +283,7 @@
MagickBooleanType
status;
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
@@ -319,7 +317,7 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
bit=0;
byte=0;
@@ -328,11 +326,11 @@
byte>>=1;
if (image->endian == LSBEndian)
{
- if (PixelIntensity(p) < ((Quantum) QuantumRange/2.0))
+ if (GetPixelIntensity(image,p) < ((Quantum) QuantumRange/2.0))
byte|=0x80;
}
else
- if (PixelIntensity(p) >= ((Quantum) QuantumRange/2.0))
+ if (GetPixelIntensity(image,p) >= ((Quantum) QuantumRange/2.0))
byte|=0x80;
bit++;
if (bit == 8)
@@ -341,7 +339,7 @@
bit=0;
byte=0;
}
- p++;
+ p+=GetPixelChannels(image);
}
if (bit != 0)
(void) WriteBlobByte(image,(unsigned char) (byte >> (8-bit)));
diff --git a/coders/mpc.c b/coders/mpc.c
index bfe2a04..438a00f 100644
--- a/coders/mpc.c
+++ b/coders/mpc.c
@@ -40,37 +40,37 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/artifact.h"
-#include "magick/attribute.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/color.h"
-#include "magick/color-private.h"
-#include "magick/colormap.h"
-#include "magick/constitute.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/geometry.h"
-#include "magick/hashmap.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/module.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/option.h"
-#include "magick/profile.h"
-#include "magick/property.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/statistic.h"
-#include "magick/string_.h"
-#include "magick/string-private.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/artifact.h"
+#include "MagickCore/attribute.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/color.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colormap.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/hashmap.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/option.h"
+#include "MagickCore/profile.h"
+#include "MagickCore/property.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/statistic.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/string-private.h"
+#include "MagickCore/utility.h"
/*
Forward declarations.
diff --git a/coders/mpeg.c b/coders/mpeg.c
index 5a72f91..c42bd2e 100644
--- a/coders/mpeg.c
+++ b/coders/mpeg.c
@@ -38,28 +38,28 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/constitute.h"
-#include "magick/delegate.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/geometry.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/layer.h"
-#include "magick/list.h"
-#include "magick/log.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/resource_.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
-#include "magick/transform.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/delegate.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/layer.h"
+#include "MagickCore/list.h"
+#include "MagickCore/log.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/transform.h"
+#include "MagickCore/utility.h"
/*
Forward declarations.
diff --git a/coders/mpr.c b/coders/mpr.c
index 826b005..cc7776d 100644
--- a/coders/mpr.c
+++ b/coders/mpr.c
@@ -39,18 +39,18 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/registry.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/registry.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
/*
Forward declarations.
diff --git a/coders/msl.c b/coders/msl.c
index d4dca0d..46d8c6b 100644
--- a/coders/msl.c
+++ b/coders/msl.c
@@ -41,52 +41,53 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/annotate.h"
-#include "magick/artifact.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/cache-view.h"
-#include "magick/color.h"
-#include "magick/colormap.h"
-#include "magick/color-private.h"
-#include "magick/composite.h"
-#include "magick/constitute.h"
-#include "magick/decorate.h"
-#include "magick/display.h"
-#include "magick/draw.h"
-#include "magick/effect.h"
-#include "magick/enhance.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/fx.h"
-#include "magick/geometry.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/log.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/module.h"
-#include "magick/option.h"
-#include "magick/paint.h"
-#include "magick/profile.h"
-#include "magick/property.h"
-#include "magick/quantize.h"
-#include "magick/quantum-private.h"
-#include "magick/registry.h"
-#include "magick/resize.h"
-#include "magick/resource_.h"
-#include "magick/segment.h"
-#include "magick/shear.h"
-#include "magick/signature.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/string-private.h"
-#include "magick/transform.h"
-#include "magick/threshold.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/annotate.h"
+#include "MagickCore/artifact.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/cache-view.h"
+#include "MagickCore/color.h"
+#include "MagickCore/colormap.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/composite.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/decorate.h"
+#include "MagickCore/display.h"
+#include "MagickCore/draw.h"
+#include "MagickCore/effect.h"
+#include "MagickCore/enhance.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/fx.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/log.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/option.h"
+#include "MagickCore/paint.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/profile.h"
+#include "MagickCore/property.h"
+#include "MagickCore/quantize.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/registry.h"
+#include "MagickCore/resize.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/segment.h"
+#include "MagickCore/shear.h"
+#include "MagickCore/signature.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/string-private.h"
+#include "MagickCore/transform.h"
+#include "MagickCore/threshold.h"
+#include "MagickCore/utility.h"
#if defined(MAGICKCORE_XML_DELEGATE)
# if defined(MAGICKCORE_WINDOWS_SUPPORT)
# if defined(__MINGW32__)
@@ -1601,7 +1602,7 @@
PaintMethod
paint_method;
- MagickPixelPacket
+ PixelInfo
target;
/*
@@ -1914,13 +1915,13 @@
register ssize_t
x;
- register PixelPacket
+ register Quantum
*q;
CacheView
*composite_view;
- opacity=QuantumRange-StringToLong(value);
+ opacity=StringToLong(value);
if (compose != DissolveCompositeOp)
{
(void) SetImageOpacity(composite_image,(Quantum)
@@ -1930,17 +1931,18 @@
(void) SetImageArtifact(msl_info->image[n],
"compose:args",value);
if (composite_image->matte != MagickTrue)
- (void) SetImageOpacity(composite_image,OpaqueOpacity);
+ (void) SetImageOpacity(composite_image,OpaqueAlpha);
composite_view=AcquireCacheView(composite_image);
for (y=0; y < (ssize_t) composite_image->rows ; y++)
{
- q=GetCacheViewAuthenticPixels(composite_view,0,y,(ssize_t)
- composite_image->columns,1,&exception);
+ q=GetCacheViewAuthenticPixels(composite_view,0,y,
+ (ssize_t) composite_image->columns,1,&exception);
for (x=0; x < (ssize_t) composite_image->columns; x++)
{
- if (q->opacity == OpaqueOpacity)
- q->opacity=ClampToQuantum(opacity);
- q++;
+ if (GetPixelAlpha(composite_image,q) == OpaqueAlpha)
+ SetPixelAlpha(composite_image,
+ ClampToQuantum(opacity),q);
+ q+=GetPixelChannels(composite_image);
}
if (SyncCacheViewAuthenticPixels(composite_view,&exception) == MagickFalse)
break;
@@ -3130,7 +3132,7 @@
char
gamma[MaxTextExtent];
- MagickPixelPacket
+ PixelInfo
pixel;
/*
@@ -3639,7 +3641,7 @@
double
opacity;
- MagickPixelPacket
+ PixelInfo
target;
PaintMethod
@@ -3759,7 +3761,7 @@
}
draw_info=CloneDrawInfo(msl_info->image_info[n],
msl_info->draw_info[n]);
- draw_info->fill.opacity=ClampToQuantum(opacity);
+ draw_info->fill.alpha=ClampToQuantum(opacity);
(void) FloodfillPaintImage(msl_info->image[n],OpacityChannel,
draw_info,&target,geometry.x,geometry.y,
paint_method == FloodfillMethod ? MagickFalse : MagickTrue);
@@ -4181,7 +4183,7 @@
}
if (LocaleCompare((const char *) tag,"opaque") == 0)
{
- MagickPixelPacket
+ PixelInfo
fill_color,
target;
@@ -6037,7 +6039,7 @@
{
if (LocaleCompare(keyword, "opacity") == 0)
{
- ssize_t opac = OpaqueOpacity,
+ ssize_t opac = OpaqueAlpha,
len = (ssize_t) strlen( value );
if (value[len-1] == '%') {
@@ -7116,12 +7118,12 @@
{
if (LocaleCompare(keyword,"color") == 0)
{
- MagickPixelPacket
+ PixelInfo
target;
(void) QueryMagickColor(value,&target,&exception);
(void) TransparentPaintImage(msl_info->image[n],&target,
- TransparentOpacity,MagickFalse);
+ TransparentAlpha,MagickFalse);
break;
}
ThrowMSLException(OptionError,"UnrecognizedAttribute",keyword);
diff --git a/coders/mtv.c b/coders/mtv.c
index dcc3156..3e85bbc 100644
--- a/coders/mtv.c
+++ b/coders/mtv.c
@@ -39,24 +39,25 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/colorspace.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
/*
Forward declarations.
@@ -104,7 +105,7 @@
register ssize_t
x;
- register PixelPacket
+ register Quantum
*q;
register unsigned char
@@ -170,15 +171,15 @@
ThrowReaderException(CorruptImageError,"UnableToReadImageData");
p=pixels;
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelRed(q,ScaleCharToQuantum(*p++));
- SetPixelGreen(q,ScaleCharToQuantum(*p++));
- SetPixelBlue(q,ScaleCharToQuantum(*p++));
- SetPixelOpacity(q,OpaqueOpacity);
- q++;
+ SetPixelRed(image,ScaleCharToQuantum(*p++),q);
+ SetPixelGreen(image,ScaleCharToQuantum(*p++),q);
+ SetPixelBlue(image,ScaleCharToQuantum(*p++),q);
+ SetPixelAlpha(image,OpaqueAlpha,q);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -325,7 +326,7 @@
MagickOffsetType
scene;
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
@@ -373,21 +374,21 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
q=pixels;
for (x=0; x < (ssize_t) image->columns; x++)
{
- *q++=ScaleQuantumToChar(GetPixelRed(p));
- *q++=ScaleQuantumToChar(GetPixelGreen(p));
- *q++=ScaleQuantumToChar(GetPixelBlue(p));
- p++;
+ *q++=ScaleQuantumToChar(GetPixelRed(image,p));
+ *q++=ScaleQuantumToChar(GetPixelGreen(image,p));
+ *q++=ScaleQuantumToChar(GetPixelBlue(image,p));
+ p+=GetPixelChannels(image);
}
(void) WriteBlob(image,(size_t) (q-pixels),pixels);
if (image->previous == (Image *) NULL)
{
status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
- image->rows);
+ image->rows);
if (status == MagickFalse)
break;
}
diff --git a/coders/mvg.c b/coders/mvg.c
index 38865f7..c9c2ff5 100644
--- a/coders/mvg.c
+++ b/coders/mvg.c
@@ -39,23 +39,23 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/artifact.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/draw.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/module.h"
-#include "magick/property.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/artifact.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/draw.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/property.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
/*
Forward declarations.
diff --git a/coders/null.c b/coders/null.c
index dd7a03e..00f87e2 100644
--- a/coders/null.c
+++ b/coders/null.c
@@ -39,25 +39,25 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/color.h"
-#include "magick/color-private.h"
-#include "magick/colorspace-private.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/pixel-private.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/color.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colorspace-private.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
/*
Forward declarations.
@@ -99,16 +99,13 @@
Image
*image;
- MagickPixelPacket
+ PixelInfo
background;
- register IndexPacket
- *indexes;
-
register ssize_t
x;
- register PixelPacket
+ register Quantum
*q;
ssize_t
@@ -130,21 +127,19 @@
if (image->rows == 0)
image->rows=1;
image->matte=MagickTrue;
- GetMagickPixelPacket(image,&background);
- background.opacity=(MagickRealType) TransparentOpacity;
+ GetPixelInfo(image,&background);
+ background.alpha=(MagickRealType) TransparentAlpha;
if (image->colorspace == CMYKColorspace)
ConvertRGBToCMYK(&background);
for (y=0; y < (ssize_t) image->rows; y++)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelPacket(image,&background,q,indexes);
- q++;
- indexes++;
+ SetPixelPixelInfo(image,&background,q);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
diff --git a/coders/otb.c b/coders/otb.c
index dd24021..45f7221 100644
--- a/coders/otb.c
+++ b/coders/otb.c
@@ -38,26 +38,27 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/color-private.h"
-#include "magick/colormap.h"
-#include "magick/colorspace.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colormap.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
/*
Forward declarations.
@@ -105,13 +106,10 @@
MagickBooleanType
status;
- register IndexPacket
- *indexes;
-
register ssize_t
x;
- register PixelPacket
+ register Quantum
*q;
ssize_t
@@ -171,9 +169,8 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
bit=0;
byte=0;
for (x=0; x < (ssize_t) image->columns; x++)
@@ -184,11 +181,11 @@
if (byte == EOF)
ThrowReaderException(CorruptImageError,"CorruptImage");
}
- SetPixelIndex(indexes+x,(byte & (0x01 << (7-bit))) ?
- 0x00 : 0x01);
+ SetPixelIndex(image,(byte & (0x01 << (7-bit))) ? 0x00 : 0x01,q);
bit++;
if (bit == 8)
bit=0;
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -304,7 +301,7 @@
MagickBooleanType
status;
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
@@ -354,13 +351,13 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
bit=0;
byte=0;
for (x=0; x < (ssize_t) image->columns; x++)
{
- if (PixelIntensity(p) < ((Quantum) QuantumRange/2.0))
+ if (GetPixelIntensity(image,p) < ((Quantum) QuantumRange/2.0))
byte|=0x1 << (7-bit);
bit++;
if (bit == 8)
@@ -369,7 +366,7 @@
bit=0;
byte=0;
}
- p++;
+ p+=GetPixelChannels(image);
}
if (bit != 0)
(void) WriteBlobByte(image,byte);
diff --git a/coders/palm.c b/coders/palm.c
index d5ace14..b6aadf9 100644
--- a/coders/palm.c
+++ b/coders/palm.c
@@ -41,33 +41,34 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/color.h"
-#include "magick/colormap.h"
-#include "magick/colormap-private.h"
-#include "magick/color-private.h"
-#include "magick/colorspace.h"
-#include "magick/constitute.h"
-#include "magick/exception.h"
-#include "magick/histogram.h"
-#include "magick/image.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/paint.h"
-#include "magick/pixel-private.h"
-#include "magick/property.h"
-#include "magick/quantize.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/color.h"
+#include "MagickCore/colormap.h"
+#include "MagickCore/colormap-private.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/histogram.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/paint.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/property.h"
+#include "MagickCore/quantize.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/utility.h"
/*
Define declarations.
@@ -177,7 +178,7 @@
%
% The format of the FindColor method is:
%
-% int FindColor(PixelPacket *pixel)
+% int FindColor(const Image *image,PixelPacket *pixel)
%
% A description of each parameter follows:
%
@@ -186,15 +187,15 @@
% o pixel: a pointer to the PixelPacket to be matched.
%
*/
-static int FindColor(PixelPacket *pixel)
+static int FindColor(const Image *image,PixelPacket *packet)
{
register ssize_t
i;
for (i=0; i < 256; i++)
- if (ScaleQuantumToChar(GetPixelRed(pixel)) == PalmPalette[i][0] &&
- ScaleQuantumToChar(GetPixelGreen(pixel)) == PalmPalette[i][1] &&
- ScaleQuantumToChar(GetPixelBlue(pixel)) == PalmPalette[i][2])
+ if (ScaleQuantumToChar(packet->red) == PalmPalette[i][0] &&
+ ScaleQuantumToChar(packet->green) == PalmPalette[i][1] &&
+ ScaleQuantumToChar(packet->blue) == PalmPalette[i][2])
return(i);
return(-1);
}
@@ -247,9 +248,6 @@
Image
*image;
- IndexPacket
- index;
-
MagickBooleanType
status;
@@ -257,17 +255,17 @@
totalOffset,
seekNextDepth;
- MagickPixelPacket
+ PixelInfo
transpix;
- register IndexPacket
- *indexes;
+ Quantum
+ index;
register ssize_t
i,
x;
- register PixelPacket
+ register Quantum
*q;
ssize_t
@@ -345,7 +343,7 @@
if ((bits_per_pixel < 16) &&
(AcquireImageColormap(image,one << bits_per_pixel) == MagickFalse))
ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
- GetMagickPixelPacket(image,&transpix);
+ GetPixelInfo(image,&transpix);
if (bits_per_pixel == 16) /* Direct Color */
{
redbits=(size_t) ReadBlobByte(image); /* # of bits of red */
@@ -362,7 +360,7 @@
}
if (bits_per_pixel == 8)
{
- IndexPacket
+ Quantum
index;
if (flags & PALM_HAS_COLORMAP_FLAG)
@@ -464,9 +462,8 @@
}
ptr=one_row;
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
if (bits_per_pixel == 16)
{
if (image->columns > (2*bytes_per_row))
@@ -475,14 +472,11 @@
{
color16=(*ptr++ << 8);
color16|=(*ptr++);
- SetPixelRed(q,(QuantumRange*((color16 >> 11) & 0x1f))/
- 0x1f);
- SetPixelGreen(q,(QuantumRange*((color16 >> 5) & 0x3f))/
- 0x3f);
- SetPixelBlue(q,(QuantumRange*((color16 >> 0) & 0x1f))/
- 0x1f);
- SetPixelOpacity(q,OpaqueOpacity);
- q++;
+ SetPixelRed(image,(QuantumRange*((color16 >> 11) & 0x1f))/0x1f,q);
+ SetPixelGreen(image,(QuantumRange*((color16 >> 5) & 0x3f))/0x3f,q);
+ SetPixelBlue(image,(QuantumRange*((color16 >> 0) & 0x1f))/0x1f,q);
+ SetPixelAlpha(image,OpaqueAlpha,q);
+ q+=GetPixelChannels(image);
}
}
else
@@ -492,9 +486,9 @@
{
if ((size_t) (ptr-one_row) >= bytes_per_row)
ThrowReaderException(CorruptImageError,"CorruptImage");
- index=(IndexPacket) (mask-(((*ptr) & (mask << bit)) >> bit));
- SetPixelIndex(indexes+x,index);
- SetPixelRGBO(q,image->colormap+(ssize_t) index);
+ index=(Quantum) (mask-(((*ptr) & (mask << bit)) >> bit));
+ SetPixelIndex(image,index,q);
+ SetPixelPacket(image,image->colormap+(ssize_t) index,q);
if (bit)
bit-=bits_per_pixel;
else
@@ -502,7 +496,7 @@
ptr++;
bit=8-bits_per_pixel;
}
- q++;
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -518,10 +512,10 @@
if (flags & PALM_HAS_TRANSPARENCY_FLAG)
{
if (bits_per_pixel != 16)
- SetMagickPixelPacket(image,image->colormap+(mask-transparentIndex),
- (const IndexPacket *) NULL,&transpix);
+ SetPixelInfoPacket(image,image->colormap+(mask-transparentIndex),
+ &transpix);
(void) TransparentPaintImage(image,&transpix,(Quantum)
- TransparentOpacity,MagickFalse);
+ TransparentAlpha,MagickFalse);
}
one_row=(unsigned char *) RelinquishMagickMemory(one_row);
if (compressionType == PALM_COMPRESSION_SCANLINE)
@@ -680,15 +674,15 @@
QuantizeInfo
*quantize_info;
- register IndexPacket
- *indexes;
-
register ssize_t
x;
- register PixelPacket
+ register const Quantum
*p;
+ register Quantum
+ *q;
+
size_t
count,
bits_per_pixel,
@@ -732,7 +726,7 @@
transpix.red=0;
transpix.green=0;
transpix.blue=0;
- transpix.opacity=0;
+ transpix.alpha=0;
one=1;
version=0;
scene=0;
@@ -826,11 +820,13 @@
(void) RemapImage(quantize_info,image,affinity_image);
for (y=0; y < (ssize_t) image->rows; y++)
{
- p=GetAuthenticPixels(image,0,y,image->columns,1,&exception);
- indexes=GetAuthenticIndexQueue(image);
+ q=GetAuthenticPixels(image,0,y,image->columns,1,&exception);
for (x=0; x < (ssize_t) image->columns; x++)
- SetPixelIndex(indexes+x,FindColor(&image->colormap[
- (ssize_t) GetPixelIndex(indexes+x)]));
+ {
+ SetPixelIndex(image,FindColor(image,&image->colormap[(ssize_t)
+ GetPixelIndex(image,q)]),q);
+ q+=GetPixelChannels(image);
+ }
}
affinity_image=DestroyImage(affinity_image);
}
@@ -850,29 +846,28 @@
{
ptr=one_row;
(void) ResetMagickMemory(ptr,0,bytes_per_row);
- p=GetAuthenticPixels(image,0,y,image->columns,1,&exception);
- if (p == (PixelPacket *) NULL)
+ p=GetVirtualPixels(image,0,y,image->columns,1,&exception);
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
if (bits_per_pixel == 16)
{
for (x=0; x < (int) image->columns; x++)
{
- color16=(unsigned short) ((((31*(size_t) GetPixelRed(p))/
- (size_t) QuantumRange) << 11) |
- (((63*(size_t) GetPixelGreen(p))/(size_t) QuantumRange) << 5) |
- ((31*(size_t) GetPixelBlue(p))/(size_t) QuantumRange));
- if (GetPixelOpacity(p) == (Quantum) TransparentOpacity)
+ color16=(unsigned short) ((((31*(size_t) GetPixelRed(image,p))/
+ (size_t) QuantumRange) << 11) | (((63*(size_t)
+ GetPixelGreen(image,p))/(size_t) QuantumRange) << 5) |
+ ((31*(size_t) GetPixelBlue(image,p))/(size_t) QuantumRange));
+ if (GetPixelAlpha(image,p) == (Quantum) TransparentAlpha)
{
- transpix.red=GetPixelRed(p);
- transpix.green=GetPixelGreen(p);
- transpix.blue=GetPixelBlue(p);
- transpix.opacity=GetPixelOpacity(p);
+ transpix.red=GetPixelRed(image,p);
+ transpix.green=GetPixelGreen(image,p);
+ transpix.blue=GetPixelBlue(image,p);
+ transpix.alpha=GetPixelAlpha(image,p);
flags|=PALM_HAS_TRANSPARENCY_FLAG;
}
*ptr++=(unsigned char) ((color16 >> 8) & 0xff);
*ptr++=(unsigned char) (color16 & 0xff);
- p++;
+ p+=GetPixelChannels(image);
}
}
else
@@ -882,9 +877,9 @@
for (x=0; x < (int) image->columns; x++)
{
if (bits_per_pixel >= 8)
- color=(unsigned char) GetPixelIndex(indexes+x);
+ color=(unsigned char) GetPixelIndex(image,p);
else
- color=(unsigned char) (GetPixelIndex(indexes+x)*
+ color=(unsigned char) (GetPixelIndex(image,p)*
((one << bits_per_pixel)-1)/MagickMax(1*image->colors-1,1));
byte|=color << bit;
if (bit != 0)
@@ -895,6 +890,7 @@
byte=0x00;
bit=(unsigned char) (8-bits_per_pixel);
}
+ p+=GetPixelChannels(image);
}
if ((image->columns % (8/bits_per_pixel)) != 0)
*ptr++=byte;
diff --git a/coders/pattern.c b/coders/pattern.c
index aa5a081..896c519 100644
--- a/coders/pattern.c
+++ b/coders/pattern.c
@@ -39,20 +39,20 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
/*
Bricks pattern.
diff --git a/coders/pcd.c b/coders/pcd.c
index 92853de..5cfa1ce 100644
--- a/coders/pcd.c
+++ b/coders/pcd.c
@@ -39,35 +39,36 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/property.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/client.h"
-#include "magick/colorspace.h"
-#include "magick/constitute.h"
-#include "magick/decorate.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/gem.h"
-#include "magick/geometry.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/montage.h"
-#include "magick/resize.h"
-#include "magick/shear.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
-#include "magick/transform.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/property.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/client.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/decorate.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/gem.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/montage.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/resize.h"
+#include "MagickCore/shear.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/transform.h"
+#include "MagickCore/utility.h"
/*
Forward declarations.
@@ -489,7 +490,7 @@
i,
y;
- register PixelPacket
+ register Quantum
*q;
register unsigned char
@@ -667,14 +668,14 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelRed(q,ScaleCharToQuantum(*yy++));
- SetPixelGreen(q,ScaleCharToQuantum(*c1++));
- SetPixelBlue(q,ScaleCharToQuantum(*c2++));
- q++;
+ SetPixelRed(image,ScaleCharToQuantum(*yy++),q);
+ SetPixelGreen(image,ScaleCharToQuantum(*c1++),q);
+ SetPixelBlue(image,ScaleCharToQuantum(*c2++),q);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -775,14 +776,14 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelRed(q,ScaleCharToQuantum(*yy++));
- SetPixelGreen(q,ScaleCharToQuantum(*c1++));
- SetPixelBlue(q,ScaleCharToQuantum(*c2++));
- q++;
+ SetPixelRed(image,ScaleCharToQuantum(*yy++),q);
+ SetPixelGreen(image,ScaleCharToQuantum(*c1++),q);
+ SetPixelBlue(image,ScaleCharToQuantum(*c2++),q);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -956,7 +957,7 @@
RectangleInfo
geometry;
- register const PixelPacket
+ register const Quantum
*p,
*q;
@@ -1020,29 +1021,31 @@
{
p=GetVirtualPixels(tile_image,0,y,tile_image->columns,2,
&tile_image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) (tile_image->columns << 1); x++)
{
- (void) WriteBlobByte(image,ScaleQuantumToChar(GetPixelRed(p)));
- p++;
+ (void) WriteBlobByte(image,ScaleQuantumToChar(GetPixelRed(tile_image,p)));
+ p+=GetPixelChannels(tile_image);
}
q=GetVirtualPixels(downsample_image,0,y >> 1,downsample_image->columns,
1,&downsample_image->exception);
- if (q == (const PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) downsample_image->columns; x++)
{
- (void) WriteBlobByte(image,ScaleQuantumToChar(GetPixelGreen(q)));
+ (void) WriteBlobByte(image,ScaleQuantumToChar(
+ GetPixelGreen(tile_image,q)));
q++;
}
q=GetVirtualPixels(downsample_image,0,y >> 1,downsample_image->columns,
1,&downsample_image->exception);
- if (q == (const PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) downsample_image->columns; x++)
{
- (void) WriteBlobByte(image,ScaleQuantumToChar(GetPixelBlue(q)));
+ (void) WriteBlobByte(image,ScaleQuantumToChar(
+ GetPixelBlue(tile_image,q)));
q++;
}
status=SetImageProgress(image,SaveImageTag,y,tile_image->rows);
diff --git a/coders/pcl.c b/coders/pcl.c
index bbc51fe..aaca876 100644
--- a/coders/pcl.c
+++ b/coders/pcl.c
@@ -39,37 +39,39 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/property.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/color.h"
-#include "magick/color-private.h"
-#include "magick/colorspace.h"
-#include "magick/constitute.h"
-#include "magick/delegate.h"
-#include "magick/draw.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/geometry.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/option.h"
-#include "magick/profile.h"
-#include "magick/resource_.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
-#include "magick/token.h"
-#include "magick/transform.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/attribute.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/color.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/delegate.h"
+#include "MagickCore/draw.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/option.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/profile.h"
+#include "MagickCore/property.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/token.h"
+#include "MagickCore/transform.h"
+#include "MagickCore/utility.h"
/*
Forward declarations.
@@ -662,10 +664,15 @@
MagickOffsetType
scene;
- register const IndexPacket
- *indexes;
+ register const Quantum *p;
- register const PixelPacket *p; register ssize_t i, x; register unsigned char *q; size_t density, length,
+ register ssize_t i, x;
+
+ register unsigned char *q;
+
+ size_t
+ density,
+ length,
one,
packets;
@@ -717,7 +724,7 @@
density);
(void) WriteBlobString(image,buffer);
(void) WriteBlobString(image,"\033&l0E"); /* top margin 0 */
- if (IsMonochromeImage(image,&image->exception) != MagickFalse)
+ if (IsImageMonochrome(image,&image->exception) != MagickFalse)
{
/*
Monochrome image: use default printer monochrome setup.
@@ -835,9 +842,8 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
q=pixels;
switch (bits_per_pixel)
{
@@ -855,7 +861,7 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
byte<<=1;
- if (PixelIntensity(p) < ((MagickRealType) QuantumRange/2.0))
+ if (GetPixelIntensity(image,p) < ((MagickRealType) QuantumRange/2.0))
byte|=0x01;
bit++;
if (bit == 8)
@@ -864,7 +870,7 @@
bit=0;
byte=0;
}
- p++;
+ p+=GetPixelChannels(image);
}
if (bit != 0)
*q++=byte << (8-bit);
@@ -876,7 +882,10 @@
Colormapped image.
*/
for (x=0; x < (ssize_t) image->columns; x++)
- *q++=(unsigned char) GetPixelIndex(indexes+x);
+ {
+ *q++=(unsigned char) GetPixelIndex(image,p);
+ p+=GetPixelChannels(image);
+ }
break;
}
case 24:
@@ -887,10 +896,10 @@
*/
for (x=0; x < (ssize_t) image->columns; x++)
{
- *q++=ScaleQuantumToChar(GetPixelRed(p));
- *q++=ScaleQuantumToChar(GetPixelGreen(p));
- *q++=ScaleQuantumToChar(GetPixelBlue(p));
- p++;
+ *q++=ScaleQuantumToChar(GetPixelRed(image,p));
+ *q++=ScaleQuantumToChar(GetPixelGreen(image,p));
+ *q++=ScaleQuantumToChar(GetPixelBlue(image,p));
+ p+=GetPixelChannels(image);
}
break;
}
diff --git a/coders/pcx.c b/coders/pcx.c
index e18dbb6..7b4d9f2 100644
--- a/coders/pcx.c
+++ b/coders/pcx.c
@@ -39,27 +39,29 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/color.h"
-#include "magick/color-private.h"
-#include "magick/colormap.h"
-#include "magick/colorspace.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/attribute.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/color.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colormap.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
/*
Typedef declarations.
@@ -238,13 +240,10 @@
PCXInfo
pcx_info;
- register IndexPacket
- *indexes;
-
register ssize_t
x;
- register PixelPacket
+ register Quantum
*q;
register ssize_t
@@ -478,9 +477,8 @@
{
p=pcx_pixels+(y*pcx_info.bytes_per_line*pcx_info.planes);
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
r=scanline;
if (image->storage_class == DirectClass)
for (i=0; i < pcx_info.planes; i++)
@@ -602,16 +600,16 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
if (image->storage_class == PseudoClass)
- SetPixelIndex(indexes+x,*r++);
+ SetPixelIndex(image,*r++,q);
else
{
- SetPixelRed(q,ScaleCharToQuantum(*r++));
- SetPixelGreen(q,ScaleCharToQuantum(*r++));
- SetPixelBlue(q,ScaleCharToQuantum(*r++));
+ SetPixelRed(image,ScaleCharToQuantum(*r++),q);
+ SetPixelGreen(image,ScaleCharToQuantum(*r++),q);
+ SetPixelBlue(image,ScaleCharToQuantum(*r++),q);
if (image->matte != MagickFalse)
- SetPixelAlpha(q,ScaleCharToQuantum(*r++));
+ SetPixelAlpha(image,ScaleCharToQuantum(*r++),q);
}
- q++;
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -842,10 +840,7 @@
PCXInfo
pcx_info;
- register const IndexPacket
- *indexes;
-
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
@@ -908,7 +903,7 @@
pcx_info.encoding=image_info->compression == NoCompression ? 0 : 1;
pcx_info.bits_per_pixel=8;
if ((image->storage_class == PseudoClass) &&
- (IsMonochromeImage(image,&image->exception) != MagickFalse))
+ (IsImageMonochrome(image,&image->exception) != MagickFalse))
pcx_info.bits_per_pixel=1;
pcx_info.left=0;
pcx_info.top=0;
@@ -989,7 +984,7 @@
q=pcx_pixels;
if ((image->storage_class == DirectClass) || (image->colors > 256))
{
- const PixelPacket
+ const Quantum
*pixels;
/*
@@ -999,7 +994,7 @@
{
pixels=GetVirtualPixels(image,0,y,image->columns,1,
&image->exception);
- if (pixels == (const PixelPacket *) NULL)
+ if (pixels == (const Quantum *) NULL)
break;
q=pcx_pixels;
for (i=0; i < pcx_info.planes; i++)
@@ -1011,8 +1006,8 @@
{
for (x=0; x < (ssize_t) pcx_info.bytes_per_line; x++)
{
- *q++=ScaleQuantumToChar(GetPixelRed(p));
- p++;
+ *q++=ScaleQuantumToChar(GetPixelRed(image,p));
+ p+=GetPixelChannels(image);
}
break;
}
@@ -1020,8 +1015,8 @@
{
for (x=0; x < (ssize_t) pcx_info.bytes_per_line; x++)
{
- *q++=ScaleQuantumToChar(GetPixelGreen(p));
- p++;
+ *q++=ScaleQuantumToChar(GetPixelGreen(image,p));
+ p+=GetPixelChannels(image);
}
break;
}
@@ -1029,8 +1024,8 @@
{
for (x=0; x < (ssize_t) pcx_info.bytes_per_line; x++)
{
- *q++=ScaleQuantumToChar(GetPixelBlue(p));
- p++;
+ *q++=ScaleQuantumToChar(GetPixelBlue(image,p));
+ p+=GetPixelChannels(image);
}
break;
}
@@ -1039,9 +1034,8 @@
{
for (x=(ssize_t) pcx_info.bytes_per_line; x != 0; x--)
{
- *q++=ScaleQuantumToChar((Quantum)
- (GetPixelAlpha(p)));
- p++;
+ *q++=ScaleQuantumToChar((Quantum) (GetPixelAlpha(image,p)));
+ p+=GetPixelChannels(image);
}
break;
}
@@ -1064,12 +1058,14 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetVirtualIndexQueue(image);
q=pcx_pixels;
for (x=0; x < (ssize_t) image->columns; x++)
- *q++=(unsigned char) GetPixelIndex(indexes+x);
+ {
+ *q++=(unsigned char) GetPixelIndex(image,p);
+ p+=GetPixelChannels(image);
+ }
if (PCXWritePixels(&pcx_info,pcx_pixels,image) == MagickFalse)
break;
if (image->previous == (Image *) NULL)
@@ -1082,7 +1078,7 @@
}
else
{
- IndexPacket
+ Quantum
polarity;
register unsigned char
@@ -1092,26 +1088,24 @@
/*
Convert PseudoClass image to a PCX monochrome image.
*/
- polarity=(IndexPacket) (PixelIntensityToQuantum(
+ polarity=(Quantum) (GetPixelPacketIntensity(
&image->colormap[0]) < ((Quantum) QuantumRange/2) ? 1 : 0);
if (image->colors == 2)
- polarity=(IndexPacket) (
- PixelIntensityToQuantum(&image->colormap[0]) <
- PixelIntensityToQuantum(&image->colormap[1]) ? 1 : 0);
+ polarity=(Quantum) (GetPixelPacketIntensity(&image->colormap[0]) <
+ GetPixelPacketIntensity(&image->colormap[1]) ? 1 : 0);
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,
&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetVirtualIndexQueue(image);
bit=0;
byte=0;
q=pcx_pixels;
for (x=0; x < (ssize_t) image->columns; x++)
{
byte<<=1;
- if (GetPixelIndex(indexes+x) == polarity)
+ if (GetPixelIndex(image,p) == polarity)
byte|=0x01;
bit++;
if (bit == 8)
@@ -1120,7 +1114,7 @@
bit=0;
byte=0;
}
- p++;
+ p+=GetPixelChannels(image);
}
if (bit != 0)
*q++=byte << (8-bit);
diff --git a/coders/pdb.c b/coders/pdb.c
index 90e8926..9b65775 100644
--- a/coders/pdb.c
+++ b/coders/pdb.c
@@ -46,31 +46,32 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/attribute.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/colormap-private.h"
-#include "magick/color-private.h"
-#include "magick/colormap.h"
-#include "magick/colorspace.h"
-#include "magick/constitute.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/property.h"
-#include "magick/quantum-private.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/attribute.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/colormap-private.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colormap.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/property.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
/*
Typedef declarations.
@@ -268,9 +269,6 @@
Image
*image;
- IndexPacket
- index;
-
MagickBooleanType
status;
@@ -280,13 +278,13 @@
PDBInfo
pdb_info;
- register IndexPacket
- *indexes;
+ Quantum
+ index;
register ssize_t
x;
- register PixelPacket
+ register Quantum
*q;
register unsigned char
@@ -435,15 +433,15 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
for (x=0; x < ((ssize_t) image->columns-7); x+=8)
{
for (bit=0; bit < 8; bit++)
{
- index=(IndexPacket) (*p & (0x80 >> bit) ? 0x00 : 0x01);
- SetPixelIndex(indexes+x+bit,index);
+ index=(Quantum) (*p & (0x80 >> bit) ? 0x00 : 0x01);
+ SetPixelIndex(image,index,q);
+ q+=GetPixelChannels(image);
}
p++;
}
@@ -465,20 +463,23 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
for (x=0; x < (ssize_t) image->columns; x+=4)
{
index=ConstrainColormapIndex(image,3UL-((*p >> 6) & 0x03));
- SetPixelIndex(indexes+x,index);
+ SetPixelIndex(image,index,q);
+ q+=GetPixelChannels(image);
index=ConstrainColormapIndex(image,3UL-((*p >> 4) & 0x03));
- SetPixelIndex(indexes+x+1,index);
+ SetPixelIndex(image,index,q);
+ q+=GetPixelChannels(image);
index=ConstrainColormapIndex(image,3UL-((*p >> 2) & 0x03));
- SetPixelIndex(indexes+x+2,index);
+ SetPixelIndex(image,index,q);
+ q+=GetPixelChannels(image);
index=ConstrainColormapIndex(image,3UL-((*p) & 0x03));
- SetPixelIndex(indexes+x+3,index);
+ SetPixelIndex(image,index,q);
p++;
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -498,16 +499,17 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
for (x=0; x < (ssize_t) image->columns; x+=2)
{
index=ConstrainColormapIndex(image,15UL-((*p >> 4) & 0x0f));
- SetPixelIndex(indexes+x,index);
+ SetPixelIndex(image,index,q);
+ q+=GetPixelChannels(image);
index=ConstrainColormapIndex(image,15UL-((*p) & 0x0f));
- SetPixelIndex(indexes+x+1,index);
+ SetPixelIndex(image,index,q);
p++;
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -699,7 +701,7 @@
QuantumInfo
*quantum_info;
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
@@ -826,9 +828,9 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- (void) ExportQuantumPixels(image,(const CacheView *) NULL,quantum_info,
+ (void) ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
GrayQuantum,scanline,&image->exception);
for (x=0; x < pdb_image.width; x++)
{
diff --git a/coders/pdf.c b/coders/pdf.c
index 7c543ec..de42c78 100644
--- a/coders/pdf.c
+++ b/coders/pdf.c
@@ -39,40 +39,42 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/color.h"
-#include "magick/color-private.h"
-#include "magick/colorspace.h"
-#include "magick/compress.h"
-#include "magick/constitute.h"
-#include "magick/delegate.h"
-#include "magick/delegate-private.h"
-#include "magick/draw.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/geometry.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/option.h"
-#include "magick/profile.h"
-#include "magick/property.h"
-#include "magick/quantum-private.h"
-#include "magick/resource_.h"
-#include "magick/resize.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
-#include "magick/transform.h"
-#include "magick/utility.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/attribute.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/color.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/compress.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/delegate.h"
+#include "MagickCore/delegate-private.h"
+#include "MagickCore/draw.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/option.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/profile.h"
+#include "MagickCore/property.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/resize.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/transform.h"
+#include "MagickCore/utility.h"
+#include "MagickCore/module.h"
/*
Define declarations.
@@ -1007,10 +1009,7 @@
media_info,
page_info;
- register const IndexPacket
- *indexes;
-
- register const PixelPacket
+ register const Quantum
*p;
register unsigned char
@@ -1195,7 +1194,7 @@
case FaxCompression:
case Group4Compression:
{
- if ((IsMonochromeImage(image,&image->exception) == MagickFalse) ||
+ if ((IsImageMonochrome(image,&image->exception) == MagickFalse) ||
(image->matte != MagickFalse))
compression=RLECompression;
break;
@@ -1551,7 +1550,7 @@
ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed");
if ((compression == FaxCompression) || (compression == Group4Compression) ||
((image_info->type != TrueColorType) &&
- (IsGrayImage(image,&image->exception) != MagickFalse)))
+ (IsImageGray(image,&image->exception) != MagickFalse)))
{
switch (compression)
{
@@ -1600,12 +1599,12 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- *q++=ScaleQuantumToChar(PixelIntensityToQuantum(p));
- p++;
+ *q++=ScaleQuantumToChar(GetPixelIntensity(image,p));
+ p+=GetPixelChannels(image);
}
if (image->previous == (Image *) NULL)
{
@@ -1641,13 +1640,13 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- Ascii85Encode(image,
- ScaleQuantumToChar(PixelIntensityToQuantum(p)));
- p++;
+ Ascii85Encode(image,ScaleQuantumToChar(
+ GetPixelIntensity(image,p)));
+ p+=GetPixelChannels(image);
}
if (image->previous == (Image *) NULL)
{
@@ -1703,17 +1702,16 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetVirtualIndexQueue(image);
for (x=0; x < (ssize_t) image->columns; x++)
{
- *q++=ScaleQuantumToChar(GetPixelRed(p));
- *q++=ScaleQuantumToChar(GetPixelGreen(p));
- *q++=ScaleQuantumToChar(GetPixelBlue(p));
+ *q++=ScaleQuantumToChar(GetPixelRed(image,p));
+ *q++=ScaleQuantumToChar(GetPixelGreen(image,p));
+ *q++=ScaleQuantumToChar(GetPixelBlue(image,p));
if (image->colorspace == CMYKColorspace)
- *q++=ScaleQuantumToChar(GetPixelIndex(indexes+x));
- p++;
+ *q++=ScaleQuantumToChar(GetPixelBlack(image,p));
+ p+=GetPixelChannels(image);
}
if (image->previous == (Image *) NULL)
{
@@ -1749,21 +1747,17 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetVirtualIndexQueue(image);
for (x=0; x < (ssize_t) image->columns; x++)
{
- Ascii85Encode(image,ScaleQuantumToChar(
- GetPixelRed(p)));
- Ascii85Encode(image,ScaleQuantumToChar(
- GetPixelGreen(p)));
- Ascii85Encode(image,ScaleQuantumToChar(
- GetPixelBlue(p)));
+ Ascii85Encode(image,ScaleQuantumToChar(GetPixelRed(image,p)));
+ Ascii85Encode(image,ScaleQuantumToChar(GetPixelGreen(image,p)));
+ Ascii85Encode(image,ScaleQuantumToChar(GetPixelBlue(image,p)));
if (image->colorspace == CMYKColorspace)
Ascii85Encode(image,ScaleQuantumToChar(
- GetPixelIndex(indexes+x)));
- p++;
+ GetPixelBlack(image,p)));
+ p+=GetPixelChannels(image);
}
if (image->previous == (Image *) NULL)
{
@@ -1804,11 +1798,13 @@
{
p=GetVirtualPixels(image,0,y,image->columns,1,
&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetVirtualIndexQueue(image);
for (x=0; x < (ssize_t) image->columns; x++)
- *q++=(unsigned char) GetPixelIndex(indexes+x);
+ {
+ *q++=(unsigned char) GetPixelIndex(image,p);
+ p+=GetPixelChannels(image);
+ }
if (image->previous == (Image *) NULL)
{
status=SetImageProgress(image,SaveImageTag,
@@ -1844,12 +1840,13 @@
{
p=GetVirtualPixels(image,0,y,image->columns,1,
&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetVirtualIndexQueue(image);
for (x=0; x < (ssize_t) image->columns; x++)
- Ascii85Encode(image,(unsigned char)
- GetPixelIndex(indexes+x));
+ {
+ Ascii85Encode(image,(unsigned char) GetPixelIndex(image,p));
+ p+=GetPixelChannels(image);
+ }
if (image->previous == (Image *) NULL)
{
status=SetImageProgress(image,SaveImageTag,
@@ -1890,7 +1887,7 @@
if ((compression == FaxCompression) ||
(compression == Group4Compression) ||
((image_info->type != TrueColorType) &&
- (IsGrayImage(image,&image->exception) != MagickFalse)))
+ (IsImageGray(image,&image->exception) != MagickFalse)))
(void) CopyMagickString(buffer,"/DeviceGray\n",MaxTextExtent);
else
if ((image->storage_class == DirectClass) || (image->colors > 256) ||
@@ -1997,7 +1994,7 @@
if ((compression == FaxCompression) ||
(compression == Group4Compression) ||
((image_info->type != TrueColorType) &&
- (IsGrayImage(tile_image,&image->exception) != MagickFalse)))
+ (IsImageGray(tile_image,&image->exception) != MagickFalse)))
{
switch (compression)
{
@@ -2051,12 +2048,12 @@
{
p=GetVirtualPixels(tile_image,0,y,tile_image->columns,1,
&tile_image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) tile_image->columns; x++)
{
- *q++=ScaleQuantumToChar(PixelIntensityToQuantum(p));
- p++;
+ *q++=ScaleQuantumToChar(GetPixelIntensity(tile_image,p));
+ p+=GetPixelChannels(tile_image);
}
}
#if defined(MAGICKCORE_ZLIB_DELEGATE)
@@ -2086,13 +2083,13 @@
{
p=GetVirtualPixels(tile_image,0,y,tile_image->columns,1,
&tile_image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) tile_image->columns; x++)
{
Ascii85Encode(image,
- ScaleQuantumToChar(PixelIntensityToQuantum(p)));
- p++;
+ ScaleQuantumToChar(GetPixelIntensity(tile_image,p)));
+ p+=GetPixelChannels(tile_image);
}
}
Ascii85Flush(image);
@@ -2146,17 +2143,16 @@
{
p=GetVirtualPixels(tile_image,0,y,tile_image->columns,1,
&tile_image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetVirtualIndexQueue(tile_image);
for (x=0; x < (ssize_t) tile_image->columns; x++)
{
- *q++=ScaleQuantumToChar(GetPixelRed(p));
- *q++=ScaleQuantumToChar(GetPixelGreen(p));
- *q++=ScaleQuantumToChar(GetPixelBlue(p));
+ *q++=ScaleQuantumToChar(GetPixelRed(tile_image,p));
+ *q++=ScaleQuantumToChar(GetPixelGreen(tile_image,p));
+ *q++=ScaleQuantumToChar(GetPixelBlue(tile_image,p));
if (image->colorspace == CMYKColorspace)
- *q++=ScaleQuantumToChar(GetPixelIndex(indexes+x));
- p++;
+ *q++=ScaleQuantumToChar(GetPixelBlack(tile_image,p));
+ p+=GetPixelChannels(tile_image);
}
}
#if defined(MAGICKCORE_ZLIB_DELEGATE)
@@ -2186,21 +2182,20 @@
{
p=GetVirtualPixels(tile_image,0,y,tile_image->columns,1,
&tile_image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetVirtualIndexQueue(tile_image);
for (x=0; x < (ssize_t) tile_image->columns; x++)
{
Ascii85Encode(image,ScaleQuantumToChar(
- GetPixelRed(p)));
+ GetPixelRed(tile_image,p)));
Ascii85Encode(image,ScaleQuantumToChar(
- GetPixelGreen(p)));
+ GetPixelGreen(tile_image,p)));
Ascii85Encode(image,ScaleQuantumToChar(
- GetPixelBlue(p)));
+ GetPixelBlue(tile_image,p)));
if (image->colorspace == CMYKColorspace)
Ascii85Encode(image,ScaleQuantumToChar(
- GetPixelIndex(indexes+x)));
- p++;
+ GetPixelBlack(tile_image,p)));
+ p+=GetPixelChannels(tile_image);
}
}
Ascii85Flush(image);
@@ -2237,11 +2232,13 @@
{
p=GetVirtualPixels(tile_image,0,y,tile_image->columns,1,
&tile_image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetVirtualIndexQueue(tile_image);
for (x=0; x < (ssize_t) tile_image->columns; x++)
- *q++=(unsigned char) GetPixelIndex(indexes+x);
+ {
+ *q++=(unsigned char) GetPixelIndex(tile_image,p);
+ q+=GetPixelChannels(image);
+ }
}
#if defined(MAGICKCORE_ZLIB_DELEGATE)
if (compression == ZipCompression)
@@ -2270,12 +2267,14 @@
{
p=GetVirtualPixels(tile_image,0,y,tile_image->columns,1,
&tile_image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetVirtualIndexQueue(tile_image);
for (x=0; x < (ssize_t) tile_image->columns; x++)
+ {
Ascii85Encode(image,(unsigned char)
- GetPixelIndex(indexes+x));
+ GetPixelIndex(tile_image,p));
+ p+=GetPixelChannels(image);
+ }
}
Ascii85Flush(image);
break;
@@ -2436,12 +2435,12 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- *q++=ScaleQuantumToChar((Quantum) (GetPixelAlpha(p)));
- p++;
+ *q++=ScaleQuantumToChar(GetPixelAlpha(image,p));
+ p+=GetPixelChannels(image);
}
}
#if defined(MAGICKCORE_ZLIB_DELEGATE)
@@ -2470,13 +2469,12 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- Ascii85Encode(image,ScaleQuantumToChar((Quantum) (QuantumRange-
- GetPixelOpacity(p))));
- p++;
+ Ascii85Encode(image,ScaleQuantumToChar(GetPixelAlpha(image,p)));
+ p+=GetPixelChannels(image);
}
}
Ascii85Flush(image);
diff --git a/coders/pes.c b/coders/pes.c
index 0a76dec..a722d72 100644
--- a/coders/pes.c
+++ b/coders/pes.c
@@ -42,36 +42,36 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/property.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/client.h"
-#include "magick/colorspace.h"
-#include "magick/constitute.h"
-#include "magick/decorate.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/gem.h"
-#include "magick/geometry.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/montage.h"
-#include "magick/resize.h"
-#include "magick/shear.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
-#include "magick/resource_.h"
-#include "magick/transform.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/property.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/client.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/decorate.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/gem.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/montage.h"
+#include "MagickCore/resize.h"
+#include "MagickCore/shear.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/transform.h"
+#include "MagickCore/utility.h"
/*
Typedef declarations.
diff --git a/coders/pict.c b/coders/pict.c
index f113fcd..d514d69 100644
--- a/coders/pict.c
+++ b/coders/pict.c
@@ -39,34 +39,35 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/color-private.h"
-#include "magick/colormap.h"
-#include "magick/colormap-private.h"
-#include "magick/colorspace.h"
-#include "magick/composite.h"
-#include "magick/constitute.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/log.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/profile.h"
-#include "magick/resource_.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
-#include "magick/transform.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colormap.h"
+#include "MagickCore/colormap-private.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/composite.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/log.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/profile.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/transform.h"
+#include "MagickCore/utility.h"
/*
ImageMagick Macintosh PICT Methods.
@@ -492,7 +493,7 @@
*/
for (y=0; y < (ssize_t) image->rows; y++)
{
- q=pixels+y*width;
+ q=pixels+y*width*GetPixelChannels(image);;
number_pixels=bytes_per_line;
count=ReadBlob(blob,(size_t) number_pixels,scanline);
(void) count;
@@ -795,9 +796,6 @@
Image
*image;
- IndexPacket
- index;
-
int
c,
code;
@@ -812,17 +810,15 @@
PICTPixmap
pixmap;
- register IndexPacket
- *indexes;
+ Quantum
+ index;
- register ssize_t
- x;
-
- register PixelPacket
+ register Quantum
*q;
register ssize_t
- i;
+ i,
+ x;
size_t
extent,
@@ -1033,8 +1029,8 @@
case 0x9a:
case 0x9b:
{
- ssize_t
- bytes_per_line;
+ Image
+ *tile_image;
PICTRectangle
source,
@@ -1046,12 +1042,12 @@
size_t
j;
+ ssize_t
+ bytes_per_line;
+
unsigned char
*pixels;
- Image
- *tile_image;
-
/*
Pixmap clipped by a rectangle.
*/
@@ -1166,21 +1162,20 @@
ThrowReaderException(CorruptImageError,"NotEnoughPixelData");
q=QueueAuthenticPixels(tile_image,0,y,tile_image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(tile_image);
for (x=0; x < (ssize_t) tile_image->columns; x++)
{
if (tile_image->storage_class == PseudoClass)
{
index=ConstrainColormapIndex(tile_image,*p);
- SetPixelIndex(indexes+x,index);
- SetPixelRed(q,
- tile_image->colormap[(ssize_t) index].red);
- SetPixelGreen(q,
- tile_image->colormap[(ssize_t) index].green);
- SetPixelBlue(q,
- tile_image->colormap[(ssize_t) index].blue);
+ SetPixelIndex(tile_image,index,q);
+ SetPixelRed(tile_image,
+ tile_image->colormap[(ssize_t) index].red,q);
+ SetPixelGreen(tile_image,
+ tile_image->colormap[(ssize_t) index].green,q);
+ SetPixelBlue(tile_image,
+ tile_image->colormap[(ssize_t) index].blue,q);
}
else
{
@@ -1188,13 +1183,13 @@
{
i=(*p++);
j=(*p);
- SetPixelRed(q,ScaleCharToQuantum(
- (unsigned char) ((i & 0x7c) << 1)));
- SetPixelGreen(q,ScaleCharToQuantum(
+ SetPixelRed(tile_image,ScaleCharToQuantum(
+ (unsigned char) ((i & 0x7c) << 1)),q);
+ SetPixelGreen(tile_image,ScaleCharToQuantum(
(unsigned char) (((i & 0x03) << 6) |
- ((j & 0xe0) >> 2))));
- SetPixelBlue(q,ScaleCharToQuantum(
- (unsigned char) ((j & 0x1f) << 3)));
+ ((j & 0xe0) >> 2))),q);
+ SetPixelBlue(tile_image,ScaleCharToQuantum(
+ (unsigned char) ((j & 0x1f) << 3)),q);
}
else
if (tile_image->matte == MagickFalse)
@@ -1202,28 +1197,28 @@
if (p > (pixels+extent+2*image->columns))
ThrowReaderException(CorruptImageError,
"NotEnoughPixelData");
- SetPixelRed(q,ScaleCharToQuantum(*p));
- SetPixelGreen(q,ScaleCharToQuantum(
- *(p+tile_image->columns)));
- SetPixelBlue(q,ScaleCharToQuantum(
- *(p+2*tile_image->columns)));
+ SetPixelRed(tile_image,ScaleCharToQuantum(*p),q);
+ SetPixelGreen(tile_image,ScaleCharToQuantum(
+ *(p+tile_image->columns)),q);
+ SetPixelBlue(tile_image,ScaleCharToQuantum(
+ *(p+2*tile_image->columns)),q);
}
else
{
if (p > (pixels+extent+3*image->columns))
ThrowReaderException(CorruptImageError,
"NotEnoughPixelData");
- SetPixelAlpha(q,ScaleCharToQuantum(*p));
- SetPixelRed(q,ScaleCharToQuantum(
- *(p+tile_image->columns)));
- SetPixelGreen(q,ScaleCharToQuantum(
- *(p+2*tile_image->columns)));
- SetPixelBlue(q,ScaleCharToQuantum(
- *(p+3*tile_image->columns)));
+ SetPixelAlpha(tile_image,ScaleCharToQuantum(*p),q);
+ SetPixelRed(tile_image,ScaleCharToQuantum(
+ *(p+tile_image->columns)),q);
+ SetPixelGreen(tile_image,ScaleCharToQuantum(
+ *(p+2*tile_image->columns)),q);
+ SetPixelBlue(tile_image,ScaleCharToQuantum(
+ *(p+3*tile_image->columns)),q);
}
}
p++;
- q++;
+ q+=GetPixelChannels(tile_image);
}
if (SyncAuthenticPixels(tile_image,exception) == MagickFalse)
break;
@@ -1560,10 +1555,7 @@
size_rectangle,
source_rectangle;
- register const IndexPacket
- *indexes;
-
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
@@ -1583,7 +1575,6 @@
*packed_scanline,
*scanline;
-
unsigned short
base_address,
row_bytes,
@@ -1881,11 +1872,13 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetVirtualIndexQueue(image);
for (x=0; x < (ssize_t) image->columns; x++)
- scanline[x]=(unsigned char) GetPixelIndex(indexes+x);
+ {
+ scanline[x]=(unsigned char) GetPixelIndex(image,p);
+ p+=GetPixelChannels(image);
+ }
count+=EncodeImage(image,scanline,(size_t) (row_bytes & 0x7FFF),
packed_scanline);
if (image->previous == (Image *) NULL)
@@ -1919,7 +1912,7 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
red=scanline;
green=scanline+image->columns;
@@ -1933,13 +1926,12 @@
}
for (x=0; x < (ssize_t) image->columns; x++)
{
- *red++=ScaleQuantumToChar(GetPixelRed(p));
- *green++=ScaleQuantumToChar(GetPixelGreen(p));
- *blue++=ScaleQuantumToChar(GetPixelBlue(p));
+ *red++=ScaleQuantumToChar(GetPixelRed(image,p));
+ *green++=ScaleQuantumToChar(GetPixelGreen(image,p));
+ *blue++=ScaleQuantumToChar(GetPixelBlue(image,p));
if (image->matte != MagickFalse)
- *opacity++=ScaleQuantumToChar((Quantum)
- (GetPixelAlpha(p)));
- p++;
+ *opacity++=ScaleQuantumToChar((Quantum) (GetPixelAlpha(image,p)));
+ p+=GetPixelChannels(image);
}
count+=EncodeImage(image,scanline,bytes_per_line & 0x7FFF,
packed_scanline);
diff --git a/coders/pix.c b/coders/pix.c
index 2a76caa..bc0dbd1 100644
--- a/coders/pix.c
+++ b/coders/pix.c
@@ -39,24 +39,25 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/colormap.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/colormap.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -90,24 +91,19 @@
Image
*image;
- IndexPacket
- index;
-
MagickBooleanType
status;
Quantum
blue,
green,
+ index,
red;
- register IndexPacket
- *indexes;
-
register ssize_t
x;
- register PixelPacket
+ register Quantum
*q;
size_t
@@ -166,14 +162,13 @@
red=(Quantum) 0;
green=(Quantum) 0;
blue=(Quantum) 0;
- index=(IndexPacket) 0;
+ index=0;
length=0;
for (y=0; y < (ssize_t) image->rows; y++)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
for (x=0; x < (ssize_t) image->columns; x++)
{
if (length == 0)
@@ -189,12 +184,12 @@
}
}
if (image->storage_class == PseudoClass)
- SetPixelIndex(indexes+x,index);
- SetPixelBlue(q,blue);
- SetPixelGreen(q,green);
- SetPixelRed(q,red);
+ SetPixelIndex(image,index,q);
+ SetPixelBlue(image,blue,q);
+ SetPixelGreen(image,green,q);
+ SetPixelRed(image,red,q);
length--;
- q++;
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
diff --git a/coders/plasma.c b/coders/plasma.c
index 6f69a93..411398c 100644
--- a/coders/plasma.c
+++ b/coders/plasma.c
@@ -39,28 +39,29 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/constitute.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/fx.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/random_.h"
-#include "magick/random-private.h"
-#include "magick/signature-private.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/fx.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/random_.h"
+#include "MagickCore/random-private.h"
+#include "MagickCore/signature-private.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -105,21 +106,21 @@
QuantumAny
range;
- register PixelPacket
+ register Quantum
*q;
exception=(&image->exception);
q=GetAuthenticPixels(image,(ssize_t) ceil(x-0.5),(ssize_t) ceil(y-0.5),1,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
return;
range=GetQuantumRange(16UL);
- SetPixelRed(q,ScaleAnyToQuantum((size_t) (65535.0*
- GetPseudoRandomValue(random_info)+0.5),range));
- SetPixelGreen(q,ScaleAnyToQuantum((size_t) (65535.0*
- GetPseudoRandomValue(random_info)+0.5),range));
- SetPixelBlue(q,ScaleAnyToQuantum((size_t) (65535.0*
- GetPseudoRandomValue(random_info)+0.5),range));
+ SetPixelRed(image,ScaleAnyToQuantum((size_t) (65535.0*
+ GetPseudoRandomValue(random_info)+0.5),range),q);
+ SetPixelGreen(image,ScaleAnyToQuantum((size_t) (65535.0*
+ GetPseudoRandomValue(random_info)+0.5),range),q);
+ SetPixelBlue(image,ScaleAnyToQuantum((size_t) (65535.0*
+ GetPseudoRandomValue(random_info)+0.5),range),q);
(void) SyncAuthenticPixels(image,exception);
}
@@ -138,7 +139,7 @@
register ssize_t
x;
- register PixelPacket
+ register Quantum
*q;
register size_t
@@ -169,12 +170,12 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelOpacity(q,QuantumRange/2);
- q++;
+ SetPixelAlpha(image,QuantumRange/2,q);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
diff --git a/coders/png.c b/coders/png.c
index df31f4d..7d188f0 100644
--- a/coders/png.c
+++ b/coders/png.c
@@ -41,45 +41,47 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/artifact.h"
-#include "magick/attribute.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/color.h"
-#include "magick/color-private.h"
-#include "magick/colormap.h"
-#include "magick/colorspace.h"
-#include "magick/constitute.h"
-#include "magick/enhance.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/geometry.h"
-#include "magick/histogram.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/layer.h"
-#include "magick/list.h"
-#include "magick/log.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/module.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/option.h"
-#include "magick/quantum-private.h"
-#include "magick/profile.h"
-#include "magick/property.h"
-#include "magick/resource_.h"
-#include "magick/semaphore.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/statistic.h"
-#include "magick/string_.h"
-#include "magick/string-private.h"
-#include "magick/transform.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/artifact.h"
+#include "MagickCore/attribute.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/color.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colormap.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/enhance.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/histogram.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/layer.h"
+#include "MagickCore/list.h"
+#include "MagickCore/log.h"
+#include "MagickCore/MagickCore.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/option.h"
+#include "MagickCore/pixel.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/profile.h"
+#include "MagickCore/property.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/semaphore.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/statistic.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/string-private.h"
+#include "MagickCore/transform.h"
+#include "MagickCore/utility.h"
#if defined(MAGICKCORE_PNG_DELEGATE)
/* Suppress libpng pedantic warnings that were added in
@@ -133,7 +135,7 @@
/* LBR01: Replicate top bit */
-#define LBR01PacketRed(pixelpacket) \
+#define LBR01PixelPacketRed(pixelpacket) \
(pixelpacket).red=(ScaleQuantumToChar((pixelpacket).red) < 0x10 ? \
0 : QuantumRange);
@@ -145,13 +147,13 @@
(pixelpacket).blue=(ScaleQuantumToChar((pixelpacket).blue) < 0x10 ? \
0 : QuantumRange);
-#define LBR01PacketOpacity(pixelpacket) \
- (pixelpacket).opacity=(ScaleQuantumToChar((pixelpacket).opacity) < 0x10 ? \
+#define LBR01PacketAlpha(pixelpacket) \
+ (pixelpacket).alpha=(ScaleQuantumToChar((pixelpacket).alpha) < 0x10 ? \
0 : QuantumRange);
#define LBR01PacketRGB(pixelpacket) \
{ \
- LBR01PacketRed((pixelpacket)); \
+ LBR01PixelPacketRed((pixelpacket)); \
LBR01PacketGreen((pixelpacket)); \
LBR01PacketBlue((pixelpacket)); \
}
@@ -159,41 +161,41 @@
#define LBR01PacketRGBO(pixelpacket) \
{ \
LBR01PacketRGB((pixelpacket)); \
- LBR01PacketOpacity((pixelpacket)); \
+ LBR01PacketAlpha((pixelpacket)); \
}
#define LBR01PixelRed(pixel) \
- (ScaleQuantumToChar(GetPixelRed((pixel))) < 0x10 ? \
+ (ScaleQuantumToChar(GetPixelRed(image,(pixel))) < 0x10 ? \
0 : QuantumRange);
-#define LBR01PixelGreen(pixel) \
- (ScaleQuantumToChar(GetPixelGreen((pixel))) < 0x10 ? \
+#define LBR01Green(pixel) \
+ (ScaleQuantumToChar(GetPixelGreen(image,(pixel))) < 0x10 ? \
0 : QuantumRange);
-#define LBR01PixelBlue(pixel) \
- (ScaleQuantumToChar(GetPixelBlue((pixel))) < 0x10 ? \
+#define LBR01Blue(pixel) \
+ (ScaleQuantumToChar(GetPixelBlue(image,(pixel))) < 0x10 ? \
0 : QuantumRange);
-#define LBR01PixelOpacity(pixel) \
- (ScaleQuantumToChar(GetPixelOpacity((pixel))) < 0x10 ? \
+#define LBR01Alpha(pixel) \
+ (ScaleQuantumToChar(GetPixelAlpha(image,(pixel))) < 0x10 ? \
0 : QuantumRange);
-#define LBR01PixelRGB(pixel) \
+#define LBR01RGB(pixel) \
{ \
LBR01PixelRed((pixel)); \
- LBR01PixelGreen((pixel)); \
- LBR01PixelBlue((pixel)); \
+ LBR01Green((pixel)); \
+ LBR01Blue((pixel)); \
}
-#define LBR01PixelRGBO(pixel) \
+#define LBR01RGBA(pixel) \
{ \
- LBR01PixelRGB((pixel)); \
- LBR01PixelOpacity((pixel)); \
+ LBR01RGB((pixel)); \
+ LBR01Alpha((pixel)); \
}
/* LBR02: Replicate top 2 bits */
-#define LBR02PacketRed(pixelpacket) \
+#define LBR02PixelPacketRed(pixelpacket) \
{ \
unsigned char lbr_bits=ScaleQuantumToChar((pixelpacket).red) & 0xc0; \
(pixelpacket).red=ScaleCharToQuantum( \
@@ -211,16 +213,16 @@
(pixelpacket).blue=ScaleCharToQuantum( \
(lbr_bits | (lbr_bits >> 2) | (lbr_bits >> 4) | (lbr_bits >> 6))); \
}
-#define LBR02PacketOpacity(pixelpacket) \
+#define LBR02PacketAlpha(pixelpacket) \
{ \
- unsigned char lbr_bits=ScaleQuantumToChar((pixelpacket).opacity) & 0xc0; \
- (pixelpacket).opacity=ScaleCharToQuantum( \
+ unsigned char lbr_bits=ScaleQuantumToChar((pixelpacket).alpha) & 0xc0; \
+ (pixelpacket).alpha=ScaleCharToQuantum( \
(lbr_bits | (lbr_bits >> 2) | (lbr_bits >> 4) | (lbr_bits >> 6))); \
}
#define LBR02PacketRGB(pixelpacket) \
{ \
- LBR02PacketRed((pixelpacket)); \
+ LBR02PixelPacketRed((pixelpacket)); \
LBR02PacketGreen((pixelpacket)); \
LBR02PacketBlue((pixelpacket)); \
}
@@ -228,55 +230,55 @@
#define LBR02PacketRGBO(pixelpacket) \
{ \
LBR02PacketRGB((pixelpacket)); \
- LBR02PacketOpacity((pixelpacket)); \
+ LBR02PacketAlpha((pixelpacket)); \
}
#define LBR02PixelRed(pixel) \
{ \
- unsigned char lbr_bits=ScaleQuantumToChar(GetPixelRed((pixel))) \
+ unsigned char lbr_bits=ScaleQuantumToChar(GetPixelRed(image,(pixel))) \
& 0xc0; \
- SetPixelRed((pixel), ScaleCharToQuantum( \
- (lbr_bits | (lbr_bits >> 2) | (lbr_bits >> 4) | (lbr_bits >> 6)))); \
+ SetPixelRed(image, ScaleCharToQuantum( \
+ (lbr_bits | (lbr_bits >> 2) | (lbr_bits >> 4) | (lbr_bits >> 6))), (pixel)); \
}
-#define LBR02PixelGreen(pixel) \
+#define LBR02Green(pixel) \
{ \
- unsigned char lbr_bits=ScaleQuantumToChar(GetPixelGreen((pixel)))\
+ unsigned char lbr_bits=ScaleQuantumToChar(GetPixelGreen(image,(pixel)))\
& 0xc0; \
- SetPixelGreen((pixel), ScaleCharToQuantum( \
- (lbr_bits | (lbr_bits >> 2) | (lbr_bits >> 4) | (lbr_bits >> 6)))); \
+ SetPixelGreen(image, ScaleCharToQuantum( \
+ (lbr_bits | (lbr_bits >> 2) | (lbr_bits >> 4) | (lbr_bits >> 6))), (pixel)); \
}
-#define LBR02PixelBlue(pixel) \
+#define LBR02Blue(pixel) \
{ \
unsigned char lbr_bits= \
- ScaleQuantumToChar(GetPixelBlue((pixel))) & 0xc0; \
- SetPixelBlue((pixel), ScaleCharToQuantum( \
- (lbr_bits | (lbr_bits >> 2) | (lbr_bits >> 4) | (lbr_bits >> 6)))); \
+ ScaleQuantumToChar(GetPixelBlue(image,(pixel))) & 0xc0; \
+ SetPixelBlue(image, ScaleCharToQuantum( \
+ (lbr_bits | (lbr_bits >> 2) | (lbr_bits >> 4) | (lbr_bits >> 6))), (pixel)); \
}
-#define LBR02PixelOpacity(pixel) \
+#define LBR02Alpha(pixel) \
{ \
unsigned char lbr_bits= \
- ScaleQuantumToChar(GetPixelOpacity((pixel))) & 0xc0; \
- SetPixelOpacity((pixel), ScaleCharToQuantum( \
- (lbr_bits | (lbr_bits >> 2) | (lbr_bits >> 4) | (lbr_bits >> 6)))); \
+ ScaleQuantumToChar(GetPixelAlpha(image,(pixel))) & 0xc0; \
+ SetPixelAlpha(image, ScaleCharToQuantum( \
+ (lbr_bits | (lbr_bits >> 2) | (lbr_bits >> 4) | (lbr_bits >> 6))), (pixel) ); \
}
-#define LBR02PixelRGB(pixel) \
+#define LBR02RGB(pixel) \
{ \
LBR02PixelRed((pixel)); \
- LBR02PixelGreen((pixel)); \
- LBR02PixelBlue((pixel)); \
+ LBR02Green((pixel)); \
+ LBR02Blue((pixel)); \
}
-#define LBR02PixelRGBO(pixel) \
+#define LBR02RGBA(pixel) \
{ \
- LBR02PixelRGB((pixel)); \
- LBR02PixelOpacity((pixel)); \
+ LBR02RGB((pixel)); \
+ LBR02Alpha((pixel)); \
}
/* LBR03: Replicate top 3 bits (only used with opaque pixels during
PNG8 quantization) */
-#define LBR03PacketRed(pixelpacket) \
+#define LBR03PixelPacketRed(pixelpacket) \
{ \
unsigned char lbr_bits=ScaleQuantumToChar((pixelpacket).red) & 0xe0; \
(pixelpacket).red=ScaleCharToQuantum( \
@@ -297,43 +299,43 @@
#define LBR03PacketRGB(pixelpacket) \
{ \
- LBR03PacketRed((pixelpacket)); \
+ LBR03PixelPacketRed((pixelpacket)); \
LBR03PacketGreen((pixelpacket)); \
LBR03PacketBlue((pixelpacket)); \
}
#define LBR03PixelRed(pixel) \
{ \
- unsigned char lbr_bits=ScaleQuantumToChar(GetPixelRed((pixel))) \
+ unsigned char lbr_bits=ScaleQuantumToChar(GetPixelRed(image,(pixel))) \
& 0xe0; \
- SetPixelRed((pixel), ScaleCharToQuantum( \
- (lbr_bits | (lbr_bits >> 3) | (lbr_bits >> 6)))); \
+ SetPixelRed(image, ScaleCharToQuantum( \
+ (lbr_bits | (lbr_bits >> 3) | (lbr_bits >> 6))), (pixel)); \
}
-#define LBR03PixelGreen(pixel) \
+#define LBR03Green(pixel) \
{ \
- unsigned char lbr_bits=ScaleQuantumToChar(GetPixelGreen((pixel)))\
+ unsigned char lbr_bits=ScaleQuantumToChar(GetPixelGreen(image,(pixel)))\
& 0xe0; \
- SetPixelGreen((pixel), ScaleCharToQuantum( \
- (lbr_bits | (lbr_bits >> 3) | (lbr_bits >> 6)))); \
+ SetPixelGreen(image, ScaleCharToQuantum( \
+ (lbr_bits | (lbr_bits >> 3) | (lbr_bits >> 6))), (pixel)); \
}
-#define LBR03PixelBlue(pixel) \
+#define LBR03Blue(pixel) \
{ \
- unsigned char lbr_bits=ScaleQuantumToChar(GetPixelBlue((pixel))) \
+ unsigned char lbr_bits=ScaleQuantumToChar(GetPixelBlue(image,(pixel))) \
& 0xe0; \
- SetPixelBlue((pixel), ScaleCharToQuantum( \
- (lbr_bits | (lbr_bits >> 3) | (lbr_bits >> 6)))); \
+ SetPixelBlue(image, ScaleCharToQuantum( \
+ (lbr_bits | (lbr_bits >> 3) | (lbr_bits >> 6))), (pixel)); \
}
-#define LBR03PixelRGB(pixel) \
+#define LBR03RGB(pixel) \
{ \
LBR03PixelRed((pixel)); \
- LBR03PixelGreen((pixel)); \
- LBR03PixelBlue((pixel)); \
+ LBR03Green((pixel)); \
+ LBR03Blue((pixel)); \
}
/* LBR04: Replicate top 4 bits */
-#define LBR04PacketRed(pixelpacket) \
+#define LBR04PixelPacketRed(pixelpacket) \
{ \
unsigned char lbr_bits=ScaleQuantumToChar((pixelpacket).red) & 0xf0; \
(pixelpacket).red=ScaleCharToQuantum((lbr_bits | (lbr_bits >> 4))); \
@@ -348,15 +350,15 @@
unsigned char lbr_bits=ScaleQuantumToChar((pixelpacket).blue) & 0xf0; \
(pixelpacket).blue=ScaleCharToQuantum((lbr_bits | (lbr_bits >> 4))); \
}
-#define LBR04PacketOpacity(pixelpacket) \
+#define LBR04PacketAlpha(pixelpacket) \
{ \
- unsigned char lbr_bits=ScaleQuantumToChar((pixelpacket).opacity) & 0xf0; \
- (pixelpacket).opacity=ScaleCharToQuantum((lbr_bits | (lbr_bits >> 4))); \
+ unsigned char lbr_bits=ScaleQuantumToChar((pixelpacket).alpha) & 0xf0; \
+ (pixelpacket).alpha=ScaleCharToQuantum((lbr_bits | (lbr_bits >> 4))); \
}
#define LBR04PacketRGB(pixelpacket) \
{ \
- LBR04PacketRed((pixelpacket)); \
+ LBR04PixelPacketRed((pixelpacket)); \
LBR04PacketGreen((pixelpacket)); \
LBR04PacketBlue((pixelpacket)); \
}
@@ -364,55 +366,55 @@
#define LBR04PacketRGBO(pixelpacket) \
{ \
LBR04PacketRGB((pixelpacket)); \
- LBR04PacketOpacity((pixelpacket)); \
+ LBR04PacketAlpha((pixelpacket)); \
}
#define LBR04PixelRed(pixel) \
{ \
- unsigned char lbr_bits=ScaleQuantumToChar(GetPixelRed((pixel))) \
+ unsigned char lbr_bits=ScaleQuantumToChar(GetPixelRed(image,(pixel))) \
& 0xf0; \
- SetPixelRed((pixel),\
- ScaleCharToQuantum((lbr_bits | (lbr_bits >> 4)))); \
+ SetPixelRed(image,\
+ ScaleCharToQuantum((lbr_bits | (lbr_bits >> 4))), (pixel)); \
}
-#define LBR04PixelGreen(pixel) \
+#define LBR04Green(pixel) \
{ \
- unsigned char lbr_bits=ScaleQuantumToChar(GetPixelGreen((pixel)))\
+ unsigned char lbr_bits=ScaleQuantumToChar(GetPixelGreen(image,(pixel)))\
& 0xf0; \
- SetPixelGreen((pixel),\
- ScaleCharToQuantum((lbr_bits | (lbr_bits >> 4)))); \
+ SetPixelGreen(image,\
+ ScaleCharToQuantum((lbr_bits | (lbr_bits >> 4))), (pixel)); \
}
-#define LBR04PixelBlue(pixel) \
+#define LBR04Blue(pixel) \
{ \
unsigned char lbr_bits= \
- ScaleQuantumToChar(GetPixelBlue((pixel))) & 0xf0; \
- SetPixelBlue((pixel),\
- ScaleCharToQuantum((lbr_bits | (lbr_bits >> 4)))); \
+ ScaleQuantumToChar(GetPixelBlue(image,(pixel))) & 0xf0; \
+ SetPixelBlue(image,\
+ ScaleCharToQuantum((lbr_bits | (lbr_bits >> 4))), (pixel)); \
}
-#define LBR04PixelOpacity(pixel) \
+#define LBR04Alpha(pixel) \
{ \
unsigned char lbr_bits= \
- ScaleQuantumToChar(GetPixelOpacity((pixel))) & 0xf0; \
- SetPixelOpacity((pixel),\
- ScaleCharToQuantum((lbr_bits | (lbr_bits >> 4)))); \
+ ScaleQuantumToChar(GetPixelAlpha(image,(pixel))) & 0xf0; \
+ SetPixelAlpha(image,\
+ ScaleCharToQuantum((lbr_bits | (lbr_bits >> 4))), (pixel)); \
}
-#define LBR04PixelRGB(pixel) \
+#define LBR04RGB(pixel) \
{ \
LBR04PixelRed((pixel)); \
- LBR04PixelGreen((pixel)); \
- LBR04PixelBlue((pixel)); \
+ LBR04Green((pixel)); \
+ LBR04Blue((pixel)); \
}
-#define LBR04PixelRGBO(pixel) \
+#define LBR04RGBA(pixel) \
{ \
- LBR04PixelRGB((pixel)); \
- LBR04PixelOpacity((pixel)); \
+ LBR04RGB((pixel)); \
+ LBR04Alpha((pixel)); \
}
/* LBR08: Replicate top 8 bits */
-#define LBR08PacketRed(pixelpacket) \
+#define LBR08PixelPacketRed(pixelpacket) \
{ \
unsigned char lbr_bits=ScaleQuantumToChar((pixelpacket).red); \
(pixelpacket).red=ScaleCharToQuantum((lbr_bits)); \
@@ -427,15 +429,15 @@
unsigned char lbr_bits=ScaleQuantumToChar((pixelpacket).blue); \
(pixelpacket).blue=ScaleCharToQuantum((lbr_bits)); \
}
-#define LBR08PacketOpacity(pixelpacket) \
+#define LBR08PacketAlpha(pixelpacket) \
{ \
- unsigned char lbr_bits=ScaleQuantumToChar((pixelpacket).opacity); \
- (pixelpacket).opacity=ScaleCharToQuantum((lbr_bits)); \
+ unsigned char lbr_bits=ScaleQuantumToChar((pixelpacket).alpha); \
+ (pixelpacket).alpha=ScaleCharToQuantum((lbr_bits)); \
}
#define LBR08PacketRGB(pixelpacket) \
{ \
- LBR08PacketRed((pixelpacket)); \
+ LBR08PixelPacketRed((pixelpacket)); \
LBR08PacketGreen((pixelpacket)); \
LBR08PacketBlue((pixelpacket)); \
}
@@ -443,55 +445,55 @@
#define LBR08PacketRGBO(pixelpacket) \
{ \
LBR08PacketRGB((pixelpacket)); \
- LBR08PacketOpacity((pixelpacket)); \
+ LBR08PacketAlpha((pixelpacket)); \
}
#define LBR08PixelRed(pixel) \
{ \
unsigned char lbr_bits= \
- ScaleQuantumToChar(GetPixelRed((pixel))); \
- SetPixelRed((pixel),\
- ScaleCharToQuantum((lbr_bits))); \
+ ScaleQuantumToChar(GetPixelRed(image,(pixel))); \
+ SetPixelRed(image,\
+ ScaleCharToQuantum((lbr_bits)), (pixel)); \
}
-#define LBR08PixelGreen(pixel) \
+#define LBR08Green(pixel) \
{ \
unsigned char lbr_bits= \
- ScaleQuantumToChar(GetPixelGreen((pixel))); \
- SetPixelGreen((pixel),\
- ScaleCharToQuantum((lbr_bits))); \
+ ScaleQuantumToChar(GetPixelGreen(image,(pixel))); \
+ SetPixelGreen(image,\
+ ScaleCharToQuantum((lbr_bits)), (pixel)); \
}
-#define LBR08PixelBlue(pixel) \
+#define LBR08Blue(pixel) \
{ \
unsigned char lbr_bits= \
- ScaleQuantumToChar(GetPixelBlue((pixel))); \
- SetPixelBlue((pixel),\
- ScaleCharToQuantum((lbr_bits))); \
+ ScaleQuantumToChar(GetPixelBlue(image,(pixel))); \
+ SetPixelBlue(image,\
+ ScaleCharToQuantum((lbr_bits)), (pixel)); \
}
-#define LBR08PixelOpacity(pixel) \
+#define LBR08Alpha(pixel) \
{ \
unsigned char lbr_bits= \
- ScaleQuantumToChar(GetPixelOpacity((pixel))); \
- SetPixelOpacity((pixel),\
- ScaleCharToQuantum((lbr_bits))); \
+ ScaleQuantumToChar(GetPixelAlpha(image,(pixel))); \
+ SetPixelAlpha(image,\
+ ScaleCharToQuantum((lbr_bits)), (pixel)); \
}
-#define LBR08PixelRGB(pixel) \
+#define LBR08RGB(pixel) \
{ \
LBR08PixelRed((pixel)); \
- LBR08PixelGreen((pixel)); \
- LBR08PixelBlue((pixel)); \
+ LBR08Green((pixel)); \
+ LBR08Blue((pixel)); \
}
-#define LBR08PixelRGBO(pixel) \
+#define LBR08RGBA(pixel) \
{ \
- LBR08PixelRGB((pixel)); \
- LBR08PixelOpacity((pixel)); \
+ LBR08RGB((pixel)); \
+ LBR08Alpha((pixel)); \
}
/* LBR16: Replicate top 16 bits */
-#define LBR16PacketRed(pixelpacket) \
+#define LBR16PixelPacketRed(pixelpacket) \
{ \
unsigned short lbr_bits=ScaleQuantumToShort((pixelpacket).red); \
(pixelpacket).red=ScaleShortToQuantum((lbr_bits)); \
@@ -506,15 +508,15 @@
unsigned short lbr_bits=ScaleQuantumToShort((pixelpacket).blue); \
(pixelpacket).blue=ScaleShortToQuantum((lbr_bits)); \
}
-#define LBR16PacketOpacity(pixelpacket) \
+#define LBR16PacketAlpha(pixelpacket) \
{ \
- unsigned short lbr_bits=ScaleQuantumToShort((pixelpacket).opacity); \
- (pixelpacket).opacity=ScaleShortToQuantum((lbr_bits)); \
+ unsigned short lbr_bits=ScaleQuantumToShort((pixelpacket).alpha); \
+ (pixelpacket).alpha=ScaleShortToQuantum((lbr_bits)); \
}
#define LBR16PacketRGB(pixelpacket) \
{ \
- LBR16PacketRed((pixelpacket)); \
+ LBR16PixelPacketRed((pixelpacket)); \
LBR16PacketGreen((pixelpacket)); \
LBR16PacketBlue((pixelpacket)); \
}
@@ -522,49 +524,49 @@
#define LBR16PacketRGBO(pixelpacket) \
{ \
LBR16PacketRGB((pixelpacket)); \
- LBR16PacketOpacity((pixelpacket)); \
+ LBR16PacketAlpha((pixelpacket)); \
}
#define LBR16PixelRed(pixel) \
{ \
unsigned short lbr_bits= \
- ScaleQuantumToShort(GetPixelRed((pixel))); \
- SetPixelRed((pixel),\
- ScaleShortToQuantum((lbr_bits))); \
+ ScaleQuantumToShort(GetPixelRed(image,(pixel))); \
+ SetPixelRed(image,\
+ ScaleShortToQuantum((lbr_bits)),(pixel)); \
}
-#define LBR16PixelGreen(pixel) \
+#define LBR16Green(pixel) \
{ \
unsigned short lbr_bits= \
- ScaleQuantumToShort(GetPixelGreen((pixel))); \
- SetPixelGreen((pixel),\
- ScaleShortToQuantum((lbr_bits))); \
+ ScaleQuantumToShort(GetPixelGreen(image,(pixel))); \
+ SetPixelGreen(image,\
+ ScaleShortToQuantum((lbr_bits)),(pixel)); \
}
-#define LBR16PixelBlue(pixel) \
+#define LBR16Blue(pixel) \
{ \
unsigned short lbr_bits= \
- ScaleQuantumToShort(GetPixelBlue((pixel))); \
- SetPixelBlue((pixel),\
- ScaleShortToQuantum((lbr_bits))); \
+ ScaleQuantumToShort(GetPixelBlue(image,(pixel))); \
+ SetPixelBlue(image,\
+ ScaleShortToQuantum((lbr_bits)),(pixel)); \
}
-#define LBR16PixelOpacity(pixel) \
+#define LBR16Alpha(pixel) \
{ \
unsigned short lbr_bits= \
- ScaleQuantumToShort(GetPixelOpacity((pixel))); \
- SetPixelOpacity((pixel),\
- ScaleShortToQuantum((lbr_bits))); \
+ ScaleQuantumToShort(GetPixelAlpha(image,(pixel))); \
+ SetPixelAlpha(image,\
+ ScaleShortToQuantum((lbr_bits)),(pixel)); \
}
-#define LBR16PixelRGB(pixel) \
+#define LBR16RGB(pixel) \
{ \
LBR16PixelRed((pixel)); \
- LBR16PixelGreen((pixel)); \
- LBR16PixelBlue((pixel)); \
+ LBR16Green((pixel)); \
+ LBR16Blue((pixel)); \
}
-#define LBR16PixelRGBO(pixel) \
+#define LBR16RGBA(pixel) \
{ \
- LBR16PixelRGB((pixel)); \
- LBR16PixelOpacity((pixel)); \
+ LBR16RGB((pixel)); \
+ LBR16Alpha((pixel)); \
}
/*
@@ -962,7 +964,7 @@
if (image->depth >= 16)
{
- const PixelPacket
+ const Quantum
*p;
ok_to_reduce=
@@ -1004,7 +1006,7 @@
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
{
ok_to_reduce = MagickFalse;
break;
@@ -1013,15 +1015,15 @@
for (x=(ssize_t) image->columns-1; x >= 0; x--)
{
ok_to_reduce=
- QuantumToCharToQuantumEqQuantum(GetPixelRed(p)) &&
- QuantumToCharToQuantumEqQuantum(GetPixelGreen(p)) &&
- QuantumToCharToQuantumEqQuantum(GetPixelBlue(p)) ?
+ QuantumToCharToQuantumEqQuantum(GetPixelRed(image,p)) &&
+ QuantumToCharToQuantumEqQuantum(GetPixelGreen(image,p)) &&
+ QuantumToCharToQuantumEqQuantum(GetPixelBlue(image,p)) ?
MagickTrue : MagickFalse;
if (ok_to_reduce == MagickFalse)
break;
- p++;
+ p+=GetPixelChannels(image);
}
if (x >= 0)
break;
@@ -1116,13 +1118,13 @@
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% %
-% Like IsGrayImage except does not change DirectClass to PseudoClass %
+% Like IsImageGray except does not change DirectClass to PseudoClass %
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
*/
static MagickBooleanType ImageIsGray(Image *image)
{
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
@@ -1138,20 +1140,20 @@
if (image->storage_class == PseudoClass)
{
for (i=0; i < (ssize_t) image->colors; i++)
- if (IsGray(image->colormap+i) == MagickFalse)
+ if (IsPixelPacketGray(image->colormap+i) == MagickFalse)
return(MagickFalse);
return(MagickTrue);
}
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
return(MagickFalse);
for (x=(ssize_t) image->columns-1; x >= 0; x--)
{
- if (IsGray(p) == MagickFalse)
+ if (IsPixelGray(image,p) == MagickFalse)
return(MagickFalse);
- p++;
+ p+=GetPixelChannels(image);
}
}
return(MagickTrue);
@@ -2036,14 +2038,11 @@
register unsigned char
*p;
- register IndexPacket
- *indexes;
-
register ssize_t
i,
x;
- register PixelPacket
+ register Quantum
*q;
size_t
@@ -2101,7 +2100,7 @@
transparent_color.red=65537;
transparent_color.green=65537;
transparent_color.blue=65537;
- transparent_color.opacity=65537;
+ transparent_color.alpha=65537;
num_text = 0;
num_text_total = 0;
@@ -2553,7 +2552,7 @@
image->background_color.blue=
ScaleShortToQuantum(ping_background->blue);
- image->background_color.opacity=OpaqueOpacity;
+ image->background_color.alpha=OpaqueAlpha;
if (logging != MagickFalse)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
@@ -2606,7 +2605,7 @@
transparent_color.red= scale_to_short*ping_trans_color->red;
transparent_color.green= scale_to_short*ping_trans_color->green;
transparent_color.blue= scale_to_short*ping_trans_color->blue;
- transparent_color.opacity= scale_to_short*ping_trans_color->gray;
+ transparent_color.alpha= scale_to_short*ping_trans_color->gray;
if (ping_color_type == PNG_COLOR_TYPE_GRAY)
{
@@ -2616,11 +2615,11 @@
" Raw tRNS graylevel is %d.",ping_trans_color->gray);
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
- " scaled graylevel is %d.",transparent_color.opacity);
+ " scaled graylevel is %d.",transparent_color.alpha);
}
- transparent_color.red=transparent_color.opacity;
- transparent_color.green=transparent_color.opacity;
- transparent_color.blue=transparent_color.opacity;
+ transparent_color.red=transparent_color.alpha;
+ transparent_color.green=transparent_color.alpha;
+ transparent_color.blue=transparent_color.alpha;
}
}
}
@@ -2883,7 +2882,7 @@
png_read_row(ping,ping_pixels+row_offset,NULL);
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
if ((int) ping_color_type == PNG_COLOR_TYPE_GRAY)
@@ -2917,7 +2916,7 @@
{
if ((ping_color_type == PNG_COLOR_TYPE_RGBA ||
ping_color_type == PNG_COLOR_TYPE_GRAY_ALPHA) &&
- (GetPixelOpacity(q) != OpaqueOpacity))
+ (GetPixelAlpha(image,q) != OpaqueAlpha))
{
if (logging != MagickFalse)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
@@ -2928,12 +2927,9 @@
}
if ((ping_color_type == PNG_COLOR_TYPE_RGB ||
ping_color_type == PNG_COLOR_TYPE_GRAY) &&
- (ScaleQuantumToShort(GetPixelRed(q))
- == transparent_color.red &&
- ScaleQuantumToShort(GetPixelGreen(q))
- == transparent_color.green &&
- ScaleQuantumToShort(GetPixelBlue(q))
- == transparent_color.blue))
+ (ScaleQuantumToShort(GetPixelRed(image,q)) == transparent_color.red &&
+ ScaleQuantumToShort(GetPixelGreen(image,q)) == transparent_color.green &&
+ ScaleQuantumToShort(GetPixelBlue(image,q)) == transparent_color.blue))
{
if (logging != MagickFalse)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
@@ -2941,7 +2937,7 @@
found_transparent_pixel = MagickTrue;
break;
}
- q++;
+ q+=GetPixelChannels(image);
}
}
@@ -2979,10 +2975,10 @@
/*
Convert grayscale image to PseudoClass pixel packets.
*/
-
if (logging != MagickFalse)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" Converting grayscale pixels to pixel packets");
+
image->matte=ping_color_type == PNG_COLOR_TYPE_GRAY_ALPHA ?
MagickTrue : MagickFalse;
@@ -3003,10 +2999,9 @@
png_read_row(ping,ping_pixels+row_offset,NULL);
q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
p=ping_pixels+row_offset;
r=quantum_scanline;
@@ -3072,16 +3067,10 @@
for (x=(ssize_t) image->columns-1; x >= 0; x--)
{
*r++=*p++;
- /* In image.h, OpaqueOpacity is 0
- * TransparentOpacity is QuantumRange
- * In a PNG datastream, Opaque is QuantumRange
- * and Transparent is 0.
- */
- SetPixelAlpha(q,ScaleCharToQuantum((unsigned char)
- *p++));
- if (GetPixelOpacity(q) != OpaqueOpacity)
+ SetPixelAlpha(image,ScaleCharToQuantum((unsigned char) *p++),q);
+ if (GetPixelAlpha(image,q) != OpaqueAlpha)
found_transparent_pixel = MagickTrue;
- q++;
+ q+=GetPixelChannels(image);
}
else
@@ -3106,7 +3095,6 @@
quantum=0;
quantum|=(*p++);
-
*r=ScaleShortToQuantum(quantum);
r++;
@@ -3118,10 +3106,10 @@
quantum=0;
quantum|=(*p++);
- SetPixelAlpha(q,ScaleShortToQuantum(quantum));
- if (GetPixelOpacity(q) != OpaqueOpacity)
+ SetPixelAlpha(image,ScaleShortToQuantum(quantum),q);
+ if (GetPixelAlpha(image,q) != OpaqueAlpha)
found_transparent_pixel = MagickTrue;
- q++;
+ q+=GetPixelChannels(image);
}
#else /* MAGICKCORE_QUANTUM_DEPTH == 8 */
@@ -3130,11 +3118,11 @@
if (ping_color_type == 4)
{
- SetPixelAlpha(q,*p++);
- if (GetPixelOpacity(q) != OpaqueOpacity)
+ SetPixelAlpha(image,*p++,q);
+ if (GetPixelAlpha(image,q) != OpaqueAlpha)
found_transparent_pixel = MagickTrue;
p++;
- q++;
+ q+=GetPixelChannels(image);
}
#endif
}
@@ -3151,8 +3139,15 @@
*/
r=quantum_scanline;
+ q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
+
+ if (q == (const Quantum *) NULL)
+ break;
for (x=0; x < (ssize_t) image->columns; x++)
- SetPixelIndex(indexes+x,*r++);
+ {
+ SetPixelIndex(image,*r++,q);
+ q+=GetPixelChannels(image);
+ }
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -3246,8 +3241,8 @@
{
for (x=0; x < ping_num_trans; x++)
{
- image->colormap[x].opacity =
- ScaleCharToQuantum((unsigned char)(255-ping_trans_alpha[x]));
+ image->colormap[x].alpha =
+ ScaleCharToQuantum((unsigned char)ping_trans_alpha[x]);
}
}
@@ -3256,9 +3251,9 @@
for (x=0; x < (int) image->colors; x++)
{
if (ScaleQuantumToShort(image->colormap[x].red) ==
- transparent_color.opacity)
+ transparent_color.alpha)
{
- image->colormap[x].opacity = (Quantum) TransparentOpacity;
+ image->colormap[x].alpha = (Quantum) TransparentAlpha;
}
}
}
@@ -3275,34 +3270,30 @@
image->storage_class=storage_class;
q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
/* Caution: on a Q8 build, this does not distinguish between
* 16-bit colors that differ only in the low byte
*/
for (x=(ssize_t) image->columns-1; x >= 0; x--)
{
- if (ScaleQuantumToShort(GetPixelRed(q))
- == transparent_color.red &&
- ScaleQuantumToShort(GetPixelGreen(q))
- == transparent_color.green &&
- ScaleQuantumToShort(GetPixelBlue(q))
- == transparent_color.blue)
+ if (ScaleQuantumToShort(GetPixelRed(image,q)) == transparent_color.red &&
+ ScaleQuantumToShort(GetPixelGreen(image,q)) == transparent_color.green &&
+ ScaleQuantumToShort(GetPixelBlue(image,q)) == transparent_color.blue)
{
- SetPixelOpacity(q,TransparentOpacity);
+ SetPixelAlpha(image,TransparentAlpha,q);
}
#if 0 /* I have not found a case where this is needed. */
else
{
- SetPixelOpacity(q)=(Quantum) OpaqueOpacity;
+ SetPixelAlpha(image,q)=(Quantum) OpaqueAlpha;
}
#endif
- q++;
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -3780,14 +3771,14 @@
jng_alpha_filter_method,
jng_alpha_interlace_method;
- register const PixelPacket
+ register const Quantum
*s;
register ssize_t
i,
x;
- register PixelPacket
+ register Quantum
*q;
register unsigned char
@@ -3816,7 +3807,7 @@
image=mng_info->image;
- if (GetAuthenticPixelQueue(image) != (PixelPacket *) NULL)
+ if (GetAuthenticPixelQueue(image) != (Quantum *) NULL)
{
/*
Allocate next image structure.
@@ -4278,7 +4269,7 @@
o close alpha_blob.
o copy intensity of secondary image into
- opacity samples of main image.
+ alpha samples of main image.
o destroy the secondary image.
*/
@@ -4311,13 +4302,19 @@
image->rows=jng_height;
image->columns=jng_width;
- length=image->columns*sizeof(PixelPacket);
for (y=0; y < (ssize_t) image->rows; y++)
{
s=GetVirtualPixels(jng_image,0,y,image->columns,1,&image->exception);
q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
- (void) CopyMagickMemory(q,s,length);
+ for (x=(ssize_t) image->columns; x != 0; x--)
+ {
+ SetPixelRed(image,GetPixelRed(jng_image,s),q);
+ SetPixelGreen(image,GetPixelGreen(jng_image,s),q);
+ SetPixelBlue(image,GetPixelBlue(jng_image,s),q);
+ q+=GetPixelChannels(image);
+ s+=GetPixelChannels(jng_image);
+ }
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -4344,7 +4341,7 @@
if (logging != MagickFalse)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
- " Reading opacity from alpha_blob.");
+ " Reading alpha from alpha_blob.");
(void) FormatLocaleString(alpha_image_info->filename,MaxTextExtent,
"%s",alpha_image->filename);
@@ -4355,20 +4352,25 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
s=GetVirtualPixels(jng_image,0,y,image->columns,1,
- &image->exception);
+ &image->exception);
q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
if (image->matte != MagickFalse)
- for (x=(ssize_t) image->columns; x != 0; x--,q++,s++)
- SetPixelOpacity(q,(Quantum) QuantumRange-
- GetPixelRed(s));
+ for (x=(ssize_t) image->columns; x != 0; x--)
+ {
+ SetPixelAlpha(image,GetPixelRed(jng_image,s),q);
+ q+=GetPixelChannels(image);
+ s+=GetPixelChannels(jng_image);
+ }
else
- for (x=(ssize_t) image->columns; x != 0; x--,q++,s++)
+ for (x=(ssize_t) image->columns; x != 0; x--)
{
- SetPixelAlpha(q,GetPixelRed(s));
- if (GetPixelOpacity(q) != OpaqueOpacity)
+ SetPixelAlpha(image,GetPixelRed(jng_image,s),q);
+ if (GetPixelAlpha(image,q) != OpaqueAlpha)
image->matte=MagickTrue;
+ q+=GetPixelChannels(image);
+ s+=GetPixelChannels(jng_image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -4853,7 +4855,7 @@
if (mng_type != 3)
insert_layers=MagickTrue;
#endif
- if (GetAuthenticPixelQueue(image) != (PixelPacket *) NULL)
+ if (GetAuthenticPixelQueue(image) != (Quantum *) NULL)
{
/* Allocate next image structure. */
AcquireNextImage(image_info,image);
@@ -5037,7 +5039,7 @@
mng_background_color.blue=
ScaleShortToQuantum((unsigned short) ((p[4] << 8) | p[5]));
- mng_background_color.opacity=OpaqueOpacity;
+ mng_background_color.alpha=OpaqueAlpha;
}
#ifdef MNG_OBJECT_BUFFERS
@@ -5305,7 +5307,7 @@
(subframe_width) && (subframe_height))
{
/* Allocate next image structure. */
- if (GetAuthenticPixelQueue(image) != (PixelPacket *) NULL)
+ if (GetAuthenticPixelQueue(image) != (Quantum *) NULL)
{
AcquireNextImage(image_info,image);
@@ -5856,7 +5858,7 @@
(image_height < mng_info->mng_height) ||
(mng_info->clip.bottom < (ssize_t) mng_info->mng_height))
{
- if (GetAuthenticPixelQueue(image) != (PixelPacket *) NULL)
+ if (GetAuthenticPixelQueue(image) != (Quantum *) NULL)
{
/*
Allocate next image structure.
@@ -5909,7 +5911,7 @@
(subframe_width) && (subframe_height) && (simplicity == 0 ||
(simplicity & 0x08)))
{
- if (GetAuthenticPixelQueue(image) != (PixelPacket *) NULL)
+ if (GetAuthenticPixelQueue(image) != (Quantum *) NULL)
{
/*
Allocate next image structure.
@@ -5958,7 +5960,7 @@
#endif /* MNG_INSERT_LAYERS */
first_mng_object=MagickFalse;
- if (GetAuthenticPixelQueue(image) != (PixelPacket *) NULL)
+ if (GetAuthenticPixelQueue(image) != (Quantum *) NULL)
{
/*
Allocate next image structure.
@@ -6133,18 +6135,7 @@
int
yy;
- ssize_t
- m,
- y;
-
- register ssize_t
- x;
-
- register PixelPacket
- *n,
- *q;
-
- PixelPacket
+ Quantum
*next,
*prev;
@@ -6152,6 +6143,17 @@
magn_methx,
magn_methy;
+ ssize_t
+ m,
+ y;
+
+ register Quantum
+ *n,
+ *q;
+
+ register ssize_t
+ x;
+
/* Allocate next image structure. */
if (logging != MagickFalse)
@@ -6190,15 +6192,15 @@
for (x=(ssize_t) image->columns-1; x >= 0; x--)
{
- SetPixelRed(q,ScaleQuantumToShort(
- GetPixelRed(q)));
- SetPixelGreen(q,ScaleQuantumToShort(
- GetPixelGreen(q)));
- SetPixelBlue(q,ScaleQuantumToShort(
- GetPixelBlue(q)));
- SetPixelOpacity(q,ScaleQuantumToShort(
- GetPixelOpacity(q)));
- q++;
+ SetPixelRed(image,ScaleQuantumToShort(
+ GetPixelRed(image,q)),q);
+ SetPixelGreen(image,ScaleQuantumToShort(
+ GetPixelGreen(image,q)),q);
+ SetPixelBlue(image,ScaleQuantumToShort(
+ GetPixelBlue(image,q)),q);
+ SetPixelAlpha(image,ScaleQuantumToShort(
+ GetPixelAlpha(image,q)),q);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -6214,7 +6216,7 @@
else
{
- large_image->background_color.opacity=OpaqueOpacity;
+ large_image->background_color.alpha=OpaqueAlpha;
(void) SetImageBackgroundColor(large_image);
if (magn_methx == 4)
@@ -6238,11 +6240,11 @@
m=(ssize_t) mng_info->magn_mt;
yy=0;
length=(size_t) image->columns;
- next=(PixelPacket *) AcquireQuantumMemory(length,sizeof(*next));
- prev=(PixelPacket *) AcquireQuantumMemory(length,sizeof(*prev));
+ next=(Quantum *) AcquireQuantumMemory(length,sizeof(*next));
+ prev=(Quantum *) AcquireQuantumMemory(length,sizeof(*prev));
- if ((prev == (PixelPacket *) NULL) ||
- (next == (PixelPacket *) NULL))
+ if ((prev == (Quantum *) NULL) ||
+ (next == (Quantum *) NULL))
{
image=DestroyImageList(image);
MngInfoFreeStruct(mng_info,&have_mng_structure);
@@ -6283,7 +6285,7 @@
for (i=0; i < m; i++, yy++)
{
- register PixelPacket
+ register Quantum
*pixels;
assert(yy < (ssize_t) large_image->rows);
@@ -6305,56 +6307,56 @@
if (magn_methy <= 1)
{
/* replicate previous */
- SetPixelRGBO(q,(pixels));
+ SetPixelRed(large_image,GetPixelRed(image,pixels),q);
+ SetPixelGreen(large_image,GetPixelGreen(image,pixels),q);
+ SetPixelBlue(large_image,GetPixelBlue(image,pixels),q);
+ SetPixelAlpha(large_image,GetPixelAlpha(image,pixels),q);
}
else if (magn_methy == 2 || magn_methy == 4)
{
if (i == 0)
{
- SetPixelRGBO(q,(pixels));
+ SetPixelRed(large_image,GetPixelRed(image,pixels),q);
+ SetPixelGreen(large_image,GetPixelGreen(image,pixels),q);
+ SetPixelBlue(large_image,GetPixelBlue(image,pixels),q);
+ SetPixelAlpha(large_image,GetPixelAlpha(image,pixels),q);
}
else
{
/* Interpolate */
- SetPixelRed(q,
- ((QM) (((ssize_t)
- (2*i*(GetPixelRed(n)
- -GetPixelRed(pixels)+m))/
+ SetPixelRed(large_image,((QM) (((ssize_t)
+ (2*i*(GetPixelRed(image,n)
+ -GetPixelRed(image,pixels)+m))/
((ssize_t) (m*2))
- +GetPixelRed(pixels)))));
- SetPixelGreen(q,
- ((QM) (((ssize_t)
- (2*i*(GetPixelGreen(n)
- -GetPixelGreen(pixels)+m))/
+ +GetPixelRed(image,pixels)))),q);
+ SetPixelGreen(large_image,((QM) (((ssize_t)
+ (2*i*(GetPixelGreen(image,n)
+ -GetPixelGreen(image,pixels)+m))/
((ssize_t) (m*2))
- +GetPixelGreen(pixels)))));
- SetPixelBlue(q,
- ((QM) (((ssize_t)
- (2*i*(GetPixelBlue(n)
- -GetPixelBlue(pixels)+m))/
+ +GetPixelGreen(image,pixels)))),q);
+ SetPixelBlue(large_image,((QM) (((ssize_t)
+ (2*i*(GetPixelBlue(image,n)
+ -GetPixelBlue(image,pixels)+m))/
((ssize_t) (m*2))
- +GetPixelBlue(pixels)))));
+ +GetPixelBlue(image,pixels)))),q);
if (image->matte != MagickFalse)
- SetPixelOpacity(q,
- ((QM) (((ssize_t)
- (2*i*(GetPixelOpacity(n)
- -GetPixelOpacity(pixels)+m))
+ SetPixelAlpha(large_image, ((QM) (((ssize_t)
+ (2*i*(GetPixelAlpha(image,n)
+ -GetPixelAlpha(image,pixels)+m))
/((ssize_t) (m*2))+
- GetPixelOpacity(pixels)))));
+ GetPixelAlpha(image,pixels)))),q);
}
if (magn_methy == 4)
{
/* Replicate nearest */
if (i <= ((m+1) << 1))
- SetPixelOpacity(q,
- (*pixels).opacity+0);
+ SetPixelAlpha(large_image,GetPixelAlpha(image,pixels),q);
else
- SetPixelOpacity(q,
- (*n).opacity+0);
+ SetPixelAlpha(large_image,GetPixelAlpha(image,n),q);
}
}
@@ -6363,27 +6365,32 @@
/* Replicate nearest */
if (i <= ((m+1) << 1))
{
- SetPixelRGBO(q,(pixels));
+ SetPixelRed(large_image,GetPixelRed(image,pixels),q);
+ SetPixelGreen(large_image,GetPixelGreen(image,pixels),q);
+ SetPixelBlue(large_image,GetPixelBlue(image,pixels),q);
+ SetPixelAlpha(large_image,GetPixelAlpha(image,pixels),q);
}
else
{
- SetPixelRGBO(q,(n));
+ SetPixelRed(large_image,GetPixelRed(image,n),q);
+ SetPixelGreen(large_image,GetPixelGreen(image,n),q);
+ SetPixelBlue(large_image,GetPixelBlue(image,n),q);
+ SetPixelAlpha(large_image,GetPixelAlpha(image,n),q);
}
if (magn_methy == 5)
{
- SetPixelOpacity(q,
- (QM) (((ssize_t) (2*i*
- (GetPixelOpacity(n)
- -GetPixelOpacity(pixels))
+ SetPixelAlpha(large_image,(QM) (((ssize_t) (2*i*
+ (GetPixelAlpha(image,n)
+ -GetPixelAlpha(image,pixels))
+m))/((ssize_t) (m*2))
- +GetPixelOpacity(pixels)));
+ +GetPixelAlpha(image,pixels)),q);
}
}
- n++;
- q++;
- pixels++;
+ n+=GetPixelChannels(image);
+ q+=GetPixelChannels(large_image);
+ pixels+=GetPixelChannels(image);
} /* x */
if (SyncAuthenticPixels(large_image,exception) == 0)
@@ -6392,8 +6399,8 @@
} /* i */
} /* y */
- prev=(PixelPacket *) RelinquishMagickMemory(prev);
- next=(PixelPacket *) RelinquishMagickMemory(next);
+ prev=(Quantum *) RelinquishMagickMemory(prev);
+ next=(Quantum *) RelinquishMagickMemory(next);
length=image->columns;
@@ -6414,12 +6421,12 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
- register PixelPacket
+ register Quantum
*pixels;
q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
- pixels=q+(image->columns-length);
- n=pixels+1;
+ pixels=q+(image->columns-length)*GetPixelChannels(image);
+ n=pixels+GetPixelChannels(image);
for (x=(ssize_t) (image->columns-length);
x < (ssize_t) image->columns; x++)
@@ -6446,47 +6453,49 @@
if (magn_methx <= 1)
{
/* replicate previous */
- SetPixelRGBO(q,(pixels));
+ SetPixelRed(image,GetPixelRed(image,pixels),q);
+ SetPixelGreen(image,GetPixelGreen(image,pixels),q);
+ SetPixelBlue(image,GetPixelBlue(image,pixels),q);
+ SetPixelAlpha(image,GetPixelAlpha(image,pixels),q);
}
else if (magn_methx == 2 || magn_methx == 4)
{
if (i == 0)
{
- SetPixelRGBO(q,(pixels));
+ SetPixelRed(image,GetPixelRed(image,pixels),q);
+ SetPixelGreen(image,GetPixelGreen(image,pixels),q);
+ SetPixelBlue(image,GetPixelBlue(image,pixels),q);
+ SetPixelAlpha(image,GetPixelAlpha(image,pixels),q);
}
/* To do: Rewrite using Get/Set***PixelComponent() */
else
{
/* Interpolate */
- SetPixelRed(q,
- (QM) ((2*i*(
- GetPixelRed(n)
- -GetPixelRed(pixels))+m)
+ SetPixelRed(image,(QM) ((2*i*(
+ GetPixelRed(image,n)
+ -GetPixelRed(image,pixels))+m)
/((ssize_t) (m*2))+
- GetPixelRed(pixels)));
+ GetPixelRed(image,pixels)),q);
- SetPixelGreen(q,
- (QM) ((2*i*(
- GetPixelGreen(n)
- -GetPixelGreen(pixels))+m)
+ SetPixelGreen(image,(QM) ((2*i*(
+ GetPixelGreen(image,n)
+ -GetPixelGreen(image,pixels))+m)
/((ssize_t) (m*2))+
- GetPixelGreen(pixels)));
+ GetPixelGreen(image,pixels)),q);
- SetPixelBlue(q,
- (QM) ((2*i*(
- GetPixelBlue(n)
- -GetPixelBlue(pixels))+m)
+ SetPixelBlue(image,(QM) ((2*i*(
+ GetPixelBlue(image,n)
+ -GetPixelBlue(image,pixels))+m)
/((ssize_t) (m*2))+
- GetPixelBlue(pixels)));
+ GetPixelBlue(image,pixels)),q);
if (image->matte != MagickFalse)
- SetPixelOpacity(q,
- (QM) ((2*i*(
- GetPixelOpacity(n)
- -GetPixelOpacity(pixels))+m)
+ SetPixelAlpha(image,(QM) ((2*i*(
+ GetPixelAlpha(image,n)
+ -GetPixelAlpha(image,pixels))+m)
/((ssize_t) (m*2))+
- GetPixelOpacity(pixels)));
+ GetPixelAlpha(image,pixels)),q);
}
if (magn_methx == 4)
@@ -6494,13 +6503,13 @@
/* Replicate nearest */
if (i <= ((m+1) << 1))
{
- SetPixelOpacity(q,
- GetPixelOpacity(pixels)+0);
+ SetPixelAlpha(image,
+ GetPixelAlpha(image,pixels)+0,q);
}
else
{
- SetPixelOpacity(q,
- GetPixelOpacity(n)+0);
+ SetPixelAlpha(image,
+ GetPixelAlpha(image,n)+0,q);
}
}
}
@@ -6510,28 +6519,34 @@
/* Replicate nearest */
if (i <= ((m+1) << 1))
{
- SetPixelRGBO(q,(pixels));
+ SetPixelRed(image,GetPixelRed(image,pixels),q);
+ SetPixelGreen(image,GetPixelGreen(image,pixels),q);
+ SetPixelBlue(image,GetPixelBlue(image,pixels),q);
+ SetPixelAlpha(image,GetPixelAlpha(image,pixels),q);
}
else
{
- SetPixelRGBO(q,(n));
+ SetPixelRed(image,GetPixelRed(image,n),q);
+ SetPixelGreen(image,GetPixelGreen(image,n),q);
+ SetPixelBlue(image,GetPixelBlue(image,n),q);
+ SetPixelAlpha(image,GetPixelAlpha(image,n),q);
}
if (magn_methx == 5)
{
/* Interpolate */
- SetPixelOpacity(q,
- (QM) ((2*i*( GetPixelOpacity(n)
- -GetPixelOpacity(pixels))+m)/
+ SetPixelAlpha(image,
+ (QM) ((2*i*( GetPixelAlpha(image,n)
+ -GetPixelAlpha(image,pixels))+m)/
((ssize_t) (m*2))
- +GetPixelOpacity(pixels)));
+ +GetPixelAlpha(image,pixels)),q);
}
}
- q++;
+ q+=GetPixelChannels(image);
}
- n++;
- p++;
+ n+=GetPixelChannels(image);
+ p+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -6549,15 +6564,15 @@
for (x=(ssize_t) image->columns-1; x >= 0; x--)
{
- SetPixelRed(q,ScaleShortToQuantum(
- GetPixelRed(q)));
- SetPixelGreen(q,ScaleShortToQuantum(
- GetPixelGreen(q)));
- SetPixelBlue(q,ScaleShortToQuantum(
- GetPixelBlue(q)));
- SetPixelOpacity(q,ScaleShortToQuantum(
- GetPixelOpacity(q)));
- q++;
+ SetPixelRed(image,ScaleShortToQuantum(
+ GetPixelRed(image,q)),q);
+ SetPixelGreen(image,ScaleShortToQuantum(
+ GetPixelGreen(image,q)),q);
+ SetPixelBlue(image,ScaleShortToQuantum(
+ GetPixelBlue(image,q)),q);
+ SetPixelAlpha(image,ScaleShortToQuantum(
+ GetPixelAlpha(image,q)),q);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -6696,7 +6711,7 @@
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" No images found. Inserting a background layer.");
- if (GetAuthenticPixelQueue(image) != (PixelPacket *) NULL)
+ if (GetAuthenticPixelQueue(image) != (Quantum *) NULL)
{
/*
Allocate next image structure.
@@ -7607,7 +7622,7 @@
/* Respect the -depth option */
if (image->depth < MAGICKCORE_QUANTUM_DEPTH)
{
- register PixelPacket
+ register Quantum
*r;
ExceptionInfo
@@ -7626,12 +7641,12 @@
r=GetAuthenticPixels(image,0,y,image->columns,1,
exception);
- if (r == (PixelPacket *) NULL)
+ if (r == (Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- LBR16PixelRGBO(r);
+ LBR16RGBA(r);
r++;
}
@@ -7660,12 +7675,12 @@
r=GetAuthenticPixels(image,0,y,image->columns,1,
exception);
- if (r == (PixelPacket *) NULL)
+ if (r == (Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- LBR08PixelRGBO(r);
+ LBR08RGBA(r);
r++;
}
@@ -7693,12 +7708,12 @@
r=GetAuthenticPixels(image,0,y,image->columns,1,
exception);
- if (r == (PixelPacket *) NULL)
+ if (r == (Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- LBR04PixelRGBO(r);
+ LBR04RGBA(r);
r++;
}
@@ -7725,12 +7740,12 @@
r=GetAuthenticPixels(image,0,y,image->columns,1,
exception);
- if (r == (PixelPacket *) NULL)
+ if (r == (Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- LBR02PixelRGBO(r);
+ LBR02RGBA(r);
r++;
}
@@ -7756,12 +7771,12 @@
r=GetAuthenticPixels(image,0,y,image->columns,1,
exception);
- if (r == (PixelPacket *) NULL)
+ if (r == (Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- LBR01PixelRGBO(r);
+ LBR01RGBA(r);
r++;
}
@@ -7823,7 +7838,7 @@
* This code will delete the colormap and change the image to
* DirectClass.
*
- * If image->matte is MagickFalse, we ignore the opacity channel
+ * If image->matte is MagickFalse, we ignore the alpha channel
* even though it sometimes contains left-over non-opaque values.
*
* Also we gather some information (number of opaque, transparent,
@@ -7845,14 +7860,11 @@
semitransparent[260],
transparent[260];
- register IndexPacket
- *indexes;
+ register const Quantum
+ *s;
- register const PixelPacket
- *s,
- *q;
-
- register PixelPacket
+ register Quantum
+ *q,
*r;
if (logging != MagickFalse)
@@ -7875,7 +7887,7 @@
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" Original colormap:");
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
- " i (red,green,blue,opacity)");
+ " i (red,green,blue,alpha)");
for (i=0; i < 256; i++)
{
@@ -7885,7 +7897,7 @@
(int) image->colormap[i].red,
(int) image->colormap[i].green,
(int) image->colormap[i].blue,
- (int) image->colormap[i].opacity);
+ (int) image->colormap[i].alpha);
}
for (i=image->colors - 10; i < (ssize_t) image->colors; i++)
@@ -7898,7 +7910,7 @@
(int) image->colormap[i].red,
(int) image->colormap[i].green,
(int) image->colormap[i].blue,
- (int) image->colormap[i].opacity);
+ (int) image->colormap[i].alpha);
}
}
}
@@ -7926,26 +7938,26 @@
{
q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
if (image->matte == MagickFalse ||
- GetPixelOpacity(q) == OpaqueOpacity)
+ GetPixelAlpha(image,q) == OpaqueAlpha)
{
if (number_opaque < 259)
{
if (number_opaque == 0)
{
- GetPixelRGB(q, opaque);
- opaque[0].opacity=OpaqueOpacity;
+ GetPixelPacket(image, q, opaque);
+ opaque[0].alpha=OpaqueAlpha;
number_opaque=1;
}
for (i=0; i< (ssize_t) number_opaque; i++)
{
- if (IsColorEqual(q, opaque+i))
+ if (IsPixelEquivalent(image,q, opaque+i))
break;
}
@@ -7953,32 +7965,32 @@
number_opaque < 259)
{
number_opaque++;
- GetPixelRGB(q, opaque+i);
- opaque[i].opacity=OpaqueOpacity;
+ GetPixelPacket(image, q, opaque+i);
+ opaque[i].alpha=OpaqueAlpha;
}
}
}
- else if (q->opacity == TransparentOpacity)
+ else if (GetPixelAlpha(image,q) == TransparentAlpha)
{
if (number_transparent < 259)
{
if (number_transparent == 0)
{
- GetPixelRGBO(q, transparent);
- ping_trans_color.red=
- (unsigned short) GetPixelRed(q);
- ping_trans_color.green=
- (unsigned short) GetPixelGreen(q);
- ping_trans_color.blue=
- (unsigned short) GetPixelBlue(q);
- ping_trans_color.gray=
- (unsigned short) GetPixelRed(q);
+ GetPixelPacket(image, q, transparent);
+ ping_trans_color.red=(unsigned short)
+ GetPixelRed(image,q);
+ ping_trans_color.green=(unsigned short)
+ GetPixelGreen(image,q);
+ ping_trans_color.blue=(unsigned short)
+ GetPixelBlue(image,q);
+ ping_trans_color.gray=(unsigned short)
+ GetPixelRed(image,q);
number_transparent = 1;
}
for (i=0; i< (ssize_t) number_transparent; i++)
{
- if (IsColorEqual(q, transparent+i))
+ if (IsPixelEquivalent(image,q, transparent+i))
break;
}
@@ -7986,7 +7998,7 @@
number_transparent < 259)
{
number_transparent++;
- GetPixelRGBO(q, transparent+i);
+ GetPixelPacket(image,q,transparent+i);
}
}
}
@@ -7996,15 +8008,15 @@
{
if (number_semitransparent == 0)
{
- GetPixelRGBO(q, semitransparent);
+ GetPixelPacket(image,q,semitransparent);
number_semitransparent = 1;
}
for (i=0; i< (ssize_t) number_semitransparent; i++)
{
- if (IsColorEqual(q, semitransparent+i)
- && GetPixelOpacity(q) ==
- semitransparent[i].opacity)
+ if (IsPixelEquivalent(image,q, semitransparent+i)
+ && GetPixelAlpha(image,q) ==
+ semitransparent[i].alpha)
break;
}
@@ -8012,11 +8024,11 @@
number_semitransparent < 259)
{
number_semitransparent++;
- GetPixelRGBO(q, semitransparent+i);
+ GetPixelPacket(image, q, semitransparent+i);
}
}
}
- q++;
+ q+=GetPixelChannels(image);
}
}
@@ -8090,7 +8102,7 @@
{
q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
/* Worst case is black-and-white; we are looking at every
@@ -8102,14 +8114,14 @@
s=q;
for (x=0; x < (ssize_t) image->columns; x++)
{
- if (GetPixelRed(s) != GetPixelGreen(s)
- || GetPixelRed(s) != GetPixelBlue(s))
+ if (GetPixelRed(image,s) != GetPixelGreen(image,s) ||
+ GetPixelRed(image,s) != GetPixelBlue(image,s))
{
ping_have_color=MagickTrue;
ping_have_non_bw=MagickTrue;
break;
}
- s++;
+ s+=GetPixelChannels(image);
}
}
@@ -8118,12 +8130,12 @@
s=q;
for (x=0; x < (ssize_t) image->columns; x++)
{
- if (GetPixelRed(s) != 0 &&
- GetPixelRed(s) != QuantumRange)
+ if (GetPixelRed(image,s) != 0 &&
+ GetPixelRed(image,s) != QuantumRange)
{
ping_have_non_bw=MagickTrue;
}
- s++;
+ s+=GetPixelChannels(image);
}
}
}
@@ -8226,30 +8238,25 @@
q=GetAuthenticPixels(image,0,y,image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
for (x=0; x < (ssize_t) image->columns; x++)
{
for (i=0; i< (ssize_t) image_colors; i++)
{
if ((image->matte == MagickFalse ||
- image->colormap[i].opacity ==
- GetPixelOpacity(q)) &&
- image->colormap[i].red ==
- GetPixelRed(q) &&
- image->colormap[i].green ==
- GetPixelGreen(q) &&
- image->colormap[i].blue ==
- GetPixelBlue(q))
+ image->colormap[i].alpha == GetPixelAlpha(image,q)) &&
+ image->colormap[i].red == GetPixelRed(image,q) &&
+ image->colormap[i].green == GetPixelGreen(image,q) &&
+ image->colormap[i].blue == GetPixelBlue(image,q))
{
- SetPixelIndex(indexes+x,i);
+ SetPixelIndex(image,i,q);
break;
}
}
- q++;
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -8266,7 +8273,7 @@
if (image->colormap != NULL)
{
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
- " i (red,green,blue,opacity)");
+ " i (red,green,blue,alpha)");
for (i=0; i < (ssize_t) image->colors; i++)
{
@@ -8278,7 +8285,7 @@
(int) image->colormap[i].red,
(int) image->colormap[i].green,
(int) image->colormap[i].blue,
- (int) image->colormap[i].opacity);
+ (int) image->colormap[i].alpha);
}
}
}
@@ -8337,7 +8344,7 @@
break;
/* PNG8 can't have semitransparent colors so we threshold the
- * opacity to 0 or OpaqueOpacity
+ * alpha to 0 or OpaqueAlpha
*/
if (number_semitransparent != 0)
{
@@ -8349,19 +8356,19 @@
r=GetAuthenticPixels(image,0,y,image->columns,1,
exception);
- if (r == (PixelPacket *) NULL)
+ if (r == (Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- if (GetPixelOpacity(r) > TransparentOpacity/2)
+ if (GetPixelAlpha(image,r) > TransparentAlpha/2)
{
- SetPixelOpacity(r,TransparentOpacity);
- SetPixelRGB(r,&image->background_color);
+ SetPixelPacket(image,&image->background_color,r);
+ SetPixelAlpha(image,TransparentAlpha,r);
}
else
- SetPixelOpacity(r,OpaqueOpacity);
- r++;
+ SetPixelAlpha(image,OpaqueAlpha,r);
+ r+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -8370,9 +8377,9 @@
if (image_colors != 0 && image_colors <= 256 &&
image->colormap != NULL)
for (i=0; i<image_colors; i++)
- image->colormap[i].opacity =
- (image->colormap[i].opacity > TransparentOpacity/2 ?
- TransparentOpacity : OpaqueOpacity);
+ image->colormap[i].alpha =
+ (image->colormap[i].alpha > TransparentAlpha/2 ?
+ TransparentAlpha : OpaqueAlpha);
}
continue;
}
@@ -8403,13 +8410,13 @@
r=GetAuthenticPixels(image,0,y,image->columns,1,
exception);
- if (r == (PixelPacket *) NULL)
+ if (r == (Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- if (GetPixelOpacity(r) == OpaqueOpacity)
- LBR04PixelRGB(r);
+ if (GetPixelAlpha(image,r) == OpaqueAlpha)
+ LBR04RGB(r);
r++;
}
@@ -8454,13 +8461,13 @@
r=GetAuthenticPixels(image,0,y,image->columns,1,
exception);
- if (r == (PixelPacket *) NULL)
+ if (r == (Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- if (GetPixelOpacity(r) == OpaqueOpacity)
- LBR03PixelRGB(r);
+ if (GetPixelAlpha(image,r) == OpaqueAlpha)
+ LBR03RGB(r);
r++;
}
@@ -8508,13 +8515,13 @@
r=GetAuthenticPixels(image,0,y,image->columns,1,
exception);
- if (r == (PixelPacket *) NULL)
+ if (r == (Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- if (GetPixelOpacity(r) == OpaqueOpacity)
- LBR02PixelBlue(r);
+ if (GetPixelAlpha(image,r) == OpaqueAlpha)
+ LBR02Blue(r);
r++;
}
@@ -8559,19 +8566,19 @@
r=GetAuthenticPixels(image,0,y,image->columns,1,
exception);
- if (r == (PixelPacket *) NULL)
+ if (r == (Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- if (ScaleQuantumToChar(GetPixelRed(r)) == 0x49 &&
- ScaleQuantumToChar(GetPixelGreen(r)) == 0x00 &&
- ScaleQuantumToChar(GetPixelBlue(r)) == 0x00 &&
- GetPixelOpacity(r) == OpaqueOpacity)
+ if (ScaleQuantumToChar(GetPixelRed(image,r)) == 0x49 &&
+ ScaleQuantumToChar(GetPixelGreen(image,r)) == 0x00 &&
+ ScaleQuantumToChar(GetPixelBlue(image,r)) == 0x00 &&
+ GetPixelAlpha(image,r) == OpaqueAlpha)
{
- SetPixelRed(r,ScaleCharToQuantum(0x24));
+ SetPixelRed(image,ScaleCharToQuantum(0x24),r);
}
- r++;
+ r+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -8638,7 +8645,7 @@
ExceptionInfo
*exception;
- register const PixelPacket
+ register const Quantum
*q;
exception=(&image->exception);
@@ -8647,24 +8654,21 @@
{
q=GetVirtualPixels(image,0,y,image->columns,1, exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- if (q->opacity != TransparentOpacity &&
- (unsigned short) GetPixelRed(q) ==
- ping_trans_color.red &&
- (unsigned short) GetPixelGreen(q) ==
- ping_trans_color.green &&
- (unsigned short) GetPixelBlue(q) ==
- ping_trans_color.blue)
+ if (GetPixelAlpha(image,q) != TransparentAlpha &&
+ (unsigned short) GetPixelRed(image,q) == ping_trans_color.red &&
+ (unsigned short) GetPixelGreen(image,q) == ping_trans_color.green &&
+ (unsigned short) GetPixelBlue(image,q) == ping_trans_color.blue)
{
ping_have_cheap_transparency = MagickFalse;
break;
}
- q++;
+ q+=GetPixelChannels(image);
}
if (ping_have_cheap_transparency == MagickFalse)
@@ -9225,7 +9229,7 @@
(ScaleQuantumToShort(image->colormap[0].blue) & mask);
ping_trans_color.gray=(png_uint_16)
- (ScaleQuantumToShort(PixelIntensityToQuantum(
+ (ScaleQuantumToShort(GetPixelPacketIntensity(
image->colormap)) & mask);
ping_trans_color.index=(png_byte) 0;
@@ -9442,8 +9446,8 @@
for (i=0; i < ping_num_trans; i++)
{
- ping_trans_alpha[i]= (png_byte) (255-
- ScaleQuantumToChar(image->colormap[i].opacity));
+ ping_trans_alpha[i]= (png_byte)
+ ScaleQuantumToChar(image->colormap[i].alpha);
}
}
}
@@ -9504,7 +9508,7 @@
{
ping_background.gray=(png_uint_16)
- ((maxval/255.)*((PixelIntensity(&image->background_color)))+.5);
+ ((maxval/255.)*((GetPixelPacketIntensity(&image->background_color)))+.5);
if (logging != MagickFalse)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
@@ -9596,8 +9600,6 @@
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" Compression mem level: 9");
- png_set_compression_mem_level(ping, 9);
-
/* Untangle the "-quality" setting:
Undefined is 0; the default is used.
@@ -10195,7 +10197,7 @@
ping_have_non_bw == MagickFalse)
{
/* Palette, Bilevel, or Opaque Monochrome */
- register const PixelPacket
+ register const Quantum
*p;
quantum_info->depth=8;
@@ -10212,12 +10214,12 @@
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
if (mng_info->IsPalette)
{
- (void) ExportQuantumPixels(image,(const CacheView *) NULL,
+ (void) ExportQuantumPixels(image,(CacheView *) NULL,
quantum_info,GrayQuantum,ping_pixels,&image->exception);
if (mng_info->write_png_colortype-1 == PNG_COLOR_TYPE_PALETTE &&
mng_info->write_png_depth &&
@@ -10232,7 +10234,7 @@
else
{
- (void) ExportQuantumPixels(image,(const CacheView *) NULL,
+ (void) ExportQuantumPixels(image,(CacheView *) NULL,
quantum_info,RedQuantum,ping_pixels,&image->exception);
}
@@ -10264,7 +10266,7 @@
(ping_bit_depth >= MAGICKCORE_QUANTUM_DEPTH)) &&
(mng_info->IsPalette) && ping_have_color == MagickFalse)
{
- register const PixelPacket
+ register const Quantum
*p;
for (pass=0; pass < num_passes; pass++)
@@ -10274,17 +10276,17 @@
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
if (ping_color_type == PNG_COLOR_TYPE_GRAY)
{
if (mng_info->IsPalette)
- (void) ExportQuantumPixels(image,(const CacheView *) NULL,
+ (void) ExportQuantumPixels(image,(CacheView *) NULL,
quantum_info,GrayQuantum,ping_pixels,&image->exception);
else
- (void) ExportQuantumPixels(image,(const CacheView *) NULL,
+ (void) ExportQuantumPixels(image,(CacheView *) NULL,
quantum_info,RedQuantum,ping_pixels,&image->exception);
if (logging != MagickFalse && y == 0)
@@ -10298,7 +10300,7 @@
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" Writing GRAY_ALPHA PNG pixels (2)");
- (void) ExportQuantumPixels(image,(const CacheView *) NULL,
+ (void) ExportQuantumPixels(image,(CacheView *) NULL,
quantum_info,GrayAlphaQuantum,ping_pixels,&image->exception);
}
@@ -10320,7 +10322,7 @@
else
{
- register const PixelPacket
+ register const Quantum
*p;
for (pass=0; pass < num_passes; pass++)
@@ -10334,23 +10336,23 @@
p=GetVirtualPixels(image,0,y,image->columns,1,
&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
if (ping_color_type == PNG_COLOR_TYPE_GRAY)
{
if (image->storage_class == DirectClass)
- (void) ExportQuantumPixels(image,(const CacheView *) NULL,
+ (void) ExportQuantumPixels(image,(CacheView *) NULL,
quantum_info,RedQuantum,ping_pixels,&image->exception);
else
- (void) ExportQuantumPixels(image,(const CacheView *) NULL,
+ (void) ExportQuantumPixels(image,(CacheView *) NULL,
quantum_info,GrayQuantum,ping_pixels,&image->exception);
}
else if (ping_color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
{
- (void) ExportQuantumPixels(image,(const CacheView *) NULL,
+ (void) ExportQuantumPixels(image,(CacheView *) NULL,
quantum_info,GrayAlphaQuantum,ping_pixels,
&image->exception);
@@ -10360,11 +10362,11 @@
}
else if (image_matte != MagickFalse)
- (void) ExportQuantumPixels(image,(const CacheView *) NULL,
+ (void) ExportQuantumPixels(image,(CacheView *) NULL,
quantum_info,RGBAQuantum,ping_pixels,&image->exception);
else
- (void) ExportQuantumPixels(image,(const CacheView *) NULL,
+ (void) ExportQuantumPixels(image,(CacheView *) NULL,
quantum_info,RGBQuantum,ping_pixels,&image->exception);
if (logging != MagickFalse && y == 0)
@@ -10400,14 +10402,14 @@
p=GetVirtualPixels(image,0,y,image->columns,1,
&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
if (ping_color_type == PNG_COLOR_TYPE_GRAY)
{
quantum_info->depth=image->depth;
- (void) ExportQuantumPixels(image,(const CacheView *) NULL,
+ (void) ExportQuantumPixels(image,(CacheView *) NULL,
quantum_info,GrayQuantum,ping_pixels,&image->exception);
}
@@ -10417,14 +10419,14 @@
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
" Writing GRAY_ALPHA PNG pixels (4)");
- (void) ExportQuantumPixels(image,(const CacheView *) NULL,
+ (void) ExportQuantumPixels(image,(CacheView *) NULL,
quantum_info,GrayAlphaQuantum,ping_pixels,
&image->exception);
}
else
{
- (void) ExportQuantumPixels(image,(const CacheView *) NULL,
+ (void) ExportQuantumPixels(image,(CacheView *) NULL,
quantum_info,IndexQuantum,ping_pixels,&image->exception);
if (logging != MagickFalse && y <= 2)
@@ -11513,7 +11515,7 @@
/* Create JPEG blob, image, and image_info */
if (logging != MagickFalse)
(void) LogMagickEvent(CoderEvent,GetMagickModule(),
- " Creating jpeg_image_info for opacity.");
+ " Creating jpeg_image_info for alpha.");
jpeg_image_info=(ImageInfo *) CloneImageInfo(image_info);
@@ -11530,8 +11532,7 @@
ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed");
(void) CopyMagickString(jpeg_image->magick,"JPEG",MaxTextExtent);
- status=SeparateImageChannel(jpeg_image,OpacityChannel);
- status=NegateImage(jpeg_image,MagickFalse);
+ status=SeparateImageChannel(jpeg_image,AlphaChannel);
jpeg_image->matte=MagickFalse;
if (jng_quality >= 1000)
@@ -11561,7 +11562,7 @@
const char
*value;
- /* Encode opacity as a grayscale PNG blob */
+ /* Encode alpha as a grayscale PNG blob */
status=OpenBlob(jpeg_image_info,jpeg_image,WriteBinaryBlobMode,
&image->exception);
if (logging != MagickFalse)
@@ -11583,7 +11584,7 @@
}
else
{
- /* Encode opacity as a grayscale JPEG blob */
+ /* Encode alpha as a grayscale JPEG blob */
status=OpenBlob(jpeg_image_info,jpeg_image,WriteBinaryBlobMode,
&image->exception);
diff --git a/coders/pnm.c b/coders/pnm.c
index 166c9d5..965fb4a 100644
--- a/coders/pnm.c
+++ b/coders/pnm.c
@@ -39,30 +39,31 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/color.h"
-#include "magick/color-private.h"
-#include "magick/colorspace.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/module.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/pixel-private.h"
-#include "magick/property.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/statistic.h"
-#include "magick/string_.h"
-#include "magick/string-private.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/attribute.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/color.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/property.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/statistic.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/string-private.h"
/*
Forward declarations.
@@ -426,18 +427,18 @@
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelRed(q,PNMInteger(image,2) == 0 ? QuantumRange : 0);
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- q++;
+ SetPixelRed(image,PNMInteger(image,2) == 0 ? QuantumRange : 0,q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -478,22 +479,22 @@
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
intensity=PNMInteger(image,10);
- SetPixelRed(q,intensity);
+ SetPixelRed(image,intensity,q);
if (scale != (Quantum *) NULL)
- SetPixelRed(q,scale[ConstrainPixel(image,(ssize_t)
- intensity,max_value)]);
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- q++;
+ SetPixelRed(image,scale[ConstrainPixel(image,(ssize_t) intensity,
+ max_value)],q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -512,7 +513,7 @@
}
case '3':
{
- MagickPixelPacket
+ PixelInfo
pixel;
/*
@@ -536,11 +537,11 @@
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
@@ -556,10 +557,10 @@
pixel.blue=(MagickRealType) scale[ConstrainPixel(image,(ssize_t)
pixel.blue,max_value)];
}
- SetPixelRed(q,pixel.red);
- SetPixelGreen(q,pixel.green);
- SetPixelBlue(q,pixel.blue);
- q++;
+ SetPixelRed(image,pixel.red,q);
+ SetPixelGreen(image,pixel.green,q);
+ SetPixelBlue(image,pixel.blue,q);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -593,7 +594,7 @@
MagickBooleanType
sync;
- register PixelPacket
+ register Quantum
*restrict q;
ssize_t
@@ -627,7 +628,7 @@
if (count != (ssize_t) extent)
status=MagickFalse;
q=QueueAuthenticPixels(image,0,offset,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
@@ -671,7 +672,7 @@
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
ssize_t
@@ -702,7 +703,7 @@
if (count != (ssize_t) extent)
status=MagickFalse;
q=QueueAuthenticPixels(image,0,offset,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
@@ -720,10 +721,10 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
p=PushCharPixel(p,&pixel);
- SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- q++;
+ SetPixelRed(image,ScaleAnyToQuantum(pixel,range),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ q+=GetPixelChannels(image);
}
}
else
@@ -734,10 +735,10 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
p=PushShortPixel(MSBEndian,p,&pixel);
- SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- q++;
+ SetPixelRed(image,ScaleAnyToQuantum(pixel,range),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ q+=GetPixelChannels(image);
}
}
sync=SyncAuthenticPixels(image,exception);
@@ -779,7 +780,7 @@
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
ssize_t
@@ -810,7 +811,7 @@
if (count != (ssize_t) extent)
status=MagickFalse;
q=QueueAuthenticPixels(image,0,offset,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
@@ -819,11 +820,11 @@
if (image->depth == 8)
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelRed(q,ScaleCharToQuantum(*p++));
- SetPixelGreen(q,ScaleCharToQuantum(*p++));
- SetPixelBlue(q,ScaleCharToQuantum(*p++));
- q->opacity=OpaqueOpacity;
- q++;
+ SetPixelRed(image,ScaleCharToQuantum(*p++),q);
+ SetPixelGreen(image,ScaleCharToQuantum(*p++),q);
+ SetPixelBlue(image,ScaleCharToQuantum(*p++),q);
+ SetPixelAlpha(image,OpaqueAlpha,q);
+ q+=GetPixelChannels(image);
}
else
if (image->depth == 16)
@@ -834,13 +835,13 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
p=PushShortPixel(MSBEndian,p,&pixel);
- SetPixelRed(q,ScaleShortToQuantum(pixel));
+ SetPixelRed(image,ScaleShortToQuantum(pixel),q);
p=PushShortPixel(MSBEndian,p,&pixel);
- SetPixelGreen(q,ScaleShortToQuantum(pixel));
+ SetPixelGreen(image,ScaleShortToQuantum(pixel),q);
p=PushShortPixel(MSBEndian,p,&pixel);
- SetPixelBlue(q,ScaleShortToQuantum(pixel));
- SetPixelOpacity(q,OpaqueOpacity);
- q++;
+ SetPixelBlue(image,ScaleShortToQuantum(pixel),q);
+ SetPixelAlpha(image,OpaqueAlpha,q);
+ q+=GetPixelChannels(image);
}
}
else
@@ -852,13 +853,13 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
p=PushCharPixel(p,&pixel);
- SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelRed(image,ScaleAnyToQuantum(pixel,range),q);
p=PushCharPixel(p,&pixel);
- SetPixelGreen(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelGreen(image,ScaleAnyToQuantum(pixel,range),q);
p=PushCharPixel(p,&pixel);
- SetPixelBlue(q,ScaleAnyToQuantum(pixel,range));
- SetPixelOpacity(q,OpaqueOpacity);
- q++;
+ SetPixelBlue(image,ScaleAnyToQuantum(pixel,range),q);
+ SetPixelAlpha(image,OpaqueAlpha,q);
+ q+=GetPixelChannels(image);
}
}
else
@@ -869,13 +870,13 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
p=PushShortPixel(MSBEndian,p,&pixel);
- SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelRed(image,ScaleAnyToQuantum(pixel,range),q);
p=PushShortPixel(MSBEndian,p,&pixel);
- SetPixelGreen(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelGreen(image,ScaleAnyToQuantum(pixel,range),q);
p=PushShortPixel(MSBEndian,p,&pixel);
- SetPixelBlue(q,ScaleAnyToQuantum(pixel,range));
- SetPixelOpacity(q,OpaqueOpacity);
- q++;
+ SetPixelBlue(image,ScaleAnyToQuantum(pixel,range),q);
+ SetPixelAlpha(image,OpaqueAlpha,q);
+ q+=GetPixelChannels(image);
}
}
if ((type == BilevelType) || (type == GrayscaleType))
@@ -884,14 +885,15 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
if ((type == BilevelType) &&
- (IsMonochromePixel(q) == MagickFalse))
- type=IsGrayPixel(q) == MagickFalse ? UndefinedType :
+ (IsPixelMonochrome(image,q) == MagickFalse))
+ type=IsPixelGray(image,q) == MagickFalse ? UndefinedType :
GrayscaleType;
- if ((type == GrayscaleType) && (IsGrayPixel(q) == MagickFalse))
+ if ((type == GrayscaleType) &&
+ (IsPixelGray(image,q) == MagickFalse))
type=UndefinedType;
if ((type != BilevelType) && (type != GrayscaleType))
break;
- q++;
+ q+=GetPixelChannels(image);
}
}
sync=SyncAuthenticPixels(image,exception);
@@ -907,9 +909,6 @@
}
case '7':
{
- register IndexPacket
- *indexes;
-
QuantumAny
range;
@@ -957,7 +956,7 @@
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
ssize_t
@@ -988,12 +987,11 @@
if (count != (ssize_t) extent)
status=MagickFalse;
q=QueueAuthenticPixels(image,0,offset,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
}
- indexes=GetAuthenticIndexQueue(image);
p=pixels;
if ((image->depth == 8) || (image->depth == 16))
(void) ImportQuantumPixels(image,(CacheView *) NULL,quantum_info,
@@ -1012,17 +1010,16 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
p=PushCharPixel(p,&pixel);
- SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- SetPixelOpacity(q,OpaqueOpacity);
+ SetPixelRed(image,ScaleAnyToQuantum(pixel,range),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ SetPixelAlpha(image,OpaqueAlpha,q);
if (image->matte != MagickFalse)
{
p=PushCharPixel(p,&pixel);
- SetPixelOpacity(q,ScaleAnyToQuantum(pixel,
- range));
+ SetPixelAlpha(image,ScaleAnyToQuantum(pixel,range),q);
}
- q++;
+ q+=GetPixelChannels(image);
}
}
else
@@ -1033,17 +1030,16 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
p=PushShortPixel(MSBEndian,p,&pixel);
- SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- SetPixelOpacity(q,OpaqueOpacity);
+ SetPixelRed(image,ScaleAnyToQuantum(pixel,range),q);
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
+ SetPixelAlpha(image,OpaqueAlpha,q);
if (image->matte != MagickFalse)
{
p=PushShortPixel(MSBEndian,p,&pixel);
- SetPixelOpacity(q,ScaleAnyToQuantum(pixel,
- range));
+ SetPixelAlpha(image,ScaleAnyToQuantum(pixel,range),q);
}
- q++;
+ q+=GetPixelChannels(image);
}
}
break;
@@ -1059,22 +1055,20 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
p=PushCharPixel(p,&pixel);
- SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelRed(image,ScaleAnyToQuantum(pixel,range),q);
p=PushCharPixel(p,&pixel);
- SetPixelGreen(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelGreen(image,ScaleAnyToQuantum(pixel,range),q);
p=PushCharPixel(p,&pixel);
- SetPixelBlue(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelBlue(image,ScaleAnyToQuantum(pixel,range),q);
p=PushCharPixel(p,&pixel);
- SetPixelIndex(indexes+x,ScaleAnyToQuantum(pixel,
- range));
- SetPixelOpacity(q,OpaqueOpacity);
+ SetPixelBlack(image,ScaleAnyToQuantum(pixel,range),q);
+ SetPixelAlpha(image,OpaqueAlpha,q);
if (image->matte != MagickFalse)
{
p=PushCharPixel(p,&pixel);
- SetPixelOpacity(q,ScaleAnyToQuantum(pixel,
- range));
+ SetPixelAlpha(image,ScaleAnyToQuantum(pixel,range),q);
}
- q++;
+ q+=GetPixelChannels(image);
}
}
else
@@ -1085,22 +1079,20 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
p=PushShortPixel(MSBEndian,p,&pixel);
- SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelRed(image,ScaleAnyToQuantum(pixel,range),q);
p=PushShortPixel(MSBEndian,p,&pixel);
- SetPixelGreen(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelGreen(image,ScaleAnyToQuantum(pixel,range),q);
p=PushShortPixel(MSBEndian,p,&pixel);
- SetPixelBlue(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelBlue(image,ScaleAnyToQuantum(pixel,range),q);
p=PushShortPixel(MSBEndian,p,&pixel);
- SetPixelIndex(indexes+x,ScaleAnyToQuantum(pixel,
- range));
- SetPixelOpacity(q,OpaqueOpacity);
+ SetPixelBlack(image,ScaleAnyToQuantum(pixel,range),q);
+ SetPixelAlpha(image,OpaqueAlpha,q);
if (image->matte != MagickFalse)
{
p=PushShortPixel(MSBEndian,p,&pixel);
- SetPixelOpacity(q,ScaleAnyToQuantum(pixel,
- range));
+ SetPixelAlpha(image,ScaleAnyToQuantum(pixel,range),q);
}
- q++;
+ q+=GetPixelChannels(image);
}
}
break;
@@ -1115,19 +1107,18 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
p=PushCharPixel(p,&pixel);
- SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelRed(image,ScaleAnyToQuantum(pixel,range),q);
p=PushCharPixel(p,&pixel);
- SetPixelGreen(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelGreen(image,ScaleAnyToQuantum(pixel,range),q);
p=PushCharPixel(p,&pixel);
- SetPixelBlue(q,ScaleAnyToQuantum(pixel,range));
- SetPixelOpacity(q,OpaqueOpacity);
+ SetPixelBlue(image,ScaleAnyToQuantum(pixel,range),q);
+ SetPixelAlpha(image,OpaqueAlpha,q);
if (image->matte != MagickFalse)
{
p=PushCharPixel(p,&pixel);
- SetPixelOpacity(q,ScaleAnyToQuantum(pixel,
- range));
+ SetPixelAlpha(image,ScaleAnyToQuantum(pixel,range),q);
}
- q++;
+ q+=GetPixelChannels(image);
}
}
else
@@ -1138,19 +1129,18 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
p=PushShortPixel(MSBEndian,p,&pixel);
- SetPixelRed(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelRed(image,ScaleAnyToQuantum(pixel,range),q);
p=PushShortPixel(MSBEndian,p,&pixel);
- SetPixelGreen(q,ScaleAnyToQuantum(pixel,range));
+ SetPixelGreen(image,ScaleAnyToQuantum(pixel,range),q);
p=PushShortPixel(MSBEndian,p,&pixel);
- SetPixelBlue(q,ScaleAnyToQuantum(pixel,range));
- SetPixelOpacity(q,OpaqueOpacity);
+ SetPixelBlue(image,ScaleAnyToQuantum(pixel,range),q);
+ SetPixelAlpha(image,OpaqueAlpha,q);
if (image->matte != MagickFalse)
{
p=PushShortPixel(MSBEndian,p,&pixel);
- SetPixelOpacity(q,ScaleAnyToQuantum(pixel,
- range));
+ SetPixelAlpha(image,ScaleAnyToQuantum(pixel,range),q);
}
- q++;
+ q+=GetPixelChannels(image);
}
}
break;
@@ -1192,7 +1182,7 @@
MagickBooleanType
sync;
- register PixelPacket
+ register Quantum
*restrict q;
ssize_t
@@ -1227,7 +1217,7 @@
status=MagickFalse;
q=QueueAuthenticPixels(image,0,(ssize_t) (image->rows-offset-1),
image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
{
status=MagickFalse;
continue;
@@ -1424,15 +1414,15 @@
const char
*value;
- IndexPacket
- index;
-
MagickBooleanType
status;
MagickOffsetType
scene;
+ Quantum
+ index;
+
QuantumAny
pixel;
@@ -1495,7 +1485,7 @@
case 'f':
{
format='F';
- if (IsGrayImage(image,&image->exception) != MagickFalse)
+ if (IsImageGray(image,&image->exception) != MagickFalse)
format='f';
break;
}
@@ -1511,12 +1501,12 @@
case 'n':
{
if ((image_info->type != TrueColorType) &&
- (IsGrayImage(image,&image->exception) != MagickFalse))
+ (IsImageGray(image,&image->exception) != MagickFalse))
{
format='5';
if (image_info->compression == NoCompression)
format='2';
- if (IsMonochromeImage(image,&image->exception) != MagickFalse)
+ if (IsImageMonochrome(image,&image->exception) != MagickFalse)
{
format='4';
if (image_info->compression == NoCompression)
@@ -1633,18 +1623,18 @@
q=pixels;
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
register ssize_t
x;
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- pixel=PixelIntensityToQuantum(p);
+ pixel=GetPixelIntensity(image,p);
*q++=(unsigned char) (pixel >= (Quantum) (QuantumRange/2) ?
'0' : '1');
*q++=' ';
@@ -1654,7 +1644,7 @@
(void) WriteBlob(image,q-pixels,pixels);
q=pixels;
}
- p++;
+ p+=GetPixelChannels(image);
}
if (image->previous == (Image *) NULL)
{
@@ -1686,18 +1676,18 @@
q=pixels;
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
register ssize_t
x;
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- index=PixelIntensityToQuantum(p);
+ index=GetPixelIntensity(image,p);
if (image->depth <= 8)
count=(ssize_t) FormatLocaleString(buffer,MaxTextExtent,"%u ",
ScaleQuantumToChar(index));
@@ -1713,7 +1703,7 @@
(void) WriteBlob(image,q-pixels,pixels);
q=pixels;
}
- p++;
+ p+=GetPixelChannels(image);
}
if (image->previous == (Image *) NULL)
{
@@ -1745,27 +1735,27 @@
q=pixels;
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
register ssize_t
x;
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
if (image->depth <= 8)
count=(ssize_t) FormatLocaleString(buffer,MaxTextExtent,
- "%u %u %u ",ScaleQuantumToChar(GetPixelRed(p)),
- ScaleQuantumToChar(GetPixelGreen(p)),
- ScaleQuantumToChar(GetPixelBlue(p)));
+ "%u %u %u ",ScaleQuantumToChar(GetPixelRed(image,p)),
+ ScaleQuantumToChar(GetPixelGreen(image,p)),
+ ScaleQuantumToChar(GetPixelBlue(image,p)));
else
count=(ssize_t) FormatLocaleString(buffer,MaxTextExtent,
- "%u %u %u ",ScaleQuantumToShort(GetPixelRed(p)),
- ScaleQuantumToShort(GetPixelGreen(p)),
- ScaleQuantumToShort(GetPixelBlue(p)));
+ "%u %u %u ",ScaleQuantumToShort(GetPixelRed(image,p)),
+ ScaleQuantumToShort(GetPixelGreen(image,p)),
+ ScaleQuantumToShort(GetPixelBlue(image,p)));
extent=(size_t) count;
(void) strncpy((char *) q,buffer,extent);
q+=extent;
@@ -1775,7 +1765,7 @@
(void) WriteBlob(image,q-pixels,pixels);
q=pixels;
}
- p++;
+ p+=GetPixelChannels(image);
}
if (image->previous == (Image *) NULL)
{
@@ -1805,14 +1795,14 @@
pixels=GetQuantumPixels(quantum_info);
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- extent=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,GrayQuantum,pixels,&image->exception);
+ extent=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ GrayQuantum,pixels,&image->exception);
count=WriteBlob(image,extent,pixels);
if (count != (ssize_t) extent)
break;
@@ -1849,50 +1839,50 @@
range=GetQuantumRange(image->depth);
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
register ssize_t
x;
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
q=pixels;
if ((image->depth == 8) || (image->depth == 16))
- extent=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,GrayQuantum,pixels,&image->exception);
+ extent=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ GrayQuantum,pixels,&image->exception);
else
{
if (image->depth <= 8)
for (x=0; x < (ssize_t) image->columns; x++)
{
- if (IsGrayPixel(p) == MagickFalse)
- pixel=ScaleQuantumToAny(PixelIntensityToQuantum(p),range);
+ if (IsPixelGray(image,p) == MagickFalse)
+ pixel=ScaleQuantumToAny(GetPixelIntensity(image,p),range);
else
{
if (image->depth == 8)
- pixel=ScaleQuantumToChar(GetPixelRed(p));
+ pixel=ScaleQuantumToChar(GetPixelRed(image,p));
else
- pixel=ScaleQuantumToAny(GetPixelRed(p),range);
+ pixel=ScaleQuantumToAny(GetPixelRed(image,p),range);
}
q=PopCharPixel((unsigned char) pixel,q);
- p++;
+ p+=GetPixelChannels(image);
}
else
for (x=0; x < (ssize_t) image->columns; x++)
{
- if (IsGrayPixel(p) == MagickFalse)
- pixel=ScaleQuantumToAny(PixelIntensityToQuantum(p),range);
+ if (IsPixelGray(image,p) == MagickFalse)
+ pixel=ScaleQuantumToAny(GetPixelIntensity(image,p),range);
else
{
if (image->depth == 16)
- pixel=ScaleQuantumToShort(GetPixelRed(p));
+ pixel=ScaleQuantumToShort(GetPixelRed(image,p));
else
- pixel=ScaleQuantumToAny(GetPixelRed(p),range);
+ pixel=ScaleQuantumToAny(GetPixelRed(image,p),range);
}
q=PopShortPixel(MSBEndian,(unsigned short) pixel,q);
- p++;
+ p+=GetPixelChannels(image);
}
extent=(size_t) (q-pixels);
}
@@ -1931,42 +1921,42 @@
range=GetQuantumRange(image->depth);
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
register ssize_t
x;
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
q=pixels;
if ((image->depth == 8) || (image->depth == 16))
- extent=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,quantum_type,pixels,&image->exception);
+ extent=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ quantum_type,pixels,&image->exception);
else
{
if (image->depth <= 8)
for (x=0; x < (ssize_t) image->columns; x++)
{
- pixel=ScaleQuantumToAny(GetPixelRed(p),range);
+ pixel=ScaleQuantumToAny(GetPixelRed(image,p),range);
q=PopCharPixel((unsigned char) pixel,q);
- pixel=ScaleQuantumToAny(GetPixelGreen(p),range);
+ pixel=ScaleQuantumToAny(GetPixelGreen(image,p),range);
q=PopCharPixel((unsigned char) pixel,q);
- pixel=ScaleQuantumToAny(GetPixelBlue(p),range);
+ pixel=ScaleQuantumToAny(GetPixelBlue(image,p),range);
q=PopCharPixel((unsigned char) pixel,q);
- p++;
+ p+=GetPixelChannels(image);
}
else
for (x=0; x < (ssize_t) image->columns; x++)
{
- pixel=ScaleQuantumToAny(GetPixelRed(p),range);
+ pixel=ScaleQuantumToAny(GetPixelRed(image,p),range);
q=PopShortPixel(MSBEndian,(unsigned short) pixel,q);
- pixel=ScaleQuantumToAny(GetPixelGreen(p),range);
+ pixel=ScaleQuantumToAny(GetPixelGreen(image,p),range);
q=PopShortPixel(MSBEndian,(unsigned short) pixel,q);
- pixel=ScaleQuantumToAny(GetPixelBlue(p),range);
+ pixel=ScaleQuantumToAny(GetPixelBlue(image,p),range);
q=PopShortPixel(MSBEndian,(unsigned short) pixel,q);
- p++;
+ p+=GetPixelChannels(image);
}
extent=(size_t) (q-pixels);
}
@@ -1999,23 +1989,19 @@
range=GetQuantumRange(image->depth);
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const IndexPacket
- *restrict indexes;
-
- register const PixelPacket
+ register const Quantum
*restrict p;
register ssize_t
x;
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetVirtualIndexQueue(image);
q=pixels;
if ((image->depth == 8) || (image->depth == 16))
- extent=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,quantum_type,pixels,&image->exception);
+ extent=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ quantum_type,pixels,&image->exception);
else
{
switch (quantum_type)
@@ -2026,28 +2012,28 @@
if (image->depth <= 8)
for (x=0; x < (ssize_t) image->columns; x++)
{
- pixel=ScaleQuantumToAny(PixelIntensityToQuantum(p),range);
+ pixel=ScaleQuantumToAny(GetPixelIntensity(image,p),range);
q=PopCharPixel((unsigned char) pixel,q);
if (image->matte != MagickFalse)
{
pixel=(unsigned char) ScaleQuantumToAny(
- GetPixelOpacity(p),range);
+ GetPixelAlpha(image,p),range);
q=PopCharPixel((unsigned char) pixel,q);
}
- p++;
+ p+=GetPixelChannels(image);
}
else
for (x=0; x < (ssize_t) image->columns; x++)
{
- pixel=ScaleQuantumToAny(PixelIntensityToQuantum(p),range);
+ pixel=ScaleQuantumToAny(GetPixelIntensity(image,p),range);
q=PopShortPixel(MSBEndian,(unsigned short) pixel,q);
if (image->matte != MagickFalse)
{
pixel=(unsigned char) ScaleQuantumToAny(
- GetPixelOpacity(p),range);
+ GetPixelAlpha(image,p),range);
q=PopShortPixel(MSBEndian,(unsigned short) pixel,q);
}
- p++;
+ p+=GetPixelChannels(image);
}
break;
}
@@ -2057,42 +2043,38 @@
if (image->depth <= 8)
for (x=0; x < (ssize_t) image->columns; x++)
{
- pixel=ScaleQuantumToAny(GetPixelRed(p),range);
+ pixel=ScaleQuantumToAny(GetPixelRed(image,p),range);
q=PopCharPixel((unsigned char) pixel,q);
- pixel=ScaleQuantumToAny(GetPixelGreen(p),range);
+ pixel=ScaleQuantumToAny(GetPixelGreen(image,p),range);
q=PopCharPixel((unsigned char) pixel,q);
- pixel=ScaleQuantumToAny(GetPixelBlue(p),range);
+ pixel=ScaleQuantumToAny(GetPixelBlue(image,p),range);
q=PopCharPixel((unsigned char) pixel,q);
- pixel=ScaleQuantumToAny(
- GetPixelIndex(indexes+x),range);
+ pixel=ScaleQuantumToAny(GetPixelBlack(image,p),range);
q=PopCharPixel((unsigned char) pixel,q);
if (image->matte != MagickFalse)
{
- pixel=ScaleQuantumToAny((Quantum) (QuantumRange-
- GetPixelOpacity(p)),range);
+ pixel=ScaleQuantumToAny(GetPixelAlpha(image,p),range);
q=PopCharPixel((unsigned char) pixel,q);
}
- p++;
+ p+=GetPixelChannels(image);
}
else
for (x=0; x < (ssize_t) image->columns; x++)
{
- pixel=ScaleQuantumToAny(GetPixelRed(p),range);
+ pixel=ScaleQuantumToAny(GetPixelRed(image,p),range);
q=PopShortPixel(MSBEndian,(unsigned short) pixel,q);
- pixel=ScaleQuantumToAny(GetPixelGreen(p),range);
+ pixel=ScaleQuantumToAny(GetPixelGreen(image,p),range);
q=PopShortPixel(MSBEndian,(unsigned short) pixel,q);
- pixel=ScaleQuantumToAny(GetPixelBlue(p),range);
+ pixel=ScaleQuantumToAny(GetPixelBlue(image,p),range);
q=PopShortPixel(MSBEndian,(unsigned short) pixel,q);
- pixel=ScaleQuantumToAny(
- GetPixelIndex(indexes+x),range);
+ pixel=ScaleQuantumToAny(GetPixelBlack(image,p),range);
q=PopShortPixel(MSBEndian,(unsigned short) pixel,q);
if (image->matte != MagickFalse)
{
- pixel=ScaleQuantumToAny((Quantum) (QuantumRange-
- GetPixelOpacity(p)),range);
+ pixel=ScaleQuantumToAny(GetPixelAlpha(image,p),range);
q=PopShortPixel(MSBEndian,(unsigned short) pixel,q);
}
- p++;
+ p+=GetPixelChannels(image);
}
break;
}
@@ -2101,36 +2083,34 @@
if (image->depth <= 8)
for (x=0; x < (ssize_t) image->columns; x++)
{
- pixel=ScaleQuantumToAny(GetPixelRed(p),range);
+ pixel=ScaleQuantumToAny(GetPixelRed(image,p),range);
q=PopCharPixel((unsigned char) pixel,q);
- pixel=ScaleQuantumToAny(GetPixelGreen(p),range);
+ pixel=ScaleQuantumToAny(GetPixelGreen(image,p),range);
q=PopCharPixel((unsigned char) pixel,q);
- pixel=ScaleQuantumToAny(GetPixelBlue(p),range);
+ pixel=ScaleQuantumToAny(GetPixelBlue(image,p),range);
q=PopCharPixel((unsigned char) pixel,q);
if (image->matte != MagickFalse)
{
- pixel=ScaleQuantumToAny((Quantum) (QuantumRange-
- GetPixelOpacity(p)),range);
+ pixel=ScaleQuantumToAny(GetPixelAlpha(image,p),range);
q=PopCharPixel((unsigned char) pixel,q);
}
- p++;
+ p+=GetPixelChannels(image);
}
else
for (x=0; x < (ssize_t) image->columns; x++)
{
- pixel=ScaleQuantumToAny(GetPixelRed(p),range);
+ pixel=ScaleQuantumToAny(GetPixelRed(image,p),range);
q=PopShortPixel(MSBEndian,(unsigned short) pixel,q);
- pixel=ScaleQuantumToAny(GetPixelGreen(p),range);
+ pixel=ScaleQuantumToAny(GetPixelGreen(image,p),range);
q=PopShortPixel(MSBEndian,(unsigned short) pixel,q);
- pixel=ScaleQuantumToAny(GetPixelBlue(p),range);
+ pixel=ScaleQuantumToAny(GetPixelBlue(image,p),range);
q=PopShortPixel(MSBEndian,(unsigned short) pixel,q);
if (image->matte != MagickFalse)
{
- pixel=ScaleQuantumToAny((Quantum) (QuantumRange-
- GetPixelOpacity(p)),range);
+ pixel=ScaleQuantumToAny(GetPixelAlpha(image,p),range);
q=PopShortPixel(MSBEndian,(unsigned short) pixel,q);
}
- p++;
+ p+=GetPixelChannels(image);
}
break;
}
@@ -2167,14 +2147,14 @@
pixels=GetQuantumPixels(quantum_info);
for (y=(ssize_t) image->rows-1; y >= 0; y--)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- extent=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,quantum_type,pixels,&image->exception);
+ extent=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ quantum_type,pixels,&image->exception);
(void) WriteBlob(image,extent,pixels);
if (image->previous == (Image *) NULL)
{
diff --git a/coders/preview.c b/coders/preview.c
index 383cb89..ce36a44 100644
--- a/coders/preview.c
+++ b/coders/preview.c
@@ -39,30 +39,30 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/property.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/client.h"
-#include "magick/constitute.h"
-#include "magick/effect.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/resize.h"
-#include "magick/resource_.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
-#include "magick/transform.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/property.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/client.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/effect.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/resize.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/transform.h"
+#include "MagickCore/utility.h"
/*
Forward declarations.
diff --git a/coders/ps.c b/coders/ps.c
index d62f427..5796321 100644
--- a/coders/ps.c
+++ b/coders/ps.c
@@ -39,39 +39,40 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/color.h"
-#include "magick/color-private.h"
-#include "magick/colorspace.h"
-#include "magick/constitute.h"
-#include "magick/delegate.h"
-#include "magick/delegate-private.h"
-#include "magick/draw.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/geometry.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/option.h"
-#include "magick/profile.h"
-#include "magick/resource_.h"
-#include "magick/pixel-private.h"
-#include "magick/property.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
-#include "magick/token.h"
-#include "magick/transform.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/attribute.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/color.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/delegate.h"
+#include "MagickCore/delegate-private.h"
+#include "MagickCore/draw.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/option.h"
+#include "MagickCore/profile.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/property.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/token.h"
+#include "MagickCore/transform.h"
+#include "MagickCore/utility.h"
/*
Forward declarations.
@@ -1026,7 +1027,7 @@
#define WriteRunlengthPacket(image,pixel,length,p) \
{ \
if ((image->matte != MagickFalse) && \
- (GetPixelOpacity(p) == (Quantum) TransparentOpacity)) \
+ (GetPixelAlpha(image,p) == (Quantum) TransparentAlpha)) \
{ \
q=PopHexPixel(hex_digits,0xff,q); \
q=PopHexPixel(hex_digits,0xff,q); \
@@ -1342,9 +1343,6 @@
GeometryInfo
geometry_info;
- IndexPacket
- index;
-
MagickBooleanType
status;
@@ -1362,15 +1360,15 @@
resolution,
scale;
+ Quantum
+ index;
+
RectangleInfo
geometry,
media_info,
page_info;
- register const IndexPacket
- *indexes;
-
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
@@ -1616,15 +1614,14 @@
{
p=GetVirtualPixels(preview_image,0,y,preview_image->columns,1,
&preview_image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetVirtualIndexQueue(preview_image);
bit=0;
byte=0;
for (x=0; x < (ssize_t) preview_image->columns; x++)
{
byte<<=1;
- pixel=PixelIntensityToQuantum(p);
+ pixel=GetPixelIntensity(preview_image,p);
if (pixel >= (Quantum) (QuantumRange/2))
byte|=0x01;
bit++;
@@ -1735,13 +1732,13 @@
labels=(char **) RelinquishMagickMemory(labels);
}
(void) ResetMagickMemory(&pixel,0,sizeof(pixel));
- pixel.opacity=(Quantum) TransparentOpacity;
- index=(IndexPacket) 0;
+ pixel.alpha=(Quantum) TransparentAlpha;
+ index=0;
x=0;
if ((image_info->type != TrueColorType) &&
- (IsGrayImage(image,&image->exception) != MagickFalse))
+ (IsImageGray(image,&image->exception) != MagickFalse))
{
- if (IsMonochromeImage(image,&image->exception) == MagickFalse)
+ if (IsImageMonochrome(image,&image->exception) == MagickFalse)
{
Quantum
pixel;
@@ -1758,11 +1755,11 @@
{
p=GetVirtualPixels(image,0,y,image->columns,1,
&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- pixel=(Quantum) ScaleQuantumToChar(PixelIntensityToQuantum(p));
+ pixel=(Quantum) ScaleQuantumToChar(GetPixelIntensity(image,p));
q=PopHexPixel(hex_digits,(size_t) pixel,q);
i++;
if ((q-pixels+8) >= 80)
@@ -1771,7 +1768,7 @@
(void) WriteBlob(image,q-pixels,pixels);
q=pixels;
}
- p++;
+ p+=GetPixelChannels(image);
}
if (image->previous == (Image *) NULL)
{
@@ -1807,15 +1804,14 @@
{
p=GetVirtualPixels(image,0,y,image->columns,1,
&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetVirtualIndexQueue(image);
bit=0;
byte=0;
for (x=0; x < (ssize_t) image->columns; x++)
{
byte<<=1;
- pixel=PixelIntensityToQuantum(p);
+ pixel=GetPixelIntensity(image,p);
if (pixel >= (Quantum) (QuantumRange/2))
byte|=0x01;
bit++;
@@ -1831,7 +1827,7 @@
bit=0;
byte=0;
}
- p++;
+ p+=GetPixelChannels(image);
}
if (bit != 0)
{
@@ -1882,16 +1878,16 @@
{
p=GetVirtualPixels(image,0,y,image->columns,1,
&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- pixel=(*p);
+ GetPixelPacket(image,p,&pixel);
length=255;
for (x=0; x < (ssize_t) image->columns; x++)
{
- if ((GetPixelRed(p) == pixel.red) &&
- (GetPixelGreen(p) == pixel.green) &&
- (GetPixelBlue(p) == pixel.blue) &&
- (GetPixelOpacity(p) == pixel.opacity) &&
+ if ((GetPixelRed(image,p) == pixel.red) &&
+ (GetPixelGreen(image,p) == pixel.green) &&
+ (GetPixelBlue(image,p) == pixel.blue) &&
+ (GetPixelAlpha(image,p) == pixel.alpha) &&
(length < 255) && (x < (ssize_t) (image->columns-1)))
length++;
else
@@ -1908,8 +1904,8 @@
}
length=0;
}
- pixel=(*p);
- p++;
+ GetPixelPacket(image,p,&pixel);
+ p+=GetPixelChannels(image);
}
WriteRunlengthPacket(image,pixel,length,p);
if ((q-pixels+10) >= 80)
@@ -1944,12 +1940,12 @@
{
p=GetVirtualPixels(image,0,y,image->columns,1,
&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
if ((image->matte != MagickFalse) &&
- (GetPixelOpacity(p) == (Quantum) TransparentOpacity))
+ (GetPixelAlpha(image,p) == (Quantum) TransparentAlpha))
{
q=PopHexPixel(hex_digits,0xff,q);
q=PopHexPixel(hex_digits,0xff,q);
@@ -1958,11 +1954,11 @@
else
{
q=PopHexPixel(hex_digits,ScaleQuantumToChar(
- GetPixelRed(p)),q);
+ GetPixelRed(image,p)),q);
q=PopHexPixel(hex_digits,ScaleQuantumToChar(
- GetPixelGreen(p)),q);
+ GetPixelGreen(image,p)),q);
q=PopHexPixel(hex_digits,ScaleQuantumToChar(
- GetPixelBlue(p)),q);
+ GetPixelBlue(image,p)),q);
}
if ((q-pixels+6) >= 80)
{
@@ -1970,7 +1966,7 @@
(void) WriteBlob(image,q-pixels,pixels);
q=pixels;
}
- p++;
+ p+=GetPixelChannels(image);
}
if (image->previous == (Image *) NULL)
{
@@ -2026,14 +2022,13 @@
{
p=GetVirtualPixels(image,0,y,image->columns,1,
&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetVirtualIndexQueue(image);
- index=GetPixelIndex(indexes);
+ index=GetPixelIndex(image,p);
length=255;
for (x=0; x < (ssize_t) image->columns; x++)
{
- if ((index == GetPixelIndex(indexes+x)) &&
+ if ((index == GetPixelIndex(image,p)) &&
(length < 255) && (x < ((ssize_t) image->columns-1)))
length++;
else
@@ -2053,12 +2048,12 @@
}
length=0;
}
- index=GetPixelIndex(indexes+x);
- pixel.red=GetPixelRed(p);
- pixel.green=GetPixelGreen(p);
- pixel.blue=GetPixelBlue(p);
- pixel.opacity=GetPixelOpacity(p);
- p++;
+ index=GetPixelIndex(image,p);
+ pixel.red=GetPixelRed(image,p);
+ pixel.green=GetPixelGreen(image,p);
+ pixel.blue=GetPixelBlue(image,p);
+ pixel.alpha=GetPixelAlpha(image,p);
+ p+=GetPixelChannels(image);
}
q=PopHexPixel(hex_digits,(size_t) index,q);
q=PopHexPixel(hex_digits,(size_t)
@@ -2089,20 +2084,18 @@
{
p=GetVirtualPixels(image,0,y,image->columns,1,
&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetVirtualIndexQueue(image);
for (x=0; x < (ssize_t) image->columns; x++)
{
- q=PopHexPixel(hex_digits,(size_t) GetPixelIndex(
- indexes+x),q);
+ q=PopHexPixel(hex_digits,(size_t) GetPixelIndex(image,p),q);
if ((q-pixels+4) >= 80)
{
*q++='\n';
(void) WriteBlob(image,q-pixels,pixels);
q=pixels;
}
- p++;
+ p+=GetPixelChannels(image);
}
if (image->previous == (Image *) NULL)
{
diff --git a/coders/ps2.c b/coders/ps2.c
index 6731b7f..ae734eb 100644
--- a/coders/ps2.c
+++ b/coders/ps2.c
@@ -39,34 +39,36 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/color.h"
-#include "magick/color-private.h"
-#include "magick/compress.h"
-#include "magick/constitute.h"
-#include "magick/draw.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/geometry.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/monitor-private.h"
-#include "magick/option.h"
-#include "magick/resource_.h"
-#include "magick/property.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/attribute.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/color.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/compress.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/draw.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/option.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/property.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/utility.h"
/*
Define declarations.
@@ -419,10 +421,7 @@
media_info,
page_info;
- register const IndexPacket
- *indexes;
-
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
@@ -723,7 +722,7 @@
ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed");
if ((compression == FaxCompression) || (compression == Group4Compression) ||
((image_info->type != TrueColorType) &&
- (IsGrayImage(image,&image->exception) != MagickFalse)))
+ (IsImageGray(image,&image->exception) != MagickFalse)))
{
(void) FormatLocaleString(buffer,MaxTextExtent,"%.20g %.20g\n1\n%d\n",
(double) image->columns,(double) image->rows,(int)
@@ -781,12 +780,12 @@
{
p=GetVirtualPixels(image,0,y,image->columns,1,
&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- *q++=ScaleQuantumToChar(PixelIntensityToQuantum(p));
- p++;
+ *q++=ScaleQuantumToChar(GetPixelIntensity(image,p));
+ p+=GetPixelChannels(image);
}
progress=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
image->rows);
@@ -816,13 +815,13 @@
{
p=GetVirtualPixels(image,0,y,image->columns,1,
&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
Ascii85Encode(image,ScaleQuantumToChar(
- PixelIntensityToQuantum(p)));
- p++;
+ GetPixelIntensity(image,p)));
+ p+=GetPixelChannels(image);
}
progress=SetImageProgress(image,SaveImageTag,(MagickOffsetType)
y,image->rows);
@@ -878,13 +877,12 @@
{
p=GetVirtualPixels(image,0,y,image->columns,1,
&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetVirtualIndexQueue(image);
for (x=0; x < (ssize_t) image->columns; x++)
{
if ((image->matte != MagickFalse) &&
- (GetPixelOpacity(p) == (Quantum) TransparentOpacity))
+ (GetPixelAlpha(image,p) == (Quantum) TransparentAlpha))
{
*q++=ScaleQuantumToChar((Quantum) QuantumRange);
*q++=ScaleQuantumToChar((Quantum) QuantumRange);
@@ -893,19 +891,18 @@
else
if (image->colorspace != CMYKColorspace)
{
- *q++=ScaleQuantumToChar(GetPixelRed(p));
- *q++=ScaleQuantumToChar(GetPixelGreen(p));
- *q++=ScaleQuantumToChar(GetPixelBlue(p));
+ *q++=ScaleQuantumToChar(GetPixelRed(image,p));
+ *q++=ScaleQuantumToChar(GetPixelGreen(image,p));
+ *q++=ScaleQuantumToChar(GetPixelBlue(image,p));
}
else
{
- *q++=ScaleQuantumToChar(GetPixelRed(p));
- *q++=ScaleQuantumToChar(GetPixelGreen(p));
- *q++=ScaleQuantumToChar(GetPixelBlue(p));
- *q++=ScaleQuantumToChar(GetPixelIndex(
- indexes+x));
+ *q++=ScaleQuantumToChar(GetPixelRed(image,p));
+ *q++=ScaleQuantumToChar(GetPixelGreen(image,p));
+ *q++=ScaleQuantumToChar(GetPixelBlue(image,p));
+ *q++=ScaleQuantumToChar(GetPixelBlack(image,p));
}
- p++;
+ p+=GetPixelChannels(image);
}
progress=SetImageProgress(image,SaveImageTag,(MagickOffsetType)
y,image->rows);
@@ -935,13 +932,12 @@
{
p=GetVirtualPixels(image,0,y,image->columns,1,
&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetVirtualIndexQueue(image);
for (x=0; x < (ssize_t) image->columns; x++)
{
if ((image->matte != MagickFalse) &&
- (GetPixelOpacity(p) == (Quantum) TransparentOpacity))
+ (GetPixelAlpha(image,p) == (Quantum) TransparentAlpha))
{
Ascii85Encode(image,ScaleQuantumToChar((Quantum)
QuantumRange));
@@ -954,24 +950,24 @@
if (image->colorspace != CMYKColorspace)
{
Ascii85Encode(image,ScaleQuantumToChar(
- GetPixelRed(p)));
+ GetPixelRed(image,p)));
Ascii85Encode(image,ScaleQuantumToChar(
- GetPixelGreen(p)));
+ GetPixelGreen(image,p)));
Ascii85Encode(image,ScaleQuantumToChar(
- GetPixelBlue(p)));
+ GetPixelBlue(image,p)));
}
else
{
Ascii85Encode(image,ScaleQuantumToChar(
- GetPixelRed(p)));
+ GetPixelRed(image,p)));
Ascii85Encode(image,ScaleQuantumToChar(
- GetPixelGreen(p)));
+ GetPixelGreen(image,p)));
Ascii85Encode(image,ScaleQuantumToChar(
- GetPixelBlue(p)));
+ GetPixelBlue(image,p)));
Ascii85Encode(image,ScaleQuantumToChar(
- GetPixelIndex(indexes+x)));
+ GetPixelBlack(image,p)));
}
- p++;
+ p+=GetPixelChannels(image);
}
progress=SetImageProgress(image,SaveImageTag,(MagickOffsetType)
y,image->rows);
@@ -1031,11 +1027,13 @@
{
p=GetVirtualPixels(image,0,y,image->columns,1,
&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetVirtualIndexQueue(image);
for (x=0; x < (ssize_t) image->columns; x++)
- *q++=(unsigned char) GetPixelIndex(indexes+x);
+ {
+ *q++=(unsigned char) GetPixelIndex(image,p);
+ p+=GetPixelChannels(image);
+ }
progress=SetImageProgress(image,SaveImageTag,(MagickOffsetType)
y,image->rows);
if (progress == MagickFalse)
@@ -1064,12 +1062,13 @@
{
p=GetVirtualPixels(image,0,y,image->columns,1,
&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetVirtualIndexQueue(image);
for (x=0; x < (ssize_t) image->columns; x++)
- Ascii85Encode(image,(unsigned char) GetPixelIndex(
- indexes+x));
+ {
+ Ascii85Encode(image,(unsigned char) GetPixelIndex(image,p));
+ p+=GetPixelChannels(image);
+ }
progress=SetImageProgress(image,SaveImageTag,(MagickOffsetType)
y,image->rows);
if (progress == MagickFalse)
diff --git a/coders/ps3.c b/coders/ps3.c
index 6d5cb7f..dac0576 100644
--- a/coders/ps3.c
+++ b/coders/ps3.c
@@ -40,35 +40,37 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/color.h"
-#include "magick/color-private.h"
-#include "magick/compress.h"
-#include "magick/constitute.h"
-#include "magick/draw.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/geometry.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/option.h"
-#include "magick/property.h"
-#include "magick/quantum-private.h"
-#include "magick/resource_.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
-#include "magick/token.h"
-#include "magick/utility.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/attribute.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/color.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/compress.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/draw.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/option.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/property.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/token.h"
+#include "MagickCore/utility.h"
+#include "MagickCore/module.h"
/*
Define declarations.
@@ -236,10 +238,7 @@
MagickBooleanType
status;
- register const IndexPacket
- *indexes;
-
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
@@ -265,25 +264,24 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetVirtualIndexQueue(image);
if (image->colorspace != CMYKColorspace)
for (x=0; x < (ssize_t) image->columns; x++)
{
- *q++=ScaleQuantumToChar(GetPixelRed(p));
- *q++=ScaleQuantumToChar(GetPixelGreen(p));
- *q++=ScaleQuantumToChar(GetPixelBlue(p));
- p++;
+ *q++=ScaleQuantumToChar(GetPixelRed(image,p));
+ *q++=ScaleQuantumToChar(GetPixelGreen(image,p));
+ *q++=ScaleQuantumToChar(GetPixelBlue(image,p));
+ p+=GetPixelChannels(image);
}
else
for (x=0; x < (ssize_t) image->columns; x++)
{
- *q++=ScaleQuantumToChar(GetPixelRed(p));
- *q++=ScaleQuantumToChar(GetPixelGreen(p));
- *q++=ScaleQuantumToChar(GetPixelBlue(p));
- *q++=ScaleQuantumToChar(GetPixelIndex(indexes+x));
- p++;
+ *q++=ScaleQuantumToChar(GetPixelRed(image,p));
+ *q++=ScaleQuantumToChar(GetPixelGreen(image,p));
+ *q++=ScaleQuantumToChar(GetPixelBlue(image,p));
+ *q++=ScaleQuantumToChar(GetPixelBlack(image,p));
+ p+=GetPixelChannels(image);
}
if (image->previous == (Image *) NULL)
{
@@ -304,7 +302,7 @@
MagickBooleanType
status;
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
@@ -329,7 +327,7 @@
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
status=MagickTrue;
- pack=IsMonochromeImage(image,&image->exception) == MagickFalse ? 1UL : 8UL;
+ pack=IsImageMonochrome(image,&image->exception) == MagickFalse ? 1UL : 8UL;
padded_columns=((image->columns+pack-1)/pack)*pack;
*length=(size_t) padded_columns*image->rows/pack;
*pixels=(unsigned char *) AcquireQuantumMemory(*length,sizeof(**pixels));
@@ -339,13 +337,13 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
if (pack == 1)
for (x=0; x < (ssize_t) image->columns; x++)
{
- *q++=ScaleQuantumToChar(PixelIntensityToQuantum(p));
- p++;
+ *q++=ScaleQuantumToChar(GetPixelIntensity(image,p));
+ p+=GetPixelChannels(image);
}
else
{
@@ -354,15 +352,15 @@
{
bit=(unsigned char) 0x00;
if (x < (ssize_t) image->columns)
- bit=(unsigned char) (PixelIntensityToQuantum(p) == (Quantum)
- TransparentOpacity ? 0x01 : 0x00);
+ bit=(unsigned char) (GetPixelIntensity(image,p) == (Quantum)
+ TransparentAlpha ? 0x01 : 0x00);
code=(code << 1)+bit;
if (((x+1) % pack) == 0)
{
*q++=code;
code='\0';
}
- p++;
+ p+=GetPixelChannels(image);
}
}
status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
@@ -381,10 +379,7 @@
MagickBooleanType
status;
- register const IndexPacket
- *indexes;
-
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
@@ -409,11 +404,13 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetVirtualIndexQueue(image);
for (x=0; x < (ssize_t) image->columns; x++)
- *q++=(unsigned char) GetPixelIndex(indexes+x);
+ {
+ *q++=(unsigned char) GetPixelIndex(image,p);
+ p+=GetPixelChannels(image);
+ }
if (image->previous == (Image *) NULL)
{
status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
@@ -876,7 +873,7 @@
case FaxCompression:
case Group4Compression:
{
- if ((IsMonochromeImage(image,&image->exception) == MagickFalse) ||
+ if ((IsImageMonochrome(image,&image->exception) == MagickFalse) ||
(image->matte != MagickFalse))
compression=RLECompression;
break;
@@ -1020,7 +1017,7 @@
(void) WriteBlobString(image,
"%%DocumentProcessColors: Cyan Magenta Yellow Black\n");
else
- if (IsGrayImage(image,&image->exception) != MagickFalse)
+ if (IsImageGray(image,&image->exception) != MagickFalse)
(void) WriteBlobString(image,
"%%DocumentProcessColors: Black\n");
}
@@ -1103,7 +1100,7 @@
(void) WriteBlobString(image,
"%%PageProcessColors: Cyan Magenta Yellow Black\n");
else
- if (IsGrayImage(image,&image->exception) != MagickFalse)
+ if (IsImageGray(image,&image->exception) != MagickFalse)
(void) WriteBlobString(image,"%%PageProcessColors: Black\n");
/*
Adjust document bounding box to bound page bounding box.
@@ -1228,7 +1225,7 @@
*/
option=GetImageOption(image_info,"ps3:imagemask");
(void) WriteBlobString(image,((option != (const char *) NULL) &&
- (IsMonochromeImage(image,&image->exception) != MagickFalse)) ?
+ (IsImageMonochrome(image,&image->exception) != MagickFalse)) ?
"true\n" : "false\n");
/*
Output pixel data.
@@ -1240,8 +1237,8 @@
(image_info->type != ColorSeparationType) &&
(image_info->type != ColorSeparationMatteType) &&
(image->colorspace != CMYKColorspace) &&
- ((IsGrayImage(image,&image->exception) != MagickFalse) ||
- (IsMonochromeImage(image,&image->exception) != MagickFalse)))
+ ((IsImageGray(image,&image->exception) != MagickFalse) ||
+ (IsImageMonochrome(image,&image->exception) != MagickFalse)))
{
/*
Gray images.
@@ -1290,7 +1287,7 @@
1 bit or 8 bit components?
*/
(void) FormatLocaleString(buffer,MaxTextExtent,"%d\n",
- IsMonochromeImage(image,&image->exception) != MagickFalse ? 1 : 8);
+ IsImageMonochrome(image,&image->exception) != MagickFalse ? 1 : 8);
(void) WriteBlobString(image,buffer);
/*
Image data.
diff --git a/coders/psd.c b/coders/psd.c
index e22ef68..88cb77f 100644
--- a/coders/psd.c
+++ b/coders/psd.c
@@ -40,31 +40,33 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/artifact.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/colormap.h"
-#include "magick/colorspace.h"
-#include "magick/constitute.h"
-#include "magick/enhance.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/log.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/module.h"
-#include "magick/monitor-private.h"
-#include "magick/pixel.h"
-#include "magick/profile.h"
-#include "magick/property.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/artifact.h"
+#include "MagickCore/attribute.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/colormap.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/enhance.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/log.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/pixel.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/profile.h"
+#include "MagickCore/property.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
/*
Define declaractions.
@@ -527,10 +529,7 @@
register const unsigned char
*p;
- register IndexPacket
- *indexes;
-
- register PixelPacket
+ register Quantum
*q;
register ssize_t
@@ -619,9 +618,8 @@
break;
}
q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
p=pixels;
for (x=0; x < (ssize_t) image->columns; x++)
{
@@ -636,25 +634,25 @@
{
case -1:
{
- SetPixelAlpha(q,pixel);
+ SetPixelAlpha(image,pixel,q);
break;
}
case 0:
{
- SetPixelRed(q,pixel);
+ SetPixelRed(image,pixel,q);
if (channels == 1)
{
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
+ SetPixelGreen(image,GetPixelRed(image,q),q);
+ SetPixelBlue(image,GetPixelRed(image,q),q);
}
if (image->storage_class == PseudoClass)
{
if (packet_size == 1)
- SetPixelIndex(indexes+x,ScaleQuantumToChar(pixel));
+ SetPixelIndex(image,ScaleQuantumToChar(pixel),q);
else
- SetPixelIndex(indexes+x,ScaleQuantumToShort(pixel));
- SetPixelRGBO(q,image->colormap+(ssize_t)
- GetPixelIndex(indexes+x));
+ SetPixelIndex(image,ScaleQuantumToShort(pixel),q);
+ SetPixelPacket(image,image->colormap+(ssize_t)
+ GetPixelIndex(image,q),q);
if (image->depth == 1)
{
ssize_t
@@ -666,11 +664,11 @@
number_bits=8;
for (bit=0; bit < number_bits; bit++)
{
- SetPixelIndex(indexes+x,(((unsigned char) pixel) &
- (0x01 << (7-bit))) != 0 ? 0 : 255);
- SetPixelRGBO(q,image->colormap+(ssize_t)
- GetPixelIndex(indexes+x));
- q++;
+ SetPixelIndex(image,(((unsigned char) pixel) &
+ (0x01 << (7-bit))) != 0 ? 0 : 255,q);
+ SetPixelPacket(image,image->colormap+(ssize_t)
+ GetPixelIndex(image,q),q);
+ q+=GetPixelChannels(image);
x++;
}
q--;
@@ -682,38 +680,38 @@
case 1:
{
if (image->storage_class == PseudoClass)
- SetPixelAlpha(q,pixel);
+ SetPixelAlpha(image,pixel,q);
else
- SetPixelGreen(q,pixel);
+ SetPixelGreen(image,pixel,q);
break;
}
case 2:
{
if (image->storage_class == PseudoClass)
- SetPixelAlpha(q,pixel);
+ SetPixelAlpha(image,pixel,q);
else
- SetPixelBlue(q,pixel);
+ SetPixelBlue(image,pixel,q);
break;
}
case 3:
{
if (image->colorspace == CMYKColorspace)
- SetPixelIndex(indexes+x,pixel);
+ SetPixelBlack(image,pixel,q);
else
- SetPixelAlpha(q,pixel);
+ SetPixelAlpha(image,pixel,q);
break;
}
case 4:
{
if ((image->colorspace == RGBColorspace) && (channels > 3))
break;
- SetPixelAlpha(q,pixel);
+ SetPixelAlpha(image,pixel,q);
break;
}
default:
break;
}
- q++;
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -752,7 +750,7 @@
PSDInfo
psd_info;
- register PixelPacket
+ register Quantum
*q;
register ssize_t
@@ -1057,8 +1055,8 @@
ThrowReaderException(CorruptImageError,"ImproperImageHeader");
}
count=ReadBlob(image,4,(unsigned char *) layer_info[i].blendkey);
- layer_info[i].opacity=(Quantum) (QuantumRange-ScaleCharToQuantum(
- (unsigned char) ReadBlobByte(image)));
+ layer_info[i].opacity=(Quantum) ScaleCharToQuantum((unsigned char)
+ ReadBlobByte(image));
layer_info[i].clipping=(unsigned char) ReadBlobByte(image);
layer_info[i].flags=(unsigned char) ReadBlobByte(image);
layer_info[i].visible=!(layer_info[i].flags & 0x02);
@@ -1300,7 +1298,7 @@
break;
}
}
- if (layer_info[i].opacity != OpaqueOpacity)
+ if (layer_info[i].opacity != OpaqueAlpha)
{
/*
Correct for opacity level.
@@ -1309,14 +1307,14 @@
{
q=GetAuthenticPixels(layer_info[i].image,0,y,
layer_info[i].image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) layer_info[i].image->columns; x++)
{
- q->opacity=(Quantum) (QuantumRange-(Quantum) (QuantumScale*
- ((QuantumRange-q->opacity)*(QuantumRange-
- layer_info[i].opacity))));
- q++;
+ SetPixelAlpha(layer_info[i].image,(Quantum)
+ (QuantumScale*(GetPixelAlpha(layer_info[i].image,q))*
+ layer_info[i].opacity),q);
+ q+=GetPixelChannels(layer_info[i].image);
}
if (SyncAuthenticPixels(layer_info[i].image,exception) == MagickFalse)
break;
@@ -1665,7 +1663,7 @@
QuantumInfo
*quantum_info;
- register const PixelPacket
+ register const Quantum
*p;
size_t
@@ -1687,7 +1685,7 @@
for (y=0; y < (ssize_t) next_image->rows; y++)
{
p=GetVirtualPixels(next_image,0,y,next_image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
length=ExportQuantumPixels(next_image,(CacheView *) NULL,quantum_info,
quantum_type,pixels,&image->exception);
@@ -1710,7 +1708,7 @@
QuantumInfo
*quantum_info;
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
@@ -1729,7 +1727,7 @@
(void) WriteBlobMSBShort(image,0);
if (next_image->depth > 8)
next_image->depth=16;
- monochrome=IsMonochromeImage(image,&image->exception) && (image->depth == 1)
+ monochrome=IsImageMonochrome(image,&image->exception) && (image->depth == 1)
? MagickTrue : MagickFalse;
packet_size=next_image->depth > 8UL ? 2UL : 1UL;
(void) packet_size;
@@ -1738,7 +1736,7 @@
for (y=0; y < (ssize_t) next_image->rows; y++)
{
p=GetVirtualPixels(next_image,0,y,next_image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
length=ExportQuantumPixels(next_image,(CacheView *) NULL,quantum_info,
quantum_type,pixels,&image->exception);
@@ -1784,7 +1782,7 @@
ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed");
}
i=0;
- if (IsGrayImage(next_image,&next_image->exception) != MagickFalse)
+ if (IsImageGray(next_image,&next_image->exception) != MagickFalse)
{
if (next_image->compression == RLECompression)
{
@@ -2097,7 +2095,7 @@
(void) WriteBlobMSBShort(image,psd_info.version); /* version */
for (i=1; i <= 6; i++)
(void) WriteBlobByte(image, 0); /* 6 bytes of reserved */
- if (IsGrayImage(image,&image->exception) != MagickFalse)
+ if (IsImageGray(image,&image->exception) != MagickFalse)
num_channels=(image->matte != MagickFalse ? 2UL : 1UL);
else
if (image->storage_class == PseudoClass)
@@ -2112,7 +2110,7 @@
(void) WriteBlobMSBShort(image,(unsigned short) num_channels);
(void) WriteBlobMSBLong(image,(unsigned int) image->rows);
(void) WriteBlobMSBLong(image,(unsigned int) image->columns);
- if (IsGrayImage(image,&image->exception) != MagickFalse)
+ if (IsImageGray(image,&image->exception) != MagickFalse)
{
MagickBooleanType
monochrome;
@@ -2120,7 +2118,7 @@
/*
Write depth & mode.
*/
- monochrome=IsMonochromeImage(image,&image->exception) &&
+ monochrome=IsImageMonochrome(image,&image->exception) &&
(image->depth == 1) ? MagickTrue : MagickFalse;
(void) WriteBlobMSBShort(image,(unsigned short)
(monochrome != MagickFalse ? 1 : image->depth > 8 ? 16 : 8));
@@ -2147,7 +2145,7 @@
(void) WriteBlobMSBShort(image,CMYKMode);
}
}
- if ((IsGrayImage(image,&image->exception) != MagickFalse) ||
+ if ((IsImageGray(image,&image->exception) != MagickFalse) ||
(image->storage_class == DirectClass) || (image->colors > 256))
(void) WriteBlobMSBLong(image,0);
else
@@ -2216,7 +2214,7 @@
while ( next_image != NULL )
{
packet_size=next_image->depth > 8 ? 2UL : 1UL;
- if (IsGrayImage(next_image,&image->exception) != MagickFalse)
+ if (IsImageGray(next_image,&image->exception) != MagickFalse)
num_channels=next_image->matte != MagickFalse ? 2UL : 1UL;
else
if (next_image->storage_class == PseudoClass)
@@ -2271,7 +2269,7 @@
packet_size=next_image->depth > 8 ? 2UL : 1UL;
channel_size=(unsigned int) ((packet_size*next_image->rows*
next_image->columns)+2);
- if ((IsGrayImage(next_image,&image->exception) != MagickFalse) ||
+ if ((IsImageGray(next_image,&image->exception) != MagickFalse) ||
(next_image->storage_class == PseudoClass))
{
(void) WriteBlobMSBShort(image,(unsigned short)
diff --git a/coders/pwp.c b/coders/pwp.c
index cba02dc..14a9b19 100644
--- a/coders/pwp.c
+++ b/coders/pwp.c
@@ -39,24 +39,24 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/constitute.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/resource_.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/coders/raw.c b/coders/raw.c
index 092dc45..5fd602b 100644
--- a/coders/raw.c
+++ b/coders/raw.c
@@ -39,27 +39,28 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/colorspace.h"
-#include "magick/constitute.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/quantum-private.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/statistic.h"
-#include "magick/string_.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/statistic.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
/*
Forward declarations.
@@ -188,10 +189,10 @@
}
for (y=0; y < (ssize_t) image->extract_info.height; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -204,7 +205,7 @@
break;
}
q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,quantum_info,
quantum_type,pixels,exception);
@@ -217,15 +218,15 @@
image->columns,1,exception);
q=QueueAuthenticPixels(image,0,y-image->extract_info.y,image->columns,
1,exception);
- if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelRed(q,GetPixelRed(p));
- SetPixelGreen(q,GetPixelGreen(p));
- SetPixelBlue(q,GetPixelBlue(p));
- p++;
- q++;
+ SetPixelRed(image,GetPixelRed(canvas_image,p),q);
+ SetPixelGreen(image,GetPixelGreen(canvas_image,p),q);
+ SetPixelBlue(image,GetPixelBlue(canvas_image,p),q);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -444,7 +445,7 @@
MagickBooleanType
status;
- register const PixelPacket
+ register const Quantum
*p;
size_t
@@ -558,9 +559,9 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,quantum_info,
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
quantum_type,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
diff --git a/coders/rgb.c b/coders/rgb.c
index dafeca5..e663199 100644
--- a/coders/rgb.c
+++ b/coders/rgb.c
@@ -39,28 +39,28 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/colorspace.h"
-#include "magick/constitute.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/pixel-private.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/statistic.h"
-#include "magick/string_.h"
-#include "magick/module.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/statistic.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/utility.h"
/*
Forward declarations.
@@ -216,10 +216,10 @@
}
for (y=0; y < (ssize_t) image->extract_info.height; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -233,7 +233,7 @@
}
q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
quantum_info,quantum_type,pixels,exception);
@@ -246,19 +246,19 @@
canvas_image->columns,1,exception);
q=QueueAuthenticPixels(image,0,y-image->extract_info.y,
image->columns,1,exception);
- if ((p == (const PixelPacket *) NULL) ||
- (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) ||
+ (q == (const Quantum *) NULL))
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelRed(q,GetPixelRed(p));
- SetPixelGreen(q,GetPixelGreen(p));
- SetPixelBlue(q,GetPixelBlue(p));
- SetPixelOpacity(q,OpaqueOpacity);
+ SetPixelRed(image,GetPixelRed(canvas_image,p),q);
+ SetPixelGreen(image,GetPixelGreen(canvas_image,p),q);
+ SetPixelBlue(image,GetPixelBlue(canvas_image,p),q);
+ SetPixelAlpha(image,OpaqueAlpha,q);
if (image->matte != MagickFalse)
- SetPixelOpacity(q,GetPixelOpacity(p));
- p++;
- q++;
+ SetPixelAlpha(image,GetPixelAlpha(canvas_image,p),q);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -297,10 +297,10 @@
}
for (y=0; y < (ssize_t) image->extract_info.height; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -317,7 +317,7 @@
quantum_type=quantum_types[i];
q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
quantum_info,quantum_type,pixels,exception);
@@ -330,8 +330,8 @@
0,canvas_image->columns,1,exception);
q=GetAuthenticPixels(image,0,y-image->extract_info.y,
image->columns,1,exception);
- if ((p == (const PixelPacket *) NULL) ||
- (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) ||
+ (q == (const Quantum *) NULL))
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
@@ -339,34 +339,34 @@
{
case RedQuantum:
{
- SetPixelRed(q,GetPixelRed(p));
+ SetPixelRed(image,GetPixelRed(canvas_image,p),q);
break;
}
case GreenQuantum:
{
- SetPixelGreen(q,GetPixelGreen(p));
+ SetPixelGreen(image,GetPixelGreen(canvas_image,p),q);
break;
}
case BlueQuantum:
{
- SetPixelBlue(q,GetPixelBlue(p));
+ SetPixelBlue(image,GetPixelBlue(canvas_image,p),q);
break;
}
case OpacityQuantum:
{
- SetPixelOpacity(q,GetPixelOpacity(p));
+ SetPixelAlpha(image,GetPixelAlpha(canvas_image,p),q);
break;
}
case AlphaQuantum:
{
- SetPixelAlpha(q,GetPixelAlpha(p));
+ SetPixelAlpha(image,GetPixelAlpha(canvas_image,p),q);
break;
}
default:
break;
}
- p++;
- q++;
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -395,10 +395,10 @@
}
for (y=0; y < (ssize_t) image->extract_info.height; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -412,7 +412,7 @@
}
q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
quantum_info,RedQuantum,pixels,exception);
@@ -425,14 +425,14 @@
canvas_image->columns,1,exception);
q=GetAuthenticPixels(image,0,y-image->extract_info.y,
image->columns,1,exception);
- if ((p == (const PixelPacket *) NULL) ||
- (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) ||
+ (q == (const Quantum *) NULL))
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelRed(q,GetPixelRed(p));
- p++;
- q++;
+ SetPixelRed(image,GetPixelRed(canvas_image,p),q);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -447,10 +447,10 @@
}
for (y=0; y < (ssize_t) image->extract_info.height; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -464,7 +464,7 @@
}
q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
quantum_info,GreenQuantum,pixels,exception);
@@ -477,14 +477,15 @@
canvas_image->columns,1,exception);
q=GetAuthenticPixels(image,0,y-image->extract_info.y,
image->columns,1,exception);
- if ((p == (const PixelPacket *) NULL) ||
- (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) ||
+ (q == (const Quantum *) NULL))
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelGreen(q,GetPixelGreen(p));
- p++;
- q++;
+ SetPixelGreen(image,
+ GetPixelGreen(canvas_image,p),q);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -499,10 +500,10 @@
}
for (y=0; y < (ssize_t) image->extract_info.height; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -516,7 +517,7 @@
}
q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
quantum_info,BlueQuantum,pixels,exception);
@@ -529,14 +530,15 @@
canvas_image->columns,1,exception);
q=GetAuthenticPixels(image,0,y-image->extract_info.y,
image->columns,1,exception);
- if ((p == (const PixelPacket *) NULL) ||
- (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) ||
+ (q == (const Quantum *) NULL))
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelBlue(q,GetPixelBlue(p));
- p++;
- q++;
+ SetPixelBlue(image,
+ GetPixelBlue(canvas_image,p),q);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -559,10 +561,10 @@
{
for (y=0; y < (ssize_t) image->extract_info.height; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -576,7 +578,7 @@
}
q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
quantum_info,AlphaQuantum,pixels,exception);
@@ -590,14 +592,15 @@
exception);
q=GetAuthenticPixels(image,0,y-image->extract_info.y,
image->columns,1,exception);
- if ((p == (const PixelPacket *) NULL) ||
- (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) ||
+ (q == (const Quantum *) NULL))
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelOpacity(q,GetPixelOpacity(p));
- p++;
- q++;
+ SetPixelAlpha(image,
+ GetPixelAlpha(canvas_image,p),q);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -647,10 +650,10 @@
count=ReadBlob(image,length,pixels);
for (y=0; y < (ssize_t) image->extract_info.height; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -664,7 +667,7 @@
}
q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
quantum_info,RedQuantum,pixels,exception);
@@ -677,14 +680,14 @@
canvas_image->columns,1,exception);
q=GetAuthenticPixels(image,0,y-image->extract_info.y,
image->columns,1,exception);
- if ((p == (const PixelPacket *) NULL) ||
- (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) ||
+ (q == (const Quantum *) NULL))
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelRed(q,GetPixelRed(p));
- p++;
- q++;
+ SetPixelRed(image,GetPixelRed(canvas_image,p),q);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -718,10 +721,10 @@
count=ReadBlob(image,length,pixels);
for (y=0; y < (ssize_t) image->extract_info.height; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -735,7 +738,7 @@
}
q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
quantum_info,GreenQuantum,pixels,exception);
@@ -748,14 +751,15 @@
canvas_image->columns,1,exception);
q=GetAuthenticPixels(image,0,y-image->extract_info.y,
image->columns,1,exception);
- if ((p == (const PixelPacket *) NULL) ||
- (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) ||
+ (q == (const Quantum *) NULL))
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelGreen(q,GetPixelGreen(p));
- p++;
- q++;
+ SetPixelGreen(image,
+ GetPixelGreen(canvas_image,p),q);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -789,10 +793,10 @@
count=ReadBlob(image,length,pixels);
for (y=0; y < (ssize_t) image->extract_info.height; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -806,7 +810,7 @@
}
q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
quantum_info,BlueQuantum,pixels,exception);
@@ -819,14 +823,15 @@
canvas_image->columns,1,exception);
q=GetAuthenticPixels(image,0,y-image->extract_info.y,
image->columns,1,exception);
- if ((p == (const PixelPacket *) NULL) ||
- (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) ||
+ (q == (const Quantum *) NULL))
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelBlue(q,GetPixelBlue(p));
- p++;
- q++;
+ SetPixelBlue(image,
+ GetPixelBlue(canvas_image,p),q);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -862,10 +867,10 @@
count=ReadBlob(image,length,pixels);
for (y=0; y < (ssize_t) image->extract_info.height; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
- register PixelPacket
+ register Quantum
*restrict q;
register ssize_t
@@ -879,7 +884,7 @@
}
q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
quantum_info,BlueQuantum,pixels,exception);
@@ -892,14 +897,15 @@
0,canvas_image->columns,1,exception);
q=GetAuthenticPixels(image,0,y-image->extract_info.y,
image->columns,1,exception);
- if ((p == (const PixelPacket *) NULL) ||
- (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) ||
+ (q == (const Quantum *) NULL))
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelOpacity(q,GetPixelOpacity(p));
- p++;
- q++;
+ SetPixelAlpha(image,
+ GetPixelAlpha(canvas_image,p),q);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -1127,7 +1133,7 @@
(void) TransformImageColorspace(image,RGBColorspace);
if ((LocaleCompare(image_info->magick,"RGBA") == 0) &&
(image->matte == MagickFalse))
- (void) SetImageAlphaChannel(image,ResetAlphaChannel);
+ (void) SetImageAlphaChannel(image,OpaqueAlphaChannel);
quantum_info=AcquireQuantumInfo(image_info,image);
if (quantum_info == (QuantumInfo *) NULL)
ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed");
@@ -1142,14 +1148,14 @@
*/
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,quantum_type,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ quantum_type,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
break;
@@ -1170,39 +1176,39 @@
*/
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,RedQuantum,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ RedQuantum,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,GreenQuantum,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ GreenQuantum,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,BlueQuantum,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ BlueQuantum,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
break;
if (quantum_type == RGBAQuantum)
{
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,AlphaQuantum,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ AlphaQuantum,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
break;
}
if (quantum_type == RGBOQuantum)
{
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,OpacityQuantum,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ OpacityQuantum,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
break;
@@ -1224,14 +1230,14 @@
*/
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,RedQuantum,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ RedQuantum,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
break;
@@ -1244,14 +1250,14 @@
}
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,GreenQuantum,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ GreenQuantum,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
break;
@@ -1264,14 +1270,14 @@
}
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,BlueQuantum,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ BlueQuantum,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
break;
@@ -1286,14 +1292,14 @@
{
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,AlphaQuantum,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ AlphaQuantum,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
break;
@@ -1328,14 +1334,14 @@
return(status);
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,RedQuantum,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ RedQuantum,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
break;
@@ -1354,14 +1360,14 @@
return(status);
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,GreenQuantum,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ GreenQuantum,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
break;
@@ -1380,14 +1386,14 @@
return(status);
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,BlueQuantum,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ BlueQuantum,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
break;
@@ -1409,15 +1415,15 @@
return(status);
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
p=GetVirtualPixels(image,0,y,image->columns,1,
&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,AlphaQuantum,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ AlphaQuantum,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
break;
diff --git a/coders/rla.c b/coders/rla.c
index 39b80ba..c1f3b2b 100644
--- a/coders/rla.c
+++ b/coders/rla.c
@@ -39,24 +39,25 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/property.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/property.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -172,7 +173,7 @@
i,
x;
- register PixelPacket
+ register Quantum
*q;
ssize_t
@@ -296,7 +297,7 @@
{
q=GetAuthenticPixels(image,(ssize_t) (x % image->columns),
(ssize_t) (y % image->rows),1,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
byte=(unsigned char) ReadBlobByte(image);
length--;
@@ -304,23 +305,23 @@
{
case 0:
{
- SetPixelRed(q,ScaleCharToQuantum(byte));
+ SetPixelRed(image,ScaleCharToQuantum(byte),q);
break;
}
case 1:
{
- SetPixelGreen(q,ScaleCharToQuantum(byte));
+ SetPixelGreen(image,ScaleCharToQuantum(byte),q);
break;
}
case 2:
{
- SetPixelBlue(q,ScaleCharToQuantum(byte));
+ SetPixelBlue(image,ScaleCharToQuantum(byte),q);
break;
}
case 3:
default:
{
- SetPixelAlpha(q,ScaleCharToQuantum(byte));
+ SetPixelAlpha(image,ScaleCharToQuantum(byte),q);
break;
}
}
@@ -338,29 +339,29 @@
{
q=GetAuthenticPixels(image,(ssize_t) (x % image->columns),
(ssize_t) (y % image->rows),1,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
switch (channel)
{
case 0:
{
- SetPixelRed(q,ScaleCharToQuantum(byte));
+ SetPixelRed(image,ScaleCharToQuantum(byte),q);
break;
}
case 1:
{
- SetPixelGreen(q,ScaleCharToQuantum(byte));
+ SetPixelGreen(image,ScaleCharToQuantum(byte),q);
break;
}
case 2:
{
- SetPixelBlue(q,ScaleCharToQuantum(byte));
+ SetPixelBlue(image,ScaleCharToQuantum(byte),q);
break;
}
case 3:
default:
{
- SetPixelAlpha(q,ScaleCharToQuantum(byte));
+ SetPixelAlpha(image,ScaleCharToQuantum(byte),q);
break;
}
}
diff --git a/coders/rle.c b/coders/rle.c
index 14a49fb..c2fecd9 100644
--- a/coders/rle.c
+++ b/coders/rle.c
@@ -39,26 +39,27 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/property.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/colormap.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/quantum-private.h"
-#include "magick/pixel.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/property.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/colormap.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/pixel.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -148,13 +149,10 @@
MagickSizeType
number_pixels;
- register IndexPacket
- *indexes;
-
register ssize_t
x;
- register PixelPacket
+ register Quantum
*q;
register ssize_t
@@ -440,16 +438,16 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelRed(q,ScaleCharToQuantum(*p++));
- SetPixelGreen(q,ScaleCharToQuantum(*p++));
- SetPixelBlue(q,ScaleCharToQuantum(*p++));
+ SetPixelRed(image,ScaleCharToQuantum(*p++),q);
+ SetPixelGreen(image,ScaleCharToQuantum(*p++),q);
+ SetPixelBlue(image,ScaleCharToQuantum(*p++),q);
if (image->matte != MagickFalse)
- SetPixelAlpha(q,ScaleCharToQuantum(*p++));
- q++;
+ SetPixelAlpha(image,ScaleCharToQuantum(*p++),q);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -500,11 +498,13 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
for (x=0; x < (ssize_t) image->columns; x++)
- SetPixelIndex(indexes+x,*p++);
+ {
+ SetPixelIndex(image,*p++,q);
+ q+=GetPixelChannels(image);
+ }
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
if (image->previous == (Image *) NULL)
@@ -525,15 +525,15 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelRed(q,image->colormap[*p++].red);
- SetPixelGreen(q,image->colormap[*p++].green);
- SetPixelBlue(q,image->colormap[*p++].blue);
- SetPixelAlpha(q,ScaleCharToQuantum(*p++));
- q++;
+ SetPixelRed(image,image->colormap[*p++].red,q);
+ SetPixelGreen(image,image->colormap[*p++].green,q);
+ SetPixelBlue(image,image->colormap[*p++].blue,q);
+ SetPixelAlpha(image,ScaleCharToQuantum(*p++),q);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
diff --git a/coders/scr.c b/coders/scr.c
index 13f19b4..9d44d92 100644
--- a/coders/scr.c
+++ b/coders/scr.c
@@ -39,23 +39,24 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -130,7 +131,7 @@
MagickBooleanType
status;
- register PixelPacket
+ register Quantum
*q;
ssize_t
@@ -215,19 +216,19 @@
if(binar[z])
{
- SetPixelRed(q,ScaleCharToQuantum(
- colour_palette[3*ink]));
- SetPixelGreen(q,ScaleCharToQuantum(
- colour_palette[1+(3*ink)]));
- SetPixelBlue(q,ScaleCharToQuantum(
- colour_palette[2+(3*ink)]));
+ SetPixelRed(image,ScaleCharToQuantum(
+ colour_palette[3*ink]),q);
+ SetPixelGreen(image,ScaleCharToQuantum(
+ colour_palette[1+(3*ink)]),q);
+ SetPixelBlue(image,ScaleCharToQuantum(
+ colour_palette[2+(3*ink)]),q);
} else {
- SetPixelRed(q,ScaleCharToQuantum(
- colour_palette[3*paper]));
- SetPixelGreen(q,ScaleCharToQuantum(
- colour_palette[1+(3*paper)]));
- SetPixelBlue(q,ScaleCharToQuantum(
- colour_palette[2+(3*paper)]));
+ SetPixelRed(image,ScaleCharToQuantum(
+ colour_palette[3*paper]),q);
+ SetPixelGreen(image,ScaleCharToQuantum(
+ colour_palette[1+(3*paper)]),q);
+ SetPixelBlue(image,ScaleCharToQuantum(
+ colour_palette[2+(3*paper)]),q);
}
pix++;
diff --git a/coders/sct.c b/coders/sct.c
index 5bed1d2..ad2f66e 100644
--- a/coders/sct.c
+++ b/coders/sct.c
@@ -39,24 +39,25 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/module.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/string-private.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/string-private.h"
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -136,14 +137,11 @@
Quantum
pixel;
- register IndexPacket
- *indexes;
-
register ssize_t
i,
x;
- register PixelPacket
+ register Quantum
*q;
ssize_t
@@ -231,9 +229,8 @@
for (i=0; i < (ssize_t) separations; i++)
{
q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
for (x=0; x < (ssize_t) image->columns; x++)
{
pixel=(Quantum) ScaleCharToQuantum((unsigned char) ReadBlobByte(image));
@@ -243,29 +240,29 @@
{
case 0:
{
- SetPixelRed(q,pixel);
- SetPixelGreen(q,pixel);
- SetPixelBlue(q,pixel);
+ SetPixelRed(image,pixel,q);
+ SetPixelGreen(image,pixel,q);
+ SetPixelBlue(image,pixel,q);
break;
}
case 1:
{
- SetPixelGreen(q,pixel);
+ SetPixelGreen(image,pixel,q);
break;
}
case 2:
{
- SetPixelBlue(q,pixel);
+ SetPixelBlue(image,pixel,q);
break;
}
case 3:
{
if (image->colorspace == CMYKColorspace)
- SetPixelBlack(indexes+x,pixel);
+ SetPixelBlack(image,pixel,q);
break;
}
}
- q++;
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
diff --git a/coders/sfw.c b/coders/sfw.c
index d82d436..46e6b6b 100644
--- a/coders/sfw.c
+++ b/coders/sfw.c
@@ -39,24 +39,24 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/constitute.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/resource_.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
-#include "magick/transform.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/transform.h"
+#include "MagickCore/utility.h"
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/coders/sgi.c b/coders/sgi.c
index 5d6c054..3adfcfa 100644
--- a/coders/sgi.c
+++ b/coders/sgi.c
@@ -39,28 +39,30 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/color.h"
-#include "magick/color-private.h"
-#include "magick/colormap.h"
-#include "magick/colorspace.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/property.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/attribute.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/color.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colormap.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/property.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
/*
Typedef declaractions.
@@ -268,10 +270,7 @@
MagickSizeType
number_pixels;
- register IndexPacket
- *indexes;
-
- register PixelPacket
+ register Quantum
*q;
register ssize_t
@@ -547,22 +546,22 @@
{
p=iris_pixels+(image->rows-y-1)*8*image->columns;
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelRed(q,ScaleShortToQuantum((unsigned short)
- ((*(p+0) << 8) | (*(p+1)))));
- SetPixelGreen(q,ScaleShortToQuantum((unsigned short)
- ((*(p+2) << 8) | (*(p+3)))));
- SetPixelBlue(q,ScaleShortToQuantum((unsigned short)
- ((*(p+4) << 8) | (*(p+5)))));
- SetPixelOpacity(q,OpaqueOpacity);
+ SetPixelRed(image,ScaleShortToQuantum((unsigned short)
+ ((*(p+0) << 8) | (*(p+1)))),q);
+ SetPixelGreen(image,ScaleShortToQuantum((unsigned short)
+ ((*(p+2) << 8) | (*(p+3)))),q);
+ SetPixelBlue(image,ScaleShortToQuantum((unsigned short)
+ ((*(p+4) << 8) | (*(p+5)))),q);
+ SetPixelAlpha(image,OpaqueAlpha,q);
if (image->matte != MagickFalse)
- SetPixelAlpha(q,ScaleShortToQuantum((unsigned short)
- ((*(p+6) << 8) | (*(p+7)))));
+ SetPixelAlpha(image,ScaleShortToQuantum((unsigned short)
+ ((*(p+6) << 8) | (*(p+7)))),q);
p+=8;
- q++;
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -580,25 +579,25 @@
{
p=iris_pixels+(image->rows-y-1)*4*image->columns;
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelRed(q,ScaleCharToQuantum(*p));
- q->green=ScaleCharToQuantum(*(p+1));
- q->blue=ScaleCharToQuantum(*(p+2));
- SetPixelOpacity(q,OpaqueOpacity);
+ SetPixelRed(image,ScaleCharToQuantum(*p),q);
+ SetPixelGreen(image,ScaleCharToQuantum(*(p+1)),q);
+ SetPixelBlue(image,ScaleCharToQuantum(*(p+2)),q);
+ SetPixelAlpha(image,OpaqueAlpha,q);
if (image->matte != MagickFalse)
- SetPixelAlpha(q,ScaleCharToQuantum(*(p+3)));
+ SetPixelAlpha(image,ScaleCharToQuantum(*(p+3)),q);
p+=4;
- q++;
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
if (image->previous == (Image *) NULL)
{
status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
- image->rows);
+ image->rows);
if (status == MagickFalse)
break;
}
@@ -620,16 +619,15 @@
{
p=iris_pixels+(image->rows-y-1)*8*image->columns;
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
for (x=0; x < (ssize_t) image->columns; x++)
{
quantum=(*p << 8);
quantum|=(*(p+1));
- SetPixelIndex(indexes+x,quantum);
+ SetPixelIndex(image,quantum,q);
p+=8;
- q++;
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -647,14 +645,13 @@
{
p=iris_pixels+(image->rows-y-1)*4*image->columns;
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelIndex(indexes+x,*p);
+ SetPixelIndex(image,*p,q);
p+=4;
- q++;
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -865,7 +862,7 @@
SGIInfo
iris_info;
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
@@ -925,7 +922,7 @@
else
{
if ((image_info->type != TrueColorType) &&
- (IsGrayImage(image,&image->exception) != MagickFalse))
+ (IsImageGray(image,&image->exception) != MagickFalse))
{
iris_info.dimension=2;
iris_info.depth=1;
@@ -974,7 +971,7 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
if (image->depth <= 8)
for (x=0; x < (ssize_t) image->columns; x++)
@@ -984,11 +981,11 @@
q=(unsigned char *) iris_pixels;
q+=((iris_info.rows-1)-y)*(4*iris_info.columns)+4*x;
- *q++=ScaleQuantumToChar(GetPixelRed(p));
- *q++=ScaleQuantumToChar(GetPixelGreen(p));
- *q++=ScaleQuantumToChar(GetPixelBlue(p));
- *q++=ScaleQuantumToChar(GetPixelAlpha(p));
- p++;
+ *q++=ScaleQuantumToChar(GetPixelRed(image,p));
+ *q++=ScaleQuantumToChar(GetPixelGreen(image,p));
+ *q++=ScaleQuantumToChar(GetPixelBlue(image,p));
+ *q++=ScaleQuantumToChar(GetPixelAlpha(image,p));
+ p+=GetPixelChannels(image);
}
else
for (x=0; x < (ssize_t) image->columns; x++)
@@ -998,11 +995,11 @@
q=(unsigned short *) iris_pixels;
q+=((iris_info.rows-1)-y)*(4*iris_info.columns)+4*x;
- *q++=ScaleQuantumToShort(GetPixelRed(p));
- *q++=ScaleQuantumToShort(GetPixelGreen(p));
- *q++=ScaleQuantumToShort(GetPixelBlue(p));
- *q++=ScaleQuantumToShort(GetPixelAlpha(p));
- p++;
+ *q++=ScaleQuantumToShort(GetPixelRed(image,p));
+ *q++=ScaleQuantumToShort(GetPixelGreen(image,p));
+ *q++=ScaleQuantumToShort(GetPixelBlue(image,p));
+ *q++=ScaleQuantumToShort(GetPixelAlpha(image,p));
+ p+=GetPixelChannels(image);
}
if (image->previous == (Image *) NULL)
{
diff --git a/coders/stegano.c b/coders/stegano.c
index e0f7d79..2e9ffb1 100644
--- a/coders/stegano.c
+++ b/coders/stegano.c
@@ -39,25 +39,26 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/colormap.h"
-#include "magick/constitute.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/colormap.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -100,9 +101,9 @@
{
#define GetBit(alpha,i) MagickMin((((size_t) (alpha) >> (size_t) \
(i)) & 0x01),16)
-#define SetBit(indexes,i,set) SetPixelIndex(indexes,((set) != 0 ? \
- (size_t) GetPixelIndex(indexes) | (one << (size_t) (i)) : (size_t) \
- GetPixelIndex(indexes) & ~(one << (size_t) (i))))
+#define SetBit(i,set) SetPixelIndex(image,((set) != 0 ? \
+ (size_t) GetPixelIndex(image,q) | (one << (size_t) (i)) : \
+ (size_t) GetPixelIndex(image,q) & ~(one << (size_t) (i))),q)
Image
*image,
@@ -120,10 +121,7 @@
PixelPacket
pixel;
- register IndexPacket
- *indexes;
-
- register PixelPacket
+ register Quantum
*q;
register ssize_t
@@ -188,24 +186,23 @@
(void) GetOneVirtualPixel(watermark,k % (ssize_t) watermark->columns,
k/(ssize_t) watermark->columns,&pixel,exception);
q=GetAuthenticPixels(image,x,y,1,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
switch (c)
{
case 0:
{
- SetBit(indexes,i,GetBit(pixel.red,j));
+ SetBit(i,GetBit(pixel.red,j));
break;
}
case 1:
{
- SetBit(indexes,i,GetBit(pixel.green,j));
+ SetBit(i,GetBit(pixel.green,j));
break;
}
case 2:
{
- SetBit(indexes,i,GetBit(pixel.blue,j));
+ SetBit(i,GetBit(pixel.blue,j));
break;
}
}
diff --git a/coders/sun.c b/coders/sun.c
index 3a066c0..630668c 100644
--- a/coders/sun.c
+++ b/coders/sun.c
@@ -39,27 +39,29 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/color.h"
-#include "magick/color-private.h"
-#include "magick/colormap.h"
-#include "magick/colorspace.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/attribute.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/color.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colormap.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
/*
Forward declarations.
@@ -239,10 +241,7 @@
MagickSizeType
number_pixels;
- register IndexPacket
- *indexes;
-
- register PixelPacket
+ register Quantum
*q;
register ssize_t
@@ -441,21 +440,24 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
for (x=0; x < ((ssize_t) image->columns-7); x+=8)
{
for (bit=7; bit >= 0; bit--)
- SetPixelIndex(indexes+x+7-bit,((*p) & (0x01 << bit) ?
- 0x00 : 0x01));
+ {
+ SetPixelIndex(image,((*p) & (0x01 << bit) ? 0x00 : 0x01),q);
+ q+=GetPixelChannels(image);
+ }
p++;
}
if ((image->columns % 8) != 0)
{
for (bit=7; bit >= (ssize_t) (8-(image->columns % 8)); bit--)
- SetPixelIndex(indexes+x+7-bit,(*p) & (0x01 << bit) ?
- 0x00 : 0x01);
+ {
+ SetPixelIndex(image,(*p) & (0x01 << bit) ? 0x00 : 0x01,q);
+ q+=GetPixelChannels(image);
+ }
p++;
}
if ((((image->columns/8)+(image->columns % 8 ? 1 : 0)) % 2) != 0)
@@ -481,11 +483,13 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
for (x=0; x < (ssize_t) image->columns; x++)
- SetPixelIndex(indexes+x,*p++);
+ {
+ SetPixelIndex(image,*p++,q);
+ q+=GetPixelChannels(image);
+ }
if ((image->columns % 2) != 0)
p++;
if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -516,34 +520,34 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
if (image->matte != MagickFalse)
- SetPixelAlpha(q,ScaleCharToQuantum(*p++));
+ SetPixelAlpha(image,ScaleCharToQuantum(*p++),q);
if (sun_info.type == RT_STANDARD)
{
- SetPixelBlue(q,ScaleCharToQuantum(*p++));
- SetPixelGreen(q,ScaleCharToQuantum(*p++));
- SetPixelRed(q,ScaleCharToQuantum(*p++));
+ SetPixelBlue(image,ScaleCharToQuantum(*p++),q);
+ SetPixelGreen(image,ScaleCharToQuantum(*p++),q);
+ SetPixelRed(image,ScaleCharToQuantum(*p++),q);
}
else
{
- SetPixelRed(q,ScaleCharToQuantum(*p++));
- SetPixelGreen(q,ScaleCharToQuantum(*p++));
- SetPixelBlue(q,ScaleCharToQuantum(*p++));
+ SetPixelRed(image,ScaleCharToQuantum(*p++),q);
+ SetPixelGreen(image,ScaleCharToQuantum(*p++),q);
+ SetPixelBlue(image,ScaleCharToQuantum(*p++),q);
}
if (image->colors != 0)
{
- SetPixelRed(q,image->colormap[(ssize_t)
- GetPixelRed(q)].red);
- SetPixelGreen(q,image->colormap[(ssize_t)
- GetPixelGreen(q)].green);
- SetPixelBlue(q,image->colormap[(ssize_t)
- GetPixelBlue(q)].blue);
+ SetPixelRed(image,image->colormap[(ssize_t)
+ GetPixelRed(image,q)].red,q);
+ SetPixelGreen(image,image->colormap[(ssize_t)
+ GetPixelGreen(image,q)].green,q);
+ SetPixelBlue(image,image->colormap[(ssize_t)
+ GetPixelBlue(image,q)].blue,q);
}
- q++;
+ q+=GetPixelChannels(image);
}
if (((bytes_per_pixel*image->columns) % 2) != 0)
p++;
@@ -719,10 +723,7 @@
MagickSizeType
number_pixels;
- register const IndexPacket
- *indexes;
-
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
@@ -779,7 +780,7 @@
0;
}
else
- if (IsMonochromeImage(image,&image->exception))
+ if (IsImageMonochrome(image,&image->exception))
{
/*
Monochrome SUN raster.
@@ -846,17 +847,17 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
q=pixels;
for (x=0; x < (ssize_t) image->columns; x++)
{
if (image->matte != MagickFalse)
- *q++=ScaleQuantumToChar(GetPixelAlpha(p));
- *q++=ScaleQuantumToChar(GetPixelRed(p));
- *q++=ScaleQuantumToChar(GetPixelGreen(p));
- *q++=ScaleQuantumToChar(GetPixelBlue(p));
- p++;
+ *q++=ScaleQuantumToChar(GetPixelAlpha(image,p));
+ *q++=ScaleQuantumToChar(GetPixelRed(image,p));
+ *q++=ScaleQuantumToChar(GetPixelGreen(image,p));
+ *q++=ScaleQuantumToChar(GetPixelBlue(image,p));
+ p+=GetPixelChannels(image);
}
if (((bytes_per_pixel*image->columns) & 0x01) != 0)
*q++='\0'; /* pad scanline */
@@ -872,7 +873,7 @@
pixels=(unsigned char *) RelinquishMagickMemory(pixels);
}
else
- if (IsMonochromeImage(image,&image->exception))
+ if (IsImageMonochrome(image,&image->exception))
{
register unsigned char
bit,
@@ -885,15 +886,14 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetVirtualIndexQueue(image);
bit=0;
byte=0;
for (x=0; x < (ssize_t) image->columns; x++)
{
byte<<=1;
- if (PixelIntensity(p) < (MagickRealType) (QuantumRange/2.0))
+ if (GetPixelIntensity(image,p) < (MagickRealType) (QuantumRange/2.0))
byte|=0x01;
bit++;
if (bit == 8)
@@ -902,7 +902,7 @@
bit=0;
byte=0;
}
- p++;
+ p+=GetPixelChannels(image);
}
if (bit != 0)
(void) WriteBlobByte(image,(unsigned char) (byte << (8-bit)));
@@ -938,14 +938,13 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetVirtualIndexQueue(image);
for (x=0; x < (ssize_t) image->columns; x++)
{
(void) WriteBlobByte(image,(unsigned char)
- GetPixelIndex(indexes+x));
- p++;
+ GetPixelIndex(image,p));
+ p+=GetPixelChannels(image);
}
if (image->columns & 0x01)
(void) WriteBlobByte(image,0); /* pad scanline */
diff --git a/coders/svg.c b/coders/svg.c
index ca40028..8a60045 100644
--- a/coders/svg.c
+++ b/coders/svg.c
@@ -40,37 +40,37 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/annotate.h"
-#include "magick/artifact.h"
-#include "magick/attribute.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/constitute.h"
-#include "magick/composite-private.h"
-#include "magick/draw.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/gem.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/log.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/module.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/quantum-private.h"
-#include "magick/pixel-private.h"
-#include "magick/property.h"
-#include "magick/resource_.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/string-private.h"
-#include "magick/token.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/annotate.h"
+#include "MagickCore/artifact.h"
+#include "MagickCore/attribute.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/composite-private.h"
+#include "MagickCore/draw.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/gem.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/log.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/property.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/string-private.h"
+#include "MagickCore/token.h"
+#include "MagickCore/utility.h"
#if defined(MAGICKCORE_XML_DELEGATE)
# if defined(MAGICKCORE_WINDOWS_SUPPORT)
# if defined(__MINGW32__)
@@ -2823,7 +2823,7 @@
register ssize_t
x;
- register PixelPacket
+ register Quantum
*q;
RsvgHandle
@@ -2910,7 +2910,7 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
@@ -2923,22 +2923,22 @@
fill_color.green=ScaleCharToQuantum(*p++);
fill_color.blue=ScaleCharToQuantum(*p++);
#endif
- fill_color.opacity=QuantumRange-ScaleCharToQuantum(*p++);
+ fill_color.alpha=ScaleCharToQuantum(*p++);
#if defined(MAGICKCORE_CAIRO_DELEGATE)
{
double
gamma;
- gamma=1.0-QuantumScale*fill_color.opacity;
+ gamma=1.0-QuantumScale*fill_color.alpha;
gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
fill_color.blue*=gamma;
fill_color.green*=gamma;
fill_color.red*=gamma;
}
#endif
- MagickCompositeOver(&fill_color,fill_color.opacity,q,
- (MagickRealType) q->opacity,q);
- q++;
+ CompositePixelOver(image,&fill_color,fill_color.alpha,q,
+ (MagickRealType) GetPixelAlpha(image,q),q);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -3298,7 +3298,7 @@
ssize_t
y;
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
@@ -3341,17 +3341,17 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- trace->bitmap[i++]=GetPixelRed(p);
+ trace->bitmap[i++]=GetPixelRed(image,p);
if (number_planes == 3)
{
- trace->bitmap[i++]=GetPixelGreen(p);
- trace->bitmap[i++]=GetPixelBlue(p);
+ trace->bitmap[i++]=GetPixelGreen(image,p);
+ trace->bitmap[i++]=GetPixelBlue(image,p);
}
- p++;
+ p+=GetPixelChannels(image);
}
}
splines=at_splines_new_full(trace,fitting_options,NULL,NULL,NULL,NULL,NULL,
@@ -3373,12 +3373,9 @@
message[MaxTextExtent],
tuple[MaxTextExtent];
- MagickPixelPacket
+ PixelInfo
pixel;
- register const IndexPacket
- *indexes;
-
(void) WriteBlobString(image,"<?xml version=\"1.0\" standalone=\"no\"?>\n");
(void) WriteBlobString(image,
"<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 20010904//EN\"\n");
@@ -3388,23 +3385,22 @@
"<svg width=\"%.20g\" height=\"%.20g\">\n",(double) image->columns,
(double) image->rows);
(void) WriteBlobString(image,message);
- GetMagickPixelPacket(image,&pixel);
+ GetPixelInfo(image,&pixel);
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetVirtualIndexQueue(image);
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetMagickPixelPacket(image,p,indexes+x,&pixel);
+ SetPixelInfo(image,p,&pixel);
(void) QueryMagickColorname(image,&pixel,SVGCompliance,tuple,
&image->exception);
(void) FormatLocaleString(message,MaxTextExtent,
" <circle cx=\"%.20g\" cy=\"%.20g\" r=\"1\" fill=\"%s\"/>\n",
(double) x,(double) y,tuple);
(void) WriteBlobString(image,message);
- p++;
+ p+=GetPixelChannels(image);
}
}
(void) WriteBlobString(image,"</svg>\n");
diff --git a/coders/tga.c b/coders/tga.c
index fe50b8c..12f7a6e 100644
--- a/coders/tga.c
+++ b/coders/tga.c
@@ -39,28 +39,30 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/color-private.h"
-#include "magick/colormap.h"
-#include "magick/colormap-private.h"
-#include "magick/colorspace.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/property.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/attribute.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colormap.h"
+#include "MagickCore/colormap-private.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/property.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
/*
Forward declarations.
@@ -131,19 +133,16 @@
Image
*image;
- IndexPacket
- index;
-
MagickBooleanType
status;
PixelPacket
pixel;
- register IndexPacket
- *indexes;
+ Quantum
+ index;
- register PixelPacket
+ register Quantum
*q;
register ssize_t
@@ -282,7 +281,7 @@
comment=DestroyString(comment);
}
(void) ResetMagickMemory(&pixel,0,sizeof(pixel));
- pixel.opacity=(Quantum) OpaqueOpacity;
+ pixel.alpha=(Quantum) OpaqueAlpha;
if (tga_info.colormap_type != 0)
{
/*
@@ -345,7 +344,7 @@
flag=0;
skip=MagickFalse;
real=0;
- index=(IndexPacket) 0;
+ index=0;
runlength=0;
offset=0;
for (y=0; y < (ssize_t) image->rows; y++)
@@ -354,9 +353,8 @@
if (((unsigned char) (tga_info.attributes & 0x20) >> 5) == 0)
real=image->rows-real-1;
q=QueueAuthenticPixels(image,0,(ssize_t) real,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
for (x=0; x < (ssize_t) image->columns; x++)
{
if ((tga_info.image_type == TGARLEColormap) ||
@@ -388,7 +386,7 @@
/*
Gray scale.
*/
- index=(IndexPacket) ReadBlobByte(image);
+ index=(Quantum) ReadBlobByte(image);
if (tga_info.colormap_type != 0)
pixel=image->colormap[(ssize_t) ConstrainColormapIndex(image,
1UL*index)];
@@ -417,8 +415,8 @@
(1UL*(j & 0xe0) >> 5),range);
pixel.blue=ScaleAnyToQuantum(1UL*(j & 0x1f),range);
if (image->matte != MagickFalse)
- pixel.opacity=(k & 0x80) == 0 ? (Quantum) OpaqueOpacity :
- (Quantum) TransparentOpacity;
+ pixel.alpha=(k & 0x80) == 0 ? (Quantum) OpaqueAlpha :
+ (Quantum) TransparentAlpha;
if (image->storage_class == PseudoClass)
index=ConstrainColormapIndex(image,((size_t) k << 8)+j);
break;
@@ -433,21 +431,21 @@
pixel.green=ScaleCharToQuantum((unsigned char) ReadBlobByte(image));
pixel.red=ScaleCharToQuantum((unsigned char) ReadBlobByte(image));
if (tga_info.bits_per_pixel == 32)
- pixel.opacity=(Quantum) (QuantumRange-ScaleCharToQuantum(
- (unsigned char) ReadBlobByte(image)));
+ pixel.alpha=ScaleCharToQuantum((unsigned char)
+ ReadBlobByte(image));
break;
}
}
if (status == MagickFalse)
ThrowReaderException(CorruptImageError,"UnableToReadImageData");
if (image->storage_class == PseudoClass)
- SetPixelIndex(indexes+x,index);
- SetPixelRed(q,pixel.red);
- SetPixelGreen(q,pixel.green);
- SetPixelBlue(q,pixel.blue);
+ SetPixelIndex(image,index,q);
+ SetPixelRed(image,pixel.red,q);
+ SetPixelGreen(image,pixel.green,q);
+ SetPixelBlue(image,pixel.blue,q);
if (image->matte != MagickFalse)
- SetPixelOpacity(q,pixel.opacity);
- q++;
+ SetPixelAlpha(image,pixel.alpha,q);
+ q+=GetPixelChannels(image);
}
if (((unsigned char) (tga_info.attributes & 0xc0) >> 6) == 4)
offset+=4;
@@ -637,10 +635,7 @@
MagickBooleanType
status;
- register const IndexPacket
- *indexes;
-
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
@@ -699,7 +694,7 @@
(image_info->type != TrueColorMatteType) &&
(image_info->type != PaletteType) &&
(image->matte == MagickFalse) &&
- (IsGrayImage(image,&image->exception) != MagickFalse))
+ (IsImageGray(image,&image->exception) != MagickFalse))
targa_info.image_type=TargaMonochrome;
else
if ((image->storage_class == DirectClass) || (image->colors > 256))
@@ -777,29 +772,25 @@
for (y=(ssize_t) (image->rows-1); y >= 0; y--)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
q=targa_pixels;
- indexes=GetVirtualIndexQueue(image);
for (x=0; x < (ssize_t) image->columns; x++)
{
if (targa_info.image_type == TargaColormap)
- *q++=(unsigned char) GetPixelIndex(indexes+x);
+ *q++=(unsigned char) GetPixelIndex(image,p);
else
if (targa_info.image_type == TargaMonochrome)
- *q++=(unsigned char) ScaleQuantumToChar(PixelIntensityToQuantum(p));
+ *q++=(unsigned char) ScaleQuantumToChar(GetPixelIntensity(image,p));
else
{
- *q++=ScaleQuantumToChar(GetPixelBlue(p));
- *q++=ScaleQuantumToChar(GetPixelGreen(p));
- *q++=ScaleQuantumToChar(GetPixelRed(p));
+ *q++=ScaleQuantumToChar(GetPixelBlue(image,p));
+ *q++=ScaleQuantumToChar(GetPixelGreen(image,p));
+ *q++=ScaleQuantumToChar(GetPixelRed(image,p));
if (image->matte != MagickFalse)
- *q++=(unsigned char) ScaleQuantumToChar(
- GetPixelAlpha(p));
- if (image->colorspace == CMYKColorspace)
- *q++=ScaleQuantumToChar(GetPixelIndex(indexes+x));
+ *q++=(unsigned char) ScaleQuantumToChar(GetPixelAlpha(image,p));
}
- p++;
+ p+=GetPixelChannels(image);
}
(void) WriteBlob(image,(size_t) (q-targa_pixels),targa_pixels);
if (image->previous == (Image *) NULL)
diff --git a/coders/thumbnail.c b/coders/thumbnail.c
index 7e1a06e..7139de9 100644
--- a/coders/thumbnail.c
+++ b/coders/thumbnail.c
@@ -39,23 +39,23 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/constitute.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/module.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/profile.h"
-#include "magick/property.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/string-private.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/profile.h"
+#include "MagickCore/property.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/string-private.h"
/*
Forward declarations.
diff --git a/coders/tiff.c b/coders/tiff.c
index 409079b..5e0123c 100644
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -39,44 +39,45 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/attribute.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/color.h"
-#include "magick/color-private.h"
-#include "magick/colormap.h"
-#include "magick/colorspace.h"
-#include "magick/constitute.h"
-#include "magick/enhance.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/geometry.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/log.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/module.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/option.h"
-#include "magick/property.h"
-#include "magick/quantum.h"
-#include "magick/quantum-private.h"
-#include "magick/profile.h"
-#include "magick/resize.h"
-#include "magick/resource_.h"
-#include "magick/semaphore.h"
-#include "magick/splay-tree.h"
-#include "magick/static.h"
-#include "magick/statistic.h"
-#include "magick/string_.h"
-#include "magick/string-private.h"
-#include "magick/thread_.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/attribute.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/color.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colormap.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/enhance.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/log.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/option.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/property.h"
+#include "MagickCore/quantum.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/profile.h"
+#include "MagickCore/resize.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/semaphore.h"
+#include "MagickCore/splay-tree.h"
+#include "MagickCore/static.h"
+#include "MagickCore/statistic.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/string-private.h"
+#include "MagickCore/thread_.h"
+#include "MagickCore/utility.h"
#if defined(MAGICKCORE_TIFF_DELEGATE)
# if defined(MAGICKCORE_HAVE_TIFFCONF_H)
# include "tiffconf.h"
@@ -1233,14 +1234,14 @@
int
status;
- register PixelPacket
+ register Quantum
*restrict q;
status=TIFFReadPixels(tiff,bits_per_sample,0,y,(char *) pixels);
if (status == -1)
break;
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
length=ImportQuantumPixels(image,(CacheView *) NULL,quantum_info,
quantum_type,pixels,exception);
@@ -1291,14 +1292,14 @@
int
status;
- register PixelPacket
+ register Quantum
*restrict q;
status=TIFFReadPixels(tiff,bits_per_sample,0,y,(char *) pixels);
if (status == -1)
break;
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
length=ImportQuantumPixels(image,(CacheView *) NULL,quantum_info,
quantum_type,pixels,exception);
@@ -1323,7 +1324,7 @@
{
for (y=0; y < (ssize_t) image->rows; y++)
{
- register PixelPacket
+ register Quantum
*restrict q;
int
@@ -1334,7 +1335,7 @@
if (status == -1)
break;
q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
if (image->colorspace != CMYKColorspace)
switch (i)
@@ -1385,11 +1386,11 @@
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
if (i == 0)
{
@@ -1402,17 +1403,17 @@
p=(unsigned char *) (((uint32 *) pixels)+image->columns*i);
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelRed(q,ScaleCharToQuantum((unsigned char)
- (TIFFGetR(*p))));
- SetPixelGreen(q,ScaleCharToQuantum((unsigned char)
- (TIFFGetG(*p))));
- SetPixelBlue(q,ScaleCharToQuantum((unsigned char)
- (TIFFGetB(*p))));
+ SetPixelRed(image,ScaleCharToQuantum((unsigned char)
+ (TIFFGetR(*p))),q);
+ SetPixelGreen(image,ScaleCharToQuantum((unsigned char)
+ (TIFFGetG(*p))),q);
+ SetPixelBlue(image,ScaleCharToQuantum((unsigned char)
+ (TIFFGetB(*p))),q);
if (image->matte != MagickFalse)
- SetPixelOpacity(q,ScaleCharToQuantum((unsigned char)
- (TIFFGetA(*p))));
+ SetPixelAlpha(image,ScaleCharToQuantum((unsigned char)
+ (TIFFGetA(*p))),q);
p++;
- q++;
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -1459,14 +1460,12 @@
}
for (y=0; y < (ssize_t) image->rows; y+=rows)
{
- PixelPacket
- *tile;
-
register ssize_t
x;
- register PixelPacket
- *restrict q;
+ register Quantum
+ *restrict q,
+ *restrict tile;
size_t
columns_remaining,
@@ -1477,7 +1476,7 @@
rows_remaining=rows;
tile=QueueAuthenticPixels(image,0,y,image->columns,rows_remaining,
exception);
- if (tile == (PixelPacket *) NULL)
+ if (tile == (Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x+=columns)
{
@@ -1497,31 +1496,31 @@
if (image->matte != MagickFalse)
for (column=columns_remaining; column > 0; column--)
{
- SetPixelRed(q,ScaleCharToQuantum((unsigned char)
- TIFFGetR(*p)));
- SetPixelGreen(q,ScaleCharToQuantum((unsigned char)
- TIFFGetG(*p)));
- SetPixelBlue(q,ScaleCharToQuantum((unsigned char)
- TIFFGetB(*p)));
- SetPixelAlpha(q,ScaleCharToQuantum((unsigned char)
- TIFFGetA(*p)));
- q++;
+ SetPixelRed(image,ScaleCharToQuantum((unsigned char)
+ TIFFGetR(*p)),q);
+ SetPixelGreen(image,ScaleCharToQuantum((unsigned char)
+ TIFFGetG(*p)),q);
+ SetPixelBlue(image,ScaleCharToQuantum((unsigned char)
+ TIFFGetB(*p)),q);
+ SetPixelAlpha(image,ScaleCharToQuantum((unsigned char)
+ TIFFGetA(*p)),q);
p++;
+ q+=GetPixelChannels(image);
}
else
for (column=columns_remaining; column > 0; column--)
{
- SetPixelRed(q,ScaleCharToQuantum((unsigned char)
- TIFFGetR(*p)));
- SetPixelGreen(q,ScaleCharToQuantum((unsigned char)
- TIFFGetG(*p)));
- SetPixelBlue(q,ScaleCharToQuantum((unsigned char)
- TIFFGetB(*p)));
- q++;
+ SetPixelRed(image,ScaleCharToQuantum((unsigned char)
+ TIFFGetR(*p)),q);
+ SetPixelGreen(image,ScaleCharToQuantum((unsigned char)
+ TIFFGetG(*p)),q);
+ SetPixelBlue(image,ScaleCharToQuantum((unsigned char)
+ TIFFGetB(*p)),q);
p++;
+ q+=GetPixelChannels(image);
}
p+=columns-columns_remaining;
- q-=(image->columns+columns_remaining);
+ q-=GetPixelChannels(image)*(image->columns+columns_remaining);
}
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -1574,26 +1573,26 @@
register ssize_t
x;
- register PixelPacket
+ register Quantum
*restrict q;
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- q+=image->columns-1;
+ q+=GetPixelChannels(image)*(image->columns-1);
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelRed(q,ScaleCharToQuantum((unsigned char)
- TIFFGetR(*p)));
- SetPixelGreen(q,ScaleCharToQuantum((unsigned char)
- TIFFGetG(*p)));
- SetPixelBlue(q,ScaleCharToQuantum((unsigned char)
- TIFFGetB(*p)));
+ SetPixelRed(image,ScaleCharToQuantum((unsigned char)
+ TIFFGetR(*p)),q);
+ SetPixelGreen(image,ScaleCharToQuantum((unsigned char)
+ TIFFGetG(*p)),q);
+ SetPixelBlue(image,ScaleCharToQuantum((unsigned char)
+ TIFFGetB(*p)),q);
if (image->matte != MagickFalse)
- SetPixelAlpha(q,ScaleCharToQuantum((unsigned char)
- TIFFGetA(*p)));
+ SetPixelAlpha(image,ScaleCharToQuantum((unsigned char)
+ TIFFGetA(*p)),q);
p--;
- q--;
+ q-=GetPixelChannels(image);;
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -2697,14 +2696,14 @@
(image_info->type != TrueColorMatteType))
{
if ((image_info->type != PaletteType) &&
- (IsGrayImage(image,&image->exception) != MagickFalse))
+ (IsImageGray(image,&image->exception) != MagickFalse))
{
photometric=(uint16) (quantum_info->min_is_white !=
MagickFalse ? PHOTOMETRIC_MINISWHITE :
PHOTOMETRIC_MINISBLACK);
(void) TIFFSetField(tiff,TIFFTAG_SAMPLESPERPIXEL,1);
if ((image_info->depth == 0) && (image->matte == MagickFalse) &&
- (IsMonochromeImage(image,&image->exception) != MagickFalse))
+ (IsImageMonochrome(image,&image->exception) != MagickFalse))
{
status=SetQuantumDepth(image,quantum_info,1);
if (status == MagickFalse)
@@ -3045,15 +3044,15 @@
quantum_type=RGBAQuantum;
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
p=GetVirtualPixels(image,0,y,image->columns,1,
&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,quantum_type,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ quantum_type,pixels,&image->exception);
(void) length;
if (TIFFWritePixels(tiff,&tiff_info,y,0,image) == -1)
break;
@@ -3075,15 +3074,15 @@
*/
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
p=GetVirtualPixels(image,0,y,image->columns,1,
&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,RedQuantum,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ RedQuantum,pixels,&image->exception);
if (TIFFWritePixels(tiff,&tiff_info,y,0,image) == -1)
break;
}
@@ -3095,15 +3094,15 @@
}
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
p=GetVirtualPixels(image,0,y,image->columns,1,
&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,GreenQuantum,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ GreenQuantum,pixels,&image->exception);
if (TIFFWritePixels(tiff,&tiff_info,y,1,image) == -1)
break;
}
@@ -3115,15 +3114,15 @@
}
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
p=GetVirtualPixels(image,0,y,image->columns,1,
&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,BlueQuantum,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ BlueQuantum,pixels,&image->exception);
if (TIFFWritePixels(tiff,&tiff_info,y,2,image) == -1)
break;
}
@@ -3136,14 +3135,14 @@
if (image->matte != MagickFalse)
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
p=GetVirtualPixels(image,0,y,image->columns,1,
&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
+ length=ExportQuantumPixels(image,(CacheView *) NULL,
quantum_info,AlphaQuantum,pixels,&image->exception);
if (TIFFWritePixels(tiff,&tiff_info,y,3,image) == -1)
break;
@@ -3171,14 +3170,14 @@
(void) TransformImageColorspace(image,CMYKColorspace);
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,quantum_type,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ quantum_type,pixels,&image->exception);
if (TIFFWritePixels(tiff,&tiff_info,y,0,image) == -1)
break;
if (image->previous == (Image *) NULL)
@@ -3242,14 +3241,14 @@
quantum_type=GrayQuantum;
for (y=0; y < (ssize_t) image->rows; y++)
{
- register const PixelPacket
+ register const Quantum
*restrict p;
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,quantum_type,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ quantum_type,pixels,&image->exception);
if (TIFFWritePixels(tiff,&tiff_info,y,0,image) == -1)
break;
if (image->previous == (Image *) NULL)
diff --git a/coders/tile.c b/coders/tile.c
index 9b93219..cb90f47 100644
--- a/coders/tile.c
+++ b/coders/tile.c
@@ -39,23 +39,23 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/constitute.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/coders/tim.c b/coders/tim.c
index 03fde8a..d68a947 100644
--- a/coders/tim.c
+++ b/coders/tim.c
@@ -39,24 +39,25 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/colormap.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/colormap.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -108,13 +109,10 @@
MagickBooleanType
status;
- register IndexPacket
- *indexes;
-
register ssize_t
x;
- register PixelPacket
+ register Quantum
*q;
register ssize_t
@@ -258,20 +256,22 @@
for (y=(ssize_t) image->rows-1; y >= 0; y--)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
p=tim_pixels+y*bytes_per_line;
for (x=0; x < ((ssize_t) image->columns-1); x+=2)
{
- SetPixelIndex(indexes+x,(*p) & 0x0f);
- SetPixelIndex(indexes+x+1,(*p >> 4) & 0x0f);
+ SetPixelIndex(image,(*p) & 0x0f,q);
+ q+=GetPixelChannels(image);
+ SetPixelIndex(image,(*p >> 4) & 0x0f,q);
p++;
+ q+=GetPixelChannels(image);
}
if ((image->columns % 2) != 0)
{
- SetPixelIndex(indexes+x,(*p >> 4) & 0x0f);
+ SetPixelIndex(image,(*p >> 4) & 0x0f,q);
p++;
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -293,12 +293,14 @@
for (y=(ssize_t) image->rows-1; y >= 0; y--)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
p=tim_pixels+y*bytes_per_line;
for (x=0; x < (ssize_t) image->columns; x++)
- SetPixelIndex(indexes+x,*p++);
+ {
+ SetPixelIndex(image,*p++,q);
+ q+=GetPixelChannels(image);
+ }
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
if (image->previous == (Image *) NULL)
@@ -320,19 +322,19 @@
{
p=tim_pixels+y*bytes_per_line;
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
word=(*p++);
word|=(*p++ << 8);
- SetPixelBlue(q,ScaleCharToQuantum(ScaleColor5to8(
- (1UL*word >> 10) & 0x1f)));
- SetPixelGreen(q,ScaleCharToQuantum(ScaleColor5to8(
- (1UL*word >> 5) & 0x1f)));
- SetPixelRed(q,ScaleCharToQuantum(ScaleColor5to8(
- (1UL*word >> 0) & 0x1f)));
- q++;
+ SetPixelBlue(image,ScaleCharToQuantum(ScaleColor5to8(
+ (1UL*word >> 10) & 0x1f)),q);
+ SetPixelGreen(image,ScaleCharToQuantum(ScaleColor5to8(
+ (1UL*word >> 5) & 0x1f)),q);
+ SetPixelRed(image,ScaleCharToQuantum(ScaleColor5to8(
+ (1UL*word >> 0) & 0x1f)),q);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -355,14 +357,14 @@
{
p=tim_pixels+y*bytes_per_line;
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelRed(q,ScaleCharToQuantum(*p++));
- SetPixelGreen(q,ScaleCharToQuantum(*p++));
- SetPixelBlue(q,ScaleCharToQuantum(*p++));
- q++;
+ SetPixelRed(image,ScaleCharToQuantum(*p++),q);
+ SetPixelGreen(image,ScaleCharToQuantum(*p++),q);
+ SetPixelBlue(image,ScaleCharToQuantum(*p++),q);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
diff --git a/coders/ttf.c b/coders/ttf.c
index f213df7..c054e2d 100644
--- a/coders/ttf.c
+++ b/coders/ttf.c
@@ -39,23 +39,23 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/draw.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
-#include "magick/type.h"
-#include "wand/MagickWand.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/draw.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/type.h"
+#include "MagickWand/MagickWand.h"
#if defined(MAGICKCORE_FREETYPE_DELEGATE)
#if defined(MAGICKCORE_HAVE_FT2BUILD_H)
# include <ft2build.h>
@@ -197,7 +197,7 @@
i,
x;
- register PixelPacket
+ register Quantum
*q;
ssize_t
@@ -233,10 +233,13 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
- *q++=background_color;
+ {
+ SetPixelPacket(image,&background_color,q);
+ q+=GetPixelChannels(image);
+ }
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
}
diff --git a/coders/txt.c b/coders/txt.c
index 02082c7..6482b9d 100644
--- a/coders/txt.c
+++ b/coders/txt.c
@@ -39,34 +39,34 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/annotate.h"
-#include "magick/attribute.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/color.h"
-#include "magick/color-private.h"
-#include "magick/colorspace.h"
-#include "magick/constitute.h"
-#include "magick/draw.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/geometry.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/option.h"
-#include "magick/pixel-private.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/statistic.h"
-#include "magick/string_.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/annotate.h"
+#include "MagickCore/attribute.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/color.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/draw.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/option.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/statistic.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
/*
Forward declarations.
@@ -367,9 +367,6 @@
Image
*image;
- IndexPacket
- *indexes;
-
long
type,
x_offset,
@@ -389,7 +386,7 @@
i,
x;
- register PixelPacket
+ register Quantum
*q;
ssize_t
@@ -458,35 +455,31 @@
{
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.index,
- &pixel.opacity);
+ &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,
- &y_offset,&pixel.red,&pixel.green,&pixel.blue,&pixel.index);
+ &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,
- &y_offset,&pixel.red,&pixel.green,&pixel.blue,&pixel.opacity);
+ &y_offset,&pixel.red,&pixel.green,&pixel.blue,&pixel.alpha);
else
count=(ssize_t) sscanf(text,"%ld,%ld: (%u,%u,%u",&x_offset,
&y_offset,&pixel.red,&pixel.green,&pixel.blue);
if (count < 5)
continue;
q=GetAuthenticPixels(image,x_offset,y_offset,1,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
continue;
- SetPixelRed(q,ScaleAnyToQuantum(pixel.red,range));
- SetPixelGreen(q,ScaleAnyToQuantum(pixel.green,range));
- SetPixelBlue(q,ScaleAnyToQuantum(pixel.blue,range));
+ SetPixelRed(image,ScaleAnyToQuantum(pixel.red,range),q);
+ SetPixelGreen(image,ScaleAnyToQuantum(pixel.green,range),q);
+ SetPixelBlue(image,ScaleAnyToQuantum(pixel.blue,range),q);
if (image->colorspace == CMYKColorspace)
- {
- indexes=GetAuthenticIndexQueue(image);
- SetPixelIndex(indexes,ScaleAnyToQuantum(pixel.index,
- range));
- }
+ SetPixelBlack(image,ScaleAnyToQuantum(pixel.black,range),q);
if (image->matte != MagickFalse)
- SetPixelAlpha(q,ScaleAnyToQuantum(pixel.opacity,range));
+ SetPixelAlpha(image,ScaleAnyToQuantum(pixel.alpha,range),q);
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
}
@@ -622,13 +615,10 @@
MagickOffsetType
scene;
- MagickPixelPacket
+ PixelInfo
pixel;
- register const IndexPacket
- *indexes;
-
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
@@ -663,19 +653,18 @@
image->columns,(double) image->rows,(double)
GetQuantumRange(image->depth),colorspace);
(void) WriteBlobString(image,buffer);
- GetMagickPixelPacket(image,&pixel);
+ GetPixelInfo(image,&pixel);
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetVirtualIndexQueue(image);
for (x=0; x < (ssize_t) image->columns; x++)
{
(void) FormatLocaleString(buffer,MaxTextExtent,"%.20g,%.20g: ",(double)
x,(double) y);
(void) WriteBlobString(image,buffer);
- SetMagickPixelPacket(image,p,indexes+x,&pixel);
+ SetPixelInfo(image,p,&pixel);
(void) CopyMagickString(tuple,"(",MaxTextExtent);
ConcatenateColorComponent(&pixel,RedChannel,X11Compliance,tuple);
(void) ConcatenateMagickString(tuple,",",MaxTextExtent);
@@ -685,7 +674,7 @@
if (pixel.colorspace == CMYKColorspace)
{
(void) ConcatenateMagickString(tuple,",",MaxTextExtent);
- ConcatenateColorComponent(&pixel,IndexChannel,X11Compliance,tuple);
+ ConcatenateColorComponent(&pixel,BlackChannel,X11Compliance,tuple);
}
if (pixel.matte != MagickFalse)
{
@@ -703,7 +692,7 @@
&image->exception);
(void) WriteBlobString(image,tuple);
(void) WriteBlobString(image,"\n");
- p++;
+ p+=GetPixelChannels(image);
}
status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
image->rows);
diff --git a/coders/uil.c b/coders/uil.c
index 15db2fc..08ed812 100644
--- a/coders/uil.c
+++ b/coders/uil.c
@@ -39,26 +39,26 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/color.h"
-#include "magick/color-private.h"
-#include "magick/colorspace.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image-private.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/pixel-private.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/color.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/utility.h"
/*
Forward declarations.
@@ -172,16 +172,13 @@
status,
transparent;
- MagickPixelPacket
+ PixelInfo
pixel;
MagickSizeType
number_pixels;
- register const IndexPacket
- *indexes;
-
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
@@ -217,7 +214,7 @@
exception=(&image->exception);
transparent=MagickFalse;
i=0;
- p=(const PixelPacket *) NULL;
+ p=(const Quantum *) NULL;
if (image->storage_class == PseudoClass)
colors=image->colors;
else
@@ -244,16 +241,16 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- matte_image[i]=(unsigned char) (GetPixelOpacity(p) ==
- (Quantum) TransparentOpacity ? 1 : 0);
+ matte_image[i]=(unsigned char) (GetPixelAlpha(image,p) ==
+ (Quantum) TransparentAlpha ? 1 : 0);
if (matte_image[i] != 0)
transparent=MagickTrue;
i++;
- p++;
+ p+=GetPixelChannels(image);
}
}
}
@@ -261,24 +258,21 @@
colors=image->colors;
if (transparent != MagickFalse)
{
- register IndexPacket
- *indexes;
-
- register PixelPacket
+ register Quantum
*q;
colors++;
for (y=0; y < (ssize_t) image->rows; y++)
{
q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
for (x=0; x < (ssize_t) image->columns; x++)
{
if (matte_image[i] != 0)
- SetPixelIndex(indexes+x,image->colors);
+ SetPixelIndex(image,image->colors,q);
p++;
+ q+=GetPixelChannels(image);
}
}
}
@@ -300,16 +294,16 @@
(void) FormatLocaleString(buffer,MaxTextExtent,
"value\n %s_ct : color_table(\n",basename);
(void) WriteBlobString(image,buffer);
- GetMagickPixelPacket(image,&pixel);
+ GetPixelInfo(image,&pixel);
for (i=0; i < (ssize_t) colors; i++)
{
/*
Define UIL color.
*/
- SetMagickPixelPacket(image,image->colormap+i,(IndexPacket *) NULL,&pixel);
+ SetPixelInfoPacket(image,image->colormap+i,&pixel);
pixel.colorspace=RGBColorspace;
pixel.depth=8;
- pixel.opacity=(MagickRealType) OpaqueOpacity;
+ pixel.alpha=(MagickRealType) OpaqueAlpha;
GetColorTuple(&pixel,MagickTrue,name);
if (transparent != MagickFalse)
if (i == (ssize_t) (colors-1))
@@ -332,7 +326,7 @@
else
(void) FormatLocaleString(buffer,MaxTextExtent,
" color('%s',%s) = '%s'",name,
- PixelIntensityToQuantum(image->colormap+i) <
+ GetPixelPacketIntensity(image->colormap+i) <
((Quantum) QuantumRange/2) ? "background" : "foreground",symbol);
(void) WriteBlobString(image,buffer);
(void) FormatLocaleString(buffer,MaxTextExtent,"%s",
@@ -349,23 +343,23 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetVirtualIndexQueue(image);
(void) WriteBlobString(image," \"");
for (x=0; x < (ssize_t) image->columns; x++)
{
- k=((ssize_t) GetPixelIndex(indexes+x) % MaxCixels);
+ k=((ssize_t) GetPixelIndex(image,p) % MaxCixels);
symbol[0]=Cixel[k];
for (j=1; j < (int) characters_per_pixel; j++)
{
- k=(((int) GetPixelIndex(indexes+x)-k)/MaxCixels) % MaxCixels;
+ k=(((int) GetPixelIndex(image,p)-k)/MaxCixels) %
+ MaxCixels;
symbol[j]=Cixel[k];
}
symbol[j]='\0';
(void) CopyMagickString(buffer,symbol,MaxTextExtent);
(void) WriteBlobString(image,buffer);
- p++;
+ p+=GetPixelChannels(image);
}
(void) FormatLocaleString(buffer,MaxTextExtent,"\"%s\n",
(y == (ssize_t) (image->rows-1) ? ");" : ","));
diff --git a/coders/url.c b/coders/url.c
index 86beadb..5991e54 100644
--- a/coders/url.c
+++ b/coders/url.c
@@ -40,23 +40,23 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/constitute.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/module.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/resource_.h"
-#include "magick/string_.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/utility.h"
#if defined(MAGICKCORE_XML_DELEGATE)
# if defined(MAGICKCORE_WINDOWS_SUPPORT)
# if defined(__MINGW32__)
diff --git a/coders/uyvy.c b/coders/uyvy.c
index 74be250..e74297b 100644
--- a/coders/uyvy.c
+++ b/coders/uyvy.c
@@ -39,25 +39,26 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/color.h"
-#include "magick/colorspace.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/color.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
/*
Forward declarations.
@@ -104,7 +105,7 @@
register ssize_t
x;
- register PixelPacket
+ register Quantum
*q;
ssize_t
@@ -150,7 +151,7 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) (image->columns >> 1); x++)
{
@@ -158,14 +159,14 @@
y1=(unsigned char) ReadBlobByte(image);
v=(unsigned char) ReadBlobByte(image);
y2=(unsigned char) ReadBlobByte(image);
- SetPixelRed(q,ScaleCharToQuantum(y1));
- SetPixelGreen(q,ScaleCharToQuantum(u));
- SetPixelBlue(q,ScaleCharToQuantum(v));
- q++;
- SetPixelRed(q,ScaleCharToQuantum(y2));
- SetPixelGreen(q,ScaleCharToQuantum(u));
- SetPixelBlue(q,ScaleCharToQuantum(v));
- q++;
+ SetPixelRed(image,ScaleCharToQuantum(y1),q);
+ SetPixelGreen(image,ScaleCharToQuantum(u),q);
+ SetPixelBlue(image,ScaleCharToQuantum(v),q);
+ q+=GetPixelChannels(image);
+ SetPixelRed(image,ScaleCharToQuantum(y2),q);
+ SetPixelGreen(image,ScaleCharToQuantum(u),q);
+ SetPixelBlue(image,ScaleCharToQuantum(v),q);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -287,7 +288,7 @@
static MagickBooleanType WriteUYVYImage(const ImageInfo *image_info,
Image *image)
{
- MagickPixelPacket
+ PixelInfo
pixel;
Image
@@ -297,7 +298,7 @@
full,
status;
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
@@ -328,29 +329,29 @@
ThrowWriterException(ResourceLimitError,image->exception.reason);
(void) TransformImageColorspace(uyvy_image,YCbCrColorspace);
full=MagickFalse;
- (void) ResetMagickMemory(&pixel,0,sizeof(MagickPixelPacket));
+ (void) ResetMagickMemory(&pixel,0,sizeof(PixelInfo));
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(uyvy_image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
if (full != MagickFalse)
{
- pixel.green=(pixel.green+GetPixelGreen(p))/2;
- pixel.blue=(pixel.blue+GetPixelBlue(p))/2;
+ pixel.green=(pixel.green+GetPixelGreen(uyvy_image,p))/2;
+ pixel.blue=(pixel.blue+GetPixelBlue(uyvy_image,p))/2;
(void) WriteBlobByte(image,ScaleQuantumToChar((Quantum) pixel.green));
(void) WriteBlobByte(image,ScaleQuantumToChar((Quantum) pixel.red));
(void) WriteBlobByte(image,ScaleQuantumToChar((Quantum) pixel.blue));
(void) WriteBlobByte(image,ScaleQuantumToChar(
- GetPixelRed(p)));
+ GetPixelRed(uyvy_image,p)));
}
- pixel.red=(double) GetPixelRed(p);
- pixel.green=(double) GetPixelGreen(p);
- pixel.blue=(double) GetPixelBlue(p);
+ pixel.red=(double) GetPixelRed(uyvy_image,p);
+ pixel.green=(double) GetPixelGreen(uyvy_image,p);
+ pixel.blue=(double) GetPixelBlue(uyvy_image,p);
full=full == MagickFalse ? MagickTrue : MagickFalse;
- p++;
+ p+=GetPixelChannels(uyvy_image);
}
status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
image->rows);
diff --git a/coders/vicar.c b/coders/vicar.c
index cb50c9f..07d9365 100644
--- a/coders/vicar.c
+++ b/coders/vicar.c
@@ -39,28 +39,28 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/colormap.h"
-#include "magick/colorspace.h"
-#include "magick/constitute.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/module.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/quantum-private.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/string-private.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/colormap.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/string-private.h"
/*
Forward declarations.
@@ -163,7 +163,7 @@
QuantumType
quantum_type;
- register PixelPacket
+ register Quantum
*q;
size_t
@@ -298,7 +298,7 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
count=ReadBlob(image,length,pixels);
(void) ImportQuantumPixels(image,(CacheView *) NULL,quantum_info,
@@ -428,7 +428,7 @@
QuantumInfo
*quantum_info;
- register const PixelPacket
+ register const Quantum
*p;
size_t
@@ -475,9 +475,9 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,quantum_info,
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
GrayQuantum,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
diff --git a/coders/vid.c b/coders/vid.c
index 9c65308..4ff9c7c 100644
--- a/coders/vid.c
+++ b/coders/vid.c
@@ -39,29 +39,29 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/property.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/constitute.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/geometry.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/log.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/montage.h"
-#include "magick/quantum-private.h"
-#include "magick/resize.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/property.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/log.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/montage.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/resize.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/utility.h"
/*
Forward declarations.
diff --git a/coders/viff.c b/coders/viff.c
index 8a32d07..2db3ea9 100644
--- a/coders/viff.c
+++ b/coders/viff.c
@@ -39,28 +39,30 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/color.h"
-#include "magick/color-private.h"
-#include "magick/colormap.h"
-#include "magick/colorspace.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/property.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/attribute.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/color.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colormap.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/property.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
/*
Forward declarations.
@@ -219,13 +221,10 @@
MagickSizeType
number_pixels;
- register IndexPacket
- *indexes;
-
register ssize_t
x;
- register PixelPacket
+ register Quantum
*q;
register ssize_t
@@ -620,28 +619,31 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
for (x=0; x < (ssize_t) (image->columns-7); x+=8)
{
for (bit=0; bit < 8; bit++)
- if (PixelIntensity(q) < ((MagickRealType) QuantumRange/2.0))
+ {
+ if (GetPixelIntensity(image,q) < ((MagickRealType) QuantumRange/2.0))
{
- quantum=(size_t) GetPixelIndex(indexes+x+bit);
+ quantum=(size_t) GetPixelIndex(image,q);
quantum|=0x01;
- SetPixelIndex(indexes+x+bit,quantum);
+ SetPixelIndex(image,quantum,q);
}
+ q+=GetPixelChannels(image);
+ }
p++;
}
if ((image->columns % 8) != 0)
{
for (bit=0; bit < (ssize_t) (image->columns % 8); bit++)
- if (PixelIntensity(q) < ((MagickRealType) QuantumRange/2.0))
+ if (GetPixelIntensity(image,q) < ((MagickRealType) QuantumRange/2.0))
{
- quantum=(size_t) GetPixelIndex(indexes+x+bit);
+ quantum=(size_t) GetPixelIndex(image,q);
quantum|=0x01;
- SetPixelIndex(indexes+x+bit,quantum);
+ SetPixelIndex(image,quantum,q);
+ q+=GetPixelChannels(image);
}
p++;
}
@@ -661,11 +663,13 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
for (x=0; x < (ssize_t) image->columns; x++)
- SetPixelIndex(indexes+x,*p++);
+ {
+ SetPixelIndex(image,*p++,q);
+ q+=GetPixelChannels(image);
+ }
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
if (image->previous == (Image *) NULL)
@@ -685,27 +689,26 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelRed(q,ScaleCharToQuantum(*p));
- SetPixelGreen(q,ScaleCharToQuantum(*(p+number_pixels)));
- SetPixelBlue(q,ScaleCharToQuantum(*(p+2*number_pixels)));
+ SetPixelRed(image,ScaleCharToQuantum(*p),q);
+ SetPixelGreen(image,ScaleCharToQuantum(*(p+number_pixels)),q);
+ SetPixelBlue(image,ScaleCharToQuantum(*(p+2*number_pixels)),q);
if (image->colors != 0)
{
- SetPixelRed(q,image->colormap[(ssize_t)
- GetPixelRed(q)].red);
- SetPixelGreen(q,image->colormap[(ssize_t)
- GetPixelGreen(q)].green);
- SetPixelBlue(q,image->colormap[(ssize_t)
- GetPixelBlue(q)].blue);
+ SetPixelRed(image,image->colormap[(ssize_t)
+ GetPixelRed(image,q)].red,q);
+ SetPixelGreen(image,image->colormap[(ssize_t)
+ GetPixelGreen(image,q)].green,q);
+ SetPixelBlue(image,image->colormap[(ssize_t)
+ GetPixelBlue(image,q)].blue,q);
}
- SetPixelOpacity(q,image->matte != MagickFalse ?
- QuantumRange-ScaleCharToQuantum(*(p+number_pixels*3)) :
- OpaqueOpacity);
+ SetPixelAlpha(image,image->matte != MagickFalse ?
+ ScaleCharToQuantum(*(p+number_pixels*3)) : OpaqueAlpha,q);
p++;
- q++;
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -925,10 +928,7 @@
number_pixels,
packets;
- register const IndexPacket
- *indexes;
-
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
@@ -971,7 +971,7 @@
*/
if (image->colorspace != RGBColorspace)
(void) TransformImageColorspace(image,RGBColorspace);
- if (IsGrayImage(image,&image->exception) != MagickFalse)
+ if (IsImageGray(image,&image->exception) != MagickFalse)
(void) SetImageStorageClass(image,DirectClass);
viff_info.identifier=(char) 0xab;
viff_info.file_type=1;
@@ -1018,7 +1018,7 @@
viff_info.color_space_model=VFF_CM_NONE;
viff_info.data_storage_type=VFF_TYP_1_BYTE;
packets=number_pixels;
- if (IsGrayImage(image,&image->exception) == MagickFalse)
+ if (IsImageGray(image,&image->exception) == MagickFalse)
{
/*
Colormapped VIFF raster.
@@ -1093,17 +1093,17 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- *q=ScaleQuantumToChar(GetPixelRed(p));
- *(q+number_pixels)=ScaleQuantumToChar(GetPixelGreen(p));
- *(q+number_pixels*2)=ScaleQuantumToChar(GetPixelBlue(p));
+ *q=ScaleQuantumToChar(GetPixelRed(image,p));
+ *(q+number_pixels)=ScaleQuantumToChar(GetPixelGreen(image,p));
+ *(q+number_pixels*2)=ScaleQuantumToChar(GetPixelBlue(image,p));
if (image->matte != MagickFalse)
*(q+number_pixels*3)=ScaleQuantumToChar((Quantum)
- (GetPixelAlpha(p)));
- p++;
+ (GetPixelAlpha(image,p)));
+ p+=GetPixelChannels(image);
q++;
}
if (image->previous == (Image *) NULL)
@@ -1116,7 +1116,7 @@
}
}
else
- if (IsGrayImage(image,&image->exception) == MagickFalse)
+ if (IsImageGray(image,&image->exception) == MagickFalse)
{
unsigned char
*viff_colormap;
@@ -1144,11 +1144,13 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetVirtualIndexQueue(image);
for (x=0; x < (ssize_t) image->columns; x++)
- *q++=(unsigned char) GetPixelIndex(indexes+x);
+ {
+ *q++=(unsigned char) GetPixelIndex(image,p);
+ p+=GetPixelChannels(image);
+ }
if (image->previous == (Image *) NULL)
{
status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
@@ -1177,15 +1179,14 @@
{
p=GetVirtualPixels(image,0,y,image->columns,1,
&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetVirtualIndexQueue(image);
bit=0;
byte=0;
for (x=0; x < (ssize_t) image->columns; x++)
{
byte>>=1;
- if (PixelIntensity(p) < ((MagickRealType) QuantumRange/2.0))
+ if (GetPixelIntensity(image,p) < ((MagickRealType) QuantumRange/2.0))
byte|=0x80;
bit++;
if (bit == 8)
@@ -1194,6 +1195,7 @@
bit=0;
byte=0;
}
+ p+=GetPixelChannels(image);
}
if (bit != 0)
*q++=byte >> (8-bit);
@@ -1215,12 +1217,12 @@
{
p=GetVirtualPixels(image,0,y,image->columns,1,
&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- *q++=(unsigned char) PixelIntensityToQuantum(p);
- p++;
+ *q++=(unsigned char) GetPixelIntensity(image,p);
+ p+=GetPixelChannels(image);
}
if (image->previous == (Image *) NULL)
{
diff --git a/coders/wbmp.c b/coders/wbmp.c
index 4925b04..8a30559 100644
--- a/coders/wbmp.c
+++ b/coders/wbmp.c
@@ -38,26 +38,27 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/color-private.h"
-#include "magick/colormap.h"
-#include "magick/colorspace.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colormap.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
/*
Forward declarations.
@@ -124,13 +125,10 @@
MagickBooleanType
status;
- register IndexPacket
- *indexes;
-
register ssize_t
x;
- register PixelPacket
+ register Quantum
*q;
ssize_t
@@ -188,9 +186,8 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
bit=0;
byte=0;
for (x=0; x < (ssize_t) image->columns; x++)
@@ -201,10 +198,11 @@
if (byte == EOF)
ThrowReaderException(CorruptImageError,"CorruptImage");
}
- SetPixelIndex(indexes+x,(byte & (0x01 << (7-bit))) ? 1 : 0);
+ SetPixelIndex(image,(byte & (0x01 << (7-bit))) ? 1 : 0,q);
bit++;
if (bit == 8)
bit=0;
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -350,7 +348,7 @@
MagickBooleanType
status;
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
@@ -387,13 +385,13 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
bit=0;
byte=0;
for (x=0; x < (ssize_t) image->columns; x++)
{
- if (PixelIntensity(p) >= ((MagickRealType) QuantumRange/2.0))
+ if (GetPixelIntensity(image,p) >= ((MagickRealType) QuantumRange/2.0))
byte|=0x1 << (7-bit);
bit++;
if (bit == 8)
@@ -402,7 +400,7 @@
bit=0;
byte=0;
}
- p++;
+ p+=GetPixelChannels(image);
}
if (bit != 0)
(void) WriteBlobByte(image,byte);
diff --git a/coders/webp.c b/coders/webp.c
index e45b6db..57b07a2 100644
--- a/coders/webp.c
+++ b/coders/webp.c
@@ -39,28 +39,29 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/client.h"
-#include "magick/display.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/memory_.h"
-#include "magick/option.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
-#include "magick/utility.h"
-#include "magick/xwindow.h"
-#include "magick/xwindow-private.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/client.h"
+#include "MagickCore/display.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/option.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/utility.h"
+#include "MagickCore/xwindow.h"
+#include "MagickCore/xwindow-private.h"
#if defined(MAGICKCORE_WEBP_DELEGATE)
#include <webp/decode.h>
#include <webp/encode.h>
@@ -113,7 +114,7 @@
MagickBooleanType
status;
- register PixelPacket
+ register Quantum
*q;
register ssize_t
@@ -166,17 +167,17 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelRed(q,ScaleCharToQuantum(*p++));
- SetPixelGreen(q,ScaleCharToQuantum(*p++));
- SetPixelBlue(q,ScaleCharToQuantum(*p++));
- SetPixelAlpha(q,ScaleCharToQuantum(*p++));
- if (q->opacity != OpaqueOpacity)
+ SetPixelRed(image,ScaleCharToQuantum(*p++),q);
+ SetPixelGreen(image,ScaleCharToQuantum(*p++),q);
+ SetPixelBlue(image,ScaleCharToQuantum(*p++),q);
+ SetPixelAlpha(image,ScaleCharToQuantum(*p++),q);
+ if (GetPixelAlpha(image,q) != OpaqueAlpha)
image->matte=MagickTrue;
- q++;
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -301,7 +302,7 @@
MagickBooleanType
status;
- register const PixelPacket
+ register const Quantum
*restrict p;
register ssize_t
@@ -367,18 +368,17 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- *q++=ScaleQuantumToChar(GetPixelRed(p));
- *q++=ScaleQuantumToChar(GetPixelGreen(p));
- *q++=ScaleQuantumToChar(GetPixelBlue(p));
+ *q++=ScaleQuantumToChar(GetPixelRed(image,p));
+ *q++=ScaleQuantumToChar(GetPixelGreen(image,p));
+ *q++=ScaleQuantumToChar(GetPixelBlue(image,p));
if (image->matte != MagickFalse)
- *q++=ScaleQuantumToChar((Quantum) (QuantumRange-
- (image->matte != MagickFalse ? GetPixelOpacity(p) :
- OpaqueOpacity)));
- p++;
+ *q++=ScaleQuantumToChar((Quantum) (image->matte != MagickFalse ?
+ GetPixelAlpha(image,p) : OpaqueAlpha));
+ p+=GetPixelChannels(image);
}
status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
image->rows);
diff --git a/coders/wmf.c b/coders/wmf.c
index 76e78a4..e229944 100644
--- a/coders/wmf.c
+++ b/coders/wmf.c
@@ -37,31 +37,31 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/property.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/color.h"
-#include "magick/color-private.h"
-#include "magick/constitute.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/log.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/paint.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
-#include "magick/type.h"
-#include "magick/module.h"
-#include "wand/MagickWand.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/property.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/color.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/log.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/paint.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/type.h"
+#include "MagickCore/module.h"
+#include "MagickWand/MagickWand.h"
#if defined(MAGICKCORE_WMF_DELEGATE)
#include "libwmf/api.h"
diff --git a/coders/wpg.c b/coders/wpg.c
index fb870b2..48587e0 100644
--- a/coders/wpg.c
+++ b/coders/wpg.c
@@ -38,30 +38,31 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/color-private.h"
-#include "magick/colormap.h"
-#include "magick/colormap-private.h"
-#include "magick/constitute.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/cache.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magic.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/resource_.h"
-#include "magick/quantum-private.h"
-#include "magick/shear.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
-#include "magick/transform.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colormap.h"
+#include "MagickCore/colormap-private.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magic.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/shear.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/transform.h"
+#include "MagickCore/utility.h"
typedef struct
{
@@ -270,17 +271,14 @@
int
bit;
- ssize_t
- x;
-
- register PixelPacket
- *q;
-
- IndexPacket
+ Quantum
index;
- register IndexPacket
- *indexes;
+ register Quantum
+ *q;
+
+ ssize_t
+ x;
exception=(&image->exception);
switch (bpp)
@@ -288,29 +286,28 @@
case 1: /* Convert bitmap scanline. */
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
for (x=0; x < ((ssize_t) image->columns-7); x+=8)
+ {
+ for (bit=0; bit < 8; bit++)
{
- for (bit=0; bit < 8; bit++)
- {
- index=((*p) & (0x80 >> bit) ? 0x01 : 0x00);
- SetPixelIndex(indexes+x+bit,index);
- SetPixelRGBO(q,image->colormap+(ssize_t) index);
- q++;
- }
- p++;
+ index=((*p) & (0x80 >> bit) ? 0x01 : 0x00);
+ SetPixelIndex(image,index,q);
+ SetPixelPacket(image,image->colormap+(ssize_t) index,q);
+ q+=GetPixelChannels(image);
}
+ p++;
+ }
if ((image->columns % 8) != 0)
{
for (bit=0; bit < (ssize_t) (image->columns % 8); bit++)
- {
- index=((*p) & (0x80 >> bit) ? 0x01 : 0x00);
- SetPixelIndex(indexes+x+bit,index);
- SetPixelRGBO(q,image->colormap+(ssize_t) index);
- q++;
- }
+ {
+ index=((*p) & (0x80 >> bit) ? 0x01 : 0x00);
+ SetPixelIndex(image,index,q);
+ SetPixelPacket(image,image->colormap+(ssize_t) index,q);
+ q+=GetPixelChannels(image);
+ }
p++;
}
if (!SyncAuthenticPixels(image,exception))
@@ -320,49 +317,48 @@
case 2: /* Convert PseudoColor scanline. */
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
for (x=0; x < ((ssize_t) image->columns-1); x+=2)
{
index=ConstrainColormapIndex(image,(*p >> 6) & 0x3);
- SetPixelIndex(indexes+x,index);
- SetPixelRGBO(q,image->colormap+(ssize_t) index);
- q++;
+ SetPixelIndex(image,index,q);
+ SetPixelPacket(image,image->colormap+(ssize_t) index,q);
+ q+=GetPixelChannels(image);
index=ConstrainColormapIndex(image,(*p >> 4) & 0x3);
- SetPixelIndex(indexes+x,index);
- SetPixelRGBO(q,image->colormap+(ssize_t) index);
- q++;
+ SetPixelIndex(image,index,q);
+ SetPixelPacket(image,image->colormap+(ssize_t) index,q);
+ q+=GetPixelChannels(image);
index=ConstrainColormapIndex(image,(*p >> 2) & 0x3);
- SetPixelIndex(indexes+x,index);
- SetPixelRGBO(q,image->colormap+(ssize_t) index);
- q++;
+ SetPixelIndex(image,index,q);
+ SetPixelPacket(image,image->colormap+(ssize_t) index,q);
+ q+=GetPixelChannels(image);
index=ConstrainColormapIndex(image,(*p) & 0x3);
- SetPixelIndex(indexes+x+1,index);
- SetPixelRGBO(q,image->colormap+(ssize_t) index);
+ SetPixelIndex(image,index,q);
+ SetPixelPacket(image,image->colormap+(ssize_t) index,q);
p++;
- q++;
+ q+=GetPixelChannels(image);
}
if ((image->columns % 4) != 0)
{
index=ConstrainColormapIndex(image,(*p >> 6) & 0x3);
- SetPixelIndex(indexes+x,index);
- SetPixelRGBO(q,image->colormap+(ssize_t) index);
- q++;
+ SetPixelIndex(image,index,q);
+ SetPixelPacket(image,image->colormap+(ssize_t) index,q);
+ q+=GetPixelChannels(image);
if ((image->columns % 4) >= 1)
{
index=ConstrainColormapIndex(image,(*p >> 4) & 0x3);
- SetPixelIndex(indexes+x,index);
- SetPixelRGBO(q,image->colormap+(ssize_t) index);
- q++;
+ SetPixelIndex(image,index,q);
+ SetPixelPacket(image,image->colormap+(ssize_t) index,q);
+ q+=GetPixelChannels(image);
if ((image->columns % 4) >= 2)
{
index=ConstrainColormapIndex(image,(*p >> 2) & 0x3);
- SetPixelIndex(indexes+x,index);
- SetPixelRGBO(q,image->colormap+(ssize_t) index);
- q++;
+ SetPixelIndex(image,index,q);
+ SetPixelPacket(image,image->colormap+(ssize_t) index,q);
+ q+=GetPixelChannels(image);
}
}
p++;
@@ -375,28 +371,27 @@
case 4: /* Convert PseudoColor scanline. */
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
for (x=0; x < ((ssize_t) image->columns-1); x+=2)
{
index=ConstrainColormapIndex(image,(*p >> 4) & 0x0f);
- SetPixelIndex(indexes+x,index);
- SetPixelRGBO(q,image->colormap+(ssize_t) index);
- q++;
+ SetPixelIndex(image,index,q);
+ SetPixelPacket(image,image->colormap+(ssize_t) index,q);
+ q+=GetPixelChannels(image);
index=ConstrainColormapIndex(image,(*p) & 0x0f);
- SetPixelIndex(indexes+x+1,index);
- SetPixelRGBO(q,image->colormap+(ssize_t) index);
+ SetPixelIndex(image,index,q);
+ SetPixelPacket(image,image->colormap+(ssize_t) index,q);
p++;
- q++;
+ q+=GetPixelChannels(image);
}
if ((image->columns % 2) != 0)
{
index=ConstrainColormapIndex(image,(*p >> 4) & 0x0f);
- SetPixelIndex(indexes+x,index);
- SetPixelRGBO(q,image->colormap+(ssize_t) index);
+ SetPixelIndex(image,index,q);
+ SetPixelPacket(image,image->colormap+(ssize_t) index,q);
p++;
- q++;
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -405,16 +400,15 @@
case 8: /* Convert PseudoColor scanline. */
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL) break;
- indexes=GetAuthenticIndexQueue(image);
+ if (q == (const Quantum *) NULL) break;
for (x=0; x < (ssize_t) image->columns; x++)
{
index=ConstrainColormapIndex(image,*p);
- SetPixelIndex(indexes+x,index);
- SetPixelRGBO(q,image->colormap+(ssize_t) index);
+ SetPixelIndex(image,index,q);
+ SetPixelPacket(image,image->colormap+(ssize_t) index,q);
p++;
- q++;
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -423,14 +417,14 @@
case 24: /* Convert DirectColor scanline. */
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelRed(q,ScaleCharToQuantum(*p++));
- SetPixelGreen(q,ScaleCharToQuantum(*p++));
- SetPixelBlue(q,ScaleCharToQuantum(*p++));
- q++;
+ SetPixelRed(image,ScaleCharToQuantum(*p++),q);
+ SetPixelGreen(image,ScaleCharToQuantum(*p++),q);
+ SetPixelBlue(image,ScaleCharToQuantum(*p++),q);
+ q+=GetPixelChannels(image);
}
if (!SyncAuthenticPixels(image,exception))
break;
diff --git a/coders/x.c b/coders/x.c
index 64d4cf7..6851e5f 100644
--- a/coders/x.c
+++ b/coders/x.c
@@ -39,26 +39,26 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/client.h"
-#include "magick/display.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/option.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
-#include "magick/utility.h"
-#include "magick/xwindow.h"
-#include "magick/xwindow-private.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/client.h"
+#include "MagickCore/display.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/option.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/utility.h"
+#include "MagickCore/xwindow.h"
+#include "MagickCore/xwindow-private.h"
/*
Forward declarations.
diff --git a/coders/xbm.c b/coders/xbm.c
index 4c7c673..6fe22d7 100644
--- a/coders/xbm.c
+++ b/coders/xbm.c
@@ -39,27 +39,28 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/color-private.h"
-#include "magick/colormap.h"
-#include "magick/colorspace.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colormap.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/utility.h"
/*
Forward declarations.
@@ -170,14 +171,11 @@
MagickBooleanType
status;
- register IndexPacket
- *indexes;
-
register ssize_t
i,
x;
- register PixelPacket
+ register Quantum
*q;
register unsigned char
@@ -354,20 +352,20 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
bit=0;
byte=0;
for (x=0; x < (ssize_t) image->columns; x++)
{
if (bit == 0)
byte=(size_t) (*p++);
- SetPixelIndex(indexes+x,(byte & 0x01) != 0 ? 0x01 : 0x00);
+ SetPixelIndex(image,(byte & 0x01) != 0 ? 0x01 : 0x00,q);
bit++;
byte>>=1;
if (bit == 8)
bit=0;
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -480,7 +478,7 @@
MagickBooleanType
status;
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
@@ -537,12 +535,12 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
byte>>=1;
- if (PixelIntensity(p) < ((MagickRealType) QuantumRange/2.0))
+ if (GetPixelIntensity(image,p) < ((MagickRealType) QuantumRange/2.0))
byte|=0x80;
bit++;
if (bit == 8)
@@ -563,7 +561,7 @@
bit=0;
byte=0;
}
- p++;
+ p+=GetPixelChannels(image);
}
if (bit != 0)
{
diff --git a/coders/xc.c b/coders/xc.c
index 9dea59a..82a6483 100644
--- a/coders/xc.c
+++ b/coders/xc.c
@@ -39,25 +39,25 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/color.h"
-#include "magick/color-private.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/pixel.h"
-#include "magick/pixel-private.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/color.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/pixel.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -93,14 +93,10 @@
Image
*image;
- IndexPacket
- index,
- *indexes;
-
MagickBooleanType
status;
- MagickPixelPacket
+ PixelInfo
color;
PixelPacket
@@ -109,7 +105,7 @@
register ssize_t
x;
- register PixelPacket
+ register Quantum
*q;
ssize_t
@@ -139,21 +135,20 @@
}
image->colorspace=color.colorspace;
image->matte=color.matte;
- index=0;
- SetPixelPacket(image,&color,&pixel,&index);
+ pixel.black=0;
+ SetPacketPixelInfo(image,&color,&pixel);
for (y=0; y < (ssize_t) image->rows; y++)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
- *q++=pixel;
- if (image->colorspace == CMYKColorspace)
- {
- indexes=GetAuthenticIndexQueue(image);
- for (x=0; x < (ssize_t) image->columns; x++)
- SetPixelIndex(indexes+x,index);
- }
+ {
+ SetPixelPacket(image,&pixel,q);
+ if (image->colorspace == CMYKColorspace)
+ SetPixelBlack(image,pixel.black,q);
+ q+=GetPixelChannels(image);
+ }
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
}
diff --git a/coders/xcf.c b/coders/xcf.c
index b77f10b..26bc193 100644
--- a/coders/xcf.c
+++ b/coders/xcf.c
@@ -39,25 +39,26 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/color.h"
-#include "magick/composite.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/pixel.h"
-#include "magick/quantize.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/color.h"
+#include "MagickCore/composite.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/pixel.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantize.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
/*
Typedef declarations.
@@ -136,7 +137,7 @@
width,
height,
type,
- opacity,
+ alpha,
visible,
linked,
preserve_trans,
@@ -166,7 +167,7 @@
red,
green,
blue,
- opacity;
+ alpha;
} XCFPixelPacket;
/*
@@ -242,8 +243,8 @@
case GIMP_SCREEN_MODE: return( ScreenCompositeOp );
case GIMP_OVERLAY_MODE: return( OverlayCompositeOp );
case GIMP_DIFFERENCE_MODE: return( DifferenceCompositeOp );
- case GIMP_ADDITION_MODE: return( AddCompositeOp );
- case GIMP_SUBTRACT_MODE: return( SubtractCompositeOp );
+ case GIMP_ADDITION_MODE: return( ModulusAddCompositeOp );
+ case GIMP_SUBTRACT_MODE: return( ModulusSubtractCompositeOp );
case GIMP_DARKEN_ONLY_MODE: return( DarkenCompositeOp );
case GIMP_LIGHTEN_ONLY_MODE:return( LightenCompositeOp );
case GIMP_HUE_MODE: return( HueCompositeOp );
@@ -252,7 +253,7 @@
case GIMP_DODGE_MODE: return( ColorDodgeCompositeOp );
case GIMP_BURN_MODE: return( ColorBurnCompositeOp );
case GIMP_HARDLIGHT_MODE: return( HardLightCompositeOp );
- case GIMP_DIVIDE_MODE: return( DivideCompositeOp );
+ case GIMP_DIVIDE_MODE: return( DivideDstCompositeOp );
/* these are the ones we don't support...yet */
case GIMP_BEHIND_MODE: return( OverCompositeOp );
case GIMP_VALUE_MODE: return( OverCompositeOp );
@@ -341,7 +342,7 @@
register ssize_t
x;
- register PixelPacket
+ register Quantum
*q;
ssize_t
@@ -368,19 +369,19 @@
for (y=0; y < (ssize_t) tile_image->rows; y++)
{
q=QueueAuthenticPixels(tile_image,0,y,tile_image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
if (inDocInfo->image_type == GIMP_GRAY)
{
for (x=0; x < (ssize_t) tile_image->columns; x++)
{
- SetPixelRed(q,ScaleCharToQuantum(*graydata));
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- SetPixelAlpha(q,ScaleCharToQuantum((unsigned char)
- inLayerInfo->opacity));
+ SetPixelRed(tile_image,ScaleCharToQuantum(*graydata),q);
+ SetPixelGreen(tile_image,GetPixelRed(image,q),q);
+ SetPixelBlue(tile_image,GetPixelRed(image,q),q);
+ SetPixelAlpha(tile_image,ScaleCharToQuantum((unsigned char)
+ inLayerInfo->alpha),q);
graydata++;
- q++;
+ q+=GetPixelChannels(tile_image);
}
}
else
@@ -388,13 +389,13 @@
{
for (x=0; x < (ssize_t) tile_image->columns; x++)
{
- SetPixelRed(q,ScaleCharToQuantum(xcfdata->red));
- SetPixelGreen(q,ScaleCharToQuantum(xcfdata->green));
- SetPixelBlue(q,ScaleCharToQuantum(xcfdata->blue));
- SetPixelAlpha(q,xcfdata->opacity == 0U ? OpaqueOpacity :
- ScaleCharToQuantum((unsigned char) inLayerInfo->opacity));
+ SetPixelRed(tile_image,ScaleCharToQuantum(xcfdata->red),q);
+ SetPixelGreen(tile_image,ScaleCharToQuantum(xcfdata->green),q);
+ SetPixelBlue(tile_image,ScaleCharToQuantum(xcfdata->blue),q);
+ SetPixelAlpha(tile_image,xcfdata->alpha == 0U ? OpaqueAlpha :
+ ScaleCharToQuantum((unsigned char) inLayerInfo->alpha),q);
xcfdata++;
- q++;
+ q+=GetPixelChannels(tile_image);
}
}
if (SyncAuthenticPixels(tile_image,exception) == MagickFalse)
@@ -413,7 +414,7 @@
MagickOffsetType
size;
- register PixelPacket
+ register Quantum
*q;
size_t
@@ -474,41 +475,41 @@
{
case 0:
{
- SetPixelRed(q,ScaleCharToQuantum(data));
+ SetPixelRed(tile_image,ScaleCharToQuantum(data),q);
if (inDocInfo->image_type == GIMP_GRAY)
{
- SetPixelGreen(q,ScaleCharToQuantum(data));
- SetPixelBlue(q,ScaleCharToQuantum(data));
- SetPixelAlpha(q,ScaleCharToQuantum(
- (unsigned char) inLayerInfo->opacity));
+ SetPixelGreen(tile_image,ScaleCharToQuantum(data),q);
+ SetPixelBlue(tile_image,ScaleCharToQuantum(data),q);
+ SetPixelAlpha(tile_image,ScaleCharToQuantum(
+ (unsigned char) inLayerInfo->alpha),q);
}
else
{
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- SetPixelAlpha(q,ScaleCharToQuantum(
- (unsigned char) inLayerInfo->opacity));
+ SetPixelGreen(tile_image,GetPixelRed(image,q),q);
+ SetPixelBlue(tile_image,GetPixelRed(image,q),q);
+ SetPixelAlpha(tile_image,ScaleCharToQuantum(
+ (unsigned char) inLayerInfo->alpha),q);
}
break;
}
case 1:
{
- SetPixelGreen(q,ScaleCharToQuantum(data));
+ SetPixelGreen(tile_image,ScaleCharToQuantum(data),q);
break;
}
case 2:
{
- SetPixelBlue(q,ScaleCharToQuantum(data));
+ SetPixelBlue(tile_image,ScaleCharToQuantum(data),q);
break;
}
case 3:
{
- SetPixelAlpha(q,data == 0 ? OpaqueOpacity :
- ScaleCharToQuantum((unsigned char) inLayerInfo->opacity));
+ SetPixelAlpha(tile_image,data == 0 ? OpaqueAlpha :
+ ScaleCharToQuantum((unsigned char) inLayerInfo->alpha),q);
break;
}
}
- q++;
+ q+=GetPixelChannels(tile_image);
}
}
else
@@ -534,41 +535,41 @@
{
case 0:
{
- SetPixelRed(q,ScaleCharToQuantum(data));
+ SetPixelRed(tile_image,ScaleCharToQuantum(data),q);
if (inDocInfo->image_type == GIMP_GRAY)
{
- SetPixelGreen(q,ScaleCharToQuantum(data));
- SetPixelBlue(q,ScaleCharToQuantum(data));
- SetPixelAlpha(q,ScaleCharToQuantum(
- (unsigned char) inLayerInfo->opacity));
+ SetPixelGreen(tile_image,ScaleCharToQuantum(data),q);
+ SetPixelBlue(tile_image,ScaleCharToQuantum(data),q);
+ SetPixelAlpha(tile_image,ScaleCharToQuantum(
+ (unsigned char) inLayerInfo->alpha),q);
}
else
{
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- SetPixelAlpha(q,ScaleCharToQuantum(
- (unsigned char) inLayerInfo->opacity));
+ SetPixelGreen(tile_image,GetPixelRed(image,q),q);
+ SetPixelBlue(tile_image,GetPixelRed(image,q),q);
+ SetPixelAlpha(tile_image,ScaleCharToQuantum(
+ (unsigned char) inLayerInfo->alpha),q);
}
break;
}
case 1:
{
- SetPixelGreen(q,ScaleCharToQuantum(data));
+ SetPixelGreen(tile_image,ScaleCharToQuantum(data),q);
break;
}
case 2:
{
- SetPixelBlue(q,ScaleCharToQuantum(data));
+ SetPixelBlue(tile_image,ScaleCharToQuantum(data),q);
break;
}
case 3:
{
- SetPixelAlpha(q,data == 0 ? OpaqueOpacity :
- ScaleCharToQuantum((unsigned char) inLayerInfo->opacity));
+ SetPixelAlpha(tile_image,data == 0 ? OpaqueAlpha :
+ ScaleCharToQuantum((unsigned char) inLayerInfo->alpha),q);
break;
}
}
- q++;
+ q+=GetPixelChannels(tile_image);
}
}
}
@@ -806,7 +807,7 @@
outLayer->floating_offset = ReadBlobMSBLong(image);
break;
case PROP_OPACITY:
- outLayer->opacity = ReadBlobMSBLong(image);
+ outLayer->alpha = ReadBlobMSBLong(image);
break;
case PROP_VISIBLE:
outLayer->visible = ReadBlobMSBLong(image);
@@ -882,8 +883,8 @@
if (foundPropEnd == MagickFalse)
return(MagickFalse);
/* clear the image based on the layer opacity */
- outLayer->image->background_color.opacity=
- ScaleCharToQuantum((unsigned char) (255-outLayer->opacity));
+ outLayer->image->background_color.alpha=
+ ScaleCharToQuantum((unsigned char) (255-outLayer->alpha));
(void) SetImageBackgroundColor(outLayer->image);
/* set the compositing mode */
diff --git a/coders/xpm.c b/coders/xpm.c
index 6b10e00..49fbb3a 100644
--- a/coders/xpm.c
+++ b/coders/xpm.c
@@ -39,35 +39,36 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/color.h"
-#include "magick/color-private.h"
-#include "magick/colormap.h"
-#include "magick/colorspace.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/geometry.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/pixel-private.h"
-#include "magick/quantize.h"
-#include "magick/quantum-private.h"
-#include "magick/resize.h"
-#include "magick/resource_.h"
-#include "magick/splay-tree.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
-#include "magick/threshold.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/attribute.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/color.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colormap.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantize.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/resize.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/splay-tree.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/threshold.h"
+#include "MagickCore/utility.h"
/*
Forward declarations.
@@ -234,13 +235,10 @@
*q,
*next;
- register IndexPacket
- *indexes;
-
register ssize_t
x;
- register PixelPacket
+ register Quantum
*r;
size_t
@@ -398,18 +396,17 @@
if (p == (char *) NULL)
break;
r=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (r == (PixelPacket *) NULL)
+ if (r == (Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
for (x=0; x < (ssize_t) image->columns; x++)
{
(void) CopyXPMColor(key,p,(size_t) width);
j=(ssize_t) GetValueFromSplayTree(xpm_colors,key);
if (image->storage_class == PseudoClass)
- SetPixelIndex(indexes+x,j);
- *r=image->colormap[j];
- r++;
+ SetPixelIndex(image,j,r);
+ SetPixelPacket(image,image->colormap+j,r);
p+=width;
+ r+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -592,7 +589,7 @@
status,
transparent;
- MagickPixelPacket
+ PixelInfo
pixel;
QuantizeInfo
@@ -601,17 +598,14 @@
RectangleInfo
geometry;
- register const IndexPacket
- *indexes;
-
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
i,
x;
- register PixelPacket
+ register Quantum
*q;
size_t
@@ -645,7 +639,7 @@
blob_info=CloneImageInfo(image_info);
(void) AcquireUniqueFilename(blob_info->filename);
if ((image_info->type != TrueColorType) &&
- (IsGrayImage(image,&image->exception) != MagickFalse))
+ (IsImageGray(image,&image->exception) != MagickFalse))
affinity_image=BlobToImage(blob_info,Graymap,GraymapExtent,
&image->exception);
else
@@ -680,15 +674,15 @@
for (y=0; y < (ssize_t) picon->rows; y++)
{
q=GetAuthenticPixels(picon,0,y,picon->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) picon->columns; x++)
{
- if (q->opacity == (Quantum) TransparentOpacity)
+ if (GetPixelAlpha(image,q) == (Quantum) TransparentAlpha)
transparent=MagickTrue;
else
- SetPixelOpacity(q,OpaqueOpacity);
- q++;
+ SetPixelAlpha(picon,OpaqueAlpha,q);
+ q+=GetPixelChannels(picon);
}
if (SyncAuthenticPixels(picon,exception) == MagickFalse)
break;
@@ -699,9 +693,6 @@
colors=picon->colors;
if (transparent != MagickFalse)
{
- register IndexPacket
- *indexes;
-
colors++;
picon->colormap=(PixelPacket *) ResizeQuantumMemory((void **)
picon->colormap,(size_t) colors,sizeof(*picon->colormap));
@@ -710,14 +701,13 @@
for (y=0; y < (ssize_t) picon->rows; y++)
{
q=GetAuthenticPixels(picon,0,y,picon->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(picon);
for (x=0; x < (ssize_t) picon->columns; x++)
{
- if (q->opacity == (Quantum) TransparentOpacity)
- SetPixelIndex(indexes+x,picon->colors);
- q++;
+ if (GetPixelAlpha(image,q) == (Quantum) TransparentAlpha)
+ SetPixelIndex(picon,picon->colors,q);
+ q+=GetPixelChannels(picon);
}
if (SyncAuthenticPixels(picon,exception) == MagickFalse)
break;
@@ -742,16 +732,16 @@
"\"%.20g %.20g %.20g %.20g\",\n",(double) picon->columns,(double)
picon->rows,(double) colors,(double) characters_per_pixel);
(void) WriteBlobString(image,buffer);
- GetMagickPixelPacket(image,&pixel);
+ GetPixelInfo(image,&pixel);
for (i=0; i < (ssize_t) colors; i++)
{
/*
Define XPM color.
*/
- SetMagickPixelPacket(image,picon->colormap+i,(IndexPacket *) NULL,&pixel);
+ SetPixelInfoPacket(image,picon->colormap+i,&pixel);
pixel.colorspace=RGBColorspace;
pixel.depth=8;
- pixel.opacity=(MagickRealType) OpaqueOpacity;
+ pixel.alpha=(MagickRealType) OpaqueAlpha;
(void) QueryMagickColorname(image,&pixel,XPMCompliance,name,
&image->exception);
if (transparent != MagickFalse)
@@ -781,22 +771,22 @@
for (y=0; y < (ssize_t) picon->rows; y++)
{
p=GetVirtualPixels(picon,0,y,picon->columns,1,&picon->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetVirtualIndexQueue(picon);
(void) WriteBlobString(image,"\"");
for (x=0; x < (ssize_t) picon->columns; x++)
{
- k=((ssize_t) GetPixelIndex(indexes+x) % MaxCixels);
+ k=((ssize_t) GetPixelIndex(picon,p) % MaxCixels);
symbol[0]=Cixel[k];
for (j=1; j < (ssize_t) characters_per_pixel; j++)
{
- k=(((int) GetPixelIndex(indexes+x)-k)/MaxCixels) % MaxCixels;
+ k=(((int) GetPixelIndex(picon,p)-k)/MaxCixels) % MaxCixels;
symbol[j]=Cixel[k];
}
symbol[j]='\0';
(void) CopyMagickString(buffer,symbol,MaxTextExtent);
(void) WriteBlobString(image,buffer);
+ p+=GetPixelChannels(image);
}
(void) FormatLocaleString(buffer,MaxTextExtent,"\"%s\n",
y == (ssize_t) (picon->rows-1) ? "" : ",");
@@ -853,13 +843,10 @@
MagickBooleanType
status;
- MagickPixelPacket
+ PixelInfo
pixel;
- register const IndexPacket
- *indexes;
-
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
@@ -907,17 +894,17 @@
if ((image->storage_class == DirectClass) || (image->colors > 256))
(void) SetImageType(image,PaletteBilevelMatteType);
for (i=0; i < (ssize_t) image->colors; i++)
- if (image->colormap[i].opacity != OpaqueOpacity)
+ if (image->colormap[i].alpha != OpaqueAlpha)
{
if (opacity < 0)
{
opacity=i;
continue;
}
- alpha=(Quantum) TransparentOpacity-(MagickRealType)
- image->colormap[i].opacity;
- beta=(Quantum) TransparentOpacity-(MagickRealType)
- image->colormap[opacity].opacity;
+ alpha=(MagickRealType) TransparentAlpha-(MagickRealType)
+ image->colormap[i].alpha;
+ beta=(MagickRealType) TransparentAlpha-(MagickRealType)
+ image->colormap[opacity].alpha;
if (alpha < beta)
opacity=i;
}
@@ -925,17 +912,17 @@
{
(void) SetImageType(image,PaletteBilevelMatteType);
for (i=0; i < (ssize_t) image->colors; i++)
- if (image->colormap[i].opacity != OpaqueOpacity)
+ if (image->colormap[i].alpha != OpaqueAlpha)
{
if (opacity < 0)
{
opacity=i;
continue;
}
- alpha=(Quantum) TransparentOpacity-(MagickRealType)
- image->colormap[i].opacity;
- beta=(Quantum) TransparentOpacity-(MagickRealType)
- image->colormap[opacity].opacity;
+ alpha=(Quantum) TransparentAlpha-(MagickRealType)
+ image->colormap[i].alpha;
+ beta=(Quantum) TransparentAlpha-(MagickRealType)
+ image->colormap[opacity].alpha;
if (alpha < beta)
opacity=i;
}
@@ -976,16 +963,16 @@
"\"%.20g %.20g %.20g %.20g \",\n",(double) image->columns,(double)
image->rows,(double) image->colors,(double) characters_per_pixel);
(void) WriteBlobString(image,buffer);
- GetMagickPixelPacket(image,&pixel);
+ GetPixelInfo(image,&pixel);
for (i=0; i < (ssize_t) image->colors; i++)
{
/*
Define XPM color.
*/
- SetMagickPixelPacket(image,image->colormap+i,(IndexPacket *) NULL,&pixel);
+ SetPixelInfoPacket(image,image->colormap+i,&pixel);
pixel.colorspace=RGBColorspace;
pixel.depth=8;
- pixel.opacity=(MagickRealType) OpaqueOpacity;
+ pixel.alpha=(MagickRealType) OpaqueAlpha;
(void) QueryMagickColorname(image,&pixel,XPMCompliance,name,
&image->exception);
if (i == opacity)
@@ -1012,22 +999,22 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- indexes=GetVirtualIndexQueue(image);
(void) WriteBlobString(image,"\"");
for (x=0; x < (ssize_t) image->columns; x++)
{
- k=((ssize_t) GetPixelIndex(indexes+x) % MaxCixels);
+ k=((ssize_t) GetPixelIndex(image,p) % MaxCixels);
symbol[0]=Cixel[k];
for (j=1; j < (ssize_t) characters_per_pixel; j++)
{
- k=(((int) GetPixelIndex(indexes+x)-k)/MaxCixels) % MaxCixels;
+ k=(((int) GetPixelIndex(image,p)-k)/MaxCixels) % MaxCixels;
symbol[j]=Cixel[k];
}
symbol[j]='\0';
(void) CopyMagickString(buffer,symbol,MaxTextExtent);
(void) WriteBlobString(image,buffer);
+ p+=GetPixelChannels(image);
}
(void) FormatLocaleString(buffer,MaxTextExtent,"\"%s\n",
(y == (ssize_t) (image->rows-1) ? "" : ","));
diff --git a/coders/xps.c b/coders/xps.c
index b64f371..0207862 100644
--- a/coders/xps.c
+++ b/coders/xps.c
@@ -39,35 +39,35 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/property.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/color.h"
-#include "magick/color-private.h"
-#include "magick/colorspace.h"
-#include "magick/constitute.h"
-#include "magick/delegate.h"
-#include "magick/draw.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/geometry.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/profile.h"
-#include "magick/resource_.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
-#include "magick/token.h"
-#include "magick/transform.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/property.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/color.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/delegate.h"
+#include "MagickCore/draw.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/profile.h"
+#include "MagickCore/resource_.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/token.h"
+#include "MagickCore/transform.h"
+#include "MagickCore/utility.h"
/*
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/coders/xtrn.c b/coders/xtrn.c
index dab0948..e69de29 100644
--- a/coders/xtrn.c
+++ b/coders/xtrn.c
@@ -1,518 +0,0 @@
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% X X TTTTT RRRR N N %
-% X X T R R NN N %
-% X T RRRR N N N %
-% X X T R R N NN %
-% X X T R R N N %
-% %
-% %
-% ImageMagickObject BLOB Interface. %
-% %
-% Software Design %
-% William Radcliffe %
-% May 2001 %
-% %
-% %
-% Copyright 1999-2007 ImageMagick Studio LLC, a non-profit organization %
-% dedicated to making software imaging solutions freely available. %
-% %
-% You may not use this file except in compliance with the License. You may %
-% obtain a copy of the License at %
-% %
-% http://www.imagemagick.org/script/license.php %
-% %
-% Unless required by applicable law or agreed to in writing, software %
-% distributed under the License is distributed on an "AS IS" BASIS, %
-% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. %
-% See the License for the specific language governing permissions and %
-% limitations under the License. %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% This coder is a kind of backdoor used by the COM object that allows it to %
-% pass blobs back and forth using the coder interface. It simply encodes and %
-% decodes the filename as a comma delimited string and extracts the info it %
-% needs. The five methods of passing images are: %
-% %
-% FILE - same thing as filename so it should be a NOP %
-% IMAGE - passes an image and image info structure %
-% BLOB - passes binary blob containining the image %
-% STREAM - passes pointers to stream hooks in and does the hooking %
-% ARRAY - passes a pointer to a Win32 smart array and streams to it %
-% %
-% Of all of these, the only one getting any real use at the moment is the %
-% ARRAY handler. It is the primary way that images are shuttled back and %
-% forth as blobs via COM since this is what VB and VBSCRIPT use internally %
-% for this purpose. %
-%
-%
-*/
-
-/*
- Include declarations.
-*/
-#if defined(_VISUALC_)
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/constitute.h"
-#include "magick/delegate.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/string_.h"
-#define WIN32_LEAN_AND_MEAN
-#define VC_EXTRALEAN
-#include <windows.h>
-#include <ole2.h>
-
-/*
- Forward declarations.
-*/
-static MagickBooleanType
- WriteXTRNImage(const ImageInfo *,Image *);
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% R e a d X T R N I m a g e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% ReadXTRNImage() reads a XTRN image file and returns it. It
-% allocates the memory necessary for the new Image structure and returns a
-% pointer to the new image.
-%
-% The format of the ReadXTRNImage method is:
-%
-% Image *ReadXTRNImage(const ImageInfo *image_info,
-% ExceptionInfo *exception)
-%
-% A description of each parameter follows:
-%
-% o image_info: Specifies a pointer to an ImageInfo structure.
-%
-% o exception: return any errors or warnings in this structure.
-%
-*/
-static Image *ReadXTRNImage(const ImageInfo *image_info,
- ExceptionInfo *exception)
-{
- Image
- *image;
-
- ImageInfo
- *clone_info;
-
- void
- *param1,
- *param2,
- *param3;
-
- param1 = param2 = param3 = (void *) NULL;
- image = (Image *) NULL;
- clone_info=CloneImageInfo(image_info);
- if (clone_info->filename == NULL)
- {
- clone_info=DestroyImageInfo(clone_info);
- ThrowReaderException(FileOpenWarning,"No filename specified");
- }
- if (LocaleCompare(image_info->magick,"XTRNFILE") == 0)
- {
- image=ReadImage(clone_info,exception);
- CatchException(exception);
- }
- else if (LocaleCompare(image_info->magick,"XTRNIMAGE") == 0)
- {
- Image
- **image_ptr;
-
-#ifdef ALL_IMAGEINFO
- ImageInfo
- **image_info_ptr;
-#endif
-
- (void) sscanf(clone_info->filename,"%lx,%lx",¶m1,¶m2);
- image_ptr=(Image **) param2;
- if (*image_ptr != (Image *)NULL)
- image=CloneImage(*image_ptr,0,0,MagickFalse,&(*image_ptr)->exception);
-#ifdef ALL_IMAGEINFO
- image_info_ptr=(ImageInfo **) param1;
- if (*image_info_ptr != (ImageInfo *)NULL)
- image_info=*image_info_ptr;
-#endif
- }
- else if (LocaleCompare(image_info->magick,"XTRNBLOB") == 0)
- {
- char
- **blob_data;
-
- size_t
- *blob_length;
-
- char
- filename[MaxTextExtent];
-
- (void) sscanf(clone_info->filename,"%lx,%lx,%s",¶m1,¶m2,&filename);
- blob_data=(char **) param1;
- blob_length=(size_t *) param2;
- image=BlobToImage(clone_info,*blob_data,*blob_length,exception);
- CatchException(exception);
- }
- else if (LocaleCompare(image_info->magick,"XTRNARRAY") == 0)
- {
- char
- *blob_data,
- filename[MaxTextExtent];
-
- HRESULT
- hr;
-
- long
- lBoundl,
- lBoundu;
-
- SAFEARRAY
- *pSafeArray;
-
- size_t
- blob_length;
-
- *filename='\0';
- (void) sscanf(clone_info->filename,"%lx,%s",¶m1,&filename);
- hr=S_OK;
- pSafeArray=(SAFEARRAY *) param1;
- if (pSafeArray)
- {
- hr = SafeArrayGetLBound(pSafeArray, 1, &lBoundl);
- if (SUCCEEDED(hr))
- hr = SafeArrayGetUBound(pSafeArray, 1, &lBoundu);
- if (SUCCEEDED(hr))
- {
- blob_length = lBoundu - lBoundl + 1;
- hr = SafeArrayAccessData(pSafeArray,(void**) &blob_data);
- if(SUCCEEDED(hr))
- {
- *clone_info->filename='\0';
- *clone_info->magick='\0';
- if (*filename != '\0')
- (void) CopyMagickString(clone_info->filename,filename,
- MaxTextExtent);
- image=BlobToImage(clone_info,blob_data,blob_length,exception);
- hr=SafeArrayUnaccessData(pSafeArray);
- CatchException(exception);
- }
- }
- }
- }
- clone_info=DestroyImageInfo(clone_info);
- return(image);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% R e g i s t e r X T R N I m a g e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% RegisterXTRNImage() adds attributes for the XTRN image format to
-% the list of supported formats. The attributes include the image format
-% tag, a method to read and/or write the format, whether the format
-% supports the saving of more than one frame to the same file or blob,
-% whether the format supports native in-memory I/O, and a brief
-% description of the format.
-%
-% The format of the RegisterXTRNImage method is:
-%
-% RegisterXTRNImage(void)
-%
-*/
-ModuleExport void RegisterXTRNImage(void)
-{
- MagickInfo
- *entry;
-
- entry=SetMagickInfo("XTRNFILE");
- entry->decoder=ReadXTRNImage;
- entry->encoder=WriteXTRNImage;
- entry->adjoin=MagickFalse;
- entry->stealth=MagickTrue;
- entry->description=ConstantString("External transfer of a file");
- entry->module=ConstantString("XTRN");
- RegisterMagickInfo(entry);
- entry=SetMagickInfo("XTRNIMAGE");
- entry->decoder=ReadXTRNImage;
- entry->encoder=WriteXTRNImage;
- entry->adjoin=MagickFalse;
- entry->stealth=MagickTrue;
- entry->description=ConstantString("External transfer of a image in memory");
- entry->module=ConstantString("XTRN");
- RegisterMagickInfo(entry);
- entry=SetMagickInfo("XTRNBLOB");
- entry->decoder=ReadXTRNImage;
- entry->encoder=WriteXTRNImage;
- entry->adjoin=MagickFalse;
- entry->stealth=MagickTrue;
- entry->description=ConstantString("IExternal transfer of a blob in memory");
- entry->module=ConstantString("XTRN");
- RegisterMagickInfo(entry);
- entry=SetMagickInfo("XTRNARRAY");
- entry->decoder=ReadXTRNImage;
- entry->encoder=WriteXTRNImage;
- entry->adjoin=MagickFalse;
- entry->stealth=MagickTrue;
- entry->description=ConstantString(
- "External transfer via a smart array interface");
- entry->module=ConstantString("XTRN");
- RegisterMagickInfo(entry);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% U n r e g i s t e r X T R N I m a g e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% UnregisterXTRNImage() removes format registrations made by the
-% XTRN module from the list of supported formats.
-%
-% The format of the UnregisterXTRNImage method is:
-%
-% UnregisterXTRNImage(void)
-%
-*/
-ModuleExport void UnregisterXTRNImage(void)
-{
- UnregisterMagickInfo("XTRNFILE");
- UnregisterMagickInfo("XTRNIMAGE");
- UnregisterMagickInfo("XTRNBLOB");
- UnregisterMagickInfo("XTRNARRAY");
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% W r i t e X T R N I m a g e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% WriteXTRNImage() writes an image in the XTRN encoded image format.
-% We use GIF because it is the only format that is compressed without
-% requiring addition optional delegates (TIFF, ZIP, etc).
-%
-% The format of the WriteXTRNImage method is:
-%
-% MagickBooleanType WriteXTRNImage(const ImageInfo *image_info,Image *image)
-%
-% A description of each parameter follows.
-%
-% o image_info: Specifies a pointer to an ImageInfo structure.
-%
-% o image: A pointer to a Image structure.
-%
-%
-*/
-
-size_t SafeArrayFifo(const Image *image,const void *data,const size_t length)
-{
- SAFEARRAYBOUND NewArrayBounds[1]; /* 1 Dimension */
- size_t tlen=length;
- SAFEARRAY *pSafeArray = (SAFEARRAY *)image->client_data;
- if (pSafeArray != NULL)
- {
- long lBoundl, lBoundu, lCount;
- HRESULT hr = S_OK;
- /* First see how big the buffer currently is */
- hr = SafeArrayGetLBound(pSafeArray, 1, &lBoundl);
- if (FAILED(hr))
- return MagickFalse;
- hr = SafeArrayGetUBound(pSafeArray, 1, &lBoundu);
- if (FAILED(hr))
- return MagickFalse;
- lCount = lBoundu - lBoundl + 1;
-
- if (length>0)
- {
- unsigned char *pReturnBuffer = NULL;
- NewArrayBounds[0].lLbound = 0; /* Start-Index 0 */
- NewArrayBounds[0].cElements = (unsigned long) (length+lCount); /* # Elemente */
- hr = SafeArrayRedim(pSafeArray, NewArrayBounds);
- if (FAILED(hr))
- return 0;
- hr = SafeArrayAccessData(pSafeArray, (void**)&pReturnBuffer);
- if( FAILED(hr) )
- return 0;
- (void) memcpy(pReturnBuffer+lCount,(unsigned char *) data,length);
- hr=SafeArrayUnaccessData(pSafeArray);
- if(FAILED(hr))
- return 0;
- }
- else
- {
- /* Adjust the length of the buffer to fit */
- }
- }
- return(tlen);
-}
-
-static MagickBooleanType WriteXTRNImage(const ImageInfo *image_info,Image *image)
-{
- Image *
- p;
-
- ImageInfo
- *clone_info;
-
- int
- scene;
-
- MagickBooleanType
- status;
-
- void
- *param1,
- *param2,
- *param3;
-
- param1 = param2 = param3 = (void *) NULL;
- if (LocaleCompare(image_info->magick,"XTRNFILE") == 0)
- {
- clone_info=CloneImageInfo(image_info);
- status=WriteImage(image_info,image);
- if (status == MagickFalse)
- CatchImageException(image);
- clone_info=DestroyImageInfo(clone_info);
- }
- else if (LocaleCompare(image_info->magick,"XTRNIMAGE") == 0)
- {
- Image
- **image_ptr;
-
- ImageInfo
- **image_info_ptr;
-
- clone_info=CloneImageInfo(image_info);
- if (clone_info->filename[0])
- {
- (void) sscanf(clone_info->filename,"%lx,%lx",¶m1,¶m2);
- image_info_ptr=(ImageInfo **) param1;
- image_ptr=(Image **) param2;
- if ((image_info_ptr != (ImageInfo **) NULL) &&
- (image_ptr != (Image **) NULL))
- {
- *image_ptr=CloneImage(image,0,0,MagickFalse,&(image->exception));
- *image_info_ptr=clone_info;
- }
- }
- }
- else if (LocaleCompare(image_info->magick,"XTRNBLOB") == 0)
- {
- char
- **blob_data;
-
- ExceptionInfo
- exception;
-
- size_t
- *blob_length;
-
- char
- filename[MaxTextExtent];
-
- clone_info=CloneImageInfo(image_info);
- if (clone_info->filename[0])
- {
- (void) sscanf(clone_info->filename,"%lx,%lx,%s",
- ¶m1,¶m2,&filename);
-
- blob_data=(char **) param1;
- blob_length=(size_t *) param2;
- scene = 0;
- (void) CopyMagickString(clone_info->filename,filename,MaxTextExtent);
- for (p=image; p != (Image *) NULL; p=GetNextImageInList(p))
- {
- (void) CopyMagickString(p->filename,filename,MaxTextExtent);
- p->scene=scene++;
- }
- SetImageInfo(clone_info,1,&image->exception);
- (void) CopyMagickString(image->magick,clone_info->magick,
- MaxTextExtent);
- GetExceptionInfo(&exception);
- if (*blob_length == 0)
- *blob_length=8192;
- *blob_data=(char *) ImageToBlob(clone_info,image,blob_length,
- &exception);
- if (*blob_data == NULL)
- status=MagickFalse;
- if (status == MagickFalse)
- CatchImageException(image);
- }
- clone_info=DestroyImageInfo(clone_info);
- }
- else if (LocaleCompare(image_info->magick,"XTRNARRAY") == 0)
- {
- char
- filename[MaxTextExtent];
-
- size_t
- blob_length;
-
- unsigned char
- *blob_data;
-
- clone_info=CloneImageInfo(image_info);
- if (*clone_info->filename != '\0')
- {
- (void) sscanf(clone_info->filename,"%lx,%s",¶m1,&filename);
- image->client_data=param1;
- scene=0;
- (void) CopyMagickString(clone_info->filename,filename,MaxTextExtent);
- for (p=image; p != (Image *) NULL; p=GetNextImageInList(p))
- {
- (void) CopyMagickString(p->filename,filename,MaxTextExtent);
- p->scene=scene++;
- }
- SetImageInfo(clone_info,1,&image->exception);
- (void) CopyMagickString(image->magick,clone_info->magick,
- MaxTextExtent);
- blob_data=ImageToBlob(clone_info,image,&blob_length,
- &image->exception);
- if (blob_data == (unsigned char *) NULL)
- status=MagickFalse;
- else
- SafeArrayFifo(image,blob_data,blob_length);
- if (status == MagickFalse)
- CatchImageException(image);
- }
- clone_info=DestroyImageInfo(clone_info);
- }
- return(MagickTrue);
-}
-#endif
diff --git a/coders/xwd.c b/coders/xwd.c
index 6b276f6..b9fa920 100644
--- a/coders/xwd.c
+++ b/coders/xwd.c
@@ -39,30 +39,31 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/color-private.h"
-#include "magick/colormap.h"
-#include "magick/colormap-private.h"
-#include "magick/colorspace.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/property.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/color-private.h"
+#include "MagickCore/colormap.h"
+#include "MagickCore/colormap-private.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/property.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
#if defined(MAGICKCORE_X11_DELEGATE)
-#include "magick/xwindow-private.h"
+#include "MagickCore/xwindow-private.h"
#if !defined(vms)
#include <X11/XWDFile.h>
#else
@@ -156,9 +157,6 @@
Image
*image;
- IndexPacket
- index;
-
int
x_status;
@@ -168,13 +166,13 @@
MagickStatusType
status;
- register IndexPacket
- *indexes;
+ Quantum
+ index;
register ssize_t
x;
- register PixelPacket
+ register Quantum
*q;
register ssize_t
@@ -399,21 +397,21 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
pixel=XGetPixel(ximage,(int) x,(int) y);
- index=(IndexPacket) ((pixel >> red_shift) & red_mask);
- SetPixelRed(q,ScaleShortToQuantum(colors[(ssize_t)
- index].red));
- index=(IndexPacket) ((pixel >> green_shift) & green_mask);
- SetPixelGreen(q,ScaleShortToQuantum(colors[(ssize_t)
- index].green));
- index=(IndexPacket) ((pixel >> blue_shift) & blue_mask);
- SetPixelBlue(q,ScaleShortToQuantum(colors[(ssize_t)
- index].blue));
- q++;
+ index=(Quantum) ((pixel >> red_shift) & red_mask);
+ SetPixelRed(image,ScaleShortToQuantum(
+ colors[(ssize_t) index].red),q);
+ index=(Quantum) ((pixel >> green_shift) & green_mask);
+ SetPixelGreen(image,ScaleShortToQuantum(
+ colors[(ssize_t) index].green),q);
+ index=(Quantum) ((pixel >> blue_shift) & blue_mask);
+ SetPixelBlue(image,ScaleShortToQuantum(
+ colors[(ssize_t) index].blue),q);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -426,24 +424,24 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
pixel=XGetPixel(ximage,(int) x,(int) y);
color=(pixel >> red_shift) & red_mask;
color=(color*65535UL)/red_mask;
- SetPixelRed(q,ScaleShortToQuantum((unsigned short)
- color));
+ SetPixelRed(image,ScaleShortToQuantum((unsigned short)
+ color),q);
color=(pixel >> green_shift) & green_mask;
color=(color*65535UL)/green_mask;
- SetPixelGreen(q,ScaleShortToQuantum((unsigned short)
- color));
+ SetPixelGreen(image,ScaleShortToQuantum((unsigned short)
+ color),q);
color=(pixel >> blue_shift) & blue_mask;
color=(color*65535UL)/blue_mask;
- SetPixelBlue(q,ScaleShortToQuantum((unsigned short)
- color));
- q++;
+ SetPixelBlue(image,ScaleShortToQuantum((unsigned short)
+ color),q);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -470,16 +468,15 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
- indexes=GetAuthenticIndexQueue(image);
for (x=0; x < (ssize_t) image->columns; x++)
{
index=ConstrainColormapIndex(image,XGetPixel(ximage,(int) x,
(int) y));
- SetPixelIndex(indexes+x,index);
- SetPixelRGBO(q,image->colormap+(ssize_t) index);
- q++;
+ SetPixelIndex(image,index,q);
+ SetPixelPacket(image,image->colormap+(ssize_t) index,q);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -605,10 +602,7 @@
MagickBooleanType
status;
- register const IndexPacket
- *indexes;
-
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
@@ -762,22 +756,24 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
q=pixels;
if (image->storage_class == PseudoClass)
{
- indexes=GetVirtualIndexQueue(image);
for (x=0; x < (ssize_t) image->columns; x++)
- *q++=(unsigned char) GetPixelIndex(indexes+x);
+ {
+ *q++=(unsigned char) GetPixelIndex(image,p);
+ p+=GetPixelChannels(image);
+ }
}
else
for (x=0; x < (ssize_t) image->columns; x++)
{
- *q++=ScaleQuantumToChar(GetPixelRed(p));
- *q++=ScaleQuantumToChar(GetPixelGreen(p));
- *q++=ScaleQuantumToChar(GetPixelBlue(p));
- p++;
+ *q++=ScaleQuantumToChar(GetPixelRed(image,p));
+ *q++=ScaleQuantumToChar(GetPixelGreen(image,p));
+ *q++=ScaleQuantumToChar(GetPixelBlue(image,p));
+ p+=GetPixelChannels(image);
}
for (x=0; x < (ssize_t) scanline_pad; x++)
*q++='\0';
diff --git a/coders/ycbcr.c b/coders/ycbcr.c
index d73c288..305291d 100644
--- a/coders/ycbcr.c
+++ b/coders/ycbcr.c
@@ -39,28 +39,28 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/colorspace.h"
-#include "magick/constitute.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/pixel-private.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/statistic.h"
-#include "magick/string_.h"
-#include "magick/module.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/statistic.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/utility.h"
/*
Forward declarations.
@@ -114,14 +114,14 @@
QuantumType
quantum_type;
- register const PixelPacket
+ register const Quantum
*p;
register ssize_t
i,
x;
- register PixelPacket
+ register Quantum
*q;
size_t
@@ -226,7 +226,7 @@
}
q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
quantum_info,quantum_type,pixels,exception);
@@ -239,18 +239,18 @@
canvas_image->columns,1,exception);
q=QueueAuthenticPixels(image,0,y-image->extract_info.y,
image->columns,1,exception);
- if ((p == (const PixelPacket *) NULL) ||
- (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) ||
+ (q == (const Quantum *) NULL))
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelRed(q,GetPixelRed(p));
- SetPixelGreen(q,GetPixelGreen(p));
- SetPixelBlue(q,GetPixelBlue(p));
+ SetPixelRed(image,GetPixelRed(canvas_image,p),q);
+ SetPixelGreen(image,GetPixelGreen(canvas_image,p),q);
+ SetPixelBlue(image,GetPixelBlue(canvas_image,p),q);
if (image->matte != MagickFalse)
- SetPixelOpacity(q,GetPixelOpacity(p));
- p++;
- q++;
+ SetPixelAlpha(image,GetPixelAlpha(canvas_image,p),q);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -298,7 +298,7 @@
quantum_type=quantum_types[i];
q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
quantum_info,quantum_type,pixels,exception);
@@ -311,8 +311,8 @@
0,canvas_image->columns,1,exception);
q=GetAuthenticPixels(image,0,y-image->extract_info.y,
image->columns,1,exception);
- if ((p == (const PixelPacket *) NULL) ||
- (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) ||
+ (q == (const Quantum *) NULL))
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
@@ -320,29 +320,29 @@
{
case RedQuantum:
{
- SetPixelRed(q,GetPixelRed(p));
+ SetPixelRed(image,GetPixelRed(canvas_image,p),q);
break;
}
case GreenQuantum:
{
- SetPixelGreen(q,GetPixelGreen(p));
+ SetPixelGreen(image,GetPixelGreen(canvas_image,p),q);
break;
}
case BlueQuantum:
{
- SetPixelBlue(q,GetPixelBlue(p));
+ SetPixelBlue(image,GetPixelBlue(canvas_image,p),q);
break;
}
case OpacityQuantum:
{
- SetPixelOpacity(q,GetPixelOpacity(p));
+ SetPixelAlpha(image,GetPixelAlpha(canvas_image,p),q);
break;
}
default:
break;
}
- p++;
- q++;
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -379,7 +379,7 @@
}
q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
quantum_info,RedQuantum,pixels,exception);
@@ -392,14 +392,14 @@
canvas_image->columns,1,exception);
q=GetAuthenticPixels(image,0,y-image->extract_info.y,
image->columns,1,exception);
- if ((p == (const PixelPacket *) NULL) ||
- (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) ||
+ (q == (const Quantum *) NULL))
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelRed(q,GetPixelRed(p));
- p++;
- q++;
+ SetPixelRed(image,GetPixelRed(canvas_image,p),q);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -422,7 +422,7 @@
}
q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
quantum_info,GreenQuantum,pixels,exception);
@@ -435,14 +435,14 @@
canvas_image->columns,1,exception);
q=GetAuthenticPixels(image,0,y-image->extract_info.y,
image->columns,1,exception);
- if ((p == (const PixelPacket *) NULL) ||
- (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) ||
+ (q == (const Quantum *) NULL))
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelGreen(q,GetPixelGreen(p));
- p++;
- q++;
+ SetPixelGreen(image,GetPixelGreen(canvas_image,p),q);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -465,7 +465,7 @@
}
q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
quantum_info,BlueQuantum,pixels,exception);
@@ -478,14 +478,14 @@
canvas_image->columns,1,exception);
q=GetAuthenticPixels(image,0,y-image->extract_info.y,
image->columns,1,exception);
- if ((p == (const PixelPacket *) NULL) ||
- (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) ||
+ (q == (const Quantum *) NULL))
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelBlue(q,GetPixelBlue(p));
- p++;
- q++;
+ SetPixelBlue(image,GetPixelBlue(canvas_image,p),q);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -510,7 +510,7 @@
}
q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
quantum_info,AlphaQuantum,pixels,exception);
@@ -524,14 +524,14 @@
exception);
q=GetAuthenticPixels(image,0,y-image->extract_info.y,
image->columns,1,exception);
- if ((p == (const PixelPacket *) NULL) ||
- (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) ||
+ (q == (const Quantum *) NULL))
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelOpacity(q,GetPixelOpacity(p));
- p++;
- q++;
+ SetPixelAlpha(image,GetPixelAlpha(canvas_image,p),q);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -589,7 +589,7 @@
}
q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
quantum_info,RedQuantum,pixels,exception);
@@ -602,14 +602,14 @@
canvas_image->columns,1,exception);
q=GetAuthenticPixels(image,0,y-image->extract_info.y,
image->columns,1,exception);
- if ((p == (const PixelPacket *) NULL) ||
- (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) ||
+ (q == (const Quantum *) NULL))
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelRed(q,GetPixelRed(p));
- p++;
- q++;
+ SetPixelRed(image,GetPixelRed(canvas_image,p),q);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -651,7 +651,7 @@
}
q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
quantum_info,GreenQuantum,pixels,exception);
@@ -664,14 +664,14 @@
canvas_image->columns,1,exception);
q=GetAuthenticPixels(image,0,y-image->extract_info.y,
image->columns,1,exception);
- if ((p == (const PixelPacket *) NULL) ||
- (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) ||
+ (q == (const Quantum *) NULL))
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelGreen(q,GetPixelGreen(p));
- p++;
- q++;
+ SetPixelGreen(image,GetPixelGreen(canvas_image,p),q);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -713,7 +713,7 @@
}
q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
quantum_info,BlueQuantum,pixels,exception);
@@ -726,14 +726,14 @@
canvas_image->columns,1,exception);
q=GetAuthenticPixels(image,0,y-image->extract_info.y,
image->columns,1,exception);
- if ((p == (const PixelPacket *) NULL) ||
- (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) ||
+ (q == (const Quantum *) NULL))
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelBlue(q,GetPixelBlue(p));
- p++;
- q++;
+ SetPixelBlue(image,GetPixelBlue(canvas_image,p),q);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -777,7 +777,7 @@
}
q=GetAuthenticPixels(canvas_image,0,0,canvas_image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
length=ImportQuantumPixels(canvas_image,(CacheView *) NULL,
quantum_info,BlueQuantum,pixels,exception);
@@ -791,14 +791,14 @@
exception);
q=GetAuthenticPixels(image,0,y-image->extract_info.y,
image->columns,1,exception);
- if ((p == (const PixelPacket *) NULL) ||
- (q == (PixelPacket *) NULL))
+ if ((p == (const Quantum *) NULL) ||
+ (q == (const Quantum *) NULL))
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelOpacity(q,GetPixelOpacity(p));
- p++;
- q++;
+ SetPixelAlpha(image,GetPixelAlpha(canvas_image,p),q);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -967,7 +967,7 @@
QuantumType
quantum_type;
- register const PixelPacket
+ register const Quantum
*p;
size_t
@@ -1014,7 +1014,7 @@
(void) TransformImageColorspace(image,YCbCrColorspace);
if ((LocaleCompare(image_info->magick,"YCbCrA") == 0) &&
(image->matte == MagickFalse))
- (void) SetImageAlphaChannel(image,ResetAlphaChannel);
+ (void) SetImageAlphaChannel(image,OpaqueAlphaChannel);
quantum_info=AcquireQuantumInfo(image_info,image);
if (quantum_info == (QuantumInfo *) NULL)
ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed");
@@ -1030,10 +1030,10 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,quantum_type,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ quantum_type,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
break;
@@ -1055,27 +1055,27 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,RedQuantum,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ RedQuantum,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,GreenQuantum,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ GreenQuantum,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,BlueQuantum,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ BlueQuantum,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
break;
if (quantum_type == RGBAQuantum)
{
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,AlphaQuantum,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ AlphaQuantum,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
break;
@@ -1098,10 +1098,10 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,RedQuantum,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ RedQuantum,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
break;
@@ -1115,10 +1115,10 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,GreenQuantum,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ GreenQuantum,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
break;
@@ -1132,10 +1132,10 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,BlueQuantum,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ BlueQuantum,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
break;
@@ -1152,10 +1152,10 @@
{
p=GetVirtualPixels(image,0,y,image->columns,1,
&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,AlphaQuantum,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ AlphaQuantum,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
break;
@@ -1185,10 +1185,10 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,RedQuantum,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ RedQuantum,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
break;
@@ -1208,10 +1208,10 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,GreenQuantum,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ GreenQuantum,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
break;
@@ -1231,10 +1231,10 @@
for (y=0; y < (ssize_t) image->rows; y++)
{
p=GetVirtualPixels(image,0,y,image->columns,1,&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,BlueQuantum,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ BlueQuantum,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
break;
@@ -1257,10 +1257,10 @@
{
p=GetVirtualPixels(image,0,y,image->columns,1,
&image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
- length=ExportQuantumPixels(image,(const CacheView *) NULL,
- quantum_info,AlphaQuantum,pixels,&image->exception);
+ length=ExportQuantumPixels(image,(CacheView *) NULL,quantum_info,
+ AlphaQuantum,pixels,&image->exception);
count=WriteBlob(image,length,pixels);
if (count != (ssize_t) length)
break;
diff --git a/coders/yuv.c b/coders/yuv.c
index 35945be..5776b94 100644
--- a/coders/yuv.c
+++ b/coders/yuv.c
@@ -39,28 +39,29 @@
/*
Include declarations.
*/
-#include "magick/studio.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/colorspace.h"
-#include "magick/constitute.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/geometry.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/resize.h"
-#include "magick/quantum-private.h"
-#include "magick/static.h"
-#include "magick/string_.h"
-#include "magick/module.h"
-#include "magick/utility.h"
+#include "MagickCore/studio.h"
+#include "MagickCore/blob.h"
+#include "MagickCore/blob-private.h"
+#include "MagickCore/cache.h"
+#include "MagickCore/colorspace.h"
+#include "MagickCore/constitute.h"
+#include "MagickCore/exception.h"
+#include "MagickCore/exception-private.h"
+#include "MagickCore/geometry.h"
+#include "MagickCore/image.h"
+#include "MagickCore/image-private.h"
+#include "MagickCore/list.h"
+#include "MagickCore/magick.h"
+#include "MagickCore/memory_.h"
+#include "MagickCore/monitor.h"
+#include "MagickCore/monitor-private.h"
+#include "MagickCore/pixel-accessor.h"
+#include "MagickCore/resize.h"
+#include "MagickCore/quantum-private.h"
+#include "MagickCore/static.h"
+#include "MagickCore/string_.h"
+#include "MagickCore/module.h"
+#include "MagickCore/utility.h"
/*
Forward declarations.
@@ -108,13 +109,13 @@
MagickBooleanType
status;
- register const PixelPacket
+ register const Quantum
*chroma_pixels;
register ssize_t
x;
- register PixelPacket
+ register Quantum
*q;
register unsigned char
@@ -221,7 +222,7 @@
}
for (y=0; y < (ssize_t) image->rows; y++)
{
- register PixelPacket
+ register Quantum
*chroma_pixels;
if (interlace == NoInterlace)
@@ -230,54 +231,52 @@
count=ReadBlob(image,(size_t) (2*quantum*image->columns),scanline);
p=scanline;
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
chroma_pixels=QueueAuthenticPixels(chroma_image,0,y,
chroma_image->columns,1,exception);
- if (chroma_pixels == (PixelPacket *) NULL)
+ if (chroma_pixels == (Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x+=2)
{
- SetPixelRed(chroma_pixels,0);
+ SetPixelRed(image,0,chroma_pixels);
if (quantum == 1)
- SetPixelGreen(chroma_pixels,ScaleCharToQuantum(*p++));
+ SetPixelGreen(image,ScaleCharToQuantum(*p++),chroma_pixels);
else
{
- SetPixelGreen(chroma_pixels,ScaleShortToQuantum(
- ((*p) << 8) | *(p+1)));
+ SetPixelGreen(image,ScaleShortToQuantum(((*p) << 8) | *(p+1)),
+ chroma_pixels);
p+=2;
}
if (quantum == 1)
- SetPixelRed(q,ScaleCharToQuantum(*p++));
+ SetPixelRed(image,ScaleCharToQuantum(*p++),q);
else
{
- SetPixelRed(q,ScaleShortToQuantum(((*p) << 8) |
- *(p+1)));
+ SetPixelRed(image,ScaleShortToQuantum(((*p) << 8) | *(p+1)),q);
p+=2;
}
- SetPixelGreen(q,0);
- SetPixelBlue(q,0);
- q++;
- SetPixelGreen(q,0);
- SetPixelBlue(q,0);
+ SetPixelGreen(image,0,q);
+ SetPixelBlue(image,0,q);
+ q+=GetPixelChannels(image);
+ SetPixelGreen(image,0,q);
+ SetPixelBlue(image,0,q);
if (quantum == 1)
- SetPixelBlue(chroma_pixels,ScaleCharToQuantum(*p++));
+ SetPixelBlue(image,ScaleCharToQuantum(*p++),chroma_pixels);
else
{
- SetPixelBlue(chroma_pixels,ScaleShortToQuantum(
- ((*p) << 8) | *(p+1)));
+ SetPixelBlue(image,ScaleShortToQuantum(((*p) << 8) | *(p+1)),
+ chroma_pixels);
p+=2;
}
if (quantum == 1)
- SetPixelRed(q,ScaleCharToQuantum(*p++));
+ SetPixelRed(image,ScaleCharToQuantum(*p++),q);
else
{
- SetPixelRed(q,ScaleShortToQuantum(((*p) << 8) |
- *(p+1)));
+ SetPixelRed(image,ScaleShortToQuantum(((*p) << 8) | *(p+1)),q);
p+=2;
}
chroma_pixels++;
- q++;
+ q+=GetPixelChannels(image);
}
}
else
@@ -286,21 +285,20 @@
count=ReadBlob(image,(size_t) quantum*image->columns,scanline);
p=scanline;
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
if (quantum == 1)
- SetPixelRed(q,ScaleCharToQuantum(*p++));
+ SetPixelRed(image,ScaleCharToQuantum(*p++),q);
else
{
- SetPixelRed(q,ScaleShortToQuantum(((*p) << 8) |
- *(p+1)));
+ SetPixelRed(image,ScaleShortToQuantum(((*p) << 8) | *(p+1)),q);
p+=2;
}
- SetPixelGreen(q,0);
- SetPixelBlue(q,0);
- q++;
+ SetPixelGreen(image,0,q);
+ SetPixelBlue(image,0,q);
+ q+=GetPixelChannels(image);
}
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -335,21 +333,21 @@
p=scanline;
q=QueueAuthenticPixels(chroma_image,0,y,chroma_image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) chroma_image->columns; x++)
{
- SetPixelRed(q,0);
+ SetPixelRed(chroma_image,0,q);
if (quantum == 1)
- SetPixelGreen(q,ScaleCharToQuantum(*p++));
+ SetPixelGreen(chroma_image,ScaleCharToQuantum(*p++),q);
else
{
- SetPixelGreen(q,ScaleShortToQuantum(((*p) << 8) |
- *(p+1)));
+ SetPixelGreen(chroma_image,ScaleShortToQuantum(((*p) << 8) |
+ *(p+1)),q);
p+=2;
}
- SetPixelBlue(q,0);
- q++;
+ SetPixelBlue(chroma_image,0,q);
+ q+=GetPixelChannels(chroma_image);
}
if (SyncAuthenticPixels(chroma_image,exception) == MagickFalse)
break;
@@ -371,19 +369,19 @@
p=scanline;
q=GetAuthenticPixels(chroma_image,0,y,chroma_image->columns,1,
exception);
- if (q == (PixelPacket *) NULL)
+ if (q == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) chroma_image->columns; x++)
{
if (quantum == 1)
- SetPixelBlue(q,ScaleCharToQuantum(*p++));
+ SetPixelBlue(chroma_image,ScaleCharToQuantum(*p++),q);
else
{
- SetPixelBlue(q,ScaleShortToQuantum(((*p) << 8) |
- *(p+1)));
+ SetPixelBlue(chroma_image,ScaleShortToQuantum(((*p) << 8) |
+ *(p+1)),q);
p+=2;
}
- q++;
+ q+=GetPixelChannels(chroma_image);
}
if (SyncAuthenticPixels(chroma_image,exception) == MagickFalse)
break;
@@ -402,15 +400,15 @@
q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
chroma_pixels=GetVirtualPixels(resize_image,0,y,resize_image->columns,1,
&resize_image->exception);
- if ((q == (PixelPacket *) NULL) ||
- (chroma_pixels == (const PixelPacket *) NULL))
+ if ((q == (const Quantum *) NULL) ||
+ (chroma_pixels == (const Quantum *) NULL))
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- SetPixelGreen(q,GetPixelGreen(chroma_pixels));
- SetPixelBlue(q,GetPixelBlue(chroma_pixels));
+ SetPixelGreen(image,GetPixelGreen(image,chroma_pixels),q);
+ SetPixelBlue(image,GetPixelBlue(image,chroma_pixels),q);
chroma_pixels++;
- q++;
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -563,7 +561,7 @@
MagickOffsetType
scene;
- register const PixelPacket
+ register const Quantum
*p,
*s;
@@ -661,39 +659,39 @@
{
p=GetVirtualPixels(yuv_image,0,y,yuv_image->columns,1,
&yuv_image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
s=GetVirtualPixels(chroma_image,0,y,chroma_image->columns,1,
&chroma_image->exception);
- if (s == (const PixelPacket *) NULL)
+ if (s == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) yuv_image->columns; x++)
{
if (quantum == 1)
{
(void) WriteBlobByte(image,ScaleQuantumToChar(
- GetPixelGreen(s)));
+ GetPixelGreen(yuv_image,s)));
(void) WriteBlobByte(image,ScaleQuantumToChar(
- GetPixelRed(p)));
- p++;
+ GetPixelRed(yuv_image,p)));
+ p+=GetPixelChannels(yuv_image);
(void) WriteBlobByte(image,ScaleQuantumToChar(
- GetPixelBlue(s)));
+ GetPixelBlue(yuv_image,s)));
(void) WriteBlobByte(image,ScaleQuantumToChar(
- GetPixelRed(p)));
+ GetPixelRed(yuv_image,p)));
}
else
{
(void) WriteBlobByte(image,ScaleQuantumToChar(
- GetPixelGreen(s)));
+ GetPixelGreen(yuv_image,s)));
(void) WriteBlobShort(image,ScaleQuantumToShort(
- GetPixelRed(p)));
- p++;
+ GetPixelRed(yuv_image,p)));
+ p+=GetPixelChannels(yuv_image);
(void) WriteBlobByte(image,ScaleQuantumToChar(
- GetPixelBlue(s)));
+ GetPixelBlue(yuv_image,s)));
(void) WriteBlobShort(image,ScaleQuantumToShort(
- GetPixelRed(p)));
+ GetPixelRed(yuv_image,p)));
}
- p++;
+ p+=GetPixelChannels(yuv_image);
s++;
x++;
}
@@ -716,17 +714,17 @@
{
p=GetVirtualPixels(yuv_image,0,y,yuv_image->columns,1,
&yuv_image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) yuv_image->columns; x++)
{
if (quantum == 1)
(void) WriteBlobByte(image,ScaleQuantumToChar(
- GetPixelRed(p)));
+ GetPixelRed(yuv_image,p)));
else
(void) WriteBlobShort(image,ScaleQuantumToShort(
- GetPixelRed(p)));
- p++;
+ GetPixelRed(yuv_image,p)));
+ p+=GetPixelChannels(yuv_image);
}
if (image->previous == (Image *) NULL)
{
@@ -759,17 +757,17 @@
{
p=GetVirtualPixels(chroma_image,0,y,chroma_image->columns,1,
&chroma_image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) chroma_image->columns; x++)
{
if (quantum == 1)
(void) WriteBlobByte(image,ScaleQuantumToChar(
- GetPixelGreen(p)));
+ GetPixelGreen(chroma_image,p)));
else
(void) WriteBlobShort(image,ScaleQuantumToShort(
- GetPixelGreen(p)));
- p++;
+ GetPixelGreen(chroma_image,p)));
+ p+=GetPixelChannels(chroma_image);
}
}
if (image->previous == (Image *) NULL)
@@ -794,17 +792,17 @@
{
p=GetVirtualPixels(chroma_image,0,y,chroma_image->columns,1,
&chroma_image->exception);
- if (p == (const PixelPacket *) NULL)
+ if (p == (const Quantum *) NULL)
break;
for (x=0; x < (ssize_t) chroma_image->columns; x++)
{
if (quantum == 1)
(void) WriteBlobByte(image,ScaleQuantumToChar(
- GetPixelBlue(p)));
+ GetPixelBlue(chroma_image,p)));
else
(void) WriteBlobShort(image,ScaleQuantumToShort(
- GetPixelBlue(p)));
- p++;
+ GetPixelBlue(chroma_image,p)));
+ p+=GetPixelChannels(chroma_image);
}
}
if (image->previous == (Image *) NULL)
diff --git a/config/configure.xml b/config/configure.xml
index 559d74a..a70e668 100644
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -10,14 +10,14 @@
<configure name="VERSION" value="6.7.1"/>
<configure name="LIB_VERSION" value="0x671"/>
<configure name="LIB_VERSION_NUMBER" value="6,7,1,0"/>
- <configure name="SVN_REVISION" value="4677" />
- <configure name="RELEASE_DATE" value="2011-06-30"/>
+ <configure name="SVN_REVISION" value="4683" />
+ <configure name="RELEASE_DATE" value="2011-07-01"/>
<configure name="CONFIGURE" value="./configure "/>
<configure name="PREFIX" value="/usr/local"/>
<configure name="EXEC-PREFIX" value="/usr/local"/>
<configure name="CONFIGURE_PATH" value="/usr/local/etc/ImageMagick/"/>
<configure name="SHARE_PATH" value="/usr/local/share/ImageMagick-6.7.1"/>
- <configure name="DOCUMENTATION_PATH" value="/usr/local/share/doc/ImageMagick-6.7.1/"/>
+ <configure name="DOCUMENTATION_PATH" value="/usr/local/share/doc/ImageMagick-7.0.0/"/>
<configure name="EXECUTABLE_PATH" value="/usr/local/bin"/>
<configure name="LIBRARY_PATH" value="/usr/local/lib/ImageMagick-6.7.1"/>
<configure name="CODER_PATH" value="/usr/local/lib/ImageMagick-6.7.1/modules-Q16/coders"/>
diff --git a/configure b/configure
index e47046c..78c1b4f 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for ImageMagick 6.7.1.
+# Generated by GNU Autoconf 2.68 for ImageMagick 7.0.0.
#
# Report bugs to <http://www.imagemagick.org>.
#
@@ -573,13 +573,13 @@
# Identity of this package.
PACKAGE_NAME='ImageMagick'
-PACKAGE_TARNAME='ImageMagick-6.7.1'
-PACKAGE_VERSION='6.7.1'
-PACKAGE_STRING='ImageMagick 6.7.1'
+PACKAGE_TARNAME='ImageMagick-7.0.0'
+PACKAGE_VERSION='7.0.0'
+PACKAGE_STRING='ImageMagick 7.0.0'
PACKAGE_BUGREPORT='http://www.imagemagick.org'
PACKAGE_URL=''
-ac_unique_file="magick/MagickCore.h"
+ac_unique_file="MagickCore/MagickCore.h"
ac_config_libobj_dir=ltdl
# Factoring default headers for most tests.
ac_includes_default="\
@@ -1715,7 +1715,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures ImageMagick 6.7.1 to adapt to many kinds of systems.
+\`configure' configures ImageMagick 7.0.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1764,7 +1764,7 @@
--localedir=DIR locale-dependent data [DATAROOTDIR/locale]
--mandir=DIR man documentation [DATAROOTDIR/man]
--docdir=DIR documentation root
- [DATAROOTDIR/doc/ImageMagick-6.7.1]
+ [DATAROOTDIR/doc/ImageMagick-7.0.0]
--htmldir=DIR html documentation [DOCDIR]
--dvidir=DIR dvi documentation [DOCDIR]
--pdfdir=DIR pdf documentation [DOCDIR]
@@ -1791,7 +1791,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of ImageMagick 6.7.1:";;
+ short | recursive ) echo "Configuration of ImageMagick 7.0.0:";;
esac
cat <<\_ACEOF
@@ -2000,7 +2000,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-ImageMagick configure 6.7.1
+ImageMagick configure 7.0.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -3043,7 +3043,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by ImageMagick $as_me 6.7.1, which was
+It was created by ImageMagick $as_me 7.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -3429,9 +3429,9 @@
ac_config_headers="$ac_config_headers config/config.h"
-ac_config_commands="$ac_config_commands magick/magick-config.h"
+ac_config_commands="$ac_config_commands MagickCore/magick-config.h"
-ac_config_files="$ac_config_files config/configure.xml config/delegates.xml config/ImageMagick.rdf config/MagickCore.dox config/MagickWand.dox config/type-dejavu.xml config/type-ghostscript.xml config/type-windows.xml config/type.xml ImageMagick.spec Magick++/bin/Magick++-config magick/ImageMagick.pc Magick++/lib/ImageMagick++.pc Magick++/lib/Magick++.pc magick/Magick-config magick/MagickCore-config magick/MagickCore.pc magick/version.h Makefile magick.sh PerlMagick/Magick.pm PerlMagick/Makefile.PL PerlMagick/check.sh utilities/animate.1 utilities/compare.1 utilities/composite.1 utilities/conjure.1 utilities/convert.1 utilities/display.1 utilities/identify.1 utilities/ImageMagick.1 utilities/import.1 utilities/mogrify.1 utilities/montage.1 utilities/stream.1 wand/MagickWand-config wand/MagickWand.pc wand/Wand-config wand/Wand.pc"
+ac_config_files="$ac_config_files config/configure.xml config/delegates.xml config/ImageMagick.rdf config/MagickCore.dox config/MagickWand.dox config/type-dejavu.xml config/type-ghostscript.xml config/type-windows.xml config/type.xml ImageMagick.spec Magick++/bin/Magick++-config MagickCore/ImageMagick.pc Magick++/lib/ImageMagick++.pc Magick++/lib/Magick++.pc MagickCore/MagickCore-config MagickCore/MagickCore.pc MagickCore/version.h Makefile magick.sh PerlMagick/Magick.pm PerlMagick/Makefile.PL PerlMagick/check.sh utilities/animate.1 utilities/compare.1 utilities/composite.1 utilities/conjure.1 utilities/convert.1 utilities/display.1 utilities/identify.1 utilities/ImageMagick.1 utilities/import.1 utilities/mogrify.1 utilities/montage.1 utilities/stream.1 MagickWand/MagickWand-config MagickWand/MagickWand.pc"
#
@@ -3582,7 +3582,7 @@
MAGICK_LIBRARY_VERSION_INFO=$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE
-MAGICK_SVN_REVISION=4677
+MAGICK_SVN_REVISION=4683
@@ -34017,7 +34017,7 @@
libtool_objdir=$objdir
# Linker search path to library, followed by -lMagickCore
- MAGICKCORE_PATH="${builddir}/magick/${libtool_objdir}"
+ MAGICKCORE_PATH="${builddir}/MagickCore/${libtool_objdir}"
fi
@@ -35009,7 +35009,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by ImageMagick $as_me 6.7.1, which was
+This file was extended by ImageMagick $as_me 7.0.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -35075,7 +35075,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-ImageMagick config.status 6.7.1
+ImageMagick config.status 7.0.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
@@ -35585,7 +35585,7 @@
do
case $ac_config_target in
"config/config.h") CONFIG_HEADERS="$CONFIG_HEADERS config/config.h" ;;
- "magick/magick-config.h") CONFIG_COMMANDS="$CONFIG_COMMANDS magick/magick-config.h" ;;
+ "MagickCore/magick-config.h") CONFIG_COMMANDS="$CONFIG_COMMANDS MagickCore/magick-config.h" ;;
"config/configure.xml") CONFIG_FILES="$CONFIG_FILES config/configure.xml" ;;
"config/delegates.xml") CONFIG_FILES="$CONFIG_FILES config/delegates.xml" ;;
"config/ImageMagick.rdf") CONFIG_FILES="$CONFIG_FILES config/ImageMagick.rdf" ;;
@@ -35597,13 +35597,12 @@
"config/type.xml") CONFIG_FILES="$CONFIG_FILES config/type.xml" ;;
"ImageMagick.spec") CONFIG_FILES="$CONFIG_FILES ImageMagick.spec" ;;
"Magick++/bin/Magick++-config") CONFIG_FILES="$CONFIG_FILES Magick++/bin/Magick++-config" ;;
- "magick/ImageMagick.pc") CONFIG_FILES="$CONFIG_FILES magick/ImageMagick.pc" ;;
+ "MagickCore/ImageMagick.pc") CONFIG_FILES="$CONFIG_FILES MagickCore/ImageMagick.pc" ;;
"Magick++/lib/ImageMagick++.pc") CONFIG_FILES="$CONFIG_FILES Magick++/lib/ImageMagick++.pc" ;;
"Magick++/lib/Magick++.pc") CONFIG_FILES="$CONFIG_FILES Magick++/lib/Magick++.pc" ;;
- "magick/Magick-config") CONFIG_FILES="$CONFIG_FILES magick/Magick-config" ;;
- "magick/MagickCore-config") CONFIG_FILES="$CONFIG_FILES magick/MagickCore-config" ;;
- "magick/MagickCore.pc") CONFIG_FILES="$CONFIG_FILES magick/MagickCore.pc" ;;
- "magick/version.h") CONFIG_FILES="$CONFIG_FILES magick/version.h" ;;
+ "MagickCore/MagickCore-config") CONFIG_FILES="$CONFIG_FILES MagickCore/MagickCore-config" ;;
+ "MagickCore/MagickCore.pc") CONFIG_FILES="$CONFIG_FILES MagickCore/MagickCore.pc" ;;
+ "MagickCore/version.h") CONFIG_FILES="$CONFIG_FILES MagickCore/version.h" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"magick.sh") CONFIG_FILES="$CONFIG_FILES magick.sh" ;;
"PerlMagick/Magick.pm") CONFIG_FILES="$CONFIG_FILES PerlMagick/Magick.pm" ;;
@@ -35621,10 +35620,8 @@
"utilities/mogrify.1") CONFIG_FILES="$CONFIG_FILES utilities/mogrify.1" ;;
"utilities/montage.1") CONFIG_FILES="$CONFIG_FILES utilities/montage.1" ;;
"utilities/stream.1") CONFIG_FILES="$CONFIG_FILES utilities/stream.1" ;;
- "wand/MagickWand-config") CONFIG_FILES="$CONFIG_FILES wand/MagickWand-config" ;;
- "wand/MagickWand.pc") CONFIG_FILES="$CONFIG_FILES wand/MagickWand.pc" ;;
- "wand/Wand-config") CONFIG_FILES="$CONFIG_FILES wand/Wand-config" ;;
- "wand/Wand.pc") CONFIG_FILES="$CONFIG_FILES wand/Wand.pc" ;;
+ "MagickWand/MagickWand-config") CONFIG_FILES="$CONFIG_FILES MagickWand/MagickWand-config" ;;
+ "MagickWand/MagickWand.pc") CONFIG_FILES="$CONFIG_FILES MagickWand/MagickWand.pc" ;;
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
"default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
@@ -36229,7 +36226,7 @@
case $ac_file$ac_mode in
- "magick/magick-config.h":C) ac_prefix_conf_OUT=`echo magick/magick-config.h`
+ "MagickCore/magick-config.h":C) ac_prefix_conf_OUT=`echo MagickCore/magick-config.h`
ac_prefix_conf_DEF=`echo _$ac_prefix_conf_OUT | sed -e "y:abcdefghijklmnopqrstuvwxyz:ABCDEFGHIJKLMNOPQRSTUVWXYZ:" -e "s/[^abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ]/_/g"`
ac_prefix_conf_PKG=`echo MagickCore`
ac_prefix_conf_LOW=`echo _$ac_prefix_conf_PKG | sed -e "y:ABCDEFGHIJKLMNOPQRSTUVWXYZ-:abcdefghijklmnopqrstuvwxyz_:"`
@@ -37219,10 +37216,10 @@
_LT_EOF
;;
- "MagickCore-config.in":C) chmod +x magick/MagickCore-config ;;
- "Magick-config.in":C) chmod +x magick/Magick-config ;;
- "MagickWand-config.in":C) chmod +x wand/MagickWand-config ;;
- "Wand-config.in":C) chmod +x wand/Wand-config ;;
+ "MagickCore-config.in":C) chmod +x MagickCore/MagickCore-config ;;
+ "Magick-config.in":C) chmod +x MagickCore/Magick-config ;;
+ "MagickWand-config.in":C) chmod +x MagickWand/MagickWand-config ;;
+ "Wand-config.in":C) chmod +x MagickWand/Wand-config ;;
"Magick++-config.in":C) chmod +x Magick++/bin/Magick++-config ;;
"PerlMagick/check.sh.in":C) chmod +x PerlMagick/check.sh ;;
diff --git a/configure.ac b/configure.ac
index deb6715..4f04fe1 100755
--- a/configure.ac
+++ b/configure.ac
@@ -16,20 +16,20 @@
AC_PREREQ(2.64)
-m4_define([magick_major_version], [6])
-m4_define([magick_minor_version], [7])
-m4_define([magick_micro_version], [1])
+m4_define([magick_major_version], [7])
+m4_define([magick_minor_version], [0])
+m4_define([magick_micro_version], [0])
m4_define([magick_version],
[magick_major_version.magick_minor_version.magick_micro_version])
m4_define([magick_svn_revision], esyscmd([sh -c "svnversion | sed -r 's/([0-9]+).*/\1/'"]))
AC_INIT([ImageMagick],[magick_version],[http://www.imagemagick.org],[ImageMagick-magick_version])
-AC_CONFIG_SRCDIR([magick/MagickCore.h])
+AC_CONFIG_SRCDIR([MagickCore/MagickCore.h])
AC_CONFIG_AUX_DIR([config])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_LIBOBJ_DIR([ltdl])
AC_CONFIG_HEADERS([config/config.h])
-AX_PREFIX_CONFIG_H([magick/magick-config.h],[MagickCore])
+AX_PREFIX_CONFIG_H([MagickCore/magick-config.h],[MagickCore])
AC_CONFIG_FILES([\
config/configure.xml \
config/delegates.xml \
@@ -42,13 +42,12 @@
config/type.xml \
ImageMagick.spec \
Magick++/bin/Magick++-config \
- magick/ImageMagick.pc \
+ MagickCore/ImageMagick.pc \
Magick++/lib/ImageMagick++.pc \
Magick++/lib/Magick++.pc \
- magick/Magick-config \
- magick/MagickCore-config \
- magick/MagickCore.pc \
- magick/version.h \
+ MagickCore/MagickCore-config \
+ MagickCore/MagickCore.pc \
+ MagickCore/version.h \
Makefile \
magick.sh \
PerlMagick/Magick.pm \
@@ -66,10 +65,8 @@
utilities/mogrify.1 \
utilities/montage.1 \
utilities/stream.1 \
- wand/MagickWand-config \
- wand/MagickWand.pc \
- wand/Wand-config \
- wand/Wand.pc ])
+ MagickWand/MagickWand-config \
+ MagickWand/MagickWand.pc ])
#
# Save initial user-tunable values
@@ -3402,7 +3399,7 @@
libtool_objdir=$objdir
# Linker search path to library, followed by -lMagickCore
- MAGICKCORE_PATH="${builddir}/magick/${libtool_objdir}"
+ MAGICKCORE_PATH="${builddir}/MagickCore/${libtool_objdir}"
fi
AC_SUBST(MAGICKCORE_PATH)
@@ -3548,10 +3545,10 @@
# Set configured scripts to executable.
AC_CONFIG_COMMANDS([default],[],[])
-AC_CONFIG_COMMANDS([MagickCore-config.in],[chmod +x magick/MagickCore-config])
-AC_CONFIG_COMMANDS([Magick-config.in],[chmod +x magick/Magick-config])
-AC_CONFIG_COMMANDS([MagickWand-config.in],[chmod +x wand/MagickWand-config])
-AC_CONFIG_COMMANDS([Wand-config.in],[chmod +x wand/Wand-config])
+AC_CONFIG_COMMANDS([MagickCore-config.in],[chmod +x MagickCore/MagickCore-config])
+AC_CONFIG_COMMANDS([Magick-config.in],[chmod +x MagickCore/Magick-config])
+AC_CONFIG_COMMANDS([MagickWand-config.in],[chmod +x MagickWand/MagickWand-config])
+AC_CONFIG_COMMANDS([Wand-config.in],[chmod +x MagickWand/Wand-config])
AC_CONFIG_COMMANDS([Magick++-config.in],[chmod +x Magick++/bin/Magick++-config])
AC_CONFIG_COMMANDS([PerlMagick/check.sh.in],[chmod +x PerlMagick/check.sh])
diff --git a/magick/Magick-config.in b/magick/Magick-config.in
deleted file mode 100644
index 8c08bf0..0000000
--- a/magick/Magick-config.in
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/sh
-#
-# Configure options script for re-calling MagickCore compilation options
-# required to use the MagickCore library.
-#
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@/ImageMagick
-
-usage="\
-Usage: Magick-config [--cflags] [--cppflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version]"
-
-if test $# -eq 0; then
- echo "${usage}" 1>&2
- echo "Example: gcc \`Magick-config --cflags --cppflags\` -o core core.c \`Magick-config --ldflags --libs\`" 1>&2
- exit 1
-fi
-
-while test $# -gt 0; do
- case "$1" in
- -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
- *) optarg= ;;
- esac
- case $1 in
- --prefix=*)
- prefix=$optarg
- ;;
- --prefix)
- echo $prefix
- ;;
- --exec-prefix=*)
- exec_prefix=$optarg
- ;;
- --exec-prefix)
- echo $exec_prefix
- ;;
- --version)
- echo '@PACKAGE_VERSION@ Q@QUANTUM_DEPTH@ @MAGICK_HDRI@'
- ;;
- --cflags)
- echo "-I${includedir} @MAGICK_PCFLAGS@"
- ;;
- --cxxflags)
- echo '@MAGICK_CXXFLAGS@'
- ;;
- --cppflags)
- echo '@MAGICK_CPPFLAGS@'
- ;;
- --ldflags)
- echo '@MAGICK_LDFLAGS@'
- ;;
- --libs)
- echo "-L${libdir} @MAGICK_LIBS@"
- ;;
- *)
- echo "${usage}" 1>&2
- exit 1
- ;;
- esac
- shift
-done
diff --git a/magick/MagickCore.h b/magick/MagickCore.h
deleted file mode 100644
index e44bb67..0000000
--- a/magick/MagickCore.h
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization
- dedicated to making software imaging solutions freely available.
-
- You may not use this file except in compliance with the License.
- obtain a copy of the License at
-
- http://www.imagemagick.org/script/license.php
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- MagickCore Application Programming Interface declarations.
-*/
-
-#ifndef _MAGICKCORE_CORE_H
-#define _MAGICKCORE_CORE_H
-
-#if defined(__cplusplus) || defined(c_plusplus)
-extern "C" {
-#endif
-
-#if !defined(_MAGICKCORE_CONFIG_H)
-# define _MAGICKCORE_CONFIG_H
-# if !defined(vms) && !defined(macintosh)
-# include "magick/magick-config.h"
-# else
-# include "magick-config.h"
-# endif
-#if defined(_magickcore_const) && !defined(const)
-# define const _magickcore_const
-#endif
-#if defined(_magickcore_inline) && !defined(inline)
-# define inline _magickcore_inline
-#endif
-#if defined(_magickcore_restrict) && !defined(restrict)
-# define restrict _magickcore_restrict
-#endif
-# if defined(__cplusplus) || defined(c_plusplus)
-# undef inline
-# endif
-#endif
-
-#include <stdio.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <sys/types.h>
-
-#if defined(WIN32) || defined(WIN64)
-# define MAGICKCORE_WINDOWS_SUPPORT
-#else
-# define MAGICKCORE_POSIX_SUPPORT
-#endif
-
-#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(__CYGWIN__) && !defined(__MINGW32__)
-# if defined(_MT) && defined(_DLL) && !defined(_MAGICKDLL_) && !defined(_LIB) && !defined(MAGICK_STATIC_LINK)
-# define _MAGICKDLL_
-# endif
-# if defined(_MAGICKDLL_)
-# if defined(_VISUALC_)
-# pragma warning( disable: 4273 ) /* Disable the dll linkage warnings */
-# endif
-# if !defined(_MAGICKLIB_)
-# define MagickExport __declspec(dllimport)
-# if defined(_VISUALC_)
-# pragma message( "Magick lib DLL import interface" )
-# endif
-# else
-# define MagickExport __declspec(dllexport)
-# if defined(_VISUALC_)
-# pragma message( "Magick lib DLL export interface" )
-# endif
-# endif
-# else
-# define MagickExport
-# if defined(_VISUALC_)
-# pragma message( "Magick lib static interface" )
-# endif
-# endif
-
-# if defined(_DLL) && !defined(_LIB)
-# define ModuleExport __declspec(dllexport)
-# if defined(_VISUALC_)
-# pragma message( "Magick module DLL export interface" )
-# endif
-# else
-# define ModuleExport
-# if defined(_VISUALC_)
-# pragma message( "Magick module static interface" )
-# endif
-
-# endif
-# define MagickGlobal __declspec(thread)
-# if defined(_VISUALC_)
-# pragma warning(disable : 4018)
-# pragma warning(disable : 4244)
-# pragma warning(disable : 4142)
-# pragma warning(disable : 4800)
-# pragma warning(disable : 4786)
-# pragma warning(disable : 4996)
-# endif
-#else
-# define MagickExport
-# define ModuleExport
-# define MagickGlobal
-#endif
-
-#if !defined(MaxTextExtent)
-# define MaxTextExtent 4096
-#endif
-#define MagickSignature 0xabacadabUL
-
-#if !defined(magick_attribute)
-# if !defined(__GNUC__)
-# define magick_attribute(x) /* nothing */
-# else
-# define magick_attribute __attribute__
-# endif
-#endif
-
-#if defined(MAGICKCORE_NAMESPACE_PREFIX)
-# include "magick/methods.h"
-#endif
-#include "magick/magick-type.h"
-#include "magick/accelerate.h"
-#include "magick/animate.h"
-#include "magick/annotate.h"
-#include "magick/artifact.h"
-#include "magick/attribute.h"
-#include "magick/blob.h"
-#include "magick/cache.h"
-#include "magick/cache-view.h"
-#include "magick/cipher.h"
-#include "magick/client.h"
-#include "magick/coder.h"
-#include "magick/color.h"
-#include "magick/colorspace.h"
-#include "magick/colormap.h"
-#include "magick/compare.h"
-#include "magick/composite.h"
-#include "magick/compress.h"
-#include "magick/configure.h"
-#include "magick/constitute.h"
-#include "magick/decorate.h"
-#include "magick/delegate.h"
-#include "magick/deprecate.h"
-#include "magick/display.h"
-#include "magick/distort.h"
-#include "magick/draw.h"
-#include "magick/effect.h"
-#include "magick/enhance.h"
-#include "magick/exception.h"
-#include "magick/feature.h"
-#include "magick/fourier.h"
-#include "magick/fx.h"
-#include "magick/gem.h"
-#include "magick/geometry.h"
-#include "magick/hashmap.h"
-#include "magick/histogram.h"
-#include "magick/identify.h"
-#include "magick/image.h"
-#include "magick/image-view.h"
-#include "magick/layer.h"
-#include "magick/list.h"
-#include "magick/locale_.h"
-#include "magick/log.h"
-#include "magick/magic.h"
-#include "magick/magick.h"
-#include "magick/matrix.h"
-#include "magick/memory_.h"
-#include "magick/module.h"
-#include "magick/mime.h"
-#include "magick/monitor.h"
-#include "magick/montage.h"
-#include "magick/morphology.h"
-#include "magick/option.h"
-#include "magick/paint.h"
-#include "magick/pixel.h"
-#include "magick/policy.h"
-#include "magick/prepress.h"
-#include "magick/profile.h"
-#include "magick/property.h"
-#include "magick/quantize.h"
-#include "magick/quantum.h"
-#include "magick/registry.h"
-#include "magick/random_.h"
-#include "magick/resample.h"
-#include "magick/resize.h"
-#include "magick/resource_.h"
-#include "magick/segment.h"
-#include "magick/shear.h"
-#include "magick/signature.h"
-#include "magick/splay-tree.h"
-#include "magick/stream.h"
-#include "magick/statistic.h"
-#include "magick/string_.h"
-#include "magick/timer.h"
-#include "magick/token.h"
-#include "magick/transform.h"
-#include "magick/threshold.h"
-#include "magick/type.h"
-#include "magick/utility.h"
-#include "magick/version.h"
-#include "magick/xml-tree.h"
-#include "magick/xwindow.h"
-
-#if defined(__cplusplus) || defined(c_plusplus)
-}
-#endif
-
-#endif
diff --git a/magick/Makefile.am b/magick/Makefile.am
deleted file mode 100644
index 6abc3cc..0000000
--- a/magick/Makefile.am
+++ /dev/null
@@ -1,436 +0,0 @@
-# Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization
-# dedicated to making software imaging solutions freely available.
-#
-# You may not use this file except in compliance with the License. You may
-# obtain a copy of the License at
-#
-# http://www.imagemagick.org/script/license.php
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# Makefile for building the MagickCore API.
-#
-
-magickincdir = $(topincludedir)/magick
-
-# Headers which are installed
-magickinc_HEADERS = \
- $(MAGICK_INCLUDE_HDRS)
-
-MAGICK_BIN_SCRPTS = \
- magick/Magick-config \
- magick/MagickCore-config
-
-MAGICK_PKGCONFIG = \
- magick/ImageMagick.pc \
- magick/MagickCore.pc
-
-OSX_GCOV_LDFLAG = @OSX_GCOV_LDFLAG@
-
-MAGICK_MANS = \
- magick/Magick-config.1 \
- magick/MagickCore-config.1
-
-MAGICKCORE_LIBS = magick/libMagickCore.la
-
-if WITH_MODULES
-magick_libMagickCore_la_SOURCES = $(MAGICK_BASE_SRCS) $(MAGICK_PLATFORM_SRCS)
-magick_libMagickCore_la_LIBADD = $(MAGICK_DEP_LIBS) $(MAGICK_LIBLTDL)
-else
-magick_libMagickCore_la_SOURCES = $(MAGICK_BASE_SRCS) $(MAGICK_PLATFORM_SRCS) $(MAGICK_CODER_SRCS) $(MAGICK_FILTER_SRCS)
-magick_libMagickCore_la_LIBADD = $(MAGICK_DEP_LIBS) $(MAGICK_LIBLTDL)
-endif # WITH_MODULES
-magick_libMagickCore_la_CPPFLAGS = -I$(top_builddir)/ltdl -I$(top_srcdir)/ltdl $(LIBRARY_EXTRA_CPPFLAGS)
-magick_libMagickCore_la_LDFLAGS = -no-undefined -export-symbols-regex ".*" \
- $(OSX_GCOV_LDFLAG) -version-info \
- $(MAGICK_LIBRARY_CURRENT):$(MAGICK_LIBRARY_REVISION):$(MAGICK_LIBRARY_AGE)
-magick_libMagickCore_la_DEPENDENCIES = $(MAGICK_LTDLDEPS)
-
-# Library base sources
-MAGICK_BASE_SRCS = \
- magick/ImageMagick.h \
- magick/MagickCore.h \
- magick/accelerate.c \
- magick/accelerate.h \
- magick/animate.c \
- magick/animate.h \
- magick/animate-private.h \
- magick/annotate.c \
- magick/annotate.h \
- magick/api.h \
- magick/artifact.c \
- magick/artifact.h \
- magick/attribute.c \
- magick/attribute.h \
- magick/blob.c \
- magick/blob.h \
- magick/blob-private.h \
- magick/cache.c \
- magick/cache.h \
- magick/cache-private.h \
- magick/cache-view.c \
- magick/cache-view.h \
- magick/cipher.c \
- magick/cipher.h \
- magick/client.c \
- magick/client.h \
- magick/coder.c \
- magick/coder.h \
- magick/color.c \
- magick/color.h \
- magick/color-private.h \
- magick/colormap.c \
- magick/colormap.h \
- magick/colormap-private.h \
- magick/colorspace.c \
- magick/colorspace.h \
- magick/colorspace-private.h \
- magick/compare.c \
- magick/compare.h \
- magick/composite.c \
- magick/composite.h \
- magick/composite-private.h \
- magick/compress.c \
- magick/compress.h \
- magick/configure.c \
- magick/configure.h \
- magick/constitute.c \
- magick/constitute.h \
- magick/decorate.c \
- magick/decorate.h \
- magick/delegate.c \
- magick/delegate.h \
- magick/delegate-private.h \
- magick/deprecate.c \
- magick/deprecate.h \
- magick/display.c \
- magick/display.h \
- magick/display-private.h \
- magick/distort.c \
- magick/distort.h \
- magick/draw.c \
- magick/draw.h \
- magick/draw-private.h \
- magick/effect.c \
- magick/effect.h \
- magick/enhance.c \
- magick/enhance.h \
- magick/exception.c \
- magick/exception.h \
- magick/exception-private.h \
- magick/feature.c \
- magick/feature.h \
- magick/fourier.c \
- magick/fourier.h \
- magick/fx.c \
- magick/fx.h \
- magick/fx-private.h \
- magick/gem.c \
- magick/gem.h \
- magick/geometry.c \
- magick/geometry.h \
- magick/hashmap.c \
- magick/hashmap.h \
- magick/histogram.c \
- magick/histogram.h \
- magick/identify.c \
- magick/identify.h \
- magick/image.c \
- magick/image.h \
- magick/image-private.h \
- magick/image-view.c \
- magick/image-view.h \
- magick/layer.c \
- magick/layer.h \
- magick/list.c \
- magick/list.h \
- magick/locale.c \
- magick/locale_.h \
- magick/log.c \
- magick/log.h \
- magick/mac.h \
- magick/magic.c \
- magick/magic.h \
- magick/magick.c \
- magick/magick-config.h \
- magick/magick-type.h \
- magick/magick.h \
- magick/matrix.c \
- magick/matrix.h \
- magick/memory.c \
- magick/memory_.h \
- magick/methods.h \
- magick/mime.c \
- magick/mime.h \
- magick/module.c \
- magick/module.h \
- magick/monitor.c \
- magick/monitor.h \
- magick/monitor-private.h \
- magick/montage.c \
- magick/montage.h \
- magick/morphology.c \
- magick/morphology.h \
- magick/morphology-private.h \
- magick/nt-base.h \
- magick/nt-feature.h \
- magick/option.c \
- magick/option.h \
- magick/paint.c \
- magick/paint.h \
- magick/pixel.c \
- magick/pixel.h \
- magick/pixel-private.h \
- magick/policy.c \
- magick/policy.h \
- magick/PreRvIcccm.c \
- magick/PreRvIcccm.h \
- magick/prepress.c \
- magick/prepress.h \
- magick/property.c \
- magick/property.h \
- magick/profile.c \
- magick/profile.h \
- magick/quantize.c \
- magick/quantize.h \
- magick/quantum.c \
- magick/quantum.h \
- magick/quantum-export.c \
- magick/quantum-import.c \
- magick/quantum-private.h \
- magick/random.c \
- magick/random_.h \
- magick/random-private.h \
- magick/registry.c \
- magick/registry.h \
- magick/resample.c \
- magick/resample.h \
- magick/resample-private.h \
- magick/resize.c \
- magick/resize.h \
- magick/resize-private.h \
- magick/resource.c \
- magick/resource_.h \
- magick/segment.c \
- magick/segment.h \
- magick/semaphore.c \
- magick/semaphore.h \
- magick/semaphore-private.h \
- magick/shear.c \
- magick/shear.h \
- magick/signature.c \
- magick/signature.h \
- magick/signature-private.h \
- magick/splay-tree.c \
- magick/splay-tree.h \
- magick/static.c \
- magick/static.h \
- magick/statistic.c \
- magick/statistic.h \
- magick/stream.c \
- magick/stream.h \
- magick/stream-private.h \
- magick/string.c \
- magick/string_.h \
- magick/string-private.h \
- magick/studio.h \
- magick/thread.c \
- magick/thread_.h \
- magick/thread-private.h \
- magick/timer.c \
- magick/timer.h \
- magick/token.c \
- magick/token.h \
- magick/token-private.h \
- magick/transform.c \
- magick/transform.h \
- magick/threshold.c \
- magick/threshold.h \
- magick/type.c \
- magick/type.h \
- magick/utility.c \
- magick/utility.h \
- magick/version.c \
- magick/version.h \
- magick/vms.h \
- magick/widget.c \
- magick/widget.h \
- magick/xml-tree.c \
- magick/xml-tree.h \
- magick/xwindow.c \
- magick/xwindow.h
-
-if WIN32_NATIVE_BUILD
-MAGICK_PLATFORM_SRCS = \
- magick/nt-base.c \
- magick/nt-base.h \
- magick/nt-feature.c \
- magick/nt-feature.h
-else
-if CYGWIN_BUILD
-MAGICK_PLATFORM_SRCS = \
- magick/nt-feature.c \
- magick/nt-feature.h
-else
-MAGICK_PLATFORM_SRCS =
-endif # if CYGWIN_BUILD
-endif # if WIN32_NATIVE_BUILD
-
-MAGICK_INCLUDE_HDRS = \
- magick/ImageMagick.h \
- magick/MagickCore.h \
- magick/PreRvIcccm.h \
- magick/accelerate.h \
- magick/animate.h \
- magick/annotate.h \
- magick/api.h \
- magick/artifact.h \
- magick/attribute.h \
- magick/blob.h \
- magick/cache.h \
- magick/cache-view.h \
- magick/cipher.h \
- magick/client.h \
- magick/coder.h \
- magick/color.h \
- magick/colormap.h \
- magick/colorspace.h \
- magick/compare.h \
- magick/composite.h \
- magick/compress.h \
- magick/configure.h \
- magick/constitute.h \
- magick/decorate.h \
- magick/delegate.h \
- magick/deprecate.h \
- magick/display.h \
- magick/distort.h \
- magick/draw.h \
- magick/effect.h \
- magick/enhance.h \
- magick/exception.h \
- magick/feature.h \
- magick/fourier.h \
- magick/fx.h \
- magick/gem.h \
- magick/geometry.h \
- magick/hashmap.h \
- magick/histogram.h \
- magick/identify.h \
- magick/image.h \
- magick/image-view.h \
- magick/layer.h \
- magick/list.h \
- magick/locale_.h \
- magick/log.h \
- magick/magic.h \
- magick/magick.h \
- magick/magick-config.h \
- magick/magick-type.h \
- magick/matrix.h \
- magick/memory_.h \
- magick/methods.h \
- magick/mime.h \
- magick/module.h \
- magick/monitor.h \
- magick/montage.h \
- magick/morphology.h \
- magick/option.h \
- magick/paint.h \
- magick/pixel.h \
- magick/policy.h \
- magick/prepress.h \
- magick/profile.h \
- magick/property.h \
- magick/quantize.h \
- magick/quantum.h \
- magick/random_.h \
- magick/registry.h \
- magick/resample.h \
- magick/resize.h \
- magick/resource_.h \
- magick/segment.h \
- magick/semaphore.h \
- magick/shear.h \
- magick/signature.h \
- magick/splay-tree.h \
- magick/statistic.h \
- magick/stream.h \
- magick/string_.h \
- magick/timer.h \
- magick/token.h \
- magick/transform.h \
- magick/threshold.h \
- magick/type.h \
- magick/utility.h \
- magick/version.h \
- magick/widget.h \
- magick/xml-tree.h \
- magick/xwindow.h
-
-MAGICK_NOINST_HDRS = \
- magick/animate-private.h \
- magick/blob-private.h \
- magick/cache-private.h \
- magick/color-private.h \
- magick/colormap-private.h \
- magick/colorspace-private.h \
- magick/composite-private.h \
- magick/delegate-private.h \
- magick/display-private.h \
- magick/draw-private.h \
- magick/exception-private.h \
- magick/fx-private.h \
- magick/image-private.h \
- magick/mac.h \
- magick/mime-private.h \
- magick/monitor-private.h \
- magick/morphology-private.h \
- magick/nt-base.h \
- magick/nt-feature.h \
- magick/pixel-private.h \
- magick/quantum-private.h \
- magick/random-private.h \
- magick/resample-private.h \
- magick/resize-private.h \
- magick/semaphore-private.h \
- magick/signature-private.h \
- magick/static.h \
- magick/stream-private.h \
- magick/string-private.h \
- magick/studio.h \
- magick/thread_.h \
- magick/thread-private.h \
- magick/token-private.h \
- magick/xwindow-private.h \
- magick/vms.h
-
-MAGICK_EXTRA_DIST = \
- magick/Magick-config.in \
- magick/MagickCore-config.in \
- $(MAGICK_MANS) \
- magick/ImageMagick.pc.in \
- magick/MagickCore.pc.in \
- magick/Make.com \
- magick/config.h_vms \
- magick/mac.c \
- magick/nt-base.c \
- magick/nt-feature.c \
- magick/vms.c \
- magick/xwdfile.h_vms
-
-# Install magick-config.h
-MAGICK_INSTALL_DATA_LOCAL_TARGETS = magick-install-data-local
-magick-install-data-local:
- $(mkinstalldirs) $(DESTDIR)$(magickincdir)
- $(INSTALL_HEADER) magick/magick-config.h $(DESTDIR)$(magickincdir)/magick-config.h
-
-# Uninstall magick-config.h
-MAGICK_UNINSTALL_LOCAL_TARGETS = magick-uninstall-local
-magick-uninstall-local:
- rm -f $(DESTDIR)$(magickincdir)/magick-config.h
-
diff --git a/magick/color-private.h b/magick/color-private.h
deleted file mode 100644
index 77482ae..0000000
--- a/magick/color-private.h
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization
- dedicated to making software imaging solutions freely available.
-
- You may not use this file except in compliance with the License.
- obtain a copy of the License at
-
- http://www.imagemagick.org/script/license.php
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- MagickCore image color methods.
-*/
-#ifndef _MAGICKCORE_COLOR_PRIVATE_H
-#define _MAGICKCORE_COLOR_PRIVATE_H
-
-#if defined(__cplusplus) || defined(c_plusplus)
-extern "C" {
-#endif
-
-#include <magick/image.h>
-#include <magick/color.h>
-#include <magick/exception-private.h>
-
-static inline MagickBooleanType IsColorEqual(const PixelPacket *p,
- const PixelPacket *q)
-{
- if ((GetPixelRed(p) == GetPixelRed(q)) &&
- (GetPixelGreen(p) == GetPixelGreen(q)) &&
- (GetPixelBlue(p) == GetPixelBlue(q)))
- return(MagickTrue);
- return(MagickFalse);
-}
-
-static inline MagickBooleanType IsGray(const PixelPacket *pixel)
-{
- if ((GetPixelRed(pixel) == GetPixelGreen(pixel)) &&
- (GetPixelGreen(pixel) == GetPixelBlue(pixel)))
- return(MagickTrue);
- return(MagickFalse);
-}
-
-static inline MagickBooleanType IsMagickColorEqual(const MagickPixelPacket *p,
- const MagickPixelPacket *q)
-{
-#if !defined(MAGICKCORE_HDRI_SUPPORT)
- if ((p->matte != MagickFalse) && (q->matte == MagickFalse) &&
- (p->opacity != OpaqueOpacity))
- return(MagickFalse);
- if ((q->matte != MagickFalse) && (p->matte == MagickFalse) &&
- (q->opacity != OpaqueOpacity))
- return(MagickFalse);
- if ((p->matte != MagickFalse) && (q->matte != MagickFalse))
- {
- if (p->opacity != q->opacity)
- return(MagickFalse);
- if (p->opacity == TransparentOpacity)
- return(MagickTrue);
- }
- if (p->red != q->red)
- return(MagickFalse);
- if (p->green != q->green)
- return(MagickFalse);
- if (p->blue != q->blue)
- return(MagickFalse);
- if ((p->colorspace == CMYKColorspace) && (p->index != q->index))
- return(MagickFalse);
-#else
- if ((p->matte != MagickFalse) && (q->matte == MagickFalse) &&
- (fabs(p->opacity-OpaqueOpacity) > 0.5))
- return(MagickFalse);
- if ((q->matte != MagickFalse) && (p->matte == MagickFalse) &&
- (fabs(q->opacity-OpaqueOpacity)) > 0.5)
- return(MagickFalse);
- if ((p->matte != MagickFalse) && (q->matte != MagickFalse))
- {
- if (fabs(p->opacity-q->opacity) > 0.5)
- return(MagickFalse);
- if (fabs(p->opacity-TransparentOpacity) <= 0.5)
- return(MagickTrue);
- }
- if (fabs(p->red-q->red) > 0.5)
- return(MagickFalse);
- if (fabs(p->green-q->green) > 0.5)
- return(MagickFalse);
- if (fabs(p->blue-q->blue) > 0.5)
- return(MagickFalse);
- if ((p->colorspace == CMYKColorspace) && (fabs(p->index-q->index) > 0.5))
- return(MagickFalse);
-#endif
- return(MagickTrue);
-}
-
-static inline MagickBooleanType IsMagickGray(const MagickPixelPacket *pixel)
-{
- if (pixel->colorspace != RGBColorspace)
- return(MagickFalse);
- if ((pixel->red == pixel->green) && (pixel->green == pixel->blue))
- return(MagickTrue);
- return(MagickFalse);
-}
-
-static inline MagickRealType MagickPixelIntensity(
- const MagickPixelPacket *pixel)
-{
- return((MagickRealType) (0.299*pixel->red+0.587*pixel->green+0.114*pixel->blue));
-}
-
-static inline Quantum MagickPixelIntensityToQuantum(
- const MagickPixelPacket *pixel)
-{
-#if !defined(MAGICKCORE_HDRI_SUPPORT)
- return((Quantum) (0.299*pixel->red+0.587*pixel->green+0.114*pixel->blue+0.5));
-#else
- return((Quantum) (0.299*pixel->red+0.587*pixel->green+0.114*pixel->blue));
-#endif
-}
-
-static inline MagickRealType MagickPixelLuminance(
- const MagickPixelPacket *pixel)
-{
- MagickRealType
- luminance;
-
- luminance=0.21267*pixel->red+0.71516*pixel->green+0.07217*pixel->blue;
- return(luminance);
-}
-
-static inline MagickRealType PixelIntensity(const PixelPacket *pixel)
-{
- MagickRealType
- intensity;
-
- if ((GetPixelRed(pixel) == GetPixelGreen(pixel)) &&
- (GetPixelGreen(pixel) == GetPixelBlue(pixel)))
- return((MagickRealType) pixel->red);
- intensity=(MagickRealType) (0.299*GetPixelRed(pixel)+0.587*
- GetPixelGreen(pixel)+0.114*GetPixelBlue(pixel));
- return(intensity);
-}
-
-static inline Quantum PixelIntensityToQuantum(const PixelPacket *pixel)
-{
-#if !defined(MAGICKCORE_HDRI_SUPPORT)
- if ((GetPixelRed(pixel) == GetPixelGreen(pixel)) &&
- (GetPixelGreen(pixel) == GetPixelBlue(pixel)))
- return(GetPixelRed(pixel));
- return((Quantum) (0.299*GetPixelRed(pixel)+0.587*
- GetPixelGreen(pixel)+0.114*GetPixelBlue(pixel)+0.5));
-#else
- {
- double
- alpha,
- beta;
-
- alpha=GetPixelRed(pixel)-GetPixelGreen(pixel);
- beta=GetPixelGreen(pixel)-GetPixelBlue(pixel);
- if ((fabs(alpha) <= MagickEpsilon) && (fabs(beta) <= MagickEpsilon))
- return(GetPixelRed(pixel));
- return((Quantum) (0.299*GetPixelRed(pixel)+0.587*
- GetPixelGreen(pixel)+0.114*GetPixelBlue(pixel)));
- }
-#endif
-}
-
-#if defined(__cplusplus) || defined(c_plusplus)
-}
-#endif
-
-#endif
diff --git a/magick/composite-private.h b/magick/composite-private.h
deleted file mode 100644
index abe108d..0000000
--- a/magick/composite-private.h
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
- Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization
- dedicated to making software imaging solutions freely available.
-
- You may not use this file except in compliance with the License.
- obtain a copy of the License at
-
- http://www.imagemagick.org/script/license.php
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- MagickCore image composite private methods.
-*/
-#ifndef _MAGICKCORE_COMPOSITE_PRIVATE_H
-#define _MAGICKCORE_COMPOSITE_PRIVATE_H
-
-#if defined(__cplusplus) || defined(c_plusplus)
-extern "C" {
-#endif
-
-/*
- ImageMagick Alpha Composite Inline Methods (special export)
-*/
-
-#include "magick/color.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-
-static inline MagickRealType RoundToUnity(const MagickRealType value)
-{
- return(value < 0.0 ? 0.0 : (value > 1.0) ? 1.0 : value);
-}
-
-static inline MagickRealType MagickOver_(const MagickRealType p,
- const MagickRealType alpha,const MagickRealType q,const MagickRealType beta)
-{
- return((1.0-QuantumScale*alpha)*p+(1.0-QuantumScale*beta)*q*
- QuantumScale*alpha);
-}
-
-static inline void MagickCompositeOver(const PixelPacket *p,
- const MagickRealType alpha,const PixelPacket *q,const MagickRealType beta,
- PixelPacket *composite)
-{
- MagickRealType
- gamma;
-
- /*
- Compose pixel p over pixel q with the given opacities.
- */
- if (alpha == TransparentOpacity)
- {
- if (composite != q)
- *composite=(*q);
- return;
- }
- gamma=1.0-QuantumScale*QuantumScale*alpha*beta;
-#if !defined(MAGICKCORE_HDRI_SUPPORT)
- composite->opacity=(Quantum) (QuantumRange*(1.0-gamma)+0.5);
- gamma=1.0/(gamma <= MagickEpsilon ? 1.0 : gamma);
- SetPixelRed(composite,gamma*MagickOver_((MagickRealType)
- GetPixelRed(p),alpha,(MagickRealType)
- GetPixelRed(q),beta)+0.5);
- SetPixelGreen(composite,gamma*MagickOver_((MagickRealType)
- GetPixelGreen(p),alpha,(MagickRealType)
- GetPixelGreen(q),beta)+0.5);
- SetPixelBlue(composite,gamma*MagickOver_((MagickRealType)
- GetPixelBlue(p),alpha,(MagickRealType)
- GetPixelBlue(q),beta)+0.5);
-#else
- SetPixelOpacity(composite,QuantumRange*(1.0-gamma));
- gamma=1.0/(gamma <= MagickEpsilon ? 1.0 : gamma);
- SetPixelRed(composite,gamma*MagickOver_((MagickRealType)
- GetPixelRed(p),alpha,(MagickRealType)
- GetPixelRed(q),beta));
- SetPixelGreen(composite,gamma*MagickOver_((MagickRealType)
- GetPixelGreen(p),alpha,(MagickRealType)
- GetPixelGreen(q),beta));
- SetPixelBlue(composite,gamma*MagickOver_((MagickRealType)
- GetPixelBlue(p),alpha,(MagickRealType)
- GetPixelBlue(q),beta));
-#endif
-}
-
-static inline void MagickPixelCompositeOver(const MagickPixelPacket *p,
- const MagickRealType alpha,const MagickPixelPacket *q,
- const MagickRealType beta,MagickPixelPacket *composite)
-{
- MagickRealType
- gamma;
-
- /*
- Compose pixel p over pixel q with the given opacities.
- */
- if (alpha == OpaqueOpacity)
- {
- *composite=(*p);
- return;
- }
- gamma=1.0-QuantumScale*QuantumScale*alpha*beta;
- composite->opacity=(MagickRealType) QuantumRange*(1.0-gamma);
- gamma=1.0/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma);
- composite->red=gamma*MagickOver_(p->red,alpha,q->red,beta);
- composite->green=gamma*MagickOver_(p->green,alpha,q->green,beta);
- composite->blue=gamma*MagickOver_(p->blue,alpha,q->blue,beta);
- if (q->colorspace == CMYKColorspace)
- composite->index=gamma*MagickOver_(p->index,alpha,q->index,beta);
-}
-
-static inline void MagickPixelCompositePlus(const MagickPixelPacket *p,
- const MagickRealType alpha,const MagickPixelPacket *q,
- const MagickRealType beta,MagickPixelPacket *composite)
-{
- MagickRealType
- Da,
- gamma,
- Sa;
-
- /*
- Add two pixels with the given opacities.
- */
- Sa=1.0-QuantumScale*alpha;
- Da=1.0-QuantumScale*beta;
- gamma=RoundToUnity(Sa+Da); /* 'Plus' blending -- not 'Over' blending */
- composite->opacity=(MagickRealType) QuantumRange*(1.0-gamma);
- gamma=1.0/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma);
- composite->red=gamma*(Sa*p->red+Da*q->red);
- composite->green=gamma*(Sa*p->green+Da*q->green);
- composite->blue=gamma*(Sa*p->blue+Da*q->blue);
- if (q->colorspace == CMYKColorspace)
- composite->index=gamma*(Sa*p->index+Da*q->index);
-}
-
-/*
- Blend pixel colors p and q by the amount given.
-*/
-static inline void MagickPixelCompositeBlend(const MagickPixelPacket *p,
- const MagickRealType alpha,const MagickPixelPacket *q,
- const MagickRealType beta,MagickPixelPacket *composite)
-{
- MagickPixelCompositePlus(p,(MagickRealType) (QuantumRange-alpha*
- (QuantumRange-p->opacity)),q,(MagickRealType) (QuantumRange-beta*
- (QuantumRange-q->opacity)),composite);
-}
-
-/*
- Blend pixel colors p and q by the amount given and area.
-*/
-static inline void MagickPixelCompositeAreaBlend(const MagickPixelPacket *p,
- const MagickRealType alpha,const MagickPixelPacket *q,
- const MagickRealType beta,const MagickRealType area,
- MagickPixelPacket *composite)
-{
- MagickPixelCompositePlus(p,(MagickRealType) QuantumRange-(1.0-area)*
- (QuantumRange-alpha),q,(MagickRealType) (QuantumRange-area*(QuantumRange-
- beta)),composite);
-}
-
-#if defined(__cplusplus) || defined(c_plusplus)
-}
-#endif
-
-#endif
diff --git a/magick/composite.c b/magick/composite.c
deleted file mode 100644
index bc08988..0000000
--- a/magick/composite.c
+++ /dev/null
@@ -1,2977 +0,0 @@
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% CCCC OOO M M PPPP OOO SSSSS IIIII TTTTT EEEEE %
-% C O O MM MM P P O O SS I T E %
-% C O O M M M PPPP O O SSS I T EEE %
-% C O O M M P O O SS I T E %
-% CCCC OOO M M P OOO SSSSS IIIII T EEEEE %
-% %
-% %
-% MagickCore Image Composite Methods %
-% %
-% Software Design %
-% John Cristy %
-% July 1992 %
-% %
-% %
-% Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization %
-% dedicated to making software imaging solutions freely available. %
-% %
-% You may not use this file except in compliance with the License. You may %
-% obtain a copy of the License at %
-% %
-% http://www.imagemagick.org/script/license.php %
-% %
-% Unless required by applicable law or agreed to in writing, software %
-% distributed under the License is distributed on an "AS IS" BASIS, %
-% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. %
-% See the License for the specific language governing permissions and %
-% limitations under the License. %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-%
-%
-*/
-
-/*
- Include declarations.
-*/
-#include "magick/studio.h"
-#include "magick/artifact.h"
-#include "magick/cache-view.h"
-#include "magick/client.h"
-#include "magick/color.h"
-#include "magick/color-private.h"
-#include "magick/colorspace.h"
-#include "magick/colorspace-private.h"
-#include "magick/composite.h"
-#include "magick/composite-private.h"
-#include "magick/constitute.h"
-#include "magick/draw.h"
-#include "magick/fx.h"
-#include "magick/gem.h"
-#include "magick/geometry.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/log.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/memory_.h"
-#include "magick/option.h"
-#include "magick/pixel-private.h"
-#include "magick/property.h"
-#include "magick/quantum.h"
-#include "magick/resample.h"
-#include "magick/resource_.h"
-#include "magick/string_.h"
-#include "magick/thread-private.h"
-#include "magick/utility.h"
-#include "magick/version.h"
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% C o m p o s i t e I m a g e C h a n n e l %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% CompositeImageChannel() returns the second image composited onto the first
-% at the specified offset, using the specified composite method.
-%
-% The format of the CompositeImageChannel method is:
-%
-% MagickBooleanType CompositeImage(Image *image,
-% const CompositeOperator compose,Image *composite_image,
-% const ssize_t x_offset,const ssize_t y_offset)
-% MagickBooleanType CompositeImageChannel(Image *image,
-% const ChannelType channel,const CompositeOperator compose,
-% Image *composite_image,const ssize_t x_offset,const ssize_t y_offset)
-%
-% A description of each parameter follows:
-%
-% o image: the destination image, modified by he composition
-%
-% o channel: the channel.
-%
-% o compose: This operator affects how the composite is applied to
-% the image. The operators and how they are utilized are listed here
-% http://www.w3.org/TR/SVG12/#compositing.
-%
-% o composite_image: the composite (source) image.
-%
-% o x_offset: the column offset of the composited image.
-%
-% o y_offset: the row offset of the composited image.
-%
-% Extra Controls from Image meta-data in 'composite_image' (artifacts)
-%
-% o "compose:args"
-% A string containing extra numerical arguments for specific compose
-% methods, generally expressed as a 'geometry' or a comma separated list
-% of numbers.
-%
-% Compose methods needing such arguments include "BlendCompositeOp" and
-% "DisplaceCompositeOp".
-%
-% o "compose:outside-overlay"
-% Modify how the composition is to effect areas not directly covered
-% by the 'composite_image' at the offset given. Normally this is
-% dependant on the 'compose' method, especially Duff-Porter methods.
-%
-% If set to "false" then disable all normal handling of pixels not
-% covered by the composite_image. Typically used for repeated tiling
-% of the composite_image by the calling API.
-%
-% Previous to IM v6.5.3-3 this was called "modify-outside-overlay"
-%
-*/
-
-static inline double MagickMin(const double x,const double y)
-{
- if (x < y)
- return(x);
- return(y);
-}
-static inline double MagickMax(const double x,const double y)
-{
- if (x > y)
- return(x);
- return(y);
-}
-
-/*
-** Programmers notes on SVG specification.
-**
-** A Composition is defined by...
-** Color Function : f(Sc,Dc) where Sc and Dc are the normizalized colors
-** Blending areas : X = 1 for area of overlap ie: f(Sc,Dc)
-** Y = 1 for source preserved
-** Z = 1 for destination preserved
-**
-** Conversion to transparency (then optimized)
-** Dca' = f(Sc, Dc)*Sa*Da + Y*Sca*(1-Da) + Z*Dca*(1-Sa)
-** Da' = X*Sa*Da + Y*Sa*(1-Da) + Z*Da*(1-Sa)
-**
-** Where...
-** Sca = Sc*Sa normalized Source color divided by Source alpha
-** Dca = Dc*Da normalized Dest color divided by Dest alpha
-** Dc' = Dca'/Da' the desired color value for this channel.
-**
-** Da' in in the follow formula as 'gamma' The resulting alpla value.
-**
-**
-** Most functions use a blending mode of over (X=1,Y=1,Z=1)
-** this results in the following optimizations...
-** gamma = Sa+Da-Sa*Da;
-** gamma = 1 - QuantiumScale*alpha * QuantiumScale*beta;
-** opacity = QuantiumScale*alpha*beta; // over blend, optimized 1-Gamma
-**
-** The above SVG definitions also definate that Mathematical Composition
-** methods should use a 'Over' blending mode for Alpha Channel.
-** It however was not applied for composition modes of 'Plus', 'Minus',
-** the modulus versions of 'Add' and 'Subtract'.
-**
-**
-** Mathematical operator changes to be applied from IM v6.7...
-**
-** 1/ Modulus modes 'Add' and 'Subtract' are obsoleted and renamed
-** 'ModulusAdd' and 'ModulusSubtract' for clarity.
-**
-** 2/ All mathematical compositions work as per the SVG specification
-** with regard to blending. This now includes 'ModulusAdd' and
-** 'ModulusSubtract'.
-**
-** 3/ When the special channel flag 'sync' (syncronize channel updates)
-** is turned off (enabled by default) then mathematical compositions are
-** only performed on the channels specified, and are applied
-** independantally of each other. In other words the mathematics is
-** performed as 'pure' mathematical operations, rather than as image
-** operations.
-*/
-
-static inline MagickRealType Atop(const MagickRealType p,
- const MagickRealType Sa,const MagickRealType q,
- const MagickRealType magick_unused(Da))
-{
- return(p*Sa+q*(1.0-Sa)); /* Da optimized out, Da/gamma => 1.0 */
-}
-
-static inline void CompositeAtop(const MagickPixelPacket *p,
- const MagickPixelPacket *q,MagickPixelPacket *composite)
-{
- MagickRealType
- Sa;
-
- Sa=1.0-QuantumScale*p->opacity; /* simplify and speed up equations */
- composite->opacity=q->opacity; /* optimized Da = 1.0-Gamma */
- composite->red=Atop(p->red,Sa,q->red,1.0);
- composite->green=Atop(p->green,Sa,q->green,1.0);
- composite->blue=Atop(p->blue,Sa,q->blue,1.0);
- if (q->colorspace == CMYKColorspace)
- composite->index=Atop(p->index,Sa,q->index,1.0);
-}
-
-/*
- What is this Composition method for? Can't find any specification!
- WARNING this is not doing correct 'over' blend handling (Anthony Thyssen).
-*/
-static inline void CompositeBumpmap(const MagickPixelPacket *p,
- const MagickPixelPacket *q,MagickPixelPacket *composite)
-{
- MagickRealType
- intensity;
-
- intensity=MagickPixelIntensity(p);
- composite->red=QuantumScale*intensity*q->red;
- composite->green=QuantumScale*intensity*q->green;
- composite->blue=QuantumScale*intensity*q->blue;
- composite->opacity=(MagickRealType) QuantumScale*intensity*
- p->opacity;
- if (q->colorspace == CMYKColorspace)
- composite->index=QuantumScale*intensity*q->index;
-}
-
-static inline void CompositeClear(const MagickPixelPacket *q,
- MagickPixelPacket *composite)
-{
- composite->opacity=(MagickRealType) TransparentOpacity;
- composite->red=0.0;
- composite->green=0.0;
- composite->blue=0.0;
- if (q->colorspace == CMYKColorspace)
- composite->index=0.0;
-}
-
-static MagickRealType ColorBurn(const MagickRealType Sca,
- const MagickRealType Sa, const MagickRealType Dca,const MagickRealType Da)
-{
-#if 0
- /*
- Oct 2004 SVG specification.
- */
- if (Sca*Da + Dca*Sa <= Sa*Da)
- return(Sca*(1.0-Da)+Dca*(1.0-Sa));
- return(Sa*(Sca*Da+Dca*Sa-Sa*Da)/Sca + Sca*(1.0-Da) + Dca*(1.0-Sa));
-#else
- /*
- March 2009 SVG specification.
- */
- if ((fabs(Sca) < MagickEpsilon) && (fabs(Dca-Da) < MagickEpsilon))
- return(Sa*Da+Dca*(1.0-Sa));
- if (Sca < MagickEpsilon)
- return(Dca*(1.0-Sa));
- return(Sa*Da-Sa*MagickMin(Da,(Da-Dca)*Sa/Sca)+Sca*(1.0-Da)+Dca*(1.0-Sa));
-#endif
-}
-
-static inline void CompositeColorBurn(const MagickPixelPacket *p,
- const MagickPixelPacket *q,MagickPixelPacket *composite)
-{
- MagickRealType
- Da,
- gamma,
- Sa;
-
- Sa=1.0-QuantumScale*p->opacity; /* simplify and speed up equations */
- Da=1.0-QuantumScale*q->opacity;
- gamma=RoundToUnity(Sa+Da-Sa*Da); /* over blend, as per SVG doc */
- composite->opacity=(MagickRealType) QuantumRange*(1.0-gamma);
- gamma=QuantumRange/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma);
- composite->red=gamma*ColorBurn(QuantumScale*p->red*Sa,Sa,QuantumScale*
- q->red*Da,Da);
- composite->green=gamma*ColorBurn(QuantumScale*p->green*Sa,Sa,QuantumScale*
- q->green*Da,Da);
- composite->blue=gamma*ColorBurn(QuantumScale*p->blue*Sa,Sa,QuantumScale*
- q->blue*Da,Da);
- if (q->colorspace == CMYKColorspace)
- composite->index=gamma*ColorBurn(QuantumScale*p->index*Sa,Sa,QuantumScale*
- q->index*Da,Da);
-}
-
-
-static MagickRealType ColorDodge(const MagickRealType Sca,
- const MagickRealType Sa, const MagickRealType Dca,const MagickRealType Da)
-{
-#if 0
- /*
- Oct 2004 SVG specification.
- */
- if ((Sca*Da+Dca*Sa) >= Sa*Da)
- return( Sa*Da + Sca*(1.0-Da) + Dca*(1.0-Sa) );
- return( Dca*Sa*Sa/(Sa-Sca) + Sca*(1.0-Da) + Dca*(1.0-Sa) );
-#endif
-#if 0
- /*
- New specification, March 2009 SVG specification. This specification was
- also wrong of non-overlap cases.
- */
- if ((fabs(Sca-Sa) < MagickEpsilon) && (fabs(Dca) < MagickEpsilon))
- return(Sca*(1.0-Da));
- if (fabs(Sca-Sa) < MagickEpsilon)
- return(Sa*Da+Sca*(1.0-Da)+Dca*(1.0-Sa));
- return(Sa*MagickMin(Da,Dca*Sa/(Sa-Sca)));
-#endif
- /*
- Working from first principles using the original formula:
-
- f(Sc,Dc) = Dc/(1-Sc)
-
- This works correctly! Looks like the 2004 model was right but just
- required a extra condition for correct handling.
- */
- if ((fabs(Sca-Sa) < MagickEpsilon) && (fabs(Dca) < MagickEpsilon))
- return(Sca*(1.0-Da)+Dca*(1.0-Sa));
- if (fabs(Sca-Sa) < MagickEpsilon)
- return(Sa*Da+Sca*(1.0-Da)+Dca*(1.0-Sa));
- return(Dca*Sa*Sa/(Sa-Sca)+Sca*(1.0-Da)+Dca*(1.0-Sa));
-}
-
-static inline void CompositeColorDodge(const MagickPixelPacket *p,
- const MagickPixelPacket *q,MagickPixelPacket *composite)
-{
- MagickRealType
- Da,
- gamma,
- Sa;
-
- Sa=1.0-QuantumScale*p->opacity; /* simplify and speed up equations */
- Da=1.0-QuantumScale*q->opacity;
- gamma=RoundToUnity(Sa+Da-Sa*Da); /* over blend, as per SVG doc */
- composite->opacity=(MagickRealType) QuantumRange*(1.0-gamma);
- gamma=QuantumRange/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma);
- composite->red=gamma*ColorDodge(QuantumScale*p->red*Sa,Sa,QuantumScale*
- q->red*Da,Da);
- composite->green=gamma*ColorDodge(QuantumScale*p->green*Sa,Sa,QuantumScale*
- q->green*Da,Da);
- composite->blue=gamma*ColorDodge(QuantumScale*p->blue*Sa,Sa,QuantumScale*
- q->blue*Da,Da);
- if (q->colorspace == CMYKColorspace)
- composite->index=gamma*ColorDodge(QuantumScale*p->index*Sa,Sa,QuantumScale*
- q->index*Da,Da);
-}
-
-static inline MagickRealType Darken(const MagickRealType p,
- const MagickRealType alpha,const MagickRealType q,const MagickRealType beta)
-{
- if (p < q)
- return(MagickOver_(p,alpha,q,beta)); /* src-over */
- return(MagickOver_(q,beta,p,alpha)); /* dst-over */
-}
-
-static inline void CompositeDarken(const MagickPixelPacket *p,
- const MagickPixelPacket *q,const ChannelType channel,
- MagickPixelPacket *composite)
-{
- /*
- Darken is equivalent to a 'Minimum' method
- OR a greyscale version of a binary 'Or'
- OR the 'Intersection' of pixel sets.
- */
- MagickRealType
- gamma;
-
- if ( (channel & SyncChannels) != 0 ) {
- composite->opacity=QuantumScale*p->opacity*q->opacity; /* Over Blend */
- gamma=1.0-QuantumScale*composite->opacity;
- gamma=1.0/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma);
- composite->red=gamma*Darken(p->red,p->opacity,q->red,q->opacity);
- composite->green=gamma*Darken(p->green,p->opacity,q->green,q->opacity);
- composite->blue=gamma*Darken(p->blue,p->opacity,q->blue,q->opacity);
- if (q->colorspace == CMYKColorspace)
- composite->index=gamma*Darken(p->index,p->opacity,q->index,q->opacity);
- }
- else { /* handle channels as separate grayscale channels */
- if ( (channel & AlphaChannel) != 0 )
- composite->opacity=MagickMax(p->opacity,q->opacity);
- if ( (channel & RedChannel) != 0 )
- composite->red=MagickMin(p->red,q->red);
- if ( (channel & GreenChannel) != 0 )
- composite->green=MagickMin(p->green,q->green);
- if ( (channel & BlueChannel) != 0 )
- composite->blue=MagickMin(p->blue,q->blue);
- if ( (channel & IndexChannel) != 0 && q->colorspace == CMYKColorspace)
- composite->index=MagickMin(p->index,q->index);
- }
-}
-
-static inline void CompositeDarkenIntensity(const MagickPixelPacket *p,
- const MagickPixelPacket *q,const ChannelType channel,
- MagickPixelPacket *composite)
-{
- /*
- Select the pixel based on the intensity level.
- If 'Sync' flag select whole pixel based on alpha weighted intensity.
- Otherwise use intensity only, but restrict copy according to channel.
- */
- if ( (channel & SyncChannels) != 0 ) {
- MagickRealType
- Da,
- Sa;
-
- Sa=1.0-QuantumScale*p->opacity;
- Da=1.0-QuantumScale*q->opacity;
- *composite = (Sa*MagickPixelIntensity(p) < Da*MagickPixelIntensity(q))
- ? *p : *q;
- }
- else {
- int from_p = (MagickPixelIntensity(p) < MagickPixelIntensity(q));
- if ( (channel & AlphaChannel) != 0 )
- composite->opacity = from_p ? p->opacity : q->opacity;
- if ( (channel & RedChannel) != 0 )
- composite->red = from_p ? p->red : q->red;
- if ( (channel & GreenChannel) != 0 )
- composite->green = from_p ? p->green : q->green;
- if ( (channel & BlueChannel) != 0 )
- composite->blue = from_p ? p->blue : q->blue;
- if ( (channel & IndexChannel) != 0 && q->colorspace == CMYKColorspace)
- composite->index = from_p ? p->index : q->index;
- }
-}
-
-static inline MagickRealType Difference(const MagickRealType p,
- const MagickRealType Sa,const MagickRealType q,const MagickRealType Da)
-{
- /* Optimized by Multipling by QuantumRange (taken from gamma). */
- return(Sa*p+Da*q-Sa*Da*2.0*MagickMin(p,q));
-}
-
-static inline void CompositeDifference(const MagickPixelPacket *p,
- const MagickPixelPacket *q,const ChannelType channel,
- MagickPixelPacket *composite)
-{
- MagickRealType
- Da,
- gamma,
- Sa;
-
- Sa=1.0-QuantumScale*p->opacity; /* simplify and speed up equations */
- Da=1.0-QuantumScale*q->opacity;
- if ( (channel & SyncChannels) != 0 ) {
- gamma=RoundToUnity(Sa+Da-Sa*Da); /* over blend, as per SVG doc */
- composite->opacity=(MagickRealType) QuantumRange*(1.0-gamma);
- gamma=1.0/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma);
- /* Values are not normalized as an optimization. */
- composite->red=gamma*Difference(p->red,Sa,q->red,Da);
- composite->green=gamma*Difference(p->green,Sa,q->green,Da);
- composite->blue=gamma*Difference(p->blue,Sa,q->blue,Da);
- if (q->colorspace == CMYKColorspace)
- composite->index=gamma*Difference(p->index,Sa,q->index,Da);
- }
- else { /* handle channels as separate grayscale channels */
- if ( (channel & AlphaChannel) != 0 )
- composite->opacity=QuantumRange-fabs(p->opacity - q->opacity);
- if ( (channel & RedChannel) != 0 )
- composite->red=fabs(p->red - q->red);
- if ( (channel & GreenChannel) != 0 )
- composite->green=fabs(p->green - q->green);
- if ( (channel & BlueChannel) != 0 )
- composite->blue=fabs(p->blue - q->blue);
- if ( (channel & IndexChannel) != 0 && q->colorspace == CMYKColorspace)
- composite->index=fabs(p->index - q->index);
- }
-}
-
-static MagickRealType Divide(const MagickRealType Sca,const MagickRealType Sa,
- const MagickRealType Dca,const MagickRealType Da)
-{
- /*
- Divide Source by Destination
-
- f(Sc,Dc) = Sc / Dc
-
- But with appropriate handling for special case of Dc == 0 specifically
- so that f(Black,Black)=Black and f(non-Black,Black)=White.
- It is however also important to correctly do 'over' alpha blending which
- is why the formula becomes so complex.
- */
- if ((fabs(Sca) < MagickEpsilon) && (fabs(Dca) < MagickEpsilon))
- return(Sca*(1.0-Da)+Dca*(1.0-Sa));
- if (fabs(Dca) < MagickEpsilon)
- return(Sa*Da+Sca*(1.0-Da)+Dca*(1.0-Sa));
- return(Sca*Da*Da/Dca+Sca*(1.0-Da)+Dca*(1.0-Sa));
-}
-
-static inline void CompositeDivide(const MagickPixelPacket *p,
- const MagickPixelPacket *q,const ChannelType channel,
- MagickPixelPacket *composite)
-{
- MagickRealType
- Da,
- gamma,
- Sa;
-
- Sa=1.0-QuantumScale*p->opacity; /* simplify and speed up equations */
- Da=1.0-QuantumScale*q->opacity;
- if ( (channel & SyncChannels) != 0 ) {
- gamma=RoundToUnity(Sa+Da-Sa*Da); /* over blend, as per SVG doc */
- composite->opacity=(MagickRealType) QuantumRange*(1.0-gamma);
- gamma=QuantumRange/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma);
- composite->red=gamma*Divide(QuantumScale*p->red*Sa,Sa,QuantumScale*
- q->red*Da,Da);
- composite->green=gamma*Divide(QuantumScale*p->green*Sa,Sa,QuantumScale*
- q->green*Da,Da);
- composite->blue=gamma*Divide(QuantumScale*p->blue*Sa,Sa,QuantumScale*
- q->blue*Da,Da);
- if (q->colorspace == CMYKColorspace)
- composite->index=gamma*Divide(QuantumScale*p->index*Sa,Sa,QuantumScale*
- q->index*Da,Da);
- }
- else { /* handle channels as separate grayscale channels */
- if ( (channel & AlphaChannel) != 0 )
- composite->opacity=QuantumRange*(1.0-Divide(Sa,1.0,Da,1.0));
- if ( (channel & RedChannel) != 0 )
- composite->red=QuantumRange*
- Divide(QuantumScale*p->red,1.0,QuantumScale*q->red,1.0);
- if ( (channel & GreenChannel) != 0 )
- composite->green=QuantumRange*
- Divide(QuantumScale*p->green,1.0,QuantumScale*q->green,1.0);
- if ( (channel & BlueChannel) != 0 )
- composite->blue=QuantumRange*
- Divide(QuantumScale*p->blue,1.0,QuantumScale*q->blue,1.0);
- if ( (channel & IndexChannel) != 0 && q->colorspace == CMYKColorspace)
- composite->index=QuantumRange*
- Divide(QuantumScale*p->index,1.0,QuantumScale*q->index,1.0);
- }
-}
-
-static MagickRealType Exclusion(const MagickRealType Sca,
- const MagickRealType Sa, const MagickRealType Dca,const MagickRealType Da)
-{
- return(Sca*Da+Dca*Sa-2.0*Sca*Dca+Sca*(1.0-Da)+Dca*(1.0-Sa));
-}
-
-static inline void CompositeExclusion(const MagickPixelPacket *p,
- const MagickPixelPacket *q,const ChannelType channel,
- MagickPixelPacket *composite)
-{
- MagickRealType
- gamma,
- Sa,
- Da;
-
- Sa=1.0-QuantumScale*p->opacity; /* simplify and speed up equations */
- Da=1.0-QuantumScale*q->opacity;
- if ( (channel & SyncChannels) != 0 ) {
- gamma=RoundToUnity(Sa+Da-Sa*Da); /* over blend, as per SVG doc */
- composite->opacity=(MagickRealType) QuantumRange*(1.0-gamma);
- gamma=QuantumRange/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma);
- composite->red=gamma*Exclusion(QuantumScale*p->red*Sa,Sa,QuantumScale*
- q->red*Da,Da);
- composite->green=gamma*Exclusion(QuantumScale*p->green*Sa,Sa,QuantumScale*
- q->green*Da,Da);
- composite->blue=gamma*Exclusion(QuantumScale*p->blue*Sa,Sa,QuantumScale*
- q->blue*Da,Da);
- if (q->colorspace == CMYKColorspace)
- composite->index=gamma*Exclusion(QuantumScale*p->index*Sa,Sa,QuantumScale*
- q->index*Da,Da);
- }
- else { /* handle channels as separate grayscale channels */
- if ( (channel & AlphaChannel) != 0 )
- composite->opacity=QuantumRange*(1.0-Exclusion(Sa,1.0,Da,1.0));
- if ( (channel & RedChannel) != 0 )
- composite->red=QuantumRange*
- Exclusion(QuantumScale*p->red,1.0,QuantumScale*q->red,1.0);
- if ( (channel & GreenChannel) != 0 )
- composite->green=QuantumRange*
- Exclusion(QuantumScale*p->green,1.0,QuantumScale*q->green,1.0);
- if ( (channel & BlueChannel) != 0 )
- composite->blue=QuantumRange*
- Exclusion(QuantumScale*p->blue,1.0,QuantumScale*q->blue,1.0);
- if ( (channel & IndexChannel) != 0 && q->colorspace == CMYKColorspace)
- composite->index=QuantumRange*
- Exclusion(QuantumScale*p->index,1.0,QuantumScale*q->index,1.0);
- }
-}
-
-static MagickRealType HardLight(const MagickRealType Sca,
- const MagickRealType Sa,const MagickRealType Dca,const MagickRealType Da)
-{
- if ((2.0*Sca) < Sa)
- return(2.0*Sca*Dca+Sca*(1.0-Da)+Dca*(1.0-Sa));
- return(Sa*Da-2.0*(Da-Dca)*(Sa-Sca)+Sca*(1.0-Da)+Dca*(1.0-Sa));
-}
-
-static inline void CompositeHardLight(const MagickPixelPacket *p,
- const MagickPixelPacket *q,MagickPixelPacket *composite)
-{
- MagickRealType
- Da,
- gamma,
- Sa;
-
- Sa=1.0-QuantumScale*p->opacity; /* simplify and speed up equations */
- Da=1.0-QuantumScale*q->opacity;
- gamma=RoundToUnity(Sa+Da-Sa*Da); /* over blend, as per SVG doc */
- composite->opacity=(MagickRealType) QuantumRange*(1.0-gamma);
- gamma=QuantumRange/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma);
- composite->red=gamma*HardLight(QuantumScale*p->red*Sa,Sa,QuantumScale*
- q->red*Da,Da);
- composite->green=gamma*HardLight(QuantumScale*p->green*Sa,Sa,QuantumScale*
- q->green*Da,Da);
- composite->blue=gamma*HardLight(QuantumScale*p->blue*Sa,Sa,QuantumScale*
- q->blue*Da,Da);
- if (q->colorspace == CMYKColorspace)
- composite->index=gamma*HardLight(QuantumScale*p->index*Sa,Sa,QuantumScale*
- q->index*Da,Da);
-}
-
-static void CompositeHSB(const MagickRealType red,const MagickRealType green,
- const MagickRealType blue,double *hue,double *saturation,double *brightness)
-{
- MagickRealType
- delta,
- max,
- min;
-
- /*
- Convert RGB to HSB colorspace.
- */
- assert(hue != (double *) NULL);
- assert(saturation != (double *) NULL);
- assert(brightness != (double *) NULL);
- max=(red > green ? red : green);
- if (blue > max)
- max=blue;
- min=(red < green ? red : green);
- if (blue < min)
- min=blue;
- *hue=0.0;
- *saturation=0.0;
- *brightness=(double) (QuantumScale*max);
- if (max == 0.0)
- return;
- *saturation=(double) (1.0-min/max);
- delta=max-min;
- if (delta == 0.0)
- return;
- if (red == max)
- *hue=(double) ((green-blue)/delta);
- else
- if (green == max)
- *hue=(double) (2.0+(blue-red)/delta);
- else
- if (blue == max)
- *hue=(double) (4.0+(red-green)/delta);
- *hue/=6.0;
- if (*hue < 0.0)
- *hue+=1.0;
-}
-
-static inline MagickRealType In(const MagickRealType p,
- const MagickRealType Sa,const MagickRealType magick_unused(q),
- const MagickRealType Da)
-{
- return(Sa*p*Da);
-}
-
-static inline void CompositeIn(const MagickPixelPacket *p,
- const MagickPixelPacket *q,MagickPixelPacket *composite)
-{
- MagickRealType
- gamma,
- Sa,
- Da;
-
- Sa=1.0-QuantumScale*p->opacity; /* simplify and speed up equations */
- Da=1.0-QuantumScale*q->opacity;
- gamma=Sa*Da;
- composite->opacity=(MagickRealType) QuantumRange*(1.0-gamma);
- gamma=1.0/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma);
- composite->red=gamma*In(p->red,Sa,q->red,Da);
- composite->green=gamma*In(p->green,Sa,q->green,Da);
- composite->blue=gamma*In(p->blue,Sa,q->blue,Da);
- if (q->colorspace == CMYKColorspace)
- composite->index=gamma*In(p->index,Sa,q->index,Da);
-}
-
-static inline MagickRealType Lighten(const MagickRealType p,
- const MagickRealType alpha,const MagickRealType q,const MagickRealType beta)
-{
- if (p > q)
- return(MagickOver_(p,alpha,q,beta)); /* src-over */
- return(MagickOver_(q,beta,p,alpha)); /* dst-over */
-}
-
-static inline void CompositeLighten(const MagickPixelPacket *p,
- const MagickPixelPacket *q,const ChannelType channel,
- MagickPixelPacket *composite)
-{
- /*
- Lighten is also equvalent to a 'Maximum' method
- OR a greyscale version of a binary 'And'
- OR the 'Union' of pixel sets.
- */
- MagickRealType
- gamma;
-
- if ( (channel & SyncChannels) != 0 ) {
- composite->opacity=QuantumScale*p->opacity*q->opacity; /* Over Blend */
- gamma=1.0-QuantumScale*composite->opacity;
- gamma=1.0/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma);
- composite->red=gamma*Lighten(p->red,p->opacity,q->red,q->opacity);
- composite->green=gamma*Lighten(p->green,p->opacity,q->green,q->opacity);
- composite->blue=gamma*Lighten(p->blue,p->opacity,q->blue,q->opacity);
- if (q->colorspace == CMYKColorspace)
- composite->index=gamma*Lighten(p->index,p->opacity,q->index,q->opacity);
- }
- else { /* handle channels as separate grayscale channels */
- if ( (channel & AlphaChannel) != 0 )
- composite->opacity=MagickMin(p->opacity,q->opacity);
- if ( (channel & RedChannel) != 0 )
- composite->red=MagickMax(p->red,q->red);
- if ( (channel & GreenChannel) != 0 )
- composite->green=MagickMax(p->green,q->green);
- if ( (channel & BlueChannel) != 0 )
- composite->blue=MagickMax(p->blue,q->blue);
- if ( (channel & IndexChannel) != 0 && q->colorspace == CMYKColorspace)
- composite->index=MagickMax(p->index,q->index);
- }
-}
-
-static inline void CompositeLightenIntensity(const MagickPixelPacket *p,
- const MagickPixelPacket *q,const ChannelType channel,
- MagickPixelPacket *composite)
-{
- /*
- Select the pixel based on the intensity level.
- If 'Sync' flag select whole pixel based on alpha weighted intensity.
- Otherwise use Intenisty only, but restrict copy according to channel.
- */
- if ( (channel & SyncChannels) != 0 ) {
- MagickRealType
- Da,
- Sa;
-
- Sa=1.0-QuantumScale*p->opacity;
- Da=1.0-QuantumScale*q->opacity;
- *composite = (Sa*MagickPixelIntensity(p) > Da*MagickPixelIntensity(q))
- ? *p : *q;
- }
- else {
- int from_p = (MagickPixelIntensity(p) > MagickPixelIntensity(q));
- if ( (channel & AlphaChannel) != 0 )
- composite->opacity = from_p ? p->opacity : q->opacity;
- if ( (channel & RedChannel) != 0 )
- composite->red = from_p ? p->red : q->red;
- if ( (channel & GreenChannel) != 0 )
- composite->green = from_p ? p->green : q->green;
- if ( (channel & BlueChannel) != 0 )
- composite->blue = from_p ? p->blue : q->blue;
- if ( (channel & IndexChannel) != 0 && q->colorspace == CMYKColorspace)
- composite->index = from_p ? p->index : q->index;
- }
-}
-
-#if 0
-static inline MagickRealType LinearDodge(const MagickRealType Sca,
- const MagickRealType Sa,const MagickRealType Dca,const MagickRealType Da)
-{
- /*
- LinearDodge: simplifies to a trivial formula
- f(Sc,Dc) = Sc + Dc
- Dca' = Sca + Dca
- */
- return(Sca+Dca);
-}
-#endif
-
-static inline void CompositeLinearDodge(const MagickPixelPacket *p,
- const MagickPixelPacket *q,MagickPixelPacket *composite)
-{
- MagickRealType
- Da,
- gamma,
- Sa;
-
- Sa=1.0-QuantumScale*p->opacity; /* simplify and speed up equations */
- Da=1.0-QuantumScale*q->opacity;
- gamma=RoundToUnity(Sa+Da-Sa*Da); /* over blend, as per SVG doc */
- composite->opacity=(MagickRealType) QuantumRange*(1.0-gamma);
- gamma=1.0/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma);
- composite->red=gamma*(p->red*Sa+q->red*Da);
- composite->green=gamma*(p->green*Sa+q->green*Da);
- composite->blue=gamma*(p->blue*Sa+q->blue*Da);
- if (q->colorspace == CMYKColorspace)
- composite->index=gamma*(p->index*Sa+q->index*Da);
-}
-
-
-static inline MagickRealType LinearBurn(const MagickRealType Sca,
- const MagickRealType Sa,const MagickRealType Dca,const MagickRealType Da)
-{
- /*
- LinearBurn: as defined by Abode Photoshop, according to
- http://www.simplefilter.de/en/basics/mixmods.html is:
-
- f(Sc,Dc) = Sc + Dc - 1
- */
- return(Sca+Dca-Sa*Da);
-}
-
-static inline void CompositeLinearBurn(const MagickPixelPacket *p,
- const MagickPixelPacket *q,MagickPixelPacket *composite)
-{
- MagickRealType
- Da,
- gamma,
- Sa;
-
- Sa=1.0-QuantumScale*p->opacity; /* simplify and speed up equations */
- Da=1.0-QuantumScale*q->opacity;
- gamma=RoundToUnity(Sa+Da-Sa*Da); /* over blend, as per SVG doc */
- composite->opacity=(MagickRealType) QuantumRange*(1.0-gamma);
- gamma=QuantumRange/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma);
- composite->red=gamma*LinearBurn(QuantumScale*p->red*Sa,Sa,QuantumScale*
- q->red*Da,Da);
- composite->green=gamma*LinearBurn(QuantumScale*p->green*Sa,Sa,QuantumScale*
- q->green*Da,Da);
- composite->blue=gamma*LinearBurn(QuantumScale*p->blue*Sa,Sa,QuantumScale*
- q->blue*Da,Da);
- if (q->colorspace == CMYKColorspace)
- composite->index=gamma*LinearBurn(QuantumScale*p->index*Sa,Sa,QuantumScale*
- q->index*Da,Da);
-}
-
-static inline MagickRealType LinearLight(const MagickRealType Sca,
- const MagickRealType Sa,const MagickRealType Dca,const MagickRealType Da)
-{
-#if 0
- /*
- Previous formula, was only valid for fully-opaque images.
- */
- return(Dca+2*Sca-1.0);
-#else
- /*
- LinearLight: as defined by Abode Photoshop, according to
- http://www.simplefilter.de/en/basics/mixmods.html is:
-
- f(Sc,Dc) = Dc + 2*Sc - 1
- */
- return((Sca-Sa)*Da+Sca+Dca);
-#endif
-}
-
-static inline void CompositeLinearLight(const MagickPixelPacket *p,
- const MagickPixelPacket *q,MagickPixelPacket *composite)
-{
- MagickRealType
- Da,
- gamma,
- Sa;
-
- Sa=1.0-QuantumScale*p->opacity; /* simplify and speed up equations */
- Da=1.0-QuantumScale*q->opacity;
- gamma=RoundToUnity(Sa+Da-Sa*Da); /* over blend, as per SVG doc */
- composite->opacity=(MagickRealType) QuantumRange*(1.0-gamma);
- gamma=QuantumRange/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma);
- composite->red=gamma*LinearLight(QuantumScale*p->red*Sa,Sa,QuantumScale*
- q->red*Da,Da);
- composite->green=gamma*LinearLight(QuantumScale*p->green*Sa,Sa,QuantumScale*
- q->green*Da,Da);
- composite->blue=gamma*LinearLight(QuantumScale*p->blue*Sa,Sa,QuantumScale*
- q->blue*Da,Da);
- if (q->colorspace == CMYKColorspace)
- composite->index=gamma*LinearLight(QuantumScale*p->index*Sa,Sa,QuantumScale*
- q->index*Da,Da);
-}
-
-static inline MagickRealType Mathematics(const MagickRealType Sca,
- const MagickRealType Sa,const MagickRealType Dca,const MagickRealType Da,
- const GeometryInfo *geometry_info)
-{
- /*
- 'Mathematics' a free form user control mathematical composition is defined
- as...
-
- f(Sc,Dc) = A*Sc*Dc + B*Sc + C*Dc + D
-
- Where the arguments A,B,C,D are (currently) passed to composite as
- a command separated 'geometry' string in "compose:args" image artifact.
-
- A = a->rho, B = a->sigma, C = a->xi, D = a->psi
-
- Applying the SVG transparency formula (see above), we get...
-
- Dca' = Sa*Da*f(Sc,Dc) + Sca*(1.0-Da) + Dca*(1.0-Sa)
-
- Dca' = A*Sca*Dca + B*Sca*Da + C*Dca*Sa + D*Sa*Da + Sca*(1.0-Da) +
- Dca*(1.0-Sa)
- */
- return(geometry_info->rho*Sca*Dca+geometry_info->sigma*Sca*Da+
- geometry_info->xi*Dca*Sa+geometry_info->psi*Sa*Da+Sca*(1.0-Da)+
- Dca*(1.0-Sa));
-}
-
-static inline void CompositeMathematics(const MagickPixelPacket *p,
- const MagickPixelPacket *q,const ChannelType channel, const GeometryInfo
- *args, MagickPixelPacket *composite)
-{
- MagickRealType
- Sa,
- Da,
- gamma;
-
- Sa=1.0-QuantumScale*p->opacity; /* ??? - AT */
- Da=1.0-QuantumScale*q->opacity;
- if ( (channel & SyncChannels) != 0 ) {
- gamma=RoundToUnity(Sa+Da-Sa*Da); /* over blend, as per SVG doc */
- composite->opacity=(MagickRealType) QuantumRange*(1.0-gamma);
- gamma=QuantumRange/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma);
- composite->red=gamma*Mathematics(QuantumScale*p->red*Sa,Sa,QuantumScale*
- q->red*Da,Da,args);
- composite->green=gamma*Mathematics(QuantumScale*p->green*Sa,Sa,QuantumScale*
- q->green*Da,Da,args);
- composite->blue=gamma*Mathematics(QuantumScale*p->blue*Sa,Sa,QuantumScale*
- q->blue*Da,Da,args);
- if (q->colorspace == CMYKColorspace)
- composite->index=gamma*Mathematics(QuantumScale*p->index*Sa,Sa,QuantumScale*
- q->index*Da,Da,args);
- }
- else { /* handle channels as separate grayscale channels */
- if ( (channel & AlphaChannel) != 0 )
- composite->opacity=QuantumRange*(1.0-Mathematics(Sa,1.0,Da,1.0,args));
- if ( (channel & RedChannel) != 0 )
- composite->red=QuantumRange*
- Mathematics(QuantumScale*p->red,1.0,QuantumScale*q->red,1.0,args);
- if ( (channel & GreenChannel) != 0 )
- composite->green=QuantumRange*
- Mathematics(QuantumScale*p->green,1.0,QuantumScale*q->green,1.0,args);
- if ( (channel & BlueChannel) != 0 )
- composite->blue=QuantumRange*
- Mathematics(QuantumScale*p->blue,1.0,QuantumScale*q->blue,1.0,args);
- if ( (channel & IndexChannel) != 0 && q->colorspace == CMYKColorspace)
- composite->index=QuantumRange*
- Mathematics(QuantumScale*p->index,1.0,QuantumScale*q->index,1.0,args);
- }
-
-}
-
-static inline void CompositePlus(const MagickPixelPacket *p,
- const MagickPixelPacket *q,const ChannelType channel,
- MagickPixelPacket *composite)
-{
- if ( (channel & SyncChannels) != 0 ) {
- /*
- NOTE: "Plus" does not use 'over' alpha-blending but uses a
- special 'plus' form of alph-blending. It is the ONLY mathematical
- operator to do this. this is what makes it different to the
- otherwise equivalent "LinearDodge" composition method.
-
- Note however that color channels are still effected by the alpha channel
- as a result of the blending, making it just as useless for independant
- channel maths, just like all other mathematical composition methods.
-
- As such the removal of the 'sync' flag, is still a usful convention.
-
- The MagickPixelCompositePlus() function is defined in
- "composite-private.h" so it can also be used for Image Blending.
- */
- MagickPixelCompositePlus(p,p->opacity,q,q->opacity,composite);
- }
- else { /* handle channels as separate grayscale channels */
- if ( (channel & AlphaChannel) != 0 )
- composite->opacity=p->opacity+q->opacity-QuantumRange;
- if ( (channel & RedChannel) != 0 )
- composite->red=p->red+q->red;
- if ( (channel & GreenChannel) != 0 )
- composite->green=p->green+q->green;
- if ( (channel & BlueChannel) != 0 )
- composite->blue=p->blue+q->blue;
- if ( (channel & IndexChannel) != 0 && q->colorspace == CMYKColorspace)
- composite->index=p->index+q->index;
- }
-}
-
-static inline MagickRealType Minus(const MagickRealType Sca,
- const MagickRealType Sa,const MagickRealType Dca,
- const MagickRealType magick_unused(Da))
-{
- /*
- Minus Source from Destination
-
- f(Sc,Dc) = Sc - Dc
-
- */
- return(Sca + Dca - 2*Dca*Sa);
-}
-
-static inline void CompositeMinus(const MagickPixelPacket *p,
- const MagickPixelPacket *q,const ChannelType channel,
- MagickPixelPacket *composite)
-{
- MagickRealType
- Sa,
- Da,
- gamma;
-
- Sa=1.0-QuantumScale*p->opacity; /* simplify and speed up equations */
- Da=1.0-QuantumScale*q->opacity;
- if ( (channel & SyncChannels) != 0 ) {
- gamma=RoundToUnity(Sa+Da-Sa*Da); /* over blend, as per SVG doc */
- composite->opacity=(MagickRealType) QuantumRange*(1.0-gamma);
- gamma=1.0/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma);
- composite->red=gamma*Minus(p->red*Sa,Sa,q->red*Da,Da);
- composite->green=gamma*Minus(p->green*Sa,Sa,q->green*Da,Da);
- composite->blue=gamma*Minus(p->blue*Sa,Sa,q->blue*Da,Da);
- if (q->colorspace == CMYKColorspace)
- composite->index=gamma*Minus(p->index*Sa,Sa,q->index*Da,Da);
- }
- else { /* handle channels as separate grayscale channels */
- if ( (channel & AlphaChannel) != 0 )
- composite->opacity=QuantumRange*(1.0-(Sa-Da));
- if ( (channel & RedChannel) != 0 )
- composite->red=p->red-q->red;
- if ( (channel & GreenChannel) != 0 )
- composite->green=p->green-q->green;
- if ( (channel & BlueChannel) != 0 )
- composite->blue=p->blue-q->blue;
- if ( (channel & IndexChannel) != 0 && q->colorspace == CMYKColorspace)
- composite->index=p->index-q->index;
- }
-}
-
-static inline MagickRealType ModulusAdd(const MagickRealType p,
- const MagickRealType Sa, const MagickRealType q, const MagickRealType Da)
-{
- MagickRealType
- pixel;
-
- pixel=p+q;
- if (pixel > QuantumRange)
- pixel-=(QuantumRange+1.0);
- return(pixel*Sa*Da + p*Sa*(1-Da) + q*Da*(1-Sa));
-}
-
-static inline void CompositeModulusAdd(const MagickPixelPacket *p,
- const MagickPixelPacket *q, const ChannelType channel,
- MagickPixelPacket *composite)
-{
- if ( (channel & SyncChannels) != 0 ) {
- MagickRealType
- Sa,
- Da,
- gamma;
-
- Sa=1.0-QuantumScale*p->opacity; /* simplify and speed up equations */
- Da=1.0-QuantumScale*q->opacity;
- gamma=RoundToUnity(Sa+Da-Sa*Da); /* over blend, as per SVG doc */
- composite->opacity=(MagickRealType) QuantumRange*(1.0-gamma);
- gamma=1.0/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma);
- composite->red=ModulusAdd(p->red,Sa,q->red,Da);
- composite->green=ModulusAdd(p->green,Sa,q->green,Da);
- composite->blue=ModulusAdd(p->blue,Sa,q->blue,Da);
- if (q->colorspace == CMYKColorspace)
- composite->index=ModulusAdd(p->index,Sa,q->index,Da);
- }
- else { /* handle channels as separate grayscale channels */
- if ( (channel & AlphaChannel) != 0 )
- composite->opacity=QuantumRange-ModulusAdd(QuantumRange-p->opacity,
- 1.0,QuantumRange-q->opacity,1.0);
- if ( (channel & RedChannel) != 0 )
- composite->red=ModulusAdd(p->red,1.0,q->red,1.0);
- if ( (channel & GreenChannel) != 0 )
- composite->green=ModulusAdd(p->green,1.0,q->green,1.0);
- if ( (channel & BlueChannel) != 0 )
- composite->blue=ModulusAdd(p->blue,1.0,q->blue,1.0);
- if ( (channel & IndexChannel) != 0 && q->colorspace == CMYKColorspace)
- composite->index=ModulusAdd(p->index,1.0,q->index,1.0);
- }
-}
-
-static inline MagickRealType ModulusSubtract(const MagickRealType p,
- const MagickRealType Sa, const MagickRealType q, const MagickRealType Da)
-{
- MagickRealType
- pixel;
-
- pixel=p-q;
- if (pixel < 0.0)
- pixel+=(QuantumRange+1.0);
- return(pixel*Sa*Da + p*Sa*(1-Da) + q*Da*(1-Sa));
-}
-
-static inline void CompositeModulusSubtract(const MagickPixelPacket *p,
- const MagickPixelPacket *q, const ChannelType channel,
- MagickPixelPacket *composite)
-{
- if ( (channel & SyncChannels) != 0 ) {
- MagickRealType
- Sa,
- Da,
- gamma;
-
- Sa=1.0-QuantumScale*p->opacity; /* simplify and speed up equations */
- Da=1.0-QuantumScale*q->opacity;
- gamma = RoundToUnity(Sa+Da-Sa*Da);
- composite->opacity=(MagickRealType) QuantumRange*(1.0-gamma);
- gamma=1.0/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma);
- composite->red=ModulusSubtract(p->red,Sa,q->red,Da);
- composite->green=ModulusSubtract(p->green,Sa,q->green,Da);
- composite->blue=ModulusSubtract(p->blue,Sa,q->blue,Da);
- if (q->colorspace == CMYKColorspace)
- composite->index=ModulusSubtract(p->index,Sa,q->index,Da);
- }
- else { /* handle channels as separate grayscale channels */
- if ( (channel & AlphaChannel) != 0 )
- composite->opacity=QuantumRange-ModulusSubtract(QuantumRange-p->opacity,
- 1.0,QuantumRange-q->opacity,1.0);
- if ( (channel & RedChannel) != 0 )
- composite->red=ModulusSubtract(p->red,1.0,q->red,1.0);
- if ( (channel & GreenChannel) != 0 )
- composite->green=ModulusSubtract(p->green,1.0,q->green,1.0);
- if ( (channel & BlueChannel) != 0 )
- composite->blue=ModulusSubtract(p->blue,1.0,q->blue,1.0);
- if ( (channel & IndexChannel) != 0 && q->colorspace == CMYKColorspace)
- composite->index=ModulusSubtract(p->index,1.0,q->index,1.0);
- }
-}
-
-static inline MagickRealType Multiply(const MagickRealType Sca,
- const MagickRealType Sa,const MagickRealType Dca,const MagickRealType Da)
-{
- return(Sca*Dca+Sca*(1.0-Da)+Dca*(1.0-Sa));
-}
-
-static inline void CompositeMultiply(const MagickPixelPacket *p,
- const MagickPixelPacket *q,const ChannelType channel,
- MagickPixelPacket *composite)
-{
- MagickRealType
- Da,
- gamma,
- Sa;
-
- Sa=1.0-QuantumScale*p->opacity; /* simplify and speed up equations */
- Da=1.0-QuantumScale*q->opacity;
- if ( (channel & SyncChannels) != 0 ) {
- gamma=RoundToUnity(Sa+Da-Sa*Da); /* over blend, as per SVG doc */
- composite->opacity=(MagickRealType) QuantumRange*(1.0-gamma);
- gamma=QuantumRange/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma);
- composite->red=gamma*Multiply(QuantumScale*p->red*Sa,Sa,QuantumScale*
- q->red*Da,Da);
- composite->green=gamma*Multiply(QuantumScale*p->green*Sa,Sa,QuantumScale*
- q->green*Da,Da);
- composite->blue=gamma*Multiply(QuantumScale*p->blue*Sa,Sa,QuantumScale*
- q->blue*Da,Da);
- if (q->colorspace == CMYKColorspace)
- composite->index=gamma*Multiply(QuantumScale*p->index*Sa,Sa,QuantumScale*
- q->index*Da,Da);
- }
- else { /* handle channels as separate grayscale channels */
- if ( (channel & AlphaChannel) != 0 )
- composite->opacity=QuantumRange*(1.0-Sa*Da);
- if ( (channel & RedChannel) != 0 )
- composite->red=QuantumScale*p->red*q->red;
- if ( (channel & GreenChannel) != 0 )
- composite->green=QuantumScale*p->green*q->green;
- if ( (channel & BlueChannel) != 0 )
- composite->blue=QuantumScale*p->blue*q->blue;
- if ( (channel & IndexChannel) != 0 && q->colorspace == CMYKColorspace)
- composite->index=QuantumScale*p->index*q->index;
- }
-}
-
-static inline MagickRealType Out(const MagickRealType p,
- const MagickRealType Sa,const MagickRealType magick_unused(q),
- const MagickRealType Da)
-{
- return(Sa*p*(1.0-Da));
-}
-
-static inline void CompositeOut(const MagickPixelPacket *p,
- const MagickPixelPacket *q,MagickPixelPacket *composite)
-{
- MagickRealType
- Sa,
- Da,
- gamma;
-
- Sa=1.0-QuantumScale*p->opacity; /* simplify and speed up equations */
- Da=1.0-QuantumScale*q->opacity;
- gamma=Sa*(1.0-Da);
- composite->opacity=(MagickRealType) QuantumRange*(1.0-gamma);
- gamma=1.0/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma);
- composite->red=gamma*Out(p->red,Sa,q->red,Da);
- composite->green=gamma*Out(p->green,Sa,q->green,Da);
- composite->blue=gamma*Out(p->blue,Sa,q->blue,Da);
- if (q->colorspace == CMYKColorspace)
- composite->index=gamma*Out(p->index,Sa,q->index,Da);
-}
-
-static MagickRealType PegtopLight(const MagickRealType Sca,
- const MagickRealType Sa,const MagickRealType Dca,const MagickRealType Da)
-{
- /*
- PegTop: A Soft-Light alternative: A continuous version of the Softlight
- function, producing very similar results.
-
- f(Sc,Dc) = Dc^2*(1-2*Sc) + 2*Sc*Dc
-
- See http://www.pegtop.net/delphi/articles/blendmodes/softlight.htm.
- */
- if (fabs(Da) < MagickEpsilon)
- return(Sca);
- return(Dca*Dca*(Sa-2*Sca)/Da+Sca*(2*Dca+1-Da)+Dca*(1-Sa));
-}
-
-static inline void CompositePegtopLight(const MagickPixelPacket *p,
- const MagickPixelPacket *q,MagickPixelPacket *composite)
-{
- MagickRealType
- Da,
- gamma,
- Sa;
-
- Sa=1.0-QuantumScale*p->opacity; /* simplify and speed up equations */
- Da=1.0-QuantumScale*q->opacity;
- gamma=RoundToUnity(Sa+Da-Sa*Da); /* over blend, as per SVG doc */
- composite->opacity=(MagickRealType) QuantumRange*(1.0-gamma);
- gamma=QuantumRange/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma);
- composite->red=gamma*PegtopLight(QuantumScale*p->red*Sa,Sa,QuantumScale*
- q->red*Da,Da);
- composite->green=gamma*PegtopLight(QuantumScale*p->green*Sa,Sa,QuantumScale*
- q->green*Da,Da);
- composite->blue=gamma*PegtopLight(QuantumScale*p->blue*Sa,Sa,QuantumScale*
- q->blue*Da,Da);
- if (q->colorspace == CMYKColorspace)
- composite->index=gamma*PegtopLight(QuantumScale*p->index*Sa,Sa,QuantumScale*
- q->index*Da,Da);
-}
-
-static MagickRealType PinLight(const MagickRealType Sca,
- const MagickRealType Sa,const MagickRealType Dca,const MagickRealType Da)
-{
- /*
- PinLight: A Photoshop 7 composition method
- http://www.simplefilter.de/en/basics/mixmods.html
-
- f(Sc,Dc) = Dc<2*Sc-1 ? 2*Sc-1 : Dc>2*Sc ? 2*Sc : Dc
- */
- if (Dca*Sa < Da*(2*Sca-Sa))
- return(Sca*(Da+1.0)-Sa*Da+Dca*(1.0-Sa));
- if ((Dca*Sa) > (2*Sca*Da))
- return(Sca*Da+Sca+Dca*(1.0-Sa));
- return(Sca*(1.0-Da)+Dca);
-}
-
-static inline void CompositePinLight(const MagickPixelPacket *p,
- const MagickPixelPacket *q,MagickPixelPacket *composite)
-{
- MagickRealType
- Da,
- gamma,
- Sa;
-
- Sa=1.0-QuantumScale*p->opacity; /* simplify and speed up equations */
- Da=1.0-QuantumScale*q->opacity;
- gamma=RoundToUnity(Sa+Da-Sa*Da); /* over blend, as per SVG doc */
- composite->opacity=(MagickRealType) QuantumRange*(1.0-gamma);
- gamma=QuantumRange/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma);
- composite->red=gamma*PinLight(QuantumScale*p->red*Sa,Sa,QuantumScale*
- q->red*Da,Da);
- composite->green=gamma*PinLight(QuantumScale*p->green*Sa,Sa,QuantumScale*
- q->green*Da,Da);
- composite->blue=gamma*PinLight(QuantumScale*p->blue*Sa,Sa,QuantumScale*
- q->blue*Da,Da);
- if (q->colorspace == CMYKColorspace)
- composite->index=gamma*PinLight(QuantumScale*p->index*Sa,Sa,QuantumScale*
- q->index*Da,Da);
-}
-
-static inline MagickRealType Screen(const MagickRealType Sca,
- const MagickRealType Dca)
-{
- /* Screen: A negated multiply
- f(Sc,Dc) = 1.0-(1.0-Sc)*(1.0-Dc)
- */
- return(Sca+Dca-Sca*Dca);
-}
-
-static inline void CompositeScreen(const MagickPixelPacket *p,
- const MagickPixelPacket *q,const ChannelType channel,
- MagickPixelPacket *composite)
-{
- MagickRealType
- Sa,
- Da,
- gamma;
-
- Sa=1.0-QuantumScale*p->opacity; /* simplify and speed up equations */
- Da=1.0-QuantumScale*q->opacity;
- if ( (channel & SyncChannels) != 0 ) {
- gamma=RoundToUnity(Sa+Da-Sa*Da); /* over blend, as per SVG doc */
- composite->opacity=(MagickRealType) QuantumRange*(1.0-gamma);
- Sa*=QuantumScale; Da*=QuantumScale; /* optimization */
- gamma=QuantumRange/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma);
- composite->red=gamma*Screen(p->red*Sa,q->red*Da);
- composite->green=gamma*Screen(p->green*Sa,q->green*Da);
- composite->blue=gamma*Screen(p->blue*Sa,q->blue*Da);
- if (q->colorspace == CMYKColorspace)
- composite->index=gamma*Screen(p->index*Sa,q->index*Da);
- }
- else { /* handle channels as separate grayscale channels */
- if ( (channel & AlphaChannel) != 0 )
- composite->opacity=QuantumRange*(1.0-Screen(Sa,Da));
- if ( (channel & RedChannel) != 0 )
- composite->red=QuantumRange*Screen(QuantumScale*p->red,
- QuantumScale*q->red);
- if ( (channel & GreenChannel) != 0 )
- composite->green=QuantumRange*Screen(QuantumScale*p->green,
- QuantumScale*q->green);
- if ( (channel & BlueChannel) != 0 )
- composite->blue=QuantumRange*Screen(QuantumScale*p->blue,
- QuantumScale*q->blue);
- if ( (channel & IndexChannel) != 0 && q->colorspace == CMYKColorspace)
- composite->index=QuantumRange*Screen(QuantumScale*p->index,
- QuantumScale*q->index);
- }
-}
-
-static MagickRealType SoftLight(const MagickRealType Sca,
- const MagickRealType Sa, const MagickRealType Dca, const MagickRealType Da)
-{
-#if 0
- /*
- Oct 2004 SVG specification -- was found to be incorrect
- See http://lists.w3.org/Archives/Public/www-svg/2009Feb/0014.html.
- */
- if (2.0*Sca < Sa)
- return(Dca*(Sa-(1.0-Dca/Da)*(2.0*Sca-Sa))+Sca*(1.0-Da)+Dca*(1.0-Sa));
- if (8.0*Dca <= Da)
- return(Dca*(Sa-(1.0-Dca/Da)*(2.0*Sca-Sa)*(3.0-8.0*Dca/Da))+
- Sca*(1.0-Da)+Dca*(1.0-Sa));
- return((Dca*Sa+(pow(Dca/Da,0.5)*Da-Dca)*(2.0*Sca-Sa))+Sca*(1.0-Da)+
- Dca*(1.0-Sa));
-#else
- MagickRealType
- alpha,
- beta;
-
- /*
- New specification: March 2009 SVG specification.
- */
- alpha=Dca/Da;
- if ((2.0*Sca) < Sa)
- return(Dca*(Sa+(2.0*Sca-Sa)*(1.0-alpha))+Sca*(1.0-Da)+Dca*(1.0-Sa));
- if (((2.0*Sca) > Sa) && ((4.0*Dca) <= Da))
- {
- beta=Dca*Sa+Da*(2.0*Sca-Sa)*(4.0*alpha*(4.0*alpha+1.0)*(alpha-1.0)+7.0*
- alpha)+Sca*(1.0-Da)+Dca*(1.0-Sa);
- return(beta);
- }
- beta=Dca*Sa+Da*(2.0*Sca-Sa)*(pow(alpha,0.5)-alpha)+Sca*(1.0-Da)+Dca*(1.0-Sa);
- return(beta);
-#endif
-}
-
-static inline void CompositeSoftLight(const MagickPixelPacket *p,
- const MagickPixelPacket *q,MagickPixelPacket *composite)
-{
- MagickRealType
- Da,
- gamma,
- Sa;
-
- Sa=1.0-QuantumScale*p->opacity; /* simplify and speed up equations */
- Da=1.0-QuantumScale*q->opacity;
- gamma=RoundToUnity(Sa+Da-Sa*Da); /* over blend, as per SVG doc */
- composite->opacity=(MagickRealType) QuantumRange*(1.0-gamma);
- gamma=QuantumRange/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma);
- composite->red=gamma*SoftLight(QuantumScale*p->red*Sa,Sa,QuantumScale*
- q->red*Da,Da);
- composite->green=gamma*SoftLight(QuantumScale*p->green*Sa,Sa,QuantumScale*
- q->green*Da,Da);
- composite->blue=gamma*SoftLight(QuantumScale*p->blue*Sa,Sa,QuantumScale*
- q->blue*Da,Da);
- if (q->colorspace == CMYKColorspace)
- composite->index=gamma*SoftLight(QuantumScale*p->index*Sa,Sa,QuantumScale*
- q->index*Da,Da);
-}
-
-/*
- Depreciated
- Multiply difference by amount, if differance larger than threshold???
- What use this is is completely unknown
- The Opacity calculation appears to be inverted -- Anthony Thyssen
-*/
-static inline MagickRealType Threshold(const MagickRealType p,
- const MagickRealType q,const MagickRealType threshold,
- const MagickRealType amount)
-{
- MagickRealType
- delta;
-
- delta=p-q;
- if ((MagickRealType) fabs((double) (2.0*delta)) < threshold)
- return(q);
- return(q+delta*amount);
-}
-
-static inline void CompositeThreshold(const MagickPixelPacket *p,
- const MagickPixelPacket *q,const MagickRealType threshold,
- const MagickRealType amount,MagickPixelPacket *composite)
-{
- composite->red=Threshold(p->red,q->red,threshold,amount);
- composite->green=Threshold(p->green,q->green,threshold,amount);
- composite->blue=Threshold(p->blue,q->blue,threshold,amount);
- composite->opacity=QuantumRange-Threshold(p->opacity,q->opacity,
- threshold,amount);
- if (q->colorspace == CMYKColorspace)
- composite->index=Threshold(p->index,q->index,threshold,amount);
-}
-
-
-static MagickRealType VividLight(const MagickRealType Sca,
- const MagickRealType Sa, const MagickRealType Dca, const MagickRealType Da)
-{
- /*
- VividLight: A Photoshop 7 composition method. See
- http://www.simplefilter.de/en/basics/mixmods.html.
-
- f(Sc,Dc) = (2*Sc < 1) ? 1-(1-Dc)/(2*Sc) : Dc/(2*(1-Sc))
- */
- if ((fabs(Sa) < MagickEpsilon) || (fabs(Sca-Sa) < MagickEpsilon))
- return(Sa*Da+Sca*(1.0-Da)+Dca*(1.0-Sa));
- if ((2*Sca) <= Sa)
- return(Sa*(Da+Sa*(Dca-Da)/(2.0*Sca))+Sca*(1.0-Da)+Dca*(1.0-Sa));
- return(Dca*Sa*Sa/(2.0*(Sa-Sca))+Sca*(1.0-Da)+Dca*(1.0-Sa));
-}
-
-static inline void CompositeVividLight(const MagickPixelPacket *p,
- const MagickPixelPacket *q,MagickPixelPacket *composite)
-{
- MagickRealType
- Da,
- gamma,
- Sa;
-
- Sa=1.0-QuantumScale*p->opacity; /* simplify and speed up equations */
- Da=1.0-QuantumScale*q->opacity;
- gamma=RoundToUnity(Sa+Da-Sa*Da); /* over blend, as per SVG doc */
- composite->opacity=(MagickRealType) QuantumRange*(1.0-gamma);
- gamma=QuantumRange/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma);
- composite->red=gamma*VividLight(QuantumScale*p->red*Sa,Sa,QuantumScale*
- q->red*Da,Da);
- composite->green=gamma*VividLight(QuantumScale*p->green*Sa,Sa,QuantumScale*
- q->green*Da,Da);
- composite->blue=gamma*VividLight(QuantumScale*p->blue*Sa,Sa,QuantumScale*
- q->blue*Da,Da);
- if (q->colorspace == CMYKColorspace)
- composite->index=gamma*VividLight(QuantumScale*p->index*Sa,Sa,QuantumScale*
- q->index*Da,Da);
-}
-
-static MagickRealType Xor(const MagickRealType Sca,const MagickRealType Sa,
- const MagickRealType Dca,const MagickRealType Da)
-{
- return(Sca*(1-Da)+Dca*(1-Sa));
-}
-
-static inline void CompositeXor(const MagickPixelPacket *p,
- const MagickPixelPacket *q,MagickPixelPacket *composite)
-{
- MagickRealType
- Da,
- gamma,
- Sa;
-
- Sa=1.0-QuantumScale*p->opacity; /* simplify and speed up equations */
- Da=1.0-QuantumScale*q->opacity;
- gamma=Sa+Da-2*Sa*Da; /* Xor blend mode X=0,Y=1,Z=1 */
- composite->opacity=(MagickRealType) QuantumRange*(1.0-gamma);
- gamma=1.0/(fabs(gamma) <= MagickEpsilon ? 1.0 : gamma);
- composite->red=gamma*Xor(p->red*Sa,Sa,q->red*Da,Da);
- composite->green=gamma*Xor(p->green*Sa,Sa,q->green*Da,Da);
- composite->blue=gamma*Xor(p->blue*Sa,Sa,q->blue*Da,Da);
- if (q->colorspace == CMYKColorspace)
- composite->index=gamma*Xor(p->index*Sa,Sa,q->index*Da,Da);
-}
-
-static void HSBComposite(const double hue,const double saturation,
- const double brightness,MagickRealType *red,MagickRealType *green,
- MagickRealType *blue)
-{
- MagickRealType
- f,
- h,
- p,
- q,
- t;
-
- /*
- Convert HSB to RGB colorspace.
- */
- assert(red != (MagickRealType *) NULL);
- assert(green != (MagickRealType *) NULL);
- assert(blue != (MagickRealType *) NULL);
- if (saturation == 0.0)
- {
- *red=(MagickRealType) QuantumRange*brightness;
- *green=(*red);
- *blue=(*red);
- return;
- }
- h=6.0*(hue-floor(hue));
- f=h-floor((double) h);
- p=brightness*(1.0-saturation);
- q=brightness*(1.0-saturation*f);
- t=brightness*(1.0-saturation*(1.0-f));
- switch ((int) h)
- {
- case 0:
- default:
- {
- *red=(MagickRealType) QuantumRange*brightness;
- *green=(MagickRealType) QuantumRange*t;
- *blue=(MagickRealType) QuantumRange*p;
- break;
- }
- case 1:
- {
- *red=(MagickRealType) QuantumRange*q;
- *green=(MagickRealType) QuantumRange*brightness;
- *blue=(MagickRealType) QuantumRange*p;
- break;
- }
- case 2:
- {
- *red=(MagickRealType) QuantumRange*p;
- *green=(MagickRealType) QuantumRange*brightness;
- *blue=(MagickRealType) QuantumRange*t;
- break;
- }
- case 3:
- {
- *red=(MagickRealType) QuantumRange*p;
- *green=(MagickRealType) QuantumRange*q;
- *blue=(MagickRealType) QuantumRange*brightness;
- break;
- }
- case 4:
- {
- *red=(MagickRealType) QuantumRange*t;
- *green=(MagickRealType) QuantumRange*p;
- *blue=(MagickRealType) QuantumRange*brightness;
- break;
- }
- case 5:
- {
- *red=(MagickRealType) QuantumRange*brightness;
- *green=(MagickRealType) QuantumRange*p;
- *blue=(MagickRealType) QuantumRange*q;
- break;
- }
- }
-}
-
-MagickExport MagickBooleanType CompositeImage(Image *image,
- const CompositeOperator compose,const Image *composite_image,
- const ssize_t x_offset,const ssize_t y_offset)
-{
- MagickBooleanType
- status;
-
- status=CompositeImageChannel(image,DefaultChannels,compose,composite_image,
- x_offset,y_offset);
- return(status);
-}
-
-MagickExport MagickBooleanType CompositeImageChannel(Image *image,
- const ChannelType channel,const CompositeOperator compose,
- const Image *composite_image,const ssize_t x_offset,const ssize_t y_offset)
-{
-#define CompositeImageTag "Composite/Image"
-
- CacheView
- *composite_view,
- *image_view;
-
- const char
- *value;
-
- double
- sans;
-
- ExceptionInfo
- *exception;
-
- GeometryInfo
- geometry_info;
-
- Image
- *destination_image;
-
- MagickBooleanType
- modify_outside_overlay,
- status;
-
- MagickOffsetType
- progress;
-
- MagickPixelPacket
- zero;
-
- MagickRealType
- amount,
- destination_dissolve,
- midpoint,
- percent_brightness,
- percent_saturation,
- source_dissolve,
- threshold;
-
- MagickStatusType
- flags;
-
- ssize_t
- y;
-
- /*
- Prepare composite image.
- */
- assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
- if (image->debug != MagickFalse)
- (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
- assert(composite_image != (Image *) NULL);
- assert(composite_image->signature == MagickSignature);
- if (SetImageStorageClass(image,DirectClass) == MagickFalse)
- return(MagickFalse);
- GetMagickPixelPacket(image,&zero);
- destination_image=(Image *) NULL;
- amount=0.5;
- destination_dissolve=1.0;
- modify_outside_overlay=MagickFalse;
- percent_brightness=100.0;
- percent_saturation=100.0;
- source_dissolve=1.0;
- threshold=0.05f;
- switch (compose)
- {
- case ClearCompositeOp:
- case SrcCompositeOp:
- case InCompositeOp:
- case SrcInCompositeOp:
- case OutCompositeOp:
- case SrcOutCompositeOp:
- case DstInCompositeOp:
- case DstAtopCompositeOp:
- {
- /*
- Modify destination outside the overlaid region.
- */
- modify_outside_overlay=MagickTrue;
- break;
- }
- case OverCompositeOp:
- {
- if (image->matte != MagickFalse)
- break;
- if (composite_image->matte != MagickFalse)
- break;
- }
- case CopyCompositeOp:
- {
- if ((x_offset < 0) || (y_offset < 0))
- break;
- if ((x_offset+(ssize_t) composite_image->columns) >= (ssize_t) image->columns)
- break;
- if ((y_offset+(ssize_t) composite_image->rows) >= (ssize_t) image->rows)
- break;
- status=MagickTrue;
- exception=(&image->exception);
- image_view=AcquireCacheView(image);
- composite_view=AcquireCacheView(composite_image);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
-#pragma omp parallel for schedule(dynamic,4) shared(status)
-#endif
- for (y=0; y < (ssize_t) composite_image->rows; y++)
- {
- MagickBooleanType
- sync;
-
- register const IndexPacket
- *composite_indexes;
-
- register const PixelPacket
- *p;
-
- register IndexPacket
- *indexes;
-
- register PixelPacket
- *q;
-
- if (status == MagickFalse)
- continue;
- p=GetCacheViewVirtualPixels(composite_view,0,y,composite_image->columns,
- 1,exception);
- q=GetCacheViewAuthenticPixels(image_view,x_offset,y+y_offset,
- composite_image->columns,1,exception);
- if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
- {
- status=MagickFalse;
- continue;
- }
- composite_indexes=GetCacheViewVirtualIndexQueue(composite_view);
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
- (void) CopyMagickMemory(q,p,composite_image->columns*sizeof(*p));
- if ((indexes != (IndexPacket *) NULL) &&
- (composite_indexes != (const IndexPacket *) NULL))
- (void) CopyMagickMemory(indexes,composite_indexes,
- composite_image->columns*sizeof(*indexes));
- sync=SyncCacheViewAuthenticPixels(image_view,exception);
- if (sync == MagickFalse)
- status=MagickFalse;
- if (image->progress_monitor != (MagickProgressMonitor) NULL)
- {
- MagickBooleanType
- proceed;
-
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
-#pragma omp critical (MagickCore_CompositeImage)
-#endif
- proceed=SetImageProgress(image,CompositeImageTag,
- (MagickOffsetType) y,image->rows);
- if (proceed == MagickFalse)
- status=MagickFalse;
- }
- }
- composite_view=DestroyCacheView(composite_view);
- image_view=DestroyCacheView(image_view);
- return(status);
- }
- case CopyOpacityCompositeOp:
- case ChangeMaskCompositeOp:
- {
- /*
- Modify destination outside the overlaid region and require an alpha
- channel to exist, to add transparency.
- */
- if (image->matte == MagickFalse)
- (void) SetImageAlphaChannel(image,OpaqueAlphaChannel);
- modify_outside_overlay=MagickTrue;
- break;
- }
- case BlurCompositeOp:
- {
- CacheView
- *composite_view,
- *destination_view;
-
- MagickPixelPacket
- pixel;
-
- MagickRealType
- angle_range,
- angle_start,
- height,
- width;
-
- ResampleFilter
- *resample_filter;
-
- SegmentInfo
- blur;
-
- /*
- Blur Image dictated by an overlay gradient map: X = red_channel;
- Y = green_channel; compose:args = x_scale[,y_scale[,angle]].
- */
- destination_image=CloneImage(image,image->columns,image->rows,MagickTrue,
- &image->exception);
- if (destination_image == (Image *) NULL)
- return(MagickFalse);
- /*
- Determine the horizontal and vertical maximim blur.
- */
- SetGeometryInfo(&geometry_info);
- flags=NoValue;
- value=GetImageArtifact(composite_image,"compose:args");
- if (value != (char *) NULL)
- flags=ParseGeometry(value,&geometry_info);
- if ((flags & WidthValue) == 0 )
- {
- destination_image=DestroyImage(destination_image);
- return(MagickFalse);
- }
- width=geometry_info.rho;
- height=geometry_info.sigma;
- blur.x1=geometry_info.rho;
- blur.x2=0.0;
- blur.y1=0.0;
- blur.y2=geometry_info.sigma;
- angle_start=0.0;
- angle_range=0.0;
- if ((flags & HeightValue) == 0)
- blur.y2=blur.x1;
- if ((flags & XValue) != 0 )
- {
- MagickRealType
- angle;
-
- angle=DegreesToRadians(geometry_info.xi);
- blur.x1=width*cos(angle);
- blur.x2=width*sin(angle);
- blur.y1=(-height*sin(angle));
- blur.y2=height*cos(angle);
- }
- if ((flags & YValue) != 0 )
- {
- angle_start=DegreesToRadians(geometry_info.xi);
- angle_range=DegreesToRadians(geometry_info.psi)-angle_start;
- }
- /*
- Blur Image by resampling.
- */
- pixel=zero;
- exception=(&image->exception);
- resample_filter=AcquireResampleFilter(image,&image->exception);
- SetResampleFilter(resample_filter,CubicFilter,2.0);
- destination_view=AcquireCacheView(destination_image);
- composite_view=AcquireCacheView(composite_image);
- for (y=0; y < (ssize_t) composite_image->rows; y++)
- {
- MagickBooleanType
- sync;
-
- register const PixelPacket
- *restrict p;
-
- register PixelPacket
- *restrict r;
-
- register IndexPacket
- *restrict destination_indexes;
-
- register ssize_t
- x;
-
- if (((y+y_offset) < 0) || ((y+y_offset) >= (ssize_t) image->rows))
- continue;
- p=GetCacheViewVirtualPixels(composite_view,0,y,composite_image->columns,
- 1,exception);
- r=QueueCacheViewAuthenticPixels(destination_view,0,y,
- destination_image->columns,1,&image->exception);
- if ((p == (const PixelPacket *) NULL) || (r == (PixelPacket *) NULL))
- break;
- destination_indexes=GetCacheViewAuthenticIndexQueue(destination_view);
- for (x=0; x < (ssize_t) composite_image->columns; x++)
- {
- if (((x_offset+x) < 0) || ((x_offset+x) >= (ssize_t) image->columns))
- {
- p++;
- continue;
- }
- if (fabs(angle_range) > MagickEpsilon)
- {
- MagickRealType
- angle;
-
- angle=angle_start+angle_range*QuantumScale*
- GetPixelBlue(p);
- blur.x1=width*cos(angle);
- blur.x2=width*sin(angle);
- blur.y1=(-height*sin(angle));
- blur.y2=height*cos(angle);
- }
- ScaleResampleFilter(resample_filter,blur.x1*QuantumScale*
- GetPixelRed(p),blur.y1*QuantumScale*
- GetPixelGreen(p),blur.x2*QuantumScale*
- GetPixelRed(p),blur.y2*QuantumScale*
- GetPixelGreen(p));
- (void) ResamplePixelColor(resample_filter,(double) x_offset+x,
- (double) y_offset+y,&pixel);
- SetPixelPacket(destination_image,&pixel,r,destination_indexes+x);
- p++;
- r++;
- }
- sync=SyncCacheViewAuthenticPixels(destination_view,exception);
- if (sync == MagickFalse)
- break;
- }
- resample_filter=DestroyResampleFilter(resample_filter);
- composite_view=DestroyCacheView(composite_view);
- destination_view=DestroyCacheView(destination_view);
- composite_image=destination_image;
- break;
- }
- case DisplaceCompositeOp:
- case DistortCompositeOp:
- {
- CacheView
- *composite_view,
- *destination_view,
- *image_view;
-
- MagickPixelPacket
- pixel;
-
- MagickRealType
- horizontal_scale,
- vertical_scale;
-
- PointInfo
- center,
- offset;
-
- register IndexPacket
- *restrict destination_indexes;
-
- register PixelPacket
- *restrict r;
-
- /*
- Displace/Distort based on overlay gradient map:
- X = red_channel; Y = green_channel;
- compose:args = x_scale[,y_scale[,center.x,center.y]]
- */
- destination_image=CloneImage(image,image->columns,image->rows,MagickTrue,
- &image->exception);
- if (destination_image == (Image *) NULL)
- return(MagickFalse);
- SetGeometryInfo(&geometry_info);
- flags=NoValue;
- value=GetImageArtifact(composite_image,"compose:args");
- if (value != (char *) NULL)
- flags=ParseGeometry(value,&geometry_info);
- if ((flags & (WidthValue|HeightValue)) == 0 )
- {
- if ((flags & AspectValue) == 0)
- {
- horizontal_scale=(MagickRealType) (composite_image->columns-1.0)/
- 2.0;
- vertical_scale=(MagickRealType) (composite_image->rows-1.0)/2.0;
- }
- else
- {
- horizontal_scale=(MagickRealType) (image->columns-1.0)/2.0;
- vertical_scale=(MagickRealType) (image->rows-1.0)/2.0;
- }
- }
- else
- {
- horizontal_scale=geometry_info.rho;
- vertical_scale=geometry_info.sigma;
- if ((flags & PercentValue) != 0)
- {
- if ((flags & AspectValue) == 0)
- {
- horizontal_scale*=(composite_image->columns-1.0)/200.0;
- vertical_scale*=(composite_image->rows-1.0)/200.0;
- }
- else
- {
- horizontal_scale*=(image->columns-1.0)/200.0;
- vertical_scale*=(image->rows-1.0)/200.0;
- }
- }
- if ((flags & HeightValue) == 0)
- vertical_scale=horizontal_scale;
- }
- /*
- Determine fixed center point for absolute distortion map
- Absolute distort ==
- Displace offset relative to a fixed absolute point
- Select that point according to +X+Y user inputs.
- default = center of overlay image
- arg flag '!' = locations/percentage relative to background image
- */
- center.x=(MagickRealType) x_offset;
- center.y=(MagickRealType) y_offset;
- if (compose == DistortCompositeOp)
- {
- if ((flags & XValue) == 0)
- if ((flags & AspectValue) == 0)
- center.x=(MagickRealType) x_offset+(composite_image->columns-1)/
- 2.0;
- else
- center.x=((MagickRealType) image->columns-1)/2.0;
- else
- if ((flags & AspectValue) == 0)
- center.x=(MagickRealType) x_offset+geometry_info.xi;
- else
- center.x=geometry_info.xi;
- if ((flags & YValue) == 0)
- if ((flags & AspectValue) == 0)
- center.y=(MagickRealType) y_offset+(composite_image->rows-1)/2.0;
- else
- center.y=((MagickRealType) image->rows-1)/2.0;
- else
- if ((flags & AspectValue) == 0)
- center.y=(MagickRealType) y_offset+geometry_info.psi;
- else
- center.y=geometry_info.psi;
- }
- /*
- Shift the pixel offset point as defined by the provided,
- displacement/distortion map. -- Like a lens...
- */
- pixel=zero;
- exception=(&image->exception);
- image_view=AcquireCacheView(image);
- destination_view=AcquireCacheView(destination_image);
- composite_view=AcquireCacheView(composite_image);
- for (y=0; y < (ssize_t) composite_image->rows; y++)
- {
- MagickBooleanType
- sync;
-
- register const PixelPacket
- *restrict p;
-
- register ssize_t
- x;
-
- if (((y+y_offset) < 0) || ((y+y_offset) >= (ssize_t) image->rows))
- continue;
- p=GetCacheViewVirtualPixels(composite_view,0,y,composite_image->columns,
- 1,exception);
- r=QueueCacheViewAuthenticPixels(destination_view,0,y,
- destination_image->columns,1,&image->exception);
- if ((p == (const PixelPacket *) NULL) || (r == (PixelPacket *) NULL))
- break;
- destination_indexes=GetCacheViewAuthenticIndexQueue(destination_view);
- for (x=0; x < (ssize_t) composite_image->columns; x++)
- {
- if (((x_offset+x) < 0) || ((x_offset+x) >= (ssize_t) image->columns))
- {
- p++;
- continue;
- }
- /*
- Displace the offset.
- */
- offset.x=(horizontal_scale*(GetPixelRed(p)-
- (((MagickRealType) QuantumRange+1.0)/2.0)))/(((MagickRealType)
- QuantumRange+1.0)/2.0)+center.x+((compose == DisplaceCompositeOp) ?
- x : 0);
- offset.y=(vertical_scale*(GetPixelGreen(p)-
- (((MagickRealType) QuantumRange+1.0)/2.0)))/(((MagickRealType)
- QuantumRange+1.0)/2.0)+center.y+((compose == DisplaceCompositeOp) ?
- y : 0);
- (void) InterpolateMagickPixelPacket(image,image_view,
- UndefinedInterpolatePixel,(double) offset.x,(double) offset.y,
- &pixel,exception);
- /*
- Mask with the 'invalid pixel mask' in alpha channel.
- */
- pixel.opacity=(MagickRealType) QuantumRange*(1.0-(1.0-QuantumScale*
- pixel.opacity)*(1.0-QuantumScale*GetPixelOpacity(p)));
- SetPixelPacket(destination_image,&pixel,r,destination_indexes+x);
- p++;
- r++;
- }
- sync=SyncCacheViewAuthenticPixels(destination_view,exception);
- if (sync == MagickFalse)
- break;
- }
- destination_view=DestroyCacheView(destination_view);
- composite_view=DestroyCacheView(composite_view);
- image_view=DestroyCacheView(image_view);
- composite_image=destination_image;
- break;
- }
- case DissolveCompositeOp:
- {
- /*
- Geometry arguments to dissolve factors.
- */
- value=GetImageArtifact(composite_image,"compose:args");
- if (value != (char *) NULL)
- {
- flags=ParseGeometry(value,&geometry_info);
- source_dissolve=geometry_info.rho/100.0;
- destination_dissolve=1.0;
- if ((source_dissolve-MagickEpsilon) < 0.0)
- source_dissolve=0.0;
- if ((source_dissolve+MagickEpsilon) > 1.0)
- {
- destination_dissolve=2.0-source_dissolve;
- source_dissolve=1.0;
- }
- if ((flags & SigmaValue) != 0)
- destination_dissolve=geometry_info.sigma/100.0;
- if ((destination_dissolve-MagickEpsilon) < 0.0)
- destination_dissolve=0.0;
- modify_outside_overlay=MagickTrue;
- if ((destination_dissolve+MagickEpsilon) > 1.0 )
- {
- destination_dissolve=1.0;
- modify_outside_overlay=MagickFalse;
- }
- }
- break;
- }
- case BlendCompositeOp:
- {
- value=GetImageArtifact(composite_image,"compose:args");
- if (value != (char *) NULL)
- {
- flags=ParseGeometry(value,&geometry_info);
- source_dissolve=geometry_info.rho/100.0;
- destination_dissolve=1.0-source_dissolve;
- if ((flags & SigmaValue) != 0)
- destination_dissolve=geometry_info.sigma/100.0;
- modify_outside_overlay=MagickTrue;
- if ((destination_dissolve+MagickEpsilon) > 1.0)
- modify_outside_overlay=MagickFalse;
- }
- break;
- }
- case MathematicsCompositeOp:
- {
- /*
- Just collect the values from "compose:args", setting.
- Unused values are set to zero automagically.
-
- Arguments are normally a comma separated list, so this probably should
- be changed to some 'general comma list' parser, (with a minimum
- number of values)
- */
- SetGeometryInfo(&geometry_info);
- value=GetImageArtifact(composite_image,"compose:args");
- if (value != (char *) NULL)
- (void) ParseGeometry(value,&geometry_info);
- break;
- }
- case ModulateCompositeOp:
- {
- /*
- Determine the brightness and saturation scale.
- */
- value=GetImageArtifact(composite_image,"compose:args");
- if (value != (char *) NULL)
- {
- flags=ParseGeometry(value,&geometry_info);
- percent_brightness=geometry_info.rho;
- if ((flags & SigmaValue) != 0)
- percent_saturation=geometry_info.sigma;
- }
- break;
- }
- case ThresholdCompositeOp:
- {
- /*
- Determine the amount and threshold.
- This Composition method is depreciated
- */
- value=GetImageArtifact(composite_image,"compose:args");
- if (value != (char *) NULL)
- {
- flags=ParseGeometry(value,&geometry_info);
- amount=geometry_info.rho;
- threshold=geometry_info.sigma;
- if ((flags & SigmaValue) == 0)
- threshold=0.05f;
- }
- threshold*=QuantumRange;
- break;
- }
- default:
- break;
- }
- value=GetImageArtifact(composite_image,"compose:outside-overlay");
- if (value != (const char *) NULL)
- modify_outside_overlay=IsMagickTrue(value);
- /*
- Composite image.
- */
- status=MagickTrue;
- progress=0;
- midpoint=((MagickRealType) QuantumRange+1.0)/2;
- GetMagickPixelPacket(composite_image,&zero);
- exception=(&image->exception);
- image_view=AcquireCacheView(image);
- composite_view=AcquireCacheView(composite_image);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(dynamic,4) shared(progress,status)
-#endif
- for (y=0; y < (ssize_t) image->rows; y++)
- {
- const PixelPacket
- *pixels;
-
- double
- brightness,
- hue,
- saturation;
-
- MagickPixelPacket
- composite,
- destination,
- source;
-
- register const IndexPacket
- *restrict composite_indexes;
-
- register const PixelPacket
- *restrict p;
-
- register IndexPacket
- *restrict indexes;
-
- register ssize_t
- x;
-
- register PixelPacket
- *restrict q;
-
- if (status == MagickFalse)
- continue;
- if (modify_outside_overlay == MagickFalse)
- {
- if (y < y_offset)
- continue;
- if ((y-y_offset) >= (ssize_t) composite_image->rows)
- continue;
- }
- /*
- If pixels is NULL, y is outside overlay region.
- */
- pixels=(PixelPacket *) NULL;
- p=(PixelPacket *) NULL;
- if ((y >= y_offset) && ((y-y_offset) < (ssize_t) composite_image->rows))
- {
- p=GetCacheViewVirtualPixels(composite_view,0,y-y_offset,
- composite_image->columns,1,exception);
- if (p == (const PixelPacket *) NULL)
- {
- status=MagickFalse;
- continue;
- }
- pixels=p;
- if (x_offset < 0)
- p-=x_offset;
- }
- q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
- {
- status=MagickFalse;
- continue;
- }
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
- composite_indexes=GetCacheViewVirtualIndexQueue(composite_view);
- source=zero;
- destination=zero;
- hue=0.0;
- saturation=0.0;
- brightness=0.0;
- for (x=0; x < (ssize_t) image->columns; x++)
- {
- if (modify_outside_overlay == MagickFalse)
- {
- if (x < x_offset)
- {
- q++;
- continue;
- }
- if ((x-x_offset) >= (ssize_t) composite_image->columns)
- break;
- }
- destination.red=(MagickRealType) GetPixelRed(q);
- destination.green=(MagickRealType) GetPixelGreen(q);
- destination.blue=(MagickRealType) GetPixelBlue(q);
- if (image->matte != MagickFalse)
- destination.opacity=(MagickRealType) GetPixelOpacity(q);
- if (image->colorspace == CMYKColorspace)
- destination.index=(MagickRealType) GetPixelIndex(indexes+x);
- if (image->colorspace == CMYKColorspace)
- {
- destination.red=(MagickRealType) QuantumRange-destination.red;
- destination.green=(MagickRealType) QuantumRange-destination.green;
- destination.blue=(MagickRealType) QuantumRange-destination.blue;
- destination.index=(MagickRealType) QuantumRange-destination.index;
- }
- /*
- Handle destination modifications outside overlaid region.
- */
- composite=destination;
- if ((pixels == (PixelPacket *) NULL) || (x < x_offset) ||
- ((x-x_offset) >= (ssize_t) composite_image->columns))
- {
- switch (compose)
- {
- case DissolveCompositeOp:
- case BlendCompositeOp:
- {
- composite.opacity=(MagickRealType) (QuantumRange-
- destination_dissolve*(QuantumRange-composite.opacity));
- break;
- }
- case ClearCompositeOp:
- case SrcCompositeOp:
- {
- CompositeClear(&destination,&composite);
- break;
- }
- case InCompositeOp:
- case SrcInCompositeOp:
- case OutCompositeOp:
- case SrcOutCompositeOp:
- case DstInCompositeOp:
- case DstAtopCompositeOp:
- case CopyOpacityCompositeOp:
- case ChangeMaskCompositeOp:
- {
- composite.opacity=(MagickRealType) TransparentOpacity;
- break;
- }
- default:
- {
- (void) GetOneVirtualMagickPixel(composite_image,x-x_offset,
- y-y_offset,&composite,exception);
- break;
- }
- }
- if (image->colorspace == CMYKColorspace)
- {
- composite.red=(MagickRealType) QuantumRange-composite.red;
- composite.green=(MagickRealType) QuantumRange-composite.green;
- composite.blue=(MagickRealType) QuantumRange-composite.blue;
- composite.index=(MagickRealType) QuantumRange-composite.index;
- }
- SetPixelRed(q,ClampToQuantum(composite.red));
- SetPixelGreen(q,ClampToQuantum(composite.green));
- SetPixelBlue(q,ClampToQuantum(composite.blue));
- if (image->matte != MagickFalse)
- SetPixelOpacity(q,ClampToQuantum(composite.opacity));
- if (image->colorspace == CMYKColorspace)
- SetPixelIndex(indexes+x,ClampToQuantum(composite.index));
- q++;
- continue;
- }
- /*
- Handle normal overlay of source onto destination.
- */
- source.red=(MagickRealType) GetPixelRed(p);
- source.green=(MagickRealType) GetPixelGreen(p);
- source.blue=(MagickRealType) GetPixelBlue(p);
- if (composite_image->matte != MagickFalse)
- source.opacity=(MagickRealType) GetPixelOpacity(p);
- if (composite_image->colorspace == CMYKColorspace)
- source.index=(MagickRealType) GetPixelIndex(composite_indexes+
- x-x_offset);
- if (composite_image->colorspace == CMYKColorspace)
- {
- source.red=(MagickRealType) QuantumRange-source.red;
- source.green=(MagickRealType) QuantumRange-source.green;
- source.blue=(MagickRealType) QuantumRange-source.blue;
- source.index=(MagickRealType) QuantumRange-source.index;
- }
- switch (compose)
- {
- /* Duff-Porter Compositions */
- case ClearCompositeOp:
- {
- CompositeClear(&destination,&composite);
- break;
- }
- case SrcCompositeOp:
- case CopyCompositeOp:
- case ReplaceCompositeOp:
- {
- composite=source;
- break;
- }
- case NoCompositeOp:
- case DstCompositeOp:
- break;
- case OverCompositeOp:
- case SrcOverCompositeOp:
- {
- MagickPixelCompositeOver(&source,source.opacity,&destination,
- destination.opacity,&composite);
- break;
- }
- case DstOverCompositeOp:
- {
- MagickPixelCompositeOver(&destination,destination.opacity,&source,
- source.opacity,&composite);
- break;
- }
- case SrcInCompositeOp:
- case InCompositeOp:
- {
- CompositeIn(&source,&destination,&composite);
- break;
- }
- case DstInCompositeOp:
- {
- CompositeIn(&destination,&source,&composite);
- break;
- }
- case OutCompositeOp:
- case SrcOutCompositeOp:
- {
- CompositeOut(&source,&destination,&composite);
- break;
- }
- case DstOutCompositeOp:
- {
- CompositeOut(&destination,&source,&composite);
- break;
- }
- case AtopCompositeOp:
- case SrcAtopCompositeOp:
- {
- CompositeAtop(&source,&destination,&composite);
- break;
- }
- case DstAtopCompositeOp:
- {
- CompositeAtop(&destination,&source,&composite);
- break;
- }
- case XorCompositeOp:
- {
- CompositeXor(&source,&destination,&composite);
- break;
- }
- /* Mathematical Compositions */
- case PlusCompositeOp:
- {
- CompositePlus(&source,&destination,channel,&composite);
- break;
- }
- case MinusDstCompositeOp:
- {
- CompositeMinus(&source,&destination,channel,&composite);
- break;
- }
- case MinusSrcCompositeOp:
- {
- CompositeMinus(&destination,&source,channel,&composite);
- break;
- }
- case ModulusAddCompositeOp:
- {
- CompositeModulusAdd(&source,&destination,channel,&composite);
- break;
- }
- case ModulusSubtractCompositeOp:
- {
- CompositeModulusSubtract(&source,&destination,channel,&composite);
- break;
- }
- case DifferenceCompositeOp:
- {
- CompositeDifference(&source,&destination,channel,&composite);
- break;
- }
- case ExclusionCompositeOp:
- {
- CompositeExclusion(&source,&destination,channel,&composite);
- break;
- }
- case MultiplyCompositeOp:
- {
- CompositeMultiply(&source,&destination,channel,&composite);
- break;
- }
- case ScreenCompositeOp:
- {
- CompositeScreen(&source,&destination,channel,&composite);
- break;
- }
- case DivideDstCompositeOp:
- {
- CompositeDivide(&source,&destination,channel,&composite);
- break;
- }
- case DivideSrcCompositeOp:
- {
- CompositeDivide(&destination,&source,channel,&composite);
- break;
- }
- case DarkenCompositeOp:
- {
- CompositeDarken(&source,&destination,channel,&composite);
- break;
- }
- case LightenCompositeOp:
- {
- CompositeLighten(&source,&destination,channel,&composite);
- break;
- }
- case DarkenIntensityCompositeOp:
- {
- CompositeDarkenIntensity(&source,&destination,channel,&composite);
- break;
- }
- case LightenIntensityCompositeOp:
- {
- CompositeLightenIntensity(&source,&destination,channel,&composite);
- break;
- }
- case MathematicsCompositeOp:
- {
- CompositeMathematics(&source,&destination,channel,&geometry_info,
- &composite);
- break;
- }
- /* Lighting Compositions */
- case ColorDodgeCompositeOp:
- {
- CompositeColorDodge(&source,&destination,&composite);
- break;
- }
- case ColorBurnCompositeOp:
- {
- CompositeColorBurn(&source,&destination,&composite);
- break;
- }
- case LinearDodgeCompositeOp:
- {
- CompositeLinearDodge(&source,&destination,&composite);
- break;
- }
- case LinearBurnCompositeOp:
- {
- CompositeLinearBurn(&source,&destination,&composite);
- break;
- }
- case HardLightCompositeOp:
- {
- CompositeHardLight(&source,&destination,&composite);
- break;
- }
- case OverlayCompositeOp:
- {
- /* Overlay = Reversed HardLight. */
- CompositeHardLight(&destination,&source,&composite);
- break;
- }
- case SoftLightCompositeOp:
- {
- CompositeSoftLight(&source,&destination,&composite);
- break;
- }
- case LinearLightCompositeOp:
- {
- CompositeLinearLight(&source,&destination,&composite);
- break;
- }
- case PegtopLightCompositeOp:
- {
- CompositePegtopLight(&source,&destination,&composite);
- break;
- }
- case VividLightCompositeOp:
- {
- CompositeVividLight(&source,&destination,&composite);
- break;
- }
- case PinLightCompositeOp:
- {
- CompositePinLight(&source,&destination,&composite);
- break;
- }
- /* Other Composition */
- case ChangeMaskCompositeOp:
- {
- if ((composite.opacity > ((MagickRealType) QuantumRange/2.0)) ||
- (IsMagickColorSimilar(&source,&destination) != MagickFalse))
- composite.opacity=(MagickRealType) TransparentOpacity;
- else
- composite.opacity=(MagickRealType) OpaqueOpacity;
- break;
- }
- case BumpmapCompositeOp:
- {
- if (source.opacity == TransparentOpacity)
- break;
- CompositeBumpmap(&source,&destination,&composite);
- break;
- }
- case DissolveCompositeOp:
- {
- MagickPixelCompositeOver(&source,(MagickRealType) (QuantumRange-
- source_dissolve*(QuantumRange-source.opacity)),&destination,
- (MagickRealType) (QuantumRange-destination_dissolve*(QuantumRange-
- destination.opacity)),&composite);
- break;
- }
- case BlendCompositeOp:
- {
- MagickPixelCompositeBlend(&source,source_dissolve,&destination,
- destination_dissolve,&composite);
- break;
- }
- case ThresholdCompositeOp:
- {
- CompositeThreshold(&source,&destination,threshold,amount,&composite);
- break;
- }
- case ModulateCompositeOp:
- {
- ssize_t
- offset;
-
- if (source.opacity == TransparentOpacity)
- break;
- offset=(ssize_t) (MagickPixelIntensityToQuantum(&source)-midpoint);
- if (offset == 0)
- break;
- CompositeHSB(destination.red,destination.green,destination.blue,&hue,
- &saturation,&brightness);
- brightness+=(0.01*percent_brightness*offset)/midpoint;
- saturation*=0.01*percent_saturation;
- HSBComposite(hue,saturation,brightness,&composite.red,
- &composite.green,&composite.blue);
- break;
- }
- case HueCompositeOp:
- {
- if (source.opacity == TransparentOpacity)
- break;
- if (destination.opacity == TransparentOpacity)
- {
- composite=source;
- break;
- }
- CompositeHSB(destination.red,destination.green,destination.blue,&hue,
- &saturation,&brightness);
- CompositeHSB(source.red,source.green,source.blue,&hue,&sans,&sans);
- HSBComposite(hue,saturation,brightness,&composite.red,
- &composite.green,&composite.blue);
- if (source.opacity < destination.opacity)
- composite.opacity=source.opacity;
- break;
- }
- case SaturateCompositeOp:
- {
- if (source.opacity == TransparentOpacity)
- break;
- if (destination.opacity == TransparentOpacity)
- {
- composite=source;
- break;
- }
- CompositeHSB(destination.red,destination.green,destination.blue,&hue,
- &saturation,&brightness);
- CompositeHSB(source.red,source.green,source.blue,&sans,&saturation,
- &sans);
- HSBComposite(hue,saturation,brightness,&composite.red,
- &composite.green,&composite.blue);
- if (source.opacity < destination.opacity)
- composite.opacity=source.opacity;
- break;
- }
- case LuminizeCompositeOp:
- {
- if (source.opacity == TransparentOpacity)
- break;
- if (destination.opacity == TransparentOpacity)
- {
- composite=source;
- break;
- }
- CompositeHSB(destination.red,destination.green,destination.blue,&hue,
- &saturation,&brightness);
- CompositeHSB(source.red,source.green,source.blue,&sans,&sans,
- &brightness);
- HSBComposite(hue,saturation,brightness,&composite.red,
- &composite.green,&composite.blue);
- if (source.opacity < destination.opacity)
- composite.opacity=source.opacity;
- break;
- }
- case ColorizeCompositeOp:
- {
- if (source.opacity == TransparentOpacity)
- break;
- if (destination.opacity == TransparentOpacity)
- {
- composite=source;
- break;
- }
- CompositeHSB(destination.red,destination.green,destination.blue,&sans,
- &sans,&brightness);
- CompositeHSB(source.red,source.green,source.blue,&hue,&saturation,
- &sans);
- HSBComposite(hue,saturation,brightness,&composite.red,
- &composite.green,&composite.blue);
- if (source.opacity < destination.opacity)
- composite.opacity=source.opacity;
- break;
- }
- case CopyRedCompositeOp:
- case CopyCyanCompositeOp:
- {
- composite.red=source.red;
- break;
- }
- case CopyGreenCompositeOp:
- case CopyMagentaCompositeOp:
- {
- composite.green=source.green;
- break;
- }
- case CopyBlueCompositeOp:
- case CopyYellowCompositeOp:
- {
- composite.blue=source.blue;
- break;
- }
- case CopyOpacityCompositeOp:
- {
- if (source.matte == MagickFalse)
- {
- composite.opacity=(MagickRealType) (QuantumRange-
- MagickPixelIntensityToQuantum(&source));
- break;
- }
- composite.opacity=source.opacity;
- break;
- }
- case CopyBlackCompositeOp:
- {
- if (source.colorspace != CMYKColorspace)
- ConvertRGBToCMYK(&source);
- composite.index=source.index;
- break;
- }
- /* compose methods that are already handled */
- case BlurCompositeOp:
- case DisplaceCompositeOp:
- case DistortCompositeOp:
- {
- composite=source;
- break;
- }
- default:
- break;
- }
- if (image->colorspace == CMYKColorspace)
- {
- composite.red=(MagickRealType) QuantumRange-composite.red;
- composite.green=(MagickRealType) QuantumRange-composite.green;
- composite.blue=(MagickRealType) QuantumRange-composite.blue;
- composite.index=(MagickRealType) QuantumRange-composite.index;
- }
- SetPixelRed(q,ClampToQuantum(composite.red));
- SetPixelGreen(q,ClampToQuantum(composite.green));
- SetPixelBlue(q,ClampToQuantum(composite.blue));
- SetPixelOpacity(q,ClampToQuantum(composite.opacity));
- if (image->colorspace == CMYKColorspace)
- SetPixelIndex(indexes+x,ClampToQuantum(composite.index));
- p++;
- if (p >= (pixels+composite_image->columns))
- p=pixels;
- q++;
- }
- if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
- status=MagickFalse;
- if (image->progress_monitor != (MagickProgressMonitor) NULL)
- {
- MagickBooleanType
- proceed;
-
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp critical (MagickCore_CompositeImageChannel)
-#endif
- proceed=SetImageProgress(image,CompositeImageTag,progress++,
- image->rows);
- if (proceed == MagickFalse)
- status=MagickFalse;
- }
- }
- composite_view=DestroyCacheView(composite_view);
- image_view=DestroyCacheView(image_view);
- if (destination_image != (Image * ) NULL)
- destination_image=DestroyImage(destination_image);
- return(status);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% T e x t u r e I m a g e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% TextureImage() repeatedly tiles the texture image across and down the image
-% canvas.
-%
-% The format of the TextureImage method is:
-%
-% MagickBooleanType TextureImage(Image *image,const Image *texture)
-%
-% A description of each parameter follows:
-%
-% o image: the image.
-%
-% o texture: This image is the texture to layer on the background.
-%
-*/
-MagickExport MagickBooleanType TextureImage(Image *image,const Image *texture)
-{
-#define TextureImageTag "Texture/Image"
-
- CacheView
- *image_view,
- *texture_view;
-
- ExceptionInfo
- *exception;
-
- MagickBooleanType
- status;
-
- ssize_t
- y;
-
- assert(image != (Image *) NULL);
- if (image->debug != MagickFalse)
- (void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
- assert(image->signature == MagickSignature);
- if (texture == (const Image *) NULL)
- return(MagickFalse);
- (void) SetImageVirtualPixelMethod(texture,TileVirtualPixelMethod);
- if (SetImageStorageClass(image,DirectClass) == MagickFalse)
- return(MagickFalse);
- status=MagickTrue;
- if ((image->compose != CopyCompositeOp) &&
- ((image->compose != OverCompositeOp) || (image->matte != MagickFalse) ||
- (texture->matte != MagickFalse)))
- {
- /*
- Tile texture onto the image background.
- */
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(dynamic,4) shared(status) omp_throttle(1)
-#endif
- for (y=0; y < (ssize_t) image->rows; y+=(ssize_t) texture->rows)
- {
- register ssize_t
- x;
-
- if (status == MagickFalse)
- continue;
- for (x=0; x < (ssize_t) image->columns; x+=(ssize_t) texture->columns)
- {
- MagickBooleanType
- thread_status;
-
- thread_status=CompositeImage(image,image->compose,texture,x+
- texture->tile_offset.x,y+texture->tile_offset.y);
- if (thread_status == MagickFalse)
- {
- status=thread_status;
- break;
- }
- }
- if (image->progress_monitor != (MagickProgressMonitor) NULL)
- {
- MagickBooleanType
- proceed;
-
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp critical (MagickCore_TextureImage)
-#endif
- proceed=SetImageProgress(image,TextureImageTag,(MagickOffsetType)
- y,image->rows);
- if (proceed == MagickFalse)
- status=MagickFalse;
- }
- }
- (void) SetImageProgress(image,TextureImageTag,(MagickOffsetType)
- image->rows,image->rows);
- return(status);
- }
- /*
- Tile texture onto the image background (optimized).
- */
- status=MagickTrue;
- exception=(&image->exception);
- image_view=AcquireCacheView(image);
- texture_view=AcquireCacheView(texture);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(dynamic,4) shared(status) omp_throttle(1)
-#endif
- for (y=0; y < (ssize_t) image->rows; y++)
- {
- MagickBooleanType
- sync;
-
- register const IndexPacket
- *texture_indexes;
-
- register const PixelPacket
- *p;
-
- register IndexPacket
- *indexes;
-
- register ssize_t
- x;
-
- register PixelPacket
- *q;
-
- size_t
- width;
-
- if (status == MagickFalse)
- continue;
- p=GetCacheViewVirtualPixels(texture_view,texture->tile_offset.x,(y+
- texture->tile_offset.y) % texture->rows,texture->columns,1,exception);
- q=QueueCacheViewAuthenticPixels(image_view,0,y,image->columns,1,
- exception);
- if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
- {
- status=MagickFalse;
- continue;
- }
- texture_indexes=GetCacheViewVirtualIndexQueue(texture_view);
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
- for (x=0; x < (ssize_t) image->columns; x+=(ssize_t) texture->columns)
- {
- width=texture->columns;
- if ((x+(ssize_t) width) > (ssize_t) image->columns)
- width=image->columns-x;
- (void) CopyMagickMemory(q,p,width*sizeof(*p));
- if ((image->colorspace == CMYKColorspace) &&
- (texture->colorspace == CMYKColorspace))
- {
- (void) CopyMagickMemory(indexes,texture_indexes,width*
- sizeof(*indexes));
- indexes+=width;
- }
- q+=width;
- }
- sync=SyncCacheViewAuthenticPixels(image_view,exception);
- if (sync == MagickFalse)
- status=MagickFalse;
- if (image->progress_monitor != (MagickProgressMonitor) NULL)
- {
- MagickBooleanType
- proceed;
-
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp critical (MagickCore_TextureImage)
-#endif
- proceed=SetImageProgress(image,TextureImageTag,(MagickOffsetType) y,
- image->rows);
- if (proceed == MagickFalse)
- status=MagickFalse;
- }
- }
- texture_view=DestroyCacheView(texture_view);
- image_view=DestroyCacheView(image_view);
- return(status);
-}
diff --git a/magick/deprecate.c b/magick/deprecate.c
deleted file mode 100644
index 9ae7c44..0000000
--- a/magick/deprecate.c
+++ /dev/null
@@ -1,7143 +0,0 @@
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% DDDD EEEEE PPPP RRRR EEEEE CCCC AAA TTTTT EEEEE %
-% D D E P P R R E C A A T E %
-% D D EEE PPPPP RRRR EEE C AAAAA T EEE %
-% D D E P R R E C A A T E %
-% DDDD EEEEE P R R EEEEE CCCC A A T EEEEE %
-% %
-% %
-% MagickCore Deprecated Methods %
-% %
-% Software Design %
-% John Cristy %
-% October 2002 %
-% %
-% %
-% Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization %
-% dedicated to making software imaging solutions freely available. %
-% %
-% You may not use this file except in compliance with the License. You may %
-% obtain a copy of the License at %
-% %
-% http://www.imagemagick.org/script/license.php %
-% %
-% Unless required by applicable law or agreed to in writing, software %
-% distributed under the License is distributed on an "AS IS" BASIS, %
-% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. %
-% See the License for the specific language governing permissions and %
-% limitations under the License. %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-%
-%
-*/
-
-/*
- Include declarations.
-*/
-#include "magick/studio.h"
-#include "magick/property.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/cache.h"
-#include "magick/cache-view.h"
-#include "magick/client.h"
-#include "magick/color.h"
-#include "magick/color-private.h"
-#include "magick/colormap.h"
-#include "magick/colormap-private.h"
-#include "magick/colorspace.h"
-#include "magick/composite.h"
-#include "magick/composite-private.h"
-#include "magick/constitute.h"
-#include "magick/deprecate.h"
-#include "magick/draw.h"
-#include "magick/draw-private.h"
-#include "magick/effect.h"
-#include "magick/enhance.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/fx.h"
-#include "magick/geometry.h"
-#include "magick/identify.h"
-#include "magick/image.h"
-#include "magick/image-private.h"
-#include "magick/list.h"
-#include "magick/log.h"
-#include "magick/memory_.h"
-#include "magick/magick.h"
-#include "magick/monitor.h"
-#include "magick/monitor-private.h"
-#include "magick/morphology.h"
-#include "magick/paint.h"
-#include "magick/pixel.h"
-#include "magick/pixel-private.h"
-#include "magick/quantize.h"
-#include "magick/random_.h"
-#include "magick/resource_.h"
-#include "magick/semaphore.h"
-#include "magick/segment.h"
-#include "magick/splay-tree.h"
-#include "magick/statistic.h"
-#include "magick/string_.h"
-#include "magick/threshold.h"
-#include "magick/transform.h"
-#include "magick/utility.h"
-
-#if !defined(MAGICKCORE_EXCLUDE_DEPRECATED)
-/*
- Global declarations.
-*/
-static MonitorHandler
- monitor_handler = (MonitorHandler) NULL;
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% A c q u i r e C a c h e V i e w I n d e x e s %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% AcquireCacheViewIndexes() returns the indexes associated with the specified
-% view.
-%
-% Deprecated, replace with:
-%
-% GetCacheViewVirtualIndexQueue(cache_view);
-%
-% The format of the AcquireCacheViewIndexes method is:
-%
-% const IndexPacket *AcquireCacheViewIndexes(const CacheView *cache_view)
-%
-% A description of each parameter follows:
-%
-% o cache_view: the cache view.
-%
-*/
-MagickExport const IndexPacket *AcquireCacheViewIndexes(
- const CacheView *cache_view)
-{
- return(GetCacheViewVirtualIndexQueue(cache_view));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% A c q u i r e C a c h e V i e w P i x e l s %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% AcquireCacheViewPixels() gets pixels from the in-memory or disk pixel cache
-% as defined by the geometry parameters. A pointer to the pixels is returned
-% if the pixels are transferred, otherwise a NULL is returned.
-%
-% Deprecated, replace with:
-%
-% GetCacheViewVirtualPixels(cache_view,x,y,columns,rows,exception);
-%
-% The format of the AcquireCacheViewPixels method is:
-%
-% const PixelPacket *AcquireCacheViewPixels(const CacheView *cache_view,
-% const ssize_t x,const ssize_t y,const size_t columns,
-% const size_t rows,ExceptionInfo *exception)
-%
-% A description of each parameter follows:
-%
-% o cache_view: the cache view.
-%
-% o x,y,columns,rows: These values define the perimeter of a region of
-% pixels.
-%
-% o exception: return any errors or warnings in this structure.
-%
-*/
-MagickExport const PixelPacket *AcquireCacheViewPixels(
- const CacheView *cache_view,const ssize_t x,const ssize_t y,
- const size_t columns,const size_t rows,ExceptionInfo *exception)
-{
- return(GetCacheViewVirtualPixels(cache_view,x,y,columns,rows,exception));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% A c q u i r e I m a g e P i x e l s %
-% % % %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% AcquireImagePixels() returns an immutable pixel region. If the
-% region is successfully accessed, a pointer to it is returned, otherwise
-% NULL is returned. The returned pointer may point to a temporary working
-% copy of the pixels or it may point to the original pixels in memory.
-% Performance is maximized if the selected region is part of one row, or one
-% or more full rows, since there is opportunity to access the pixels in-place
-% (without a copy) if the image is in RAM, or in a memory-mapped file. The
-% returned pointer should *never* be deallocated by the user.
-%
-% Pixels accessed via the returned pointer represent a simple array of type
-% PixelPacket. If the image type is CMYK or the storage class is PseudoClass,
-% call GetAuthenticIndexQueue() after invoking GetAuthenticPixels() to access
-% the black color component or to obtain the colormap indexes (of type
-% IndexPacket) corresponding to the region.
-%
-% If you plan to modify the pixels, use GetAuthenticPixels() instead.
-%
-% Note, the AcquireImagePixels() and GetAuthenticPixels() methods are not
-% thread-safe. In a threaded environment, use GetCacheViewVirtualPixels() or
-% GetCacheViewAuthenticPixels() instead.
-%
-% Deprecated, replace with:
-%
-% GetVirtualPixels(image,x,y,columns,rows,exception);
-%
-% The format of the AcquireImagePixels() method is:
-%
-% const PixelPacket *AcquireImagePixels(const Image *image,const ssize_t x,
-% const ssize_t y,const size_t columns,const size_t rows,
-% ExceptionInfo *exception)
-%
-% A description of each parameter follows:
-%
-% o image: the image.
-%
-% o x,y,columns,rows: These values define the perimeter of a region of
-% pixels.
-%
-% o exception: return any errors or warnings in this structure.
-%
-*/
-MagickExport const PixelPacket *AcquireImagePixels(const Image *image,
- const ssize_t x,const ssize_t y,const size_t columns,
- const size_t rows,ExceptionInfo *exception)
-{
- return(GetVirtualPixels(image,x,y,columns,rows,exception));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% A c q u i r e I n d e x e s %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% AcquireIndexes() returns the black channel or the colormap indexes
-% associated with the last call to QueueAuthenticPixels() or
-% GetVirtualPixels(). NULL is returned if the black channel or colormap
-% indexes are not available.
-%
-% Deprecated, replace with:
-%
-% GetVirtualIndexQueue(image);
-%
-% The format of the AcquireIndexes() method is:
-%
-% const IndexPacket *AcquireIndexes(const Image *image)
-%
-% A description of each parameter follows:
-%
-% o indexes: AcquireIndexes() returns the indexes associated with the last
-% call to QueueAuthenticPixels() or GetVirtualPixels().
-%
-% o image: the image.
-%
-*/
-MagickExport const IndexPacket *AcquireIndexes(const Image *image)
-{
- return(GetVirtualIndexQueue(image));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% A c q u i r e M e m o r y %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% AcquireMemory() returns a pointer to a block of memory at least size bytes
-% suitably aligned for any use.
-%
-% The format of the AcquireMemory method is:
-%
-% void *AcquireMemory(const size_t size)
-%
-% A description of each parameter follows:
-%
-% o size: the size of the memory in bytes to allocate.
-%
-*/
-MagickExport void *AcquireMemory(const size_t size)
-{
- void
- *allocation;
-
- assert(size != 0);
- (void) LogMagickEvent(DeprecateEvent,GetMagickModule(),"last use: v5.5.7");
- allocation=malloc(size);
- return(allocation);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% A c q u i r e O n e C a c h e V i e w P i x e l %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% AcquireOneCacheViewPixel() returns a single pixel at the specified (x,y)
-% location. The image background color is returned if an error occurs. If
-% you plan to modify the pixel, use GetOneCacheViewAuthenticPixel() instead.
-%
-% Deprecated, replace with:
-%
-% GetOneCacheViewVirtualPixel(cache_view,x,y,pixel,exception);
-%
-% The format of the AcquireOneCacheViewPixel method is:
-%
-% MagickBooleanType AcquireOneCacheViewPixel(const CacheView *cache_view,
-% const ssize_t x,const ssize_t y,PixelPacket *pixel,ExceptionInfo *exception)
-%
-% A description of each parameter follows:
-%
-% o cache_view: the cache view.
-%
-% o x,y: These values define the offset of the pixel.
-%
-% o pixel: return a pixel at the specified (x,y) location.
-%
-% o exception: return any errors or warnings in this structure.
-%
-*/
-MagickExport MagickBooleanType AcquireOneCacheViewPixel(
- const CacheView *cache_view,const ssize_t x,const ssize_t y,PixelPacket *pixel,
- ExceptionInfo *exception)
-{
- return(GetOneCacheViewVirtualPixel(cache_view,x,y,pixel,exception));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% A c q u i r e O n e C a c h e V i e w V i r t u a l P i x e l %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% AcquireOneCacheViewVirtualPixel() returns a single pixel at the specified
-% (x,y) location. The image background color is returned if an error occurs.
-% If you plan to modify the pixel, use GetOneCacheViewAuthenticPixel() instead.
-%
-% Deprecated, replace with:
-%
-% GetOneCacheViewVirtualMethodPixel(cache_view,virtual_pixel_method,
-% x,y,pixel,exception);
-%
-% The format of the AcquireOneCacheViewPixel method is:
-%
-% MagickBooleanType AcquireOneCacheViewVirtualPixel(
-% const CacheView *cache_view,
-% const VirtualPixelMethod virtual_pixel_method,const ssize_t x,
-% const ssize_t y,PixelPacket *pixel,ExceptionInfo *exception)
-%
-% A description of each parameter follows:
-%
-% o cache_view: the cache view.
-%
-% o virtual_pixel_method: the virtual pixel method.
-%
-% o x,y: These values define the offset of the pixel.
-%
-% o pixel: return a pixel at the specified (x,y) location.
-%
-% o exception: return any errors or warnings in this structure.
-%
-*/
-MagickExport MagickBooleanType AcquireOneCacheViewVirtualPixel(
- const CacheView *cache_view,const VirtualPixelMethod virtual_pixel_method,
- const ssize_t x,const ssize_t y,PixelPacket *pixel,ExceptionInfo *exception)
-{
- MagickBooleanType
- status;
-
- status=GetOneCacheViewVirtualMethodPixel(cache_view,virtual_pixel_method,
- x,y,pixel,exception);
- return(status);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% A c q u i r e O n e M a g i c k P i x e l %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% AcquireOneMagickPixel() returns a single pixel at the specified (x,y)
-% location. The image background color is returned if an error occurs. If
-% you plan to modify the pixel, use GetOnePixel() instead.
-%
-% Deprecated, replace with:
-%
-% MagickPixelPacket pixel;
-% GetOneVirtualMagickPixel(image,x,y,&pixel,exception);
-%
-% The format of the AcquireOneMagickPixel() method is:
-%
-% MagickPixelPacket AcquireOneMagickPixel(const Image image,const ssize_t x,
-% const ssize_t y,ExceptionInfo exception)
-%
-% A description of each parameter follows:
-%
-% o image: the image.
-%
-% o x,y: These values define the location of the pixel to return.
-%
-% o exception: return any errors or warnings in this structure.
-%
-*/
-MagickExport MagickPixelPacket AcquireOneMagickPixel(const Image *image,
- const ssize_t x,const ssize_t y,ExceptionInfo *exception)
-{
- MagickPixelPacket
- pixel;
-
- (void) GetOneVirtualMagickPixel(image,x,y,&pixel,exception);
- return(pixel);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% A c q u i r e O n e P i x e l %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% AcquireOnePixel() returns a single pixel at the specified (x,y) location.
-% The image background color is returned if an error occurs. If you plan to
-% modify the pixel, use GetOnePixel() instead.
-%
-% Deprecated, replace with:
-%
-% PixelPacket pixel;
-% GetOneVirtualPixel(image,x,y,&pixel,exception);
-%
-% The format of the AcquireOnePixel() method is:
-%
-% PixelPacket AcquireOnePixel(const Image image,const ssize_t x,
-% const ssize_t y,ExceptionInfo exception)
-%
-% A description of each parameter follows:
-%
-% o image: the image.
-%
-% o x,y: These values define the location of the pixel to return.
-%
-% o exception: return any errors or warnings in this structure.
-%
-*/
-MagickExport PixelPacket AcquireOnePixel(const Image *image,const ssize_t x,
- const ssize_t y,ExceptionInfo *exception)
-{
- PixelPacket
- pixel;
-
- (void) GetOneVirtualPixel(image,x,y,&pixel,exception);
- return(pixel);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% A c q u i r e O n e V i r t u a l P i x e l %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% AcquireOneVirtualPixel() returns a single pixel at the specified (x,y)
-% location as defined by specified pixel method. The image background color
-% is returned if an error occurs. If you plan to modify the pixel, use
-% GetOnePixel() instead.
-%
-% Deprecated, replace with:
-%
-% PixelPacket pixel;
-% GetOneVirtualMethodPixel(image,virtual_pixel_method,x,y,&pixel,exception);
-%
-% The format of the AcquireOneVirtualPixel() method is:
-%
-% PixelPacket AcquireOneVirtualPixel(const Image image,
-% const VirtualPixelMethod virtual_pixel_method,const ssize_t x,
-% const ssize_t y,ExceptionInfo exception)
-%
-% A description of each parameter follows:
-%
-% o virtual_pixel_method: the virtual pixel method.
-%
-% o image: the image.
-%
-% o x,y: These values define the location of the pixel to return.
-%
-% o exception: return any errors or warnings in this structure.
-%
-*/
-MagickExport PixelPacket AcquireOneVirtualPixel(const Image *image,
- const VirtualPixelMethod virtual_pixel_method,const ssize_t x,const ssize_t y,
- ExceptionInfo *exception)
-{
- PixelPacket
- pixel;
-
- (void) GetOneVirtualMethodPixel(image,virtual_pixel_method,x,y,&pixel,
- exception);
- return(pixel);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% A c q u i r e P i x e l s %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% AcquirePixels() returns the pixels associated with the last call to
-% QueueAuthenticPixels() or GetVirtualPixels().
-%
-% Deprecated, replace with:
-%
-% GetVirtualPixelQueue(image);
-%
-% The format of the AcquirePixels() method is:
-%
-% const PixelPacket *AcquirePixels(const Image image)
-%
-% A description of each parameter follows:
-%
-% o image: the image.
-%
-*/
-MagickExport const PixelPacket *AcquirePixels(const Image *image)
-{
- return(GetVirtualPixelQueue(image));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% A f f i n i t y I m a g e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% AffinityImage() replaces the colors of an image with the closest color from
-% a reference image.
-%
-% Deprecated, replace with:
-%
-% RemapImage(quantize_info,image,affinity_image);
-%
-% The format of the AffinityImage method is:
-%
-% MagickBooleanType AffinityImage(const QuantizeInfo *quantize_info,
-% Image *image,const Image *affinity_image)
-%
-% A description of each parameter follows:
-%
-% o quantize_info: Specifies a pointer to an QuantizeInfo structure.
-%
-% o image: the image.
-%
-% o affinity_image: the reference image.
-%
-*/
-MagickExport MagickBooleanType AffinityImage(const QuantizeInfo *quantize_info,
- Image *image,const Image *affinity_image)
-{
- return(RemapImage(quantize_info,image,affinity_image));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% A f f i n i t y I m a g e s %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% AffinityImages() replaces the colors of a sequence of images with the
-% closest color from a reference image.
-%
-% Deprecated, replace with:
-%
-% RemapImages(quantize_info,images,affinity_image);
-%
-% The format of the AffinityImage method is:
-%
-% MagickBooleanType AffinityImages(const QuantizeInfo *quantize_info,
-% Image *images,Image *affinity_image)
-%
-% A description of each parameter follows:
-%
-% o quantize_info: Specifies a pointer to an QuantizeInfo structure.
-%
-% o images: the image sequence.
-%
-% o affinity_image: the reference image.
-%
-*/
-MagickExport MagickBooleanType AffinityImages(const QuantizeInfo *quantize_info,
- Image *images,const Image *affinity_image)
-{
- return(RemapImages(quantize_info,images,affinity_image));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% A l l o c a t e I m a g e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% AllocateImage() returns a pointer to an image structure initialized to
-% default values.
-%
-% Deprecated, replace with:
-%
-% AcquireImage(image_info);
-%
-% The format of the AllocateImage method is:
-%
-% Image *AllocateImage(const ImageInfo *image_info)
-%
-% A description of each parameter follows:
-%
-% o image_info: Many of the image default values are set from this
-% structure. For example, filename, compression, depth, background color,
-% and others.
-%
-*/
-MagickExport Image *AllocateImage(const ImageInfo *image_info)
-{
- return(AcquireImage(image_info));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% A l l o c a t e I m a g e C o l o r m a p %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% AllocateImageColormap() allocates an image colormap and initializes
-% it to a linear gray colorspace. If the image already has a colormap,
-% it is replaced. AllocateImageColormap() returns MagickTrue if successful,
-% otherwise MagickFalse if there is not enough memory.
-%
-% Deprecated, replace with:
-%
-% AcquireImageColormap(image,colors);
-%
-% The format of the AllocateImageColormap method is:
-%
-% MagickBooleanType AllocateImageColormap(Image *image,
-% const size_t colors)
-%
-% A description of each parameter follows:
-%
-% o image: the image.
-%
-% o colors: the number of colors in the image colormap.
-%
-*/
-MagickExport MagickBooleanType AllocateImageColormap(Image *image,
- const size_t colors)
-{
- return(AcquireImageColormap(image,colors));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% A l l o c a t e N e x t I m a g e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% AllocateNextImage() initializes the next image in a sequence to
-% default values. The next member of image points to the newly allocated
-% image. If there is a memory shortage, next is assigned NULL.
-%
-% Deprecated, replace with:
-%
-% AcquireNextImage(image_info,image);
-%
-% The format of the AllocateNextImage method is:
-%
-% void AllocateNextImage(const ImageInfo *image_info,Image *image)
-%
-% A description of each parameter follows:
-%
-% o image_info: Many of the image default values are set from this
-% structure. For example, filename, compression, depth, background color,
-% and others.
-%
-% o image: the image.
-%
-*/
-MagickExport void AllocateNextImage(const ImageInfo *image_info,Image *image)
-{
- AcquireNextImage(image_info,image);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% A l l o c a t e S t r i n g %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% AllocateString() allocates memory for a string and copies the source string
-% to that memory location (and returns it).
-%
-% The format of the AllocateString method is:
-%
-% char *AllocateString(const char *source)
-%
-% A description of each parameter follows:
-%
-% o source: A character string.
-%
-*/
-MagickExport char *AllocateString(const char *source)
-{
- char
- *destination;
-
- size_t
- length;
-
- assert(source != (const char *) NULL);
- (void) LogMagickEvent(DeprecateEvent,GetMagickModule(),"last use: v5.5.7");
- length=strlen(source)+MaxTextExtent+1;
- destination=(char *) AcquireQuantumMemory(length,sizeof(*destination));
- if (destination == (char *) NULL)
- ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
- *destination='\0';
- if (source != (char *) NULL)
- (void) CopyMagickString(destination,source,length);
- return(destination);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% A v e r a g e I m a g e s %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% AverageImages() takes a set of images and averages them together. Each
-% image in the set must have the same width and height. AverageImages()
-% returns a single image with each corresponding pixel component of each
-% image averaged. On failure, a NULL image is returned and exception
-% describes the reason for the failure.
-%
-% Deprecated, replace with:
-%
-% EvaluateImages(images,MeanEvaluateOperator,exception);
-%
-% The format of the AverageImages method is:
-%
-% Image *AverageImages(Image *images,ExceptionInfo *exception)
-%
-% A description of each parameter follows:
-%
-% o image: the image sequence.
-%
-% o exception: return any errors or warnings in this structure.
-%
-*/
-MagickExport Image *AverageImages(const Image *images,ExceptionInfo *exception)
-{
- return(EvaluateImages(images,MeanEvaluateOperator,exception));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% C h a n n e l I m a g e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% Extract a channel from the image. A channel is a particular color component
-% of each pixel in the image.
-%
-% Deprecated, replace with:
-%
-% SeparateImageChannel(image,channel);
-%
-% The format of the ChannelImage method is:
-%
-% unsigned int ChannelImage(Image *image,const ChannelType channel)
-%
-% A description of each parameter follows:
-%
-% o image: the image.
-%
-% o channel: Identify which channel to extract: RedChannel, GreenChannel,
-% BlueChannel, OpacityChannel, CyanChannel, MagentaChannel, YellowChannel,
-% or BlackChannel.
-%
-*/
-MagickExport unsigned int ChannelImage(Image *image,const ChannelType channel)
-{
- return(SeparateImageChannel(image,channel));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% C h a n n e l T h r e s h o l d I m a g e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% ChannelThresholdImage() changes the value of individual pixels based on
-% the intensity of each pixel channel. The result is a high-contrast image.
-%
-% The format of the ChannelThresholdImage method is:
-%
-% unsigned int ChannelThresholdImage(Image *image,const char *level)
-%
-% A description of each parameter follows:
-%
-% o image: the image.
-%
-% o level: define the threshold values.
-%
-*/
-MagickExport unsigned int ChannelThresholdImage(Image *image,const char *level)
-{
- MagickPixelPacket
- threshold;
-
- GeometryInfo
- geometry_info;
-
- unsigned int
- flags,
- status;
-
- assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
- if (image->debug != MagickFalse)
- (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
- if (image->debug != MagickFalse)
- (void) LogMagickEvent(DeprecateEvent,GetMagickModule(),"last use: v5.5.7");
- if (level == (char *) NULL)
- return(MagickFalse);
- flags=ParseGeometry(level,&geometry_info);
- threshold.red=geometry_info.rho;
- threshold.green=geometry_info.sigma;
- if ((flags & SigmaValue) == 0)
- threshold.green=threshold.red;
- threshold.blue=geometry_info.xi;
- if ((flags & XiValue) == 0)
- threshold.blue=threshold.red;
- status=BilevelImageChannel(image,RedChannel,threshold.red);
- status|=BilevelImageChannel(image,GreenChannel,threshold.green);
- status|=BilevelImageChannel(image,BlueChannel,threshold.blue);
- return(status);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% C l i p I m a g e P a t h %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% ClipPathImage() sets the image clip mask based any clipping path information
-% if it exists.
-%
-% Deprecated, replace with:
-%
-% ClipImagePath(image,pathname,inside);
-%
-% The format of the ClipImage method is:
-%
-% MagickBooleanType ClipPathImage(Image *image,const char *pathname,
-% const MagickBooleanType inside)
-%
-% A description of each parameter follows:
-%
-% o image: the image.
-%
-% o pathname: name of clipping path resource. If name is preceded by #, use
-% clipping path numbered by name.
-%
-% o inside: if non-zero, later operations take effect inside clipping path.
-% Otherwise later operations take effect outside clipping path.
-%
-*/
-MagickExport MagickBooleanType ClipPathImage(Image *image,const char *pathname,
- const MagickBooleanType inside)
-{
- return(ClipImagePath(image,pathname,inside));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% C l o n e I m a g e A t t r i b u t e s %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% CloneImageAttributes() clones one or more image attributes.
-%
-% Deprecated, replace with:
-%
-% CloneImageProperties(image,clone_image);
-%
-% The format of the CloneImageAttributes method is:
-%
-% MagickBooleanType CloneImageAttributes(Image *image,
-% const Image *clone_image)
-%
-% A description of each parameter follows:
-%
-% o image: the image.
-%
-% o clone_image: the clone image.
-%
-*/
-MagickExport MagickBooleanType CloneImageAttributes(Image *image,
- const Image *clone_image)
-{
- return(CloneImageProperties(image,clone_image));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% C l o n e M e m o r y %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% CloneMemory() copies size bytes from memory area source to the destination.
-% Copying between objects that overlap will take place correctly. It returns
-% destination.
-%
-% The format of the CloneMemory method is:
-%
-% void *CloneMemory(void *destination,const void *source,
-% const size_t size)
-%
-% A description of each parameter follows:
-%
-% o destination: the destination.
-%
-% o source: the source.
-%
-% o size: the size of the memory in bytes to allocate.
-%
-*/
-MagickExport void *CloneMemory(void *destination,const void *source,
- const size_t size)
-{
- register const unsigned char
- *p;
-
- register unsigned char
- *q;
-
- register ssize_t
- i;
-
- assert(destination != (void *) NULL);
- assert(source != (const void *) NULL);
- (void) LogMagickEvent(DeprecateEvent,GetMagickModule(),"last use: v5.5.7");
- p=(const unsigned char *) source;
- q=(unsigned char *) destination;
- if ((p <= q) || ((p+size) >= q))
- return(CopyMagickMemory(destination,source,size));
- /*
- Overlap, copy backwards.
- */
- p+=size;
- q+=size;
- for (i=(ssize_t) (size-1); i >= 0; i--)
- *--q=(*--p);
- return(destination);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% C l o s e C a c h e V i e w %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% CloseCacheView() closes the specified view returned by a previous call to
-% OpenCacheView().
-%
-% Deprecated, replace with:
-%
-% DestroyCacheView(view_info);
-%
-% The format of the CloseCacheView method is:
-%
-% CacheView *CloseCacheView(CacheView *view_info)
-%
-% A description of each parameter follows:
-%
-% o view_info: the address of a structure of type CacheView.
-%
-*/
-MagickExport CacheView *CloseCacheView(CacheView *view_info)
-{
- return(DestroyCacheView(view_info));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% C o l o r F l o o d f i l l I m a g e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% ColorFloodfill() changes the color value of any pixel that matches
-% target and is an immediate neighbor. If the method FillToBorderMethod is
-% specified, the color value is changed for any neighbor pixel that does not
-% match the bordercolor member of image.
-%
-% By default target must match a particular pixel color exactly.
-% However, in many cases two colors may differ by a small amount. The
-% fuzz member of image defines how much tolerance is acceptable to
-% consider two colors as the same. For example, set fuzz to 10 and the
-% color red at intensities of 100 and 102 respectively are now
-% interpreted as the same color for the purposes of the floodfill.
-%
-% The format of the ColorFloodfillImage method is:
-%
-% MagickBooleanType ColorFloodfillImage(Image *image,
-% const DrawInfo *draw_info,const PixelPacket target,
-% const ssize_t x_offset,const ssize_t y_offset,const PaintMethod method)
-%
-% A description of each parameter follows:
-%
-% o image: the image.
-%
-% o draw_info: the draw info.
-%
-% o target: the RGB value of the target color.
-%
-% o x,y: the starting location of the operation.
-%
-% o method: Choose either FloodfillMethod or FillToBorderMethod.
-%
-*/
-
-#define MaxStacksize (1UL << 15)
-#define PushSegmentStack(up,left,right,delta) \
-{ \
- if (s >= (segment_stack+MaxStacksize)) \
- ThrowBinaryException(DrawError,"SegmentStackOverflow",image->filename) \
- else \
- { \
- if ((((up)+(delta)) >= 0) && (((up)+(delta)) < (ssize_t) image->rows)) \
- { \
- s->x1=(double) (left); \
- s->y1=(double) (up); \
- s->x2=(double) (right); \
- s->y2=(double) (delta); \
- s++; \
- } \
- } \
-}
-
-MagickExport MagickBooleanType ColorFloodfillImage(Image *image,
- const DrawInfo *draw_info,const PixelPacket target,const ssize_t x_offset,
- const ssize_t y_offset,const PaintMethod method)
-{
- Image
- *floodplane_image;
-
- MagickBooleanType
- skip;
-
- PixelPacket
- fill_color;
-
- register SegmentInfo
- *s;
-
- SegmentInfo
- *segment_stack;
-
- ssize_t
- offset,
- start,
- x,
- x1,
- x2,
- y;
-
- /*
- Check boundary conditions.
- */
- assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
- if (image->debug != MagickFalse)
- (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
- assert(draw_info != (DrawInfo *) NULL);
- assert(draw_info->signature == MagickSignature);
- if ((x_offset < 0) || (x_offset >= (ssize_t) image->columns))
- return(MagickFalse);
- if ((y_offset < 0) || (y_offset >= (ssize_t) image->rows))
- return(MagickFalse);
- if (SetImageStorageClass(image,DirectClass) == MagickFalse)
- return(MagickFalse);
- if (image->matte == MagickFalse)
- (void) SetImageAlphaChannel(image,OpaqueAlphaChannel);
- floodplane_image=CloneImage(image,image->columns,image->rows,MagickTrue,
- &image->exception);
- if (floodplane_image == (Image *) NULL)
- return(MagickFalse);
- (void) SetImageAlphaChannel(floodplane_image,OpaqueAlphaChannel);
- /*
- Set floodfill color.
- */
- segment_stack=(SegmentInfo *) AcquireQuantumMemory(MaxStacksize,
- sizeof(*segment_stack));
- if (segment_stack == (SegmentInfo *) NULL)
- {
- floodplane_image=DestroyImage(floodplane_image);
- ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed",
- image->filename);
- }
- /*
- Push initial segment on stack.
- */
- x=x_offset;
- y=y_offset;
- start=0;
- s=segment_stack;
- PushSegmentStack(y,x,x,1);
- PushSegmentStack(y+1,x,x,-1);
- while (s > segment_stack)
- {
- register const PixelPacket
- *restrict p;
-
- register ssize_t
- x;
-
- register PixelPacket
- *restrict q;
-
- /*
- Pop segment off stack.
- */
- s--;
- x1=(ssize_t) s->x1;
- x2=(ssize_t) s->x2;
- offset=(ssize_t) s->y2;
- y=(ssize_t) s->y1+offset;
- /*
- Recolor neighboring pixels.
- */
- p=GetVirtualPixels(image,0,y,(size_t) (x1+1),1,&image->exception);
- q=GetAuthenticPixels(floodplane_image,0,y,(size_t) (x1+1),1,
- &image->exception);
- if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
- break;
- p+=x1;
- q+=x1;
- for (x=x1; x >= 0; x--)
- {
- if (q->opacity == (Quantum) TransparentOpacity)
- break;
- if (method == FloodfillMethod)
- {
- if (IsColorSimilar(image,p,&target) == MagickFalse)
- break;
- }
- else
- if (IsColorSimilar(image,p,&target) != MagickFalse)
- break;
- q->opacity=(Quantum) TransparentOpacity;
- p--;
- q--;
- }
- if (SyncAuthenticPixels(floodplane_image,&image->exception) == MagickFalse)
- break;
- skip=x >= x1 ? MagickTrue : MagickFalse;
- if (skip == MagickFalse)
- {
- start=x+1;
- if (start < x1)
- PushSegmentStack(y,start,x1-1,-offset);
- x=x1+1;
- }
- do
- {
- if (skip == MagickFalse)
- {
- if (x < (ssize_t) image->columns)
- {
- p=GetVirtualPixels(image,x,y,image->columns-x,1,
- &image->exception);
- q=GetAuthenticPixels(floodplane_image,x,y,image->columns-x,1,
- &image->exception);
- if ((p == (const PixelPacket *) NULL) ||
- (q == (PixelPacket *) NULL))
- break;
- for ( ; x < (ssize_t) image->columns; x++)
- {
- if (q->opacity == (Quantum) TransparentOpacity)
- break;
- if (method == FloodfillMethod)
- {
- if (IsColorSimilar(image,p,&target) == MagickFalse)
- break;
- }
- else
- if (IsColorSimilar(image,p,&target) != MagickFalse)
- break;
- q->opacity=(Quantum) TransparentOpacity;
- p++;
- q++;
- }
- if (SyncAuthenticPixels(floodplane_image,&image->exception) == MagickFalse)
- break;
- }
- PushSegmentStack(y,start,x-1,offset);
- if (x > (x2+1))
- PushSegmentStack(y,x2+1,x-1,-offset);
- }
- skip=MagickFalse;
- x++;
- if (x <= x2)
- {
- p=GetVirtualPixels(image,x,y,(size_t) (x2-x+1),1,
- &image->exception);
- q=GetAuthenticPixels(floodplane_image,x,y,(size_t) (x2-x+1),1,
- &image->exception);
- if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
- break;
- for ( ; x <= x2; x++)
- {
- if (q->opacity == (Quantum) TransparentOpacity)
- break;
- if (method == FloodfillMethod)
- {
- if (IsColorSimilar(image,p,&target) != MagickFalse)
- break;
- }
- else
- if (IsColorSimilar(image,p,&target) == MagickFalse)
- break;
- p++;
- q++;
- }
- }
- start=x;
- } while (x <= x2);
- }
- for (y=0; y < (ssize_t) image->rows; y++)
- {
- register const PixelPacket
- *restrict p;
-
- register ssize_t
- x;
-
- register PixelPacket
- *restrict q;
-
- /*
- Tile fill color onto floodplane.
- */
- p=GetVirtualPixels(floodplane_image,0,y,image->columns,1,
- &image->exception);
- q=GetAuthenticPixels(image,0,y,image->columns,1,&image->exception);
- if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
- break;
- for (x=0; x < (ssize_t) image->columns; x++)
- {
- if (GetPixelOpacity(p) != OpaqueOpacity)
- {
- (void) GetFillColor(draw_info,x,y,&fill_color);
- MagickCompositeOver(&fill_color,(MagickRealType) fill_color.opacity,q,
- (MagickRealType) q->opacity,q);
- }
- p++;
- q++;
- }
- if (SyncAuthenticPixels(image,&image->exception) == MagickFalse)
- break;
- }
- segment_stack=(SegmentInfo *) RelinquishMagickMemory(segment_stack);
- floodplane_image=DestroyImage(floodplane_image);
- return(y == (ssize_t) image->rows ? MagickTrue : MagickFalse);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% D e l e t e I m a g e A t t r i b u t e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% DeleteImageAttribute() deletes an attribute from the image.
-%
-% Deprecated, replace with:
-%
-% DeleteImageProperty(image,key);
-%
-% The format of the DeleteImageAttribute method is:
-%
-% MagickBooleanType DeleteImageAttribute(Image *image,const char *key)
-%
-% A description of each parameter follows:
-%
-% o image: the image info.
-%
-% o key: the image key.
-%
-*/
-MagickExport MagickBooleanType DeleteImageAttribute(Image *image,
- const char *key)
-{
- return(DeleteImageProperty(image,key));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% D e l e t e I m a g e L i s t %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% DeleteImageList() deletes an image at the specified position in the list.
-%
-% The format of the DeleteImageList method is:
-%
-% unsigned int DeleteImageList(Image *images,const ssize_t offset)
-%
-% A description of each parameter follows:
-%
-% o images: the image list.
-%
-% o offset: the position within the list.
-%
-*/
-MagickExport unsigned int DeleteImageList(Image *images,const ssize_t offset)
-{
- register ssize_t
- i;
-
- if (images->debug != MagickFalse)
- (void) LogMagickEvent(DeprecateEvent,GetMagickModule(),"last use: v5.5.2");
- while (GetPreviousImageInList(images) != (Image *) NULL)
- images=GetPreviousImageInList(images);
- for (i=0; i < offset; i++)
- {
- if (GetNextImageInList(images) == (Image *) NULL)
- return(MagickFalse);
- images=GetNextImageInList(images);
- }
- DeleteImageFromList(&images);
- return(MagickTrue);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% D e l e t e M a g i c k R e g i s t r y %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% DeleteMagickRegistry() deletes an entry in the registry as defined by the id.
-% It returns MagickTrue if the entry is deleted otherwise MagickFalse if no
-% entry is found in the registry that matches the id.
-%
-% Deprecated, replace with:
-%
-% char key[MaxTextExtent];
-% FormatLocaleString(key,MaxTextExtent,"%ld\n",id);
-% DeleteImageRegistry(key);
-%
-% The format of the DeleteMagickRegistry method is:
-%
-% MagickBooleanType DeleteMagickRegistry(const ssize_t id)
-%
-% A description of each parameter follows:
-%
-% o id: the registry id.
-%
-*/
-MagickExport MagickBooleanType DeleteMagickRegistry(const ssize_t id)
-{
- char
- key[MaxTextExtent];
-
- (void) FormatLocaleString(key,MaxTextExtent,"%.20g\n",(double) id);
- return(DeleteImageRegistry(key));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-+ D e s t r o y C o n s t i t u t e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% DestroyConstitute() destroys the constitute component.
-%
-% The format of the DestroyConstitute method is:
-%
-% DestroyConstitute(void)
-%
-*/
-MagickExport void DestroyConstitute(void)
-{
- ConstituteComponentTerminus();
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-+ D e s t r o y M a g i c k R e g i s t r y %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% DestroyMagickRegistry() deallocates memory associated the magick registry.
-%
-% Deprecated, replace with:
-%
-% RegistryComponentTerminus();
-%
-% The format of the DestroyMagickRegistry method is:
-%
-% void DestroyMagickRegistry(void)
-%
-*/
-MagickExport void DestroyMagickRegistry(void)
-{
- RegistryComponentTerminus();
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% D e s c r i b e I m a g e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% DescribeImage() describes an image by printing its attributes to the file.
-% Attributes include the image width, height, size, and others.
-%
-% Deprecated, replace with:
-%
-% IdentifyImage(image,file,verbose);
-%
-% The format of the DescribeImage method is:
-%
-% MagickBooleanType DescribeImage(Image *image,FILE *file,
-% const MagickBooleanType verbose)
-%
-% A description of each parameter follows:
-%
-% o image: the image.
-%
-% o file: the file, typically stdout.
-%
-% o verbose: A value other than zero prints more detailed information
-% about the image.
-%
-*/
-MagickExport MagickBooleanType DescribeImage(Image *image,FILE *file,
- const MagickBooleanType verbose)
-{
- return(IdentifyImage(image,file,verbose));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% D e s t r o y I m a g e A t t r i b u t e s %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% DestroyImageAttributes() deallocates memory associated with the image
-% attribute list.
-%
-% The format of the DestroyImageAttributes method is:
-%
-% DestroyImageAttributes(Image *image)
-%
-% A description of each parameter follows:
-%
-% o image: the image.
-%
-*/
-MagickExport void DestroyImageAttributes(Image *image)
-{
- assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
- if (image->debug != MagickFalse)
- (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
- if (image->attributes != (void *) NULL)
- image->attributes=(void *) DestroySplayTree((SplayTreeInfo *)
- image->attributes);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% D e s t r o y I m a g e s %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% DestroyImages() destroys an image list.
-%
-% Deprecated, replace with:
-%
-% DestroyImageList(image);
-%
-% The format of the DestroyImages method is:
-%
-% void DestroyImages(Image *image)
-%
-% A description of each parameter follows:
-%
-% o image: the image sequence.
-%
-*/
-MagickExport void DestroyImages(Image *image)
-{
- if (image == (Image *) NULL)
- return;
- if (image->debug != MagickFalse)
- (void) LogMagickEvent(DeprecateEvent,GetMagickModule(),"last use: v5.4.3");
- image=DestroyImageList(image);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% D e s t r o y M a g i c k %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% DestroyMagick() destroys the ImageMagick environment.
-%
-% Deprecated, replace with:
-%
-% MagickCoreTerminus();
-%
-% The format of the DestroyMagick function is:
-%
-% DestroyMagick(void)
-%
-*/
-MagickExport void DestroyMagick(void)
-{
- MagickCoreTerminus();
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% D i s p a t c h I m a g e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% DispatchImage() extracts pixel data from an image and returns it to you.
-% The method returns MagickFalse on success otherwise MagickTrue if an error is
-% encountered. The data is returned as char, short int, int, ssize_t, float,
-% or double in the order specified by map.
-%
-% Suppose you want to extract the first scanline of a 640x480 image as
-% character data in red-green-blue order:
-%
-% DispatchImage(image,0,0,640,1,"RGB",CharPixel,pixels,exception);
-%
-% Deprecated, replace with:
-%
-% ExportImagePixels(image,x_offset,y_offset,columns,rows,map,type,pixels,
-% exception);
-%
-% The format of the DispatchImage method is:
-%
-% unsigned int DispatchImage(const Image *image,const ssize_t x_offset,
-% const ssize_t y_offset,const size_t columns,
-% const size_t rows,const char *map,const StorageType type,
-% void *pixels,ExceptionInfo *exception)
-%
-% A description of each parameter follows:
-%
-% o image: the image.
-%
-% o x_offset, y_offset, columns, rows: These values define the perimeter
-% of a region of pixels you want to extract.
-%
-% o map: This string reflects the expected ordering of the pixel array.
-% It can be any combination or order of R = red, G = green, B = blue,
-% A = alpha, C = cyan, Y = yellow, M = magenta, K = black, or
-% I = intensity (for grayscale).
-%
-% o type: Define the data type of the pixels. Float and double types are
-% normalized to [0..1] otherwise [0..QuantumRange]. Choose from these
-% types: CharPixel, ShortPixel, IntegerPixel, LongPixel, FloatPixel, or
-% DoublePixel.
-%
-% o pixels: This array of values contain the pixel components as defined by
-% map and type. You must preallocate this array where the expected
-% length varies depending on the values of width, height, map, and type.
-%
-% o exception: return any errors or warnings in this structure.
-%
-*/
-MagickExport unsigned int DispatchImage(const Image *image,const ssize_t x_offset,
- const ssize_t y_offset,const size_t columns,const size_t rows,
- const char *map,const StorageType type,void *pixels,ExceptionInfo *exception)
-{
- unsigned int
- status;
-
- if (image->debug != MagickFalse)
- (void) LogMagickEvent(DeprecateEvent,GetMagickModule(),"last use: v5.5.6");
- status=ExportImagePixels(image,x_offset,y_offset,columns,rows,map,type,pixels,
- exception);
- return(status);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% E x t r a c t S u b i m a g e F r o m I m a g e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% ExtractSubimageFromImageImage() extracts a region of the image that most
-% closely resembles the reference.
-%
-% The format of the ExtractSubimageFromImageImage method is:
-%
-% Image *ExtractSubimageFromImage(const Image *image,
-% const Image *reference,ExceptionInfo *exception)
-%
-% A description of each parameter follows:
-%
-% o image: the image.
-%
-% o reference: find an area of the image that closely resembles this image.
-%
-% o exception: return any errors or warnings in this structure.
-%
-*/
-
-static double GetSimilarityMetric(const Image *image,const Image *reference,
- const ssize_t x_offset,const ssize_t y_offset,
- const double similarity_threshold,ExceptionInfo *exception)
-{
- CacheView
- *image_view,
- *reference_view;
-
- double
- channels,
- normalized_similarity,
- similarity;
-
- ssize_t
- y;
-
- /*
- Compute the similarity in pixels between two images.
- */
- normalized_similarity=1.0;
- similarity=0.0;
- channels=3;
- if ((image->matte != MagickFalse) && (reference->matte != MagickFalse))
- channels++;
- if ((image->colorspace == CMYKColorspace) &&
- (reference->colorspace == CMYKColorspace))
- channels++;
- image_view=AcquireCacheView(image);
- reference_view=AcquireCacheView(reference);
- for (y=0; y < (ssize_t) reference->rows; y++)
- {
- register const IndexPacket
- *indexes,
- *reference_indexes;
-
- register const PixelPacket
- *p,
- *q;
-
- register ssize_t
- x;
-
- p=GetCacheViewVirtualPixels(image_view,x_offset,y_offset+y,
- reference->columns,1,exception);
- q=GetCacheViewVirtualPixels(reference_view,0,y,reference->columns,1,
- exception);
- if ((p == (const PixelPacket *) NULL) || (q == (const PixelPacket *) NULL))
- continue;
- indexes=GetCacheViewVirtualIndexQueue(image_view);
- reference_indexes=GetCacheViewVirtualIndexQueue(reference_view);
- for (x=0; x < (ssize_t) reference->columns; x++)
- {
- MagickRealType
- pixel;
-
- pixel=QuantumScale*(GetPixelRed(p)-(double)
- GetPixelRed(q));
- similarity+=pixel*pixel;
- pixel=QuantumScale*(GetPixelGreen(p)-(double)
- GetPixelGreen(q));
- similarity+=pixel*pixel;
- pixel=QuantumScale*(GetPixelBlue(p)-(double)
- GetPixelBlue(q));
- similarity+=pixel*pixel;
- if ((image->matte != MagickFalse) && (reference->matte != MagickFalse))
- {
- pixel=QuantumScale*(GetPixelOpacity(p)-(double)
- GetPixelOpacity(q));
- similarity+=pixel*pixel;
- }
- if ((image->colorspace == CMYKColorspace) &&
- (reference->colorspace == CMYKColorspace))
- {
- pixel=QuantumScale*(GetPixelIndex(indexes+x)-(double)
- GetPixelIndex(reference_indexes+x));
- similarity+=pixel*pixel;
- }
- p++;
- q++;
- }
- normalized_similarity=sqrt(similarity)/reference->columns/reference->rows/
- channels;
- if (normalized_similarity > similarity_threshold)
- break;
- }
- reference_view=DestroyCacheView(reference_view);
- image_view=DestroyCacheView(image_view);
- return(normalized_similarity);
-}
-
-MagickExport Image *ExtractSubimageFromImage(Image *image,
- const Image *reference,ExceptionInfo *exception)
-{
- double
- similarity_threshold;
-
- RectangleInfo
- offset;
-
- ssize_t
- y;
-
- /*
- Extract reference from image.
- */
- if ((reference->columns > image->columns) || (reference->rows > image->rows))
- return((Image *) NULL);
- similarity_threshold=(double) image->columns*image->rows;
- SetGeometry(reference,&offset);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(dynamic,4)
-#endif
- for (y=0; y < (ssize_t) (image->rows-reference->rows); y++)
- {
- double
- similarity;
-
- register ssize_t
- x;
-
- for (x=0; x < (ssize_t) (image->columns-reference->columns); x++)
- {
- similarity=GetSimilarityMetric(image,reference,x,y,similarity_threshold,
- exception);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp critical (MagickCore_ExtractSubimageFromImage)
-#endif
- if (similarity < similarity_threshold)
- {
- similarity_threshold=similarity;
- offset.x=x;
- offset.y=y;
- }
- }
- }
- if (similarity_threshold > (QuantumScale*reference->fuzz/100.0))
- return((Image *) NULL);
- return(CropImage(image,&offset,exception));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% F l a t t e n I m a g e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% FlattenImages() Obsolete Function: Use MergeImageLayers() instead.
-%
-% Deprecated, replace with:
-%
-% MergeImageLayers(image,FlattenLayer,exception);
-%
-% The format of the FlattenImage method is:
-%
-% Image *FlattenImage(Image *image,ExceptionInfo *exception)
-%
-% A description of each parameter follows:
-%
-% o image: the image sequence.
-%
-% o exception: return any errors or warnings in this structure.
-%
-*/
-MagickExport Image *FlattenImages(Image *image,ExceptionInfo *exception)
-{
- return(MergeImageLayers(image,FlattenLayer,exception));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% F o r m a t I m a g e A t t r i b u t e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% FormatImageAttribute() permits formatted key/value pairs to be saved as an
-% image attribute.
-%
-% The format of the FormatImageAttribute method is:
-%
-% MagickBooleanType FormatImageAttribute(Image *image,const char *key,
-% const char *format,...)
-%
-% A description of each parameter follows.
-%
-% o image: The image.
-%
-% o key: The attribute key.
-%
-% o format: A string describing the format to use to write the remaining
-% arguments.
-%
-*/
-MagickExport MagickBooleanType FormatImageAttribute(Image *image,
- const char *key,const char *format,...)
-{
- char
- value[MaxTextExtent];
-
- int
- n;
-
- va_list
- operands;
-
- va_start(operands,format);
- n=FormatLocaleStringList(value,MaxTextExtent,format,operands);
- (void) n;
- va_end(operands);
- return(SetImageProperty(image,key,value));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% F o r m a t M a g i c k S t r i n g %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% FormatMagickString() prints formatted output of a variable argument list.
-%
-% The format of the FormatMagickString method is:
-%
-% ssize_t FormatMagickString(char *string,const size_t length,
-% const char *format,...)
-%
-% A description of each parameter follows.
-%
-% o string: FormatMagickString() returns the formatted string in this
-% character buffer.
-%
-% o length: the maximum length of the string.
-%
-% o format: A string describing the format to use to write the remaining
-% arguments.
-%
-*/
-
-MagickExport ssize_t FormatMagickStringList(char *string,const size_t length,
- const char *format,va_list operands)
-{
- int
- n;
-
-#if defined(MAGICKCORE_HAVE_VSNPRINTF)
- n=vsnprintf(string,length,format,operands);
-#else
- n=vsprintf(string,format,operands);
-#endif
- if (n < 0)
- string[length-1]='\0';
- return((ssize_t) n);
-}
-
-MagickExport ssize_t FormatMagickString(char *string,const size_t length,
- const char *format,...)
-{
- ssize_t
- n;
-
- va_list
- operands;
-
- va_start(operands,format);
- n=(ssize_t) FormatMagickStringList(string,length,format,operands);
- va_end(operands);
- return(n);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% F o r m a t S t r i n g %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% FormatString() prints formatted output of a variable argument list.
-%
-% The format of the FormatString method is:
-%
-% void FormatString(char *string,const char *format,...)
-%
-% A description of each parameter follows.
-%
-% o string: Method FormatString returns the formatted string in this
-% character buffer.
-%
-% o format: A string describing the format to use to write the remaining
-% arguments.
-%
-*/
-
-MagickExport void FormatStringList(char *string,const char *format,
- va_list operands)
-{
- int
- n;
-
- (void) LogMagickEvent(DeprecateEvent,GetMagickModule(),"last use: v5.5.7");
-#if defined(MAGICKCORE_HAVE_VSNPRINTF)
- n=vsnprintf(string,MaxTextExtent,format,operands);
-#else
- n=vsprintf(string,format,operands);
-#endif
- if (n < 0)
- string[MaxTextExtent-1]='\0';
-}
-
-MagickExport void FormatString(char *string,const char *format,...)
-{
- va_list
- operands;
-
- va_start(operands,format);
- (void) FormatLocaleStringList(string,MaxTextExtent,format,operands);
- va_end(operands);
- return;
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-+ F u z z y C o l o r M a t c h %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% FuzzyColorMatch() returns true if two pixels are identical in color.
-%
-% The format of the ColorMatch method is:
-%
-% void FuzzyColorMatch(const PixelPacket *p,const PixelPacket *q,
-% const double fuzz)
-%
-% A description of each parameter follows:
-%
-% o p: Pixel p.
-%
-% o q: Pixel q.
-%
-% o distance: Define how much tolerance is acceptable to consider
-% two colors as the same.
-%
-*/
-MagickExport unsigned int FuzzyColorMatch(const PixelPacket *p,
- const PixelPacket *q,const double fuzz)
-{
- MagickPixelPacket
- pixel;
-
- register MagickRealType
- distance;
-
- if ((fuzz == 0.0) && (GetPixelRed(p) == GetPixelRed(q)) &&
- (GetPixelGreen(p) == GetPixelGreen(q)) &&
- (GetPixelBlue(p) == GetPixelBlue(q)))
- return(MagickTrue);
- pixel.red=GetPixelRed(p)-(MagickRealType) GetPixelRed(q);
- distance=pixel.red*pixel.red;
- if (distance > (fuzz*fuzz))
- return(MagickFalse);
- pixel.green=GetPixelGreen(p)-(MagickRealType)
- GetPixelGreen(q);
- distance+=pixel.green*pixel.green;
- if (distance > (fuzz*fuzz))
- return(MagickFalse);
- pixel.blue=GetPixelBlue(p)-(MagickRealType) GetPixelBlue(q);
- distance+=pixel.blue*pixel.blue;
- if (distance > (fuzz*fuzz))
- return(MagickFalse);
- return(MagickTrue);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-+ F u z z y C o l o r C o m p a r e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% FuzzyColorCompare() returns MagickTrue if the distance between two colors is
-% less than the specified distance in a linear three dimensional color space.
-% This method is used by ColorFloodFill() and other algorithms which
-% compare two colors.
-%
-% The format of the FuzzyColorCompare method is:
-%
-% void FuzzyColorCompare(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 FuzzyColorCompare(const Image *image,
- const PixelPacket *p,const PixelPacket *q)
-{
- (void) LogMagickEvent(DeprecateEvent,GetMagickModule(),"last use: v6.2.5");
- return(IsColorSimilar(image,p,q));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-+ F u z z y O p a c i t y C o m p a r e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% FuzzyOpacityCompare() returns true if the distance between two opacity
-% values is less than the specified distance in a linear color space. This
-% method is used by MatteFloodFill() and other algorithms which compare
-% two opacity values.
-%
-% Deprecated, replace with:
-%
-% IsOpacitySimilar(image,p,q);
-%
-% The format of the FuzzyOpacityCompare method is:
-%
-% void FuzzyOpacityCompare(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 FuzzyOpacityCompare(const Image *image,
- const PixelPacket *p,const PixelPacket *q)
-{
- (void) LogMagickEvent(DeprecateEvent,GetMagickModule(),"last use: v6.2.5");
- return(IsOpacitySimilar(image,p,q));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% G e t C o n f i g u r e B l o b %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% GetConfigureBlob() returns the specified configure file as a blob.
-%
-% The format of the GetConfigureBlob method is:
-%
-% void *GetConfigureBlob(const char *filename,ExceptionInfo *exception)
-%
-% A description of each parameter follows:
-%
-% o filename: the configure file name.
-%
-% o path: return the full path information of the configure file.
-%
-% o length: This pointer to a size_t integer sets the initial length of the
-% blob. On return, it reflects the actual length of the blob.
-%
-% o exception: return any errors or warnings in this structure.
-%
-*/
-MagickExport void *GetConfigureBlob(const char *filename,char *path,
- size_t *length,ExceptionInfo *exception)
-{
- void
- *blob;
-
- assert(filename != (const char *) NULL);
- (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",filename);
- (void) LogMagickEvent(DeprecateEvent,GetMagickModule(),"last use: v5.5.7");
- assert(path != (char *) NULL);
- assert(length != (size_t *) NULL);
- assert(exception != (ExceptionInfo *) NULL);
- blob=(void *) NULL;
- (void) CopyMagickString(path,filename,MaxTextExtent);
-#if defined(MAGICKCORE_INSTALLED_SUPPORT)
-#if defined(MAGICKCORE_LIBRARY_PATH)
- if (blob == (void *) NULL)
- {
- /*
- Search hard coded paths.
- */
- (void) FormatLocaleString(path,MaxTextExtent,"%s%s",
- MAGICKCORE_LIBRARY_PATH,filename);
- if (IsPathAccessible(path) != MagickFalse)
- blob=FileToBlob(path,~0,length,exception);
- }
-#endif
-#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !(defined(MAGICKCORE_CONFIGURE_PATH) || defined(MAGICKCORE_SHARE_PATH))
- if (blob == (void *) NULL)
- {
- char
- *key_value;
-
- /*
- Locate file via registry key.
- */
- key_value=NTRegistryKeyLookup("ConfigurePath");
- if (key_value != (char *) NULL)
- {
- (void) FormatLocaleString(path,MaxTextExtent,"%s%s%s",key_value,
- DirectorySeparator,filename);
- if (IsPathAccessible(path) != MagickFalse)
- blob=FileToBlob(path,~0,length,exception);
- }
- }
-#endif
-#else
- if (blob == (void *) NULL)
- {
- char
- *home;
-
- home=GetEnvironmentValue("MAGICK_HOME");
- if (home != (char *) NULL)
- {
- /*
- Search MAGICK_HOME.
- */
-#if !defined(MAGICKCORE_POSIX_SUPPORT)
- (void) FormatLocaleString(path,MaxTextExtent,"%s%s%s",home,
- DirectorySeparator,filename);
-#else
- (void) FormatLocaleString(path,MaxTextExtent,"%s/lib/%s/%s",home,
- MAGICKCORE_LIBRARY_RELATIVE_PATH,filename);
-#endif
- if (IsPathAccessible(path) != MagickFalse)
- blob=FileToBlob(path,~0,length,exception);
- home=DestroyString(home);
- }
- home=GetEnvironmentValue("HOME");
- if (home == (char *) NULL)
- home=GetEnvironmentValue("USERPROFILE");
- if (home != (char *) NULL)
- {
- /*
- Search $HOME/.magick.
- */
- (void) FormatLocaleString(path,MaxTextExtent,"%s%s.magick%s%s",home,
- DirectorySeparator,DirectorySeparator,filename);
- if ((IsPathAccessible(path) != MagickFalse) && (blob == (void *) NULL))
- blob=FileToBlob(path,~0,length,exception);
- home=DestroyString(home);
- }
- }
- if ((blob == (void *) NULL) && (*GetClientPath() != '\0'))
- {
-#if !defined(MAGICKCORE_POSIX_SUPPORT)
- (void) FormatLocaleString(path,MaxTextExtent,"%s%s%s",GetClientPath(),
- DirectorySeparator,filename);
-#else
- char
- prefix[MaxTextExtent];
-
- /*
- Search based on executable directory if directory is known.
- */
- (void) CopyMagickString(prefix,GetClientPath(),
- MaxTextExtent);
- ChopPathComponents(prefix,1);
- (void) FormatLocaleString(path,MaxTextExtent,"%s/lib/%s/%s",prefix,
- MAGICKCORE_LIBRARY_RELATIVE_PATH,filename);
-#endif
- if (IsPathAccessible(path) != MagickFalse)
- blob=FileToBlob(path,~0,length,exception);
- }
- /*
- Search current directory.
- */
- if ((blob == (void *) NULL) && (IsPathAccessible(path) != MagickFalse))
- blob=FileToBlob(path,~0,length,exception);
-#if defined(MAGICKCORE_WINDOWS_SUPPORT)
- /*
- Search Windows registry.
- */
- if (blob == (void *) NULL)
- blob=NTResourceToBlob(filename);
-#endif
-#endif
- if (blob == (void *) NULL)
- (void) ThrowMagickException(exception,GetMagickModule(),ConfigureWarning,
- "UnableToOpenConfigureFile","`%s'",path);
- return(blob);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% G e t C a c h e V i e w %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% GetCacheView() gets pixels from the in-memory or disk pixel cache as
-% defined by the geometry parameters. A pointer to the pixels is returned if
-% the pixels are transferred, otherwise a NULL is returned.
-%
-% Deprecated, replace with:
-%
-% GetCacheViewAuthenticPixels(cache_view,x,y,columns,rows,
-% GetCacheViewException(cache_view));
-%
-% The format of the GetCacheView method is:
-%
-% PixelPacket *GetCacheView(CacheView *cache_view,const ssize_t x,
-% const ssize_t y,const size_t columns,const size_t rows)
-%
-% A description of each parameter follows:
-%
-% o cache_view: the address of a structure of type CacheView.
-%
-% o x,y,columns,rows: These values define the perimeter of a region of
-% pixels.
-%
-*/
-MagickExport PixelPacket *GetCacheView(CacheView *cache_view,const ssize_t x,
- const ssize_t y,const size_t columns,const size_t rows)
-{
- PixelPacket
- *pixels;
-
- pixels=GetCacheViewAuthenticPixels(cache_view,x,y,columns,rows,
- GetCacheViewException(cache_view));
- return(pixels);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% G e t C a c h e V i e w I n d e x e s %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% GetCacheViewIndexes() returns the indexes associated with the specified
-% view.
-%
-% Deprecated, replace with:
-%
-% GetCacheViewAuthenticIndexQueue(cache_view);
-%
-% The format of the GetCacheViewIndexes method is:
-%
-% IndexPacket *GetCacheViewIndexes(CacheView *cache_view)
-%
-% A description of each parameter follows:
-%
-% o cache_view: the cache view.
-%
-*/
-MagickExport IndexPacket *GetCacheViewIndexes(CacheView *cache_view)
-{
- return(GetCacheViewAuthenticIndexQueue(cache_view));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% G e t C a c h e V i e w P i x e l s %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% GetCacheViewPixels() gets pixels from the in-memory or disk pixel cache as
-% defined by the geometry parameters. A pointer to the pixels is returned if
-% the pixels are transferred, otherwise a NULL is returned.
-%
-% Deprecated, replace with:
-%
-% GetCacheViewAuthenticPixels(cache_view,x,y,columns,rows,
-% GetCacheViewException(cache_view));
-%
-% The format of the GetCacheViewPixels method is:
-%
-% PixelPacket *GetCacheViewPixels(CacheView *cache_view,const ssize_t x,
-% const ssize_t y,const size_t columns,const size_t rows)
-%
-% A description of each parameter follows:
-%
-% o cache_view: the cache view.
-%
-% o x,y,columns,rows: These values define the perimeter of a region of
-% pixels.
-%
-*/
-MagickExport PixelPacket *GetCacheViewPixels(CacheView *cache_view,const ssize_t x,
- const ssize_t y,const size_t columns,const size_t rows)
-{
- PixelPacket
- *pixels;
-
- pixels=GetCacheViewAuthenticPixels(cache_view,x,y,columns,rows,
- GetCacheViewException(cache_view));
- return(pixels);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% G e t I m a g e A t t r i b u t e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% GetImageAttribute() searches the list of image attributes and returns
-% a pointer to the attribute if it exists otherwise NULL.
-%
-% The format of the GetImageAttribute method is:
-%
-% const ImageAttribute *GetImageAttribute(const Image *image,
-% const char *key)
-%
-% A description of each parameter follows:
-%
-% o image: the image.
-%
-% o key: These character strings are the name of an image attribute to
-% return.
-%
-*/
-
-static void *DestroyAttribute(void *attribute)
-{
- register ImageAttribute
- *p;
-
- p=(ImageAttribute *) attribute;
- if (p->value != (char *) NULL)
- p->value=DestroyString(p->value);
- return(RelinquishMagickMemory(p));
-}
-
-MagickExport const ImageAttribute *GetImageAttribute(const Image *image,
- const char *key)
-{
- const char
- *value;
-
- ImageAttribute
- *attribute;
-
- (void) LogMagickEvent(DeprecateEvent,GetMagickModule(),"last use: v6.3.1");
- value=GetImageProperty(image,key);
- if (value == (const char *) NULL)
- return((const ImageAttribute *) NULL);
- if (image->attributes == (void *) NULL)
- ((Image *) image)->attributes=NewSplayTree(CompareSplayTreeString,
- RelinquishMagickMemory,DestroyAttribute);
- else
- {
- const ImageAttribute
- *attribute;
-
- attribute=(const ImageAttribute *) GetValueFromSplayTree((SplayTreeInfo *)
- image->attributes,key);
- if (attribute != (const ImageAttribute *) NULL)
- return(attribute);
- }
- attribute=(ImageAttribute *) AcquireMagickMemory(sizeof(*attribute));
- if (attribute == (ImageAttribute *) NULL)
- ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
- (void) ResetMagickMemory(attribute,0,sizeof(*attribute));
- attribute->key=ConstantString(key);
- attribute->value=ConstantString(value);
- (void) AddValueToSplayTree((SplayTreeInfo *) ((Image *) image)->attributes,
- attribute->key,attribute);
- return((const ImageAttribute *) attribute);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% G e t I m a g e C l i p p i n g P a t h A t t r i b u t e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% GetImageClippingPathAttribute() searches the list of image attributes and
-% returns a pointer to a clipping path if it exists otherwise NULL.
-%
-% Deprecated, replace with:
-%
-% GetImageAttribute(image,"8BIM:1999,2998");
-%
-% The format of the GetImageClippingPathAttribute method is:
-%
-% const ImageAttribute *GetImageClippingPathAttribute(Image *image)
-%
-% A description of each parameter follows:
-%
-% o attribute: Method GetImageClippingPathAttribute returns the clipping
-% path if it exists otherwise NULL.
-%
-% o image: the image.
-%
-*/
-MagickExport const ImageAttribute *GetImageClippingPathAttribute(Image *image)
-{
- return(GetImageAttribute(image,"8BIM:1999,2998"));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% G e t I m a g e F r o m M a g i c k R e g i s t r y %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% GetImageFromMagickRegistry() gets an image from the registry as defined by
-% its name. If the image is not found, a NULL image is returned.
-%
-% Deprecated, replace with:
-%
-% GetImageRegistry(ImageRegistryType,name,exception);
-%
-% The format of the GetImageFromMagickRegistry method is:
-%
-% Image *GetImageFromMagickRegistry(const char *name,ssize_t *id,
-% ExceptionInfo *exception)
-%
-% A description of each parameter follows:
-%
-% o name: the name of the image to retrieve from the registry.
-%
-% o id: the registry id.
-%
-% o exception: return any errors or warnings in this structure.
-%
-*/
-MagickExport Image *GetImageFromMagickRegistry(const char *name,ssize_t *id,
- ExceptionInfo *exception)
-{
- *id=0L;
- return((Image *) GetImageRegistry(ImageRegistryType,name,exception));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% G e t M a g i c k R e g i s t r y %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% GetMagickRegistry() gets a blob from the registry as defined by the id. If
-% the blob that matches the id is not found, NULL is returned.
-%
-% The format of the GetMagickRegistry method is:
-%
-% const void *GetMagickRegistry(const ssize_t id,RegistryType *type,
-% size_t *length,ExceptionInfo *exception)
-%
-% A description of each parameter follows:
-%
-% o id: the registry id.
-%
-% o type: the registry type.
-%
-% o length: the blob length in number of bytes.
-%
-% o exception: return any errors or warnings in this structure.
-%
-*/
-MagickExport void *GetMagickRegistry(const ssize_t id,RegistryType *type,
- size_t *length,ExceptionInfo *exception)
-{
- char
- key[MaxTextExtent];
-
- void
- *blob;
-
- *type=UndefinedRegistryType;
- *length=0;
- (void) FormatLocaleString(key,MaxTextExtent,"%.20g\n",(double) id);
- blob=(void *) GetImageRegistry(ImageRegistryType,key,exception);
- if (blob != (void *) NULL)
- return(blob);
- blob=(void *) GetImageRegistry(ImageInfoRegistryType,key,exception);
- if (blob != (void *) NULL)
- return(blob);
- return((void *) GetImageRegistry(UndefinedRegistryType,key,exception));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% G e t I m a g e G e o m e t r y %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% GetImageGeometry() returns a region as defined by the geometry string with
-% respect to the image and its gravity.
-%
-% Deprecated, replace with:
-%
-% if (size_to_fit != MagickFalse)
-% ParseRegionGeometry(image,geometry,region_info,&image->exception); else
-% ParsePageGeometry(image,geometry,region_info,&image->exception);
-%
-% The format of the GetImageGeometry method is:
-%
-% int GetImageGeometry(Image *image,const char *geometry,
-% const unsigned int size_to_fit,RectangeInfo *region_info)
-%
-% A description of each parameter follows:
-%
-% o flags: Method GetImageGeometry returns a bitmask that indicates
-% which of the four values were located in the geometry string.
-%
-% o geometry: The geometry (e.g. 100x100+10+10).
-%
-% o size_to_fit: A value other than 0 means to scale the region so it
-% fits within the specified width and height.
-%
-% o region_info: the region as defined by the geometry string with
-% respect to the image and its gravity.
-%
-*/
-MagickExport int GetImageGeometry(Image *image,const char *geometry,
- const unsigned int size_to_fit,RectangleInfo *region_info)
-{
- if (image->debug != MagickFalse)
- (void) LogMagickEvent(DeprecateEvent,GetMagickModule(),"last use: v5.5.4");
- if (size_to_fit != MagickFalse)
- return((int) ParseRegionGeometry(image,geometry,region_info,&image->exception));
- return((int) ParsePageGeometry(image,geometry,region_info,&image->exception));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% G e t I m a g e L i s t %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% GetImageList() returns an image at the specified position in the list.
-%
-% Deprecated, replace with:
-%
-% CloneImage(GetImageFromList(images,(ssize_t) offset),0,0,MagickTrue,
-% exception);
-%
-% The format of the GetImageList method is:
-%
-% Image *GetImageList(const Image *images,const ssize_t offset,
-% ExceptionInfo *exception)
-%
-% A description of each parameter follows:
-%
-% o images: the image list.
-%
-% o offset: the position within the list.
-%
-% o exception: return any errors or warnings in this structure.
-%
-*/
-MagickExport Image *GetImageList(const Image *images,const ssize_t offset,
- ExceptionInfo *exception)
-{
- Image
- *image;
-
- if (images->debug != MagickFalse)
- (void) LogMagickEvent(DeprecateEvent,GetMagickModule(),"last use: v5.5.2");
- image=CloneImage(GetImageFromList(images,(ssize_t) offset),0,0,MagickTrue,
- exception);
- return(image);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% G e t I m a g e L i s t I n d e x %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% GetImageListIndex() returns the position in the list of the specified
-% image.
-%
-% Deprecated, replace with:
-%
-% GetImageIndexInList(images);
-%
-% The format of the GetImageListIndex method is:
-%
-% ssize_t GetImageListIndex(const Image *images)
-%
-% A description of each parameter follows:
-%
-% o images: the image list.
-%
-*/
-MagickExport ssize_t GetImageListIndex(const Image *images)
-{
- if (images->debug != MagickFalse)
- (void) LogMagickEvent(DeprecateEvent,GetMagickModule(),"last use: v5.5.2");
- return(GetImageIndexInList(images));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% G e t I m a g e L i s t S i z e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% GetImageListSize() returns the number of images in the list.
-%
-% Deprecated, replace with:
-%
-% GetImageListLength(images);
-%
-% The format of the GetImageListSize method is:
-%
-% size_t GetImageListSize(const Image *images)
-%
-% A description of each parameter follows:
-%
-% o images: the image list.
-%
-*/
-MagickExport size_t GetImageListSize(const Image *images)
-{
- if (images->debug != MagickFalse)
- (void) LogMagickEvent(DeprecateEvent,GetMagickModule(),"last use: v5.5.2");
- return(GetImageListLength(images));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% G e t I m a g e P i x e l s %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% GetImagePixels() obtains a pixel region for read/write access. If the
-% region is successfully accessed, a pointer to a PixelPacket array
-% representing the region is returned, otherwise NULL is returned.
-%
-% The returned pointer may point to a temporary working copy of the pixels
-% or it may point to the original pixels in memory. Performance is maximized
-% if the selected region is part of one row, or one or more full rows, since
-% then there is opportunity to access the pixels in-place (without a copy)
-% if the image is in RAM, or in a memory-mapped file. The returned pointer
-% should *never* be deallocated by the user.
-%
-% Pixels accessed via the returned pointer represent a simple array of type
-% PixelPacket. If the image type is CMYK or if the storage class is
-% PseduoClass, call GetAuthenticIndexQueue() after invoking GetImagePixels()
-% to obtain the black color component or colormap indexes (of type IndexPacket)
-% corresponding to the region. Once the PixelPacket (and/or IndexPacket)
-% array has been updated, the changes must be saved back to the underlying
-% image using SyncAuthenticPixels() or they may be lost.
-%
-% Deprecated, replace with:
-%
-% GetAuthenticPixels(image,x,y,columns,rows,&image->exception);
-%
-% The format of the GetImagePixels() method is:
-%
-% PixelPacket *GetImagePixels(Image *image,const ssize_t x,const ssize_t y,
-% const size_t columns,const size_t rows)
-%
-% A description of each parameter follows:
-%
-% o image: the image.
-%
-% o x,y,columns,rows: These values define the perimeter of a region of
-% pixels.
-%
-*/
-MagickExport PixelPacket *GetImagePixels(Image *image,const ssize_t x,const ssize_t y,
- const size_t columns,const size_t rows)
-{
- return(GetAuthenticPixels(image,x,y,columns,rows,&image->exception));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% G e t I n d e x e s %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% GetIndexes() returns the black channel or the colormap indexes associated
-% with the last call to QueueAuthenticPixels() or GetVirtualPixels(). NULL is
-% returned if the black channel or colormap indexes are not available.
-%
-% Deprecated, replace with:
-%
-% GetAuthenticIndexQueue(image);
-%
-% The format of the GetIndexes() method is:
-%
-% IndexPacket *GetIndexes(const Image *image)
-%
-% A description of each parameter follows:
-%
-% o indexes: GetIndexes() returns the indexes associated with the last
-% call to QueueAuthenticPixels() or GetAuthenticPixels().
-%
-% o image: the image.
-%
-*/
-MagickExport IndexPacket *GetIndexes(const Image *image)
-{
- return(GetAuthenticIndexQueue(image));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-+ G e t M a g i c k G e o m e t r y %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% GetMagickGeometry() is similar to GetGeometry() except the returned
-% geometry is modified as determined by the meta characters: %, !, <, >,
-% and ~.
-%
-% Deprecated, replace with:
-%
-% ParseMetaGeometry(geometry,x,y,width,height);
-%
-% The format of the GetMagickGeometry method is:
-%
-% unsigned int GetMagickGeometry(const char *geometry,ssize_t *x,ssize_t *y,
-% size_t *width,size_t *height)
-%
-% A description of each parameter follows:
-%
-% o geometry: Specifies a character string representing the geometry
-% specification.
-%
-% o x,y: A pointer to an integer. The x and y offset as determined by
-% the geometry specification is returned here.
-%
-% o width,height: A pointer to an unsigned integer. The width and height
-% as determined by the geometry specification is returned here.
-%
-*/
-MagickExport unsigned int GetMagickGeometry(const char *geometry,ssize_t *x,
- ssize_t *y,size_t *width,size_t *height)
-{
- (void) LogMagickEvent(DeprecateEvent,GetMagickModule(),"last use: v5.5.3");
- return(ParseMetaGeometry(geometry,x,y,width,height));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% G e t N e x t I m a g e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% GetNextImage() returns the next image in a list.
-%
-% Deprecated, replace with:
-%
-% GetNextImageInList(images);
-%
-% The format of the GetNextImage method is:
-%
-% Image *GetNextImage(const Image *images)
-%
-% A description of each parameter follows:
-%
-% o images: the image list.
-%
-*/
-MagickExport Image *GetNextImage(const Image *images)
-{
- if (images->debug != MagickFalse)
- (void) LogMagickEvent(DeprecateEvent,GetMagickModule(),"last use: v5.5.2");
- return(GetNextImageInList(images));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% G e t N e x t I m a g e A t t r i b u t e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% GetNextImageAttribute() gets the next image attribute.
-%
-% Deprecated, replace with:
-%
-% const char *property;
-% property=GetNextImageProperty(image);
-% if (property != (const char *) NULL)
-% GetImageAttribute(image,property);
-%
-% The format of the GetNextImageAttribute method is:
-%
-% const ImageAttribute *GetNextImageAttribute(const Image *image)
-%
-% A description of each parameter follows:
-%
-% o image: the image.
-%
-*/
-MagickExport const ImageAttribute *GetNextImageAttribute(const Image *image)
-{
- const char
- *property;
-
- property=GetNextImageProperty(image);
- if (property == (const char *) NULL)
- return((const ImageAttribute *) NULL);
- return(GetImageAttribute(image,property));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% G e t N u m b e r S c e n e s %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% GetNumberScenes() returns the number of images in the list.
-%
-% Deprecated, replace with:
-%
-% GetImageListLength(image);
-%
-% The format of the GetNumberScenes method is:
-%
-% unsigned int GetNumberScenes(const Image *images)
-%
-% A description of each parameter follows:
-%
-% o images: the image list.
-%
-*/
-MagickExport unsigned int GetNumberScenes(const Image *image)
-{
- if (image->debug != MagickFalse)
- (void) LogMagickEvent(DeprecateEvent,GetMagickModule(),"last use: v5.5.2");
- return((unsigned int) GetImageListLength(image));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% G e t O n e P i x e l %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% GetOnePixel() returns a single pixel at the specified (x,y) location.
-% The image background color is returned if an error occurs.
-%
-% Deprecated, replace with:
-%
-% GetOneAuthenticPixel(image,x,y,&pixel,&image->exception);
-%
-% The format of the GetOnePixel() method is:
-%
-% PixelPacket GetOnePixel(const Image image,const ssize_t x,const ssize_t y)
-%
-% A description of each parameter follows:
-%
-% o image: the image.
-%
-% o x,y: These values define the location of the pixel to return.
-%
-*/
-MagickExport PixelPacket GetOnePixel(Image *image,const ssize_t x,const ssize_t y)
-{
- PixelPacket
- pixel;
-
- (void) GetOneAuthenticPixel(image,x,y,&pixel,&image->exception);
- return(pixel);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% G e t P i x e l s %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% GetPixels() returns the pixels associated with the last call to
-% QueueAuthenticPixels() or GetAuthenticPixels().
-%
-% Deprecated, replace with:
-%
-% GetAuthenticPixelQueue(image);
-%
-% The format of the GetPixels() method is:
-%
-% PixelPacket *GetPixels(const Image image)
-%
-% A description of each parameter follows:
-%
-% o pixels: GetPixels() returns the pixels associated with the last call
-% to QueueAuthenticPixels() or GetAuthenticPixels().
-%
-% o image: the image.
-%
-*/
-MagickExport PixelPacket *GetPixels(const Image *image)
-{
- return(GetAuthenticPixelQueue(image));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% G e t P r e v i o u s I m a g e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% GetPreviousImage() returns the previous image in a list.
-%
-% Deprecated, replace with:
-%
-% GetPreviousImageInList(images));
-%
-% The format of the GetPreviousImage method is:
-%
-% Image *GetPreviousImage(const Image *images)
-%
-% A description of each parameter follows:
-%
-% o images: the image list.
-%
-*/
-MagickExport Image *GetPreviousImage(const Image *images)
-{
- if (images->debug != MagickFalse)
- (void) LogMagickEvent(DeprecateEvent,GetMagickModule(),"last use: v5.5.2");
- return(GetPreviousImageInList(images));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% H S L T r a n s f o r m %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% HSLTransform() converts a (hue, saturation, lightness) to a (red, green,
-% blue) triple.
-%
-% The format of the HSLTransformImage method is:
-%
-% void HSLTransform(const double hue,const double saturation,
-% const double lightness,Quantum *red,Quantum *green,Quantum *blue)
-%
-% A description of each parameter follows:
-%
-% o hue, saturation, lightness: A double value representing a
-% component of the HSL color space.
-%
-% o red, green, blue: A pointer to a pixel component of type Quantum.
-%
-*/
-
-static inline MagickRealType HueToRGB(MagickRealType m1,MagickRealType m2,
- MagickRealType hue)
-{
- if (hue < 0.0)
- hue+=1.0;
- if (hue > 1.0)
- hue-=1.0;
- if ((6.0*hue) < 1.0)
- return(m1+6.0*(m2-m1)*hue);
- if ((2.0*hue) < 1.0)
- return(m2);
- if ((3.0*hue) < 2.0)
- return(m1+6.0*(m2-m1)*(2.0/3.0-hue));
- return(m1);
-}
-
-MagickExport void HSLTransform(const double hue,const double saturation,
- const double lightness,Quantum *red,Quantum *green,Quantum *blue)
-{
- MagickRealType
- b,
- g,
- r,
- m1,
- m2;
-
- /*
- Convert HSL to RGB colorspace.
- */
- assert(red != (Quantum *) NULL);
- assert(green != (Quantum *) NULL);
- assert(blue != (Quantum *) NULL);
- if (lightness <= 0.5)
- m2=lightness*(saturation+1.0);
- else
- m2=lightness+saturation-lightness*saturation;
- m1=2.0*lightness-m2;
- r=HueToRGB(m1,m2,hue+1.0/3.0);
- g=HueToRGB(m1,m2,hue);
- b=HueToRGB(m1,m2,hue-1.0/3.0);
- *red=ClampToQuantum((MagickRealType) QuantumRange*r);
- *green=ClampToQuantum((MagickRealType) QuantumRange*g);
- *blue=ClampToQuantum((MagickRealType) QuantumRange*b);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% I d e n t i t y A f f i n e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% IdentityAffine() initializes the affine transform to the identity matrix.
-%
-% The format of the IdentityAffine method is:
-%
-% IdentityAffine(AffineMatrix *affine)
-%
-% A description of each parameter follows:
-%
-% o affine: A pointer the affine transform of type AffineMatrix.
-%
-*/
-MagickExport void IdentityAffine(AffineMatrix *affine)
-{
- (void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
- (void) LogMagickEvent(DeprecateEvent,GetMagickModule(),"last use: v5.5.7");
- assert(affine != (AffineMatrix *) NULL);
- (void) ResetMagickMemory(affine,0,sizeof(AffineMatrix));
- affine->sx=1.0;
- affine->sy=1.0;
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% I n i t i a l i z e M a g i c k %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% InitializeMagick() initializes the ImageMagick environment.
-%
-% Deprecated, replace with:
-%
-% MagickCoreGenesis(path,MagickFalse);
-%
-% The format of the InitializeMagick function is:
-%
-% InitializeMagick(const char *path)
-%
-% A description of each parameter follows:
-%
-% o path: the execution path of the current ImageMagick client.
-%
-*/
-MagickExport void InitializeMagick(const char *path)
-{
- MagickCoreGenesis(path,MagickFalse);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% I n t e r p o l a t e P i x e l C o l o r %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% InterpolatePixelColor() applies bi-linear or tri-linear interpolation
-% between a pixel and it's neighbors.
-%
-% The format of the InterpolatePixelColor method is:
-%
-% MagickPixelPacket InterpolatePixelColor(const Image *image,
-% CacheView *view_info,InterpolatePixelMethod method,const double x,
-% const double y,ExceptionInfo *exception)
-%
-% A description of each parameter follows:
-%
-% o image: the image.
-%
-% o image_view: the image cache view.
-%
-% o type: the type of pixel color interpolation.
-%
-% o x,y: A double representing the current (x,y) position of the pixel.
-%
-% o exception: return any errors or warnings in this structure.
-%
-*/
-
-static inline double MagickMax(const double x,const double y)
-{
- if (x > y)
- return(x);
- return(y);
-}
-
-static void BicubicInterpolate(const MagickPixelPacket *pixels,const double dx,
- MagickPixelPacket *pixel)
-{
- MagickRealType
- dx2,
- p,
- q,
- r,
- s;
-
- dx2=dx*dx;
- p=(pixels[3].red-pixels[2].red)-(pixels[0].red-pixels[1].red);
- q=(pixels[0].red-pixels[1].red)-p;
- r=pixels[2].red-pixels[0].red;
- s=pixels[1].red;
- pixel->red=(dx*dx2*p)+(dx2*q)+(dx*r)+s;
- p=(pixels[3].green-pixels[2].green)-(pixels[0].green-pixels[1].green);
- q=(pixels[0].green-pixels[1].green)-p;
- r=pixels[2].green-pixels[0].green;
- s=pixels[1].green;
- pixel->green=(dx*dx2*p)+(dx2*q)+(dx*r)+s;
- p=(pixels[3].blue-pixels[2].blue)-(pixels[0].blue-pixels[1].blue);
- q=(pixels[0].blue-pixels[1].blue)-p;
- r=pixels[2].blue-pixels[0].blue;
- s=pixels[1].blue;
- pixel->blue=(dx*dx2*p)+(dx2*q)+(dx*r)+s;
- p=(pixels[3].opacity-pixels[2].opacity)-(pixels[0].opacity-pixels[1].opacity);
- q=(pixels[0].opacity-pixels[1].opacity)-p;
- r=pixels[2].opacity-pixels[0].opacity;
- s=pixels[1].opacity;
- pixel->opacity=(dx*dx2*p)+(dx2*q)+(dx*r)+s;
- if (pixel->colorspace == CMYKColorspace)
- {
- p=(pixels[3].index-pixels[2].index)-(pixels[0].index-pixels[1].index);
- q=(pixels[0].index-pixels[1].index)-p;
- r=pixels[2].index-pixels[0].index;
- s=pixels[1].index;
- pixel->index=(dx*dx2*p)+(dx2*q)+(dx*r)+s;
- }
-}
-
-static inline MagickRealType CubicWeightingFunction(const MagickRealType x)
-{
- MagickRealType
- alpha,
- gamma;
-
- alpha=MagickMax(x+2.0,0.0);
- gamma=1.0*alpha*alpha*alpha;
- alpha=MagickMax(x+1.0,0.0);
- gamma-=4.0*alpha*alpha*alpha;
- alpha=MagickMax(x+0.0,0.0);
- gamma+=6.0*alpha*alpha*alpha;
- alpha=MagickMax(x-1.0,0.0);
- gamma-=4.0*alpha*alpha*alpha;
- return(gamma/6.0);
-}
-
-static inline double MeshInterpolate(const PointInfo *delta,const double p,
- const double x,const double y)
-{
- return(delta->x*x+delta->y*y+(1.0-delta->x-delta->y)*p);
-}
-
-static inline ssize_t NearestNeighbor(MagickRealType x)
-{
- if (x >= 0.0)
- return((ssize_t) (x+0.5));
- return((ssize_t) (x-0.5));
-}
-
-MagickExport MagickPixelPacket InterpolatePixelColor(const Image *image,
- CacheView *image_view,const InterpolatePixelMethod method,const double x,
- const double y,ExceptionInfo *exception)
-{
- MagickPixelPacket
- pixel;
-
- register const IndexPacket
- *indexes;
-
- register const PixelPacket
- *p;
-
- register ssize_t
- i;
-
- assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
- assert(image_view != (CacheView *) NULL);
- GetMagickPixelPacket(image,&pixel);
- switch (method)
- {
- case AverageInterpolatePixel:
- {
- MagickPixelPacket
- pixels[16];
-
- MagickRealType
- alpha[16],
- gamma;
-
- p=GetCacheViewVirtualPixels(image_view,(ssize_t) floor(x)-1,(ssize_t)
- floor(y)-1,4,4,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- indexes=GetCacheViewVirtualIndexQueue(image_view);
- for (i=0; i < 16L; i++)
- {
- GetMagickPixelPacket(image,pixels+i);
- SetMagickPixelPacket(image,p,indexes+i,pixels+i);
- alpha[i]=1.0;
- if (image->matte != MagickFalse)
- {
- alpha[i]=QuantumScale*((MagickRealType) GetPixelAlpha(p));
- pixels[i].red*=alpha[i];
- pixels[i].green*=alpha[i];
- pixels[i].blue*=alpha[i];
- if (image->colorspace == CMYKColorspace)
- pixels[i].index*=alpha[i];
- }
- gamma=alpha[i];
- gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
- pixel.red+=gamma*0.0625*pixels[i].red;
- pixel.green+=gamma*0.0625*pixels[i].green;
- pixel.blue+=gamma*0.0625*pixels[i].blue;
- pixel.opacity+=0.0625*pixels[i].opacity;
- if (image->colorspace == CMYKColorspace)
- pixel.index+=gamma*0.0625*pixels[i].index;
- p++;
- }
- break;
- }
- case BicubicInterpolatePixel:
- {
- MagickPixelPacket
- pixels[16],
- u[4];
-
- MagickRealType
- alpha[16];
-
- PointInfo
- delta;
-
- p=GetCacheViewVirtualPixels(image_view,(ssize_t) floor(x)-1,(ssize_t)
- floor(y)-1,4,4,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- indexes=GetCacheViewVirtualIndexQueue(image_view);
- for (i=0; i < 16L; i++)
- {
- GetMagickPixelPacket(image,pixels+i);
- SetMagickPixelPacket(image,p,indexes+i,pixels+i);
- alpha[i]=1.0;
- if (image->matte != MagickFalse)
- {
- alpha[i]=QuantumScale*((MagickRealType) GetPixelAlpha(p));
- pixels[i].red*=alpha[i];
- pixels[i].green*=alpha[i];
- pixels[i].blue*=alpha[i];
- if (image->colorspace == CMYKColorspace)
- pixels[i].index*=alpha[i];
- }
- p++;
- }
- delta.x=x-floor(x);
- for (i=0; i < 4L; i++)
- BicubicInterpolate(pixels+4*i,delta.x,u+i);
- delta.y=y-floor(y);
- BicubicInterpolate(u,delta.y,&pixel);
- break;
- }
- case BilinearInterpolatePixel:
- default:
- {
- MagickPixelPacket
- pixels[16];
-
- MagickRealType
- alpha[16],
- gamma;
-
- PointInfo
- delta;
-
- p=GetCacheViewVirtualPixels(image_view,(ssize_t) floor(x),(ssize_t)
- floor(y),2,2,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- indexes=GetCacheViewVirtualIndexQueue(image_view);
- for (i=0; i < 4L; i++)
- {
- GetMagickPixelPacket(image,pixels+i);
- SetMagickPixelPacket(image,p,indexes+i,pixels+i);
- alpha[i]=1.0;
- if (image->matte != MagickFalse)
- {
- alpha[i]=QuantumScale*((MagickRealType) GetPixelAlpha(p));
- pixels[i].red*=alpha[i];
- pixels[i].green*=alpha[i];
- pixels[i].blue*=alpha[i];
- if (image->colorspace == CMYKColorspace)
- pixels[i].index*=alpha[i];
- }
- p++;
- }
- delta.x=x-floor(x);
- delta.y=y-floor(y);
- gamma=(((1.0-delta.y)*((1.0-delta.x)*alpha[0]+delta.x*alpha[1])+delta.y*
- ((1.0-delta.x)*alpha[2]+delta.x*alpha[3])));
- gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
- pixel.red=gamma*((1.0-delta.y)*((1.0-delta.x)*pixels[0].red+delta.x*
- pixels[1].red)+delta.y*((1.0-delta.x)*pixels[2].red+delta.x*
- pixels[3].red));
- pixel.green=gamma*((1.0-delta.y)*((1.0-delta.x)*pixels[0].green+delta.x*
- pixels[1].green)+delta.y*((1.0-delta.x)*pixels[2].green+
- delta.x*pixels[3].green));
- pixel.blue=gamma*((1.0-delta.y)*((1.0-delta.x)*pixels[0].blue+delta.x*
- pixels[1].blue)+delta.y*((1.0-delta.x)*pixels[2].blue+delta.x*
- pixels[3].blue));
- pixel.opacity=((1.0-delta.y)*((1.0-delta.x)*pixels[0].opacity+delta.x*
- pixels[1].opacity)+delta.y*((1.0-delta.x)*pixels[2].opacity+delta.x*
- pixels[3].opacity));
- if (image->colorspace == CMYKColorspace)
- pixel.index=gamma*((1.0-delta.y)*((1.0-delta.x)*pixels[0].index+delta.x*
- pixels[1].index)+delta.y*((1.0-delta.x)*pixels[2].index+delta.x*
- pixels[3].index));
- break;
- }
- case FilterInterpolatePixel:
- {
- Image
- *excerpt_image,
- *filter_image;
-
- MagickPixelPacket
- pixels[1];
-
- RectangleInfo
- geometry;
-
- geometry.width=4L;
- geometry.height=4L;
- geometry.x=(ssize_t) floor(x)-1L;
- geometry.y=(ssize_t) floor(y)-1L;
- excerpt_image=ExcerptImage(image,&geometry,exception);
- if (excerpt_image == (Image *) NULL)
- break;
- filter_image=ResizeImage(excerpt_image,1,1,image->filter,image->blur,
- exception);
- excerpt_image=DestroyImage(excerpt_image);
- if (filter_image == (Image *) NULL)
- break;
- p=GetVirtualPixels(filter_image,0,0,1,1,exception);
- if (p == (const PixelPacket *) NULL)
- {
- filter_image=DestroyImage(filter_image);
- break;
- }
- indexes=GetVirtualIndexQueue(filter_image);
- GetMagickPixelPacket(image,pixels);
- SetMagickPixelPacket(image,p,indexes,&pixel);
- filter_image=DestroyImage(filter_image);
- break;
- }
- case IntegerInterpolatePixel:
- {
- MagickPixelPacket
- pixels[1];
-
- p=GetCacheViewVirtualPixels(image_view,(ssize_t) floor(x),(ssize_t)
- floor(y),1,1,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- indexes=GetCacheViewVirtualIndexQueue(image_view);
- GetMagickPixelPacket(image,pixels);
- SetMagickPixelPacket(image,p,indexes,&pixel);
- break;
- }
- case MeshInterpolatePixel:
- {
- MagickPixelPacket
- pixels[4];
-
- MagickRealType
- alpha[4],
- gamma;
-
- PointInfo
- delta,
- luminance;
-
- p=GetCacheViewVirtualPixels(image_view,(ssize_t) floor(x),(ssize_t)
- floor(y),2,2,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- indexes=GetCacheViewVirtualIndexQueue(image_view);
- for (i=0; i < 4L; i++)
- {
- GetMagickPixelPacket(image,pixels+i);
- SetMagickPixelPacket(image,p,indexes+i,pixels+i);
- alpha[i]=1.0;
- if (image->matte != MagickFalse)
- {
- alpha[i]=QuantumScale*((MagickRealType) GetPixelAlpha(p));
- pixels[i].red*=alpha[i];
- pixels[i].green*=alpha[i];
- pixels[i].blue*=alpha[i];
- if (image->colorspace == CMYKColorspace)
- pixels[i].index*=alpha[i];
- }
- p++;
- }
- delta.x=x-floor(x);
- delta.y=y-floor(y);
- luminance.x=MagickPixelLuminance(pixels+0)-MagickPixelLuminance(pixels+3);
- luminance.y=MagickPixelLuminance(pixels+1)-MagickPixelLuminance(pixels+2);
- if (fabs(luminance.x) < fabs(luminance.y))
- {
- /*
- Diagonal 0-3 NW-SE.
- */
- if (delta.x <= delta.y)
- {
- /*
- Bottom-left triangle (pixel:2, diagonal: 0-3).
- */
- delta.y=1.0-delta.y;
- gamma=MeshInterpolate(&delta,alpha[2],alpha[3],alpha[0]);
- gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
- pixel.red=gamma*MeshInterpolate(&delta,pixels[2].red,
- pixels[3].red,pixels[0].red);
- pixel.green=gamma*MeshInterpolate(&delta,pixels[2].green,
- pixels[3].green,pixels[0].green);
- pixel.blue=gamma*MeshInterpolate(&delta,pixels[2].blue,
- pixels[3].blue,pixels[0].blue);
- pixel.opacity=gamma*MeshInterpolate(&delta,pixels[2].opacity,
- pixels[3].opacity,pixels[0].opacity);
- if (image->colorspace == CMYKColorspace)
- pixel.index=gamma*MeshInterpolate(&delta,pixels[2].index,
- pixels[3].index,pixels[0].index);
- }
- else
- {
- /*
- Top-right triangle (pixel:1, diagonal: 0-3).
- */
- delta.x=1.0-delta.x;
- gamma=MeshInterpolate(&delta,alpha[1],alpha[0],alpha[3]);
- gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
- pixel.red=gamma*MeshInterpolate(&delta,pixels[1].red,
- pixels[0].red,pixels[3].red);
- pixel.green=gamma*MeshInterpolate(&delta,pixels[1].green,
- pixels[0].green,pixels[3].green);
- pixel.blue=gamma*MeshInterpolate(&delta,pixels[1].blue,
- pixels[0].blue,pixels[3].blue);
- pixel.opacity=gamma*MeshInterpolate(&delta,pixels[1].opacity,
- pixels[0].opacity,pixels[3].opacity);
- if (image->colorspace == CMYKColorspace)
- pixel.index=gamma*MeshInterpolate(&delta,pixels[1].index,
- pixels[0].index,pixels[3].index);
- }
- }
- else
- {
- /*
- Diagonal 1-2 NE-SW.
- */
- if (delta.x <= (1.0-delta.y))
- {
- /*
- Top-left triangle (pixel 0, diagonal: 1-2).
- */
- gamma=MeshInterpolate(&delta,alpha[0],alpha[1],alpha[2]);
- gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
- pixel.red=gamma*MeshInterpolate(&delta,pixels[0].red,
- pixels[1].red,pixels[2].red);
- pixel.green=gamma*MeshInterpolate(&delta,pixels[0].green,
- pixels[1].green,pixels[2].green);
- pixel.blue=gamma*MeshInterpolate(&delta,pixels[0].blue,
- pixels[1].blue,pixels[2].blue);
- pixel.opacity=gamma*MeshInterpolate(&delta,pixels[0].opacity,
- pixels[1].opacity,pixels[2].opacity);
- if (image->colorspace == CMYKColorspace)
- pixel.index=gamma*MeshInterpolate(&delta,pixels[0].index,
- pixels[1].index,pixels[2].index);
- }
- else
- {
- /*
- Bottom-right triangle (pixel: 3, diagonal: 1-2).
- */
- delta.x=1.0-delta.x;
- delta.y=1.0-delta.y;
- gamma=MeshInterpolate(&delta,alpha[3],alpha[2],alpha[1]);
- gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
- pixel.red=gamma*MeshInterpolate(&delta,pixels[3].red,
- pixels[2].red,pixels[1].red);
- pixel.green=gamma*MeshInterpolate(&delta,pixels[3].green,
- pixels[2].green,pixels[1].green);
- pixel.blue=gamma*MeshInterpolate(&delta,pixels[3].blue,
- pixels[2].blue,pixels[1].blue);
- pixel.opacity=gamma*MeshInterpolate(&delta,pixels[3].opacity,
- pixels[2].opacity,pixels[1].opacity);
- if (image->colorspace == CMYKColorspace)
- pixel.index=gamma*MeshInterpolate(&delta,pixels[3].index,
- pixels[2].index,pixels[1].index);
- }
- }
- break;
- }
- case NearestNeighborInterpolatePixel:
- {
- MagickPixelPacket
- pixels[1];
-
- p=GetCacheViewVirtualPixels(image_view,NearestNeighbor(x),
- NearestNeighbor(y),1,1,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- indexes=GetCacheViewVirtualIndexQueue(image_view);
- GetMagickPixelPacket(image,pixels);
- SetMagickPixelPacket(image,p,indexes,&pixel);
- break;
- }
- case SplineInterpolatePixel:
- {
- MagickPixelPacket
- pixels[16];
-
- MagickRealType
- alpha[16],
- dx,
- dy,
- gamma;
-
- PointInfo
- delta;
-
- ssize_t
- j,
- n;
-
- p=GetCacheViewVirtualPixels(image_view,(ssize_t) floor(x)-1,(ssize_t)
- floor(y)-1,4,4,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- indexes=GetCacheViewVirtualIndexQueue(image_view);
- n=0;
- delta.x=x-floor(x);
- delta.y=y-floor(y);
- for (i=(-1); i < 3L; i++)
- {
- dy=CubicWeightingFunction((MagickRealType) i-delta.y);
- for (j=(-1); j < 3L; j++)
- {
- GetMagickPixelPacket(image,pixels+n);
- SetMagickPixelPacket(image,p,indexes+n,pixels+n);
- alpha[n]=1.0;
- if (image->matte != MagickFalse)
- {
- alpha[n]=QuantumScale*((MagickRealType)
- GetPixelAlpha(p));
- pixels[n].red*=alpha[n];
- pixels[n].green*=alpha[n];
- pixels[n].blue*=alpha[n];
- if (image->colorspace == CMYKColorspace)
- pixels[n].index*=alpha[n];
- }
- dx=CubicWeightingFunction(delta.x-(MagickRealType) j);
- gamma=alpha[n];
- gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
- pixel.red+=gamma*dx*dy*pixels[n].red;
- pixel.green+=gamma*dx*dy*pixels[n].green;
- pixel.blue+=gamma*dx*dy*pixels[n].blue;
- if (image->matte != MagickFalse)
- pixel.opacity+=dx*dy*pixels[n].opacity;
- if (image->colorspace == CMYKColorspace)
- pixel.index+=gamma*dx*dy*pixels[n].index;
- n++;
- p++;
- }
- }
- break;
- }
- }
- return(pixel);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% I n t e r p r e t I m a g e A t t r i b u t e s %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% InterpretImageAttributes() replaces any embedded formatting characters with
-% the appropriate image attribute and returns the translated text.
-%
-% Deprecated, replace with:
-%
-% InterpretImageProperties(image_info,image,embed_text);
-%
-% The format of the InterpretImageAttributes method is:
-%
-% char *InterpretImageAttributes(const ImageInfo *image_info,Image *image,
-% const char *embed_text)
-%
-% A description of each parameter follows:
-%
-% o image_info: the image info.
-%
-% o image: the image.
-%
-% o embed_text: the address of a character string containing the embedded
-% formatting characters.
-%
-*/
-MagickExport char *InterpretImageAttributes(const ImageInfo *image_info,
- Image *image,const char *embed_text)
-{
- (void) LogMagickEvent(DeprecateEvent,GetMagickModule(),"last use: v6.3.1");
- return(InterpretImageProperties(image_info,image,embed_text));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-+ I s S u b i m a g e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% IsSubimage() returns MagickTrue if the geometry is a valid subimage
-% specification (e.g. [1], [1-9], [1,7,4]).
-%
-% The format of the IsSubimage method is:
-%
-% unsigned int IsSubimage(const char *geometry,const unsigned int pedantic)
-%
-% A description of each parameter follows:
-%
-% o geometry: This string is the geometry specification.
-%
-% o pedantic: A value other than 0 invokes a more restrictive set of
-% conditions for a valid specification (e.g. [1], [1-4], [4-1]).
-%
-*/
-MagickExport unsigned int IsSubimage(const char *geometry,
- const unsigned int pedantic)
-{
- (void) LogMagickEvent(DeprecateEvent,GetMagickModule(),"last use: v5.5.7");
- if (geometry == (const char *) NULL)
- return(MagickFalse);
- if ((strchr(geometry,'x') != (char *) NULL) ||
- (strchr(geometry,'X') != (char *) NULL))
- return(MagickFalse);
- if ((pedantic != MagickFalse) && (strchr(geometry,',') != (char *) NULL))
- return(MagickFalse);
- return(MagickTrue);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% L e v e l I m a g e C o l o r s %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% LevelImageColor() will map the given color to "black" and "white"
-% values, limearly spreading out the colors, and level values on a channel by
-% channel bases, as per LevelImage(). The given colors allows you to specify
-% different level ranges for each of the color channels separately.
-%
-% If the boolean 'invert' is set true the image values will modifyed in the
-% reverse direction. That is any existing "black" and "white" colors in the
-% image will become the color values given, with all other values compressed
-% appropriatally. This effectivally maps a greyscale gradient into the given
-% color gradient.
-%
-% Deprecated, replace with:
-%
-% LevelColorsImageChannel(image,channel,black_color,white_color,invert);
-%
-% The format of the LevelImageColors method is:
-%
-% MagickBooleanType LevelImageColors(Image *image,const ChannelType channel,
-% const MagickPixelPacket *black_color,const MagickPixelPacket *white_color,
-% const MagickBooleanType invert)
-%
-% A description of each parameter follows:
-%
-% o image: the image.
-%
-% o channel: the channel.
-%
-% o black_color: The color to map black to/from
-%
-% o white_point: The color to map white to/from
-%
-% o invert: if true map the colors (levelize), rather than from (level)
-%
-*/
-MagickBooleanType LevelImageColors(Image *image,const ChannelType channel,
- const MagickPixelPacket *black_color,const MagickPixelPacket *white_color,
- const MagickBooleanType invert)
-{
- return(LevelColorsImageChannel(image,channel,black_color,white_color,invert));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% L i b e r a t e M e m o r y %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% LiberateMemory() frees memory that has already been allocated, and NULL's
-% the pointer to it.
-%
-% The format of the LiberateMemory method is:
-%
-% void LiberateMemory(void **memory)
-%
-% A description of each parameter follows:
-%
-% o memory: A pointer to a block of memory to free for reuse.
-%
-*/
-MagickExport void LiberateMemory(void **memory)
-{
- assert(memory != (void **) NULL);
- (void) LogMagickEvent(DeprecateEvent,GetMagickModule(),"last use: v5.5.7");
- if (*memory == (void *) NULL)
- return;
- free(*memory);
- *memory=(void *) NULL;
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% L i b e r a t e S e m a p h o r e I n f o %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% LiberateSemaphoreInfo() relinquishes a semaphore.
-%
-% Deprecated, replace with:
-%
-% UnlockSemaphoreInfo(*semaphore_info);
-%
-% The format of the LiberateSemaphoreInfo method is:
-%
-% LiberateSemaphoreInfo(void **semaphore_info)
-%
-% A description of each parameter follows:
-%
-% o semaphore_info: Specifies a pointer to an SemaphoreInfo structure.
-%
-*/
-MagickExport void LiberateSemaphoreInfo(SemaphoreInfo **semaphore_info)
-{
- (void) LogMagickEvent(DeprecateEvent,GetMagickModule(),"last use: v5.5.7");
- UnlockSemaphoreInfo(*semaphore_info);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% M a g i c k I n c a r n a t e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% MagickIncarnate() initializes the ImageMagick environment.
-%
-% Deprecated, replace with:
-%
-% MagickCoreGenesis(path,MagickFalse);
-%
-% The format of the MagickIncarnate function is:
-%
-% MagickIncarnate(const char *path)
-%
-% A description of each parameter follows:
-%
-% o path: the execution path of the current ImageMagick client.
-%
-*/
-
-MagickExport void MagickIncarnate(const char *path)
-{
- (void) LogMagickEvent(DeprecateEvent,GetMagickModule(),"last use: v5.5.1");
- MagickCoreGenesis(path,MagickFalse);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% M a g i c k M o n i t o r %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% MagickMonitor() calls the monitor handler method with a text string that
-% describes the task and a measure of completion. The method returns
-% MagickTrue on success otherwise MagickFalse if an error is encountered, e.g.
-% if there was a user interrupt.
-%
-% The format of the MagickMonitor method is:
-%
-% MagickBooleanType MagickMonitor(const char *text,
-% const MagickOffsetType offset,const MagickSizeType span,
-% void *client_data)
-%
-% A description of each parameter follows:
-%
-% o offset: the position relative to the span parameter which represents
-% how much progress has been made toward completing a task.
-%
-% o span: the span relative to completing a task.
-%
-% o client_data: the client data.
-%
-*/
-MagickExport MagickBooleanType MagickMonitor(const char *text,
- const MagickOffsetType offset,const MagickSizeType span,
- void *magick_unused(client_data))
-{
- ExceptionInfo
- *exception;
-
- MagickBooleanType
- status;
-
- assert(text != (const char *) NULL);
- (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",text);
- ProcessPendingEvents(text);
- status=MagickTrue;
- exception=AcquireExceptionInfo();
- if (monitor_handler != (MonitorHandler) NULL)
- status=(*monitor_handler)(text,offset,span,exception);
- exception=DestroyExceptionInfo(exception);
- return(status);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% M a p I m a g e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% MapImage() replaces the colors of an image with the closest color from a
-% reference image.
-%
-% Deprecated, replace with:
-%
-% QuantizeInfo quantize_info;
-% GetQuantizeInfo(&quantize_info);
-% quantize_info.dither=dither;
-% RemapImage(&quantize_info,image,map_image);
-%
-% The format of the MapImage method is:
-%
-% MagickBooleanType MapImage(Image *image,const Image *map_image,
-% const MagickBooleanType dither)
-%
-% A description of each parameter follows:
-%
-% o image: Specifies a pointer to an Image structure.
-%
-% o map_image: the image. Reduce image to a set of colors represented by
-% this image.
-%
-% o dither: Set this integer value to something other than zero to
-% dither the mapped image.
-%
-*/
-MagickExport MagickBooleanType MapImage(Image *image,const Image *map_image,
- const MagickBooleanType dither)
-{
- QuantizeInfo
- quantize_info;
-
- /*
- Initialize color cube.
- */
- assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
- if (image->debug != MagickFalse)
- (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
- assert(map_image != (Image *) NULL);
- assert(map_image->signature == MagickSignature);
- GetQuantizeInfo(&quantize_info);
- quantize_info.dither=dither;
- return(RemapImage(&quantize_info,image,map_image));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% M a p I m a g e s %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% MapImages() replaces the colors of a sequence of images with the closest
-% color from a reference image.
-%
-% Deprecated, replace with:
-%
-% QuantizeInfo quantize_info;
-% GetQuantizeInfo(&quantize_info);
-% quantize_info.dither=dither;
-% RemapImages(&quantize_info,images,map_image);
-%
-% The format of the MapImage method is:
-%
-% MagickBooleanType MapImages(Image *images,Image *map_image,
-% const MagickBooleanType dither)
-%
-% A description of each parameter follows:
-%
-% o image: Specifies a pointer to a set of Image structures.
-%
-% o map_image: the image. Reduce image to a set of colors represented by
-% this image.
-%
-% o dither: Set this integer value to something other than zero to
-% dither the quantized image.
-%
-*/
-MagickExport MagickBooleanType MapImages(Image *images,const Image *map_image,
- const MagickBooleanType dither)
-{
- QuantizeInfo
- quantize_info;
-
- assert(images != (Image *) NULL);
- assert(images->signature == MagickSignature);
- if (images->debug != MagickFalse)
- (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",images->filename);
- GetQuantizeInfo(&quantize_info);
- quantize_info.dither=dither;
- return(RemapImages(&quantize_info,images,map_image));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% M a t t e F l o o d f i l l I m a g e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% MatteFloodfill() changes the transparency value of any pixel that matches
-% target and is an immediate neighbor. If the method FillToBorderMethod
-% is specified, the transparency value is changed for any neighbor pixel
-% that does not match the bordercolor member of image.
-%
-% By default target must match a particular pixel transparency exactly.
-% However, in many cases two transparency values may differ by a
-% small amount. The fuzz member of image defines how much tolerance is
-% acceptable to consider two transparency values as the same. For example,
-% set fuzz to 10 and the opacity values of 100 and 102 respectively are
-% now interpreted as the same value for the purposes of the floodfill.
-%
-% The format of the MatteFloodfillImage method is:
-%
-% MagickBooleanType MatteFloodfillImage(Image *image,
-% const PixelPacket target,const Quantum opacity,const ssize_t x_offset,
-% const ssize_t y_offset,const PaintMethod method)
-%
-% A description of each parameter follows:
-%
-% o image: the image.
-%
-% o target: the RGB value of the target color.
-%
-% o opacity: the level of transparency: 0 is fully opaque and QuantumRange is
-% fully transparent.
-%
-% o x,y: the starting location of the operation.
-%
-% o method: Choose either FloodfillMethod or FillToBorderMethod.
-%
-*/
-MagickExport MagickBooleanType MatteFloodfillImage(Image *image,
- const PixelPacket target,const Quantum opacity,const ssize_t x_offset,
- const ssize_t y_offset,const PaintMethod method)
-{
- Image
- *floodplane_image;
-
- MagickBooleanType
- skip;
-
- register SegmentInfo
- *s;
-
- SegmentInfo
- *segment_stack;
-
- ssize_t
- offset,
- start,
- x,
- x1,
- x2,
- y;
-
- /*
- Check boundary conditions.
- */
- assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
- if (image->debug != MagickFalse)
- (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
- if ((x_offset < 0) || (x_offset >= (ssize_t) image->columns))
- return(MagickFalse);
- if ((y_offset < 0) || (y_offset >= (ssize_t) image->rows))
- return(MagickFalse);
- if (SetImageStorageClass(image,DirectClass) == MagickFalse)
- return(MagickFalse);
- if (image->matte == MagickFalse)
- (void) SetImageAlphaChannel(image,OpaqueAlphaChannel);
- floodplane_image=CloneImage(image,image->columns,image->rows,MagickTrue,
- &image->exception);
- if (floodplane_image == (Image *) NULL)
- return(MagickFalse);
- (void) SetImageAlphaChannel(floodplane_image,OpaqueAlphaChannel);
- /*
- Set floodfill color.
- */
- segment_stack=(SegmentInfo *) AcquireQuantumMemory(MaxStacksize,
- sizeof(*segment_stack));
- if (segment_stack == (SegmentInfo *) NULL)
- {
- floodplane_image=DestroyImage(floodplane_image);
- ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed",
- image->filename);
- }
- /*
- Push initial segment on stack.
- */
- x=x_offset;
- y=y_offset;
- start=0;
- s=segment_stack;
- PushSegmentStack(y,x,x,1);
- PushSegmentStack(y+1,x,x,-1);
- while (s > segment_stack)
- {
- register const PixelPacket
- *restrict p;
-
- register ssize_t
- x;
-
- register PixelPacket
- *restrict q;
-
- /*
- Pop segment off stack.
- */
- s--;
- x1=(ssize_t) s->x1;
- x2=(ssize_t) s->x2;
- offset=(ssize_t) s->y2;
- y=(ssize_t) s->y1+offset;
- /*
- Recolor neighboring pixels.
- */
- p=GetVirtualPixels(image,0,y,(size_t) (x1+1),1,&image->exception);
- q=GetAuthenticPixels(floodplane_image,0,y,(size_t) (x1+1),1,
- &image->exception);
- if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
- break;
- p+=x1;
- q+=x1;
- for (x=x1; x >= 0; x--)
- {
- if (q->opacity == (Quantum) TransparentOpacity)
- break;
- if (method == FloodfillMethod)
- {
- if (IsColorSimilar(image,p,&target) == MagickFalse)
- break;
- }
- else
- if (IsColorSimilar(image,p,&target) != MagickFalse)
- break;
- q->opacity=(Quantum) TransparentOpacity;
- q--;
- p--;
- }
- if (SyncAuthenticPixels(floodplane_image,&image->exception) == MagickFalse)
- break;
- skip=x >= x1 ? MagickTrue : MagickFalse;
- if (skip == MagickFalse)
- {
- start=x+1;
- if (start < x1)
- PushSegmentStack(y,start,x1-1,-offset);
- x=x1+1;
- }
- do
- {
- if (skip == MagickFalse)
- {
- if (x < (ssize_t) image->columns)
- {
- p=GetVirtualPixels(image,x,y,image->columns-x,1,
- &image->exception);
- q=GetAuthenticPixels(floodplane_image,x,y,image->columns-x,1,
- &image->exception);
- if ((p == (const PixelPacket *) NULL) ||
- (q == (PixelPacket *) NULL))
- break;
- for ( ; x < (ssize_t) image->columns; x++)
- {
- if (q->opacity == (Quantum) TransparentOpacity)
- break;
- if (method == FloodfillMethod)
- {
- if (IsColorSimilar(image,p,&target) == MagickFalse)
- break;
- }
- else
- if (IsColorSimilar(image,p,&target) != MagickFalse)
- break;
- q->opacity=(Quantum) TransparentOpacity;
- q++;
- p++;
- }
- if (SyncAuthenticPixels(floodplane_image,&image->exception) == MagickFalse)
- break;
- }
- PushSegmentStack(y,start,x-1,offset);
- if (x > (x2+1))
- PushSegmentStack(y,x2+1,x-1,-offset);
- }
- skip=MagickFalse;
- x++;
- if (x <= x2)
- {
- p=GetVirtualPixels(image,x,y,(size_t) (x2-x+1),1,
- &image->exception);
- q=GetAuthenticPixels(floodplane_image,x,y,(size_t) (x2-x+1),1,
- &image->exception);
- if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
- break;
- for ( ; x <= x2; x++)
- {
- if (q->opacity == (Quantum) TransparentOpacity)
- break;
- if (method == FloodfillMethod)
- {
- if (IsColorSimilar(image,p,&target) != MagickFalse)
- break;
- }
- else
- if (IsColorSimilar(image,p,&target) == MagickFalse)
- break;
- p++;
- q++;
- }
- }
- start=x;
- } while (x <= x2);
- }
- for (y=0; y < (ssize_t) image->rows; y++)
- {
- register const PixelPacket
- *restrict p;
-
- register ssize_t
- x;
-
- register PixelPacket
- *restrict q;
-
- /*
- Tile fill color onto floodplane.
- */
- p=GetVirtualPixels(floodplane_image,0,y,image->columns,1,
- &image->exception);
- q=GetAuthenticPixels(image,0,y,image->columns,1,&image->exception);
- if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL))
- break;
- for (x=0; x < (ssize_t) image->columns; x++)
- {
- if (GetPixelOpacity(p) != OpaqueOpacity)
- q->opacity=opacity;
- p++;
- q++;
- }
- if (SyncAuthenticPixels(image,&image->exception) == MagickFalse)
- break;
- }
- segment_stack=(SegmentInfo *) RelinquishMagickMemory(segment_stack);
- floodplane_image=DestroyImage(floodplane_image);
- return(y == (ssize_t) image->rows ? MagickTrue : MagickFalse);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% M a x i m u m I m a g e s %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% MaximumImages() returns the maximum intensity of an image sequence.
-%
-% Deprecated, replace with:
-%
-% EvaluateImages(images,MinEvaluateOperator,exception);
-%
-% The format of the MaxImages method is:
-%
-% Image *MaximumImages(Image *images,ExceptionInfo *exception)
-%
-% A description of each parameter follows:
-%
-% o images: the image sequence.
-%
-% o exception: return any errors or warnings in this structure.
-%
-*/
-MagickExport Image *MaximumImages(const Image *images,ExceptionInfo *exception)
-{
- return(EvaluateImages(images,MinEvaluateOperator,exception));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% M i n i m u m I m a g e s %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% MinimumImages() returns the minimum intensity of an image sequence.
-%
-% Deprecated, replace with:
-%
-% EvaluateImages(images,MinEvaluateOperator,exception);
-%
-% The format of the MinimumImages method is:
-%
-% Image *MinimumImages(Image *images,ExceptionInfo *exception)
-%
-% A description of each parameter follows:
-%
-% o images: the image sequence.
-%
-% o exception: return any errors or warnings in this structure.
-%
-*/
-MagickExport Image *MinimumImages(const Image *images,ExceptionInfo *exception)
-{
- return(EvaluateImages(images,MinEvaluateOperator,exception));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% M e d i a n F i l t e r I m a g e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% MedianFilterImage() applies a digital filter that improves the quality
-% of a noisy image. Each pixel is replaced by the median in a set of
-% neighboring pixels as defined by radius.
-%
-% The algorithm was contributed by Mike Edmonds and implements an insertion
-% sort for selecting median color-channel values. For more on this algorithm
-% see "Skip Lists: A probabilistic Alternative to Balanced Trees" by William
-% Pugh in the June 1990 of Communications of the ACM.
-%
-% The format of the MedianFilterImage method is:
-%
-% Image *MedianFilterImage(const Image *image,const double radius,
-% ExceptionInfo *exception)
-%
-% A description of each parameter follows:
-%
-% o image: the image.
-%
-% o radius: the radius of the pixel neighborhood.
-%
-% o exception: return any errors or warnings in this structure.
-%
-*/
-MagickExport Image *MedianFilterImage(const Image *image,const double radius,
- ExceptionInfo *exception)
-{
- Image
- *median_image;
-
- median_image=StatisticImage(image,MedianStatistic,(size_t) radius,(size_t)
- radius,exception);
- return(median_image);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% M o d e I m a g e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% ModeImage() makes each pixel the 'predominant color' of the neighborhood
-% of the specified radius.
-%
-% The format of the ModeImage method is:
-%
-% Image *ModeImage(const Image *image,const double radius,
-% ExceptionInfo *exception)
-%
-% A description of each parameter follows:
-%
-% o image: the image.
-%
-% o radius: the radius of the pixel neighborhood.
-%
-% o exception: return any errors or warnings in this structure.
-%
-*/
-MagickExport Image *ModeImage(const Image *image,const double radius,
- ExceptionInfo *exception)
-{
- Image
- *mode_image;
-
- mode_image=StatisticImage(image,ModeStatistic,(size_t) radius,(size_t) radius,
- exception);
- return(mode_image);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% M o s a i c I m a g e s %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% MosaicImages() Obsolete Function: Use MergeImageLayers() instead.
-%
-% Deprecated, replace with:
-%
-% MergeImageLayers(image,MosaicLayer,exception);
-%
-% The format of the MosaicImage method is:
-%
-% Image *MosaicImages(const Image *image,ExceptionInfo *exception)
-%
-% A description of each parameter follows:
-%
-% o image: the image list to be composited together
-%
-% o exception: return any errors or warnings in this structure.
-%
-*/
-MagickExport Image *MosaicImages(Image *image,ExceptionInfo *exception)
-{
- return(MergeImageLayers(image,MosaicLayer,exception));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% O p a q u e I m a g e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% OpaqueImage() changes any pixel that matches color with the color
-% defined by fill.
-%
-% By default color must match a particular pixel color exactly. However,
-% in many cases two colors may differ by a small amount. Fuzz defines
-% how much tolerance is acceptable to consider two colors as the same.
-% For example, set fuzz to 10 and the color red at intensities of 100 and
-% 102 respectively are now interpreted as the same color.
-%
-% The format of the OpaqueImage method is:
-%
-% MagickBooleanType OpaqueImage(Image *image,
-% const PixelPacket *target,const PixelPacket fill)
-%
-% A description of each parameter follows:
-%
-% o image: the image.
-%
-% o target: the RGB value of the target color.
-%
-% o fill: the replacement color.
-%
-*/
-MagickExport MagickBooleanType OpaqueImage(Image *image,
- const PixelPacket target,const PixelPacket fill)
-{
-#define OpaqueImageTag "Opaque/Image"
-
- MagickBooleanType
- proceed;
-
- register ssize_t
- i;
-
- ssize_t
- y;
-
- /*
- Make image color opaque.
- */
- assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
- (void) LogMagickEvent(DeprecateEvent,GetMagickModule(),"last use: v6.1.0");
- if (image->debug != MagickFalse)
- (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
- switch (image->storage_class)
- {
- case DirectClass:
- default:
- {
- /*
- Make DirectClass image opaque.
- */
- for (y=0; y < (ssize_t) image->rows; y++)
- {
- register ssize_t
- x;
-
- register PixelPacket
- *restrict q;
-
- q=GetAuthenticPixels(image,0,y,image->columns,1,&image->exception);
- if (q == (PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) image->columns; x++)
- {
- if (IsColorSimilar(image,q,&target) != MagickFalse)
- *q=fill;
- q++;
- }
- if (SyncAuthenticPixels(image,&image->exception) == MagickFalse)
- break;
- proceed=SetImageProgress(image,OpaqueImageTag,(MagickOffsetType) y,
- image->rows);
- if (proceed == MagickFalse)
- break;
- }
- break;
- }
- case PseudoClass:
- {
- /*
- Make PseudoClass image opaque.
- */
- for (i=0; i < (ssize_t) image->colors; i++)
- {
- if (IsColorSimilar(image,&image->colormap[i],&target) != MagickFalse)
- image->colormap[i]=fill;
- }
- if (fill.opacity != OpaqueOpacity)
- {
- for (y=0; y < (ssize_t) image->rows; y++)
- {
- register ssize_t
- x;
-
- register PixelPacket
- *restrict q;
-
- q=GetAuthenticPixels(image,0,y,image->columns,1,&image->exception);
- if (q == (PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) image->columns; x++)
- {
- if (IsColorSimilar(image,q,&target) != MagickFalse)
- q->opacity=fill.opacity;
- q++;
- }
- if (SyncAuthenticPixels(image,&image->exception) == MagickFalse)
- break;
- }
- }
- (void) SyncImage(image);
- break;
- }
- }
- if (fill.opacity != OpaqueOpacity)
- image->matte=MagickTrue;
- return(MagickTrue);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% O p e n C a c h e V i e w %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% OpenCacheView() opens a view into the pixel cache, using the
-% VirtualPixelMethod that is defined within the given image itself.
-%
-% Deprecated, replace with:
-%
-% AcquireCacheView(image);
-%
-% The format of the OpenCacheView method is:
-%
-% CacheView *OpenCacheView(const Image *image)
-%
-% A description of each parameter follows:
-%
-% o image: the image.
-%
-*/
-MagickExport CacheView *OpenCacheView(const Image *image)
-{
- return(AcquireCacheView(image));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% P a i n t F l o o d f i l l I m a g e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% PaintFloodfill() changes the color value of any pixel that matches
-% target and is an immediate neighbor. If the method FillToBorderMethod is
-% specified, the color value is changed for any neighbor pixel that does not
-% match the bordercolor member of image.
-%
-% By default target must match a particular pixel color exactly.
-% However, in many cases two colors may differ by a small amount. The
-% fuzz member of image defines how much tolerance is acceptable to
-% consider two colors as the same. For example, set fuzz to 10 and the
-% color red at intensities of 100 and 102 respectively are now
-% interpreted as the same color for the purposes of the floodfill.
-%
-% Deprecated, replace with:
-%
-% FloodfillPaintImage(image,channel,draw_info,target,x,y,
-% method == FloodfillMethod ? MagickFalse : MagickTrue);
-%
-% The format of the PaintFloodfillImage method is:
-%
-% MagickBooleanType PaintFloodfillImage(Image *image,
-% const ChannelType channel,const MagickPixelPacket target,const ssize_t x,
-% const ssize_t y,const DrawInfo *draw_info,const PaintMethod method)
-%
-% A description of each parameter follows:
-%
-% o image: the image.
-%
-% o channel: the channel(s).
-%
-% o target: the RGB value of the target color.
-%
-% o x,y: the starting location of the operation.
-%
-% o draw_info: the draw info.
-%
-% o method: Choose either FloodfillMethod or FillToBorderMethod.
-%
-*/
-MagickExport MagickBooleanType PaintFloodfillImage(Image *image,
- const ChannelType channel,const MagickPixelPacket *target,const ssize_t x,
- const ssize_t y,const DrawInfo *draw_info,const PaintMethod method)
-{
- MagickBooleanType
- status;
-
- status=FloodfillPaintImage(image,channel,draw_info,target,x,y,
- method == FloodfillMethod ? MagickFalse : MagickTrue);
- return(status);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% P a i n t O p a q u e I m a g e %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% PaintOpaqueImage() changes any pixel that matches color with the color
-% defined by fill.
-%
-% By default color must match a particular pixel color exactly. However,
-% in many cases two colors may differ by a small amount. Fuzz defines
-% how much tolerance is acceptable to consider two colors as the same.
-% For example, set fuzz to 10 and the color red at intensities of 100 and
-% 102 respectively are now interpreted as the same color.
-%
-% Deprecated, replace with:
-%
-% OpaquePaintImageChannel(image,DefaultChannels,target,fill,MagickFalse);
-% OpaquePaintImageChannel(image,channel,target,fill,MagickFalse);
-%
-% The format of the PaintOpaqueImage method is:
-%
-% MagickBooleanType PaintOpaqueImage(Image *image,
-% const PixelPacket *target,const PixelPacket *fill)
-% MagickBooleanType PaintOpaqueImageChannel(Image *image,
-% const ChannelType channel,const PixelPacket *target,
-% const PixelPacket *fill)
-%
-% A description of each parameter follows:
-%
-% o image: the image.
-%
-% o channel: the channel(s).
-%
-% o target: the RGB value of the target color.
-%
-% o fill: the replacement color.
-%
-*/
-
-MagickExport MagickBooleanType PaintOpaqueImage(Image *image,
- const MagickPixelPacket *target,const MagickPixelPacket *fill)
-{
- MagickBooleanType
- status;
-
- status=OpaquePaintImageChannel(image,DefaultChannels,target,fill,MagickFalse);
- return(status);
-}
-
-MagickExport MagickBooleanType PaintOpaqueImageChannel(Image *image,
- const ChannelType channel,const MagickPixelPacket *target,
- const MagickPixelPacket *fill)
-{
- return(OpaquePaintImageChannel(image,channel,target,fill,MagickFalse));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% P a i n t T r a n s p a r e n t I m a g e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% PaintTransparentImage() changes the opacity value associated with any pixel
-% that matches color to the value defined by opacity.
-%
-% By default color must match a particular pixel color exactly. However,
-% in many cases two colors may differ by a small amount. Fuzz defines
-% how much tolerance is acceptable to consider two colors as the same.
-% For example, set fuzz to 10 and the color red at intensities of 100 and
-% 102 respectively are now interpreted as the same color.
-%
-% Deprecated, replace with:
-%
-% TransparentPaintImage(image,target,opacity,MagickFalse);
-%
-% The format of the PaintTransparentImage method is:
-%
-% MagickBooleanType PaintTransparentImage(Image *image,
-% const MagickPixelPacket *target,const Quantum opacity)
-%
-% A description of each parameter follows:
-%
-% o image: the image.
-%
-% o target: the RGB value of the target color.
-%
-% o opacity: the replacement opacity value.
-%
-*/
-MagickExport MagickBooleanType PaintTransparentImage(Image *image,
- const MagickPixelPacket *target,const Quantum opacity)
-{
- return(TransparentPaintImage(image,target,opacity,MagickFalse));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-+ P a r s e I m a g e G e o m e t r y %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% ParseImageGeometry() is similar to GetGeometry() except the returned
-% geometry is modified as determined by the meta characters: %, !, <,
-% and >.
-%
-% Deprecated, replace with:
-%
-% ParseMetaGeometry(geometry,x,y,width,height);
-%
-% The format of the ParseImageGeometry method is:
-%
-% int ParseImageGeometry(char *geometry,ssize_t *x,ssize_t *y,
-% size_t *width,size_t *height)
-%
-% A description of each parameter follows:
-%
-% o flags: Method ParseImageGeometry returns a bitmask that indicates
-% which of the four values were located in the geometry string.
-%
-% o image_geometry: Specifies a character string representing the geometry
-% specification.
-%
-% o x,y: A pointer to an integer. The x and y offset as determined by
-% the geometry specification is returned here.
-%
-% o width,height: A pointer to an unsigned integer. The width and height
-% as determined by the geometry specification is returned here.
-%
-*/
-MagickExport int ParseImageGeometry(const char *geometry,ssize_t *x,ssize_t *y,
- size_t *width,size_t *height)
-{
- (void) LogMagickEvent(DeprecateEvent,GetMagickModule(),"last use: v5.5.1");
- return((int) ParseMetaGeometry(geometry,x,y,width,height));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% P a r s e S i z e G e o m e t r y %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% ParseSizeGeometry() returns a region as defined by the geometry string with
-% respect to the image dimensions and aspect ratio.
-%
-% Deprecated, replace with:
-%
-% ParseMetaGeometry(geometry,®ion_info->x,®ion_info->y,
-% ®ion_info->width,®ion_info->height);
-%
-% The format of the ParseSizeGeometry method is:
-%
-% MagickStatusType ParseSizeGeometry(const Image *image,
-% const char *geometry,RectangeInfo *region_info)
-%
-% A description of each parameter follows:
-%
-% o geometry: The geometry (e.g. 100x100+10+10).
-%
-% o region_info: the region as defined by the geometry string.
-%
-*/
-MagickExport MagickStatusType ParseSizeGeometry(const Image *image,
- const char *geometry,RectangleInfo *region_info)
-{
- MagickStatusType
- flags;
-
- (void) LogMagickEvent(DeprecateEvent,GetMagickModule(),"last use: v6.4.7");
- SetGeometry(image,region_info);
- flags=ParseMetaGeometry(geometry,®ion_info->x,®ion_info->y,
- ®ion_info->width,®ion_info->height);
- return(flags);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% P o p I m a g e L i s t %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% PopImageList() removes the last image in the list.
-%
-% Deprecated, replace with:
-%
-% RemoveLastImageFromList(images);
-%
-% The format of the PopImageList method is:
-%
-% Image *PopImageList(Image **images)
-%
-% A description of each parameter follows:
-%
-% o images: the image list.
-%
-*/
-MagickExport Image *PopImageList(Image **images)
-{
- (void) LogMagickEvent(DeprecateEvent,GetMagickModule(),"last use: v5.5.2");
- return(RemoveLastImageFromList(images));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% P o p I m a g e P i x e l s %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% PopImagePixels() transfers one or more pixel components from the image pixel
-% cache to a user supplied buffer. The pixels are returned in network byte
-% order. MagickTrue is returned if the pixels are successfully transferred,
-% otherwise MagickFalse.
-%
-% The format of the PopImagePixels method is:
-%
-% size_t PopImagePixels(Image *,const QuantumType quantum,
-% unsigned char *destination)
-%
-% A description of each parameter follows:
-%
-% o image: the image.
-%
-% o quantum: Declare which pixel components to transfer (RGB, RGBA, etc).
-%
-% o destination: The components are transferred to this buffer.
-%
-*/
-MagickExport size_t PopImagePixels(Image *image,const QuantumType quantum,
- unsigned char *destination)
-{
- QuantumInfo
- *quantum_info;
-
- size_t
- length;
-
- quantum_info=AcquireQuantumInfo((const ImageInfo *) NULL,image);
- if (quantum_info == (QuantumInfo *) NULL)
- return(0);
- length=ExportQuantumPixels(image,(const CacheView *) NULL,quantum_info,
- quantum,destination,&image->exception);
- quantum_info=DestroyQuantumInfo(quantum_info);
- return(length);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% P o s t s c r i p t G e o m e t r y %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% PostscriptGeometry() replaces any page mneumonic with the equivalent size in
-% picas.
-%
-% Deprecated, replace with:
-%
-% GetPageGeometry(page);
-%
-% The format of the PostscriptGeometry method is:
-%
-% char *PostscriptGeometry(const char *page)
-%
-% A description of each parameter follows.
-%
-% o page: Specifies a pointer to an array of characters.
-% The string is either a Postscript page name (e.g. A4) or a postscript
-% page geometry (e.g. 612x792+36+36).
-%
-*/
-MagickExport char *PostscriptGeometry(const char *page)
-{
- (void) LogMagickEvent(DeprecateEvent,GetMagickModule(),"last use: v5.5.1");
- return(GetPageGeometry(page));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% P u s h I m a g e L i s t %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% PushImageList() adds an image to the end of the list.
-%
-% Deprecated, replace with:
-%
-% AppendImageToList(images,CloneImageList(image,exception));
-%
-% The format of the PushImageList method is:
-%
-% unsigned int PushImageList(Image *images,const Image *image,
-% ExceptionInfo *exception)
-%
-% A description of each parameter follows:
-%
-% o images: the image list.
-%
-% o image: the image.
-%
-% o exception: return any errors or warnings in this structure.
-%
-*/
-MagickExport unsigned int PushImageList(Image **images,const Image *image,
- ExceptionInfo *exception)
-{
- (void) LogMagickEvent(DeprecateEvent,GetMagickModule(),"last use: v5.5.2");
- AppendImageToList(images,CloneImageList(image,exception));
- return(MagickTrue);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% P u s h I m a g e P i x e l s %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% PushImagePixels() transfers one or more pixel components from a user
-% supplied buffer into the image pixel cache of an image. The pixels are
-% expected in network byte order. It returns MagickTrue if the pixels are
-% successfully transferred, otherwise MagickFalse.
-%
-% The format of the PushImagePixels method is:
-%
-% size_t PushImagePixels(Image *image,const QuantumType quantum,
-% const unsigned char *source)
-%
-% A description of each parameter follows:
-%
-% o image: the image.
-%
-% o quantum: Declare which pixel components to transfer (red, green, blue,
-% opacity, RGB, or RGBA).
-%
-% o source: The pixel components are transferred from this buffer.
-%
-*/
-MagickExport size_t PushImagePixels(Image *image,const QuantumType quantum,
- const unsigned char *source)
-{
- QuantumInfo
- *quantum_info;
-
- size_t
- length;
-
- quantum_info=AcquireQuantumInfo((const ImageInfo *) NULL,image);
- if (quantum_info == (QuantumInfo *) NULL)
- return(0);
- length=ImportQuantumPixels(image,(CacheView *) NULL,quantum_info,quantum,
- source,&image->exception);
- quantum_info=DestroyQuantumInfo(quantum_info);
- return(length);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% Q u a n t i z a t i o n E r r o r %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% QuantizationError() measures the difference between the original and
-% quantized images. This difference is the total quantization error. The
-% error is computed by summing over all pixels in an image the distance
-% squared in RGB space between each reference pixel value and its quantized
-% value. These values are computed:
-%
-% o mean_error_per_pixel: This value is the mean error for any single
-% pixel in the image.
-%
-% o normalized_mean_square_error: This value is the normalized mean
-% quantization error for any single pixel in the image. This distance
-% measure is normalized to a range between 0 and 1. It is independent
-% of the range of red, green, and blue values in the image.
-%
-% o normalized_maximum_square_error: Thsi value is the normalized
-% maximum quantization error for any single pixel in the image. This
-% distance measure is normalized to a range between 0 and 1. It is
-% independent of the range of red, green, and blue values in your image.
-%
-% Deprecated, replace with:
-%
-% GetImageQuantizeError(image);
-%
-% The format of the QuantizationError method is:
-%
-% unsigned int QuantizationError(Image *image)
-%
-% A description of each parameter follows.
-%
-% o image: Specifies a pointer to an Image structure; returned from
-% ReadImage.
-%
-*/
-MagickExport unsigned int QuantizationError(Image *image)
-{
- if (image->debug != MagickFalse)
- (void) LogMagickEvent(DeprecateEvent,GetMagickModule(),"last use: v5.5.3");
- return(GetImageQuantizeError(image));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% R a n d o m C h a n n e l T h r e s h o l d I m a g e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% RandomChannelThresholdImage() changes the value of individual pixels based
-% on the intensity of each pixel compared to a random threshold. The result
-% is a low-contrast, two color image.
-%
-% The format of the RandomChannelThresholdImage method is:
-%
-% unsigned int RandomChannelThresholdImage(Image *image,
-% const char *channel, const char *thresholds,
-% ExceptionInfo *exception)
-%
-% A description of each parameter follows:
-%
-% o image: the image.
-%
-% o channel: the channel or channels to be thresholded.
-%
-% o thresholds: a geometry string containing LOWxHIGH thresholds.
-% If the string contains 2x2, 3x3, or 4x4, then an ordered
-% dither of order 2, 3, or 4 will be performed instead.
-%
-% o exception: return any errors or warnings in this structure.
-%
-*/
-MagickExport unsigned int RandomChannelThresholdImage(Image *image,const char
- *channel,const char *thresholds,ExceptionInfo *exception)
-{
-#define RandomChannelThresholdImageText " RandomChannelThreshold image... "
-
- double
- lower_threshold,
- upper_threshold;
-
- RandomInfo
- *random_info;
-
- ssize_t
- count,
- y;
-
- static MagickRealType
- o2[4]={0.2f, 0.6f, 0.8f, 0.4f},
- o3[9]={0.1f, 0.6f, 0.3f, 0.7f, 0.5f, 0.8f, 0.4f, 0.9f, 0.2f},
- o4[16]={0.1f, 0.7f, 1.1f, 0.3f, 1.0f, 0.5f, 1.5f, 0.8f, 1.4f, 1.6f, 0.6f,
- 1.2f, 0.4f, 0.9f, 1.3f, 0.2f},
- threshold=128;
-
- size_t
- order;
-
- /*
- Threshold image.
- */
- assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
- if (image->debug != MagickFalse)
- (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
- assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
- if (image->debug != MagickFalse)
- (void) LogMagickEvent(DeprecateEvent,GetMagickModule(),"last use: v5.5.7");
- if (thresholds == (const char *) NULL)
- return(MagickTrue);
- if (LocaleCompare(thresholds,"2x2") == 0)
- order=2;
- else
- if (LocaleCompare(thresholds,"3x3") == 0)
- order=3;
- else
- if (LocaleCompare(thresholds,"4x4") == 0)
- order=4;
- else
- {
- order=1;
- lower_threshold=0;
- upper_threshold=0;
- count=(ssize_t) sscanf(thresholds,"%lf[/x%%]%lf",&lower_threshold,
- &upper_threshold);
- if (strchr(thresholds,'%') != (char *) NULL)
- {
- upper_threshold*=(.01*QuantumRange);
- lower_threshold*=(.01*QuantumRange);
- }
- if (count == 1)
- upper_threshold=(MagickRealType) QuantumRange-lower_threshold;
- }
- if (image->debug != MagickFalse)
- (void) LogMagickEvent(TransformEvent,GetMagickModule(),
- " RandomChannelThresholdImage: channel type=%s",channel);
- if (image->debug != MagickFalse)
- (void) LogMagickEvent(TransformEvent,GetMagickModule(),
- " Thresholds: %s (%fx%f)",thresholds,lower_threshold,upper_threshold);
- if (LocaleCompare(channel,"all") == 0 ||
- LocaleCompare(channel,"intensity") == 0)
- if (AcquireImageColormap(image,2) == MagickFalse)
- ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed",
- image->filename);
- random_info=AcquireRandomInfo();
- for (y=0; y < (ssize_t) image->rows; y++)
- {
- register ssize_t
- x;
-
- register IndexPacket
- index,
- *restrict indexes;
-
- register PixelPacket
- *restrict q;
-
- q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
- if (q == (PixelPacket *) NULL)
- break;
- if (LocaleCompare(channel,"all") == 0 ||
- LocaleCompare(channel,"intensity") == 0)
- {
- indexes=GetAuthenticIndexQueue(image);
- for (x=0; x < (ssize_t) image->columns; x++)
- {
- MagickRealType
- intensity;
-
- intensity=(MagickRealType) PixelIntensityToQuantum(q);
- if (order == 1)
- {
- if (intensity < lower_threshold)
- threshold=lower_threshold;
- else if (intensity > upper_threshold)
- threshold=upper_threshold;
- else
- threshold=(MagickRealType) (QuantumRange*
- GetPseudoRandomValue(random_info));
- }
- else if (order == 2)
- threshold=(MagickRealType) QuantumRange*o2[(x%2)+2*(y%2)];
- else if (order == 3)
- threshold=(MagickRealType) QuantumRange*o3[(x%3)+3*(y%3)];
- else if (order == 4)
- threshold=(MagickRealType) QuantumRange*o4[(x%4)+4*(y%4)];
- index=(IndexPacket) (intensity <= threshold ? 0 : 1);
- SetPixelIndex(indexes+x,index);
- SetPixelRGBO(q,image->colormap+(ssize_t) index);
- q++;
- }
- }
- if (LocaleCompare(channel,"opacity") == 0 ||
- LocaleCompare(channel,"all") == 0 ||
- LocaleCompare(channel,"matte") == 0)
- {
- if (image->matte != MagickFalse)
- for (x=0; x < (ssize_t) image->columns; x++)
- {
- if (order == 1)
- {
- if ((MagickRealType) q->opacity < lower_threshold)
- threshold=lower_threshold;
- else if ((MagickRealType) q->opacity > upper_threshold)
- threshold=upper_threshold;
- else
- threshold=(MagickRealType) (QuantumRange*
- GetPseudoRandomValue(random_info));
- }
- else if (order == 2)
- threshold=(MagickRealType) QuantumRange*o2[(x%2)+2*(y%2)];
- else if (order == 3)
- threshold=(MagickRealType) QuantumRange*o3[(x%3)+3*(y%3)];
- else if (order == 4)
- threshold=(MagickRealType) QuantumRange*o4[(x%4)+4*(y%4)]/1.7;
- SetPixelOpacity(q,(MagickRealType) q->opacity <=
- threshold ? 0 : QuantumRange);
- q++;
- }
- }
- else
- {
- /* To Do: red, green, blue, cyan, magenta, yellow, black */
- if (LocaleCompare(channel,"intensity") != 0)
- ThrowBinaryException(OptionError,"UnrecognizedChannelType",
- image->filename);
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- }
- random_info=DestroyRandomInfo(random_info);
- return(MagickTrue);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% R e a c q u i r e M e m o r y %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% ReacquireMemory() changes the size of the memory and returns a pointer to
-% the (possibly moved) block. The contents will be unchanged up to the
-% lesser of the new and old sizes.
-%
-% The format of the ReacquireMemory method is:
-%
-% void ReacquireMemory(void **memory,const size_t size)
-%
-% A description of each parameter follows:
-%
-% o memory: A pointer to a memory allocation. On return the pointer
-% may change but the contents of the original allocation will not.
-%
-% o size: the new size of the allocated memory.
-%
-*/
-MagickExport void ReacquireMemory(void **memory,const size_t size)
-{
- void
- *allocation;
-
- assert(memory != (void **) NULL);
- (void) LogMagickEvent(DeprecateEvent,GetMagickModule(),"last use: v5.5.7");
- if (*memory == (void *) NULL)
- {
- *memory=AcquireMagickMemory(size);
- return;
- }
- allocation=realloc(*memory,size);
- if (allocation == (void *) NULL)
- *memory=RelinquishMagickMemory(*memory);
- *memory=allocation;
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% R e c o l o r I m a g e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% RecolorImage() apply color transformation to an image. The method permits
-% saturation changes, hue rotation, luminance to alpha, and various other
-% effects. Although variable-sized transformation matrices can be used,
-% typically one uses a 5x5 matrix for an RGBA image and a 6x6 for CMYKA
-% (or RGBA with offsets). The matrix is similar to those used by Adobe Flash
-% except offsets are in column 6 rather than 5 (in support of CMYKA images)
-% and offsets are normalized (divide Flash offset by 255).
-%
-% The format of the RecolorImage method is:
-%
-% Image *RecolorImage(const Image *image,const size_t order,
-% const double *color_matrix,ExceptionInfo *exception)
-%
-% A description of each parameter follows:
-%
-% o image: the image.
-%
-% o order: the number of columns and rows in the recolor matrix.
-%
-% o color_matrix: An array of double representing the recolor matrix.
-%
-% o exception: return any errors or warnings in this structure.
-%
-*/
-MagickExport Image *RecolorImage(const Image *image,const size_t order,
- const double *color_matrix,ExceptionInfo *exception)
-{
- KernelInfo
- *kernel_info;
-
- Image
- *recolor_image;
-
- kernel_info=AcquireKernelInfo("1");
- if (kernel_info == (KernelInfo *) NULL)
- return((Image *) NULL);
- kernel_info->width=order;
- kernel_info->height=order;
- kernel_info->values=(double *) color_matrix;
- recolor_image=ColorMatrixImage(image,kernel_info,exception);
- kernel_info->values=(double *) NULL;
- kernel_info=DestroyKernelInfo(kernel_info);
- return(recolor_image);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% R e d u c e N o i s e I m a g e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% ReduceNoiseImage() smooths the contours of an image while still preserving
-% edge information. The algorithm works by replacing each pixel with its
-% neighbor closest in value. A neighbor is defined by radius. Use a radius
-% of 0 and ReduceNoise() selects a suitable radius for you.
-%
-% The format of the ReduceNoiseImage method is:
-%
-% Image *ReduceNoiseImage(const Image *image,const double radius,
-% ExceptionInfo *exception)
-%
-% A description of each parameter follows:
-%
-% o image: the image.
-%
-% o radius: the radius of the pixel neighborhood.
-%
-% o exception: return any errors or warnings in this structure.
-%
-*/
-MagickExport Image *ReduceNoiseImage(const Image *image,const double radius,
- ExceptionInfo *exception)
-{
- Image
- *reduce_image;
-
- reduce_image=StatisticImage(image,NonpeakStatistic,(size_t) radius,(size_t)
- radius,exception);
- return(reduce_image);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% R e s e t I m a g e A t t r i b u t e I t e r a t o r %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% ResetImageAttributeIterator() resets the image attributes iterator. Use it
-% in conjunction with GetNextImageAttribute() to iterate over all the values
-% associated with an image.
-%
-% Deprecated, replace with:
-%
-% ResetImagePropertyIterator(image);
-%
-% The format of the ResetImageAttributeIterator method is:
-%
-% ResetImageAttributeIterator(const ImageInfo *image)
-%
-% A description of each parameter follows:
-%
-% o image: the image.
-%
-*/
-MagickExport void ResetImageAttributeIterator(const Image *image)
-{
- ResetImagePropertyIterator(image);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% S e t C a c h e V i e w P i x e l s %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% SetCacheViewPixels() gets pixels from the in-memory or disk pixel cache as
-% defined by the geometry parameters. A pointer to the pixels is returned
-% if the pixels are transferred, otherwise a NULL is returned.
-%
-% Deprecated, replace with:
-%
-% QueueCacheViewAuthenticPixels(cache_view,x,y,columns,rows,
-% GetCacheViewException(cache_view));
-%
-% The format of the SetCacheViewPixels method is:
-%
-% PixelPacket *SetCacheViewPixels(CacheView *cache_view,const ssize_t x,
-% const ssize_t y,const size_t columns,const size_t rows)
-%
-% A description of each parameter follows:
-%
-% o cache_view: the cache view.
-%
-% o x,y,columns,rows: These values define the perimeter of a region of
-% pixels.
-%
-*/
-MagickExport PixelPacket *SetCacheViewPixels(CacheView *cache_view,const ssize_t x,
- const ssize_t y,const size_t columns,const size_t rows)
-{
- PixelPacket
- *pixels;
-
- pixels=QueueCacheViewAuthenticPixels(cache_view,x,y,columns,rows,
- GetCacheViewException(cache_view));
- return(pixels);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-+ S e t C a c h e T h e s h o l d %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% SetCacheThreshold() sets the amount of free memory allocated for the pixel
-% cache. Once this threshold is exceeded, all subsequent pixels cache
-% operations are to/from disk.
-%
-% The format of the SetCacheThreshold() method is:
-%
-% void SetCacheThreshold(const size_t threshold)
-%
-% A description of each parameter follows:
-%
-% o threshold: the number of megabytes of memory available to the pixel
-% cache.
-%
-*/
-MagickExport void SetCacheThreshold(const size_t size)
-{
- (void) LogMagickEvent(DeprecateEvent,GetMagickModule(),"last use: v5.5.1");
- (void) SetMagickResourceLimit(MemoryResource,size*1024*1024);
- (void) SetMagickResourceLimit(MapResource,2*size*1024*1024);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% S e t E x c e p t i o n I n f o %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% SetExceptionInfo() sets the exception severity.
-%
-% The format of the SetExceptionInfo method is:
-%
-% MagickBooleanType SetExceptionInfo(ExceptionInfo *exception,
-% ExceptionType severity)
-%
-% A description of each parameter follows:
-%
-% o exception: the exception info.
-%
-% o severity: the exception severity.
-%
-*/
-MagickExport MagickBooleanType SetExceptionInfo(ExceptionInfo *exception,
- ExceptionType severity)
-{
- assert(exception != (ExceptionInfo *) NULL);
- ClearMagickException(exception);
- exception->severity=severity;
- return(MagickTrue);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% S e t I m a g e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% SetImage() sets the red, green, and blue components of each pixel to
-% the image background color and the opacity component to the specified
-% level of transparency. The background color is defined by the
-% background_color member of the image.
-%
-% The format of the SetImage method is:
-%
-% void SetImage(Image *image,const Quantum opacity)
-%
-% A description of each parameter follows:
-%
-% o image: the image.
-%
-% o opacity: Set each pixel to this level of transparency.
-%
-*/
-MagickExport void SetImage(Image *image,const Quantum opacity)
-{
- PixelPacket
- background_color;
-
- ssize_t
- y;
-
- (void) LogMagickEvent(DeprecateEvent,GetMagickModule(),"last use: v6.2.0");
- assert(image != (Image *) NULL);
- if (image->debug != MagickFalse)
- (void) LogMagickEvent(TraceEvent,GetMagickModule(),"...");
- assert(image->signature == MagickSignature);
- background_color=image->background_color;
- if (opacity != OpaqueOpacity)
- background_color.opacity=opacity;
- if (background_color.opacity != OpaqueOpacity)
- {
- (void) SetImageStorageClass(image,DirectClass);
- image->matte=MagickTrue;
- }
- if ((image->storage_class == PseudoClass) ||
- (image->colorspace == CMYKColorspace))
- {
- /*
- Set colormapped or CMYK image.
- */
- for (y=0; y < (ssize_t) image->rows; y++)
- {
- register IndexPacket
- *restrict indexes;
-
- register ssize_t
- x;
-
- register PixelPacket
- *restrict q;
-
- q=QueueAuthenticPixels(image,0,y,image->columns,1,&image->exception);
- if (q == (PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) image->columns; x++)
- {
- SetPixelRGBO(q,&background_color);
- q++;
- }
- indexes=GetAuthenticIndexQueue(image);
- for (x=0; x < (ssize_t) image->columns; x++)
- SetPixelIndex(indexes+x,0);
- if (SyncAuthenticPixels(image,&image->exception) == MagickFalse)
- break;
- }
- return;
- }
- /*
- Set DirectClass image.
- */
- for (y=0; y < (ssize_t) image->rows; y++)
- {
- register ssize_t
- x;
-
- register PixelPacket
- *restrict q;
-
- q=QueueAuthenticPixels(image,0,y,image->columns,1,&image->exception);
- if (q == (PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) image->columns; x++)
- {
- SetPixelRGBO(q,&background_color);
- q++;
- }
- if (SyncAuthenticPixels(image,&image->exception) == MagickFalse)
- break;
- }
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% S e t I m a g e A t t r i b u t e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% SetImageAttribute() searches the list of image attributes and replaces the
-% attribute value. If it is not found in the list, the attribute name
-% and value is added to the list.
-%
-% Deprecated, replace with:
-%
-% SetImageProperty(image,key,value);
-%
-% The format of the SetImageAttribute method is:
-%
-% MagickBooleanType SetImageAttribute(Image *image,const char *key,
-% const char *value)
-%
-% A description of each parameter follows:
-%
-% o image: the image.
-%
-% o key: the key.
-%
-% o value: the value.
-%
-*/
-MagickExport MagickBooleanType SetImageAttribute(Image *image,const char *key,
- const char *value)
-{
- (void) LogMagickEvent(DeprecateEvent,GetMagickModule(),"last use: v6.3.1");
- return(SetImageProperty(image,key,value));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% S e t I m a g e L i s t %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% SetImageList() inserts an image into the list at the specified position.
-%
-% The format of the SetImageList method is:
-%
-% unsigned int SetImageList(Image *images,const Image *image,
-% const ssize_t offset,ExceptionInfo *exception)
-%
-% A description of each parameter follows:
-%
-% o images: the image list.
-%
-% o image: the image.
-%
-% o offset: the position within the list.
-%
-% o exception: return any errors or warnings in this structure.
-%
-*/
-MagickExport unsigned int SetImageList(Image **images,const Image *image,
- const ssize_t offset,ExceptionInfo *exception)
-{
- Image
- *clone;
-
- register ssize_t
- i;
-
- (void) LogMagickEvent(DeprecateEvent,GetMagickModule(),"last use: v5.5.2");
- clone=CloneImageList(image,exception);
- while (GetPreviousImageInList(*images) != (Image *) NULL)
- (*images)=GetPreviousImageInList(*images);
- for (i=0; i < offset; i++)
- {
- if (GetNextImageInList(*images) == (Image *) NULL)
- return(MagickFalse);
- (*images)=GetNextImageInList(*images);
- }
- InsertImageInList(images,clone);
- return(MagickTrue);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% S e t I m a g e P i x e l s %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% SetImagePixels() queues a mutable pixel region.
-% If the region is successfully initialized a pointer to a PixelPacket
-% array representing the region is returned, otherwise NULL is returned.
-% The returned pointer may point to a temporary working buffer for the
-% pixels or it may point to the final location of the pixels in memory.
-%
-% Write-only access means that any existing pixel values corresponding to
-% the region are ignored. This useful while the initial image is being
-% created from scratch, or if the existing pixel values are to be
-% completely replaced without need to refer to their pre-existing values.
-% The application is free to read and write the pixel buffer returned by
-% SetImagePixels() any way it pleases. SetImagePixels() does not initialize
-% the pixel array values. Initializing pixel array values is the
-% application's responsibility.
-%
-% Performance is maximized if the selected region is part of one row, or
-% one or more full rows, since then there is opportunity to access the
-% pixels in-place (without a copy) if the image is in RAM, or in a
-% memory-mapped file. The returned pointer should *never* be deallocated
-% by the user.
-%
-% Pixels accessed via the returned pointer represent a simple array of type
-% PixelPacket. If the image type is CMYK or the storage class is PseudoClass,
-% call GetAuthenticIndexQueue() after invoking GetAuthenticPixels() to obtain
-% the black color component or the colormap indexes (of type IndexPacket)
-% corresponding to the region. Once the PixelPacket (and/or IndexPacket)
-% array has been updated, the changes must be saved back to the underlying
-% image using SyncAuthenticPixels() or they may be lost.
-%
-% Deprecated, replace with:
-%
-% QueueAuthenticPixels(image,x,y,columns,rows,&image->exception);
-%
-% The format of the SetImagePixels() method is:
-%
-% PixelPacket *SetImagePixels(Image *image,const ssize_t x,const ssize_t y,
-% const size_t columns,const size_t rows)
-%
-% A description of each parameter follows:
-%
-% o pixels: SetImagePixels returns a pointer to the pixels if they are
-% transferred, otherwise a NULL is returned.
-%
-% o image: the image.
-%
-% o x,y,columns,rows: These values define the perimeter of a region of
-% pixels.
-%
-*/
-MagickExport PixelPacket *SetImagePixels(Image *image,const ssize_t x,const ssize_t y,
- const size_t columns,const size_t rows)
-{
- return(QueueAuthenticPixels(image,x,y,columns,rows,&image->exception));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% S e t M a g i c k R e g i s t r y %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% SetMagickRegistry() sets a blob into the registry and returns a unique ID.
-% If an error occurs, -1 is returned.
-%
-% The format of the SetMagickRegistry method is:
-%
-% ssize_t SetMagickRegistry(const RegistryType type,const void *blob,
-% const size_t length,ExceptionInfo *exception)
-%
-% A description of each parameter follows:
-%
-% o type: the registry type.
-%
-% o blob: the address of a Binary Large OBject.
-%
-% o length: For a registry type of ImageRegistryType use sizeof(Image)
-% otherise the blob length in number of bytes.
-%
-% o exception: return any errors or warnings in this structure.
-%
-*/
-MagickExport ssize_t SetMagickRegistry(const RegistryType type,const void *blob,
- const size_t magick_unused(length),ExceptionInfo *exception)
-{
- char
- key[MaxTextExtent];
-
- MagickBooleanType
- status;
-
- static ssize_t
- id = 0;
-
- (void) FormatLocaleString(key,MaxTextExtent,"%.20g\n",(double) id);
- status=SetImageRegistry(type,key,blob,exception);
- if (status == MagickFalse)
- return(-1);
- return(id++);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% S e t M o n i t o r H a n d l e r %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% SetMonitorHandler() sets the monitor handler to the specified method
-% and returns the previous monitor handler.
-%
-% The format of the SetMonitorHandler method is:
-%
-% MonitorHandler SetMonitorHandler(MonitorHandler handler)
-%
-% A description of each parameter follows:
-%
-% o handler: Specifies a pointer to a method to handle monitors.
-%
-*/
-
-MagickExport MonitorHandler GetMonitorHandler(void)
-{
- return(monitor_handler);
-}
-
-MagickExport MonitorHandler SetMonitorHandler(MonitorHandler handler)
-{
- MonitorHandler
- previous_handler;
-
- previous_handler=monitor_handler;
- monitor_handler=handler;
- return(previous_handler);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% S h i f t I m a g e L i s t %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% ShiftImageList() removes an image from the beginning of the list.
-%
-% Deprecated, replace with:
-%
-% RemoveFirstImageFromList(images);
-%
-% The format of the ShiftImageList method is:
-%
-% Image *ShiftImageList(Image **images)
-%
-% A description of each parameter follows:
-%
-% o images: the image list.
-%
-*/
-MagickExport Image *ShiftImageList(Image **images)
-{
- (void) LogMagickEvent(DeprecateEvent,GetMagickModule(),"last use: v5.5.2");
- return(RemoveFirstImageFromList(images));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-+ S i z e B l o b %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% SizeBlob() returns the current length of the image file or blob.
-%
-% Deprecated, replace with:
-%
-% GetBlobSize(image);
-%
-% The format of the SizeBlob method is:
-%
-% off_t SizeBlob(Image *image)
-%
-% A description of each parameter follows:
-%
-% o size: Method SizeBlob returns the current length of the image file
-% or blob.
-%
-% o image: the image.
-%
-*/
-MagickExport MagickOffsetType SizeBlob(Image *image)
-{
- if (image->debug != MagickFalse)
- (void) LogMagickEvent(DeprecateEvent,GetMagickModule(),"last use: v5.4.3");
- return((MagickOffsetType) GetBlobSize(image));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% S p l i c e I m a g e L i s t %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% SpliceImageList() removes the images designated by offset and length from
-% the list and replaces them with the specified list.
-%
-% The format of the SpliceImageList method is:
-%
-% Image *SpliceImageList(Image *images,const ssize_t offset,
-% const size_t length,const Image *splices,
-% ExceptionInfo *exception)
-%
-% A description of each parameter follows:
-%
-% o images: the image list.
-%
-% o offset: the position within the list.
-%
-% o length: the length of the image list to remove.
-%
-% o splice: Replace the removed image list with this list.
-%
-% o exception: return any errors or warnings in this structure.
-%
-*/
-MagickExport Image *SpliceImageList(Image *images,const ssize_t offset,
- const size_t length,const Image *splices,ExceptionInfo *exception)
-{
- Image
- *clone;
-
- register ssize_t
- i;
-
- if (images->debug != MagickFalse)
- (void) LogMagickEvent(DeprecateEvent,GetMagickModule(),"last use: v5.5.2");
- clone=CloneImageList(splices,exception);
- while (GetPreviousImageInList(images) != (Image *) NULL)
- images=GetPreviousImageInList(images);
- for (i=0; i < offset; i++)
- {
- if (GetNextImageInList(images) == (Image *) NULL)
- return((Image *) NULL);
- images=GetNextImageInList(images);
- }
- (void) SpliceImageIntoList(&images,length,clone);
- return(images);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% S t r i p %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% Strip() strips any whitespace or quotes from the beginning and end of a
-% string of characters.
-%
-% The format of the Strip method is:
-%
-% void Strip(char *message)
-%
-% A description of each parameter follows:
-%
-% o message: Specifies an array of characters.
-%
-*/
-MagickExport void Strip(char *message)
-{
- register char
- *p,
- *q;
-
- assert(message != (char *) NULL);
- (void) LogMagickEvent(DeprecateEvent,GetMagickModule(),"last use: v5.5.7");
- if (*message == '\0')
- return;
- if (strlen(message) == 1)
- return;
- p=message;
- while (isspace((int) ((unsigned char) *p)) != 0)
- p++;
- if ((*p == '\'') || (*p == '"'))
- p++;
- q=message+strlen(message)-1;
- while ((isspace((int) ((unsigned char) *q)) != 0) && (q > p))
- q--;
- if (q > p)
- if ((*q == '\'') || (*q == '"'))
- q--;
- (void) CopyMagickMemory(message,p,(size_t) (q-p+1));
- message[q-p+1]='\0';
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% S y n c C a c h e V i e w %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% SyncCacheView() saves the cache view pixels to the in-memory or disk
-% cache. It returns MagickTrue if the pixel region is synced, otherwise
-% MagickFalse.
-%
-% Deprecated, replace with:
-%
-% SyncCacheViewAuthenticPixels(cache_view,GetCacheViewException(cache_view));
-%
-% The format of the SyncCacheView method is:
-%
-% MagickBooleanType SyncCacheView(CacheView *cache_view)
-%
-% A description of each parameter follows:
-%
-% o cache_view: the cache view.
-%
-*/
-MagickExport MagickBooleanType SyncCacheView(CacheView *cache_view)
-{
- MagickBooleanType
- status;
-
- status=SyncCacheViewAuthenticPixels(cache_view,
- GetCacheViewException(cache_view));
- return(status);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% S y n c C a c h e V i e w P i x e l s %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% SyncCacheViewPixels() saves the cache view pixels to the in-memory
-% or disk cache. It returns MagickTrue if the pixel region is flushed,
-% otherwise MagickFalse.
-%
-% Deprecated, replace with:
-%
-% SyncCacheViewAuthenticPixels(cache_view,GetCacheViewException(cache_view));
-%
-% The format of the SyncCacheViewPixels method is:
-%
-% MagickBooleanType SyncCacheViewPixels(CacheView *cache_view)
-%
-% A description of each parameter follows:
-%
-% o cache_view: the cache view.
-%
-% o exception: return any errors or warnings in this structure.
-%
-*/
-MagickExport MagickBooleanType SyncCacheViewPixels(CacheView *cache_view)
-{
- MagickBooleanType
- status;
-
- status=SyncCacheViewAuthenticPixels(cache_view,
- GetCacheViewException(cache_view));
- return(status);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% S y n c I m a g e P i x e l s %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% SyncImagePixels() saves the image pixels to the in-memory or disk cache.
-% The method returns MagickTrue if the pixel region is synced, otherwise
-% MagickFalse.
-%
-% Deprecated, replace with:
-%
-% SyncAuthenticPixels(image,&image->exception);
-%
-% The format of the SyncImagePixels() method is:
-%
-% MagickBooleanType SyncImagePixels(Image *image)
-%
-% A description of each parameter follows:
-%
-% o image: the image.
-%
-*/
-MagickExport MagickBooleanType SyncImagePixels(Image *image)
-{
- return(SyncAuthenticPixels(image,&image->exception));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% T e m p o r a r y F i l e n a m e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% TemporaryFilename() replaces the contents of path by a unique path name.
-%
-% The format of the TemporaryFilename method is:
-%
-% void TemporaryFilename(char *path)
-%
-% A description of each parameter follows.
-%
-% o path: Specifies a pointer to an array of characters. The unique path
-% name is returned in this array.
-%
-*/
-MagickExport void TemporaryFilename(char *path)
-{
- (void) LogMagickEvent(DeprecateEvent,GetMagickModule(),"last use: v5.5.6");
- (void) AcquireUniqueFilename(path);
- (void) RelinquishUniqueFileResource(path);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% T h r e s h o l d I m a g e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% ThresholdImage() changes the value of individual pixels based on
-% the intensity of each pixel compared to threshold. The result is a
-% high-contrast, two color image.
-%
-% The format of the ThresholdImage method is:
-%
-% unsigned int ThresholdImage(Image *image,const double threshold)
-%
-% A description of each parameter follows:
-%
-% o image: the image.
-%
-% o threshold: Define the threshold value
-%
-*/
-MagickExport unsigned int ThresholdImage(Image *image,const double threshold)
-{
-#define ThresholdImageTag "Threshold/Image"
-
- IndexPacket
- index;
-
- ssize_t
- y;
-
- /*
- Threshold image.
- */
- assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
- if (image->debug != MagickFalse)
- (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
- if (image->debug != MagickFalse)
- (void) LogMagickEvent(DeprecateEvent,GetMagickModule(),"last use: v5.5.7");
- if (!AcquireImageColormap(image,2))
- ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed",
- "UnableToThresholdImage");
- for (y=0; y < (ssize_t) image->rows; y++)
- {
- register IndexPacket
- *restrict indexes;
-
- register ssize_t
- x;
-
- register PixelPacket
- *restrict q;
-
- q=GetAuthenticPixels(image,0,y,image->columns,1,&image->exception);
- if (q == (PixelPacket *) NULL)
- break;
- indexes=GetAuthenticIndexQueue(image);
- for (x=0; x < (ssize_t) image->columns; x++)
- {
- index=(IndexPacket) ((MagickRealType) PixelIntensityToQuantum(q) <=
- threshold ? 0 : 1);
- SetPixelIndex(indexes+x,index);
- SetPixelRGBO(q,image->colormap+(ssize_t) index);
- q++;
- }
- if (!SyncAuthenticPixels(image,&image->exception))
- break;
- }
- return(MagickTrue);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% T h r e s h o l d I m a g e C h a n n e l %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% ThresholdImageChannel() changes the value of individual pixels based on
-% the intensity of each pixel channel. The result is a high-contrast image.
-%
-% The format of the ThresholdImageChannel method is:
-%
-% unsigned int ThresholdImageChannel(Image *image,const char *threshold)
-%
-% A description of each parameter follows:
-%
-% o image: the image.
-%
-% o threshold: define the threshold values.
-%
-*/
-MagickExport unsigned int ThresholdImageChannel(Image *image,
- const char *threshold)
-{
-#define ThresholdImageTag "Threshold/Image"
-
- MagickPixelPacket
- pixel;
-
- GeometryInfo
- geometry_info;
-
- IndexPacket
- index;
-
- ssize_t
- y;
-
- unsigned int
- flags;
-
- /*
- Threshold image.
- */
- assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
- if (image->debug != MagickFalse)
- (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
- if (threshold == (const char *) NULL)
- return(MagickTrue);
- if (SetImageStorageClass(image,DirectClass) == MagickFalse)
- return(MagickFalse);
- flags=ParseGeometry(threshold,&geometry_info);
- pixel.red=geometry_info.rho;
- if (flags & SigmaValue)
- pixel.green=geometry_info.sigma;
- else
- pixel.green=pixel.red;
- if (flags & XiValue)
- pixel.blue=geometry_info.xi;
- else
- pixel.blue=pixel.red;
- if (flags & PsiValue)
- pixel.opacity=geometry_info.psi;
- else
- pixel.opacity=(MagickRealType) OpaqueOpacity;
- if (flags & PercentValue)
- {
- pixel.red*=QuantumRange/100.0f;
- pixel.green*=QuantumRange/100.0f;
- pixel.blue*=QuantumRange/100.0f;
- pixel.opacity*=QuantumRange/100.0f;
- }
- if (!(flags & SigmaValue))
- {
- if (!AcquireImageColormap(image,2))
- ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed",
- "UnableToThresholdImage");
- if (pixel.red == 0)
- (void) GetImageDynamicThreshold(image,2.0,2.0,&pixel,&image->exception);
- }
- for (y=0; y < (ssize_t) image->rows; y++)
- {
- register IndexPacket
- *restrict indexes;
-
- register ssize_t
- x;
-
- register PixelPacket
- *restrict q;
-
- q=GetAuthenticPixels(image,0,y,image->columns,1,&image->exception);
- if (q == (PixelPacket *) NULL)
- break;
- indexes=GetAuthenticIndexQueue(image);
- if (IsMagickGray(&pixel) != MagickFalse)
- for (x=0; x < (ssize_t) image->columns; x++)
- {
- index=(IndexPacket) ((MagickRealType)
- PixelIntensityToQuantum(q) <= pixel.red ? 0 : 1);
- SetPixelIndex(indexes+x,index);
- SetPixelRed(q,image->colormap[(ssize_t) index].red);
- SetPixelGreen(q,image->colormap[(ssize_t) index].green);
- SetPixelBlue(q,image->colormap[(ssize_t) index].blue);
- q++;
- }
- else
- for (x=0; x < (ssize_t) image->columns; x++)
- {
- SetPixelRed(q,(MagickRealType) q->red <= pixel.red
- ? 0 : QuantumRange);
- SetPixelGreen(q,(MagickRealType) q->green <= pixel.green
- ? 0 : QuantumRange);
- SetPixelBlue(q,(MagickRealType) q->blue <= pixel.blue
- ? 0 : QuantumRange);
- SetPixelOpacity(q,(MagickRealType) q->opacity <= pixel.opacity
- ? 0 : QuantumRange);
- q++;
- }
- if (!SyncAuthenticPixels(image,&image->exception))
- break;
- }
- return(MagickTrue);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-+ T r a n s f o r m C o l o r s p a c e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% TransformColorspace() converts the image to a specified colorspace.
-% If the image is already in the requested colorspace, no work is performed.
-% Note that the current colorspace is stored in the image colorspace member.
-% The transformation matrices are not necessarily the standard ones: the
-% weights are rescaled to normalize the range of the transformed values to
-% be [0..QuantumRange].
-%
-% Deprecated, replace with:
-%
-% TransformImageColorspace(image,colorspace);
-%
-% The format of the TransformColorspace method is:
-%
-% unsigned int (void) TransformColorspace(Image *image,
-% const ColorspaceType colorspace)
-%
-% A description of each parameter follows:
-%
-% o image: the image to transform
-%
-% o colorspace: the desired colorspace.
-%
-*/
-MagickExport unsigned int TransformColorspace(Image *image,
- const ColorspaceType colorspace)
-{
- assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
- if (image->debug != MagickFalse)
- (void) LogMagickEvent(DeprecateEvent,GetMagickModule(),"last use: v5.5.6");
- return(TransformImageColorspace(image,colorspace));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% T r a n s f o r m H S L %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% TransformHSL() converts a (red, green, blue) to a (hue, saturation,
-% lightness) triple.
-%
-% The format of the TransformHSL method is:
-%
-% void TransformHSL(const Quantum red,const Quantum green,
-% const Quantum blue,double *hue,double *saturation,double *lightness)
-%
-% A description of each parameter follows:
-%
-% o red, green, blue: A Quantum value representing the red, green, and
-% blue component of a pixel..
-%
-% o hue, saturation, lightness: A pointer to a double value representing a
-% component of the HSL color space.
-%
-*/
-
-static inline double MagickMin(const double x,const double y)
-{
- if (x < y)
- return(x);
- return(y);
-}
-
-MagickExport void TransformHSL(const Quantum red,const Quantum green,
- const Quantum blue,double *hue,double *saturation,double *lightness)
-{
- MagickRealType
- b,
- delta,
- g,
- max,
- min,
- r;
-
- /*
- Convert RGB to HSL colorspace.
- */
- assert(hue != (double *) NULL);
- assert(saturation != (double *) NULL);
- assert(lightness != (double *) NULL);
- r=QuantumScale*red;
- g=QuantumScale*green;
- b=QuantumScale*blue;
- max=MagickMax(r,MagickMax(g,b));
- min=MagickMin(r,MagickMin(g,b));
- *hue=0.0;
- *saturation=0.0;
- *lightness=(double) ((min+max)/2.0);
- delta=max-min;
- if (delta == 0.0)
- return;
- *saturation=(double) (delta/((*lightness < 0.5) ? (min+max) :
- (2.0-max-min)));
- if (r == max)
- *hue=(double) (g == min ? 5.0+(max-b)/delta : 1.0-(max-g)/delta);
- else
- if (g == max)
- *hue=(double) (b == min ? 1.0+(max-r)/delta : 3.0-(max-b)/delta);
- else
- *hue=(double) (r == min ? 3.0+(max-g)/delta : 5.0-(max-r)/delta);
- *hue/=6.0;
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% T r a n s l a t e T e x t %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% TranslateText() replaces any embedded formatting characters with the
-% appropriate image attribute and returns the translated text.
-%
-% Deprecated, replace with:
-%
-% InterpretImageProperties(image_info,image,embed_text);
-%
-% The format of the TranslateText method is:
-%
-% char *TranslateText(const ImageInfo *image_info,Image *image,
-% const char *embed_text)
-%
-% A description of each parameter follows:
-%
-% o image_info: the image info.
-%
-% o image: the image.
-%
-% o embed_text: the address of a character string containing the embedded
-% formatting characters.
-%
-*/
-MagickExport char *TranslateText(const ImageInfo *image_info,Image *image,
- const char *embed_text)
-{
- assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
- if (image->debug != MagickFalse)
- (void) LogMagickEvent(DeprecateEvent,GetMagickModule(),"last use: v6.2.6");
- return(InterpretImageProperties(image_info,image,embed_text));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% T r a n s p a r e n t I m a g e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% TransparentImage() changes the opacity value associated with any pixel
-% that matches color to the value defined by opacity.
-%
-% By default color must match a particular pixel color exactly. However,
-% in many cases two colors may differ by a small amount. Fuzz defines
-% how much tolerance is acceptable to consider two colors as the same.
-% For example, set fuzz to 10 and the color red at intensities of 100 and
-% 102 respectively are now interpreted as the same color.
-%
-% The format of the TransparentImage method is:
-%
-% MagickBooleanType TransparentImage(Image *image,
-% const PixelPacket target,const Quantum opacity)
-%
-% A description of each parameter follows:
-%
-% o image: the image.
-%
-% o target: the RGB value of the target color.
-%
-% o opacity: the replacement opacity value.
-%
-*/
-MagickExport MagickBooleanType TransparentImage(Image *image,
- const PixelPacket target,const Quantum opacity)
-{
-#define TransparentImageTag "Transparent/Image"
-
- MagickBooleanType
- proceed;
-
- ssize_t
- y;
-
- /*
- Make image color transparent.
- */
- assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
- (void) LogMagickEvent(DeprecateEvent,GetMagickModule(),"last use: v6.1.0");
- if (image->debug != MagickFalse)
- (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
- if (image->matte == MagickFalse)
- (void) SetImageAlphaChannel(image,OpaqueAlphaChannel);
- for (y=0; y < (ssize_t) image->rows; y++)
- {
- register ssize_t
- x;
-
- register PixelPacket
- *restrict q;
-
- q=GetAuthenticPixels(image,0,y,image->columns,1,&image->exception);
- if (q == (PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) image->columns; x++)
- {
- if (IsColorSimilar(image,q,&target) != MagickFalse)
- q->opacity=opacity;
- q++;
- }
- if (SyncAuthenticPixels(image,&image->exception) == MagickFalse)
- break;
- proceed=SetImageProgress(image,TransparentImageTag,(MagickOffsetType) y,
- image->rows);
- if (proceed == MagickFalse)
- break;
- }
- return(MagickTrue);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% U n s h i f t I m a g e L i s t %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% UnshiftImageList() adds the image to the beginning of the list.
-%
-% Deprecated, replace with:
-%
-% PrependImageToList(images,CloneImageList(image,exception));
-%
-% The format of the UnshiftImageList method is:
-%
-% unsigned int UnshiftImageList(Image *images,const Image *image,
-% ExceptionInfo *exception)
-%
-% A description of each parameter follows:
-%
-% o images: the image list.
-%
-% o image: the image.
-%
-% o exception: return any errors or warnings in this structure.
-%
-*/
-MagickExport unsigned int UnshiftImageList(Image **images,const Image *image,
- ExceptionInfo *exception)
-{
- (void) LogMagickEvent(DeprecateEvent,GetMagickModule(),"last use: v5.5.2");
- PrependImageToList(images,CloneImageList(image,exception));
- return(MagickTrue);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-+ V a l i d a t e C o l o r m a p I n d e x %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% ValidateColormapIndex() validates the colormap index. If the index does
-% not range from 0 to the number of colors in the colormap an exception
-% issued and 0 is returned.
-%
-% Deprecated, replace with:
-%
-% ConstrainColormapIndex(image,index);
-%
-% The format of the ValidateColormapIndex method is:
-%
-% IndexPacket ValidateColormapIndex(Image *image,const unsigned int index)
-%
-% A description of each parameter follows:
-%
-% o index: Method ValidateColormapIndex returns colormap index if it is
-% valid other an exception issued and 0 is returned.
-%
-% o image: the image.
-%
-% o index: This integer is the colormap index.
-%
-*/
-MagickExport IndexPacket ValidateColormapIndex(Image *image,
- const size_t index)
-{
- if (image->debug != MagickFalse)
- (void) LogMagickEvent(DeprecateEvent,GetMagickModule(),"last use: v5.4.4");
- return(ConstrainColormapIndex(image,index));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% Z o o m I m a g e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% ZoomImage() creates a new image that is a scaled size of an existing one.
-% It allocates the memory necessary for the new Image structure and returns a
-% pointer to the new image. The Point filter gives fast pixel replication,
-% Triangle is equivalent to bi-linear interpolation, and Mitchel giver slower,
-% very high-quality results. See Graphic Gems III for details on this
-% algorithm.
-%
-% The filter member of the Image structure specifies which image filter to
-% use. Blur specifies the blur factor where > 1 is blurry, < 1 is sharp.
-%
-% The format of the ZoomImage method is:
-%
-% Image *ZoomImage(const Image *image,const size_t columns,
-% const size_t rows,ExceptionInfo *exception)
-%
-% A description of each parameter follows:
-%
-% o image: the image.
-%
-% o columns: An integer that specifies the number of columns in the zoom
-% image.
-%
-% o rows: An integer that specifies the number of rows in the scaled
-% image.
-%
-% o exception: return any errors or warnings in this structure.
-%
-*/
-MagickExport Image *ZoomImage(const Image *image,const size_t columns,
- const size_t rows,ExceptionInfo *exception)
-{
- Image
- *zoom_image;
-
- assert(image != (const Image *) NULL);
- assert(image->signature == MagickSignature);
- if (image->debug != MagickFalse)
- (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
- assert(exception != (ExceptionInfo *) NULL);
- assert(exception->signature == MagickSignature);
- zoom_image=ResizeImage(image,columns,rows,image->filter,image->blur,
- exception);
- return(zoom_image);
-}
-#endif
diff --git a/magick/deprecate.h b/magick/deprecate.h
deleted file mode 100644
index 278f3c6..0000000
--- a/magick/deprecate.h
+++ /dev/null
@@ -1,334 +0,0 @@
-/*
- Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization
- dedicated to making software imaging solutions freely available.
-
- You may not use this file except in compliance with the License.
- obtain a copy of the License at
-
- http://www.imagemagick.org/script/license.php
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- MagickCore deprecated methods.
-*/
-#ifndef _MAGICKCORE_DEPRECATE_H
-#define _MAGICKCORE_DEPRECATE_H
-
-#if defined(__cplusplus) || defined(c_plusplus)
-extern "C" {
-#endif
-
-#if !defined(MAGICKCORE_EXCLUDE_DEPRECATED)
-
-#include <stdarg.h>
-#include "magick/blob.h"
-#include "magick/cache-view.h"
-#include "magick/draw.h"
-#include "magick/constitute.h"
-#include "magick/magick-config.h"
-#include "magick/pixel.h"
-#include "magick/quantize.h"
-#include "magick/quantum.h"
-#include "magick/registry.h"
-#include "magick/semaphore.h"
-
-#if !defined(magick_attribute)
-# if !defined(__GNUC__)
-# define magick_attribute(x) /*nothing*/
-# else
-# define magick_attribute __attribute__
-# endif
-#endif
-
-#define Downscale(quantum) ScaleQuantumToChar(quantum)
-#define LABColorspace LabColorspace
-#define Intensity(color) PixelIntensityToQuantum(color)
-#define LiberateUniqueFileResource(resource) \
- RelinquishUniqueFileResource(resource)
-#define LiberateMagickResource(resource) RelinquishMagickResource(resource)
-#define LiberateSemaphore(semaphore) RelinquishSemaphore(semaphore)
-#define QuantumDepth MAGICKCORE_QUANTUM_DEPTH
-#define MaxRGB QuantumRange /* deprecated */
-#define RunlengthEncodedCompression RLECompression
-#define Upscale(value) ScaleCharToQuantum(value)
-#define XDownscale(value) ScaleShortToQuantum(value)
-#define XUpscale(quantum) ScaleQuantumToShort(quantum)
-
-typedef enum
-{
- UndefinedMagickLayerMethod
-} MagickLayerMethod;
-
-typedef MagickOffsetType ExtendedSignedIntegralType;
-typedef MagickSizeType ExtendedUnsignedIntegralType;
-typedef MagickRealType ExtendedRationalType;
-typedef struct _ViewInfo ViewInfo;
-
-typedef MagickBooleanType
- (*MonitorHandler)(const char *,const MagickOffsetType,const MagickSizeType,
- ExceptionInfo *);
-
-typedef struct _ImageAttribute
-{
- char
- *key,
- *value;
-
- MagickBooleanType
- compression;
-
- struct _ImageAttribute
- *previous,
- *next; /* deprecated */
-} ImageAttribute;
-
-extern MagickExport CacheView
- *CloseCacheView(CacheView *) magick_attribute((deprecated)),
- *OpenCacheView(const Image *) magick_attribute((deprecated));
-
-extern MagickExport char
- *AllocateString(const char *) magick_attribute((deprecated)),
- *InterpretImageAttributes(const ImageInfo *,Image *,const char *)
- magick_attribute((deprecated)),
- *PostscriptGeometry(const char *) magick_attribute((deprecated)),
- *TranslateText(const ImageInfo *,Image *,const char *)
- magick_attribute((deprecated));
-
-extern MagickExport const ImageAttribute
- *GetImageAttribute(const Image *,const char *),
- *GetImageClippingPathAttribute(Image *) magick_attribute((deprecated)),
- *GetNextImageAttribute(const Image *) magick_attribute((deprecated));
-
-extern MagickExport const IndexPacket
- *AcquireCacheViewIndexes(const CacheView *) magick_attribute((deprecated)),
- *AcquireIndexes(const Image *) magick_attribute((deprecated));
-
-extern MagickExport const PixelPacket
- *AcquirePixels(const Image *) magick_attribute((deprecated)),
- *AcquireCacheViewPixels(const CacheView *,const ssize_t,const ssize_t,
- const size_t,const size_t,ExceptionInfo *)
- magick_attribute((deprecated)),
- *AcquireImagePixels(const Image *,const ssize_t,const ssize_t,const size_t,
- const size_t,ExceptionInfo *) magick_attribute((deprecated));
-
-extern MagickExport Image
- *AllocateImage(const ImageInfo *) magick_attribute((deprecated)),
- *AverageImages(const Image *,ExceptionInfo *),
- *ExtractSubimageFromImage(Image *,const Image *,ExceptionInfo *)
- magick_attribute((deprecated)),
- *GetImageFromMagickRegistry(const char *,ssize_t *id,ExceptionInfo *)
- magick_attribute((deprecated)),
- *GetImageList(const Image *,const ssize_t,ExceptionInfo *)
- magick_attribute((deprecated)),
- *GetNextImage(const Image *) magick_attribute((deprecated)),
- *GetPreviousImage(const Image *) magick_attribute((deprecated)),
- *FlattenImages(Image *,ExceptionInfo *) magick_attribute((deprecated)),
- *MaximumImages(const Image *,ExceptionInfo *),
- *MedianFilterImage(const Image *,const double,ExceptionInfo *),
- *ModeImage(const Image *,const double,ExceptionInfo *),
- *MinimumImages(const Image *,ExceptionInfo *),
- *MosaicImages(Image *,ExceptionInfo *) magick_attribute((deprecated)),
- *PopImageList(Image **) magick_attribute((deprecated)),
- *RecolorImage(const Image *,const size_t,const double *,ExceptionInfo *)
- magick_attribute((deprecated)),
- *ReduceNoiseImage(const Image *,const double,ExceptionInfo *),
- *ShiftImageList(Image **) magick_attribute((deprecated)),
- *SpliceImageList(Image *,const ssize_t,const size_t,const Image *,
- ExceptionInfo *) magick_attribute((deprecated)),
- *ZoomImage(const Image *,const size_t,const size_t,ExceptionInfo *)
- magick_attribute((deprecated));
-
-extern MagickExport IndexPacket
- *GetCacheViewIndexes(CacheView *) magick_attribute((deprecated)),
- *GetIndexes(const Image *) magick_attribute((deprecated)),
- ValidateColormapIndex(Image *,const size_t) magick_attribute((deprecated));
-
-extern MagickExport int
- GetImageGeometry(Image *,const char *,const unsigned int,RectangleInfo *)
- magick_attribute((deprecated)),
- ParseImageGeometry(const char *,ssize_t *,ssize_t *,size_t *,size_t *)
- magick_attribute((deprecated));
-
-extern MagickExport ssize_t
- FormatMagickString(char *,const size_t,const char *,...)
- magick_attribute((format (printf,3,4))) magick_attribute((deprecated)),
- FormatMagickStringList(char *,const size_t,const char *,va_list)
- magick_attribute((format (printf,3,0))),
- GetImageListIndex(const Image *) magick_attribute((deprecated)),
- SetMagickRegistry(const RegistryType,const void *,const size_t,
- ExceptionInfo *) magick_attribute((deprecated));
-
-extern MagickExport MagickBooleanType
- AcquireOneCacheViewPixel(const CacheView *,const ssize_t,const ssize_t,
- PixelPacket *,ExceptionInfo *) magick_attribute((deprecated)),
- AcquireOneCacheViewVirtualPixel(const CacheView *,const VirtualPixelMethod,
- const ssize_t,const ssize_t,PixelPacket *,ExceptionInfo *)
- magick_attribute((deprecated)),
- AffinityImage(const QuantizeInfo *,Image *,const Image *)
- magick_attribute((deprecated)),
- AffinityImages(const QuantizeInfo *,Image *,const Image *)
- magick_attribute((deprecated)),
- AllocateImageColormap(Image *,const size_t)
- magick_attribute((deprecated)),
- ClipPathImage(Image *,const char *,const MagickBooleanType)
- magick_attribute((deprecated)),
- CloneImageAttributes(Image *,const Image *) magick_attribute((deprecated)),
- ColorFloodfillImage(Image *,const DrawInfo *,const PixelPacket,const ssize_t,
- const ssize_t,const PaintMethod) magick_attribute((deprecated)),
- DeleteImageAttribute(Image *,const char *) magick_attribute((deprecated)),
- DeleteMagickRegistry(const ssize_t) magick_attribute((deprecated)),
- DescribeImage(Image *,FILE *,const MagickBooleanType)
- magick_attribute((deprecated)),
- FormatImageAttribute(Image *,const char *,const char *,...)
- magick_attribute((format (printf,3,4))) magick_attribute((deprecated)),
- FormatImageAttributeList(Image *,const char *,const char *,va_list)
- magick_attribute((format (printf,3,0))) magick_attribute((deprecated)),
- FuzzyColorCompare(const Image *,const PixelPacket *,const PixelPacket *)
- magick_attribute((deprecated)),
- FuzzyOpacityCompare(const Image *,const PixelPacket *,const PixelPacket *)
- magick_attribute((deprecated)),
- LevelImageColors(Image *,const ChannelType,const MagickPixelPacket *,
- const MagickPixelPacket *, const MagickBooleanType)
- magick_attribute((deprecated)),
- MagickMonitor(const char *,const MagickOffsetType,const MagickSizeType,
- void *) magick_attribute((deprecated)),
- MapImage(Image *,const Image *,const MagickBooleanType)
- magick_attribute((deprecated)),
- MapImages(Image *,const Image *,const MagickBooleanType)
- magick_attribute((deprecated)),
- MatteFloodfillImage(Image *,const PixelPacket,const Quantum,const ssize_t,
- const ssize_t,const PaintMethod) magick_attribute((deprecated)),
- OpaqueImage(Image *,const PixelPacket,const PixelPacket)
- magick_attribute((deprecated)),
- PaintFloodfillImage(Image *,const ChannelType,const MagickPixelPacket *,
- const ssize_t,const ssize_t,const DrawInfo *,const PaintMethod)
- magick_attribute((deprecated)),
- PaintOpaqueImage(Image *,const MagickPixelPacket *,const MagickPixelPacket *)
- magick_attribute((deprecated)),
- PaintOpaqueImageChannel(Image *,const ChannelType,const MagickPixelPacket *,
- const MagickPixelPacket *) magick_attribute((deprecated)),
- PaintTransparentImage(Image *,const MagickPixelPacket *,const Quantum)
- magick_attribute((deprecated)),
- SetExceptionInfo(ExceptionInfo *,ExceptionType)
- magick_attribute((deprecated)),
- SetImageAttribute(Image *,const char *,const char *)
- magick_attribute((deprecated)),
- SyncCacheViewPixels(CacheView *) magick_attribute((deprecated)),
- SyncImagePixels(Image *) magick_attribute((deprecated)),
- TransparentImage(Image *,const PixelPacket,const Quantum)
- magick_attribute((deprecated));
-
-extern MagickExport MagickPixelPacket
- AcquireOneMagickPixel(const Image *,const ssize_t,const ssize_t,
- ExceptionInfo *) magick_attribute((deprecated));
-
-extern MagickExport MonitorHandler
- GetMonitorHandler(void) magick_attribute((deprecated)),
- SetMonitorHandler(MonitorHandler) magick_attribute((deprecated));
-
-extern MagickExport MagickOffsetType
- SizeBlob(Image *image) magick_attribute((deprecated));
-
-extern MagickExport MagickPixelPacket
- InterpolatePixelColor(const Image *,CacheView *,const InterpolatePixelMethod,
- const double,const double,ExceptionInfo *) magick_attribute((deprecated));
-
-extern MagickExport MagickStatusType
- ParseSizeGeometry(const Image *,const char *,RectangleInfo *)
- magick_attribute((deprecated));
-
-extern MagickExport PixelPacket
- AcquireOnePixel(const Image *,const ssize_t,const ssize_t,ExceptionInfo *)
- magick_attribute((deprecated)),
- AcquireOneVirtualPixel(const Image *,const VirtualPixelMethod,const ssize_t,
- const ssize_t,ExceptionInfo *) magick_attribute((deprecated)),
- *GetCacheView(CacheView *,const ssize_t,const ssize_t,const size_t,
- const size_t) magick_attribute((deprecated)),
- *GetCacheViewPixels(CacheView *,const ssize_t,const ssize_t,const size_t,
- const size_t) magick_attribute((deprecated)),
- *GetImagePixels(Image *,const ssize_t,const ssize_t,const size_t,
- const size_t) magick_attribute((deprecated)),
- GetOnePixel(Image *,const ssize_t,const ssize_t)
- magick_attribute((deprecated)),
- *GetPixels(const Image *) magick_attribute((deprecated)),
- *SetCacheViewPixels(CacheView *,const ssize_t,const ssize_t,const size_t,
- const size_t) magick_attribute((deprecated)),
- *SetImagePixels(Image *,const ssize_t,const ssize_t,const size_t,
- const size_t) magick_attribute((deprecated));
-
-extern MagickExport size_t
- GetImageListSize(const Image *) magick_attribute((deprecated)),
- PopImagePixels(Image *,const QuantumType,unsigned char *)
- magick_attribute((deprecated)),
- PushImagePixels(Image *,const QuantumType,const unsigned char *)
- magick_attribute((deprecated));
-
-extern MagickExport unsigned int
- ChannelImage(Image *,const ChannelType) magick_attribute((deprecated)),
- ChannelThresholdImage(Image *,const char *) magick_attribute((deprecated)),
- DispatchImage(const Image *,const ssize_t,const ssize_t,const size_t,
- const size_t,const char *,const StorageType,void *,ExceptionInfo *)
- magick_attribute((deprecated)),
- FuzzyColorMatch(const PixelPacket *,const PixelPacket *,const double)
- magick_attribute((deprecated)),
- GetNumberScenes(const Image *) magick_attribute((deprecated)),
- GetMagickGeometry(const char *,ssize_t *,ssize_t *,size_t *,size_t *)
- magick_attribute((deprecated)),
- IsSubimage(const char *,const unsigned int) magick_attribute((deprecated)),
- PushImageList(Image **,const Image *,ExceptionInfo *)
- magick_attribute((deprecated)),
- QuantizationError(Image *) magick_attribute((deprecated)),
- RandomChannelThresholdImage(Image *,const char *,const char *,
- ExceptionInfo *) magick_attribute((deprecated)),
- SetImageList(Image **,const Image *,const ssize_t,ExceptionInfo *)
- magick_attribute((deprecated)),
- TransformColorspace(Image *,const ColorspaceType)
- magick_attribute((deprecated)),
- ThresholdImage(Image *,const double) magick_attribute((deprecated)),
- ThresholdImageChannel(Image *,const char *) magick_attribute((deprecated)),
- UnshiftImageList(Image **,const Image *,ExceptionInfo *)
- magick_attribute((deprecated));
-
-extern MagickExport void
- *AcquireMemory(const size_t) magick_attribute((deprecated)),
- AllocateNextImage(const ImageInfo *,Image *) magick_attribute((deprecated)),
- *CloneMemory(void *,const void *,const size_t) magick_attribute((deprecated)),
- DestroyConstitute(void),
- DestroyImageAttributes(Image *) magick_attribute((deprecated)),
- DestroyImages(Image *) magick_attribute((deprecated)),
- DestroyMagick(void) magick_attribute((deprecated)),
- DestroyMagickRegistry(void) magick_attribute((deprecated)),
- *GetConfigureBlob(const char *,char *,size_t *,ExceptionInfo *)
- magick_attribute((deprecated)),
- *GetMagickRegistry(const ssize_t,RegistryType *,size_t *,ExceptionInfo *)
- magick_attribute((deprecated)),
- IdentityAffine(AffineMatrix *) magick_attribute((deprecated)),
- LiberateMemory(void **) magick_attribute((deprecated)),
- LiberateSemaphoreInfo(SemaphoreInfo **) magick_attribute((deprecated)),
- FormatString(char *,const char *,...) magick_attribute((format (printf,2,3)))
- magick_attribute((deprecated)),
- FormatStringList(char *,const char *,va_list)
- magick_attribute((format (printf,2,0))) magick_attribute((deprecated)),
- HSLTransform(const double,const double,const double,Quantum *,Quantum *,
- Quantum *) magick_attribute((deprecated)),
- InitializeMagick(const char *) magick_attribute((deprecated)),
- MagickIncarnate(const char *) magick_attribute((deprecated)),
- ReacquireMemory(void **,const size_t) magick_attribute((deprecated)),
- ResetImageAttributeIterator(const Image *) magick_attribute((deprecated)),
- SetCacheThreshold(const size_t) magick_attribute((deprecated)),
- SetImage(Image *,const Quantum) magick_attribute((deprecated)),
- Strip(char *) magick_attribute((deprecated)),
- TemporaryFilename(char *) magick_attribute((deprecated)),
- TransformHSL(const Quantum,const Quantum,const Quantum,double *,double *,
- double *) magick_attribute((deprecated));
-#endif
-
-#if defined(__cplusplus) || defined(c_plusplus)
-}
-#endif
-
-#endif
diff --git a/magick/pixel.c b/magick/pixel.c
deleted file mode 100644
index c6c95d0..0000000
--- a/magick/pixel.c
+++ /dev/null
@@ -1,3977 +0,0 @@
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% PPPP IIIII X X EEEEE L %
-% P P I X X E L %
-% PPPP I X EEE L %
-% P I X X E L %
-% P IIIII X X EEEEE LLLLL %
-% %
-% MagickCore Methods to Import/Export Pixels %
-% %
-% Software Design %
-% John Cristy %
-% October 1998 %
-% %
-% %
-% Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization %
-% dedicated to making software imaging solutions freely available. %
-% %
-% You may not use this file except in compliance with the License. You may %
-% obtain a copy of the License at %
-% %
-% http://www.imagemagick.org/script/license.php %
-% %
-% Unless required by applicable law or agreed to in writing, software %
-% distributed under the License is distributed on an "AS IS" BASIS, %
-% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. %
-% See the License for the specific language governing permissions and %
-% limitations under the License. %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-%
-*/
-
-/*
- Include declarations.
-*/
-#include "magick/studio.h"
-#include "magick/property.h"
-#include "magick/blob.h"
-#include "magick/blob-private.h"
-#include "magick/color-private.h"
-#include "magick/draw.h"
-#include "magick/exception.h"
-#include "magick/exception-private.h"
-#include "magick/cache.h"
-#include "magick/constitute.h"
-#include "magick/delegate.h"
-#include "magick/geometry.h"
-#include "magick/list.h"
-#include "magick/magick.h"
-#include "magick/memory_.h"
-#include "magick/monitor.h"
-#include "magick/option.h"
-#include "magick/pixel.h"
-#include "magick/pixel-private.h"
-#include "magick/quantum.h"
-#include "magick/resource_.h"
-#include "magick/semaphore.h"
-#include "magick/statistic.h"
-#include "magick/stream.h"
-#include "magick/string_.h"
-#include "magick/transform.h"
-#include "magick/utility.h"
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% E x p o r t I m a g e P i x e l s %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% ExportImagePixels() extracts pixel data from an image and returns it to you.
-% The method returns MagickTrue on success otherwise MagickFalse if an error is
-% encountered. The data is returned as char, short int, int, ssize_t, float,
-% or double in the order specified by map.
-%
-% Suppose you want to extract the first scanline of a 640x480 image as
-% character data in red-green-blue order:
-%
-% ExportImagePixels(image,0,0,640,1,"RGB",CharPixel,pixels,exception);
-%
-% The format of the ExportImagePixels method is:
-%
-% MagickBooleanType ExportImagePixels(const Image *image,
-% const ssize_t x_offset,const ssize_t y_offset,const size_t columns,
-% const size_t rows,const char *map,const StorageType type,
-% void *pixels,ExceptionInfo *exception)
-%
-% A description of each parameter follows:
-%
-% o image: the image.
-%
-% o x_offset,y_offset,columns,rows: These values define the perimeter
-% of a region of pixels you want to extract.
-%
-% o map: This string reflects the expected ordering of the pixel array.
-% It can be any combination or order of R = red, G = green, B = blue,
-% A = alpha (0 is transparent), O = opacity (0 is opaque), C = cyan,
-% Y = yellow, M = magenta, K = black, I = intensity (for grayscale),
-% P = pad.
-%
-% o type: Define the data type of the pixels. Float and double types are
-% normalized to [0..1] otherwise [0..QuantumRange]. Choose from these
-% types: CharPixel, DoublePixel, FloatPixel, IntegerPixel, LongPixel,
-% QuantumPixel, or ShortPixel.
-%
-% o pixels: This array of values contain the pixel components as defined by
-% map and type. You must preallocate this array where the expected
-% length varies depending on the values of width, height, map, and type.
-%
-% o exception: return any errors or warnings in this structure.
-%
-*/
-MagickExport MagickBooleanType ExportImagePixels(const Image *image,
- const ssize_t x_offset,const ssize_t y_offset,const size_t columns,
- const size_t rows,const char *map,const StorageType type,void *pixels,
- ExceptionInfo *exception)
-{
- QuantumType
- *quantum_map;
-
- register ssize_t
- i,
- x;
-
- register const IndexPacket
- *indexes;
-
- register const PixelPacket
- *p;
-
- size_t
- length;
-
- ssize_t
- y;
-
- assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
- if (image->debug != MagickFalse)
- (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
- length=strlen(map);
- quantum_map=(QuantumType *) AcquireQuantumMemory(length,sizeof(*quantum_map));
- if (quantum_map == (QuantumType *) NULL)
- {
- (void) ThrowMagickException(exception,GetMagickModule(),
- ResourceLimitError,"MemoryAllocationFailed","`%s'",image->filename);
- return(MagickFalse);
- }
- for (i=0; i < (ssize_t) length; i++)
- {
- switch (map[i])
- {
- case 'A':
- case 'a':
- {
- quantum_map[i]=AlphaQuantum;
- break;
- }
- case 'B':
- case 'b':
- {
- quantum_map[i]=BlueQuantum;
- break;
- }
- case 'C':
- case 'c':
- {
- quantum_map[i]=CyanQuantum;
- if (image->colorspace == CMYKColorspace)
- break;
- quantum_map=(QuantumType *) RelinquishMagickMemory(quantum_map);
- (void) ThrowMagickException(exception,GetMagickModule(),ImageError,
- "ColorSeparatedImageRequired","`%s'",map);
- return(MagickFalse);
- }
- case 'g':
- case 'G':
- {
- quantum_map[i]=GreenQuantum;
- break;
- }
- case 'I':
- case 'i':
- {
- quantum_map[i]=IndexQuantum;
- break;
- }
- case 'K':
- case 'k':
- {
- quantum_map[i]=BlackQuantum;
- if (image->colorspace == CMYKColorspace)
- break;
- quantum_map=(QuantumType *) RelinquishMagickMemory(quantum_map);
- (void) ThrowMagickException(exception,GetMagickModule(),ImageError,
- "ColorSeparatedImageRequired","`%s'",map);
- return(MagickFalse);
- }
- case 'M':
- case 'm':
- {
- quantum_map[i]=MagentaQuantum;
- if (image->colorspace == CMYKColorspace)
- break;
- quantum_map=(QuantumType *) RelinquishMagickMemory(quantum_map);
- (void) ThrowMagickException(exception,GetMagickModule(),ImageError,
- "ColorSeparatedImageRequired","`%s'",map);
- return(MagickFalse);
- }
- case 'o':
- case 'O':
- {
- quantum_map[i]=OpacityQuantum;
- break;
- }
- case 'P':
- case 'p':
- {
- quantum_map[i]=UndefinedQuantum;
- break;
- }
- case 'R':
- case 'r':
- {
- quantum_map[i]=RedQuantum;
- break;
- }
- case 'Y':
- case 'y':
- {
- quantum_map[i]=YellowQuantum;
- if (image->colorspace == CMYKColorspace)
- break;
- quantum_map=(QuantumType *) RelinquishMagickMemory(quantum_map);
- (void) ThrowMagickException(exception,GetMagickModule(),ImageError,
- "ColorSeparatedImageRequired","`%s'",map);
- return(MagickFalse);
- }
- default:
- {
- quantum_map=(QuantumType *) RelinquishMagickMemory(quantum_map);
- (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
- "UnrecognizedPixelMap","`%s'",map);
- return(MagickFalse);
- }
- }
- }
- switch (type)
- {
- case CharPixel:
- {
- register unsigned char
- *q;
-
- q=(unsigned char *) pixels;
- if (LocaleCompare(map,"BGR") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- *q++=ScaleQuantumToChar(GetPixelBlue(p));
- *q++=ScaleQuantumToChar(GetPixelGreen(p));
- *q++=ScaleQuantumToChar(GetPixelRed(p));
- p++;
- }
- }
- break;
- }
- if (LocaleCompare(map,"BGRA") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- *q++=ScaleQuantumToChar(GetPixelBlue(p));
- *q++=ScaleQuantumToChar(GetPixelGreen(p));
- *q++=ScaleQuantumToChar(GetPixelRed(p));
- *q++=ScaleQuantumToChar((Quantum) (GetPixelAlpha(p)));
- p++;
- }
- }
- break;
- }
- if (LocaleCompare(map,"BGRP") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- *q++=ScaleQuantumToChar(GetPixelBlue(p));
- *q++=ScaleQuantumToChar(GetPixelGreen(p));
- *q++=ScaleQuantumToChar(GetPixelRed(p));
- *q++=ScaleQuantumToChar((Quantum) 0);
- p++;
- }
- }
- break;
- }
- if (LocaleCompare(map,"I") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- *q++=ScaleQuantumToChar(PixelIntensityToQuantum(p));
- p++;
- }
- }
- break;
- }
- if (LocaleCompare(map,"RGB") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- *q++=ScaleQuantumToChar(GetPixelRed(p));
- *q++=ScaleQuantumToChar(GetPixelGreen(p));
- *q++=ScaleQuantumToChar(GetPixelBlue(p));
- p++;
- }
- }
- break;
- }
- if (LocaleCompare(map,"RGBA") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- *q++=ScaleQuantumToChar(GetPixelRed(p));
- *q++=ScaleQuantumToChar(GetPixelGreen(p));
- *q++=ScaleQuantumToChar(GetPixelBlue(p));
- *q++=ScaleQuantumToChar((Quantum) (GetPixelAlpha(p)));
- p++;
- }
- }
- break;
- }
- if (LocaleCompare(map,"RGBP") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- *q++=ScaleQuantumToChar(GetPixelRed(p));
- *q++=ScaleQuantumToChar(GetPixelGreen(p));
- *q++=ScaleQuantumToChar(GetPixelBlue(p));
- *q++=ScaleQuantumToChar((Quantum) 0);
- p++;
- }
- }
- break;
- }
- for (y=0; y < (ssize_t) rows; y++)
- {
- p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- indexes=GetVirtualIndexQueue(image);
- for (x=0; x < (ssize_t) columns; x++)
- {
- for (i=0; i < (ssize_t) length; i++)
- {
- *q=0;
- switch (quantum_map[i])
- {
- case RedQuantum:
- case CyanQuantum:
- {
- *q=ScaleQuantumToChar(GetPixelRed(p));
- break;
- }
- case GreenQuantum:
- case MagentaQuantum:
- {
- *q=ScaleQuantumToChar(GetPixelGreen(p));
- break;
- }
- case BlueQuantum:
- case YellowQuantum:
- {
- *q=ScaleQuantumToChar(GetPixelBlue(p));
- break;
- }
- case AlphaQuantum:
- {
- *q=ScaleQuantumToChar((Quantum) (GetPixelAlpha(p)));
- break;
- }
- case OpacityQuantum:
- {
- *q=ScaleQuantumToChar(GetPixelOpacity(p));
- break;
- }
- case BlackQuantum:
- {
- if (image->colorspace == CMYKColorspace)
- *q=ScaleQuantumToChar(GetPixelIndex(indexes+x));
- break;
- }
- case IndexQuantum:
- {
- *q=ScaleQuantumToChar(PixelIntensityToQuantum(p));
- break;
- }
- default:
- break;
- }
- q++;
- }
- p++;
- }
- }
- break;
- }
- case DoublePixel:
- {
- register double
- *q;
-
- q=(double *) pixels;
- if (LocaleCompare(map,"BGR") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- *q++=(double) (QuantumScale*GetPixelBlue(p));
- *q++=(double) (QuantumScale*GetPixelGreen(p));
- *q++=(double) (QuantumScale*GetPixelRed(p));
- p++;
- }
- }
- break;
- }
- if (LocaleCompare(map,"BGRA") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- *q++=(double) (QuantumScale*GetPixelBlue(p));
- *q++=(double) (QuantumScale*GetPixelGreen(p));
- *q++=(double) (QuantumScale*GetPixelRed(p));
- *q++=(double) (QuantumScale*((Quantum) (QuantumRange-
- GetPixelOpacity(p))));
- p++;
- }
- }
- break;
- }
- if (LocaleCompare(map,"BGRP") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- *q++=(double) (QuantumScale*GetPixelBlue(p));
- *q++=(double) (QuantumScale*GetPixelGreen(p));
- *q++=(double) (QuantumScale*GetPixelRed(p));
- *q++=0.0;
- p++;
- }
- }
- break;
- }
- if (LocaleCompare(map,"I") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- *q++=(double) (QuantumScale*PixelIntensityToQuantum(p));
- p++;
- }
- }
- break;
- }
- if (LocaleCompare(map,"RGB") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- *q++=(double) (QuantumScale*GetPixelRed(p));
- *q++=(double) (QuantumScale*GetPixelGreen(p));
- *q++=(double) (QuantumScale*GetPixelBlue(p));
- p++;
- }
- }
- break;
- }
- if (LocaleCompare(map,"RGBA") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- *q++=(double) (QuantumScale*GetPixelRed(p));
- *q++=(double) (QuantumScale*GetPixelGreen(p));
- *q++=(double) (QuantumScale*GetPixelBlue(p));
- *q++=(double) (QuantumScale*((Quantum) (QuantumRange-
- GetPixelOpacity(p))));
- p++;
- }
- }
- break;
- }
- if (LocaleCompare(map,"RGBP") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- *q++=(double) (QuantumScale*GetPixelRed(p));
- *q++=(double) (QuantumScale*GetPixelGreen(p));
- *q++=(double) (QuantumScale*GetPixelBlue(p));
- *q++=0.0;
- p++;
- }
- }
- break;
- }
- for (y=0; y < (ssize_t) rows; y++)
- {
- p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- indexes=GetVirtualIndexQueue(image);
- for (x=0; x < (ssize_t) columns; x++)
- {
- for (i=0; i < (ssize_t) length; i++)
- {
- *q=0;
- switch (quantum_map[i])
- {
- case RedQuantum:
- case CyanQuantum:
- {
- *q=(double) (QuantumScale*GetPixelRed(p));
- break;
- }
- case GreenQuantum:
- case MagentaQuantum:
- {
- *q=(double) (QuantumScale*GetPixelGreen(p));
- break;
- }
- case BlueQuantum:
- case YellowQuantum:
- {
- *q=(double) (QuantumScale*GetPixelBlue(p));
- break;
- }
- case AlphaQuantum:
- {
- *q=(double) (QuantumScale*((Quantum) (QuantumRange-
- GetPixelOpacity(p))));
- break;
- }
- case OpacityQuantum:
- {
- *q=(double) (QuantumScale*GetPixelOpacity(p));
- break;
- }
- case BlackQuantum:
- {
- if (image->colorspace == CMYKColorspace)
- *q=(double) (QuantumScale*GetPixelIndex(indexes+x));
- break;
- }
- case IndexQuantum:
- {
- *q=(double) (QuantumScale*PixelIntensityToQuantum(p));
- break;
- }
- default:
- *q=0;
- }
- q++;
- }
- p++;
- }
- }
- break;
- }
- case FloatPixel:
- {
- register float
- *q;
-
- q=(float *) pixels;
- if (LocaleCompare(map,"BGR") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- *q++=(float) (QuantumScale*GetPixelBlue(p));
- *q++=(float) (QuantumScale*GetPixelGreen(p));
- *q++=(float) (QuantumScale*GetPixelRed(p));
- p++;
- }
- }
- break;
- }
- if (LocaleCompare(map,"BGRA") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- *q++=(float) (QuantumScale*GetPixelBlue(p));
- *q++=(float) (QuantumScale*GetPixelGreen(p));
- *q++=(float) (QuantumScale*GetPixelRed(p));
- *q++=(float) (QuantumScale*(Quantum) (GetPixelAlpha(p)));
- p++;
- }
- }
- break;
- }
- if (LocaleCompare(map,"BGRP") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- *q++=(float) (QuantumScale*GetPixelBlue(p));
- *q++=(float) (QuantumScale*GetPixelGreen(p));
- *q++=(float) (QuantumScale*GetPixelRed(p));
- *q++=0.0;
- p++;
- }
- }
- break;
- }
- if (LocaleCompare(map,"I") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- *q++=(float) (QuantumScale*PixelIntensityToQuantum(p));
- p++;
- }
- }
- break;
- }
- if (LocaleCompare(map,"RGB") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- *q++=(float) (QuantumScale*GetPixelRed(p));
- *q++=(float) (QuantumScale*GetPixelGreen(p));
- *q++=(float) (QuantumScale*GetPixelBlue(p));
- p++;
- }
- }
- break;
- }
- if (LocaleCompare(map,"RGBA") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- *q++=(float) (QuantumScale*GetPixelRed(p));
- *q++=(float) (QuantumScale*GetPixelGreen(p));
- *q++=(float) (QuantumScale*GetPixelBlue(p));
- *q++=(float) (QuantumScale*((Quantum) (GetPixelAlpha(p))));
- p++;
- }
- }
- break;
- }
- if (LocaleCompare(map,"RGBP") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- *q++=(float) (QuantumScale*GetPixelRed(p));
- *q++=(float) (QuantumScale*GetPixelGreen(p));
- *q++=(float) (QuantumScale*GetPixelBlue(p));
- *q++=0.0;
- p++;
- }
- }
- break;
- }
- for (y=0; y < (ssize_t) rows; y++)
- {
- p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- indexes=GetVirtualIndexQueue(image);
- for (x=0; x < (ssize_t) columns; x++)
- {
- for (i=0; i < (ssize_t) length; i++)
- {
- *q=0;
- switch (quantum_map[i])
- {
- case RedQuantum:
- case CyanQuantum:
- {
- *q=(float) (QuantumScale*GetPixelRed(p));
- break;
- }
- case GreenQuantum:
- case MagentaQuantum:
- {
- *q=(float) (QuantumScale*GetPixelGreen(p));
- break;
- }
- case BlueQuantum:
- case YellowQuantum:
- {
- *q=(float) (QuantumScale*GetPixelBlue(p));
- break;
- }
- case AlphaQuantum:
- {
- *q=(float) (QuantumScale*((Quantum) (GetPixelAlpha(p))));
- break;
- }
- case OpacityQuantum:
- {
- *q=(float) (QuantumScale*GetPixelOpacity(p));
- break;
- }
- case BlackQuantum:
- {
- if (image->colorspace == CMYKColorspace)
- *q=(float) (QuantumScale*GetPixelIndex(indexes+x));
- break;
- }
- case IndexQuantum:
- {
- *q=(float) (QuantumScale*PixelIntensityToQuantum(p));
- break;
- }
- default:
- *q=0;
- }
- q++;
- }
- p++;
- }
- }
- break;
- }
- case IntegerPixel:
- {
- register unsigned int
- *q;
-
- q=(unsigned int *) pixels;
- if (LocaleCompare(map,"BGR") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- *q++=(unsigned int) ScaleQuantumToLong(GetPixelBlue(p));
- *q++=(unsigned int) ScaleQuantumToLong(GetPixelGreen(p));
- *q++=(unsigned int) ScaleQuantumToLong(GetPixelRed(p));
- p++;
- }
- }
- break;
- }
- if (LocaleCompare(map,"BGRA") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- *q++=(unsigned int) ScaleQuantumToLong(GetPixelBlue(p));
- *q++=(unsigned int) ScaleQuantumToLong(GetPixelGreen(p));
- *q++=(unsigned int) ScaleQuantumToLong(GetPixelRed(p));
- *q++=(unsigned int) ScaleQuantumToLong((Quantum) (QuantumRange-
- GetPixelOpacity(p)));
- p++;
- }
- }
- break;
- }
- if (LocaleCompare(map,"BGRP") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- *q++=(unsigned int) ScaleQuantumToLong(GetPixelBlue(p));
- *q++=(unsigned int) ScaleQuantumToLong(GetPixelGreen(p));
- *q++=(unsigned int) ScaleQuantumToLong(GetPixelRed(p));
- *q++=0U;
- p++;
- }
- }
- break;
- }
- if (LocaleCompare(map,"I") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- *q++=(unsigned int)
- ScaleQuantumToLong(PixelIntensityToQuantum(p));
- p++;
- }
- }
- break;
- }
- if (LocaleCompare(map,"RGB") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- *q++=(unsigned int) ScaleQuantumToLong(GetPixelRed(p));
- *q++=(unsigned int) ScaleQuantumToLong(GetPixelGreen(p));
- *q++=(unsigned int) ScaleQuantumToLong(GetPixelBlue(p));
- p++;
- }
- }
- break;
- }
- if (LocaleCompare(map,"RGBA") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- *q++=(unsigned int) ScaleQuantumToLong(GetPixelRed(p));
- *q++=(unsigned int) ScaleQuantumToLong(GetPixelGreen(p));
- *q++=(unsigned int) ScaleQuantumToLong(GetPixelBlue(p));
- *q++=(unsigned int) ScaleQuantumToLong((Quantum)
- (GetPixelAlpha(p)));
- p++;
- }
- }
- break;
- }
- if (LocaleCompare(map,"RGBP") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- *q++=(unsigned int) ScaleQuantumToLong(GetPixelRed(p));
- *q++=(unsigned int) ScaleQuantumToLong(GetPixelGreen(p));
- *q++=(unsigned int) ScaleQuantumToLong(GetPixelBlue(p));
- *q++=0U;
- p++;
- }
- }
- break;
- }
- for (y=0; y < (ssize_t) rows; y++)
- {
- p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- indexes=GetVirtualIndexQueue(image);
- for (x=0; x < (ssize_t) columns; x++)
- {
- for (i=0; i < (ssize_t) length; i++)
- {
- *q=0;
- switch (quantum_map[i])
- {
- case RedQuantum:
- case CyanQuantum:
- {
- *q=(unsigned int) ScaleQuantumToLong(GetPixelRed(p));
- break;
- }
- case GreenQuantum:
- case MagentaQuantum:
- {
- *q=(unsigned int) ScaleQuantumToLong(GetPixelGreen(p));
- break;
- }
- case BlueQuantum:
- case YellowQuantum:
- {
- *q=(unsigned int) ScaleQuantumToLong(GetPixelBlue(p));
- break;
- }
- case AlphaQuantum:
- {
- *q=(unsigned int) ScaleQuantumToLong((Quantum) (QuantumRange-
- GetPixelOpacity(p)));
- break;
- }
- case OpacityQuantum:
- {
- *q=(unsigned int) ScaleQuantumToLong(GetPixelOpacity(p));
- break;
- }
- case BlackQuantum:
- {
- if (image->colorspace == CMYKColorspace)
- *q=(unsigned int) ScaleQuantumToLong(GetPixelIndex(indexes+x));
- break;
- }
- case IndexQuantum:
- {
- *q=(unsigned int)
- ScaleQuantumToLong(PixelIntensityToQuantum(p));
- break;
- }
- default:
- *q=0;
- }
- q++;
- }
- p++;
- }
- }
- break;
- }
- case LongPixel:
- {
- register size_t
- *q;
-
- q=(size_t *) pixels;
- if (LocaleCompare(map,"BGR") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- *q++=ScaleQuantumToLong(GetPixelBlue(p));
- *q++=ScaleQuantumToLong(GetPixelGreen(p));
- *q++=ScaleQuantumToLong(GetPixelRed(p));
- p++;
- }
- }
- break;
- }
- if (LocaleCompare(map,"BGRA") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- *q++=ScaleQuantumToLong(GetPixelBlue(p));
- *q++=ScaleQuantumToLong(GetPixelGreen(p));
- *q++=ScaleQuantumToLong(GetPixelRed(p));
- *q++=ScaleQuantumToLong((Quantum) (GetPixelAlpha(p)));
- p++;
- }
- }
- break;
- }
- if (LocaleCompare(map,"BGRP") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- *q++=ScaleQuantumToLong(GetPixelBlue(p));
- *q++=ScaleQuantumToLong(GetPixelGreen(p));
- *q++=ScaleQuantumToLong(GetPixelRed(p));
- *q++=0;
- p++;
- }
- }
- break;
- }
- if (LocaleCompare(map,"I") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- *q++=ScaleQuantumToLong(PixelIntensityToQuantum(p));
- p++;
- }
- }
- break;
- }
- if (LocaleCompare(map,"RGB") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- *q++=ScaleQuantumToLong(GetPixelRed(p));
- *q++=ScaleQuantumToLong(GetPixelGreen(p));
- *q++=ScaleQuantumToLong(GetPixelBlue(p));
- p++;
- }
- }
- break;
- }
- if (LocaleCompare(map,"RGBA") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- *q++=ScaleQuantumToLong(GetPixelRed(p));
- *q++=ScaleQuantumToLong(GetPixelGreen(p));
- *q++=ScaleQuantumToLong(GetPixelBlue(p));
- *q++=ScaleQuantumToLong((Quantum) (GetPixelAlpha(p)));
- p++;
- }
- }
- break;
- }
- if (LocaleCompare(map,"RGBP") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- *q++=ScaleQuantumToLong(GetPixelRed(p));
- *q++=ScaleQuantumToLong(GetPixelGreen(p));
- *q++=ScaleQuantumToLong(GetPixelBlue(p));
- *q++=0;
- p++;
- }
- }
- break;
- }
- for (y=0; y < (ssize_t) rows; y++)
- {
- p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- indexes=GetVirtualIndexQueue(image);
- for (x=0; x < (ssize_t) columns; x++)
- {
- for (i=0; i < (ssize_t) length; i++)
- {
- *q=0;
- switch (quantum_map[i])
- {
- case RedQuantum:
- case CyanQuantum:
- {
- *q=ScaleQuantumToLong(GetPixelRed(p));
- break;
- }
- case GreenQuantum:
- case MagentaQuantum:
- {
- *q=ScaleQuantumToLong(GetPixelGreen(p));
- break;
- }
- case BlueQuantum:
- case YellowQuantum:
- {
- *q=ScaleQuantumToLong(GetPixelBlue(p));
- break;
- }
- case AlphaQuantum:
- {
- *q=ScaleQuantumToLong((Quantum) (GetPixelAlpha(p)));
- break;
- }
- case OpacityQuantum:
- {
- *q=ScaleQuantumToLong(GetPixelOpacity(p));
- break;
- }
- case BlackQuantum:
- {
- if (image->colorspace == CMYKColorspace)
- *q=ScaleQuantumToLong(GetPixelIndex(indexes+x));
- break;
- }
- case IndexQuantum:
- {
- *q=ScaleQuantumToLong(PixelIntensityToQuantum(p));
- break;
- }
- default:
- break;
- }
- q++;
- }
- p++;
- }
- }
- break;
- }
- case QuantumPixel:
- {
- register Quantum
- *q;
-
- q=(Quantum *) pixels;
- if (LocaleCompare(map,"BGR") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- *q++=GetPixelBlue(p);
- *q++=GetPixelGreen(p);
- *q++=GetPixelRed(p);
- p++;
- }
- }
- break;
- }
- if (LocaleCompare(map,"BGRA") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- *q++=GetPixelBlue(p);
- *q++=GetPixelGreen(p);
- *q++=GetPixelRed(p);
- *q++=(Quantum) (GetPixelAlpha(p));
- p++;
- }
- }
- break;
- }
- if (LocaleCompare(map,"BGRP") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- *q++=GetPixelBlue(p);
- *q++=GetPixelGreen(p);
- *q++=GetPixelRed(p);
- *q++=(Quantum) 0;
- p++;
- }
- }
- break;
- }
- if (LocaleCompare(map,"I") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- *q++=PixelIntensityToQuantum(p);
- p++;
- }
- }
- break;
- }
- if (LocaleCompare(map,"RGB") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- *q++=GetPixelRed(p);
- *q++=GetPixelGreen(p);
- *q++=GetPixelBlue(p);
- p++;
- }
- }
- break;
- }
- if (LocaleCompare(map,"RGBA") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- *q++=GetPixelRed(p);
- *q++=GetPixelGreen(p);
- *q++=GetPixelBlue(p);
- *q++=(Quantum) (GetPixelAlpha(p));
- p++;
- }
- }
- break;
- }
- if (LocaleCompare(map,"RGBP") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- *q++=GetPixelRed(p);
- *q++=GetPixelGreen(p);
- *q++=GetPixelBlue(p);
- *q++=(Quantum) 0;
- p++;
- }
- }
- break;
- }
- for (y=0; y < (ssize_t) rows; y++)
- {
- p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- indexes=GetVirtualIndexQueue(image);
- for (x=0; x < (ssize_t) columns; x++)
- {
- for (i=0; i < (ssize_t) length; i++)
- {
- *q=(Quantum) 0;
- switch (quantum_map[i])
- {
- case RedQuantum:
- case CyanQuantum:
- {
- *q=GetPixelRed(p);
- break;
- }
- case GreenQuantum:
- case MagentaQuantum:
- {
- *q=GetPixelGreen(p);
- break;
- }
- case BlueQuantum:
- case YellowQuantum:
- {
- *q=GetPixelBlue(p);
- break;
- }
- case AlphaQuantum:
- {
- *q=(Quantum) (GetPixelAlpha(p));
- break;
- }
- case OpacityQuantum:
- {
- *q=GetPixelOpacity(p);
- break;
- }
- case BlackQuantum:
- {
- if (image->colorspace == CMYKColorspace)
- *q=GetPixelIndex(indexes+x);
- break;
- }
- case IndexQuantum:
- {
- *q=(PixelIntensityToQuantum(p));
- break;
- }
- default:
- *q=(Quantum) 0;
- }
- q++;
- }
- p++;
- }
- }
- break;
- }
- case ShortPixel:
- {
- register unsigned short
- *q;
-
- q=(unsigned short *) pixels;
- if (LocaleCompare(map,"BGR") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- *q++=ScaleQuantumToShort(GetPixelBlue(p));
- *q++=ScaleQuantumToShort(GetPixelGreen(p));
- *q++=ScaleQuantumToShort(GetPixelRed(p));
- p++;
- }
- }
- break;
- }
- if (LocaleCompare(map,"BGRA") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- *q++=ScaleQuantumToShort(GetPixelBlue(p));
- *q++=ScaleQuantumToShort(GetPixelGreen(p));
- *q++=ScaleQuantumToShort(GetPixelRed(p));
- *q++=ScaleQuantumToShort((Quantum) (GetPixelAlpha(p)));
- p++;
- }
- }
- break;
- }
- if (LocaleCompare(map,"BGRP") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- *q++=ScaleQuantumToShort(GetPixelBlue(p));
- *q++=ScaleQuantumToShort(GetPixelGreen(p));
- *q++=ScaleQuantumToShort(GetPixelRed(p));
- *q++=0;
- p++;
- }
- }
- break;
- }
- if (LocaleCompare(map,"I") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- *q++=ScaleQuantumToShort(PixelIntensityToQuantum(p));
- p++;
- }
- }
- break;
- }
- if (LocaleCompare(map,"RGB") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- *q++=ScaleQuantumToShort(GetPixelRed(p));
- *q++=ScaleQuantumToShort(GetPixelGreen(p));
- *q++=ScaleQuantumToShort(GetPixelBlue(p));
- p++;
- }
- }
- break;
- }
- if (LocaleCompare(map,"RGBA") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- *q++=ScaleQuantumToShort(GetPixelRed(p));
- *q++=ScaleQuantumToShort(GetPixelGreen(p));
- *q++=ScaleQuantumToShort(GetPixelBlue(p));
- *q++=ScaleQuantumToShort((Quantum) (GetPixelAlpha(p)));
- p++;
- }
- }
- break;
- }
- if (LocaleCompare(map,"RGBP") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- *q++=ScaleQuantumToShort(GetPixelRed(p));
- *q++=ScaleQuantumToShort(GetPixelGreen(p));
- *q++=ScaleQuantumToShort(GetPixelBlue(p));
- *q++=0;
- p++;
- }
- }
- break;
- }
- for (y=0; y < (ssize_t) rows; y++)
- {
- p=GetVirtualPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (p == (const PixelPacket *) NULL)
- break;
- indexes=GetVirtualIndexQueue(image);
- for (x=0; x < (ssize_t) columns; x++)
- {
- for (i=0; i < (ssize_t) length; i++)
- {
- *q=0;
- switch (quantum_map[i])
- {
- case RedQuantum:
- case CyanQuantum:
- {
- *q=ScaleQuantumToShort(GetPixelRed(p));
- break;
- }
- case GreenQuantum:
- case MagentaQuantum:
- {
- *q=ScaleQuantumToShort(GetPixelGreen(p));
- break;
- }
- case BlueQuantum:
- case YellowQuantum:
- {
- *q=ScaleQuantumToShort(GetPixelBlue(p));
- break;
- }
- case AlphaQuantum:
- {
- *q=ScaleQuantumToShort((Quantum) (GetPixelAlpha(p)));
- break;
- }
- case OpacityQuantum:
- {
- *q=ScaleQuantumToShort(GetPixelOpacity(p));
- break;
- }
- case BlackQuantum:
- {
- if (image->colorspace == CMYKColorspace)
- *q=ScaleQuantumToShort(GetPixelIndex(indexes+x));
- break;
- }
- case IndexQuantum:
- {
- *q=ScaleQuantumToShort(PixelIntensityToQuantum(p));
- break;
- }
- default:
- break;
- }
- q++;
- }
- p++;
- }
- }
- break;
- }
- default:
- {
- quantum_map=(QuantumType *) RelinquishMagickMemory(quantum_map);
- (void) ThrowMagickException(exception,GetMagickModule(),OptionError,
- "UnrecognizedPixelMap","`%s'",map);
- break;
- }
- }
- quantum_map=(QuantumType *) RelinquishMagickMemory(quantum_map);
- return(MagickTrue);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% G e t M a g i c k P i x e l P a c k e t %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% GetMagickPixelPacket() initializes the MagickPixelPacket structure.
-%
-% The format of the GetMagickPixelPacket method is:
-%
-% GetMagickPixelPacket(const Image *image,MagickPixelPacket *pixel)
-%
-% A description of each parameter follows:
-%
-% o image: the image.
-%
-% o pixel: Specifies a pointer to a PixelPacket structure.
-%
-*/
-MagickExport void GetMagickPixelPacket(const Image *image,
- MagickPixelPacket *pixel)
-{
- pixel->storage_class=DirectClass;
- pixel->colorspace=RGBColorspace;
- pixel->matte=MagickFalse;
- pixel->fuzz=0.0;
- pixel->depth=MAGICKCORE_QUANTUM_DEPTH;
- pixel->red=0.0;
- pixel->green=0.0;
- pixel->blue=0.0;
- pixel->opacity=(MagickRealType) OpaqueOpacity;
- pixel->index=0.0;
- if (image == (const Image *) NULL)
- return;
- pixel->storage_class=image->storage_class;
- pixel->colorspace=image->colorspace;
- pixel->matte=image->matte;
- pixel->depth=image->depth;
- pixel->fuzz=image->fuzz;
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% I m p o r t I m a g e P i x e l s %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% ImportImagePixels() accepts pixel data and stores in the image at the
-% location you specify. The method returns MagickTrue on success otherwise
-% MagickFalse if an error is encountered. The pixel data can be either char,
-% short int, int, ssize_t, float, or double in the order specified by map.
-%
-% Suppose your want to upload the first scanline of a 640x480 image from
-% character data in red-green-blue order:
-%
-% ImportImagePixels(image,0,0,640,1,"RGB",CharPixel,pixels);
-%
-% The format of the ImportImagePixels method is:
-%
-% MagickBooleanType ImportImagePixels(Image *image,const ssize_t x_offset,
-% const ssize_t y_offset,const size_t columns,
-% const size_t rows,const char *map,const StorageType type,
-% const void *pixels)
-%
-% A description of each parameter follows:
-%
-% o image: the image.
-%
-% o x_offset,y_offset,columns,rows: These values define the perimeter
-% of a region of pixels you want to define.
-%
-% o map: This string reflects the expected ordering of the pixel array.
-% It can be any combination or order of R = red, G = green, B = blue,
-% A = alpha (0 is transparent), O = opacity (0 is opaque), C = cyan,
-% Y = yellow, M = magenta, K = black, I = intensity (for grayscale),
-% P = pad.
-%
-% o type: Define the data type of the pixels. Float and double types are
-% normalized to [0..1] otherwise [0..QuantumRange]. Choose from these
-% types: CharPixel, ShortPixel, IntegerPixel, LongPixel, FloatPixel, or
-% DoublePixel.
-%
-% o pixels: This array of values contain the pixel components as defined by
-% map and type. You must preallocate this array where the expected
-% length varies depending on the values of width, height, map, and type.
-%
-*/
-MagickExport MagickBooleanType ImportImagePixels(Image *image,
- const ssize_t x_offset,const ssize_t y_offset,const size_t columns,
- const size_t rows,const char *map,const StorageType type,
- const void *pixels)
-{
- ExceptionInfo
- *exception;
-
- PixelPacket
- *q;
-
- QuantumType
- *quantum_map;
-
- register IndexPacket
- *indexes;
-
- register ssize_t
- i,
- x;
-
- size_t
- length;
-
- ssize_t
- y;
-
- /*
- Allocate image structure.
- */
- assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
- if (image->debug != MagickFalse)
- (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
- length=strlen(map);
- quantum_map=(QuantumType *) AcquireQuantumMemory(length,sizeof(*quantum_map));
- if (quantum_map == (QuantumType *) NULL)
- ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed",
- image->filename);
- for (i=0; i < (ssize_t) length; i++)
- {
- switch (map[i])
- {
- case 'a':
- case 'A':
- {
- quantum_map[i]=AlphaQuantum;
- image->matte=MagickTrue;
- break;
- }
- case 'B':
- case 'b':
- {
- quantum_map[i]=BlueQuantum;
- break;
- }
- case 'C':
- case 'c':
- {
- quantum_map[i]=CyanQuantum;
- (void) SetImageColorspace(image,CMYKColorspace);
- break;
- }
- case 'g':
- case 'G':
- {
- quantum_map[i]=GreenQuantum;
- break;
- }
- case 'K':
- case 'k':
- {
- quantum_map[i]=BlackQuantum;
- (void) SetImageColorspace(image,CMYKColorspace);
- break;
- }
- case 'I':
- case 'i':
- {
- quantum_map[i]=IndexQuantum;
- break;
- }
- case 'm':
- case 'M':
- {
- quantum_map[i]=MagentaQuantum;
- (void) SetImageColorspace(image,CMYKColorspace);
- break;
- }
- case 'O':
- case 'o':
- {
- quantum_map[i]=OpacityQuantum;
- image->matte=MagickTrue;
- break;
- }
- case 'P':
- case 'p':
- {
- quantum_map[i]=UndefinedQuantum;
- break;
- }
- case 'R':
- case 'r':
- {
- quantum_map[i]=RedQuantum;
- break;
- }
- case 'Y':
- case 'y':
- {
- quantum_map[i]=YellowQuantum;
- (void) SetImageColorspace(image,CMYKColorspace);
- break;
- }
- default:
- {
- quantum_map=(QuantumType *) RelinquishMagickMemory(quantum_map);
- (void) ThrowMagickException(&image->exception,GetMagickModule(),
- OptionError,"UnrecognizedPixelMap","`%s'",map);
- return(MagickFalse);
- }
- }
- }
- if (SetImageStorageClass(image,DirectClass) == MagickFalse)
- return(MagickFalse);
- /*
- Transfer the pixels from the pixel datarray to the image.
- */
- exception=(&image->exception);
- switch (type)
- {
- case CharPixel:
- {
- register const unsigned char
- *p;
-
- p=(const unsigned char *) pixels;
- if (LocaleCompare(map,"BGR") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (q == (PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- SetPixelBlue(q,ScaleCharToQuantum(*p++));
- SetPixelGreen(q,ScaleCharToQuantum(*p++));
- SetPixelRed(q,ScaleCharToQuantum(*p++));
- q++;
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- }
- break;
- }
- if (LocaleCompare(map,"BGRA") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (q == (PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- SetPixelBlue(q,ScaleCharToQuantum(*p++));
- SetPixelGreen(q,ScaleCharToQuantum(*p++));
- SetPixelRed(q,ScaleCharToQuantum(*p++));
- SetPixelAlpha(q,ScaleCharToQuantum(*p++));
- q++;
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- }
- break;
- }
- if (LocaleCompare(map,"BGRO") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (q == (PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- SetPixelBlue(q,ScaleCharToQuantum(*p++));
- SetPixelGreen(q,ScaleCharToQuantum(*p++));
- SetPixelRed(q,ScaleCharToQuantum(*p++));
- SetPixelOpacity(q,ScaleCharToQuantum(*p++));
- q++;
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- }
- break;
- }
- if (LocaleCompare(map,"BGRP") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (q == (PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- SetPixelBlue(q,ScaleCharToQuantum(*p++));
- SetPixelGreen(q,ScaleCharToQuantum(*p++));
- SetPixelRed(q,ScaleCharToQuantum(*p++));
- p++;
- q++;
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- }
- break;
- }
- if (LocaleCompare(map,"I") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (q == (PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- SetPixelRed(q,ScaleCharToQuantum(*p++));
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- q++;
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- }
- break;
- }
- if (LocaleCompare(map,"RGB") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (q == (PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- SetPixelRed(q,ScaleCharToQuantum(*p++));
- SetPixelGreen(q,ScaleCharToQuantum(*p++));
- SetPixelBlue(q,ScaleCharToQuantum(*p++));
- q++;
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- }
- break;
- }
- if (LocaleCompare(map,"RGBA") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (q == (PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- SetPixelRed(q,ScaleCharToQuantum(*p++));
- SetPixelGreen(q,ScaleCharToQuantum(*p++));
- SetPixelBlue(q,ScaleCharToQuantum(*p++));
- SetPixelAlpha(q,ScaleCharToQuantum(*p++));
- q++;
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- }
- break;
- }
- if (LocaleCompare(map,"RGBO") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (q == (PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- SetPixelRed(q,ScaleCharToQuantum(*p++));
- SetPixelGreen(q,ScaleCharToQuantum(*p++));
- SetPixelBlue(q,ScaleCharToQuantum(*p++));
- SetPixelOpacity(q,ScaleCharToQuantum(*p++));
- q++;
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- }
- break;
- }
- if (LocaleCompare(map,"RGBP") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (q == (PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- SetPixelRed(q,ScaleCharToQuantum(*p++));
- SetPixelGreen(q,ScaleCharToQuantum(*p++));
- SetPixelBlue(q,ScaleCharToQuantum(*p++));
- p++;
- q++;
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- }
- break;
- }
- for (y=0; y < (ssize_t) rows; y++)
- {
- q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (q == (PixelPacket *) NULL)
- break;
- indexes=GetAuthenticIndexQueue(image);
- for (x=0; x < (ssize_t) columns; x++)
- {
- for (i=0; i < (ssize_t) length; i++)
- {
- switch (quantum_map[i])
- {
- case RedQuantum:
- case CyanQuantum:
- {
- SetPixelRed(q,ScaleCharToQuantum(*p));
- break;
- }
- case GreenQuantum:
- case MagentaQuantum:
- {
- SetPixelGreen(q,ScaleCharToQuantum(*p));
- break;
- }
- case BlueQuantum:
- case YellowQuantum:
- {
- SetPixelBlue(q,ScaleCharToQuantum(*p));
- break;
- }
- case AlphaQuantum:
- {
- SetPixelAlpha(q,ScaleCharToQuantum(*p));
- break;
- }
- case OpacityQuantum:
- {
- SetPixelOpacity(q,ScaleCharToQuantum(*p));
- break;
- }
- case BlackQuantum:
- {
- SetPixelIndex(indexes+x,ScaleCharToQuantum(*p));
- break;
- }
- case IndexQuantum:
- {
- SetPixelRed(q,ScaleCharToQuantum(*p));
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- break;
- }
- default:
- break;
- }
- p++;
- }
- q++;
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- }
- break;
- }
- case DoublePixel:
- {
- register const double
- *p;
-
- p=(const double *) pixels;
- if (LocaleCompare(map,"BGR") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (q == (PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- SetPixelBlue(q,ClampToQuantum((MagickRealType)
- QuantumRange*(*p)));
- p++;
- SetPixelGreen(q,ClampToQuantum((MagickRealType)
- QuantumRange*(*p)));
- p++;
- SetPixelRed(q,ClampToQuantum((MagickRealType)
- QuantumRange*(*p)));
- p++;
- q++;
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- }
- break;
- }
- if (LocaleCompare(map,"BGRA") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (q == (PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- SetPixelBlue(q,ClampToQuantum((MagickRealType)
- QuantumRange*(*p)));
- p++;
- SetPixelGreen(q,ClampToQuantum((MagickRealType)
- QuantumRange*(*p)));
- p++;
- SetPixelRed(q,ClampToQuantum((MagickRealType)
- QuantumRange*(*p)));
- p++;
- q->opacity=(Quantum) QuantumRange-ClampToQuantum((MagickRealType)
- QuantumRange*(*p));
- p++;
- q++;
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- }
- break;
- }
- if (LocaleCompare(map,"BGRP") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (q == (PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- SetPixelBlue(q,ClampToQuantum((MagickRealType)
- QuantumRange*(*p)));
- p++;
- SetPixelGreen(q,ClampToQuantum((MagickRealType)
- QuantumRange*(*p)));
- p++;
- SetPixelRed(q,ClampToQuantum((MagickRealType)
- QuantumRange*(*p)));
- p++;
- p++;
- q++;
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- }
- break;
- }
- if (LocaleCompare(map,"I") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (q == (PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- SetPixelRed(q,ClampToQuantum((MagickRealType)
- QuantumRange*(*p)));
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- p++;
- q++;
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- }
- break;
- }
- if (LocaleCompare(map,"RGB") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (q == (PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- SetPixelRed(q,ClampToQuantum((MagickRealType)
- QuantumRange*(*p)));
- p++;
- SetPixelGreen(q,ClampToQuantum((MagickRealType) QuantumRange*(*p)));
- p++;
- SetPixelBlue(q,ClampToQuantum((MagickRealType) QuantumRange*(*p)));
- p++;
- q++;
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- }
- break;
- }
- if (LocaleCompare(map,"RGBA") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (q == (PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- SetPixelRed(q,ClampToQuantum((MagickRealType)
- QuantumRange*(*p)));
- p++;
- SetPixelGreen(q,ClampToQuantum((MagickRealType)
- QuantumRange*(*p)));
- p++;
- SetPixelBlue(q,ClampToQuantum((MagickRealType)
- QuantumRange*(*p)));
- p++;
- SetPixelAlpha(q,ClampToQuantum((MagickRealType)
- QuantumRange*(*p)));
- p++;
- q++;
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- }
- break;
- }
- if (LocaleCompare(map,"RGBP") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (q == (PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- SetPixelRed(q,ClampToQuantum((MagickRealType)
- QuantumRange*(*p)));
- p++;
- SetPixelGreen(q,ClampToQuantum((MagickRealType)
- QuantumRange*(*p)));
- p++;
- SetPixelBlue(q,ClampToQuantum((MagickRealType)
- QuantumRange*(*p)));
- p++;
- q++;
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- }
- break;
- }
- for (y=0; y < (ssize_t) rows; y++)
- {
- q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (q == (PixelPacket *) NULL)
- break;
- indexes=GetAuthenticIndexQueue(image);
- for (x=0; x < (ssize_t) columns; x++)
- {
- for (i=0; i < (ssize_t) length; i++)
- {
- switch (quantum_map[i])
- {
- case RedQuantum:
- case CyanQuantum:
- {
- SetPixelRed(q,ClampToQuantum((MagickRealType)
- QuantumRange*(*p)));
- break;
- }
- case GreenQuantum:
- case MagentaQuantum:
- {
- SetPixelGreen(q,ClampToQuantum((MagickRealType)
- QuantumRange*(*p)));
- break;
- }
- case BlueQuantum:
- case YellowQuantum:
- {
- SetPixelBlue(q,ClampToQuantum((MagickRealType)
- QuantumRange*(*p)));
- break;
- }
- case AlphaQuantum:
- {
- SetPixelAlpha(q,ClampToQuantum((MagickRealType)
- QuantumRange*(*p)));
- break;
- }
- case OpacityQuantum:
- {
- SetPixelOpacity(q,ClampToQuantum((MagickRealType)
- QuantumRange*(*p)));
- break;
- }
- case BlackQuantum:
- {
- SetPixelIndex(indexes+x,ClampToQuantum(
- (MagickRealType) QuantumRange*(*p)));
- break;
- }
- case IndexQuantum:
- {
- SetPixelRed(q,ClampToQuantum((MagickRealType)
- QuantumRange*(*p)));
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- break;
- }
- default:
- break;
- }
- p++;
- }
- q++;
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- }
- break;
- }
- case FloatPixel:
- {
- register const float
- *p;
-
- p=(const float *) pixels;
- if (LocaleCompare(map,"BGR") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (q == (PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- SetPixelBlue(q,ClampToQuantum((MagickRealType)
- QuantumRange*(*p)));
- p++;
- SetPixelGreen(q,ClampToQuantum((MagickRealType)
- QuantumRange*(*p)));
- p++;
- SetPixelRed(q,ClampToQuantum((MagickRealType)
- QuantumRange*(*p)));
- p++;
- q++;
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- }
- break;
- }
- if (LocaleCompare(map,"BGRA") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (q == (PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- SetPixelBlue(q,ClampToQuantum((MagickRealType)
- QuantumRange*(*p)));
- p++;
- SetPixelGreen(q,ClampToQuantum((MagickRealType)
- QuantumRange*(*p)));
- p++;
- SetPixelRed(q,ClampToQuantum((MagickRealType)
- QuantumRange*(*p)));
- p++;
- SetPixelAlpha(q,ClampToQuantum((MagickRealType)
- QuantumRange*(*p)));
- p++;
- q++;
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- }
- break;
- }
- if (LocaleCompare(map,"BGRP") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (q == (PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- SetPixelBlue(q,ClampToQuantum((MagickRealType)
- QuantumRange*(*p)));
- p++;
- SetPixelGreen(q,ClampToQuantum((MagickRealType)
- QuantumRange*(*p)));
- p++;
- SetPixelRed(q,ClampToQuantum((MagickRealType)
- QuantumRange*(*p)));
- p++;
- p++;
- q++;
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- }
- break;
- }
- if (LocaleCompare(map,"I") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (q == (PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- SetPixelRed(q,ClampToQuantum((MagickRealType)
- QuantumRange*(*p)));
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- p++;
- q++;
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- }
- break;
- }
- if (LocaleCompare(map,"RGB") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (q == (PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- SetPixelRed(q,ClampToQuantum((MagickRealType)
- QuantumRange*(*p)));
- p++;
- SetPixelGreen(q,ClampToQuantum((MagickRealType)
- QuantumRange*(*p)));
- p++;
- SetPixelBlue(q,ClampToQuantum((MagickRealType)
- QuantumRange*(*p)));
- p++;
- q++;
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- }
- break;
- }
- if (LocaleCompare(map,"RGBA") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (q == (PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- SetPixelRed(q,ClampToQuantum((MagickRealType)
- QuantumRange*(*p)));
- p++;
- SetPixelGreen(q,ClampToQuantum((MagickRealType)
- QuantumRange*(*p)));
- p++;
- SetPixelBlue(q,ClampToQuantum((MagickRealType)
- QuantumRange*(*p)));
- p++;
- SetPixelAlpha(q,ClampToQuantum((MagickRealType)
- QuantumRange*(*p)));
- p++;
- q++;
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- }
- break;
- }
- if (LocaleCompare(map,"RGBP") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (q == (PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- SetPixelRed(q,ClampToQuantum((MagickRealType)
- QuantumRange*(*p)));
- p++;
- SetPixelGreen(q,ClampToQuantum((MagickRealType)
- QuantumRange*(*p)));
- p++;
- SetPixelBlue(q,ClampToQuantum((MagickRealType)
- QuantumRange*(*p)));
- p++;
- q++;
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- }
- break;
- }
- for (y=0; y < (ssize_t) rows; y++)
- {
- q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (q == (PixelPacket *) NULL)
- break;
- indexes=GetAuthenticIndexQueue(image);
- for (x=0; x < (ssize_t) columns; x++)
- {
- for (i=0; i < (ssize_t) length; i++)
- {
- switch (quantum_map[i])
- {
- case RedQuantum:
- case CyanQuantum:
- {
- SetPixelRed(q,ClampToQuantum((MagickRealType)
- QuantumRange*(*p)));
- break;
- }
- case GreenQuantum:
- case MagentaQuantum:
- {
- SetPixelGreen(q,ClampToQuantum((MagickRealType)
- QuantumRange*(*p)));
- break;
- }
- case BlueQuantum:
- case YellowQuantum:
- {
- SetPixelBlue(q,ClampToQuantum((MagickRealType)
- QuantumRange*(*p)));
- break;
- }
- case AlphaQuantum:
- {
- SetPixelAlpha(q,ClampToQuantum((MagickRealType)
- QuantumRange*(*p)));
- break;
- }
- case OpacityQuantum:
- {
- SetPixelOpacity(q,ClampToQuantum((MagickRealType)
- QuantumRange*(*p)));
- break;
- }
- case BlackQuantum:
- {
- SetPixelIndex(indexes+x,ClampToQuantum(
- (MagickRealType) QuantumRange*(*p)));
- break;
- }
- case IndexQuantum:
- {
- SetPixelRed(q,ClampToQuantum((MagickRealType)
- QuantumRange*(*p)));
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- break;
- }
- default:
- break;
- }
- p++;
- }
- q++;
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- }
- break;
- }
- case IntegerPixel:
- {
- register const unsigned int
- *p;
-
- p=(const unsigned int *) pixels;
- if (LocaleCompare(map,"BGR") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (q == (PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- SetPixelBlue(q,ScaleLongToQuantum(*p++));
- SetPixelGreen(q,ScaleLongToQuantum(*p++));
- SetPixelRed(q,ScaleLongToQuantum(*p++));
- q++;
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- }
- break;
- }
- if (LocaleCompare(map,"BGRA") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (q == (PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- SetPixelBlue(q,ScaleLongToQuantum(*p++));
- SetPixelGreen(q,ScaleLongToQuantum(*p++));
- SetPixelRed(q,ScaleLongToQuantum(*p++));
- SetPixelAlpha(q,ScaleLongToQuantum(*p++));
- q++;
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- }
- break;
- }
- if (LocaleCompare(map,"BGRP") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (q == (PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- SetPixelBlue(q,ScaleLongToQuantum(*p++));
- SetPixelGreen(q,ScaleLongToQuantum(*p++));
- SetPixelRed(q,ScaleLongToQuantum(*p++));
- p++;
- q++;
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- }
- break;
- }
- if (LocaleCompare(map,"I") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (q == (PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- SetPixelRed(q,ScaleLongToQuantum(*p++));
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- q++;
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- }
- break;
- }
- if (LocaleCompare(map,"RGB") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (q == (PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- SetPixelRed(q,ScaleLongToQuantum(*p++));
- SetPixelGreen(q,ScaleLongToQuantum(*p++));
- SetPixelBlue(q,ScaleLongToQuantum(*p++));
- q++;
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- }
- break;
- }
- if (LocaleCompare(map,"RGBA") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (q == (PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- SetPixelRed(q,ScaleLongToQuantum(*p++));
- SetPixelGreen(q,ScaleLongToQuantum(*p++));
- SetPixelBlue(q,ScaleLongToQuantum(*p++));
- SetPixelAlpha(q,ScaleLongToQuantum(*p++));
- q++;
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- }
- break;
- }
- if (LocaleCompare(map,"RGBP") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (q == (PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- SetPixelRed(q,ScaleLongToQuantum(*p++));
- SetPixelGreen(q,ScaleLongToQuantum(*p++));
- SetPixelBlue(q,ScaleLongToQuantum(*p++));
- p++;
- q++;
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- }
- break;
- }
- for (y=0; y < (ssize_t) rows; y++)
- {
- q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (q == (PixelPacket *) NULL)
- break;
- indexes=GetAuthenticIndexQueue(image);
- for (x=0; x < (ssize_t) columns; x++)
- {
- for (i=0; i < (ssize_t) length; i++)
- {
- switch (quantum_map[i])
- {
- case RedQuantum:
- case CyanQuantum:
- {
- SetPixelRed(q,ScaleLongToQuantum(*p));
- break;
- }
- case GreenQuantum:
- case MagentaQuantum:
- {
- SetPixelGreen(q,ScaleLongToQuantum(*p));
- break;
- }
- case BlueQuantum:
- case YellowQuantum:
- {
- SetPixelBlue(q,ScaleLongToQuantum(*p));
- break;
- }
- case AlphaQuantum:
- {
- SetPixelAlpha(q,ScaleLongToQuantum(*p));
- break;
- }
- case OpacityQuantum:
- {
- SetPixelOpacity(q,ScaleLongToQuantum(*p));
- break;
- }
- case BlackQuantum:
- {
- SetPixelIndex(indexes+x,ScaleLongToQuantum(*p));
- break;
- }
- case IndexQuantum:
- {
- SetPixelRed(q,ScaleLongToQuantum(*p));
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- break;
- }
- default:
- break;
- }
- p++;
- }
- q++;
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- }
- break;
- }
- case LongPixel:
- {
- register const unsigned int
- *p;
-
- p=(const unsigned int *) pixels;
- if (LocaleCompare(map,"BGR") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (q == (PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- SetPixelBlue(q,ScaleLongToQuantum(*p++));
- SetPixelGreen(q,ScaleLongToQuantum(*p++));
- SetPixelRed(q,ScaleLongToQuantum(*p++));
- q++;
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- }
- break;
- }
- if (LocaleCompare(map,"BGRA") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (q == (PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- SetPixelBlue(q,ScaleLongToQuantum(*p++));
- SetPixelGreen(q,ScaleLongToQuantum(*p++));
- SetPixelRed(q,ScaleLongToQuantum(*p++));
- SetPixelAlpha(q,ScaleLongToQuantum(*p++));
- q++;
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- }
- break;
- }
- if (LocaleCompare(map,"BGRP") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (q == (PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- SetPixelBlue(q,ScaleLongToQuantum(*p++));
- SetPixelGreen(q,ScaleLongToQuantum(*p++));
- SetPixelRed(q,ScaleLongToQuantum(*p++));
- p++;
- q++;
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- }
- break;
- }
- if (LocaleCompare(map,"I") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (q == (PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- SetPixelRed(q,ScaleLongToQuantum(*p++));
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- q++;
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- }
- break;
- }
- if (LocaleCompare(map,"RGB") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (q == (PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- SetPixelRed(q,ScaleLongToQuantum(*p++));
- SetPixelGreen(q,ScaleLongToQuantum(*p++));
- SetPixelBlue(q,ScaleLongToQuantum(*p++));
- q++;
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- }
- break;
- }
- if (LocaleCompare(map,"RGBA") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (q == (PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- SetPixelRed(q,ScaleLongToQuantum(*p++));
- SetPixelGreen(q,ScaleLongToQuantum(*p++));
- SetPixelBlue(q,ScaleLongToQuantum(*p++));
- SetPixelAlpha(q,ScaleLongToQuantum(*p++));
- q++;
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- }
- break;
- }
- if (LocaleCompare(map,"RGBP") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (q == (PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- SetPixelRed(q,ScaleLongToQuantum(*p++));
- SetPixelGreen(q,ScaleLongToQuantum(*p++));
- SetPixelBlue(q,ScaleLongToQuantum(*p++));
- p++;
- q++;
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- }
- break;
- }
- for (y=0; y < (ssize_t) rows; y++)
- {
- q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (q == (PixelPacket *) NULL)
- break;
- indexes=GetAuthenticIndexQueue(image);
- for (x=0; x < (ssize_t) columns; x++)
- {
- for (i=0; i < (ssize_t) length; i++)
- {
- switch (quantum_map[i])
- {
- case RedQuantum:
- case CyanQuantum:
- {
- SetPixelRed(q,ScaleLongToQuantum(*p));
- break;
- }
- case GreenQuantum:
- case MagentaQuantum:
- {
- SetPixelGreen(q,ScaleLongToQuantum(*p));
- break;
- }
- case BlueQuantum:
- case YellowQuantum:
- {
- SetPixelBlue(q,ScaleLongToQuantum(*p));
- break;
- }
- case AlphaQuantum:
- {
- SetPixelAlpha(q,ScaleLongToQuantum(*p));
- break;
- }
- case OpacityQuantum:
- {
- SetPixelOpacity(q,ScaleLongToQuantum(*p));
- break;
- }
- case BlackQuantum:
- {
- SetPixelIndex(indexes+x,ScaleLongToQuantum(*p));
- break;
- }
- case IndexQuantum:
- {
- SetPixelRed(q,ScaleLongToQuantum(*p));
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- break;
- }
- default:
- break;
- }
- p++;
- }
- q++;
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- }
- break;
- }
- case QuantumPixel:
- {
- register const Quantum
- *p;
-
- p=(const Quantum *) pixels;
- if (LocaleCompare(map,"BGR") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (q == (PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- SetPixelBlue(q,*p++);
- SetPixelGreen(q,*p++);
- SetPixelRed(q,*p++);
- q++;
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- }
- break;
- }
- if (LocaleCompare(map,"BGRA") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (q == (PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- SetPixelBlue(q,*p++);
- SetPixelGreen(q,*p++);
- SetPixelRed(q,*p++);
- SetPixelAlpha(q,*p++);
- q++;
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- }
- break;
- }
- if (LocaleCompare(map,"BGRP") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (q == (PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- SetPixelBlue(q,*p++);
- SetPixelGreen(q,*p++);
- SetPixelRed(q,*p++);
- p++;
- q++;
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- }
- break;
- }
- if (LocaleCompare(map,"I") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (q == (PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- SetPixelRed(q,*p++);
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- q++;
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- }
- break;
- }
- if (LocaleCompare(map,"RGB") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (q == (PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- SetPixelRed(q,*p++);
- SetPixelGreen(q,*p++);
- SetPixelBlue(q,*p++);
- q++;
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- }
- break;
- }
- if (LocaleCompare(map,"RGBA") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (q == (PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- SetPixelRed(q,*p++);
- SetPixelGreen(q,*p++);
- SetPixelBlue(q,*p++);
- SetPixelAlpha(q,*p++);
- q++;
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- }
- break;
- }
- if (LocaleCompare(map,"RGBP") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (q == (PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- SetPixelRed(q,*p++);
- SetPixelGreen(q,*p++);
- SetPixelBlue(q,*p++);
- p++;
- q++;
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- }
- break;
- }
- for (y=0; y < (ssize_t) rows; y++)
- {
- q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (q == (PixelPacket *) NULL)
- break;
- indexes=GetAuthenticIndexQueue(image);
- for (x=0; x < (ssize_t) columns; x++)
- {
- for (i=0; i < (ssize_t) length; i++)
- {
- switch (quantum_map[i])
- {
- case RedQuantum:
- case CyanQuantum:
- {
- SetPixelRed(q,*p);
- break;
- }
- case GreenQuantum:
- case MagentaQuantum:
- {
- SetPixelGreen(q,*p);
- break;
- }
- case BlueQuantum:
- case YellowQuantum:
- {
- SetPixelBlue(q,*p);
- break;
- }
- case AlphaQuantum:
- {
- SetPixelAlpha(q,*p);
- break;
- }
- case OpacityQuantum:
- {
- SetPixelOpacity(q,*p);
- break;
- }
- case BlackQuantum:
- {
- SetPixelIndex(indexes+x,*p);
- break;
- }
- case IndexQuantum:
- {
- SetPixelRed(q,*p);
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- break;
- }
- default:
- break;
- }
- p++;
- }
- q++;
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- }
- break;
- }
- case ShortPixel:
- {
- register const unsigned short
- *p;
-
- p=(const unsigned short *) pixels;
- if (LocaleCompare(map,"BGR") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (q == (PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- SetPixelBlue(q,ScaleShortToQuantum(*p++));
- SetPixelGreen(q,ScaleShortToQuantum(*p++));
- SetPixelRed(q,ScaleShortToQuantum(*p++));
- q++;
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- }
- break;
- }
- if (LocaleCompare(map,"BGRA") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (q == (PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- SetPixelBlue(q,ScaleShortToQuantum(*p++));
- SetPixelGreen(q,ScaleShortToQuantum(*p++));
- SetPixelRed(q,ScaleShortToQuantum(*p++));
- SetPixelAlpha(q,ScaleShortToQuantum(*p++));
- q++;
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- }
- break;
- }
- if (LocaleCompare(map,"BGRP") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (q == (PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- SetPixelBlue(q,ScaleShortToQuantum(*p++));
- SetPixelGreen(q,ScaleShortToQuantum(*p++));
- SetPixelRed(q,ScaleShortToQuantum(*p++));
- p++;
- q++;
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- }
- break;
- }
- if (LocaleCompare(map,"I") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (q == (PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- SetPixelRed(q,ScaleShortToQuantum(*p++));
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- q++;
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- }
- break;
- }
- if (LocaleCompare(map,"RGB") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (q == (PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- SetPixelRed(q,ScaleShortToQuantum(*p++));
- SetPixelGreen(q,ScaleShortToQuantum(*p++));
- SetPixelBlue(q,ScaleShortToQuantum(*p++));
- q++;
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- }
- break;
- }
- if (LocaleCompare(map,"RGBA") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (q == (PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- SetPixelRed(q,ScaleShortToQuantum(*p++));
- SetPixelGreen(q,ScaleShortToQuantum(*p++));
- SetPixelBlue(q,ScaleShortToQuantum(*p++));
- SetPixelAlpha(q,ScaleShortToQuantum(*p++));
- q++;
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- }
- break;
- }
- if (LocaleCompare(map,"RGBP") == 0)
- {
- for (y=0; y < (ssize_t) rows; y++)
- {
- q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (q == (PixelPacket *) NULL)
- break;
- for (x=0; x < (ssize_t) columns; x++)
- {
- SetPixelRed(q,ScaleShortToQuantum(*p++));
- SetPixelGreen(q,ScaleShortToQuantum(*p++));
- SetPixelBlue(q,ScaleShortToQuantum(*p++));
- p++;
- q++;
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- }
- break;
- }
- for (y=0; y < (ssize_t) rows; y++)
- {
- q=GetAuthenticPixels(image,x_offset,y_offset+y,columns,1,exception);
- if (q == (PixelPacket *) NULL)
- break;
- indexes=GetAuthenticIndexQueue(image);
- for (x=0; x < (ssize_t) columns; x++)
- {
- for (i=0; i < (ssize_t) length; i++)
- {
- switch (quantum_map[i])
- {
- case RedQuantum:
- case CyanQuantum:
- {
- SetPixelRed(q,ScaleShortToQuantum(*p));
- break;
- }
- case GreenQuantum:
- case MagentaQuantum:
- {
- SetPixelGreen(q,ScaleShortToQuantum(*p));
- break;
- }
- case BlueQuantum:
- case YellowQuantum:
- {
- SetPixelBlue(q,ScaleShortToQuantum(*p));
- break;
- }
- case AlphaQuantum:
- {
- SetPixelAlpha(q,ScaleShortToQuantum(*p));
- break;
- }
- case OpacityQuantum:
- {
- SetPixelOpacity(q,ScaleShortToQuantum(*p));
- break;
- }
- case BlackQuantum:
- {
- SetPixelIndex(indexes+x,ScaleShortToQuantum(*p));
- break;
- }
- case IndexQuantum:
- {
- SetPixelRed(q,ScaleShortToQuantum(*p));
- SetPixelGreen(q,GetPixelRed(q));
- SetPixelBlue(q,GetPixelRed(q));
- break;
- }
- default:
- break;
- }
- p++;
- }
- q++;
- }
- if (SyncAuthenticPixels(image,exception) == MagickFalse)
- break;
- }
- break;
- }
- default:
- {
- quantum_map=(QuantumType *) RelinquishMagickMemory(quantum_map);
- (void) ThrowMagickException(&image->exception,GetMagickModule(),
- OptionError,"UnrecognizedPixelMap","`%s'",map);
- break;
- }
- }
- quantum_map=(QuantumType *) RelinquishMagickMemory(quantum_map);
- return(MagickTrue);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% I n t e r p o l a t e M a g i c k P i x e l P a c k e t %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% InterpolateMagickPixelPacket() applies bi-linear or tri-linear interpolation
-% between a floating point coordinate and the pixels surrounding that
-% coordinate. No pixel area resampling, or scaling of the result is
-% performed.
-%
-% The format of the InterpolateMagickPixelPacket method is:
-%
-% MagickBooleanType InterpolateMagickPixelPacket(const Image *image,
-% const CacheView *image_view,const InterpolatePixelMethod method,
-% const double x,const double y,MagickPixelPacket *pixel,
-% ExceptionInfo *exception)
-%
-% A description of each parameter follows:
-%
-% o image: the image.
-%
-% o image_view: the image view.
-%
-% o method: the pixel color interpolation method.
-%
-% o x,y: A double representing the current (x,y) position of the pixel.
-%
-% o pixel: return the interpolated pixel here.
-%
-% o exception: return any errors or warnings in this structure.
-%
-*/
-
-static inline void AlphaBlendMagickPixelPacket(const Image *image,
- const PixelPacket *color,const IndexPacket *indexes,MagickPixelPacket *pixel,
- MagickRealType *alpha)
-{
- if (image->matte == MagickFalse)
- {
- *alpha=1.0;
- pixel->red=(MagickRealType) GetPixelRed(color);
- pixel->green=(MagickRealType) GetPixelGreen(color);
- pixel->blue=(MagickRealType) GetPixelBlue(color);
- pixel->opacity=(MagickRealType) GetPixelOpacity(color);
- pixel->index=0.0;
- if (((image->colorspace == CMYKColorspace) ||
- (image->storage_class == PseudoClass)) &&
- (indexes != (const IndexPacket *) NULL))
- pixel->index=(MagickRealType) GetPixelIndex(indexes);
- return;
- }
- *alpha=QuantumScale*GetPixelAlpha(color);
- pixel->red=(*alpha*GetPixelRed(color));
- pixel->green=(*alpha*GetPixelGreen(color));
- pixel->blue=(*alpha*GetPixelBlue(color));
- pixel->opacity=(MagickRealType) GetPixelOpacity(color);
- pixel->index=0.0;
- if (((image->colorspace == CMYKColorspace) ||
- (image->storage_class == PseudoClass)) &&
- (indexes != (const IndexPacket *) NULL))
- pixel->index=(*alpha*GetPixelIndex(indexes));
-}
-
-static void BicubicInterpolate(const MagickPixelPacket *pixels,const double dx,
- MagickPixelPacket *pixel)
-{
- MagickRealType
- dx2,
- p,
- q,
- r,
- s;
-
- dx2=dx*dx;
- p=(pixels[3].red-pixels[2].red)-(pixels[0].red-pixels[1].red);
- q=(pixels[0].red-pixels[1].red)-p;
- r=pixels[2].red-pixels[0].red;
- s=pixels[1].red;
- pixel->red=(dx*dx2*p)+(dx2*q)+(dx*r)+s;
- p=(pixels[3].green-pixels[2].green)-(pixels[0].green-pixels[1].green);
- q=(pixels[0].green-pixels[1].green)-p;
- r=pixels[2].green-pixels[0].green;
- s=pixels[1].green;
- pixel->green=(dx*dx2*p)+(dx2*q)+(dx*r)+s;
- p=(pixels[3].blue-pixels[2].blue)-(pixels[0].blue-pixels[1].blue);
- q=(pixels[0].blue-pixels[1].blue)-p;
- r=pixels[2].blue-pixels[0].blue;
- s=pixels[1].blue;
- pixel->blue=(dx*dx2*p)+(dx2*q)+(dx*r)+s;
- p=(pixels[3].opacity-pixels[2].opacity)-(pixels[0].opacity-pixels[1].opacity);
- q=(pixels[0].opacity-pixels[1].opacity)-p;
- r=pixels[2].opacity-pixels[0].opacity;
- s=pixels[1].opacity;
- pixel->opacity=(dx*dx2*p)+(dx2*q)+(dx*r)+s;
- if (pixel->colorspace == CMYKColorspace)
- {
- p=(pixels[3].index-pixels[2].index)-(pixels[0].index-pixels[1].index);
- q=(pixels[0].index-pixels[1].index)-p;
- r=pixels[2].index-pixels[0].index;
- s=pixels[1].index;
- pixel->index=(dx*dx2*p)+(dx2*q)+(dx*r)+s;
- }
-}
-
-static inline double MagickMax(const MagickRealType x,const MagickRealType y)
-{
- if (x > y)
- return(x);
- return(y);
-}
-
-static inline MagickRealType CubicWeightingFunction(const MagickRealType x)
-{
- MagickRealType
- alpha,
- gamma;
-
- alpha=MagickMax(x+2.0,0.0);
- gamma=1.0*alpha*alpha*alpha;
- alpha=MagickMax(x+1.0,0.0);
- gamma-=4.0*alpha*alpha*alpha;
- alpha=MagickMax(x+0.0,0.0);
- gamma+=6.0*alpha*alpha*alpha;
- alpha=MagickMax(x-1.0,0.0);
- gamma-=4.0*alpha*alpha*alpha;
- return(gamma/6.0);
-}
-
-static inline double MeshInterpolate(const PointInfo *delta,const double p,
- const double x,const double y)
-{
- return(delta->x*x+delta->y*y+(1.0-delta->x-delta->y)*p);
-}
-
-static inline ssize_t NearestNeighbor(const MagickRealType x)
-{
- if (x >= 0.0)
- return((ssize_t) (x+0.5));
- return((ssize_t) (x-0.5));
-}
-
-MagickExport MagickBooleanType InterpolateMagickPixelPacket(const Image *image,
- const CacheView *image_view,const InterpolatePixelMethod method,
- const double x,const double y,MagickPixelPacket *pixel,
- ExceptionInfo *exception)
-{
- MagickBooleanType
- status;
-
- MagickPixelPacket
- pixels[16];
-
- MagickRealType
- alpha[16],
- gamma;
-
- register const IndexPacket
- *indexes;
-
- register const PixelPacket
- *p;
-
- register ssize_t
- i;
-
- ssize_t
- x_offset,
- y_offset;
-
- assert(image != (Image *) NULL);
- assert(image->signature == MagickSignature);
- assert(image_view != (CacheView *) NULL);
- status=MagickTrue;
- x_offset=(ssize_t) floor(x);
- y_offset=(ssize_t) floor(y);
- switch (method == UndefinedInterpolatePixel ? image->interpolate : method)
- {
- case AverageInterpolatePixel:
- {
- p=GetCacheViewVirtualPixels(image_view,x_offset-1,y_offset-1,4,4,
- exception);
- if (p == (const PixelPacket *) NULL)
- {
- status=MagickFalse;
- break;
- }
- indexes=GetCacheViewVirtualIndexQueue(image_view);
- AlphaBlendMagickPixelPacket(image,p+0,indexes+0,pixels+0,alpha+0);
- AlphaBlendMagickPixelPacket(image,p+1,indexes+1,pixels+1,alpha+1);
- AlphaBlendMagickPixelPacket(image,p+2,indexes+2,pixels+2,alpha+2);
- AlphaBlendMagickPixelPacket(image,p+3,indexes+3,pixels+3,alpha+3);
- AlphaBlendMagickPixelPacket(image,p+4,indexes+4,pixels+4,alpha+4);
- AlphaBlendMagickPixelPacket(image,p+5,indexes+5,pixels+5,alpha+5);
- AlphaBlendMagickPixelPacket(image,p+6,indexes+6,pixels+6,alpha+6);
- AlphaBlendMagickPixelPacket(image,p+7,indexes+7,pixels+7,alpha+7);
- AlphaBlendMagickPixelPacket(image,p+8,indexes+8,pixels+8,alpha+8);
- AlphaBlendMagickPixelPacket(image,p+9,indexes+9,pixels+9,alpha+9);
- AlphaBlendMagickPixelPacket(image,p+10,indexes+10,pixels+10,alpha+10);
- AlphaBlendMagickPixelPacket(image,p+11,indexes+11,pixels+11,alpha+11);
- AlphaBlendMagickPixelPacket(image,p+12,indexes+12,pixels+12,alpha+12);
- AlphaBlendMagickPixelPacket(image,p+13,indexes+13,pixels+13,alpha+13);
- AlphaBlendMagickPixelPacket(image,p+14,indexes+14,pixels+14,alpha+14);
- AlphaBlendMagickPixelPacket(image,p+15,indexes+15,pixels+15,alpha+15);
- pixel->red=0.0;
- pixel->green=0.0;
- pixel->blue=0.0;
- pixel->opacity=0.0;
- pixel->index=0.0;
- for (i=0; i < 16L; i++)
- {
- gamma=1.0/(fabs((double) alpha[i]) <= MagickEpsilon ? 1.0 : alpha[i]);
- pixel->red+=gamma*0.0625*pixels[i].red;
- pixel->green+=gamma*0.0625*pixels[i].green;
- pixel->blue+=gamma*0.0625*pixels[i].blue;
- pixel->opacity+=0.0625*pixels[i].opacity;
- if (image->colorspace == CMYKColorspace)
- pixel->index+=gamma*0.0625*pixels[i].index;
- }
- break;
- }
- case BicubicInterpolatePixel:
- {
- MagickPixelPacket
- u[4];
-
- PointInfo
- delta;
-
- p=GetCacheViewVirtualPixels(image_view,x_offset-1,y_offset-1,4,4,
- exception);
- if (p == (const PixelPacket *) NULL)
- {
- status=MagickFalse;
- break;
- }
- indexes=GetCacheViewVirtualIndexQueue(image_view);
- AlphaBlendMagickPixelPacket(image,p+0,indexes+0,pixels+0,alpha+0);
- AlphaBlendMagickPixelPacket(image,p+1,indexes+1,pixels+1,alpha+1);
- AlphaBlendMagickPixelPacket(image,p+2,indexes+2,pixels+2,alpha+2);
- AlphaBlendMagickPixelPacket(image,p+3,indexes+3,pixels+3,alpha+3);
- AlphaBlendMagickPixelPacket(image,p+4,indexes+4,pixels+4,alpha+4);
- AlphaBlendMagickPixelPacket(image,p+5,indexes+5,pixels+5,alpha+5);
- AlphaBlendMagickPixelPacket(image,p+6,indexes+6,pixels+6,alpha+6);
- AlphaBlendMagickPixelPacket(image,p+7,indexes+7,pixels+7,alpha+7);
- AlphaBlendMagickPixelPacket(image,p+8,indexes+8,pixels+8,alpha+8);
- AlphaBlendMagickPixelPacket(image,p+9,indexes+9,pixels+9,alpha+9);
- AlphaBlendMagickPixelPacket(image,p+10,indexes+10,pixels+10,alpha+10);
- AlphaBlendMagickPixelPacket(image,p+11,indexes+11,pixels+11,alpha+11);
- AlphaBlendMagickPixelPacket(image,p+12,indexes+12,pixels+12,alpha+12);
- AlphaBlendMagickPixelPacket(image,p+13,indexes+13,pixels+13,alpha+13);
- AlphaBlendMagickPixelPacket(image,p+14,indexes+14,pixels+14,alpha+14);
- AlphaBlendMagickPixelPacket(image,p+15,indexes+15,pixels+15,alpha+15);
- delta.x=x-x_offset;
- delta.y=y-y_offset;
- for (i=0; i < 4L; i++)
- BicubicInterpolate(pixels+4*i,delta.x,u+i);
- BicubicInterpolate(u,delta.y,pixel);
- break;
- }
- case BilinearInterpolatePixel:
- default:
- {
- PointInfo
- delta,
- epsilon;
-
- p=GetCacheViewVirtualPixels(image_view,x_offset,y_offset,2,2,exception);
- if (p == (const PixelPacket *) NULL)
- {
- status=MagickFalse;
- break;
- }
- indexes=GetCacheViewVirtualIndexQueue(image_view);
- AlphaBlendMagickPixelPacket(image,p+0,indexes+0,pixels+0,alpha+0);
- AlphaBlendMagickPixelPacket(image,p+1,indexes+1,pixels+1,alpha+1);
- AlphaBlendMagickPixelPacket(image,p+2,indexes+2,pixels+2,alpha+2);
- AlphaBlendMagickPixelPacket(image,p+3,indexes+3,pixels+3,alpha+3);
- delta.x=x-x_offset;
- delta.y=y-y_offset;
- epsilon.x=1.0-delta.x;
- epsilon.y=1.0-delta.y;
- gamma=((epsilon.y*(epsilon.x*alpha[0]+delta.x*alpha[1])+delta.y*
- (epsilon.x*alpha[2]+delta.x*alpha[3])));
- gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
- pixel->red=gamma*(epsilon.y*(epsilon.x*pixels[0].red+delta.x*
- pixels[1].red)+delta.y*(epsilon.x*pixels[2].red+delta.x*pixels[3].red));
- pixel->green=gamma*(epsilon.y*(epsilon.x*pixels[0].green+delta.x*
- pixels[1].green)+delta.y*(epsilon.x*pixels[2].green+delta.x*
- pixels[3].green));
- pixel->blue=gamma*(epsilon.y*(epsilon.x*pixels[0].blue+delta.x*
- pixels[1].blue)+delta.y*(epsilon.x*pixels[2].blue+delta.x*
- pixels[3].blue));
- pixel->opacity=(epsilon.y*(epsilon.x*pixels[0].opacity+delta.x*
- pixels[1].opacity)+delta.y*(epsilon.x*pixels[2].opacity+delta.x*
- pixels[3].opacity));
- if (image->colorspace == CMYKColorspace)
- pixel->index=gamma*(epsilon.y*(epsilon.x*pixels[0].index+delta.x*
- pixels[1].index)+delta.y*(epsilon.x*pixels[2].index+delta.x*
- pixels[3].index));
- break;
- }
- case FilterInterpolatePixel:
- {
- CacheView
- *filter_view;
-
- Image
- *excerpt_image,
- *filter_image;
-
- RectangleInfo
- geometry;
-
- geometry.width=4L;
- geometry.height=4L;
- geometry.x=x_offset-1;
- geometry.y=y_offset-1;
- excerpt_image=ExcerptImage(image,&geometry,exception);
- if (excerpt_image == (Image *) NULL)
- {
- status=MagickFalse;
- break;
- }
- filter_image=ResizeImage(excerpt_image,1,1,image->filter,image->blur,
- exception);
- excerpt_image=DestroyImage(excerpt_image);
- if (filter_image == (Image *) NULL)
- break;
- filter_view=AcquireCacheView(filter_image);
- p=GetCacheViewVirtualPixels(filter_view,0,0,1,1,exception);
- if (p != (const PixelPacket *) NULL)
- {
- indexes=GetVirtualIndexQueue(filter_image);
- SetMagickPixelPacket(image,p,indexes,pixel);
- }
- filter_view=DestroyCacheView(filter_view);
- filter_image=DestroyImage(filter_image);
- break;
- }
- case IntegerInterpolatePixel:
- {
- p=GetCacheViewVirtualPixels(image_view,x_offset,y_offset,1,1,exception);
- if (p == (const PixelPacket *) NULL)
- {
- status=MagickFalse;
- break;
- }
- indexes=GetCacheViewVirtualIndexQueue(image_view);
- SetMagickPixelPacket(image,p,indexes,pixel);
- break;
- }
- case MeshInterpolatePixel:
- {
- PointInfo
- delta,
- luminance;
-
- p=GetCacheViewVirtualPixels(image_view,x_offset,y_offset,2,2,
- exception);
- if (p == (const PixelPacket *) NULL)
- {
- status=MagickFalse;
- break;
- }
- indexes=GetCacheViewVirtualIndexQueue(image_view);
- AlphaBlendMagickPixelPacket(image,p+0,indexes+0,pixels+0,alpha+0);
- AlphaBlendMagickPixelPacket(image,p+1,indexes+1,pixels+1,alpha+1);
- AlphaBlendMagickPixelPacket(image,p+2,indexes+2,pixels+2,alpha+2);
- AlphaBlendMagickPixelPacket(image,p+3,indexes+3,pixels+3,alpha+3);
- delta.x=x-x_offset;
- delta.y=y-y_offset;
- luminance.x=MagickPixelLuminance(pixels+0)-MagickPixelLuminance(pixels+3);
- luminance.y=MagickPixelLuminance(pixels+1)-MagickPixelLuminance(pixels+2);
- if (fabs(luminance.x) < fabs(luminance.y))
- {
- /*
- Diagonal 0-3 NW-SE.
- */
- if (delta.x <= delta.y)
- {
- /*
- Bottom-left triangle (pixel:2, diagonal: 0-3).
- */
- delta.y=1.0-delta.y;
- gamma=MeshInterpolate(&delta,alpha[2],alpha[3],alpha[0]);
- gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
- pixel->red=gamma*MeshInterpolate(&delta,pixels[2].red,
- pixels[3].red,pixels[0].red);
- pixel->green=gamma*MeshInterpolate(&delta,pixels[2].green,
- pixels[3].green,pixels[0].green);
- pixel->blue=gamma*MeshInterpolate(&delta,pixels[2].blue,
- pixels[3].blue,pixels[0].blue);
- pixel->opacity=gamma*MeshInterpolate(&delta,pixels[2].opacity,
- pixels[3].opacity,pixels[0].opacity);
- if (image->colorspace == CMYKColorspace)
- pixel->index=gamma*MeshInterpolate(&delta,pixels[2].index,
- pixels[3].index,pixels[0].index);
- }
- else
- {
- /*
- Top-right triangle (pixel:1, diagonal: 0-3).
- */
- delta.x=1.0-delta.x;
- gamma=MeshInterpolate(&delta,alpha[1],alpha[0],alpha[3]);
- gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
- pixel->red=gamma*MeshInterpolate(&delta,pixels[1].red,
- pixels[0].red,pixels[3].red);
- pixel->green=gamma*MeshInterpolate(&delta,pixels[1].green,
- pixels[0].green,pixels[3].green);
- pixel->blue=gamma*MeshInterpolate(&delta,pixels[1].blue,
- pixels[0].blue,pixels[3].blue);
- pixel->opacity=gamma*MeshInterpolate(&delta,pixels[1].opacity,
- pixels[0].opacity,pixels[3].opacity);
- if (image->colorspace == CMYKColorspace)
- pixel->index=gamma*MeshInterpolate(&delta,pixels[1].index,
- pixels[0].index,pixels[3].index);
- }
- }
- else
- {
- /*
- Diagonal 1-2 NE-SW.
- */
- if (delta.x <= (1.0-delta.y))
- {
- /*
- Top-left triangle (pixel 0, diagonal: 1-2).
- */
- gamma=MeshInterpolate(&delta,alpha[0],alpha[1],alpha[2]);
- gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
- pixel->red=gamma*MeshInterpolate(&delta,pixels[0].red,
- pixels[1].red,pixels[2].red);
- pixel->green=gamma*MeshInterpolate(&delta,pixels[0].green,
- pixels[1].green,pixels[2].green);
- pixel->blue=gamma*MeshInterpolate(&delta,pixels[0].blue,
- pixels[1].blue,pixels[2].blue);
- pixel->opacity=gamma*MeshInterpolate(&delta,pixels[0].opacity,
- pixels[1].opacity,pixels[2].opacity);
- if (image->colorspace == CMYKColorspace)
- pixel->index=gamma*MeshInterpolate(&delta,pixels[0].index,
- pixels[1].index,pixels[2].index);
- }
- else
- {
- /*
- Bottom-right triangle (pixel: 3, diagonal: 1-2).
- */
- delta.x=1.0-delta.x;
- delta.y=1.0-delta.y;
- gamma=MeshInterpolate(&delta,alpha[3],alpha[2],alpha[1]);
- gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
- pixel->red=gamma*MeshInterpolate(&delta,pixels[3].red,
- pixels[2].red,pixels[1].red);
- pixel->green=gamma*MeshInterpolate(&delta,pixels[3].green,
- pixels[2].green,pixels[1].green);
- pixel->blue=gamma*MeshInterpolate(&delta,pixels[3].blue,
- pixels[2].blue,pixels[1].blue);
- pixel->opacity=gamma*MeshInterpolate(&delta,pixels[3].opacity,
- pixels[2].opacity,pixels[1].opacity);
- if (image->colorspace == CMYKColorspace)
- pixel->index=gamma*MeshInterpolate(&delta,pixels[3].index,
- pixels[2].index,pixels[1].index);
- }
- }
- break;
- }
- case NearestNeighborInterpolatePixel:
- {
- p=GetCacheViewVirtualPixels(image_view,NearestNeighbor(x),
- NearestNeighbor(y),1,1,exception);
- if (p == (const PixelPacket *) NULL)
- {
- status=MagickFalse;
- break;
- }
- indexes=GetCacheViewVirtualIndexQueue(image_view);
- SetMagickPixelPacket(image,p,indexes,pixel);
- break;
- }
- case SplineInterpolatePixel:
- {
- MagickRealType
- dx,
- dy;
-
- PointInfo
- delta;
-
- ssize_t
- j,
- n;
-
- p=GetCacheViewVirtualPixels(image_view,x_offset-1,y_offset-1,4,4,
- exception);
- if (p == (const PixelPacket *) NULL)
- {
- status=MagickFalse;
- break;
- }
- indexes=GetCacheViewVirtualIndexQueue(image_view);
- AlphaBlendMagickPixelPacket(image,p+0,indexes+0,pixels+0,alpha+0);
- AlphaBlendMagickPixelPacket(image,p+1,indexes+1,pixels+1,alpha+1);
- AlphaBlendMagickPixelPacket(image,p+2,indexes+2,pixels+2,alpha+2);
- AlphaBlendMagickPixelPacket(image,p+3,indexes+3,pixels+3,alpha+3);
- AlphaBlendMagickPixelPacket(image,p+4,indexes+4,pixels+4,alpha+4);
- AlphaBlendMagickPixelPacket(image,p+5,indexes+5,pixels+5,alpha+5);
- AlphaBlendMagickPixelPacket(image,p+6,indexes+6,pixels+6,alpha+6);
- AlphaBlendMagickPixelPacket(image,p+7,indexes+7,pixels+7,alpha+7);
- AlphaBlendMagickPixelPacket(image,p+8,indexes+8,pixels+8,alpha+8);
- AlphaBlendMagickPixelPacket(image,p+9,indexes+9,pixels+9,alpha+9);
- AlphaBlendMagickPixelPacket(image,p+10,indexes+10,pixels+10,alpha+10);
- AlphaBlendMagickPixelPacket(image,p+11,indexes+11,pixels+11,alpha+11);
- AlphaBlendMagickPixelPacket(image,p+12,indexes+12,pixels+12,alpha+12);
- AlphaBlendMagickPixelPacket(image,p+13,indexes+13,pixels+13,alpha+13);
- AlphaBlendMagickPixelPacket(image,p+14,indexes+14,pixels+14,alpha+14);
- AlphaBlendMagickPixelPacket(image,p+15,indexes+15,pixels+15,alpha+15);
- pixel->red=0.0;
- pixel->green=0.0;
- pixel->blue=0.0;
- pixel->opacity=0.0;
- pixel->index=0.0;
- delta.x=x-x_offset;
- delta.y=y-y_offset;
- n=0;
- for (i=(-1); i < 3L; i++)
- {
- dy=CubicWeightingFunction((MagickRealType) i-delta.y);
- for (j=(-1); j < 3L; j++)
- {
- dx=CubicWeightingFunction(delta.x-(MagickRealType) j);
- gamma=1.0/(fabs((double) alpha[n]) <= MagickEpsilon ? 1.0 : alpha[n]);
- pixel->red+=gamma*dx*dy*pixels[n].red;
- pixel->green+=gamma*dx*dy*pixels[n].green;
- pixel->blue+=gamma*dx*dy*pixels[n].blue;
- pixel->opacity+=dx*dy*pixels[n].opacity;
- if (image->colorspace == CMYKColorspace)
- pixel->index+=gamma*dx*dy*pixels[n].index;
- n++;
- }
- }
- break;
- }
- }
- return(status);
-}
diff --git a/magick/pixel.h b/magick/pixel.h
deleted file mode 100644
index 8ae1ab2..0000000
--- a/magick/pixel.h
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
- Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization
- dedicated to making software imaging solutions freely available.
-
- You may not use this file except in compliance with the License.
- obtain a copy of the License at
-
- http://www.imagemagick.org/script/license.php
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- MagickCore image constitute methods.
-*/
-#ifndef _MAGICKCORE_PIXEL_H
-#define _MAGICKCORE_PIXEL_H
-
-#if defined(__cplusplus) || defined(c_plusplus)
-extern "C" {
-#endif
-
-#include <magick/colorspace.h>
-#include <magick/constitute.h>
-
-#define ClampPixelRed(pixel) ClampToQuantum((pixel)->red)
-#define ClampPixelGreen(pixel) ClampToQuantum((pixel)->green)
-#define ClampPixelBlue(pixel) ClampToQuantum((pixel)->blue)
-#define ClampPixelIndex(indexes) ClampToQuantum(*(indexes))
-#define ClampPixelOpacity(pixel) ClampToQuantum((pixel)->opacity)
-#define GetPixelAlpha(pixel) (QuantumRange-(pixel)->opacity)
-#define GetPixelBlack(indexes) (*(indexes))
-#define GetPixelBlue(pixel) ((pixel)->blue)
-#define GetPixelCb(pixel) ((pixel)->green)
-#define GetPixelCr(pixel) ((pixel)->blue)
-#define GetPixelCyan(pixel) ((pixel)->red)
-#define GetPixelGray(pixel) ((pixel)->red)
-#define GetPixelGreen(pixel) ((pixel)->green)
-#define GetPixelIndex(indexes) (*(indexes))
-#define GetPixelMagenta(pixel) ((pixel)->green)
-#define GetPixelNext(pixel) ((pixel)+1)
-#define GetPixelOpacity(pixel) ((pixel)->opacity)
-#define GetPixelRed(pixel) ((pixel)->red)
-#define GetPixelRGB(pixel,packet) \
-{ \
- (packet)->red=GetPixelRed((pixel)); \
- (packet)->green=GetPixelGreen((pixel)); \
- (packet)->blue=GetPixelBlue((pixel)); \
-}
-#define GetPixelRGBO(pixel,packet) \
-{ \
- (packet)->red=GetPixelRed((pixel)); \
- (packet)->green=GetPixelGreen((pixel)); \
- (packet)->blue=GetPixelBlue((pixel)); \
- (packet)->opacity=GetPixelOpacity((pixel)); \
-}
-#define GetPixelY(pixel) ((pixel)->red)
-#define GetPixelYellow(pixel) ((pixel)->blue)
-#define SetPixelAlpha(pixel,value) \
- ((pixel)->opacity=(Quantum) (QuantumRange-(value)))
-#define SetPixelBlack(indexes,value) (*(indexes)=(Quantum) (value))
-#define SetPixelBlue(pixel,value) ((pixel)->blue=(Quantum) (value))
-#define SetPixelCb(pixel,value) ((pixel)->green=(Quantum) (value))
-#define SetPixelCr(pixel,value) ((pixel)->blue=(Quantum) (value))
-#define SetPixelCyan(pixel,value) ((pixel)->red=(Quantum) (value))
-#define SetPixelGray(pixel,value) \
- ((pixel)->red=(pixel)->green=(pixel)->blue=(Quantum) (value))
-#define SetPixelGreen(pixel,value) ((pixel)->green=(Quantum) (value))
-#define SetPixelIndex(indexes,value) (*(indexes)=(IndexPacket) (value))
-#define SetPixelMagenta(pixel,value) ((pixel)->green=(Quantum) (value))
-#define SetPixelOpacity(pixel,value) \
- ((pixel)->opacity=(Quantum) (value))
-#define SetPixelRed(pixel,value) ((pixel)->red=(Quantum) (value))
-#define SetPixelRGB(pixel,packet) \
-{ \
- SetPixelRed(pixel,(packet)->red); \
- SetPixelGreen(pixel,(packet)->green); \
- SetPixelBlue(pixel,(packet)->blue); \
-}
-#define SetPixelRGBA(pixel,packet) \
-{ \
- SetPixelRed(pixel,(packet)->red); \
- SetPixelGreen(pixel,(packet)->green); \
- SetPixelBlue(pixel,(packet)->blue); \
- SetPixelAlpha(pixel,(QuantumRange-(packet)->opacity)); \
-}
-#define SetPixelRGBO(pixel,packet) \
-{ \
- SetPixelRed(pixel,(packet)->red); \
- SetPixelGreen(pixel,(packet)->green); \
- SetPixelBlue(pixel,(packet)->blue); \
- SetPixelOpacity(pixel,(packet)->opacity); \
-}
-#define SetPixelYellow(pixel,value) ((pixel)->blue=(Quantum) (value))
-#define SetPixelY(pixel,value) ((pixel)->red=(Quantum) (value))
-
-typedef enum
-{
- UndefinedInterpolatePixel,
- AverageInterpolatePixel,
- BicubicInterpolatePixel,
- BilinearInterpolatePixel,
- FilterInterpolatePixel,
- IntegerInterpolatePixel,
- MeshInterpolatePixel,
- NearestNeighborInterpolatePixel,
- SplineInterpolatePixel
-} InterpolatePixelMethod;
-
-typedef enum
-{
- PixelRed = 0,
- PixelCyan = 0,
- PixelGray = 0,
- PixelY = 0,
- PixelGreen = 1,
- PixelMagenta = 1,
- PixelCb = 1,
- PixelBlue = 2,
- PixelYellow = 2,
- PixelCr = 2,
- PixelAlpha = 3,
- PixelBlack = 4,
- PixelIndex = 4,
- MaskPixelComponent = 5
-} PixelComponent;
-
-typedef struct _DoublePixelPacket
-{
- double
- red,
- green,
- blue,
- opacity,
- index;
-} DoublePixelPacket;
-
-typedef struct _LongPixelPacket
-{
- unsigned int
- red,
- green,
- blue,
- opacity,
- index;
-} LongPixelPacket;
-
-typedef struct _MagickPixelPacket
-{
- ClassType
- storage_class;
-
- ColorspaceType
- colorspace;
-
- MagickBooleanType
- matte;
-
- double
- fuzz;
-
- size_t
- depth;
-
- MagickRealType
- red,
- green,
- blue,
- opacity,
- index;
-} MagickPixelPacket;
-
-typedef Quantum IndexPacket;
-
-typedef struct _PixelPacket
-{
-#if defined(MAGICKCORE_WORDS_BIGENDIAN)
-#define MAGICK_PIXEL_RGBA 1
- Quantum
- red,
- green,
- blue,
- opacity;
-#else
-#define MAGICK_PIXEL_BGRA 1
- Quantum
- blue,
- green,
- red,
- opacity;
-#endif
-} PixelPacket;
-
-typedef struct _CacheView
- CacheView_;
-
-extern MagickExport MagickBooleanType
- ExportImagePixels(const Image *,const ssize_t,const ssize_t,const size_t,
- const size_t,const char *,const StorageType,void *,ExceptionInfo *),
- ImportImagePixels(Image *,const ssize_t,const ssize_t,const size_t,
- const size_t,const char *,const StorageType,const void *),
- InterpolateMagickPixelPacket(const Image *,const CacheView_ *,
- const InterpolatePixelMethod,const double,const double,MagickPixelPacket *,
- ExceptionInfo *);
-
-extern MagickExport void
- GetMagickPixelPacket(const Image *,MagickPixelPacket *);
-
-#if defined(__cplusplus) || defined(c_plusplus)
-}
-#endif
-
-#endif
diff --git a/utilities/ImageMagick.1 b/utilities/ImageMagick.1
index 2ce944e..493bb1e 100644
--- a/utilities/ImageMagick.1
+++ b/utilities/ImageMagick.1
@@ -67,9 +67,9 @@
interprets and executes scripts written in the Magick Scripting Language (MSL).
.PP
-For more information about the ImageMagick, point your browser to file:///usr/local/share/doc/ImageMagick-6.7.1//index.html or http://www.imagemagick.org/.
+For more information about the ImageMagick, point your browser to file:///usr/local/share/doc/ImageMagick-7.0.0//index.html or http://www.imagemagick.org/.
.SH SEE ALSO
convert(1), identify(1), composite(1), montage(1), compare(1), display(1), animate(1), import(1), conjure(1), quantize(5), miff(4)
.SH COPYRIGHT
-\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.7.1//www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7.0.0//www/license.html or http://www.imagemagick.org/script/license.php\fP
diff --git a/utilities/animate.1 b/utilities/animate.1
index e567f88..96bac47 100644
--- a/utilities/animate.1
+++ b/utilities/animate.1
@@ -7,7 +7,7 @@
.SH OVERVIEW
The \fBanimate\fP program is a member of the ImageMagick(1) suite of tools. Use it to animate an image or image sequence on any X server.
-For more information about the animate command, point your browser to file:///usr/local/share/doc/ImageMagick-6.7.1//www/animate.html or http://www.imagemagick.org/script/animate.php.
+For more information about the animate command, point your browser to file:///usr/local/share/doc/ImageMagick-7.0.0//www/animate.html or http://www.imagemagick.org/script/animate.php.
.SH DESCRIPTION
Image Settings:
\-authenticate value decrypt image with this password
@@ -93,4 +93,4 @@
.SH COPYRIGHT
-\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.7.1//www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7.0.0//www/license.html or http://www.imagemagick.org/script/license.php\fP
diff --git a/utilities/compare.1 b/utilities/compare.1
index fed9e63..e566ef4 100644
--- a/utilities/compare.1
+++ b/utilities/compare.1
@@ -7,7 +7,7 @@
.SH OVERVIEW
The \fBcompare\fP program is a member of the ImageMagick(1) suite of tools. Use it to mathematically and visually annotate the difference between an image and its reconstruction.
-For more information about the compare command, point your browser to file:///usr/local/share/doc/ImageMagick-6.7.1//www/compare.html or http://www.imagemagick.org/script/compare.php.
+For more information about the compare command, point your browser to file:///usr/local/share/doc/ImageMagick-7.0.0//www/compare.html or http://www.imagemagick.org/script/compare.php.
.SH DESCRIPTION
Image Settings:
\-authenticate value decrypt image with this password
@@ -66,4 +66,4 @@
.SH COPYRIGHT
-\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.7.1//www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7.0.0//www/license.html or http://www.imagemagick.org/script/license.php\fP
diff --git a/utilities/composite.1 b/utilities/composite.1
index 26d96fa..b1b81fa 100644
--- a/utilities/composite.1
+++ b/utilities/composite.1
@@ -7,7 +7,7 @@
.SH OVERVIEW
The \fBcomposite\fP program is a member of the ImageMagick(1) suite of tools. Use it to overlap one image over another.
-For more information about the composite command, point your browser to file:///usr/local/share/doc/ImageMagick-6.7.1//www/composite.html or http://www.imagemagick.org/script/composite.php.
+For more information about the composite command, point your browser to file:///usr/local/share/doc/ImageMagick-7.0.0//www/composite.html or http://www.imagemagick.org/script/composite.php.
.SH DESCRIPTION
Image Settings:
\-affine matrix affine transform matrix
@@ -103,4 +103,4 @@
.SH COPYRIGHT
-\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.7.1//www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7.0.0//www/license.html or http://www.imagemagick.org/script/license.php\fP
diff --git a/utilities/conjure.1 b/utilities/conjure.1
index cdf19a6..f3671ba 100644
--- a/utilities/conjure.1
+++ b/utilities/conjure.1
@@ -7,7 +7,7 @@
.SH OVERVIEW
The \fBconjure\fP program is a member of the ImageMagick(1) suite of tools. Use it to process a Magick Scripting Language (MSL) script. The Magick scripting language (MSL) will primarily benefit those that want to accomplish custom image processing tasks but do not wish to program, or those that do not have access to a Perl interpreter or a compiler.
-For more information about the conjure command, point your browser to file:///usr/local/share/doc/ImageMagick-6.7.1//www/conjure.html or http://www.imagemagick.org/script/conjure.php.
+For more information about the conjure command, point your browser to file:///usr/local/share/doc/ImageMagick-7.0.0//www/conjure.html or http://www.imagemagick.org/script/conjure.php.
.SH DESCRIPTION
Image Settings:
\-monitor monitor progress
@@ -31,4 +31,4 @@
.SH COPYRIGHT
-\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.7.1//www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7.0.0//www/license.html or http://www.imagemagick.org/script/license.php\fP
diff --git a/utilities/convert.1 b/utilities/convert.1
index 636173f..2c4bec4 100644
--- a/utilities/convert.1
+++ b/utilities/convert.1
@@ -7,7 +7,7 @@
.SH OVERVIEW
The \fBconvert\fP program is a member of the ImageMagick(1) suite of tools. Use it to convert between image formats as well as resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more.
-For more information about the convert command, point your browser to file:///usr/local/share/doc/ImageMagick-6.7.1//www/convert.html or http://www.imagemagick.org/script/convert.php.
+For more information about the convert command, point your browser to file:///usr/local/share/doc/ImageMagick-7.0.0//www/convert.html or http://www.imagemagick.org/script/convert.php.
.SH DESCRIPTION
Image Settings:
\-adjoin join images into a single multi-image file
@@ -266,4 +266,4 @@
ImageMagick(1)
.SH COPYRIGHT
-\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.7.1//www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7.0.0//www/license.html or http://www.imagemagick.org/script/license.php\fP
diff --git a/utilities/display.1 b/utilities/display.1
index 0fbd518..95f5fc0 100644
--- a/utilities/display.1
+++ b/utilities/display.1
@@ -7,7 +7,7 @@
.SH OVERVIEW
The \fBdisplay\fP program is a member of the ImageMagick(1) suite of tools. Use it to display an image or image sequence on any X server.
-For more information about the display command, point your browser to file:///usr/local/share/doc/ImageMagick-6.7.1//www/display.html or http://www.imagemagick.org/script/display.php.
+For more information about the display command, point your browser to file:///usr/local/share/doc/ImageMagick-7.0.0//www/display.html or http://www.imagemagick.org/script/display.php.
.SH DESCRIPTION
Image Settings:
\-antialias remove pixel-aliasing
@@ -125,4 +125,4 @@
.SH COPYRIGHT
-\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.7.1//www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7.0.0//www/license.html or http://www.imagemagick.org/script/license.php\fP
diff --git a/utilities/identify.1 b/utilities/identify.1
index cb7bb0c..2f922d2 100644
--- a/utilities/identify.1
+++ b/utilities/identify.1
@@ -7,7 +7,7 @@
.SH OVERVIEW
The \fBidentify\fP program is a member of the ImageMagick(1) suite of tools. It describes the format and characteristics of one or more image files. It also reports if an image is incomplete or corrupt. The information returned includes the image number, the file name, the width and height of the image, whether the image is colormapped or not, the number of colors in the image (by default off use \fI-define unique=true\fP option), the number of bytes in the image, the format of the image (JPEG, PNM, etc.), and finally the number of seconds it took to read and process the image. Many more attributes are available with the verbose option.
-For more information about the identify command, point your browser to file:///usr/local/share/doc/ImageMagick-6.7.1//www/identify.html or http://www.imagemagick.org/script/identify.php.
+For more information about the identify command, point your browser to file:///usr/local/share/doc/ImageMagick-7.0.0//www/identify.html or http://www.imagemagick.org/script/identify.php.
.SH DESCRIPTION
Image Settings:
\-antialias remove pixel-aliasing
@@ -61,4 +61,4 @@
.SH COPYRIGHT
-\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.7.1//www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7.0.0//www/license.html or http://www.imagemagick.org/script/license.php\fP
diff --git a/utilities/import.1 b/utilities/import.1
index b6ed94c..4c7cfca 100644
--- a/utilities/import.1
+++ b/utilities/import.1
@@ -7,7 +7,7 @@
.SH OVERVIEW
The \fBimport\fP program is a member of the ImageMagick(1) suite of tools. Use it to capture some or all of an X server screen and save the image to a file.
-For more information about the import command, point your browser to file:///usr/local/share/doc/ImageMagick-6.7.1//www/import.html or http://www.imagemagick.org/script/import.php.
+For more information about the import command, point your browser to file:///usr/local/share/doc/ImageMagick-7.0.0//www/import.html or http://www.imagemagick.org/script/import.php.
.SH DESCRIPTION
Image Settings:
\-adjoin join images into a single multi-image file
@@ -94,4 +94,4 @@
.SH COPYRIGHT
-\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.7.1//www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7.0.0//www/license.html or http://www.imagemagick.org/script/license.php\fP
diff --git a/utilities/mogrify.1 b/utilities/mogrify.1
index 9f2dc43..81d00a7 100644
--- a/utilities/mogrify.1
+++ b/utilities/mogrify.1
@@ -7,7 +7,7 @@
.SH OVERVIEW
The \fBmogrify\fP program is a member of the ImageMagick(1) suite of tools. Use it to resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more. This tool is similar to convert(1) except the original image file is overwritten with any changes you request.
-For more information about the mogrify command, point your browser to file:///usr/local/share/doc/ImageMagick-6.7.1//www/mogrify.html or http://www.imagemagick.org/script/mogrify.php.
+For more information about the mogrify command, point your browser to file:///usr/local/share/doc/ImageMagick-7.0.0//www/mogrify.html or http://www.imagemagick.org/script/mogrify.php.
.SH DESCRIPTION
Image Settings:
\-adjoin join images into a single multi-image file
@@ -268,4 +268,4 @@
.SH COPYRIGHT
-\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.7.1//www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7.0.0//www/license.html or http://www.imagemagick.org/script/license.php\fP
diff --git a/utilities/montage.1 b/utilities/montage.1
index ef67866..3793f6f 100644
--- a/utilities/montage.1
+++ b/utilities/montage.1
@@ -7,7 +7,7 @@
.SH OVERVIEW
The \fBmontage\fP program is a member of the ImageMagick(1) suite of tools. Use it to create a composite image by combining several separate images. The images are tiled on the composite image optionally adorned with a border, frame, image name, and more.
-For more information about the montage command, point your browser to file:///usr/local/share/doc/ImageMagick-6.7.1//www/montage.html or http://www.imagemagick.org/script/montage.php.
+For more information about the montage command, point your browser to file:///usr/local/share/doc/ImageMagick-7.0.0//www/montage.html or http://www.imagemagick.org/script/montage.php.
.SH DESCRIPTION
Image Settings:
\-adjoin join images into a single multi-image file
@@ -131,4 +131,4 @@
.SH COPYRIGHT
-\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.7.1//www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7.0.0//www/license.html or http://www.imagemagick.org/script/license.php\fP
diff --git a/utilities/stream.1 b/utilities/stream.1
index 37b7cfb..059b877 100644
--- a/utilities/stream.1
+++ b/utilities/stream.1
@@ -7,7 +7,7 @@
.SH OVERVIEW
\fBStream\fP is a lightweight tool to stream one or more pixel components of the image or portion of the image to your choice of storage formats. It writes the pixel components as they are read from the input image a row at a time making \fBstream\fP desirable when working with large images or when you require raw pixel components.
-For more information about the stream command, point your browser to file:///usr/local/share/doc/ImageMagick-6.7.1//www/stream.html or http://www.imagemagick.org/script/stream.php.
+For more information about the stream command, point your browser to file:///usr/local/share/doc/ImageMagick-7.0.0//www/stream.html or http://www.imagemagick.org/script/stream.php.
.SH DESCRIPTION
Image Settings:
\-authenticate value decrypt image with this password
@@ -54,4 +54,4 @@
.SH COPYRIGHT
-\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.7.1//www/license.html or http://www.imagemagick.org/script/license.php\fP
+\fBCopyright (C) 1999-2011 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7.0.0//www/license.html or http://www.imagemagick.org/script/license.php\fP
diff --git a/wand/Makefile.am b/wand/Makefile.am
deleted file mode 100644
index e033cd4..0000000
--- a/wand/Makefile.am
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization
-# dedicated to making software imaging solutions freely available.
-#
-# You may not use this file except in compliance with the License. You may
-# obtain a copy of the License at
-#
-# http://www.imagemagick.org/script/license.php
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# Makefile for building MagickWand API.
-#
-
-wandincdir = $(topincludedir)/wand
-
-WAND_SOURCES = \
- wand/MagickWand.h \
- wand/animate.c \
- wand/animate.h \
- wand/compare.c \
- wand/compare.h \
- wand/composite.c \
- wand/composite.h \
- wand/conjure.c \
- wand/conjure.h \
- wand/convert.c \
- wand/convert.h \
- wand/deprecate.h \
- wand/deprecate.c \
- wand/display.c \
- wand/display.h \
- wand/drawing-wand.c \
- wand/drawing-wand.h \
- wand/identify.c \
- wand/identify.h \
- wand/import.c \
- wand/import.h \
- wand/magick-image.c \
- wand/magick-image.h \
- wand/magick-property.c \
- wand/magick-property.h \
- wand/magick-wand.c \
- wand/magick-wand.h \
- wand/magick-wand-private.h \
- wand/mogrify.c \
- wand/mogrify.h \
- wand/mogrify-private.h \
- wand/montage.c \
- wand/montage.h \
- wand/pixel-iterator.c \
- wand/pixel-iterator.h \
- wand/pixel-wand.c \
- wand/pixel-wand.h \
- wand/pixel-wand-private.h \
- wand/stream.c \
- wand/stream.h \
- wand/studio.h \
- wand/wand.c \
- wand/wand.h \
- wand/wand-view.c \
- wand/wand-view.h
-
-WAND_INCLUDE_HDRS = \
- wand/MagickWand.h \
- wand/animate.h \
- wand/compare.h \
- wand/composite.h \
- wand/conjure.h \
- wand/convert.h \
- wand/deprecate.h \
- wand/display.h \
- wand/drawing-wand.h \
- wand/identify.h \
- wand/import.h \
- wand/magick-image.h \
- wand/magick-property.h \
- wand/magick-wand.h \
- wand/magick_wand.h \
- wand/mogrify.h \
- wand/montage.h \
- wand/pixel-iterator.h \
- wand/pixel-wand.h \
- wand/stream.h \
- wand/wand-view.h
-
-WAND_NOINST_HDRS = \
- wand/mogrify-private.h \
- wand/magick-wand-private.h \
- wand/pixel-wand-private.h \
- wand/studio.h \
- wand/wand.h
-
-# Headers which are installed
-wandinc_HEADERS = \
- $(WAND_INCLUDE_HDRS)
-
-WAND_BIN_SCRPTS = \
- wand/Wand-config \
- wand/MagickWand-config
-
-WAND_PKGCONFIG = \
- wand/MagickWand.pc \
- wand/Wand.pc
-
-WAND_MANS = \
- wand/MagickWand-config.1 \
- wand/Wand-config.1
-
-WAND_BUILT_SRCS =
-
-MAGICKWAND_LIBS = wand/libMagickWand.la
-
-wand_libMagickWand_la_SOURCES = $(WAND_SOURCES)
-wand_libMagickWand_la_CPPFLAGS = $(LIBRARY_EXTRA_CPPFLAGS)
-wand_libMagickWand_la_LDFLAGS = -no-undefined -export-symbols-regex ".*" \
- -version-info \
- $(MAGICK_LIBRARY_CURRENT):$(MAGICK_LIBRARY_REVISION):$(MAGICK_LIBRARY_AGE)
-wand_libMagickWand_la_LIBADD = $(MAGICKCORE_LIBS) $(X11_LIBS) $(GOMP_LIBS) $(MATH_LIBS)
-
-WAND_EXTRA_DIST = \
- wand/ChangeLog \
- wand/input_256c.miff \
- wand/input_bilevel.miff \
- wand/input_gray.miff \
- wand/input_truecolor.miff \
- wand/MagickWand-config.1 \
- wand/MagickWand.pc.in \
- wand/sequence.miff \
- wand/Wand-config.1 \
- wand/Wand.pc.in \
- wand/common.sh \
- $(WAND_TESTS)
-
-wand_drawtest_SOURCES = wand/drawtest.c
-wand_drawtest_LDFLAGS = $(LDFLAGS)
-wand_drawtest_LDADD = $(MAGICKWAND_LIBS)
-
-wand_wandtest_SOURCES = wand/wandtest.c
-wand_wandtest_LDFLAGS = $(LDFLAGS)
-wand_wandtest_LDADD = $(MAGICKWAND_LIBS)
-
-WAND_CHECK_PGRMS = \
- wand/drawtest \
- wand/wandtest
-
-WAND_TESTS = \
- wand/drawtest.sh \
- wand/wandtest.sh
-
-WAND_CLEANFILES = \
- wand/*_out.*
diff --git a/wand/Wand-config.in b/wand/Wand-config.in
deleted file mode 100644
index 107dcf8..0000000
--- a/wand/Wand-config.in
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/sh
-#
-# Configure options script for re-calling MagickWand compilation options
-# required to use the MagickWand library.
-#
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@/ImageMagick
-
-usage="\
-Usage: Wand-config [--cflags] [--cppflags] [--exec-prefix] [--ldflags] [--libs] [--prefix] [--version]"
-
-if test $# -eq 0; then
- echo "${usage}" 1>&2
- echo "Example: gcc \`Wand-config --cflags --cppflags\` -o wand wand.c \`Wand-config --ldflags --libs\`" 1>&2
- exit 1
-fi
-
-while test $# -gt 0; do
- case "$1" in
- -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
- *) optarg= ;;
- esac
- case $1 in
- --prefix=*)
- prefix=$optarg
- ;;
- --prefix)
- echo $prefix
- ;;
- --exec-prefix=*)
- exec_prefix=$optarg
- ;;
- --exec-prefix)
- echo $exec_prefix
- ;;
- --version)
- echo '@PACKAGE_VERSION@ Q@QUANTUM_DEPTH@ @MAGICK_HDRI@'
- ;;
- --cflags)
- echo "-I${includedir} @MAGICK_PCFLAGS@"
- ;;
- --cxxflags)
- echo '@MAGICK_CXXFLAGS@'
- ;;
- --cppflags)
- echo '@MAGICK_CPPFLAGS@'
- ;;
- --ldflags)
- echo '@MAGICK_LDFLAGS@'
- ;;
- --libs)
- echo "-L${libdir} -lMagickWand @MAGICK_LIBS@"
- ;;
- *)
- echo "${usage}" 1>&2
- exit 1
- ;;
- esac
- shift
-done
-
diff --git a/wand/Wand.pc b/wand/Wand.pc
deleted file mode 100644
index 3d35235..0000000
--- a/wand/Wand.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/usr/local
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include/ImageMagick
-
-Name: Wand
-Version: 6.7.1
-Description: MagickWand - C API for ImageMagick
-Requires: ImageMagick
-Libs: -L${libdir} -lMagickWand -lMagickCore
-Cflags: -I${includedir} -fopenmp
diff --git a/wand/deprecate.c b/wand/deprecate.c
deleted file mode 100644
index a00ece2..0000000
--- a/wand/deprecate.c
+++ /dev/null
@@ -1,3089 +0,0 @@
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% DDDD EEEEE PPPP RRRR EEEEE CCCC AAA TTTTT EEEEE %
-% D D E P P R R E C A A T E %
-% D D EEE PPPPP RRRR EEE C AAAAA T EEE %
-% D D E P R R E C A A T E %
-% DDDD EEEEE P R R EEEEE CCCC A A T EEEEE %
-% %
-% %
-% MagickWand Deprecated Methods %
-% %
-% Software Design %
-% John Cristy %
-% October 2002 %
-% %
-% %
-% Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization %
-% dedicated to making software imaging solutions freely available. %
-% %
-% You may not use this file except in compliance with the License. You may %
-% obtain a copy of the License at %
-% %
-% http://www.imagemagick.org/script/license.php %
-% %
-% Unless required by applicable law or agreed to in writing, software %
-% distributed under the License is distributed on an "AS IS" BASIS, %
-% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. %
-% See the License for the specific language governing permissions and %
-% limitations under the License. %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-%
-%
-*/
-
-/*
- Include declarations.
-*/
-#include "wand/studio.h"
-#include "wand/MagickWand.h"
-#include "wand/magick-wand-private.h"
-#include "wand/wand.h"
-#include "magick/monitor-private.h"
-#include "magick/thread-private.h"
-
-/*
- Define declarations.
-*/
-#define PixelViewId "PixelView"
-#define ThrowWandException(severity,tag,context) \
-{ \
- (void) ThrowMagickException(wand->exception,GetMagickModule(),severity, \
- tag,"`%s'",context); \
- return(MagickFalse); \
-}
-
-/*
- Typedef declarations.
-*/
-struct _PixelView
-{
- size_t
- id;
-
- char
- name[MaxTextExtent];
-
- ExceptionInfo
- *exception;
-
- MagickWand
- *wand;
-
- CacheView
- *view;
-
- RectangleInfo
- region;
-
- size_t
- number_threads;
-
- PixelWand
- ***pixel_wands;
-
- MagickBooleanType
- debug;
-
- size_t
- signature;
-};
-
-#if !defined(MAGICKCORE_EXCLUDE_DEPRECATED)
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% M a g i c k A v e r a g e I m a g e s %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% MagickAverageImages() average a set of images.
-%
-% The format of the MagickAverageImages method is:
-%
-% MagickWand *MagickAverageImages(MagickWand *wand)
-%
-% A description of each parameter follows:
-%
-% o wand: the magick wand.
-%
-*/
-
-static MagickWand *CloneMagickWandFromImages(const MagickWand *wand,
- Image *images)
-{
- MagickWand
- *clone_wand;
-
- assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
- if (wand->debug != MagickFalse)
- (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
- clone_wand=(MagickWand *) AcquireMagickMemory(sizeof(*clone_wand));
- if (clone_wand == (MagickWand *) NULL)
- ThrowWandFatalException(ResourceLimitFatalError,"MemoryAllocationFailed",
- images->filename);
- (void) ResetMagickMemory(clone_wand,0,sizeof(*clone_wand));
- clone_wand->id=AcquireWandId();
- (void) FormatLocaleString(clone_wand->name,MaxTextExtent,"%s-%.20g",
- MagickWandId,(double) clone_wand->id);
- clone_wand->exception=AcquireExceptionInfo();
- InheritException(clone_wand->exception,wand->exception);
- clone_wand->image_info=CloneImageInfo(wand->image_info);
- clone_wand->quantize_info=CloneQuantizeInfo(wand->quantize_info);
- clone_wand->images=images;
- clone_wand->debug=IsEventLogging();
- if (clone_wand->debug != MagickFalse)
- (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",clone_wand->name);
- clone_wand->signature=WandSignature;
- return(clone_wand);
-}
-
-WandExport MagickWand *MagickAverageImages(MagickWand *wand)
-{
- Image
- *average_image;
-
- assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
- if (wand->debug != MagickFalse)
- (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
- if (wand->images == (Image *) NULL)
- return((MagickWand *) NULL);
- average_image=EvaluateImages(wand->images,MeanEvaluateOperator,
- wand->exception);
- if (average_image == (Image *) NULL)
- return((MagickWand *) NULL);
- return(CloneMagickWandFromImages(wand,average_image));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% C l o n e P i x e l V i e w %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% ClonePixelView() makes a copy of the specified pixel view.
-%
-% The format of the ClonePixelView method is:
-%
-% PixelView *ClonePixelView(const PixelView *pixel_view)
-%
-% A description of each parameter follows:
-%
-% o pixel_view: the pixel view.
-%
-*/
-WandExport PixelView *ClonePixelView(const PixelView *pixel_view)
-{
- PixelView
- *clone_view;
-
- register ssize_t
- i;
-
- assert(pixel_view != (PixelView *) NULL);
- assert(pixel_view->signature == WandSignature);
- if (pixel_view->debug != MagickFalse)
- (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",pixel_view->name);
- clone_view=(PixelView *) AcquireMagickMemory(sizeof(*clone_view));
- if (clone_view == (PixelView *) NULL)
- ThrowWandFatalException(ResourceLimitFatalError,"MemoryAllocationFailed",
- pixel_view->name);
- (void) ResetMagickMemory(clone_view,0,sizeof(*clone_view));
- clone_view->id=AcquireWandId();
- (void) FormatLocaleString(clone_view->name,MaxTextExtent,"%s-%.20g",
- PixelViewId,(double) clone_view->id);
- clone_view->exception=AcquireExceptionInfo();
- InheritException(clone_view->exception,pixel_view->exception);
- clone_view->view=CloneCacheView(pixel_view->view);
- clone_view->region=pixel_view->region;
- clone_view->number_threads=pixel_view->number_threads;
- for (i=0; i < (ssize_t) pixel_view->number_threads; i++)
- clone_view->pixel_wands[i]=ClonePixelWands((const PixelWand **)
- pixel_view->pixel_wands[i],pixel_view->region.width);
- clone_view->debug=pixel_view->debug;
- if (clone_view->debug != MagickFalse)
- (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",clone_view->name);
- clone_view->signature=WandSignature;
- return(clone_view);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% D e s t r o y P i x e l V i e w %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% DestroyPixelView() deallocates memory associated with a pixel view.
-%
-% The format of the DestroyPixelView method is:
-%
-% PixelView *DestroyPixelView(PixelView *pixel_view,
-% const size_t number_wands,const size_t number_threads)
-%
-% A description of each parameter follows:
-%
-% o pixel_view: the pixel view.
-%
-% o number_wand: the number of pixel wands.
-%
-% o number_threads: number of threads.
-%
-*/
-
-static PixelWand ***DestroyPixelsThreadSet(PixelWand ***pixel_wands,
- const size_t number_wands,const size_t number_threads)
-{
- register ssize_t
- i;
-
- assert(pixel_wands != (PixelWand ***) NULL);
- for (i=0; i < (ssize_t) number_threads; i++)
- if (pixel_wands[i] != (PixelWand **) NULL)
- pixel_wands[i]=DestroyPixelWands(pixel_wands[i],number_wands);
- pixel_wands=(PixelWand ***) RelinquishMagickMemory(pixel_wands);
- return(pixel_wands);
-}
-
-WandExport PixelView *DestroyPixelView(PixelView *pixel_view)
-{
- assert(pixel_view != (PixelView *) NULL);
- assert(pixel_view->signature == WandSignature);
- pixel_view->pixel_wands=DestroyPixelsThreadSet(pixel_view->pixel_wands,
- pixel_view->region.width,pixel_view->number_threads);
- pixel_view->view=DestroyCacheView(pixel_view->view);
- pixel_view->exception=DestroyExceptionInfo(pixel_view->exception);
- pixel_view->signature=(~WandSignature);
- RelinquishWandId(pixel_view->id);
- pixel_view=(PixelView *) RelinquishMagickMemory(pixel_view);
- return(pixel_view);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% D u p l e x T r a n s f e r P i x e l V i e w I t e r a t o r %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% DuplexTransferPixelViewIterator() iterates over three pixel views in
-% parallel and calls your transfer method for each scanline of the view. The
-% source and duplex pixel region is not confined to the image canvas-- that is
-% you can include negative offsets or widths or heights that exceed the image
-% dimension. However, the destination pixel view is confined to the image
-% canvas-- that is no negative offsets or widths or heights that exceed the
-% image dimension are permitted.
-%
-% Use this pragma:
-%
-% #pragma omp critical
-%
-% to define a section of code in your callback transfer method that must be
-% executed by a single thread at a time.
-%
-% The format of the DuplexTransferPixelViewIterator method is:
-%
-% MagickBooleanType DuplexTransferPixelViewIterator(PixelView *source,
-% PixelView *duplex,PixelView *destination,
-% DuplexTransferPixelViewMethod transfer,void *context)
-%
-% A description of each parameter follows:
-%
-% o source: the source pixel view.
-%
-% o duplex: the duplex pixel view.
-%
-% o destination: the destination pixel view.
-%
-% o transfer: the transfer callback method.
-%
-% o context: the user defined context.
-%
-*/
-WandExport MagickBooleanType DuplexTransferPixelViewIterator(
- PixelView *source,PixelView *duplex,PixelView *destination,
- DuplexTransferPixelViewMethod transfer,void *context)
-{
-#define DuplexTransferPixelViewTag "PixelView/DuplexTransfer"
-
- ExceptionInfo
- *exception;
-
- Image
- *destination_image,
- *duplex_image,
- *source_image;
-
- MagickBooleanType
- status;
-
- MagickOffsetType
- progress;
-
- ssize_t
- y;
-
- assert(source != (PixelView *) NULL);
- assert(source->signature == WandSignature);
- if (transfer == (DuplexTransferPixelViewMethod) NULL)
- return(MagickFalse);
- source_image=source->wand->images;
- duplex_image=duplex->wand->images;
- destination_image=destination->wand->images;
- if (SetImageStorageClass(destination_image,DirectClass) == MagickFalse)
- return(MagickFalse);
- status=MagickTrue;
- progress=0;
- exception=destination->exception;
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(static,1) shared(progress,status)
-#endif
- for (y=source->region.y; y < (ssize_t) source->region.height; y++)
- {
- const int
- id = GetOpenMPThreadId();
-
- MagickBooleanType
- sync;
-
- register const IndexPacket
- *restrict duplex_indexes,
- *restrict indexes;
-
- register const PixelPacket
- *restrict duplex_pixels,
- *restrict pixels;
-
- register IndexPacket
- *restrict destination_indexes;
-
- register ssize_t
- x;
-
- register PixelPacket
- *restrict destination_pixels;
-
- if (status == MagickFalse)
- continue;
- pixels=GetCacheViewVirtualPixels(source->view,source->region.x,y,
- source->region.width,1,source->exception);
- if (pixels == (const PixelPacket *) NULL)
- {
- status=MagickFalse;
- continue;
- }
- indexes=GetCacheViewVirtualIndexQueue(source->view);
- for (x=0; x < (ssize_t) source->region.width; x++)
- PixelSetQuantumColor(source->pixel_wands[id][x],pixels+x);
- if (source_image->colorspace == CMYKColorspace)
- for (x=0; x < (ssize_t) source->region.width; x++)
- PixelSetBlackQuantum(source->pixel_wands[id][x],
- GetPixelIndex(indexes+x));
- if (source_image->storage_class == PseudoClass)
- for (x=0; x < (ssize_t) source->region.width; x++)
- PixelSetIndex(source->pixel_wands[id][x],
- GetPixelIndex(indexes+x));
- duplex_pixels=GetCacheViewVirtualPixels(duplex->view,duplex->region.x,y,
- duplex->region.width,1,duplex->exception);
- if (duplex_pixels == (const PixelPacket *) NULL)
- {
- status=MagickFalse;
- continue;
- }
- duplex_indexes=GetCacheViewVirtualIndexQueue(duplex->view);
- for (x=0; x < (ssize_t) duplex->region.width; x++)
- PixelSetQuantumColor(duplex->pixel_wands[id][x],duplex_pixels+x);
- if (duplex_image->colorspace == CMYKColorspace)
- for (x=0; x < (ssize_t) duplex->region.width; x++)
- PixelSetBlackQuantum(duplex->pixel_wands[id][x],
- GetPixelIndex(duplex_indexes+x));
- if (duplex_image->storage_class == PseudoClass)
- for (x=0; x < (ssize_t) duplex->region.width; x++)
- PixelSetIndex(duplex->pixel_wands[id][x],
- GetPixelIndex(duplex_indexes+x));
- destination_pixels=GetCacheViewAuthenticPixels(destination->view,
- destination->region.x,y,destination->region.width,1,exception);
- if (destination_pixels == (PixelPacket *) NULL)
- {
- status=MagickFalse;
- continue;
- }
- destination_indexes=GetCacheViewAuthenticIndexQueue(destination->view);
- for (x=0; x < (ssize_t) destination->region.width; x++)
- PixelSetQuantumColor(destination->pixel_wands[id][x],
- destination_pixels+x);
- if (destination_image->colorspace == CMYKColorspace)
- for (x=0; x < (ssize_t) destination->region.width; x++)
- PixelSetBlackQuantum(destination->pixel_wands[id][x],
- GetPixelIndex(destination_indexes+x));
- if (destination_image->storage_class == PseudoClass)
- for (x=0; x < (ssize_t) destination->region.width; x++)
- PixelSetIndex(destination->pixel_wands[id][x],
- GetPixelIndex(destination_indexes+x));
- if (transfer(source,duplex,destination,context) == MagickFalse)
- status=MagickFalse;
- for (x=0; x < (ssize_t) destination->region.width; x++)
- PixelGetQuantumColor(destination->pixel_wands[id][x],
- destination_pixels+x);
- if (destination_image->colorspace == CMYKColorspace)
- for (x=0; x < (ssize_t) destination->region.width; x++)
- SetPixelIndex(destination_indexes+x,PixelGetBlackQuantum(
- destination->pixel_wands[id][x]));
- sync=SyncCacheViewAuthenticPixels(destination->view,exception);
- if (sync == MagickFalse)
- {
- InheritException(destination->exception,GetCacheViewException(
- source->view));
- status=MagickFalse;
- }
- if (source_image->progress_monitor != (MagickProgressMonitor) NULL)
- {
- MagickBooleanType
- proceed;
-
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp critical (MagickWand_DuplexTransferPixelViewIterator)
-#endif
- proceed=SetImageProgress(source_image,DuplexTransferPixelViewTag,
- progress++,source->region.height);
- if (proceed == MagickFalse)
- status=MagickFalse;
- }
- }
- return(status);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% G e t P i x e l V i e w E x c e p t i o n %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% GetPixelViewException() returns the severity, reason, and description of any
-% error that occurs when utilizing a pixel view.
-%
-% The format of the GetPixelViewException method is:
-%
-% char *GetPixelViewException(const PixelWand *pixel_view,
-% ExceptionType *severity)
-%
-% A description of each parameter follows:
-%
-% o pixel_view: the pixel pixel_view.
-%
-% o severity: the severity of the error is returned here.
-%
-*/
-WandExport char *GetPixelViewException(const PixelView *pixel_view,
- ExceptionType *severity)
-{
- char
- *description;
-
- assert(pixel_view != (const PixelView *) NULL);
- assert(pixel_view->signature == WandSignature);
- if (pixel_view->debug != MagickFalse)
- (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",pixel_view->name);
- assert(severity != (ExceptionType *) NULL);
- *severity=pixel_view->exception->severity;
- description=(char *) AcquireQuantumMemory(2UL*MaxTextExtent,
- sizeof(*description));
- if (description == (char *) NULL)
- ThrowWandFatalException(ResourceLimitFatalError,"MemoryAllocationFailed",
- pixel_view->name);
- *description='\0';
- if (pixel_view->exception->reason != (char *) NULL)
- (void) CopyMagickString(description,GetLocaleExceptionMessage(
- pixel_view->exception->severity,pixel_view->exception->reason),
- MaxTextExtent);
- if (pixel_view->exception->description != (char *) NULL)
- {
- (void) ConcatenateMagickString(description," (",MaxTextExtent);
- (void) ConcatenateMagickString(description,GetLocaleExceptionMessage(
- pixel_view->exception->severity,pixel_view->exception->description),
- MaxTextExtent);
- (void) ConcatenateMagickString(description,")",MaxTextExtent);
- }
- return(description);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% G e t P i x e l V i e w H e i g h t %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% GetPixelViewHeight() returns the pixel view height.
-%
-% The format of the GetPixelViewHeight method is:
-%
-% size_t GetPixelViewHeight(const PixelView *pixel_view)
-%
-% A description of each parameter follows:
-%
-% o pixel_view: the pixel view.
-%
-*/
-WandExport size_t GetPixelViewHeight(const PixelView *pixel_view)
-{
- assert(pixel_view != (PixelView *) NULL);
- assert(pixel_view->signature == WandSignature);
- return(pixel_view->region.height);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% G e t P i x e l V i e w I t e r a t o r %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% GetPixelViewIterator() iterates over the pixel view in parallel and calls
-% your get method for each scanline of the view. The pixel region is
-% not confined to the image canvas-- that is you can include negative offsets
-% or widths or heights that exceed the image dimension. Any updates to
-% the pixels in your callback are ignored.
-%
-% Use this pragma:
-%
-% #pragma omp critical
-%
-% to define a section of code in your callback get method that must be
-% executed by a single thread at a time.
-%
-% The format of the GetPixelViewIterator method is:
-%
-% MagickBooleanType GetPixelViewIterator(PixelView *source,
-% GetPixelViewMethod get,void *context)
-%
-% A description of each parameter follows:
-%
-% o source: the source pixel view.
-%
-% o get: the get callback method.
-%
-% o context: the user defined context.
-%
-*/
-WandExport MagickBooleanType GetPixelViewIterator(PixelView *source,
- GetPixelViewMethod get,void *context)
-{
-#define GetPixelViewTag "PixelView/Get"
-
- Image
- *source_image;
-
- MagickBooleanType
- status;
-
- MagickOffsetType
- progress;
-
- ssize_t
- y;
-
- assert(source != (PixelView *) NULL);
- assert(source->signature == WandSignature);
- if (get == (GetPixelViewMethod) NULL)
- return(MagickFalse);
- source_image=source->wand->images;
- status=MagickTrue;
- progress=0;
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(static,1) shared(progress,status)
-#endif
- for (y=source->region.y; y < (ssize_t) source->region.height; y++)
- {
- const int
- id = GetOpenMPThreadId();
-
- register const IndexPacket
- *indexes;
-
- register const PixelPacket
- *pixels;
-
- register ssize_t
- x;
-
- if (status == MagickFalse)
- continue;
- pixels=GetCacheViewVirtualPixels(source->view,source->region.x,y,
- source->region.width,1,source->exception);
- if (pixels == (const PixelPacket *) NULL)
- {
- status=MagickFalse;
- continue;
- }
- indexes=GetCacheViewVirtualIndexQueue(source->view);
- for (x=0; x < (ssize_t) source->region.width; x++)
- PixelSetQuantumColor(source->pixel_wands[id][x],pixels+x);
- if (source_image->colorspace == CMYKColorspace)
- for (x=0; x < (ssize_t) source->region.width; x++)
- PixelSetBlackQuantum(source->pixel_wands[id][x],
- GetPixelIndex(indexes+x));
- if (source_image->storage_class == PseudoClass)
- for (x=0; x < (ssize_t) source->region.width; x++)
- PixelSetIndex(source->pixel_wands[id][x],
- GetPixelIndex(indexes+x));
- if (get(source,context) == MagickFalse)
- status=MagickFalse;
- if (source_image->progress_monitor != (MagickProgressMonitor) NULL)
- {
- MagickBooleanType
- proceed;
-
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp critical (MagickWand_GetPixelViewIterator)
-#endif
- proceed=SetImageProgress(source_image,GetPixelViewTag,progress++,
- source->region.height);
- if (proceed == MagickFalse)
- status=MagickFalse;
- }
- }
- return(status);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% G e t P i x e l V i e w P i x e l s %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% GetPixelViewPixels() returns the pixel view pixel_wands.
-%
-% The format of the GetPixelViewPixels method is:
-%
-% PixelWand *GetPixelViewPixels(const PixelView *pixel_view)
-%
-% A description of each parameter follows:
-%
-% o pixel_view: the pixel view.
-%
-*/
-WandExport PixelWand **GetPixelViewPixels(const PixelView *pixel_view)
-{
- const int
- id = GetOpenMPThreadId();
-
- assert(pixel_view != (PixelView *) NULL);
- assert(pixel_view->signature == WandSignature);
- return(pixel_view->pixel_wands[id]);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% G e t P i x e l V i e w W a n d %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% GetPixelViewWand() returns the magick wand associated with the pixel view.
-%
-% The format of the GetPixelViewWand method is:
-%
-% MagickWand *GetPixelViewWand(const PixelView *pixel_view)
-%
-% A description of each parameter follows:
-%
-% o pixel_view: the pixel view.
-%
-*/
-WandExport MagickWand *GetPixelViewWand(const PixelView *pixel_view)
-{
- assert(pixel_view != (PixelView *) NULL);
- assert(pixel_view->signature == WandSignature);
- return(pixel_view->wand);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% G e t P i x e l V i e w W i d t h %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% GetPixelViewWidth() returns the pixel view width.
-%
-% The format of the GetPixelViewWidth method is:
-%
-% size_t GetPixelViewWidth(const PixelView *pixel_view)
-%
-% A description of each parameter follows:
-%
-% o pixel_view: the pixel view.
-%
-*/
-WandExport size_t GetPixelViewWidth(const PixelView *pixel_view)
-{
- assert(pixel_view != (PixelView *) NULL);
- assert(pixel_view->signature == WandSignature);
- return(pixel_view->region.width);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% G e t P i x e l V i e w X %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% GetPixelViewX() returns the pixel view x offset.
-%
-% The format of the GetPixelViewX method is:
-%
-% ssize_t GetPixelViewX(const PixelView *pixel_view)
-%
-% A description of each parameter follows:
-%
-% o pixel_view: the pixel view.
-%
-*/
-WandExport ssize_t GetPixelViewX(const PixelView *pixel_view)
-{
- assert(pixel_view != (PixelView *) NULL);
- assert(pixel_view->signature == WandSignature);
- return(pixel_view->region.x);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% G e t P i x e l V i e w Y %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% GetPixelViewY() returns the pixel view y offset.
-%
-% The format of the GetPixelViewY method is:
-%
-% ssize_t GetPixelViewY(const PixelView *pixel_view)
-%
-% A description of each parameter follows:
-%
-% o pixel_view: the pixel view.
-%
-*/
-WandExport ssize_t GetPixelViewY(const PixelView *pixel_view)
-{
- assert(pixel_view != (PixelView *) NULL);
- assert(pixel_view->signature == WandSignature);
- return(pixel_view->region.y);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% I s P i x e l V i e w %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% IsPixelView() returns MagickTrue if the the parameter is verified as a pixel
-% view container.
-%
-% The format of the IsPixelView method is:
-%
-% MagickBooleanType IsPixelView(const PixelView *pixel_view)
-%
-% A description of each parameter follows:
-%
-% o pixel_view: the pixel view.
-%
-*/
-WandExport MagickBooleanType IsPixelView(const PixelView *pixel_view)
-{
- size_t
- length;
-
- if (pixel_view == (const PixelView *) NULL)
- return(MagickFalse);
- if (pixel_view->signature != WandSignature)
- return(MagickFalse);
- length=strlen(PixelViewId);
- if (LocaleNCompare(pixel_view->name,PixelViewId,length) != 0)
- return(MagickFalse);
- return(MagickTrue);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% M a g i c k C l i p P a t h I m a g e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% MagickClipPathImage() clips along the named paths from the 8BIM profile, if
-% present. Later operations take effect inside the path. Id may be a number
-% if preceded with #, to work on a numbered path, e.g., "#1" to use the first
-% path.
-%
-% The format of the MagickClipPathImage method is:
-%
-% MagickBooleanType MagickClipPathImage(MagickWand *wand,
-% const char *pathname,const MagickBooleanType inside)
-%
-% A description of each parameter follows:
-%
-% o wand: the magick wand.
-%
-% o pathname: name of clipping path resource. If name is preceded by #, use
-% clipping path numbered by name.
-%
-% o inside: if non-zero, later operations take effect inside clipping path.
-% Otherwise later operations take effect outside clipping path.
-%
-*/
-WandExport MagickBooleanType MagickClipPathImage(MagickWand *wand,
- const char *pathname,const MagickBooleanType inside)
-{
- return(MagickClipImagePath(wand,pathname,inside));
-}
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% D r a w G e t F i l l A l p h a %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% DrawGetFillAlpha() returns the alpha used when drawing using the fill
-% color or fill texture. Fully opaque is 1.0.
-%
-% The format of the DrawGetFillAlpha method is:
-%
-% double DrawGetFillAlpha(const DrawingWand *wand)
-%
-% A description of each parameter follows:
-%
-% o wand: the drawing wand.
-%
-*/
-WandExport double DrawGetFillAlpha(const DrawingWand *wand)
-{
- return(DrawGetFillOpacity(wand));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% D r a w G e t S t r o k e A l p h a %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% DrawGetStrokeAlpha() returns the alpha of stroked object outlines.
-%
-% The format of the DrawGetStrokeAlpha method is:
-%
-% double DrawGetStrokeAlpha(const DrawingWand *wand)
-%
-% A description of each parameter follows:
-%
-% o wand: the drawing wand.
-*/
-WandExport double DrawGetStrokeAlpha(const DrawingWand *wand)
-{
- return(DrawGetStrokeOpacity(wand));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% D r a w P e e k G r a p h i c W a n d %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% DrawPeekGraphicWand() returns the current drawing wand.
-%
-% The format of the PeekDrawingWand method is:
-%
-% DrawInfo *DrawPeekGraphicWand(const DrawingWand *wand)
-%
-% A description of each parameter follows:
-%
-% o wand: the drawing wand.
-%
-*/
-WandExport DrawInfo *DrawPeekGraphicWand(const DrawingWand *wand)
-{
- return(PeekDrawingWand(wand));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% D r a w P o p G r a p h i c C o n t e x t %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% DrawPopGraphicContext() destroys the current drawing wand and returns to the
-% previously pushed drawing wand. Multiple drawing wands may exist. It is an
-% error to attempt to pop more drawing wands than have been pushed, and it is
-% proper form to pop all drawing wands which have been pushed.
-%
-% The format of the DrawPopGraphicContext method is:
-%
-% MagickBooleanType DrawPopGraphicContext(DrawingWand *wand)
-%
-% A description of each parameter follows:
-%
-% o wand: the drawing wand.
-%
-*/
-WandExport void DrawPopGraphicContext(DrawingWand *wand)
-{
- (void) PopDrawingWand(wand);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% D r a w P u s h G r a p h i c C o n t e x t %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% DrawPushGraphicContext() clones the current drawing wand to create a new
-% drawing wand. The original drawing wand(s) may be returned to by
-% invoking PopDrawingWand(). The drawing wands are stored on a drawing wand
-% stack. For every Pop there must have already been an equivalent Push.
-%
-% The format of the DrawPushGraphicContext method is:
-%
-% MagickBooleanType DrawPushGraphicContext(DrawingWand *wand)
-%
-% A description of each parameter follows:
-%
-% o wand: the drawing wand.
-%
-*/
-WandExport void DrawPushGraphicContext(DrawingWand *wand)
-{
- (void) PushDrawingWand(wand);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% D r a w S e t F i l l A l p h a %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% DrawSetFillAlpha() sets the alpha to use when drawing using the fill
-% color or fill texture. Fully opaque is 1.0.
-%
-% The format of the DrawSetFillAlpha method is:
-%
-% void DrawSetFillAlpha(DrawingWand *wand,const double fill_alpha)
-%
-% A description of each parameter follows:
-%
-% o wand: the drawing wand.
-%
-% o fill_alpha: fill alpha
-%
-*/
-WandExport void DrawSetFillAlpha(DrawingWand *wand,const double fill_alpha)
-{
- DrawSetFillOpacity(wand,fill_alpha);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% D r a w S e t S t r o k e A l p h a %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% DrawSetStrokeAlpha() specifies the alpha of stroked object outlines.
-%
-% The format of the DrawSetStrokeAlpha method is:
-%
-% void DrawSetStrokeAlpha(DrawingWand *wand,const double stroke_alpha)
-%
-% A description of each parameter follows:
-%
-% o wand: the drawing wand.
-%
-% o stroke_alpha: stroke alpha. The value 1.0 is opaque.
-%
-*/
-WandExport void DrawSetStrokeAlpha(DrawingWand *wand,const double stroke_alpha)
-{
- DrawSetStrokeOpacity(wand,stroke_alpha);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% M a g i c k C o l o r F l o o d f i l l I m a g e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% MagickColorFloodfillImage() changes the color value of any pixel that matches
-% target and is an immediate neighbor. If the method FillToBorderMethod is
-% specified, the color value is changed for any neighbor pixel that does not
-% match the bordercolor member of image.
-%
-% The format of the MagickColorFloodfillImage method is:
-%
-% MagickBooleanType MagickColorFloodfillImage(MagickWand *wand,
-% const PixelWand *fill,const double fuzz,const PixelWand *bordercolor,
-% const ssize_t x,const ssize_t y)
-%
-% A description of each parameter follows:
-%
-% o wand: the magick wand.
-%
-% o fill: the floodfill color pixel wand.
-%
-% o fuzz: By default target must match a particular pixel color
-% exactly. However, in many cases two colors may differ by a small amount.
-% The fuzz member of image defines how much tolerance is acceptable to
-% consider two colors as the same. For example, set fuzz to 10 and the
-% color red at intensities of 100 and 102 respectively are now interpreted
-% as the same color for the purposes of the floodfill.
-%
-% o bordercolor: the border color pixel wand.
-%
-% o x,y: the starting location of the operation.
-%
-*/
-WandExport MagickBooleanType MagickColorFloodfillImage(MagickWand *wand,
- const PixelWand *fill,const double fuzz,const PixelWand *bordercolor,
- const ssize_t x,const ssize_t y)
-{
- DrawInfo
- *draw_info;
-
- MagickBooleanType
- status;
-
- PixelPacket
- target;
-
- assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
- if (wand->debug != MagickFalse)
- (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
- if (wand->images == (Image *) NULL)
- ThrowWandException(WandError,"ContainsNoImages",wand->name);
- draw_info=CloneDrawInfo(wand->image_info,(DrawInfo *) NULL);
- PixelGetQuantumColor(fill,&draw_info->fill);
- (void) GetOneVirtualPixel(wand->images,x % wand->images->columns,
- y % wand->images->rows,&target,wand->exception);
- if (bordercolor != (PixelWand *) NULL)
- PixelGetQuantumColor(bordercolor,&target);
- wand->images->fuzz=fuzz;
- status=ColorFloodfillImage(wand->images,draw_info,target,x,y,
- bordercolor != (PixelWand *) NULL ? FillToBorderMethod : FloodfillMethod);
- if (status == MagickFalse)
- InheritException(wand->exception,&wand->images->exception);
- draw_info=DestroyDrawInfo(draw_info);
- return(status);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% M a g i c k D e s c r i b e I m a g e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% MagickDescribeImage() identifies an image by printing its attributes to the
-% file. Attributes include the image width, height, size, and others.
-%
-% The format of the MagickDescribeImage method is:
-%
-% const char *MagickDescribeImage(MagickWand *wand)
-%
-% A description of each parameter follows:
-%
-% o wand: the magick wand.
-%
-*/
-WandExport char *MagickDescribeImage(MagickWand *wand)
-{
- return(MagickIdentifyImage(wand));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% M a g i c k F l a t t e n I m a g e s %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% MagickFlattenImages() merges a sequence of images. This useful for
-% combining Photoshop layers into a single image.
-%
-% The format of the MagickFlattenImages method is:
-%
-% MagickWand *MagickFlattenImages(MagickWand *wand)
-%
-% A description of each parameter follows:
-%
-% o wand: the magick wand.
-%
-*/
-WandExport MagickWand *MagickFlattenImages(MagickWand *wand)
-{
- Image
- *flatten_image;
-
- assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
- if (wand->debug != MagickFalse)
- (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
- if (wand->images == (Image *) NULL)
- return((MagickWand *) NULL);
- flatten_image=FlattenImages(wand->images,wand->exception);
- if (flatten_image == (Image *) NULL)
- return((MagickWand *) NULL);
- return(CloneMagickWandFromImages(wand,flatten_image));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% M a g i c k G e t I m a g e A t t r i b u t e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% MagickGetImageAttribute() returns a value associated with the specified
-% property. Use MagickRelinquishMemory() to free the value when you are
-% finished with it.
-%
-% The format of the MagickGetImageAttribute method is:
-%
-% char *MagickGetImageAttribute(MagickWand *wand,const char *property)
-%
-% A description of each parameter follows:
-%
-% o wand: the magick wand.
-%
-% o property: the property.
-%
-*/
-WandExport char *MagickGetImageAttribute(MagickWand *wand,const char *property)
-{
- return(MagickGetImageProperty(wand,property));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-+ M a g i c k G e t I m a g e I n d e x %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% MagickGetImageIndex() returns the index of the current image.
-%
-% The format of the MagickGetImageIndex method is:
-%
-% ssize_t MagickGetImageIndex(MagickWand *wand)
-%
-% A description of each parameter follows:
-%
-% o wand: the magick wand.
-%
-*/
-WandExport ssize_t MagickGetImageIndex(MagickWand *wand)
-{
- return(MagickGetIteratorIndex(wand));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-+ M a g i c k G e t I m a g e C h a n n e l E x t r e m a %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% MagickGetImageChannelExtrema() gets the extrema for one or more image
-% channels.
-%
-% The format of the MagickGetImageChannelExtrema method is:
-%
-% MagickBooleanType MagickGetImageChannelExtrema(MagickWand *wand,
-% const ChannelType channel,size_t *minima,size_t *maxima)
-%
-% A description of each parameter follows:
-%
-% o wand: the magick wand.
-%
-% o channel: the image channel(s).
-%
-% o minima: The minimum pixel value for the specified channel(s).
-%
-% o maxima: The maximum pixel value for the specified channel(s).
-%
-*/
-WandExport MagickBooleanType MagickGetImageChannelExtrema(MagickWand *wand,
- const ChannelType channel,size_t *minima,size_t *maxima)
-{
- MagickBooleanType
- status;
-
- assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
- if (wand->debug != MagickFalse)
- (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
- if (wand->images == (Image *) NULL)
- ThrowWandException(WandError,"ContainsNoImages",wand->name);
- status=GetImageChannelExtrema(wand->images,channel,minima,maxima,
- wand->exception);
- return(status);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-+ M a g i c k G e t I m a g e E x t r e m a %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% MagickGetImageExtrema() gets the extrema for the image.
-%
-% The format of the MagickGetImageExtrema method is:
-%
-% MagickBooleanType MagickGetImageExtrema(MagickWand *wand,
-% size_t *minima,size_t *maxima)
-%
-% A description of each parameter follows:
-%
-% o wand: the magick wand.
-%
-% o minima: The minimum pixel value for the specified channel(s).
-%
-% o maxima: The maximum pixel value for the specified channel(s).
-%
-*/
-WandExport MagickBooleanType MagickGetImageExtrema(MagickWand *wand,
- size_t *minima,size_t *maxima)
-{
- MagickBooleanType
- status;
-
- assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
- if (wand->debug != MagickFalse)
- (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
- if (wand->images == (Image *) NULL)
- ThrowWandException(WandError,"ContainsNoImages",wand->name);
- status=GetImageExtrema(wand->images,minima,maxima,wand->exception);
- return(status);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% M a g i c k G e t I m a g e M a t t e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% MagickGetImageMatte() returns MagickTrue if the image has a matte channel
-% otherwise MagickFalse.
-%
-% The format of the MagickGetImageMatte method is:
-%
-% size_t MagickGetImageMatte(MagickWand *wand)
-%
-% A description of each parameter follows:
-%
-% o wand: the magick wand.
-%
-*/
-WandExport MagickBooleanType MagickGetImageMatte(MagickWand *wand)
-{
- assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
- if (wand->debug != MagickFalse)
- (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
- if (wand->images == (Image *) NULL)
- ThrowWandException(WandError,"ContainsNoImages",wand->name);
- return(wand->images->matte);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% M a g i c k G e t I m a g e P i x e l s %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% MagickGetImagePixels() extracts pixel data from an image and returns it to
-% you. The method returns MagickTrue on success otherwise MagickFalse if an
-% error is encountered. The data is returned as char, short int, int, ssize_t,
-% float, or double in the order specified by map.
-%
-% Suppose you want to extract the first scanline of a 640x480 image as
-% character data in red-green-blue order:
-%
-% MagickGetImagePixels(wand,0,0,640,1,"RGB",CharPixel,pixels);
-%
-% The format of the MagickGetImagePixels method is:
-%
-% MagickBooleanType MagickGetImagePixels(MagickWand *wand,
-% const ssize_t x,const ssize_t y,const size_t columns,
-% const size_t rows,const char *map,const StorageType storage,
-% void *pixels)
-%
-% A description of each parameter follows:
-%
-% o wand: the magick wand.
-%
-% o x, y, columns, rows: These values define the perimeter
-% of a region of pixels you want to extract.
-%
-% o map: This string reflects the expected ordering of the pixel array.
-% It can be any combination or order of R = red, G = green, B = blue,
-% A = alpha (0 is transparent), O = opacity (0 is opaque), C = cyan,
-% Y = yellow, M = magenta, K = black, I = intensity (for grayscale),
-% P = pad.
-%
-% o storage: Define the data type of the pixels. Float and double types are
-% expected to be normalized [0..1] otherwise [0..QuantumRange]. Choose from
-% these types: CharPixel, DoublePixel, FloatPixel, IntegerPixel,
-% LongPixel, QuantumPixel, or ShortPixel.
-%
-% o pixels: This array of values contain the pixel components as defined by
-% map and type. You must preallocate this array where the expected
-% length varies depending on the values of width, height, map, and type.
-%
-*/
-WandExport MagickBooleanType MagickGetImagePixels(MagickWand *wand,
- const ssize_t x,const ssize_t y,const size_t columns,
- const size_t rows,const char *map,const StorageType storage,
- void *pixels)
-{
- return(MagickExportImagePixels(wand,x,y,columns,rows,map,storage,pixels));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% M a g i c k G e t I m a g e S i z e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% MagickGetImageSize() returns the image length in bytes.
-%
-% The format of the MagickGetImageSize method is:
-%
-% MagickBooleanType MagickGetImageSize(MagickWand *wand,
-% MagickSizeType *length)
-%
-% A description of each parameter follows:
-%
-% o wand: the magick wand.
-%
-% o length: the image length in bytes.
-%
-*/
-WandExport MagickSizeType MagickGetImageSize(MagickWand *wand)
-{
- assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
- if (wand->debug != MagickFalse)
- (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
- if (wand->images == (Image *) NULL)
- ThrowWandException(WandError,"ContainsNoImages",wand->name);
- return(GetBlobSize(wand->images));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% M a g i c k M a p I m a g e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% MagickMapImage() replaces the colors of an image with the closest color
-% from a reference image.
-%
-% The format of the MagickMapImage method is:
-%
-% MagickBooleanType MagickMapImage(MagickWand *wand,
-% const MagickWand *map_wand,const MagickBooleanType dither)
-%
-% A description of each parameter follows:
-%
-% o wand: the magick wand.
-%
-% o map: the map wand.
-%
-% o dither: Set this integer value to something other than zero to dither
-% the mapped image.
-%
-*/
-WandExport MagickBooleanType MagickMapImage(MagickWand *wand,
- const MagickWand *map_wand,const MagickBooleanType dither)
-{
- MagickBooleanType
- status;
-
- assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
- if (wand->debug != MagickFalse)
- (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
- if ((wand->images == (Image *) NULL) || (map_wand->images == (Image *) NULL))
- ThrowWandException(WandError,"ContainsNoImages",wand->name);
- status=MapImage(wand->images,map_wand->images,dither);
- if (status == MagickFalse)
- InheritException(wand->exception,&wand->images->exception);
- return(status);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% M a g i c k M a t t e F l o o d f i l l I m a g e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% MagickMatteFloodfillImage() changes the transparency value of any pixel that
-% matches target and is an immediate neighbor. If the method
-% FillToBorderMethod is specified, the transparency value is changed for any
-% neighbor pixel that does not match the bordercolor member of image.
-%
-% The format of the MagickMatteFloodfillImage method is:
-%
-% MagickBooleanType MagickMatteFloodfillImage(MagickWand *wand,
-% const double alpha,const double fuzz,const PixelWand *bordercolor,
-% const ssize_t x,const ssize_t y)
-%
-% A description of each parameter follows:
-%
-% o wand: the magick wand.
-%
-% o alpha: the level of transparency: 1.0 is fully opaque and 0.0 is fully
-% transparent.
-%
-% o fuzz: By default target must match a particular pixel color
-% exactly. However, in many cases two colors may differ by a small amount.
-% The fuzz member of image defines how much tolerance is acceptable to
-% consider two colors as the same. For example, set fuzz to 10 and the
-% color red at intensities of 100 and 102 respectively are now interpreted
-% as the same color for the purposes of the floodfill.
-%
-% o bordercolor: the border color pixel wand.
-%
-% o x,y: the starting location of the operation.
-%
-*/
-WandExport MagickBooleanType MagickMatteFloodfillImage(MagickWand *wand,
- const double alpha,const double fuzz,const PixelWand *bordercolor,
- const ssize_t x,const ssize_t y)
-{
- DrawInfo
- *draw_info;
-
- MagickBooleanType
- status;
-
- PixelPacket
- target;
-
- assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
- if (wand->debug != MagickFalse)
- (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
- if (wand->images == (Image *) NULL)
- ThrowWandException(WandError,"ContainsNoImages",wand->name);
- draw_info=CloneDrawInfo(wand->image_info,(DrawInfo *) NULL);
- (void) GetOneVirtualPixel(wand->images,x % wand->images->columns,
- y % wand->images->rows,&target,wand->exception);
- if (bordercolor != (PixelWand *) NULL)
- PixelGetQuantumColor(bordercolor,&target);
- wand->images->fuzz=fuzz;
- status=MatteFloodfillImage(wand->images,target,ClampToQuantum(
- (MagickRealType) QuantumRange-QuantumRange*alpha),x,y,bordercolor !=
- (PixelWand *) NULL ? FillToBorderMethod : FloodfillMethod);
- if (status == MagickFalse)
- InheritException(wand->exception,&wand->images->exception);
- draw_info=DestroyDrawInfo(draw_info);
- return(status);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% M a g i c k M e d i a n F i l t e r I m a g e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% MagickMedianFilterImage() applies a digital filter that improves the quality
-% of a noisy image. Each pixel is replaced by the median in a set of
-% neighboring pixels as defined by radius.
-%
-% The format of the MagickMedianFilterImage method is:
-%
-% MagickBooleanType MagickMedianFilterImage(MagickWand *wand,
-% const double radius)
-%
-% A description of each parameter follows:
-%
-% o wand: the magick wand.
-%
-% o radius: the radius of the pixel neighborhood.
-%
-*/
-WandExport MagickBooleanType MagickMedianFilterImage(MagickWand *wand,
- const double radius)
-{
- Image
- *median_image;
-
- assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
- if (wand->debug != MagickFalse)
- (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
- if (wand->images == (Image *) NULL)
- ThrowWandException(WandError,"ContainsNoImages",wand->name);
- median_image=MedianFilterImage(wand->images,radius,wand->exception);
- if (median_image == (Image *) NULL)
- return(MagickFalse);
- ReplaceImageInList(&wand->images,median_image);
- return(MagickTrue);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% M a g i c k M i n i m u m I m a g e s %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% MagickMinimumImages() returns the minimum intensity of an image sequence.
-%
-% The format of the MagickMinimumImages method is:
-%
-% MagickWand *MagickMinimumImages(MagickWand *wand)
-%
-% A description of each parameter follows:
-%
-% o wand: the magick wand.
-%
-*/
-WandExport MagickWand *MagickMinimumImages(MagickWand *wand)
-{
- Image
- *minimum_image;
-
- assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
- if (wand->debug != MagickFalse)
- (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
- if (wand->images == (Image *) NULL)
- return((MagickWand *) NULL);
- minimum_image=EvaluateImages(wand->images,MinEvaluateOperator,
- wand->exception);
- if (minimum_image == (Image *) NULL)
- return((MagickWand *) NULL);
- return(CloneMagickWandFromImages(wand,minimum_image));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% M a g i c k M o d e I m a g e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% MagickModeImage() makes each pixel the 'predominant color' of the
-% neighborhood of the specified radius.
-%
-% The format of the MagickModeImage method is:
-%
-% MagickBooleanType MagickModeImage(MagickWand *wand,
-% const double radius)
-%
-% A description of each parameter follows:
-%
-% o wand: the magick wand.
-%
-% o radius: the radius of the pixel neighborhood.
-%
-*/
-WandExport MagickBooleanType MagickModeImage(MagickWand *wand,
- const double radius)
-{
- Image
- *mode_image;
-
- assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
- if (wand->debug != MagickFalse)
- (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
- if (wand->images == (Image *) NULL)
- ThrowWandException(WandError,"ContainsNoImages",wand->name);
- mode_image=ModeImage(wand->images,radius,wand->exception);
- if (mode_image == (Image *) NULL)
- return(MagickFalse);
- ReplaceImageInList(&wand->images,mode_image);
- return(MagickTrue);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% M a g i c k M o s a i c I m a g e s %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% MagickMosaicImages() inlays an image sequence to form a single coherent
-% picture. It returns a wand with each image in the sequence composited at
-% the location defined by the page offset of the image.
-%
-% The format of the MagickMosaicImages method is:
-%
-% MagickWand *MagickMosaicImages(MagickWand *wand)
-%
-% A description of each parameter follows:
-%
-% o wand: the magick wand.
-%
-*/
-WandExport MagickWand *MagickMosaicImages(MagickWand *wand)
-{
- Image
- *mosaic_image;
-
- assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
- if (wand->debug != MagickFalse)
- (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
- if (wand->images == (Image *) NULL)
- return((MagickWand *) NULL);
- mosaic_image=MosaicImages(wand->images,wand->exception);
- if (mosaic_image == (Image *) NULL)
- return((MagickWand *) NULL);
- return(CloneMagickWandFromImages(wand,mosaic_image));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% M a g i c k O p a q u e I m a g e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% MagickOpaqueImage() changes any pixel that matches color with the color
-% defined by fill.
-%
-% The format of the MagickOpaqueImage method is:
-%
-% MagickBooleanType MagickOpaqueImage(MagickWand *wand,
-% const PixelWand *target,const PixelWand *fill,const double fuzz)
-%
-% A description of each parameter follows:
-%
-% o wand: the magick wand.
-%
-% o channel: the channel(s).
-%
-% o target: Change this target color to the fill color within the image.
-%
-% o fill: the fill pixel wand.
-%
-% o fuzz: By default target must match a particular pixel color
-% exactly. However, in many cases two colors may differ by a small amount.
-% The fuzz member of image defines how much tolerance is acceptable to
-% consider two colors as the same. For example, set fuzz to 10 and the
-% color red at intensities of 100 and 102 respectively are now interpreted
-% as the same color for the purposes of the floodfill.
-%
-*/
-WandExport MagickBooleanType MagickOpaqueImage(MagickWand *wand,
- const PixelWand *target,const PixelWand *fill,const double fuzz)
-{
- return(MagickPaintOpaqueImage(wand,target,fill,fuzz));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% M a g i c k P a i n t F l o o d f i l l I m a g e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% MagickPaintFloodfillImage() changes the color value of any pixel that matches
-% target and is an immediate neighbor. If the method FillToBorderMethod is
-% specified, the color value is changed for any neighbor pixel that does not
-% match the bordercolor member of image.
-%
-% The format of the MagickPaintFloodfillImage method is:
-%
-% MagickBooleanType MagickPaintFloodfillImage(MagickWand *wand,
-% const ChannelType channel,const PixelWand *fill,const double fuzz,
-% const PixelWand *bordercolor,const ssize_t x,const ssize_t y)
-%
-% A description of each parameter follows:
-%
-% o wand: the magick wand.
-%
-% o channel: the channel(s).
-%
-% o fill: the floodfill color pixel wand.
-%
-% o fuzz: By default target must match a particular pixel color
-% exactly. However, in many cases two colors may differ by a small amount.
-% The fuzz member of image defines how much tolerance is acceptable to
-% consider two colors as the same. For example, set fuzz to 10 and the
-% color red at intensities of 100 and 102 respectively are now interpreted
-% as the same color for the purposes of the floodfill.
-%
-% o bordercolor: the border color pixel wand.
-%
-% o x,y: the starting location of the operation.
-%
-*/
-WandExport MagickBooleanType MagickPaintFloodfillImage(MagickWand *wand,
- const ChannelType channel,const PixelWand *fill,const double fuzz,
- const PixelWand *bordercolor,const ssize_t x,const ssize_t y)
-{
- MagickBooleanType
- status;
-
- status=MagickFloodfillPaintImage(wand,channel,fill,fuzz,bordercolor,x,y,
- MagickFalse);
- return(status);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% M a g i c k P a i n t O p a q u e I m a g e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% MagickPaintOpaqueImage() changes any pixel that matches color with the color
-% defined by fill.
-%
-% The format of the MagickPaintOpaqueImage method is:
-%
-% MagickBooleanType MagickPaintOpaqueImage(MagickWand *wand,
-% const PixelWand *target,const PixelWand *fill,const double fuzz)
-% MagickBooleanType MagickPaintOpaqueImageChannel(MagickWand *wand,
-% const ChannelType channel,const PixelWand *target,
-% const PixelWand *fill,const double fuzz)
-%
-% A description of each parameter follows:
-%
-% o wand: the magick wand.
-%
-% o channel: the channel(s).
-%
-% o target: Change this target color to the fill color within the image.
-%
-% o fill: the fill pixel wand.
-%
-% o fuzz: By default target must match a particular pixel color
-% exactly. However, in many cases two colors may differ by a small amount.
-% The fuzz member of image defines how much tolerance is acceptable to
-% consider two colors as the same. For example, set fuzz to 10 and the
-% color red at intensities of 100 and 102 respectively are now interpreted
-% as the same color for the purposes of the floodfill.
-%
-*/
-
-WandExport MagickBooleanType MagickPaintOpaqueImage(MagickWand *wand,
- const PixelWand *target,const PixelWand *fill,const double fuzz)
-{
- return(MagickPaintOpaqueImageChannel(wand,DefaultChannels,target,fill,fuzz));
-}
-
-WandExport MagickBooleanType MagickPaintOpaqueImageChannel(MagickWand *wand,
- const ChannelType channel,const PixelWand *target,const PixelWand *fill,
- const double fuzz)
-{
- MagickBooleanType
- status;
-
- status=MagickOpaquePaintImageChannel(wand,channel,target,fill,fuzz,
- MagickFalse);
- return(status);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% M a g i c k P a i n t T r a n s p a r e n t I m a g e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% MagickPaintTransparentImage() changes any pixel that matches color with the
-% color defined by fill.
-%
-% The format of the MagickPaintTransparentImage method is:
-%
-% MagickBooleanType MagickPaintTransparentImage(MagickWand *wand,
-% const PixelWand *target,const double alpha,const double fuzz)
-%
-% A description of each parameter follows:
-%
-% o wand: the magick wand.
-%
-% o target: Change this target color to specified opacity value within
-% the image.
-%
-% o alpha: the level of transparency: 1.0 is fully opaque and 0.0 is fully
-% transparent.
-%
-% o fuzz: By default target must match a particular pixel color
-% exactly. However, in many cases two colors may differ by a small amount.
-% The fuzz member of image defines how much tolerance is acceptable to
-% consider two colors as the same. For example, set fuzz to 10 and the
-% color red at intensities of 100 and 102 respectively are now interpreted
-% as the same color for the purposes of the floodfill.
-%
-*/
-WandExport MagickBooleanType MagickPaintTransparentImage(MagickWand *wand,
- const PixelWand *target,const double alpha,const double fuzz)
-{
- return(MagickTransparentPaintImage(wand,target,alpha,fuzz,MagickFalse));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% M a g i c k R e c o l o r I m a g e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% MagickRecolorImage() apply color transformation to an image. The method
-% permits saturation changes, hue rotation, luminance to alpha, and various
-% other effects. Although variable-sized transformation matrices can be used,
-% typically one uses a 5x5 matrix for an RGBA image and a 6x6 for CMYKA
-% (or RGBA with offsets). The matrix is similar to those used by Adobe Flash
-% except offsets are in column 6 rather than 5 (in support of CMYKA images)
-% and offsets are normalized (divide Flash offset by 255).
-%
-% The format of the MagickRecolorImage method is:
-%
-% MagickBooleanType MagickRecolorImage(MagickWand *wand,
-% const size_t order,const double *color_matrix)
-%
-% A description of each parameter follows:
-%
-% o wand: the magick wand.
-%
-% o order: the number of columns and rows in the color matrix.
-%
-% o color_matrix: An array of doubles representing the color matrix.
-%
-*/
-WandExport MagickBooleanType MagickRecolorImage(MagickWand *wand,
- const size_t order,const double *color_matrix)
-{
- Image
- *transform_image;
-
- assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
- if (wand->debug != MagickFalse)
- (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
- if (color_matrix == (const double *) NULL)
- return(MagickFalse);
- if (wand->images == (Image *) NULL)
- ThrowWandException(WandError,"ContainsNoImages",wand->name);
- transform_image=RecolorImage(wand->images,order,color_matrix,
- wand->exception);
- if (transform_image == (Image *) NULL)
- return(MagickFalse);
- ReplaceImageInList(&wand->images,transform_image);
- return(MagickTrue);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% M a g i c k R e d u c e N o i s e I m a g e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% MagickReduceNoiseImage() smooths the contours of an image while still
-% preserving edge information. The algorithm works by replacing each pixel
-% with its neighbor closest in value. A neighbor is defined by radius. Use
-% a radius of 0 and ReduceNoise() selects a suitable radius for you.
-%
-% The format of the MagickReduceNoiseImage method is:
-%
-% MagickBooleanType MagickReduceNoiseImage(MagickWand *wand,
-% const double radius)
-%
-% A description of each parameter follows:
-%
-% o wand: the magick wand.
-%
-% o radius: the radius of the pixel neighborhood.
-%
-*/
-WandExport MagickBooleanType MagickReduceNoiseImage(MagickWand *wand,
- const double radius)
-{
- Image
- *noise_image;
-
- assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
- if (wand->debug != MagickFalse)
- (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
- if (wand->images == (Image *) NULL)
- ThrowWandException(WandError,"ContainsNoImages",wand->name);
- noise_image=ReduceNoiseImage(wand->images,radius,wand->exception);
- if (noise_image == (Image *) NULL)
- return(MagickFalse);
- ReplaceImageInList(&wand->images,noise_image);
- return(MagickTrue);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% M a g i c k M a x i m u m I m a g e s %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% MagickMaximumImages() returns the maximum intensity of an image sequence.
-%
-% The format of the MagickMaximumImages method is:
-%
-% MagickWand *MagickMaximumImages(MagickWand *wand)
-%
-% A description of each parameter follows:
-%
-% o wand: the magick wand.
-%
-*/
-WandExport MagickWand *MagickMaximumImages(MagickWand *wand)
-{
- Image
- *maximum_image;
-
- assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
- if (wand->debug != MagickFalse)
- (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
- if (wand->images == (Image *) NULL)
- return((MagickWand *) NULL);
- maximum_image=EvaluateImages(wand->images,MaxEvaluateOperator,
- wand->exception);
- if (maximum_image == (Image *) NULL)
- return((MagickWand *) NULL);
- return(CloneMagickWandFromImages(wand,maximum_image));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% M a g i c k S e t I m a g e A t t r i b u t e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% MagickSetImageAttribute() associates a property with an image.
-%
-% The format of the MagickSetImageAttribute method is:
-%
-% MagickBooleanType MagickSetImageAttribute(MagickWand *wand,
-% const char *property,const char *value)
-%
-% A description of each parameter follows:
-%
-% o wand: the magick wand.
-%
-% o property: the property.
-%
-% o value: the value.
-%
-*/
-WandExport MagickBooleanType MagickSetImageAttribute(MagickWand *wand,
- const char *property,const char *value)
-{
- return(SetImageProperty(wand->images,property,value));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% M a g i c k S e t I m a g e I n d e x %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% MagickSetImageIndex() set the current image to the position of the list
-% specified with the index parameter.
-%
-% The format of the MagickSetImageIndex method is:
-%
-% MagickBooleanType MagickSetImageIndex(MagickWand *wand,
-% const ssize_t index)
-%
-% A description of each parameter follows:
-%
-% o wand: the magick wand.
-%
-% o index: the scene number.
-%
-*/
-WandExport MagickBooleanType MagickSetImageIndex(MagickWand *wand,
- const ssize_t index)
-{
- return(MagickSetIteratorIndex(wand,index));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-+ M a g i c k S e t I m a g e O p t i o n %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% MagickSetImageOption() associates one or options with a particular image
-% format (.e.g MagickSetImageOption(wand,"jpeg","perserve","yes").
-%
-% The format of the MagickSetImageOption method is:
-%
-% MagickBooleanType MagickSetImageOption(MagickWand *wand,
-% const char *format,const char *key,const char *value)
-%
-% A description of each parameter follows:
-%
-% o wand: the magick wand.
-%
-% o format: the image format.
-%
-% o key: The key.
-%
-% o value: The value.
-%
-*/
-WandExport MagickBooleanType MagickSetImageOption(MagickWand *wand,
- const char *format,const char *key,const char *value)
-{
- char
- option[MaxTextExtent];
-
- assert(wand != (MagickWand *) NULL);
- assert(wand->signature == WandSignature);
- if (wand->debug != MagickFalse)
- (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
- (void) FormatLocaleString(option,MaxTextExtent,"%s:%s=%s",format,key,value);
- return(DefineImageOption(wand->image_info,option));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% M a g i c k T r a n s p a r e n t I m a g e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% MagickTransparentImage() changes any pixel that matches color with the
-% color defined by fill.
-%
-% The format of the MagickTransparentImage method is:
-%
-% MagickBooleanType MagickTransparentImage(MagickWand *wand,
-% const PixelWand *target,const double alpha,const double fuzz)
-%
-% A description of each parameter follows:
-%
-% o wand: the magick wand.
-%
-% o target: Change this target color to specified opacity value within
-% the image.
-%
-% o alpha: the level of transparency: 1.0 is fully opaque and 0.0 is fully
-% transparent.
-%
-% o fuzz: By default target must match a particular pixel color
-% exactly. However, in many cases two colors may differ by a small amount.
-% The fuzz member of image defines how much tolerance is acceptable to
-% consider two colors as the same. For example, set fuzz to 10 and the
-% color red at intensities of 100 and 102 respectively are now interpreted
-% as the same color for the purposes of the floodfill.
-%
-*/
-WandExport MagickBooleanType MagickTransparentImage(MagickWand *wand,
- const PixelWand *target,const double alpha,const double fuzz)
-{
- return(MagickPaintTransparentImage(wand,target,alpha,fuzz));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% M a g i c k R e g i o n O f I n t e r e s t I m a g e %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% MagickRegionOfInterestImage() extracts a region of the image and returns it
-% as a new wand.
-%
-% The format of the MagickRegionOfInterestImage method is:
-%
-% MagickWand *MagickRegionOfInterestImage(MagickWand *wand,
-% const size_t width,const size_t height,const ssize_t x,
-% const ssize_t y)
-%
-% A description of each parameter follows:
-%
-% o wand: the magick wand.
-%
-% o width: the region width.
-%
-% o height: the region height.
-%
-% o x: the region x offset.
-%
-% o y: the region y offset.
-%
-*/
-WandExport MagickWand *MagickRegionOfInterestImage(MagickWand *wand,
- const size_t width,const size_t height,const ssize_t x,
- const ssize_t y)
-{
- return(MagickGetImageRegion(wand,width,height,x,y));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% M a g i c k S e t I m a g e P i x e l s %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% MagickSetImagePixels() accepts pixel datand stores it in the image at the
-% location you specify. The method returns MagickFalse on success otherwise
-% MagickTrue if an error is encountered. The pixel data can be either char,
-% short int, int, ssize_t, float, or double in the order specified by map.
-%
-% Suppose your want to upload the first scanline of a 640x480 image from
-% character data in red-green-blue order:
-%
-% MagickSetImagePixels(wand,0,0,640,1,"RGB",CharPixel,pixels);
-%
-% The format of the MagickSetImagePixels method is:
-%
-% MagickBooleanType MagickSetImagePixels(MagickWand *wand,
-% const ssize_t x,const ssize_t y,const size_t columns,
-% const size_t rows,const char *map,const StorageType storage,
-% const void *pixels)
-%
-% A description of each parameter follows:
-%
-% o wand: the magick wand.
-%
-% o x, y, columns, rows: These values define the perimeter of a region
-% of pixels you want to define.
-%
-% o map: This string reflects the expected ordering of the pixel array.
-% It can be any combination or order of R = red, G = green, B = blue,
-% A = alpha (0 is transparent), O = opacity (0 is opaque), C = cyan,
-% Y = yellow, M = magenta, K = black, I = intensity (for grayscale),
-% P = pad.
-%
-% o storage: Define the data type of the pixels. Float and double types are
-% expected to be normalized [0..1] otherwise [0..QuantumRange]. Choose from
-% these types: CharPixel, ShortPixel, IntegerPixel, LongPixel, FloatPixel,
-% or DoublePixel.
-%
-% o pixels: This array of values contain the pixel components as defined by
-% map and type. You must preallocate this array where the expected
-% length varies depending on the values of width, height, map, and type.
-%
-*/
-WandExport MagickBooleanType MagickSetImagePixels(MagickWand *wand,
- const ssize_t x,const ssize_t y,const size_t columns,
- const size_t rows,const char *map,const StorageType storage,
- const void *pixels)
-{
- return(MagickImportImagePixels(wand,x,y,columns,rows,map,storage,pixels));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% M a g i c k W r i t e I m a g e B l o b %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% MagickWriteImageBlob() implements direct to memory image formats. It
-% returns the image as a blob and its length. Use MagickSetFormat() to
-% set the format of the returned blob (GIF, JPEG, PNG, etc.).
-%
-% Use MagickRelinquishMemory() to free the blob when you are done with it.
-%
-% The format of the MagickWriteImageBlob method is:
-%
-% unsigned char *MagickWriteImageBlob(MagickWand *wand,size_t *length)
-%
-% A description of each parameter follows:
-%
-% o wand: the magick wand.
-%
-% o length: the length of the blob.
-%
-*/
-WandExport unsigned char *MagickWriteImageBlob(MagickWand *wand,size_t *length)
-{
- return(MagickGetImageBlob(wand,length));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% N e w P i x e l V i e w %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% NewPixelView() returns a pixel view required for all other methods in the
-% Pixel View API.
-%
-% The format of the NewPixelView method is:
-%
-% PixelView *NewPixelView(MagickWand *wand)
-%
-% A description of each parameter follows:
-%
-% o wand: the wand.
-%
-*/
-
-static PixelWand ***AcquirePixelsThreadSet(const size_t number_wands,
- const size_t number_threads)
-{
- PixelWand
- ***pixel_wands;
-
- register ssize_t
- i;
-
- pixel_wands=(PixelWand ***) AcquireQuantumMemory(number_threads,
- sizeof(*pixel_wands));
- if (pixel_wands == (PixelWand ***) NULL)
- return((PixelWand ***) NULL);
- (void) ResetMagickMemory(pixel_wands,0,number_threads*sizeof(*pixel_wands));
- for (i=0; i < (ssize_t) number_threads; i++)
- {
- pixel_wands[i]=NewPixelWands(number_wands);
- if (pixel_wands[i] == (PixelWand **) NULL)
- return(DestroyPixelsThreadSet(pixel_wands,number_wands,number_threads));
- }
- return(pixel_wands);
-}
-
-WandExport PixelView *NewPixelView(MagickWand *wand)
-{
- PixelView
- *pixel_view;
-
- assert(wand != (MagickWand *) NULL);
- assert(wand->signature == MagickSignature);
- pixel_view=(PixelView *) AcquireMagickMemory(sizeof(*pixel_view));
- if (pixel_view == (PixelView *) NULL)
- ThrowWandFatalException(ResourceLimitFatalError,"MemoryAllocationFailed",
- GetExceptionMessage(errno));
- (void) ResetMagickMemory(pixel_view,0,sizeof(*pixel_view));
- pixel_view->id=AcquireWandId();
- (void) FormatLocaleString(pixel_view->name,MaxTextExtent,"%s-%.20g",
- PixelViewId,(double) pixel_view->id);
- pixel_view->exception=AcquireExceptionInfo();
- pixel_view->wand=wand;
- pixel_view->view=AcquireCacheView(pixel_view->wand->images);
- pixel_view->region.width=wand->images->columns;
- pixel_view->region.height=wand->images->rows;
- pixel_view->number_threads=GetOpenMPMaximumThreads();
- pixel_view->pixel_wands=AcquirePixelsThreadSet(pixel_view->region.width,
- pixel_view->number_threads);
- if (pixel_view->pixel_wands == (PixelWand ***) NULL)
- ThrowWandFatalException(ResourceLimitFatalError,"MemoryAllocationFailed",
- GetExceptionMessage(errno));
- pixel_view->debug=IsEventLogging();
- pixel_view->signature=WandSignature;
- return(pixel_view);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% N e w P i x e l V i e w R e g i o n %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% NewPixelViewRegion() returns a pixel view required for all other methods
-% in the Pixel View API.
-%
-% The format of the NewPixelViewRegion method is:
-%
-% PixelView *NewPixelViewRegion(MagickWand *wand,const ssize_t x,
-% const ssize_t y,const size_t width,const size_t height)
-%
-% A description of each parameter follows:
-%
-% o wand: the magick wand.
-%
-% o x,y,columns,rows: These values define the perimeter of a region of
-% pixel_wands view.
-%
-*/
-WandExport PixelView *NewPixelViewRegion(MagickWand *wand,const ssize_t x,
- const ssize_t y,const size_t width,const size_t height)
-{
- PixelView
- *pixel_view;
-
- assert(wand != (MagickWand *) NULL);
- assert(wand->signature == MagickSignature);
- pixel_view=(PixelView *) AcquireMagickMemory(sizeof(*pixel_view));
- if (pixel_view == (PixelView *) NULL)
- ThrowWandFatalException(ResourceLimitFatalError,"MemoryAllocationFailed",
- GetExceptionMessage(errno));
- (void) ResetMagickMemory(pixel_view,0,sizeof(*pixel_view));
- pixel_view->id=AcquireWandId();
- (void) FormatLocaleString(pixel_view->name,MaxTextExtent,"%s-%.20g",
- PixelViewId,(double) pixel_view->id);
- pixel_view->exception=AcquireExceptionInfo();
- pixel_view->view=AcquireCacheView(pixel_view->wand->images);
- pixel_view->wand=wand;
- pixel_view->region.width=width;
- pixel_view->region.height=height;
- pixel_view->region.x=x;
- pixel_view->region.y=y;
- pixel_view->number_threads=GetOpenMPMaximumThreads();
- pixel_view->pixel_wands=AcquirePixelsThreadSet(pixel_view->region.width,
- pixel_view->number_threads);
- if (pixel_view->pixel_wands == (PixelWand ***) NULL)
- ThrowWandFatalException(ResourceLimitFatalError,"MemoryAllocationFailed",
- GetExceptionMessage(errno));
- pixel_view->debug=IsEventLogging();
- pixel_view->signature=WandSignature;
- return(pixel_view);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% P i x e l G e t N e x t R o w %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% PixelGetNextRow() returns the next row as an array of pixel wands from the
-% pixel iterator.
-%
-% The format of the PixelGetNextRow method is:
-%
-% PixelWand **PixelGetNextRow(PixelIterator *iterator,
-% size_t *number_wands)
-%
-% A description of each parameter follows:
-%
-% o iterator: the pixel iterator.
-%
-% o number_wands: the number of pixel wands.
-%
-*/
-WandExport PixelWand **PixelGetNextRow(PixelIterator *iterator)
-{
- size_t
- number_wands;
-
- return(PixelGetNextIteratorRow(iterator,&number_wands));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% P i x e l I t e r a t o r G e t E x c e p t i o n %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% PixelIteratorGetException() returns the severity, reason, and description of
-% any error that occurs when using other methods in this API.
-%
-% The format of the PixelIteratorGetException method is:
-%
-% char *PixelIteratorGetException(const Pixeliterator *iterator,
-% ExceptionType *severity)
-%
-% A description of each parameter follows:
-%
-% o iterator: the pixel iterator.
-%
-% o severity: the severity of the error is returned here.
-%
-*/
-WandExport char *PixelIteratorGetException(const PixelIterator *iterator,
- ExceptionType *severity)
-{
- return(PixelGetIteratorException(iterator,severity));
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% S e t P i x e l V i e w I t e r a t o r %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% SetPixelViewIterator() iterates over the pixel view in parallel and calls
-% your set method for each scanline of the view. The pixel region is
-% confined to the image canvas-- that is no negative offsets or widths or
-% heights that exceed the image dimension. The pixels are initiallly
-% undefined and any settings you make in the callback method are automagically
-% synced back to your image.
-%
-% Use this pragma:
-%
-% #pragma omp critical
-%
-% to define a section of code in your callback set method that must be
-% executed by a single thread at a time.
-%
-% The format of the SetPixelViewIterator method is:
-%
-% MagickBooleanType SetPixelViewIterator(PixelView *destination,
-% SetPixelViewMethod set,void *context)
-%
-% A description of each parameter follows:
-%
-% o destination: the pixel view.
-%
-% o set: the set callback method.
-%
-% o context: the user defined context.
-%
-*/
-WandExport MagickBooleanType SetPixelViewIterator(PixelView *destination,
- SetPixelViewMethod set,void *context)
-{
-#define SetPixelViewTag "PixelView/Set"
-
- ExceptionInfo
- *exception;
-
- Image
- *destination_image;
-
- MagickBooleanType
- status;
-
- MagickOffsetType
- progress;
-
- ssize_t
- y;
-
- assert(destination != (PixelView *) NULL);
- assert(destination->signature == WandSignature);
- if (set == (SetPixelViewMethod) NULL)
- return(MagickFalse);
- destination_image=destination->wand->images;
- if (SetImageStorageClass(destination_image,DirectClass) == MagickFalse)
- return(MagickFalse);
- status=MagickTrue;
- progress=0;
- exception=destination->exception;
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(static,1) shared(progress,status)
-#endif
- for (y=destination->region.y; y < (ssize_t) destination->region.height; y++)
- {
- const int
- id = GetOpenMPThreadId();
-
- MagickBooleanType
- sync;
-
- register IndexPacket
- *restrict indexes;
-
- register ssize_t
- x;
-
- register PixelPacket
- *restrict pixels;
-
- if (status == MagickFalse)
- continue;
- pixels=GetCacheViewAuthenticPixels(destination->view,destination->region.x,
- y,destination->region.width,1,exception);
- if (pixels == (PixelPacket *) NULL)
- {
- InheritException(destination->exception,GetCacheViewException(
- destination->view));
- status=MagickFalse;
- continue;
- }
- indexes=GetCacheViewAuthenticIndexQueue(destination->view);
- if (set(destination,context) == MagickFalse)
- status=MagickFalse;
- for (x=0; x < (ssize_t) destination->region.width; x++)
- PixelGetQuantumColor(destination->pixel_wands[id][x],pixels+x);
- if (destination_image->colorspace == CMYKColorspace)
- for (x=0; x < (ssize_t) destination->region.width; x++)
- SetPixelIndex(indexes+x,PixelGetBlackQuantum(
- destination->pixel_wands[id][x]));
- sync=SyncCacheViewAuthenticPixels(destination->view,exception);
- if (sync == MagickFalse)
- {
- InheritException(destination->exception,GetCacheViewException(
- destination->view));
- status=MagickFalse;
- }
- if (destination_image->progress_monitor != (MagickProgressMonitor) NULL)
- {
- MagickBooleanType
- proceed;
-
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp critical (MagickWand_SetPixelViewIterator)
-#endif
- proceed=SetImageProgress(destination_image,SetPixelViewTag,progress++,
- destination->region.height);
- if (proceed == MagickFalse)
- status=MagickFalse;
- }
- }
- return(status);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% T r a n s f e r P i x e l V i e w I t e r a t o r %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% TransferPixelViewIterator() iterates over two pixel views in parallel and
-% calls your transfer method for each scanline of the view. The source pixel
-% region is not confined to the image canvas-- that is you can include
-% negative offsets or widths or heights that exceed the image dimension.
-% However, the destination pixel view is confined to the image canvas-- that
-% is no negative offsets or widths or heights that exceed the image dimension
-% are permitted.
-%
-% Use this pragma:
-%
-% #pragma omp critical
-%
-% to define a section of code in your callback transfer method that must be
-% executed by a single thread at a time.
-%
-% The format of the TransferPixelViewIterator method is:
-%
-% MagickBooleanType TransferPixelViewIterator(PixelView *source,
-% PixelView *destination,TransferPixelViewMethod transfer,void *context)
-%
-% A description of each parameter follows:
-%
-% o source: the source pixel view.
-%
-% o destination: the destination pixel view.
-%
-% o transfer: the transfer callback method.
-%
-% o context: the user defined context.
-%
-*/
-WandExport MagickBooleanType TransferPixelViewIterator(PixelView *source,
- PixelView *destination,TransferPixelViewMethod transfer,void *context)
-{
-#define TransferPixelViewTag "PixelView/Transfer"
-
- ExceptionInfo
- *exception;
-
- Image
- *destination_image,
- *source_image;
-
- MagickBooleanType
- status;
-
- MagickOffsetType
- progress;
-
- ssize_t
- y;
-
- assert(source != (PixelView *) NULL);
- assert(source->signature == WandSignature);
- if (transfer == (TransferPixelViewMethod) NULL)
- return(MagickFalse);
- source_image=source->wand->images;
- destination_image=destination->wand->images;
- if (SetImageStorageClass(destination_image,DirectClass) == MagickFalse)
- return(MagickFalse);
- status=MagickTrue;
- progress=0;
- exception=destination->exception;
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(static,1) shared(progress,status)
-#endif
- for (y=source->region.y; y < (ssize_t) source->region.height; y++)
- {
- const int
- id = GetOpenMPThreadId();
-
- MagickBooleanType
- sync;
-
- register const IndexPacket
- *restrict indexes;
-
- register const PixelPacket
- *restrict pixels;
-
- register IndexPacket
- *restrict destination_indexes;
-
- register ssize_t
- x;
-
- register PixelPacket
- *restrict destination_pixels;
-
- if (status == MagickFalse)
- continue;
- pixels=GetCacheViewVirtualPixels(source->view,source->region.x,y,
- source->region.width,1,source->exception);
- if (pixels == (const PixelPacket *) NULL)
- {
- status=MagickFalse;
- continue;
- }
- indexes=GetCacheViewVirtualIndexQueue(source->view);
- for (x=0; x < (ssize_t) source->region.width; x++)
- PixelSetQuantumColor(source->pixel_wands[id][x],pixels+x);
- if (source_image->colorspace == CMYKColorspace)
- for (x=0; x < (ssize_t) source->region.width; x++)
- PixelSetBlackQuantum(source->pixel_wands[id][x],
- GetPixelIndex(indexes+x));
- if (source_image->storage_class == PseudoClass)
- for (x=0; x < (ssize_t) source->region.width; x++)
- PixelSetIndex(source->pixel_wands[id][x],
- GetPixelIndex(indexes+x));
- destination_pixels=GetCacheViewAuthenticPixels(destination->view,
- destination->region.x,y,destination->region.width,1,exception);
- if (destination_pixels == (PixelPacket *) NULL)
- {
- status=MagickFalse;
- continue;
- }
- destination_indexes=GetCacheViewAuthenticIndexQueue(destination->view);
- for (x=0; x < (ssize_t) destination->region.width; x++)
- PixelSetQuantumColor(destination->pixel_wands[id][x],pixels+x);
- if (destination_image->colorspace == CMYKColorspace)
- for (x=0; x < (ssize_t) destination->region.width; x++)
- PixelSetBlackQuantum(destination->pixel_wands[id][x],
- GetPixelIndex(indexes+x));
- if (destination_image->storage_class == PseudoClass)
- for (x=0; x < (ssize_t) destination->region.width; x++)
- PixelSetIndex(destination->pixel_wands[id][x],
- GetPixelIndex(indexes+x));
- if (transfer(source,destination,context) == MagickFalse)
- status=MagickFalse;
- for (x=0; x < (ssize_t) destination->region.width; x++)
- PixelGetQuantumColor(destination->pixel_wands[id][x],
- destination_pixels+x);
- if (destination_image->colorspace == CMYKColorspace)
- for (x=0; x < (ssize_t) destination->region.width; x++)
- SetPixelIndex(destination_indexes+x,PixelGetBlackQuantum(
- destination->pixel_wands[id][x]));
- sync=SyncCacheViewAuthenticPixels(destination->view,exception);
- if (sync == MagickFalse)
- {
- InheritException(destination->exception,GetCacheViewException(
- source->view));
- status=MagickFalse;
- }
- if (source_image->progress_monitor != (MagickProgressMonitor) NULL)
- {
- MagickBooleanType
- proceed;
-
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp critical (MagickWand_TransferPixelViewIterator)
-#endif
- proceed=SetImageProgress(source_image,TransferPixelViewTag,progress++,
- source->region.height);
- if (proceed == MagickFalse)
- status=MagickFalse;
- }
- }
- return(status);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
-% U p d a t e P i x e l V i e w I t e r a t o r %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% UpdatePixelViewIterator() iterates over the pixel view in parallel and calls
-% your update method for each scanline of the view. The pixel region is
-% confined to the image canvas-- that is no negative offsets or widths or
-% heights that exceed the image dimension are permitted. Updates to pixels
-% in your callback are automagically synced back to the image.
-%
-% Use this pragma:
-%
-% #pragma omp critical
-%
-% to define a section of code in your callback update method that must be
-% executed by a single thread at a time.
-%
-% The format of the UpdatePixelViewIterator method is:
-%
-% MagickBooleanType UpdatePixelViewIterator(PixelView *source,
-% UpdatePixelViewMethod update,void *context)
-%
-% A description of each parameter follows:
-%
-% o source: the source pixel view.
-%
-% o update: the update callback method.
-%
-% o context: the user defined context.
-%
-*/
-WandExport MagickBooleanType UpdatePixelViewIterator(PixelView *source,
- UpdatePixelViewMethod update,void *context)
-{
-#define UpdatePixelViewTag "PixelView/Update"
-
- ExceptionInfo
- *exception;
-
- Image
- *source_image;
-
- MagickBooleanType
- status;
-
- MagickOffsetType
- progress;
-
- ssize_t
- y;
-
- assert(source != (PixelView *) NULL);
- assert(source->signature == WandSignature);
- if (update == (UpdatePixelViewMethod) NULL)
- return(MagickFalse);
- source_image=source->wand->images;
- if (SetImageStorageClass(source_image,DirectClass) == MagickFalse)
- return(MagickFalse);
- status=MagickTrue;
- progress=0;
- exception=source->exception;
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp parallel for schedule(static,1) shared(progress,status)
-#endif
- for (y=source->region.y; y < (ssize_t) source->region.height; y++)
- {
- const int
- id = GetOpenMPThreadId();
-
- register IndexPacket
- *restrict indexes;
-
- register ssize_t
- x;
-
- register PixelPacket
- *restrict pixels;
-
- if (status == MagickFalse)
- continue;
- pixels=GetCacheViewAuthenticPixels(source->view,source->region.x,y,
- source->region.width,1,exception);
- if (pixels == (PixelPacket *) NULL)
- {
- InheritException(source->exception,GetCacheViewException(
- source->view));
- status=MagickFalse;
- continue;
- }
- indexes=GetCacheViewAuthenticIndexQueue(source->view);
- for (x=0; x < (ssize_t) source->region.width; x++)
- PixelSetQuantumColor(source->pixel_wands[id][x],pixels+x);
- if (source_image->colorspace == CMYKColorspace)
- for (x=0; x < (ssize_t) source->region.width; x++)
- PixelSetBlackQuantum(source->pixel_wands[id][x],
- GetPixelIndex(indexes+x));
- if (update(source,context) == MagickFalse)
- status=MagickFalse;
- for (x=0; x < (ssize_t) source->region.width; x++)
- PixelGetQuantumColor(source->pixel_wands[id][x],pixels+x);
- if (source_image->colorspace == CMYKColorspace)
- for (x=0; x < (ssize_t) source->region.width; x++)
- SetPixelIndex(indexes+x,PixelGetBlackQuantum(
- source->pixel_wands[id][x]));
- if (SyncCacheViewAuthenticPixels(source->view,exception) == MagickFalse)
- {
- InheritException(source->exception,GetCacheViewException(source->view));
- status=MagickFalse;
- }
- if (source_image->progress_monitor != (MagickProgressMonitor) NULL)
- {
- MagickBooleanType
- proceed;
-
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
- #pragma omp critical (MagickWand_UpdatePixelViewIterator)
-#endif
- proceed=SetImageProgress(source_image,UpdatePixelViewTag,progress++,
- source->region.height);
- if (proceed == MagickFalse)
- status=MagickFalse;
- }
- }
- return(status);
-}
-#endif
diff --git a/wand/deprecate.h b/wand/deprecate.h
deleted file mode 100644
index 8e91311..0000000
--- a/wand/deprecate.h
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization
- dedicated to making software imaging solutions freely available.
-
- You may not use this file except in compliance with the License.
- obtain a copy of the License at
-
- http://www.imagemagick.org/script/license.php
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- MagickCore deprecated methods.
-*/
-#ifndef _MAGICKWAND_DEPRECATE_H
-#define _MAGICKWAND_DEPRECATE_H
-
-#if defined(__cplusplus) || defined(c_plusplus)
-extern "C" {
-#endif
-
-#if !defined(MAGICKCORE_EXCLUDE_DEPRECATED)
-
-#include "wand/drawing-wand.h"
-#include "wand/magick-wand.h"
-#include "wand/pixel-iterator.h"
-#include "wand/pixel-wand.h"
-
-typedef struct _DrawingWand
- *DrawContext;
-
-typedef struct _PixelView
- PixelView;
-
-typedef MagickBooleanType
- (*DuplexTransferPixelViewMethod)(const PixelView *,const PixelView *,
- PixelView *,void *),
- (*GetPixelViewMethod)(const PixelView *,void *),
- (*SetPixelViewMethod)(PixelView *,void *),
- (*TransferPixelViewMethod)(const PixelView *,PixelView *,void *),
- (*UpdatePixelViewMethod)(PixelView *,void *);
-
-extern WandExport char
- *GetPixelViewException(const PixelView *,ExceptionType *)
- magick_attribute((deprecated));
-
-extern WandExport double
- DrawGetFillAlpha(const DrawingWand *) magick_attribute((deprecated)),
- DrawGetStrokeAlpha(const DrawingWand *) magick_attribute((deprecated));
-
-extern WandExport DrawInfo
- *DrawPeekGraphicWand(const DrawingWand *) magick_attribute((deprecated));
-
-extern WandExport char
- *MagickDescribeImage(MagickWand *) magick_attribute((deprecated)),
- *MagickGetImageAttribute(MagickWand *,const char *)
- magick_attribute((deprecated)),
- *PixelIteratorGetException(const PixelIterator *,ExceptionType *)
- magick_attribute((deprecated));
-
-extern WandExport ssize_t
- MagickGetImageIndex(MagickWand *) magick_attribute((deprecated));
-
-extern WandExport MagickBooleanType
- DuplexTransferPixelViewIterator(PixelView *,PixelView *,PixelView *,
- DuplexTransferPixelViewMethod,void *) magick_attribute((deprecated)),
- GetPixelViewIterator(PixelView *,GetPixelViewMethod,void *)
- magick_attribute((deprecated)),
- IsPixelView(const PixelView *) magick_attribute((deprecated)),
- MagickClipPathImage(MagickWand *,const char *,const MagickBooleanType)
- magick_attribute((deprecated)),
- MagickColorFloodfillImage(MagickWand *,const PixelWand *,const double,
- const PixelWand *,const ssize_t,const ssize_t)
- magick_attribute((deprecated)),
- MagickGetImageChannelExtrema(MagickWand *,const ChannelType,size_t *,
- size_t *) magick_attribute((deprecated)),
- MagickGetImageExtrema(MagickWand *,size_t *,size_t *)
- magick_attribute((deprecated)),
- MagickGetImageMatte(MagickWand *) magick_attribute((deprecated)),
- MagickGetImagePixels(MagickWand *,const ssize_t,const ssize_t,const size_t,
- const size_t,const char *,const StorageType,void *)
- magick_attribute((deprecated)),
- MagickMapImage(MagickWand *,const MagickWand *,const MagickBooleanType)
- magick_attribute((deprecated)),
- MagickMatteFloodfillImage(MagickWand *,const double,const double,
- const PixelWand *,const ssize_t,const ssize_t)
- magick_attribute((deprecated)),
- MagickMedianFilterImage(MagickWand *,const double)
- magick_attribute((deprecated)),
- MagickModeImage(MagickWand *,const double) magick_attribute((deprecated)),
- MagickReduceNoiseImage(MagickWand *,const double)
- magick_attribute((deprecated)),
- MagickRemapImage(MagickWand *,const MagickWand *,const DitherMethod),
- MagickOpaqueImage(MagickWand *,const PixelWand *,const PixelWand *,
- const double) magick_attribute((deprecated)),
- MagickPaintFloodfillImage(MagickWand *,const ChannelType,const PixelWand *,
- const double,const PixelWand *,const ssize_t,const ssize_t)
- magick_attribute((deprecated)),
- MagickPaintOpaqueImage(MagickWand *,const PixelWand *,const PixelWand *,
- const double) magick_attribute((deprecated)),
- MagickPaintOpaqueImageChannel(MagickWand *,const ChannelType,
- const PixelWand *,const PixelWand *,const double)
- magick_attribute((deprecated)),
- MagickPaintTransparentImage(MagickWand *,const PixelWand *,const double,
- const double) magick_attribute((deprecated)),
- MagickRecolorImage(MagickWand *,const size_t,const double *)
- magick_attribute((deprecated)),
- MagickSetImageAttribute(MagickWand *,const char *,const char *)
- magick_attribute((deprecated)),
- MagickSetImageIndex(MagickWand *,const ssize_t)
- magick_attribute((deprecated)),
- MagickSetImageOption(MagickWand *,const char *,const char *,const char *)
- magick_attribute((deprecated)),
- MagickSetImagePixels(MagickWand *,const ssize_t,const ssize_t,const size_t,
- const size_t,const char *,const StorageType,const void *)
- magick_attribute((deprecated)),
- MagickTransparentImage(MagickWand *,const PixelWand *,const double,
- const double) magick_attribute((deprecated)),
- SetPixelViewIterator(PixelView *,SetPixelViewMethod,void *)
- magick_attribute((deprecated)),
- TransferPixelViewIterator(PixelView *,PixelView *,TransferPixelViewMethod,
- void *) magick_attribute((deprecated)),
- UpdatePixelViewIterator(PixelView *,UpdatePixelViewMethod,void *)
- magick_attribute((deprecated));
-
-extern WandExport MagickWand
- *GetPixelViewWand(const PixelView *) magick_attribute((deprecated)),
- *MagickAverageImages(MagickWand *) magick_attribute((deprecated)),
- *MagickFlattenImages(MagickWand *) magick_attribute((deprecated)),
- *MagickMaximumImages(MagickWand *) magick_attribute((deprecated)),
- *MagickMinimumImages(MagickWand *) magick_attribute((deprecated)),
- *MagickMosaicImages(MagickWand *) magick_attribute((deprecated)),
- *MagickRegionOfInterestImage(MagickWand *,const size_t,const size_t,
- const ssize_t,const ssize_t) magick_attribute((deprecated));
-
-extern WandExport MagickSizeType
- MagickGetImageSize(MagickWand *) magick_attribute((deprecated));
-
-extern WandExport PixelView
- *ClonePixelView(const PixelView *) magick_attribute((deprecated)),
- *DestroyPixelView(PixelView *) magick_attribute((deprecated)),
- *NewPixelView(MagickWand *) magick_attribute((deprecated)),
- *NewPixelViewRegion(MagickWand *,const ssize_t,const ssize_t,const size_t,
- const size_t) magick_attribute((deprecated));
-
-extern WandExport PixelWand
- **GetPixelViewPixels(const PixelView *) magick_attribute((deprecated)),
- **PixelGetNextRow(PixelIterator *) magick_attribute((deprecated));
-
-extern WandExport size_t
- GetPixelViewHeight(const PixelView *) magick_attribute((deprecated)),
- GetPixelViewWidth(const PixelView *) magick_attribute((deprecated));
-
-extern WandExport ssize_t
- GetPixelViewX(const PixelView *) magick_attribute((deprecated)),
- GetPixelViewY(const PixelView *) magick_attribute((deprecated));
-
-extern WandExport unsigned char
- *MagickWriteImageBlob(MagickWand *,size_t *) magick_attribute((deprecated));
-
-extern WandExport void
- DrawPopGraphicContext(DrawingWand *) magick_attribute((deprecated)),
- DrawPushGraphicContext(DrawingWand *) magick_attribute((deprecated)),
- DrawSetFillAlpha(DrawingWand *,const double) magick_attribute((deprecated)),
- DrawSetStrokeAlpha(DrawingWand *,const double) magick_attribute((deprecated));
-
-#endif
-
-#if defined(__cplusplus) || defined(c_plusplus)
-}
-#endif
-
-#endif
diff --git a/wand/magick-wand.h b/wand/magick-wand.h
deleted file mode 100644
index 1ceade4..0000000
--- a/wand/magick-wand.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization
- dedicated to making software imaging solutions freely available.
-
- You may not use this file except in compliance with the License.
- obtain a copy of the License at
-
- http://www.imagemagick.org/script/license.php
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- MagickWand API (deprecated, use magick-wand.h instead).
-*/
-
-#ifndef _MAGICKWAND_MAGICK_WAND_DEPRECATED_H
-#define _MAGICKWAND_MAGICK_WAND_DEPRECATED_H
-
-#include "wand/MagickWand.h"
-
-#endif
diff --git a/wand/magick_wand.h b/wand/magick_wand.h
deleted file mode 100644
index 1ceade4..0000000
--- a/wand/magick_wand.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization
- dedicated to making software imaging solutions freely available.
-
- You may not use this file except in compliance with the License.
- obtain a copy of the License at
-
- http://www.imagemagick.org/script/license.php
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
- MagickWand API (deprecated, use magick-wand.h instead).
-*/
-
-#ifndef _MAGICKWAND_MAGICK_WAND_DEPRECATED_H
-#define _MAGICKWAND_MAGICK_WAND_DEPRECATED_H
-
-#include "wand/MagickWand.h"
-
-#endif