diff --git a/Magick++/lib/Image.cpp b/Magick++/lib/Image.cpp
index 0a8ae32..05a61bf 100644
--- a/Magick++/lib/Image.cpp
+++ b/Magick++/lib/Image.cpp
@@ -345,12 +345,12 @@
{
ExceptionInfo exceptionInfo;
GetExceptionInfo( &exceptionInfo );
- PushPixelComponentMap( image(), channel_);
+ PushPixelChannelMap( image(), channel_);
MagickCore::Image* newImage =
AddNoiseImage ( image(),
noiseType_,
&exceptionInfo );
- PopPixelComponentMap( image() );
+ PopPixelChannelMap( image() );
replaceImage( newImage );
throwException( exceptionInfo );
(void) DestroyExceptionInfo( &exceptionInfo );
@@ -495,10 +495,10 @@
{
ExceptionInfo exceptionInfo;
GetExceptionInfo( &exceptionInfo );
- PushPixelComponentMap( image(), channel_ );
+ PushPixelChannelMap( image(), channel_ );
MagickCore::Image* newImage =
BlurImage( image(), radius_, sigma_, &exceptionInfo);
- PopPixelComponentMap( image() );
+ PopPixelChannelMap( image() );
replaceImage( newImage );
throwException( exceptionInfo );
(void) DestroyExceptionInfo( &exceptionInfo );
@@ -522,9 +522,9 @@
void Magick::Image::channel ( const ChannelType channel_ )
{
modifyImage();
- PushPixelComponentMap( image(), channel_ );
+ PushPixelChannelMap( image(), channel_ );
SeparateImage ( image() );
- PopPixelComponentMap( image() );
+ PopPixelChannelMap( image() );
throwImageException();
}
@@ -1125,10 +1125,10 @@
{
ExceptionInfo exceptionInfo;
GetExceptionInfo( &exceptionInfo );
- PushPixelComponentMap( image(), channel );
+ PushPixelChannelMap( image(), channel );
MagickCore::Image* newImage =
FxImage ( image(), expression.c_str(), &exceptionInfo );
- PopPixelComponentMap( image() );
+ PopPixelChannelMap( image() );
replaceImage( newImage );
throwException( exceptionInfo );
(void) DestroyExceptionInfo( &exceptionInfo );
@@ -1175,10 +1175,10 @@
{
ExceptionInfo exceptionInfo;
GetExceptionInfo( &exceptionInfo );
- PushPixelComponentMap( image(), channel_ );
+ PushPixelChannelMap( image(), channel_ );
MagickCore::Image* newImage =
GaussianBlurImage( image(), width_, sigma_, &exceptionInfo );
- PopPixelComponentMap( image() );
+ PopPixelChannelMap( image() );
replaceImage( newImage );
throwException( exceptionInfo );
(void) DestroyExceptionInfo( &exceptionInfo );
@@ -1282,10 +1282,10 @@
target.green=static_cast<PixelPacket>(target_).green;
target.blue=static_cast<PixelPacket>(target_).blue;
target.alpha=alpha_;
- PushPixelComponentMap( image(), AlphaChannel );
+ PushPixelChannelMap( image(), AlphaChannel );
FloodfillPaintImage ( image(), options()->drawInfo(), &target, x_, y_,
method_ == FloodfillMethod ? MagickFalse : MagickTrue);
- PopPixelComponentMap( image() );
+ PopPixelChannelMap( image() );
throwImageException();
}
@@ -1486,9 +1486,9 @@
{
ExceptionInfo exceptionInfo;
GetExceptionInfo( &exceptionInfo );
- PushPixelComponentMap( image(), channel_ );
+ PushPixelChannelMap( image(), channel_ );
EvaluateImage( image(), operator_, rvalue_, &exceptionInfo);
- PopPixelComponentMap( image() );
+ PopPixelChannelMap( image() );
throwException( exceptionInfo );
(void) DestroyExceptionInfo( &exceptionInfo );
}
@@ -1509,9 +1509,9 @@
geometry.y = y_;
MagickCore::Image *crop_image = CropImage( image(), &geometry,
&exceptionInfo );
- PushPixelComponentMap( image(), channel_);
+ PushPixelChannelMap( image(), channel_);
EvaluateImage( crop_image, operator_, rvalue_, &exceptionInfo );
- PopPixelComponentMap( image() );
+ PopPixelChannelMap( image() );
(void) CompositeImage( image(), image()->matte != MagickFalse ?
OverCompositeOp : CopyCompositeOp, crop_image, geometry.x, geometry.y );
crop_image = DestroyImageList(crop_image);
@@ -1551,11 +1551,11 @@
ExceptionInfo exceptionInfo;
GetExceptionInfo( &exceptionInfo );
modifyImage();
- PushPixelComponentMap( image(), channel_);
+ PushPixelChannelMap( image(), channel_);
(void) RandomThresholdImage( image(),
static_cast<std::string>(thresholds_).c_str(),
&exceptionInfo );
- PopPixelComponentMap( image() );
+ PopPixelChannelMap( image() );
throwImageException();
(void) DestroyExceptionInfo( &exceptionInfo );
}
@@ -1868,13 +1868,13 @@
{
ExceptionInfo exceptionInfo;
GetExceptionInfo( &exceptionInfo );
- PushPixelComponentMap( image(), channel_ );
+ PushPixelChannelMap( image(), channel_ );
MagickCore::Image* newImage =
SharpenImage( image(),
radius_,
sigma_,
&exceptionInfo );
- PopPixelComponentMap( image() );
+ PopPixelChannelMap( image() );
replaceImage( newImage );
throwException( exceptionInfo );
(void) DestroyExceptionInfo( &exceptionInfo );
@@ -1939,10 +1939,10 @@
ExceptionInfo exceptionInfo;
GetExceptionInfo( &exceptionInfo );
- PushPixelComponentMap( image(), channel );
+ PushPixelChannelMap( image(), channel );
MagickCore::Image* newImage = SparseColorImage ( image(), method,
number_arguments, arguments, &exceptionInfo );
- PopPixelComponentMap( image() );
+ PopPixelChannelMap( image() );
replaceImage( newImage );
throwException( exceptionInfo );
(void) DestroyExceptionInfo( &exceptionInfo );
@@ -2132,7 +2132,7 @@
{
ExceptionInfo exceptionInfo;
GetExceptionInfo( &exceptionInfo );
- PushPixelComponentMap( image(), channel_ );
+ PushPixelChannelMap( image(), channel_ );
MagickCore::Image* newImage =
UnsharpMaskImage( image(),
radius_,
@@ -2140,7 +2140,7 @@
amount_,
threshold_,
&exceptionInfo );
- PopPixelComponentMap( image() );
+ PopPixelChannelMap( image() );
replaceImage( newImage );
throwException( exceptionInfo );
(void) DestroyExceptionInfo( &exceptionInfo );
@@ -3572,7 +3572,7 @@
ExceptionInfo exceptionInfo;
GetExceptionInfo( &exceptionInfo );
- PushPixelComponentMap( image(), RedChannel);
+ PushPixelChannelMap( image(), RedChannel);
(void) GetImageRange( image(),&minimum,&maximum,&exceptionInfo);
statistics->red.minimum=minimum;
statistics->red.maximum=maximum;
@@ -3580,9 +3580,9 @@
&statistics->red.standard_deviation,&exceptionInfo);
(void) GetImageKurtosis( image(),&statistics->red.kurtosis,
&statistics->red.skewness,&exceptionInfo);
- PopPixelComponentMap( image() );
+ PopPixelChannelMap( image() );
- PushPixelComponentMap( image(), GreenChannel);
+ PushPixelChannelMap( image(), GreenChannel);
(void) GetImageRange( image(),&minimum,&maximum,&exceptionInfo);
statistics->green.minimum=minimum;
statistics->green.maximum=maximum;
@@ -3590,9 +3590,9 @@
&statistics->green.standard_deviation,&exceptionInfo);
(void) GetImageKurtosis( image(),&statistics->green.kurtosis,
&statistics->green.skewness,&exceptionInfo);
- PopPixelComponentMap( image() );
+ PopPixelChannelMap( image() );
- PushPixelComponentMap( image(), GreenChannel);
+ PushPixelChannelMap( image(), GreenChannel);
(void) GetImageRange( image(),&minimum,&maximum,&exceptionInfo);
statistics->blue.minimum=minimum;
statistics->blue.maximum=maximum;
@@ -3600,9 +3600,9 @@
&statistics->blue.standard_deviation,&exceptionInfo);
(void) GetImageKurtosis( image(),&statistics->blue.kurtosis,
&statistics->blue.skewness,&exceptionInfo);
- PopPixelComponentMap( image() );
+ PopPixelChannelMap( image() );
- PushPixelComponentMap( image(), AlphaChannel);
+ PushPixelChannelMap( image(), AlphaChannel);
(void) GetImageRange( image(),&minimum,&maximum,&exceptionInfo);
statistics->alpha.minimum=minimum;
statistics->alpha.maximum=maximum;
@@ -3610,7 +3610,7 @@
&statistics->alpha.standard_deviation,&exceptionInfo);
(void) GetImageKurtosis( image(),&statistics->alpha.kurtosis,
&statistics->alpha.skewness,&exceptionInfo);
- PopPixelComponentMap( image() );
+ PopPixelChannelMap( image() );
throwException( exceptionInfo );
(void) DestroyExceptionInfo( &exceptionInfo );