diff --git a/Magick++/lib/Image.cpp b/Magick++/lib/Image.cpp
index d31bc16..6538f62 100644
--- a/Magick++/lib/Image.cpp
+++ b/Magick++/lib/Image.cpp
@@ -342,12 +342,12 @@
{
ExceptionInfo exceptionInfo;
GetExceptionInfo( &exceptionInfo );
- ChannelType channel_mask = SetPixelChannelMask( image(), channel_);
+ ChannelType channel_mask = SetImageChannelMask( image(), channel_);
MagickCore::Image* newImage =
AddNoiseImage ( image(),
noiseType_, 1.0,
&exceptionInfo );
- (void) SetPixelChannelMapMask( image(), channel_mask );
+ (void) SetPixelChannelMask( image(), channel_mask );
replaceImage( newImage );
throwException( exceptionInfo );
(void) DestroyExceptionInfo( &exceptionInfo );
@@ -498,10 +498,10 @@
{
ExceptionInfo exceptionInfo;
GetExceptionInfo( &exceptionInfo );
- ChannelType channel_mask = SetPixelChannelMask( image(), channel_ );
+ ChannelType channel_mask = SetImageChannelMask( image(), channel_ );
MagickCore::Image* newImage =
BlurImage( image(), radius_, sigma_, &exceptionInfo);
- (void) SetPixelChannelMapMask( image(), channel_mask );
+ (void) SetPixelChannelMask( image(), channel_mask );
replaceImage( newImage );
throwException( exceptionInfo );
(void) DestroyExceptionInfo( &exceptionInfo );
@@ -1201,10 +1201,10 @@
{
ExceptionInfo exceptionInfo;
GetExceptionInfo( &exceptionInfo );
- ChannelType channel_mask = SetPixelChannelMask( image(), channel );
+ ChannelType channel_mask = SetImageChannelMask( image(), channel );
MagickCore::Image* newImage =
FxImage ( image(), expression.c_str(), &exceptionInfo );
- (void) SetPixelChannelMapMask( image(), channel_mask );
+ (void) SetPixelChannelMask( image(), channel_mask );
replaceImage( newImage );
throwException( exceptionInfo );
(void) DestroyExceptionInfo( &exceptionInfo );
@@ -1258,10 +1258,10 @@
{
ExceptionInfo exceptionInfo;
GetExceptionInfo( &exceptionInfo );
- ChannelType channel_mask = SetPixelChannelMask( image(), channel_ );
+ ChannelType channel_mask = SetImageChannelMask( image(), channel_ );
MagickCore::Image* newImage =
GaussianBlurImage( image(), width_, sigma_, &exceptionInfo );
- (void) SetPixelChannelMapMask( image(), channel_mask );
+ (void) SetPixelChannelMask( image(), channel_mask );
replaceImage( newImage );
throwException( exceptionInfo );
(void) DestroyExceptionInfo( &exceptionInfo );
@@ -1374,12 +1374,12 @@
target.green=static_cast<PixelInfo>(target_).green;
target.blue=static_cast<PixelInfo>(target_).blue;
target.alpha=alpha_;
- ChannelType channel_mask = SetPixelChannelMask( image(), AlphaChannel );
+ ChannelType channel_mask = SetImageChannelMask( image(), AlphaChannel );
ExceptionInfo exceptionInfo;
GetExceptionInfo( &exceptionInfo );
FloodfillPaintImage ( image(), options()->drawInfo(), &target, x_, y_,
method_ == FloodfillMethod ? MagickFalse : MagickTrue, &exceptionInfo);
- (void) SetPixelChannelMapMask( image(), channel_mask );
+ (void) SetPixelChannelMask( image(), channel_mask );
throwException( exceptionInfo );
(void) DestroyExceptionInfo( &exceptionInfo );
}
@@ -1605,9 +1605,9 @@
{
ExceptionInfo exceptionInfo;
GetExceptionInfo( &exceptionInfo );
- ChannelType channel_mask = SetPixelChannelMask( image(), channel_ );
+ ChannelType channel_mask = SetImageChannelMask( image(), channel_ );
EvaluateImage( image(), operator_, rvalue_, &exceptionInfo);
- (void) SetPixelChannelMapMask( image(), channel_mask );
+ (void) SetPixelChannelMask( image(), channel_mask );
throwException( exceptionInfo );
(void) DestroyExceptionInfo( &exceptionInfo );
}
@@ -1628,9 +1628,9 @@
geometry.y = y_;
MagickCore::Image *crop_image = CropImage( image(), &geometry,
&exceptionInfo );
- ChannelType channel_mask = SetPixelChannelMask( image(), channel_);
+ ChannelType channel_mask = SetImageChannelMask( image(), channel_);
EvaluateImage( crop_image, operator_, rvalue_, &exceptionInfo );
- (void) SetPixelChannelMapMask( image(), channel_mask );
+ (void) SetPixelChannelMask( image(), channel_mask );
(void) CompositeImage( image(), crop_image, image()->matte != MagickFalse ?
OverCompositeOp : CopyCompositeOp, MagickFalse, geometry.x, geometry.y,
&exceptionInfo );
@@ -1674,11 +1674,11 @@
ExceptionInfo exceptionInfo;
GetExceptionInfo( &exceptionInfo );
modifyImage();
- ChannelType channel_mask = SetPixelChannelMask( image(), channel_);
+ ChannelType channel_mask = SetImageChannelMask( image(), channel_);
(void) RandomThresholdImage( image(),
static_cast<std::string>(thresholds_).c_str(),
&exceptionInfo );
- (void) SetPixelChannelMapMask( image(), channel_mask );
+ (void) SetPixelChannelMask( image(), channel_mask );
throwImageException();
(void) DestroyExceptionInfo( &exceptionInfo );
}
@@ -1999,13 +1999,13 @@
{
ExceptionInfo exceptionInfo;
GetExceptionInfo( &exceptionInfo );
- ChannelType channel_mask = SetPixelChannelMask( image(), channel_ );
+ ChannelType channel_mask = SetImageChannelMask( image(), channel_ );
MagickCore::Image* newImage =
SharpenImage( image(),
radius_,
sigma_,
&exceptionInfo );
- (void) SetPixelChannelMapMask( image(), channel_mask );
+ (void) SetPixelChannelMask( image(), channel_mask );
replaceImage( newImage );
throwException( exceptionInfo );
(void) DestroyExceptionInfo( &exceptionInfo );
@@ -2076,10 +2076,10 @@
ExceptionInfo exceptionInfo;
GetExceptionInfo( &exceptionInfo );
- ChannelType channel_mask = SetPixelChannelMask( image(), channel );
+ ChannelType channel_mask = SetImageChannelMask( image(), channel );
MagickCore::Image* newImage = SparseColorImage ( image(), method,
number_arguments, arguments, &exceptionInfo );
- (void) SetPixelChannelMapMask( image(), channel_mask );
+ (void) SetPixelChannelMask( image(), channel_mask );
replaceImage( newImage );
throwException( exceptionInfo );
(void) DestroyExceptionInfo( &exceptionInfo );
@@ -2290,7 +2290,7 @@
{
ExceptionInfo exceptionInfo;
GetExceptionInfo( &exceptionInfo );
- ChannelType channel_mask = SetPixelChannelMask( image(), channel_ );
+ ChannelType channel_mask = SetImageChannelMask( image(), channel_ );
MagickCore::Image* newImage =
UnsharpMaskImage( image(),
radius_,
@@ -2298,7 +2298,7 @@
amount_,
threshold_,
&exceptionInfo );
- (void) SetPixelChannelMapMask( image(), channel_mask );
+ (void) SetPixelChannelMask( image(), channel_mask );
replaceImage( newImage );
throwException( exceptionInfo );
(void) DestroyExceptionInfo( &exceptionInfo );
@@ -3767,7 +3767,7 @@
ExceptionInfo exceptionInfo;
GetExceptionInfo( &exceptionInfo );
- ChannelType channel_mask = SetPixelChannelMask( image(), RedChannel);
+ ChannelType channel_mask = SetImageChannelMask( image(), RedChannel);
(void) GetImageRange( image(),&minimum,&maximum,&exceptionInfo);
statistics->red.minimum=minimum;
statistics->red.maximum=maximum;
@@ -3775,9 +3775,9 @@
&statistics->red.standard_deviation,&exceptionInfo);
(void) GetImageKurtosis( image(),&statistics->red.kurtosis,
&statistics->red.skewness,&exceptionInfo);
- (void) SetPixelChannelMapMask( image(), channel_mask );
+ (void) SetPixelChannelMask( image(), channel_mask );
- channel_mask = SetPixelChannelMask( image(), GreenChannel);
+ channel_mask = SetImageChannelMask( image(), GreenChannel);
(void) GetImageRange( image(),&minimum,&maximum,&exceptionInfo);
statistics->green.minimum=minimum;
statistics->green.maximum=maximum;
@@ -3785,9 +3785,9 @@
&statistics->green.standard_deviation,&exceptionInfo);
(void) GetImageKurtosis( image(),&statistics->green.kurtosis,
&statistics->green.skewness,&exceptionInfo);
- (void) SetPixelChannelMapMask( image(), channel_mask );
+ (void) SetPixelChannelMask( image(), channel_mask );
- channel_mask = SetPixelChannelMask( image(), GreenChannel);
+ channel_mask = SetImageChannelMask( image(), GreenChannel);
(void) GetImageRange( image(),&minimum,&maximum,&exceptionInfo);
statistics->blue.minimum=minimum;
statistics->blue.maximum=maximum;
@@ -3795,9 +3795,9 @@
&statistics->blue.standard_deviation,&exceptionInfo);
(void) GetImageKurtosis( image(),&statistics->blue.kurtosis,
&statistics->blue.skewness,&exceptionInfo);
- (void) SetPixelChannelMapMask( image(), channel_mask );
+ (void) SetPixelChannelMask( image(), channel_mask );
- channel_mask = SetPixelChannelMask( image(), AlphaChannel);
+ channel_mask = SetImageChannelMask( image(), AlphaChannel);
(void) GetImageRange( image(),&minimum,&maximum,&exceptionInfo);
statistics->alpha.minimum=minimum;
statistics->alpha.maximum=maximum;
@@ -3805,7 +3805,7 @@
&statistics->alpha.standard_deviation,&exceptionInfo);
(void) GetImageKurtosis( image(),&statistics->alpha.kurtosis,
&statistics->alpha.skewness,&exceptionInfo);
- (void) SetPixelChannelMapMask( image(), channel_mask );
+ (void) SetPixelChannelMask( image(), channel_mask );
throwException( exceptionInfo );
(void) DestroyExceptionInfo( &exceptionInfo );
diff --git a/Magick++/lib/Magick++/Include.h b/Magick++/lib/Magick++/Include.h
index e605e43..90b1019 100644
--- a/Magick++/lib/Magick++/Include.h
+++ b/Magick++/lib/Magick++/Include.h
@@ -895,8 +895,8 @@
using MagickCore::SetMagickInfo;
using MagickCore::SetMagickResourceLimit;
using MagickCore::SetImageVirtualPixelMethod;
- using MagickCore::SetPixelChannelMap;
- using MagickCore::SetPixelChannelMask;
+ using MagickCore::SetPixelChannel;
+ using MagickCore::SetImageChannelMask;
using MagickCore::SetStringInfoDatum;
using MagickCore::ShadeImage;
using MagickCore::ShadowImage;
diff --git a/MagickCore/attribute.c b/MagickCore/attribute.c
index 79a7d97..f686a11 100644
--- a/MagickCore/attribute.c
+++ b/MagickCore/attribute.c
@@ -426,8 +426,8 @@
PixelTrait
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
if ((traits == UndefinedPixelTrait) ||
(channel == IndexPixelChannel) || (channel == MaskPixelChannel))
continue;
@@ -490,8 +490,8 @@
PixelTrait
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
if ((traits == UndefinedPixelTrait) || (channel == IndexPixelChannel) ||
(channel == MaskPixelChannel))
continue;
@@ -1015,8 +1015,8 @@
PixelTrait
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
if ((traits == UndefinedPixelTrait) ||
(channel == IndexPixelChannel) || (channel == MaskPixelChannel))
continue;
@@ -1078,8 +1078,8 @@
PixelTrait
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
if ((traits == UndefinedPixelTrait) || (channel == IndexPixelChannel) ||
(channel == MaskPixelChannel))
continue;
@@ -1209,9 +1209,9 @@
status=TransformImageColorspace(image,sRGBColorspace,exception);
if (image->matte == MagickFalse)
(void) SetImageAlphaChannel(image,OpaqueAlphaChannel,exception);
- channel_mask=SetPixelChannelMask(image,AlphaChannel);
+ channel_mask=SetImageChannelMask(image,AlphaChannel);
(void) BilevelImage(image,(double) QuantumRange/2.0,exception);
- (void) SetPixelChannelMask(image,channel_mask);
+ (void) SetImageChannelMask(image,channel_mask);
quantize_info=AcquireQuantizeInfo(image_info);
status=QuantizeImage(quantize_info,image,exception);
quantize_info=DestroyQuantizeInfo(quantize_info);
diff --git a/MagickCore/cache-view.c b/MagickCore/cache-view.c
index e26d2ee..00fef6a 100644
--- a/MagickCore/cache-view.c
+++ b/MagickCore/cache-view.c
@@ -742,7 +742,7 @@
PixelChannel
channel;
- channel=GetPixelChannelMapChannel(cache_view->image,i);
+ channel=GetPixelChannelChannel(cache_view->image,i);
pixel[channel]=p[i];
}
return(MagickTrue);
@@ -818,7 +818,7 @@
PixelChannel
channel;
- channel=GetPixelChannelMapChannel(cache_view->image,i);
+ channel=GetPixelChannelChannel(cache_view->image,i);
pixel[channel]=p[i];
}
return(MagickTrue);
@@ -952,7 +952,7 @@
PixelChannel
channel;
- channel=GetPixelChannelMapChannel(cache_view->image,i);
+ channel=GetPixelChannelChannel(cache_view->image,i);
pixel[channel]=p[i];
}
return(MagickTrue);
diff --git a/MagickCore/cache.c b/MagickCore/cache.c
index 1874a1d..ceb1e5b 100644
--- a/MagickCore/cache.c
+++ b/MagickCore/cache.c
@@ -2078,7 +2078,7 @@
PixelChannel
channel;
- channel=GetPixelChannelMapChannel(image,i);
+ channel=GetPixelChannelChannel(image,i);
pixel[channel]=q[i];
}
return(MagickTrue);
@@ -2153,7 +2153,7 @@
PixelChannel
channel;
- channel=GetPixelChannelMapChannel(image,i);
+ channel=GetPixelChannelChannel(image,i);
pixel[channel]=q[i];
}
return(MagickTrue);
@@ -2232,7 +2232,7 @@
PixelChannel
channel;
- channel=GetPixelChannelMapChannel(image,i);
+ channel=GetPixelChannelChannel(image,i);
pixel[channel]=p[i];
}
return(MagickTrue);
@@ -2311,7 +2311,7 @@
PixelChannel
channel;
- channel=GetPixelChannelMapChannel(image,i);
+ channel=GetPixelChannelChannel(image,i);
pixel[channel]=p[i];
}
return(MagickTrue);
diff --git a/MagickCore/channel.c b/MagickCore/channel.c
index bd96b55..77ffb85 100644
--- a/MagickCore/channel.c
+++ b/MagickCore/channel.c
@@ -169,9 +169,9 @@
status=MagickFalse;
continue;
}
- destination_traits=GetPixelChannelMapTraits(destination_image,
+ destination_traits=GetPixelChannelTraits(destination_image,
destination_channel);
- source_traits=GetPixelChannelMapTraits(source_image,source_channel);
+ source_traits=GetPixelChannelTraits(source_image,source_channel);
if ((destination_traits == UndefinedPixelTrait) ||
(source_traits == UndefinedPixelTrait))
continue;
@@ -275,7 +275,7 @@
Image
*canvas;
- SetPixelChannelMapMask(destination_image,channel_mask);
+ SetPixelChannelMask(destination_image,channel_mask);
if ((channel_op == ExtractChannelOp) && (destination_channel == 1))
(void) SetImageColorspace(destination_image,GRAYColorspace,exception);
status=SetImageStorageClass(destination_image,DirectClass,exception);
@@ -409,7 +409,7 @@
if (status == MagickFalse)
break;
}
- SetPixelChannelMapMask(destination_image,channel_mask);
+ SetPixelChannelMask(destination_image,channel_mask);
if ((channel_op == ExtractChannelOp) && (destination_channel == 1))
(void) SetImageColorspace(destination_image,GRAYColorspace,exception);
status=SetImageStorageClass(destination_image,DirectClass,exception);
@@ -541,8 +541,8 @@
if (next == (Image *) NULL)
continue;
- channel=GetPixelChannelMapChannel(combine_image,i);
- traits=GetPixelChannelMapTraits(combine_image,channel);
+ channel=GetPixelChannelChannel(combine_image,i);
+ traits=GetPixelChannelTraits(combine_image,channel);
if (traits == UndefinedPixelTrait)
continue;
image_view=AcquireVirtualCacheView(next,exception);
@@ -707,8 +707,8 @@
PixelTrait
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
if ((traits == UndefinedPixelTrait) ||
(GetChannelBit(channel_type,channel) == 0))
continue;
@@ -788,8 +788,8 @@
PixelTrait
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
if ((traits == UndefinedPixelTrait) ||
((traits & UpdatePixelTrait) == 0))
continue;
diff --git a/MagickCore/compare.c b/MagickCore/compare.c
index a641e34..a50aa30 100644
--- a/MagickCore/compare.c
+++ b/MagickCore/compare.c
@@ -238,9 +238,9 @@
reconstruct_traits,
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- reconstruct_traits=GetPixelChannelMapTraits(reconstruct_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ reconstruct_traits=GetPixelChannelTraits(reconstruct_image,channel);
if ((traits == UndefinedPixelTrait) ||
(reconstruct_traits == UndefinedPixelTrait) ||
((reconstruct_traits & UpdatePixelTrait) == 0))
@@ -377,9 +377,9 @@
reconstruct_traits,
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- reconstruct_traits=GetPixelChannelMapTraits(reconstruct_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ reconstruct_traits=GetPixelChannelTraits(reconstruct_image,channel);
if ((traits == UndefinedPixelTrait) ||
(reconstruct_traits == UndefinedPixelTrait) ||
((reconstruct_traits & UpdatePixelTrait) == 0))
@@ -423,8 +423,8 @@
PixelTrait
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
if ((traits & UpdatePixelTrait) != 0)
channels++;
}
@@ -501,9 +501,9 @@
reconstruct_traits,
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- reconstruct_traits=GetPixelChannelMapTraits(reconstruct_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ reconstruct_traits=GetPixelChannelTraits(reconstruct_image,channel);
if ((traits == UndefinedPixelTrait) ||
(reconstruct_traits == UndefinedPixelTrait) ||
((reconstruct_traits & UpdatePixelTrait) == 0))
@@ -602,9 +602,9 @@
reconstruct_traits,
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- reconstruct_traits=GetPixelChannelMapTraits(reconstruct_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ reconstruct_traits=GetPixelChannelTraits(reconstruct_image,channel);
if ((traits == UndefinedPixelTrait) ||
(reconstruct_traits == UndefinedPixelTrait) ||
((reconstruct_traits & UpdatePixelTrait) == 0))
@@ -699,9 +699,9 @@
reconstruct_traits,
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- reconstruct_traits=GetPixelChannelMapTraits(reconstruct_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ reconstruct_traits=GetPixelChannelTraits(reconstruct_image,channel);
if ((traits == UndefinedPixelTrait) ||
(reconstruct_traits == UndefinedPixelTrait) ||
((reconstruct_traits & UpdatePixelTrait) == 0))
@@ -797,9 +797,9 @@
reconstruct_traits,
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- reconstruct_traits=GetPixelChannelMapTraits(reconstruct_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ reconstruct_traits=GetPixelChannelTraits(reconstruct_image,channel);
if ((traits == UndefinedPixelTrait) ||
(reconstruct_traits == UndefinedPixelTrait) ||
((reconstruct_traits & UpdatePixelTrait) == 0))
@@ -907,9 +907,9 @@
reconstruct_traits,
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- reconstruct_traits=GetPixelChannelMapTraits(reconstruct_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ reconstruct_traits=GetPixelChannelTraits(reconstruct_image,channel);
if ((traits == UndefinedPixelTrait) ||
(reconstruct_traits == UndefinedPixelTrait) ||
((reconstruct_traits & UpdatePixelTrait) == 0))
@@ -946,7 +946,7 @@
PixelChannel
channel;
- channel=GetPixelChannelMapChannel(image,i);
+ channel=GetPixelChannelChannel(image,i);
gamma=image_statistics[i].standard_deviation*
reconstruct_statistics[channel].standard_deviation;
gamma=MagickEpsilonReciprocal(gamma);
@@ -1032,9 +1032,9 @@
reconstruct_traits,
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- reconstruct_traits=GetPixelChannelMapTraits(reconstruct_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ reconstruct_traits=GetPixelChannelTraits(reconstruct_image,channel);
if ((traits == UndefinedPixelTrait) ||
(reconstruct_traits == UndefinedPixelTrait) ||
((reconstruct_traits & UpdatePixelTrait) == 0))
@@ -1445,9 +1445,9 @@
reconstruct_traits,
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- reconstruct_traits=GetPixelChannelMapTraits(reconstruct_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ reconstruct_traits=GetPixelChannelTraits(reconstruct_image,channel);
if ((traits == UndefinedPixelTrait) ||
(reconstruct_traits == UndefinedPixelTrait) ||
((reconstruct_traits & UpdatePixelTrait) == 0))
@@ -1644,9 +1644,9 @@
similarity_traits,
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- similarity_traits=GetPixelChannelMapTraits(similarity_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ similarity_traits=GetPixelChannelTraits(similarity_image,channel);
if ((traits == UndefinedPixelTrait) ||
(similarity_traits == UndefinedPixelTrait) ||
((similarity_traits & UpdatePixelTrait) == 0))
diff --git a/MagickCore/composite-private.h b/MagickCore/composite-private.h
index 0b8e1e1..3963e14 100644
--- a/MagickCore/composite-private.h
+++ b/MagickCore/composite-private.h
@@ -71,8 +71,8 @@
PixelTrait
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
if (traits == UndefinedPixelTrait)
continue;
switch (channel)
diff --git a/MagickCore/composite.c b/MagickCore/composite.c
index 512dab8..68734f7 100644
--- a/MagickCore/composite.c
+++ b/MagickCore/composite.c
@@ -458,9 +458,9 @@
composite_traits,
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- composite_traits=GetPixelChannelMapTraits(composite_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ composite_traits=GetPixelChannelTraits(composite_image,channel);
if ((traits == UndefinedPixelTrait) ||
(composite_traits == UndefinedPixelTrait))
continue;
@@ -495,9 +495,9 @@
composite_traits,
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- composite_traits=GetPixelChannelMapTraits(composite_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ composite_traits=GetPixelChannelTraits(composite_image,channel);
if ((traits == UndefinedPixelTrait) ||
(composite_traits == UndefinedPixelTrait))
continue;
@@ -680,9 +680,9 @@
composite_traits,
traits;
- channel=GetPixelChannelMapChannel(composite_image,i);
- composite_traits=GetPixelChannelMapTraits(composite_image,channel);
- traits=GetPixelChannelMapTraits(image,channel);
+ channel=GetPixelChannelChannel(composite_image,i);
+ composite_traits=GetPixelChannelTraits(composite_image,channel);
+ traits=GetPixelChannelTraits(image,channel);
if ((traits == UndefinedPixelTrait) ||
(composite_traits == UndefinedPixelTrait))
continue;
@@ -1324,9 +1324,9 @@
composite_traits,
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- composite_traits=GetPixelChannelMapTraits(composite_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ composite_traits=GetPixelChannelTraits(composite_image,channel);
if ((traits == UndefinedPixelTrait) ||
(composite_traits == UndefinedPixelTrait))
continue;
@@ -1515,9 +1515,9 @@
composite_traits,
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- composite_traits=GetPixelChannelMapTraits(composite_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ composite_traits=GetPixelChannelTraits(composite_image,channel);
if (traits == UndefinedPixelTrait)
continue;
if ((compose != IntensityCompositeOp) &&
@@ -2519,9 +2519,9 @@
texture_traits,
traits;
- channel=GetPixelChannelMapChannel(texture_image,i);
- texture_traits=GetPixelChannelMapTraits(texture_image,channel);
- traits=GetPixelChannelMapTraits(image,channel);
+ channel=GetPixelChannelChannel(texture_image,i);
+ texture_traits=GetPixelChannelTraits(texture_image,channel);
+ traits=GetPixelChannelTraits(image,channel);
if ((traits == UndefinedPixelTrait) ||
(texture_traits == UndefinedPixelTrait))
continue;
diff --git a/MagickCore/decorate.c b/MagickCore/decorate.c
index 854f996..7f915ea 100644
--- a/MagickCore/decorate.c
+++ b/MagickCore/decorate.c
@@ -724,8 +724,8 @@
PixelTrait
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
if ((traits & UpdatePixelTrait) == 0)
continue;
q[i]=ClampToQuantum(QuantumScale*((double) q[i]*HighlightFactor+(double)
@@ -748,8 +748,8 @@
PixelTrait
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
if ((traits & UpdatePixelTrait) == 0)
continue;
q[i]=ClampToQuantum(QuantumScale*((double) q[i]*AccentuateFactor+
@@ -772,8 +772,8 @@
PixelTrait
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
if ((traits & UpdatePixelTrait) == 0)
continue;
q[i]=ClampToQuantum(QuantumScale*((double) q[i]*ShadowFactor+(double)
@@ -829,8 +829,8 @@
PixelTrait
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
if ((traits & UpdatePixelTrait) == 0)
continue;
q[i]=ClampToQuantum(QuantumScale*((double) q[i]*HighlightFactor+(double)
@@ -855,8 +855,8 @@
PixelTrait
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
if ((traits & UpdatePixelTrait) == 0)
continue;
q[i]=ClampToQuantum(QuantumScale*((double) q[i]*ShadowFactor+(double)
@@ -912,8 +912,8 @@
PixelTrait
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
if ((traits & UpdatePixelTrait) == 0)
continue;
q[i]=ClampToQuantum(QuantumScale*((double) q[i]*HighlightFactor+(double)
@@ -931,8 +931,8 @@
PixelTrait
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
if ((traits & UpdatePixelTrait) == 0)
continue;
q[i]=ClampToQuantum(QuantumScale*((double) q[i]*TroughFactor+
@@ -955,8 +955,8 @@
PixelTrait
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
if ((traits & UpdatePixelTrait) == 0)
continue;
q[i]=ClampToQuantum(QuantumScale*((double) q[i]*ShadowFactor+(double)
diff --git a/MagickCore/display.c b/MagickCore/display.c
index 38caf63..a296d75 100644
--- a/MagickCore/display.c
+++ b/MagickCore/display.c
@@ -10172,11 +10172,11 @@
(DrawInfo *) NULL);
draw_info->fill.alpha=(double) ClampToQuantum(
StringToDouble(matte,(char **) NULL));
- channel_mask=SetPixelChannelMask(*image,AlphaChannel);
+ channel_mask=SetImageChannelMask(*image,AlphaChannel);
(void) FloodfillPaintImage(*image,draw_info,&target,(ssize_t)
x_offset,(ssize_t) y_offset,method == FloodfillMethod ?
MagickFalse : MagickTrue,exception);
- (void) SetPixelChannelMapMask(*image,channel_mask);
+ (void) SetPixelChannelMask(*image,channel_mask);
draw_info=DestroyDrawInfo(draw_info);
break;
}
diff --git a/MagickCore/draw.c b/MagickCore/draw.c
index ab57ff2..21202ed 100644
--- a/MagickCore/draw.c
+++ b/MagickCore/draw.c
@@ -4390,11 +4390,11 @@
target.green=(double) draw_info->border_color.green;
target.blue=(double) draw_info->border_color.blue;
}
- channel_mask=SetPixelChannelMask(image,AlphaChannel);
+ channel_mask=SetImageChannelMask(image,AlphaChannel);
(void) FloodfillPaintImage(image,draw_info,&target,x,y,
primitive_info->method == FloodfillMethod ? MagickFalse :
MagickTrue,exception);
- (void) SetPixelChannelMask(image,channel_mask);
+ (void) SetImageChannelMask(image,channel_mask);
break;
}
case ResetMethod:
diff --git a/MagickCore/effect.c b/MagickCore/effect.c
index 7321386..7af9b83 100644
--- a/MagickCore/effect.c
+++ b/MagickCore/effect.c
@@ -374,9 +374,9 @@
ssize_t
v;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- blur_traits=GetPixelChannelMapTraits(blur_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ blur_traits=GetPixelChannelTraits(blur_image,channel);
if ((traits == UndefinedPixelTrait) ||
(blur_traits == UndefinedPixelTrait))
continue;
@@ -697,9 +697,9 @@
ssize_t
v;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- sharp_traits=GetPixelChannelMapTraits(sharp_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ sharp_traits=GetPixelChannelTraits(sharp_image,channel);
if ((traits == UndefinedPixelTrait) ||
(sharp_traits == UndefinedPixelTrait))
continue;
@@ -999,9 +999,9 @@
register ssize_t
u;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- blur_traits=GetPixelChannelMapTraits(blur_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ blur_traits=GetPixelChannelTraits(blur_image,channel);
if ((traits == UndefinedPixelTrait) ||
(blur_traits == UndefinedPixelTrait))
continue;
@@ -1123,9 +1123,9 @@
register ssize_t
u;
- channel=GetPixelChannelMapChannel(blur_image,i);
- traits=GetPixelChannelMapTraits(blur_image,channel);
- blur_traits=GetPixelChannelMapTraits(blur_image,channel);
+ channel=GetPixelChannelChannel(blur_image,i);
+ traits=GetPixelChannelTraits(blur_image,channel);
+ blur_traits=GetPixelChannelTraits(blur_image,channel);
if ((traits == UndefinedPixelTrait) ||
(blur_traits == UndefinedPixelTrait))
continue;
@@ -1436,9 +1436,9 @@
if (status == MagickFalse)
continue;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- despeckle_traits=GetPixelChannelMapTraits(despeckle_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ despeckle_traits=GetPixelChannelTraits(despeckle_image,channel);
if ((traits == UndefinedPixelTrait) ||
(despeckle_traits == UndefinedPixelTrait))
continue;
@@ -1999,9 +1999,9 @@
register ssize_t
j;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- blur_traits=GetPixelChannelMapTraits(blur_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ blur_traits=GetPixelChannelTraits(blur_image,channel);
if ((traits == UndefinedPixelTrait) ||
(blur_traits == UndefinedPixelTrait))
continue;
@@ -2794,9 +2794,9 @@
register ssize_t
j;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- blur_traits=GetPixelChannelMapTraits(blur_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ blur_traits=GetPixelChannelTraits(blur_image,channel);
if ((traits == UndefinedPixelTrait) ||
(blur_traits == UndefinedPixelTrait))
continue;
@@ -3103,9 +3103,9 @@
ssize_t
v;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- blur_traits=GetPixelChannelMapTraits(blur_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ blur_traits=GetPixelChannelTraits(blur_image,channel);
if ((traits == UndefinedPixelTrait) ||
(blur_traits == UndefinedPixelTrait))
continue;
@@ -3382,9 +3382,9 @@
shade_traits,
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- shade_traits=GetPixelChannelMapTraits(shade_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ shade_traits=GetPixelChannelTraits(shade_image,channel);
if ((traits == UndefinedPixelTrait) ||
(shade_traits == UndefinedPixelTrait))
continue;
@@ -3803,9 +3803,9 @@
traits,
unsharp_traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- unsharp_traits=GetPixelChannelMapTraits(unsharp_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ unsharp_traits=GetPixelChannelTraits(unsharp_image,channel);
if ((traits == UndefinedPixelTrait) ||
(unsharp_traits == UndefinedPixelTrait))
continue;
diff --git a/MagickCore/enhance.c b/MagickCore/enhance.c
index 31dd207..cfecc95 100644
--- a/MagickCore/enhance.c
+++ b/MagickCore/enhance.c
@@ -144,15 +144,15 @@
PixelTrait
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
if ((traits & UpdatePixelTrait) == 0)
continue;
- channel_mask=SetPixelChannelMask(image,(ChannelType) (1 << i));
+ channel_mask=SetImageChannelMask(image,(ChannelType) (1 << i));
status=GetImageMean(image,&mean,&sans,exception);
gamma=log(mean*QuantumScale)/log_mean;
status&=LevelImage(image,0.0,(double) QuantumRange,gamma,exception);
- (void) SetPixelChannelMask(image,channel_mask);
+ (void) SetImageChannelMask(image,channel_mask);
if (status == MagickFalse)
break;
}
@@ -1172,28 +1172,28 @@
{
if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
{
- i=GetPixelChannelMapChannel(image,RedPixelChannel);
+ i=GetPixelChannelChannel(image,RedPixelChannel);
if (black[i] != white[i])
image->colormap[j].red=stretch_map[GetPixelChannels(image)*
ScaleQuantumToMap(ClampToQuantum(image->colormap[j].red))]+i;
}
if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
{
- i=GetPixelChannelMapChannel(image,GreenPixelChannel);
+ i=GetPixelChannelChannel(image,GreenPixelChannel);
if (black[i] != white[i])
image->colormap[j].green=stretch_map[GetPixelChannels(image)*
ScaleQuantumToMap(ClampToQuantum(image->colormap[j].green))]+i;
}
if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
{
- i=GetPixelChannelMapChannel(image,BluePixelChannel);
+ i=GetPixelChannelChannel(image,BluePixelChannel);
if (black[i] != white[i])
image->colormap[j].blue=stretch_map[GetPixelChannels(image)*
ScaleQuantumToMap(ClampToQuantum(image->colormap[j].blue))]+i;
}
if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
{
- i=GetPixelChannelMapChannel(image,AlphaPixelChannel);
+ i=GetPixelChannelChannel(image,AlphaPixelChannel);
if (black[i] != white[i])
image->colormap[j].alpha=stretch_map[GetPixelChannels(image)*
ScaleQuantumToMap(ClampToQuantum(image->colormap[j].alpha))]+i;
@@ -1244,8 +1244,8 @@
PixelTrait
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
if (((traits & UpdatePixelTrait) == 0) || (black[i] == white[i]))
continue;
q[i]=ClampToQuantum(stretch_map[GetPixelChannels(image)*
@@ -1418,9 +1418,9 @@
register const Quantum
*restrict r;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- enhance_traits=GetPixelChannelMapTraits(enhance_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ enhance_traits=GetPixelChannelTraits(enhance_image,channel);
if ((traits == UndefinedPixelTrait) ||
(enhance_traits == UndefinedPixelTrait))
continue;
@@ -1647,7 +1647,7 @@
{
if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
{
- channel=GetPixelChannelMapChannel(image,RedPixelChannel);
+ channel=GetPixelChannelChannel(image,RedPixelChannel);
if (black[channel] != white[channel])
image->colormap[j].red=equalize_map[GetPixelChannels(image)*
ScaleQuantumToMap(ClampToQuantum(image->colormap[j].red))]+
@@ -1655,7 +1655,7 @@
}
if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
{
- channel=GetPixelChannelMapChannel(image,GreenPixelChannel);
+ channel=GetPixelChannelChannel(image,GreenPixelChannel);
if (black[channel] != white[channel])
image->colormap[j].green=equalize_map[GetPixelChannels(image)*
ScaleQuantumToMap(ClampToQuantum(image->colormap[j].green))]+
@@ -1663,7 +1663,7 @@
}
if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
{
- channel=GetPixelChannelMapChannel(image,BluePixelChannel);
+ channel=GetPixelChannelChannel(image,BluePixelChannel);
if (black[channel] != white[channel])
image->colormap[j].blue=equalize_map[GetPixelChannels(image)*
ScaleQuantumToMap(ClampToQuantum(image->colormap[j].blue))]+
@@ -1671,7 +1671,7 @@
}
if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
{
- channel=GetPixelChannelMapChannel(image,AlphaPixelChannel);
+ channel=GetPixelChannelChannel(image,AlphaPixelChannel);
if (black[channel] != white[channel])
image->colormap[j].alpha=equalize_map[GetPixelChannels(image)*
ScaleQuantumToMap(ClampToQuantum(image->colormap[j].alpha))]+
@@ -1722,8 +1722,8 @@
PixelTrait
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
if (((traits & UpdatePixelTrait) == 0) || (black[i] == white[i]))
continue;
q[i]=ClampToQuantum(equalize_map[GetPixelChannels(image)*
@@ -1893,8 +1893,8 @@
PixelTrait
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
if ((traits & UpdatePixelTrait) == 0)
continue;
q[i]=gamma_map[ScaleQuantumToMap(q[i])];
@@ -2268,8 +2268,8 @@
PixelTrait
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
if ((traits & UpdatePixelTrait) == 0)
continue;
q[i]=ClampToQuantum(LevelPixel(black_point,white_point,gamma,
@@ -2435,8 +2435,8 @@
PixelTrait
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
if ((traits & UpdatePixelTrait) == 0)
continue;
q[i]=LevelizeValue(q[i]);
@@ -2525,80 +2525,80 @@
{
if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
{
- channel_mask=SetPixelChannelMask(image,RedChannel);
+ channel_mask=SetImageChannelMask(image,RedChannel);
status|=LevelImage(image,black_color->red,white_color->red,1.0,
exception);
- (void) SetPixelChannelMask(image,channel_mask);
+ (void) SetImageChannelMask(image,channel_mask);
}
if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
{
- channel_mask=SetPixelChannelMask(image,GreenChannel);
+ channel_mask=SetImageChannelMask(image,GreenChannel);
status|=LevelImage(image,black_color->green,white_color->green,1.0,
exception);
- (void) SetPixelChannelMask(image,channel_mask);
+ (void) SetImageChannelMask(image,channel_mask);
}
if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
{
- channel_mask=SetPixelChannelMask(image,BlueChannel);
+ channel_mask=SetImageChannelMask(image,BlueChannel);
status|=LevelImage(image,black_color->blue,white_color->blue,1.0,
exception);
- (void) SetPixelChannelMask(image,channel_mask);
+ (void) SetImageChannelMask(image,channel_mask);
}
if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
{
- channel_mask=SetPixelChannelMask(image,BlackChannel);
+ channel_mask=SetImageChannelMask(image,BlackChannel);
status|=LevelImage(image,black_color->black,white_color->black,1.0,
exception);
- (void) SetPixelChannelMask(image,channel_mask);
+ (void) SetImageChannelMask(image,channel_mask);
}
if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) &&
(image->matte == MagickTrue))
{
- channel_mask=SetPixelChannelMask(image,AlphaChannel);
+ channel_mask=SetImageChannelMask(image,AlphaChannel);
status|=LevelImage(image,black_color->alpha,white_color->alpha,1.0,
exception);
- (void) SetPixelChannelMask(image,channel_mask);
+ (void) SetImageChannelMask(image,channel_mask);
}
}
else
{
if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
{
- channel_mask=SetPixelChannelMask(image,RedChannel);
+ channel_mask=SetImageChannelMask(image,RedChannel);
status|=LevelizeImage(image,black_color->red,white_color->red,1.0,
exception);
- (void) SetPixelChannelMask(image,channel_mask);
+ (void) SetImageChannelMask(image,channel_mask);
}
if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
{
- channel_mask=SetPixelChannelMask(image,GreenChannel);
+ channel_mask=SetImageChannelMask(image,GreenChannel);
status|=LevelizeImage(image,black_color->green,white_color->green,1.0,
exception);
- (void) SetPixelChannelMask(image,channel_mask);
+ (void) SetImageChannelMask(image,channel_mask);
}
if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
{
- channel_mask=SetPixelChannelMask(image,BlueChannel);
+ channel_mask=SetImageChannelMask(image,BlueChannel);
status|=LevelizeImage(image,black_color->blue,white_color->blue,1.0,
exception);
- (void) SetPixelChannelMask(image,channel_mask);
+ (void) SetImageChannelMask(image,channel_mask);
}
if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
{
- channel_mask=SetPixelChannelMask(image,BlackChannel);
+ channel_mask=SetImageChannelMask(image,BlackChannel);
status|=LevelizeImage(image,black_color->black,white_color->black,1.0,
exception);
- (void) SetPixelChannelMask(image,channel_mask);
+ (void) SetImageChannelMask(image,channel_mask);
}
if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) &&
(image->matte == MagickTrue))
{
- channel_mask=SetPixelChannelMask(image,AlphaChannel);
+ channel_mask=SetImageChannelMask(image,AlphaChannel);
status|=LevelizeImage(image,black_color->alpha,white_color->alpha,1.0,
exception);
- (void) SetPixelChannelMask(image,channel_mask);
+ (void) SetImageChannelMask(image,channel_mask);
}
}
return(status == 0 ? MagickFalse : MagickTrue);
@@ -3150,8 +3150,8 @@
PixelTrait
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
if ((traits & UpdatePixelTrait) == 0)
continue;
q[i]=QuantumRange-q[i];
@@ -3219,8 +3219,8 @@
PixelTrait
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
if ((traits & UpdatePixelTrait) == 0)
continue;
q[i]=QuantumRange-q[i];
@@ -3461,8 +3461,8 @@
PixelTrait
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
if ((traits & UpdatePixelTrait) == 0)
continue;
q[i]=ClampToQuantum((double) sigmoidal_map[ScaleQuantumToMap(q[i])]);
diff --git a/MagickCore/fx.c b/MagickCore/fx.c
index b3fa9cb..2bd8a18 100644
--- a/MagickCore/fx.c
+++ b/MagickCore/fx.c
@@ -359,9 +359,9 @@
noise_traits,
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- noise_traits=GetPixelChannelMapTraits(noise_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ noise_traits=GetPixelChannelTraits(noise_image,channel);
if ((traits == UndefinedPixelTrait) ||
(noise_traits == UndefinedPixelTrait))
continue;
@@ -781,9 +781,9 @@
colorize_traits,
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- colorize_traits=GetPixelChannelMapTraits(colorize_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ colorize_traits=GetPixelChannelTraits(colorize_image,channel);
if ((traits == UndefinedPixelTrait) ||
(colorize_traits == UndefinedPixelTrait))
continue;
@@ -793,9 +793,9 @@
SetPixelChannel(colorize_image,channel,p[i],q);
continue;
}
- channel=GetPixelChannelMapChannel(colorize_image,channel);
- q[i]=ClampToQuantum(Colorize(p[i],GetPixelInfoChannel(&blend_percentage,
- channel),GetPixelInfoChannel(colorize,channel)));
+ SetPixelChannel(colorize_image,channel,
+ ClampToQuantum(Colorize(p[i],GetPixelInfoChannel(&blend_percentage,
+ channel),GetPixelInfoChannel(colorize,channel))),q);
}
p+=GetPixelChannels(image);
q+=GetPixelChannels(colorize_image);
@@ -1162,7 +1162,7 @@
{
channel=(PixelChannel) option;
channel_mask=(ChannelType) (channel_mask | (1 << channel));
- SetPixelChannelMapMask(image,channel_mask);
+ SetPixelChannelMask(image,channel_mask);
}
}
(void) FormatLocaleString(key,MaxTextExtent,"%p.%.20g.%s",(void *) image,
@@ -1171,7 +1171,7 @@
if (value != (const char *) NULL)
{
if (channel_mask != UndefinedChannel)
- SetPixelChannelMapMask(image,channel_mask);
+ SetPixelChannelMask(image,channel_mask);
return(QuantumScale*StringToDouble(value,(char **) NULL));
}
(void) DeleteNodeFromSplayTree(fx_info->symbols,key);
@@ -1239,7 +1239,7 @@
standard_deviation);
}
if (channel_mask != UndefinedChannel)
- SetPixelChannelMapMask(image,channel_mask);
+ SetPixelChannelMask(image,channel_mask);
(void) AddValueToSplayTree(fx_info->symbols,ConstantString(key),
ConstantString(statistic));
return(QuantumScale*StringToDouble(statistic,(char **) NULL));
@@ -3112,9 +3112,9 @@
fx_traits,
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- fx_traits=GetPixelChannelMapTraits(fx_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ fx_traits=GetPixelChannelTraits(fx_image,channel);
if ((traits == UndefinedPixelTrait) ||
(fx_traits == UndefinedPixelTrait))
continue;
@@ -3320,9 +3320,9 @@
implode_traits,
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- implode_traits=GetPixelChannelMapTraits(implode_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ implode_traits=GetPixelChannelTraits(implode_image,channel);
if ((traits == UndefinedPixelTrait) ||
(implode_traits == UndefinedPixelTrait))
continue;
@@ -3550,9 +3550,9 @@
morph_traits,
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- morph_traits=GetPixelChannelMapTraits(morph_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ morph_traits=GetPixelChannelTraits(morph_image,channel);
if ((traits == UndefinedPixelTrait) ||
(morph_traits == UndefinedPixelTrait))
continue;
@@ -3747,8 +3747,8 @@
return(MagickTrue);
for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
{
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
if (traits == UndefinedPixelTrait)
continue;
q[i]=PlasmaPixel(random_info,(u[channel]+v[channel])/2.0,plasma);
@@ -3770,8 +3770,8 @@
return(MagickTrue);
for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
{
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
if (traits == UndefinedPixelTrait)
continue;
q[i]=PlasmaPixel(random_info,(u[channel]+v[channel])/2.0,plasma);
@@ -3797,8 +3797,8 @@
return(MagickTrue);
for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
{
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
if (traits == UndefinedPixelTrait)
continue;
q[i]=PlasmaPixel(random_info,(u[channel]+v[channel])/2.0,plasma);
@@ -3821,8 +3821,8 @@
return(MagickTrue);
for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
{
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
if (traits == UndefinedPixelTrait)
continue;
q[i]=PlasmaPixel(random_info,(u[channel]+v[channel])/2.0,plasma);
@@ -3847,8 +3847,8 @@
return(MagickTrue);
for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
{
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
if (traits == UndefinedPixelTrait)
continue;
q[i]=PlasmaPixel(random_info,(u[channel]+v[channel])/2.0,plasma);
@@ -4360,12 +4360,12 @@
border_image=DestroyImage(border_image);
return((Image *) NULL);
}
- channel_mask=SetPixelChannelMask(border_image,AlphaChannel);
+ channel_mask=SetImageChannelMask(border_image,AlphaChannel);
shadow_image=BlurImage(border_image,0.0,sigma,exception);
border_image=DestroyImage(border_image);
if (shadow_image == (Image *) NULL)
return((Image *) NULL);
- (void) SetPixelChannelMapMask(shadow_image,channel_mask);
+ (void) SetPixelChannelMask(shadow_image,channel_mask);
if (shadow_image->page.width == 0)
shadow_image->page.width=shadow_image->columns;
if (shadow_image->page.height == 0)
@@ -4495,8 +4495,8 @@
PixelTrait
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
if (traits == UndefinedPixelTrait)
continue;
q[i]=ClampToQuantum(QuantumRange*value);
@@ -4661,8 +4661,8 @@
PixelTrait
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
if ((traits == UndefinedPixelTrait) ||
((traits & CopyPixelTrait) != 0))
continue;
@@ -5168,9 +5168,9 @@
swirl_traits,
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- swirl_traits=GetPixelChannelMapTraits(swirl_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ swirl_traits=GetPixelChannelTraits(swirl_image,channel);
if ((traits == UndefinedPixelTrait) ||
(swirl_traits == UndefinedPixelTrait))
continue;
@@ -5391,9 +5391,9 @@
tint_traits,
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- tint_traits=GetPixelChannelMapTraits(tint_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ tint_traits=GetPixelChannelTraits(tint_image,channel);
if ((traits == UndefinedPixelTrait) ||
(tint_traits == UndefinedPixelTrait))
continue;
diff --git a/MagickCore/histogram.c b/MagickCore/histogram.c
index 76d82e5..c92d898 100644
--- a/MagickCore/histogram.c
+++ b/MagickCore/histogram.c
@@ -1017,17 +1017,17 @@
PixelTrait
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
if ((traits & UpdatePixelTrait) == 0)
continue;
- channel_mask=SetPixelChannelMask(image,(ChannelType) (1 << i));
+ channel_mask=SetImageChannelMask(image,(ChannelType) (1 << i));
status&=GetImageRange(image,&min,&max,exception);
min+=black;
max-=white;
if (fabs(min-max) >= MagickEpsilon)
status&=LevelImage(image,min,max,gamma,exception);
- (void) SetPixelChannelMask(image,channel_mask);
+ (void) SetImageChannelMask(image,channel_mask);
}
return(status != 0 ? MagickTrue : MagickFalse);
}
diff --git a/MagickCore/image.c b/MagickCore/image.c
index 8e5f15b..41f7fb3 100644
--- a/MagickCore/image.c
+++ b/MagickCore/image.c
@@ -1679,7 +1679,7 @@
double
pixel;
- traits=GetPixelChannelMapTraits(image,i);
+ traits=GetPixelChannelTraits(image,i);
if (traits == UndefinedPixelTrait)
continue;
pixel=(double) p[i];
@@ -2093,8 +2093,8 @@
PixelTrait
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
if (traits == UndefinedPixelTrait)
continue;
switch (channel)
@@ -2390,6 +2390,44 @@
% %
% %
% %
+% S e t I m a g e C h a n n e l M a s k %
+% %
+% %
+% %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+% SetImageChannelMask() sets the image channel mask from the specified channel
+% mask.
+%
+% The format of the SetImageChannelMask method is:
+%
+% ChannelType SetImageChannelMask(Image *image,
+% const ChannelType channel_mask)
+%
+% A description of each parameter follows:
+%
+% o image: the image.
+%
+% o channel_mask: the channel mask.
+%
+*/
+MagickExport ChannelType SetImageChannelMask(Image *image,
+ const ChannelType channel_mask)
+{
+ ChannelType
+ mask;
+
+ mask=image->channel_mask;
+ image->channel_mask=channel_mask;
+ SetPixelChannelMask(image,channel_mask);
+ return(mask);
+}
+
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% %
+% %
+% %
% S e t I m a g e C o l o r %
% %
% %
@@ -3698,7 +3736,7 @@
exception);
option=GetImageOption(image_info,"channel");
if (option != (const char *) NULL)
- (void) SetPixelChannelMapMask(image,(ChannelType)
+ (void) SetPixelChannelMask(image,(ChannelType)
ParseChannelOption(option));
/* FUTURE: do not sync compose to per-image compose setting here */
option=GetImageOption(image_info,"compose");
diff --git a/MagickCore/image.h b/MagickCore/image.h
index 1f48d78..1075995 100644
--- a/MagickCore/image.h
+++ b/MagickCore/image.h
@@ -462,6 +462,9 @@
signature;
};
+extern MagickExport ChannelType
+ SetImageChannelMask(Image *,const ChannelType);
+
extern MagickExport const char
DefaultTileGeometry[],
DefaultTileLabel[],
diff --git a/MagickCore/montage.c b/MagickCore/montage.c
index 90dfae1..4c073c3 100644
--- a/MagickCore/montage.c
+++ b/MagickCore/montage.c
@@ -759,9 +759,9 @@
if ((montage_info->frame != (char *) NULL) &&
(image->compose == DstOutCompositeOp))
{
- SetPixelChannelMapMask(image,AlphaChannel);
+ SetPixelChannelMask(image,AlphaChannel);
(void) NegateImage(image,MagickFalse,exception);
- SetPixelChannelMapMask(image,DefaultChannels);
+ SetPixelChannelMask(image,DefaultChannels);
}
}
/*
diff --git a/MagickCore/paint.c b/MagickCore/paint.c
index 4dafd4b..e9acbcb 100644
--- a/MagickCore/paint.c
+++ b/MagickCore/paint.c
@@ -665,9 +665,9 @@
paint_traits,
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- paint_traits=GetPixelChannelMapTraits(paint_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ paint_traits=GetPixelChannelTraits(paint_image,channel);
if ((traits == UndefinedPixelTrait) ||
(paint_traits == UndefinedPixelTrait))
continue;
diff --git a/MagickCore/pixel-accessor.h b/MagickCore/pixel-accessor.h
index f2d959b..7066bba 100644
--- a/MagickCore/pixel-accessor.h
+++ b/MagickCore/pixel-accessor.h
@@ -113,19 +113,19 @@
return(pixel[image->channel_map[channel].offset]);
}
-static inline PixelChannel GetPixelChannelMapChannel(
+static inline PixelChannel GetPixelChannelChannel(
const Image *restrict image,const ssize_t offset)
{
return(image->channel_map[offset].channel);
}
-static inline ssize_t GetPixelChannelMapOffset(const Image *restrict image,
+static inline ssize_t GetPixelChannelOffset(const Image *restrict image,
const PixelChannel channel)
{
return(image->channel_map[channel].offset);
}
-static inline PixelTrait GetPixelChannelMapTraits(const Image *restrict image,
+static inline PixelTrait GetPixelChannelTraits(const Image *restrict image,
const PixelChannel channel)
{
return(image->channel_map[channel].traits);
@@ -574,14 +574,14 @@
pixel[image->channel_map[channel].offset]=quantum;
}
-static inline void SetPixelChannelMapChannel(const Image *restrict image,
+static inline void SetPixelChannelChannel(const Image *restrict image,
const PixelChannel channel,const ssize_t offset)
{
image->channel_map[offset].channel=channel;
image->channel_map[channel].offset=offset;
}
-static inline void SetPixelChannelMap(const Image *restrict image,
+static inline void SetPixelChannel(const Image *restrict image,
const PixelChannel channel,const PixelTrait traits,const ssize_t offset)
{
image->channel_map[offset].channel=channel;
diff --git a/MagickCore/pixel.c b/MagickCore/pixel.c
index 10f2ed8..8381500 100644
--- a/MagickCore/pixel.c
+++ b/MagickCore/pixel.c
@@ -88,7 +88,7 @@
PixelChannel \
channel; \
\
- switch (GetPixelChannelMapChannel(image,i)) \
+ switch (GetPixelChannelChannel(image,i)) \
{ \
case RedPixelChannel: \
{ \
@@ -143,13 +143,13 @@
default: \
name="undefined"; \
} \
- channel=GetPixelChannelMapChannel(image,i); \
+ channel=GetPixelChannelChannel(image,i); \
*traits='\0'; \
- if ((GetPixelChannelMapTraits(image,channel) & UpdatePixelTrait) != 0) \
+ if ((GetPixelChannelTraits(image,channel) & UpdatePixelTrait) != 0) \
(void) ConcatenateMagickString(traits,"update,",MaxTextExtent); \
- if ((GetPixelChannelMapTraits(image,channel) & BlendPixelTrait) != 0) \
+ if ((GetPixelChannelTraits(image,channel) & BlendPixelTrait) != 0) \
(void) ConcatenateMagickString(traits,"blend,",MaxTextExtent); \
- if ((GetPixelChannelMapTraits(image,channel) & CopyPixelTrait) != 0) \
+ if ((GetPixelChannelTraits(image,channel) & CopyPixelTrait) != 0) \
(void) ConcatenateMagickString(traits,"copy,",MaxTextExtent); \
if (*traits == '\0') \
(void) ConcatenateMagickString(traits,"undefined,",MaxTextExtent); \
@@ -3915,32 +3915,32 @@
n=0;
if (image->colorspace == GRAYColorspace)
{
- SetPixelChannelMap(image,BluePixelChannel,trait,n);
- SetPixelChannelMap(image,GreenPixelChannel,trait,n);
- SetPixelChannelMap(image,RedPixelChannel,trait,n++);
+ SetPixelChannelAttributes(image,BluePixelChannel,trait,n);
+ SetPixelChannelAttributes(image,GreenPixelChannel,trait,n);
+ SetPixelChannelAttributes(image,RedPixelChannel,trait,n++);
}
else
{
- SetPixelChannelMap(image,RedPixelChannel,trait,n++);
- SetPixelChannelMap(image,GreenPixelChannel,trait,n++);
- SetPixelChannelMap(image,BluePixelChannel,trait,n++);
+ SetPixelChannelAttributes(image,RedPixelChannel,trait,n++);
+ SetPixelChannelAttributes(image,GreenPixelChannel,trait,n++);
+ SetPixelChannelAttributes(image,BluePixelChannel,trait,n++);
}
if (image->colorspace == CMYKColorspace)
- SetPixelChannelMap(image,BlackPixelChannel,trait,n++);
+ SetPixelChannelAttributes(image,BlackPixelChannel,trait,n++);
if (image->matte != MagickFalse)
- SetPixelChannelMap(image,AlphaPixelChannel,CopyPixelTrait,n++);
+ SetPixelChannelAttributes(image,AlphaPixelChannel,CopyPixelTrait,n++);
if (image->storage_class == PseudoClass)
- SetPixelChannelMap(image,IndexPixelChannel,CopyPixelTrait,n++);
+ SetPixelChannelAttributes(image,IndexPixelChannel,CopyPixelTrait,n++);
if (image->mask != MagickFalse)
- SetPixelChannelMap(image,MaskPixelChannel,CopyPixelTrait,n++);
+ SetPixelChannelAttributes(image,MaskPixelChannel,CopyPixelTrait,n++);
assert((n+image->number_meta_channels) < MaxPixelChannels);
for (i=0; i < (ssize_t) image->number_meta_channels; i++)
- SetPixelChannelMap(image,(PixelChannel) (MetaPixelChannel+i),CopyPixelTrait,
- n++);
+ SetPixelChannelAttributes(image,(PixelChannel) (MetaPixelChannel+i),
+ CopyPixelTrait,n++);
image->number_channels=(size_t) n;
if (image->debug != MagickFalse)
LogPixelChannels(image);
- (void) SetPixelChannelMask(image,image->channel_mask);
+ (void) SetImageChannelMask(image,image->channel_mask);
}
/*
@@ -4093,7 +4093,7 @@
assert(image_view != (CacheView *) NULL);
status=MagickTrue;
*pixel=0.0;
- traits=GetPixelChannelMapTraits(image,channel);
+ traits=GetPixelChannelTraits(image,channel);
x_offset=(ssize_t) floor(x);
y_offset=(ssize_t) floor(y);
interpolate = method;
@@ -4546,9 +4546,9 @@
register ssize_t
j;
- channel=GetPixelChannelMapChannel(source,i);
- traits=GetPixelChannelMapTraits(source,channel);
- destination_traits=GetPixelChannelMapTraits(destination,channel);
+ channel=GetPixelChannelChannel(source,i);
+ traits=GetPixelChannelTraits(source,channel);
+ destination_traits=GetPixelChannelTraits(destination,channel);
if ((traits == UndefinedPixelTrait) ||
(destination_traits == UndefinedPixelTrait))
continue;
@@ -4591,9 +4591,9 @@
delta,
epsilon;
- channel=GetPixelChannelMapChannel(source,i);
- traits=GetPixelChannelMapTraits(source,channel);
- destination_traits=GetPixelChannelMapTraits(destination,channel);
+ channel=GetPixelChannelChannel(source,i);
+ traits=GetPixelChannelTraits(source,channel);
+ destination_traits=GetPixelChannelTraits(destination,channel);
if ((traits == UndefinedPixelTrait) ||
(destination_traits == UndefinedPixelTrait))
continue;
@@ -4651,9 +4651,9 @@
register ssize_t
j;
- channel=GetPixelChannelMapChannel(source,i);
- traits=GetPixelChannelMapTraits(source,channel);
- destination_traits=GetPixelChannelMapTraits(destination,channel);
+ channel=GetPixelChannelChannel(source,i);
+ traits=GetPixelChannelTraits(source,channel);
+ destination_traits=GetPixelChannelTraits(destination,channel);
if ((traits == UndefinedPixelTrait) ||
(destination_traits == UndefinedPixelTrait))
continue;
@@ -4703,9 +4703,9 @@
RectangleInfo
geometry;
- channel=GetPixelChannelMapChannel(source,i);
- traits=GetPixelChannelMapTraits(source,channel);
- destination_traits=GetPixelChannelMapTraits(destination,channel);
+ channel=GetPixelChannelChannel(source,i);
+ traits=GetPixelChannelTraits(source,channel);
+ destination_traits=GetPixelChannelTraits(destination,channel);
if ((traits == UndefinedPixelTrait) ||
(destination_traits == UndefinedPixelTrait))
continue;
@@ -4747,9 +4747,9 @@
}
for (i=0; i < (ssize_t) GetPixelChannels(source); i++)
{
- channel=GetPixelChannelMapChannel(source,i);
- traits=GetPixelChannelMapTraits(source,channel);
- destination_traits=GetPixelChannelMapTraits(destination,channel);
+ channel=GetPixelChannelChannel(source,i);
+ traits=GetPixelChannelTraits(source,channel);
+ destination_traits=GetPixelChannelTraits(destination,channel);
if ((traits == UndefinedPixelTrait) ||
(destination_traits == UndefinedPixelTrait))
continue;
@@ -4769,9 +4769,9 @@
}
for (i=0; i < (ssize_t) GetPixelChannels(source); i++)
{
- channel=GetPixelChannelMapChannel(source,i);
- traits=GetPixelChannelMapTraits(source,channel);
- destination_traits=GetPixelChannelMapTraits(destination,channel);
+ channel=GetPixelChannelChannel(source,i);
+ traits=GetPixelChannelTraits(source,channel);
+ destination_traits=GetPixelChannelTraits(destination,channel);
if ((traits == UndefinedPixelTrait) ||
(destination_traits == UndefinedPixelTrait))
continue;
@@ -4793,9 +4793,9 @@
delta,
luminance;
- channel=GetPixelChannelMapChannel(source,i);
- traits=GetPixelChannelMapTraits(source,channel);
- destination_traits=GetPixelChannelMapTraits(destination,channel);
+ channel=GetPixelChannelChannel(source,i);
+ traits=GetPixelChannelTraits(source,channel);
+ destination_traits=GetPixelChannelTraits(destination,channel);
if ((traits == UndefinedPixelTrait) ||
(destination_traits == UndefinedPixelTrait))
continue;
@@ -4905,9 +4905,9 @@
register ssize_t
j;
- channel=GetPixelChannelMapChannel(source,i);
- traits=GetPixelChannelMapTraits(source,channel);
- destination_traits=GetPixelChannelMapTraits(destination,channel);
+ channel=GetPixelChannelChannel(source,i);
+ traits=GetPixelChannelTraits(source,channel);
+ destination_traits=GetPixelChannelTraits(destination,channel);
if ((traits == UndefinedPixelTrait) ||
(destination_traits == UndefinedPixelTrait))
continue;
@@ -5739,12 +5739,12 @@
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% SetPixelChannelMapMask() sets the pixel channel map from the specified
+% SetPixelChannelMask() sets the pixel channel map from the specified
% channel mask.
%
-% The format of the SetPixelChannelMapMask method is:
+% The format of the SetPixelChannelMask method is:
%
-% void SetPixelChannelMapMask(Image *image,const ChannelType channel_mask)
+% void SetPixelChannelMask(Image *image,const ChannelType channel_mask)
%
% A description of each parameter follows:
%
@@ -5753,7 +5753,7 @@
% o channel_mask: the channel mask.
%
*/
-MagickExport void SetPixelChannelMapMask(Image *image,
+MagickExport void SetPixelChannelMask(Image *image,
const ChannelType channel_mask)
{
#define GetChannelBit(mask,bit) (((size_t) (mask) >> (size_t) (bit)) & 0x01)
@@ -5770,7 +5770,7 @@
PixelChannel
channel;
- channel=GetPixelChannelMapChannel(image,i);
+ channel=GetPixelChannelChannel(image,i);
SetPixelChannelTraits(image,channel,
GetChannelBit(channel_mask,channel) == 0 ? CopyPixelTrait :
image->matte == MagickFalse || (channel == AlphaPixelChannel) ?
@@ -5789,44 +5789,6 @@
% %
% %
% %
-% S e t P i x e l C h a n n e l M a s k %
-% %
-% %
-% %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% SetPixelChannelMask() sets the pixel channel mask from the specified channel
-% mask.
-%
-% The format of the SetPixelChannelMask method is:
-%
-% ChannelType SetPixelChannelMask(Image *image,
-% const ChannelType channel_mask)
-%
-% A description of each parameter follows:
-%
-% o image: the image.
-%
-% o channel_mask: the channel mask.
-%
-*/
-MagickExport ChannelType SetPixelChannelMask(Image *image,
- const ChannelType channel_mask)
-{
- ChannelType
- mask;
-
- mask=image->channel_mask;
- image->channel_mask=channel_mask;
- SetPixelChannelMapMask(image,channel_mask);
- return(mask);
-}
-
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% %
-% %
-% %
% S e t P i x e l M e t a C h a n n e l s %
% %
% %
diff --git a/MagickCore/pixel.h b/MagickCore/pixel.h
index f4ef93f..3e6ee22 100644
--- a/MagickCore/pixel.h
+++ b/MagickCore/pixel.h
@@ -175,9 +175,6 @@
typedef struct _CacheView
CacheView_;
-extern MagickExport ChannelType
- SetPixelChannelMask(Image *,const ChannelType);
-
extern MagickExport MagickBooleanType
ExportImagePixels(Image *,const ssize_t,const ssize_t,const size_t,
const size_t,const char *,const StorageType,void *,ExceptionInfo *),
@@ -208,7 +205,7 @@
extern MagickExport void
InitializePixelChannelMap(Image *),
GetPixelInfo(const Image *,PixelInfo *),
- SetPixelChannelMapMask(Image *,const ChannelType);
+ SetPixelChannelMask(Image *,const ChannelType);
#if defined(__cplusplus) || defined(c_plusplus)
}
diff --git a/MagickCore/quantum-export.c b/MagickCore/quantum-export.c
index bc57fae..6a3750c 100644
--- a/MagickCore/quantum-export.c
+++ b/MagickCore/quantum-export.c
@@ -3254,8 +3254,8 @@
PixelTrait
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
if ((traits & UpdatePixelTrait) == 0)
continue;
q[i]=ClampToQuantum(Sa*q[i]);
diff --git a/MagickCore/quantum-import.c b/MagickCore/quantum-import.c
index 9a04abc..5de3527 100644
--- a/MagickCore/quantum-import.c
+++ b/MagickCore/quantum-import.c
@@ -3619,8 +3619,8 @@
PixelTrait
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
if ((traits & UpdatePixelTrait) == 0)
continue;
q[i]=ClampToQuantum(gamma*q[i]);
diff --git a/MagickCore/resize.c b/MagickCore/resize.c
index b261b84..45bd8fb 100644
--- a/MagickCore/resize.c
+++ b/MagickCore/resize.c
@@ -1657,9 +1657,9 @@
resize_traits,
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- resize_traits=GetPixelChannelMapTraits(resize_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ resize_traits=GetPixelChannelTraits(resize_image,channel);
if ((traits == UndefinedPixelTrait) ||
(resize_traits == UndefinedPixelTrait))
continue;
@@ -1880,9 +1880,9 @@
rescale_traits,
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- rescale_traits=GetPixelChannelMapTraits(rescale_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ rescale_traits=GetPixelChannelTraits(rescale_image,channel);
if ((traits == UndefinedPixelTrait) ||
(rescale_traits == UndefinedPixelTrait))
continue;
@@ -2312,9 +2312,9 @@
ssize_t
k;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- resize_traits=GetPixelChannelMapTraits(resize_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ resize_traits=GetPixelChannelTraits(resize_image,channel);
if ((traits == UndefinedPixelTrait) ||
(resize_traits == UndefinedPixelTrait))
continue;
@@ -2527,9 +2527,9 @@
ssize_t
k;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- resize_traits=GetPixelChannelMapTraits(resize_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ resize_traits=GetPixelChannelTraits(resize_image,channel);
if ((traits == UndefinedPixelTrait) ||
(resize_traits == UndefinedPixelTrait))
continue;
@@ -2843,9 +2843,9 @@
sample_traits,
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- sample_traits=GetPixelChannelMapTraits(sample_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ sample_traits=GetPixelChannelTraits(sample_image,channel);
if ((traits == UndefinedPixelTrait) ||
(sample_traits == UndefinedPixelTrait))
continue;
@@ -3044,8 +3044,8 @@
PixelTrait
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
if ((traits & BlendPixelTrait) == 0)
{
x_vector[x*GetPixelChannels(image)+i]=(double) p[i];
@@ -3088,8 +3088,8 @@
PixelTrait
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
if ((traits & BlendPixelTrait) == 0)
{
x_vector[x*GetPixelChannels(image)+i]=(double)
@@ -3135,8 +3135,8 @@
PixelTrait
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
if ((traits & BlendPixelTrait) == 0)
{
x_vector[x*GetPixelChannels(image)+i]=(double) p[i];
@@ -3185,13 +3185,13 @@
ssize_t
offset;
- channel=GetPixelChannelMapChannel(scale_image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- scale_traits=GetPixelChannelMapTraits(scale_image,channel);
+ channel=GetPixelChannelChannel(scale_image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ scale_traits=GetPixelChannelTraits(scale_image,channel);
if ((traits == UndefinedPixelTrait) ||
(scale_traits == UndefinedPixelTrait))
continue;
- offset=GetPixelChannelMapOffset(image,channel);
+ offset=GetPixelChannelOffset(image,channel);
if ((traits & BlendPixelTrait) == 0)
{
SetPixelChannel(scale_image,channel,ClampToQuantum(
@@ -3199,7 +3199,7 @@
continue;
}
alpha=QuantumScale*scanline[x*GetPixelChannels(image)+
- GetPixelChannelMapChannel(image,AlphaPixelChannel)];
+ GetPixelChannelChannel(image,AlphaPixelChannel)];
gamma=MagickEpsilonReciprocal(alpha);
SetPixelChannel(scale_image,channel,ClampToQuantum(gamma*scanline[
x*GetPixelChannels(image)+offset]),q);
@@ -3239,8 +3239,8 @@
PixelTrait
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
if (traits == UndefinedPixelTrait)
continue;
pixel[i]+=span.x*scanline[x*GetPixelChannels(image)+i];
@@ -3273,7 +3273,7 @@
((ssize_t) n < (ssize_t) scale_image->columns))
for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
{
- channel=GetPixelChannelMapChannel(image,i);
+ channel=GetPixelChannelChannel(image,i);
scale_scanline[n*MaxPixelChannels+channel]=pixel[i];
}
/*
@@ -3288,9 +3288,9 @@
}
for (i=0; i < (ssize_t) GetPixelChannels(scale_image); i++)
{
- channel=GetPixelChannelMapChannel(scale_image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- scale_traits=GetPixelChannelMapTraits(scale_image,channel);
+ channel=GetPixelChannelChannel(scale_image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ scale_traits=GetPixelChannelTraits(scale_image,channel);
if ((traits == UndefinedPixelTrait) ||
(scale_traits == UndefinedPixelTrait))
continue;
diff --git a/MagickCore/shear.c b/MagickCore/shear.c
index 95de2a5..e540838 100644
--- a/MagickCore/shear.c
+++ b/MagickCore/shear.c
@@ -1107,9 +1107,9 @@
rotate_traits,
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- rotate_traits=GetPixelChannelMapTraits(rotate_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ rotate_traits=GetPixelChannelTraits(rotate_image,channel);
if ((traits == UndefinedPixelTrait) ||
(rotate_traits == UndefinedPixelTrait))
continue;
@@ -1199,9 +1199,9 @@
rotate_traits,
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- rotate_traits=GetPixelChannelMapTraits(rotate_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ rotate_traits=GetPixelChannelTraits(rotate_image,channel);
if ((traits == UndefinedPixelTrait) ||
(rotate_traits == UndefinedPixelTrait))
continue;
@@ -1328,9 +1328,9 @@
rotate_traits,
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- rotate_traits=GetPixelChannelMapTraits(rotate_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ rotate_traits=GetPixelChannelTraits(rotate_image,channel);
if ((traits == UndefinedPixelTrait) ||
(rotate_traits == UndefinedPixelTrait))
continue;
diff --git a/MagickCore/signature.c b/MagickCore/signature.c
index 31ddd1c..6bb14cf 100644
--- a/MagickCore/signature.c
+++ b/MagickCore/signature.c
@@ -540,8 +540,8 @@
register ssize_t
j;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
if (traits == UndefinedPixelTrait)
continue;
pixel=QuantumScale*p[i];
diff --git a/MagickCore/statistic.c b/MagickCore/statistic.c
index 78c911b..85fbcb3 100644
--- a/MagickCore/statistic.c
+++ b/MagickCore/statistic.c
@@ -573,9 +573,9 @@
evaluate_traits,
traits;
- channel=GetPixelChannelMapChannel(image,i);
- evaluate_traits=GetPixelChannelMapTraits(image,channel);
- traits=GetPixelChannelMapTraits(next,channel);
+ channel=GetPixelChannelChannel(image,i);
+ evaluate_traits=GetPixelChannelTraits(image,channel);
+ traits=GetPixelChannelTraits(next,channel);
if ((traits == UndefinedPixelTrait) ||
(evaluate_traits == UndefinedPixelTrait))
continue;
@@ -686,9 +686,9 @@
evaluate_traits,
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(next,channel);
- evaluate_traits=GetPixelChannelMapTraits(image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(next,channel);
+ evaluate_traits=GetPixelChannelTraits(image,channel);
if ((traits == UndefinedPixelTrait) ||
(evaluate_traits == UndefinedPixelTrait))
continue;
@@ -750,8 +750,8 @@
PixelTrait
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
if (traits == UndefinedPixelTrait)
continue;
if ((traits & UpdatePixelTrait) == 0)
@@ -855,8 +855,8 @@
PixelTrait
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
if (traits == UndefinedPixelTrait)
continue;
if (((traits & CopyPixelTrait) != 0) ||
@@ -1086,8 +1086,8 @@
PixelTrait
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
if (traits == UndefinedPixelTrait)
continue;
if ((traits & UpdatePixelTrait) == 0)
@@ -1225,8 +1225,8 @@
PixelTrait
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
if (traits == UndefinedPixelTrait)
continue;
if ((traits & UpdatePixelTrait) == 0)
@@ -1345,8 +1345,8 @@
PixelTrait
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
if (traits == UndefinedPixelTrait)
continue;
if (((traits & UpdatePixelTrait) == 0) ||
@@ -1477,8 +1477,8 @@
PixelTrait
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
if (traits == UndefinedPixelTrait)
continue;
if ((traits & UpdatePixelTrait) == 0)
@@ -1560,8 +1560,8 @@
PixelTrait
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
if ((traits & UpdatePixelTrait) != 0)
channels++;
}
@@ -1635,8 +1635,8 @@
PixelTrait
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
if (traits == UndefinedPixelTrait)
continue;
if (channel_statistics[channel].depth != MAGICKCORE_QUANTUM_DEPTH)
@@ -2327,9 +2327,9 @@
ssize_t
v;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- statistic_traits=GetPixelChannelMapTraits(statistic_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ statistic_traits=GetPixelChannelTraits(statistic_image,channel);
if ((traits == UndefinedPixelTrait) ||
(statistic_traits == UndefinedPixelTrait))
continue;
diff --git a/MagickCore/stream.c b/MagickCore/stream.c
index 7be49c8..5e83f3d 100644
--- a/MagickCore/stream.c
+++ b/MagickCore/stream.c
@@ -467,7 +467,7 @@
PixelChannel
channel;
- channel=GetPixelChannelMapChannel(image,i);
+ channel=GetPixelChannelChannel(image,i);
pixel[channel]=q[i];
}
return(MagickTrue);
@@ -534,7 +534,7 @@
PixelChannel
channel;
- channel=GetPixelChannelMapChannel(image,i);
+ channel=GetPixelChannelChannel(image,i);
pixel[channel]=p[i];
}
return(MagickTrue);
diff --git a/MagickCore/threshold.c b/MagickCore/threshold.c
index 1e5e3c1..01395a9 100644
--- a/MagickCore/threshold.c
+++ b/MagickCore/threshold.c
@@ -262,9 +262,9 @@
ssize_t
v;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- threshold_traits=GetPixelChannelMapTraits(threshold_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ threshold_traits=GetPixelChannelTraits(threshold_image,channel);
if ((traits == UndefinedPixelTrait) ||
(threshold_traits == UndefinedPixelTrait))
continue;
@@ -428,8 +428,8 @@
PixelTrait
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
if ((traits & UpdatePixelTrait) == 0)
continue;
if (image->channel_mask != DefaultChannels)
@@ -599,8 +599,8 @@
PixelTrait
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
if ((traits & UpdatePixelTrait) == 0)
continue;
if (image->channel_mask != DefaultChannels)
@@ -750,8 +750,8 @@
PixelTrait
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
if (traits == UndefinedPixelTrait)
continue;
q[i]=ClampToUnsignedQuantum(q[i]);
@@ -1382,8 +1382,8 @@
level,
threshold;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
if ((traits & UpdatePixelTrait) == 0)
continue;
if (fabs(levels[n++]) < MagickEpsilon)
@@ -1560,8 +1560,8 @@
PixelTrait
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
if ((traits & UpdatePixelTrait) == 0)
continue;
if ((double) q[i] < min_threshold)
@@ -1738,8 +1738,8 @@
PixelTrait
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
if ((traits & UpdatePixelTrait) == 0)
continue;
if (image->channel_mask != DefaultChannels)
diff --git a/MagickCore/transform.c b/MagickCore/transform.c
index 455a9cf..85cf8f6 100644
--- a/MagickCore/transform.c
+++ b/MagickCore/transform.c
@@ -200,9 +200,9 @@
chop_traits,
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- chop_traits=GetPixelChannelMapTraits(chop_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ chop_traits=GetPixelChannelTraits(chop_image,channel);
if ((traits == UndefinedPixelTrait) ||
(chop_traits == UndefinedPixelTrait))
continue;
@@ -272,9 +272,9 @@
chop_traits,
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- chop_traits=GetPixelChannelMapTraits(chop_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ chop_traits=GetPixelChannelTraits(chop_image,channel);
if ((traits == UndefinedPixelTrait) ||
(chop_traits == UndefinedPixelTrait))
continue;
@@ -632,9 +632,9 @@
crop_traits,
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- crop_traits=GetPixelChannelMapTraits(crop_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ crop_traits=GetPixelChannelTraits(crop_image,channel);
if ((traits == UndefinedPixelTrait) ||
(crop_traits == UndefinedPixelTrait))
continue;
@@ -994,9 +994,9 @@
excerpt_traits,
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- excerpt_traits=GetPixelChannelMapTraits(excerpt_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ excerpt_traits=GetPixelChannelTraits(excerpt_image,channel);
if ((traits == UndefinedPixelTrait) ||
(excerpt_traits == UndefinedPixelTrait))
continue;
@@ -1201,9 +1201,9 @@
flip_traits,
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- flip_traits=GetPixelChannelMapTraits(flip_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ flip_traits=GetPixelChannelTraits(flip_image,channel);
if ((traits == UndefinedPixelTrait) ||
(flip_traits == UndefinedPixelTrait))
continue;
@@ -1349,9 +1349,9 @@
flop_traits,
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- flop_traits=GetPixelChannelMapTraits(flop_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ flop_traits=GetPixelChannelTraits(flop_image,channel);
if ((traits == UndefinedPixelTrait) ||
(flop_traits == UndefinedPixelTrait))
continue;
@@ -1483,9 +1483,9 @@
destination_traits,
source_traits;
- channel=GetPixelChannelMapChannel(source,i);
- source_traits=GetPixelChannelMapTraits(source,channel);
- destination_traits=GetPixelChannelMapTraits(destination,channel);
+ channel=GetPixelChannelChannel(source,i);
+ source_traits=GetPixelChannelTraits(source,channel);
+ destination_traits=GetPixelChannelTraits(destination,channel);
if ((source_traits == UndefinedPixelTrait) ||
(destination_traits == UndefinedPixelTrait))
continue;
@@ -1807,9 +1807,9 @@
splice_traits,
traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- splice_traits=GetPixelChannelMapTraits(splice_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ splice_traits=GetPixelChannelTraits(splice_image,channel);
if ((traits == UndefinedPixelTrait) ||
(splice_traits == UndefinedPixelTrait))
continue;
@@ -1840,9 +1840,9 @@
traits,
splice_traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- splice_traits=GetPixelChannelMapTraits(splice_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ splice_traits=GetPixelChannelTraits(splice_image,channel);
if ((traits == UndefinedPixelTrait) ||
(splice_traits == UndefinedPixelTrait))
continue;
@@ -1916,9 +1916,9 @@
traits,
splice_traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- splice_traits=GetPixelChannelMapTraits(splice_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ splice_traits=GetPixelChannelTraits(splice_image,channel);
if ((traits == UndefinedPixelTrait) ||
(splice_traits == UndefinedPixelTrait))
continue;
@@ -1949,9 +1949,9 @@
traits,
splice_traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- splice_traits=GetPixelChannelMapTraits(splice_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ splice_traits=GetPixelChannelTraits(splice_image,channel);
if ((traits == UndefinedPixelTrait) ||
(splice_traits == UndefinedPixelTrait))
continue;
@@ -2265,9 +2265,9 @@
traits,
transpose_traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- transpose_traits=GetPixelChannelMapTraits(transpose_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ transpose_traits=GetPixelChannelTraits(transpose_image,channel);
if ((traits == UndefinedPixelTrait) ||
(transpose_traits == UndefinedPixelTrait))
continue;
@@ -2418,9 +2418,9 @@
traits,
transverse_traits;
- channel=GetPixelChannelMapChannel(image,i);
- traits=GetPixelChannelMapTraits(image,channel);
- transverse_traits=GetPixelChannelMapTraits(transverse_image,channel);
+ channel=GetPixelChannelChannel(image,i);
+ traits=GetPixelChannelTraits(image,channel);
+ transverse_traits=GetPixelChannelTraits(transverse_image,channel);
if ((traits == UndefinedPixelTrait) ||
(transverse_traits == UndefinedPixelTrait))
continue;
diff --git a/MagickWand/compare.c b/MagickWand/compare.c
index 7af0025..b61b394 100644
--- a/MagickWand/compare.c
+++ b/MagickWand/compare.c
@@ -392,7 +392,7 @@
if (channel < 0)
ThrowCompareException(OptionError,"UnrecognizedChannelType",
argv[i]);
- SetPixelChannelMapMask(image,(ChannelType) channel);
+ SetPixelChannelMask(image,(ChannelType) channel);
break;
}
if (LocaleCompare("colorspace",option+1) == 0)
diff --git a/MagickWand/composite.c b/MagickWand/composite.c
index 156157b..830b4b0 100644
--- a/MagickWand/composite.c
+++ b/MagickWand/composite.c
@@ -125,7 +125,7 @@
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",(*image)->filename);
assert(exception != (ExceptionInfo *) NULL);
status=MagickTrue;
- channel_mask=SetPixelChannelMask(composite_image,composite_options->channel);
+ channel_mask=SetImageChannelMask(composite_image,composite_options->channel);
if (composite_image != (Image *) NULL)
{
assert(composite_image->signature == MagickSignature);
@@ -220,7 +220,7 @@
exception);
}
}
- (void) SetPixelChannelMapMask(composite_image,channel_mask);
+ (void) SetPixelChannelMask(composite_image,channel_mask);
return(status != 0 ? MagickTrue : MagickFalse);
}
diff --git a/PerlMagick/Magick.xs b/PerlMagick/Magick.xs
index dcbe667..9870720 100644
--- a/PerlMagick/Magick.xs
+++ b/PerlMagick/Magick.xs
@@ -2967,10 +2967,10 @@
}
}
}
- channel_mask=SetPixelChannelMask(image,channel);
+ channel_mask=SetImageChannelMask(image,channel);
image=ChannelFxImage(image,expression,exception);
if (image != (Image *) NULL)
- (void) SetPixelChannelMask(image,channel_mask);
+ (void) SetImageChannelMask(image,channel_mask);
if (image == (Image *) NULL)
goto PerlException;
for ( ; image; image=image->next)
@@ -3324,7 +3324,7 @@
"UnrecognizedType",SvPV(ST(i),na));
return;
}
- SetPixelChannelMapMask(image,(ChannelType) option);
+ SetPixelChannelMask(image,(ChannelType) option);
break;
}
ThrowPerlException(exception,OptionError,"UnrecognizedAttribute",
@@ -4313,10 +4313,10 @@
}
}
}
- channel_mask=SetPixelChannelMask(image,channel);
+ channel_mask=SetImageChannelMask(image,channel);
image=FxImage(image,expression,exception);
if (image != (Image *) NULL)
- (void) SetPixelChannelMask(image,channel_mask);
+ (void) SetImageChannelMask(image,channel_mask);
if (image == (Image *) NULL)
goto PerlException;
for ( ; image; image=image->next)
@@ -6288,7 +6288,7 @@
SvPV(ST(i),na));
return;
}
- SetPixelChannelMapMask(image,(ChannelType) option);
+ SetPixelChannelMask(image,(ChannelType) option);
break;
}
ThrowPerlException(exception,OptionError,"UnrecognizedAttribute",
@@ -7658,11 +7658,11 @@
attenuate=argument_list[1].real_reference;
if (attribute_flag[2] != 0)
channel=(ChannelType) argument_list[2].integer_reference;
- channel_mask=SetPixelChannelMask(image,channel);
+ channel_mask=SetImageChannelMask(image,channel);
image=AddNoiseImage(image,(NoiseType)
argument_list[0].integer_reference,attenuate,exception);
if (image != (Image *) NULL)
- (void) SetPixelChannelMask(image,channel_mask);
+ (void) SetImageChannelMask(image,channel_mask);
break;
}
case 4: /* Colorize */
@@ -7725,11 +7725,11 @@
geometry_info.sigma=argument_list[2].real_reference;
if (attribute_flag[3] != 0)
channel=(ChannelType) argument_list[3].integer_reference;
- channel_mask=SetPixelChannelMask(image,channel);
+ channel_mask=SetImageChannelMask(image,channel);
image=BlurImage(image,geometry_info.rho,geometry_info.sigma,
exception);
if (image != (Image *) NULL)
- (void) SetPixelChannelMask(image,channel_mask);
+ (void) SetImageChannelMask(image,channel_mask);
break;
}
case 7: /* Chop */
@@ -7891,11 +7891,11 @@
geometry_info.sigma=argument_list[2].real_reference;
if (attribute_flag[3] != 0)
channel=(ChannelType) argument_list[3].integer_reference;
- channel_mask=SetPixelChannelMask(image,channel);
+ channel_mask=SetImageChannelMask(image,channel);
image=StatisticImage(image,MedianStatistic,(size_t) geometry_info.rho,
(size_t) geometry_info.sigma,exception);
if (image != (Image *) NULL)
- (void) SetPixelChannelMask(image,channel_mask);
+ (void) SetImageChannelMask(image,channel_mask);
break;
}
case 19: /* Minify */
@@ -7928,11 +7928,11 @@
geometry_info.sigma=argument_list[2].real_reference;
if (attribute_flag[3] != 0)
channel=(ChannelType) argument_list[3].integer_reference;
- channel_mask=SetPixelChannelMask(image,channel);
+ channel_mask=SetImageChannelMask(image,channel);
image=StatisticImage(image,NonpeakStatistic,(size_t)
geometry_info.rho,(size_t) geometry_info.sigma,exception);
if (image != (Image *) NULL)
- (void) SetPixelChannelMask(image,channel_mask);
+ (void) SetImageChannelMask(image,channel_mask);
break;
}
case 22: /* Roll */
@@ -8019,11 +8019,11 @@
geometry_info.sigma=argument_list[2].real_reference;
if (attribute_flag[3] != 0)
channel=(ChannelType) argument_list[3].integer_reference;
- channel_mask=SetPixelChannelMask(image,channel);
+ channel_mask=SetImageChannelMask(image,channel);
image=SharpenImage(image,geometry_info.rho,geometry_info.sigma,
exception);
if (image != (Image *) NULL)
- (void) SetPixelChannelMask(image,channel_mask);
+ (void) SetImageChannelMask(image,channel_mask);
break;
}
case 28: /* Shear */
@@ -8559,7 +8559,7 @@
geometry.y);
flags=ParseGravityGeometry(image,composite_geometry,&geometry,
exception);
- channel_mask=SetPixelChannelMask(image,channel);
+ channel_mask=SetImageChannelMask(image,channel);
if (attribute_flag[8] == 0) /* no rotate */
CompositeImage(image,composite_image,compose,clip_to_self,
geometry.x,geometry.y,exception);
@@ -8584,7 +8584,7 @@
else
(void) SetImageMask(image,(Image *) NULL,exception);
}
- (void) SetPixelChannelMask(image,channel_mask);
+ (void) SetImageChannelMask(image,channel_mask);
break;
}
case 36: /* Contrast */
@@ -8848,9 +8848,9 @@
{
if (attribute_flag[0] != 0)
channel=(ChannelType) argument_list[0].integer_reference;
- channel_mask=SetPixelChannelMask(image,channel);
+ channel_mask=SetImageChannelMask(image,channel);
EqualizeImage(image,exception);
- (void) SetPixelChannelMask(image,channel_mask);
+ (void) SetImageChannelMask(image,channel_mask);
break;
}
case 40: /* Gamma */
@@ -8932,10 +8932,10 @@
invert=MagickFalse;
if (attribute_flag[6] != 0)
invert=(MagickBooleanType) argument_list[6].integer_reference;
- channel_mask=SetPixelChannelMask(image,AlphaChannel);
+ channel_mask=SetImageChannelMask(image,AlphaChannel);
(void) FloodfillPaintImage(image,draw_info,&target,geometry.x,
geometry.y,invert,exception);
- (void) SetPixelChannelMask(image,channel_mask);
+ (void) SetImageChannelMask(image,channel_mask);
draw_info=DestroyDrawInfo(draw_info);
break;
}
@@ -8985,19 +8985,19 @@
argument_list[0].integer_reference=0;
if (attribute_flag[1] != 0)
channel=(ChannelType) argument_list[1].integer_reference;
- channel_mask=SetPixelChannelMask(image,channel);
+ channel_mask=SetImageChannelMask(image,channel);
(void) NegateImage(image,argument_list[0].integer_reference != 0 ?
MagickTrue : MagickFalse,exception);
- (void) SetPixelChannelMask(image,channel_mask);
+ (void) SetImageChannelMask(image,channel_mask);
break;
}
case 45: /* Normalize */
{
if (attribute_flag[0] != 0)
channel=(ChannelType) argument_list[0].integer_reference;
- channel_mask=SetPixelChannelMask(image,channel);
+ channel_mask=SetImageChannelMask(image,channel);
NormalizeImage(image,exception);
- (void) SetPixelChannelMask(image,channel_mask);
+ (void) SetImageChannelMask(image,channel_mask);
break;
}
case 46: /* NumberColors */
@@ -9029,9 +9029,9 @@
invert=MagickFalse;
if (attribute_flag[4] != 0)
invert=(MagickBooleanType) argument_list[4].integer_reference;
- channel_mask=SetPixelChannelMask(image,channel);
+ channel_mask=SetImageChannelMask(image,channel);
(void) OpaquePaintImage(image,&target,&fill_color,invert,exception);
- (void) SetPixelChannelMask(image,channel_mask);
+ (void) SetImageChannelMask(image,channel_mask);
break;
}
case 48: /* Quantize */
@@ -9169,10 +9169,10 @@
op=(MagickEvaluateOperator) argument_list[1].integer_reference;
if (attribute_flag[2] != MagickFalse)
channel=(ChannelType) argument_list[2].integer_reference;
- channel_mask=SetPixelChannelMask(image,channel);
+ channel_mask=SetImageChannelMask(image,channel);
(void) EvaluateImage(image,op,argument_list[0].real_reference,
exception);
- (void) SetPixelChannelMask(image,channel_mask);
+ (void) SetImageChannelMask(image,channel_mask);
break;
}
case 56: /* Transparent */
@@ -9218,9 +9218,9 @@
channel=(ChannelType) argument_list[1].integer_reference;
threshold=StringToDoubleInterval(argument_list[0].string_reference,
(double) QuantumRange+1.0);
- channel_mask=SetPixelChannelMask(image,channel);
+ channel_mask=SetImageChannelMask(image,channel);
(void) BilevelImage(image,threshold,exception);
- (void) SetPixelChannelMask(image,channel_mask);
+ (void) SetImageChannelMask(image,channel_mask);
break;
}
case 58: /* Charcoal */
@@ -9328,11 +9328,11 @@
geometry_info.sigma=argument_list[2].real_reference;
if (attribute_flag[3] != 0)
channel=(ChannelType) argument_list[3].integer_reference;
- channel_mask=SetPixelChannelMask(image,channel);
+ channel_mask=SetImageChannelMask(image,channel);
image=GaussianBlurImage(image,geometry_info.rho,geometry_info.sigma,
exception);
if (image != (Image *) NULL)
- (void) SetPixelChannelMask(image,channel_mask);
+ (void) SetImageChannelMask(image,channel_mask);
break;
}
case 67: /* Convolve */
@@ -9383,10 +9383,10 @@
if (kernel == (KernelInfo *) NULL)
break;
}
- channel_mask=SetPixelChannelMask(image,channel);
+ channel_mask=SetImageChannelMask(image,channel);
image=ConvolveImage(image,kernel,exception);
if (image != (Image *) NULL)
- (void) SetPixelChannelMask(image,channel_mask);
+ (void) SetImageChannelMask(image,channel_mask);
kernel=DestroyKernelInfo(kernel);
break;
}
@@ -9483,11 +9483,11 @@
geometry_info.psi=argument_list[4].real_reference;
if (attribute_flag[5] != 0)
channel=(ChannelType) argument_list[5].integer_reference;
- channel_mask=SetPixelChannelMask(image,channel);
+ channel_mask=SetImageChannelMask(image,channel);
image=UnsharpMaskImage(image,geometry_info.rho,geometry_info.sigma,
geometry_info.xi,geometry_info.psi,exception);
if (image != (Image *) NULL)
- (void) SetPixelChannelMask(image,channel_mask);
+ (void) SetImageChannelMask(image,channel_mask);
break;
}
case 70: /* MotionBlur */
@@ -9509,11 +9509,11 @@
geometry_info.xi=argument_list[3].real_reference;
if (attribute_flag[4] != 0)
channel=(ChannelType) argument_list[4].integer_reference;
- channel_mask=SetPixelChannelMask(image,channel);
+ channel_mask=SetImageChannelMask(image,channel);
image=MotionBlurImage(image,geometry_info.rho,geometry_info.sigma,
geometry_info.xi,exception);
if (image != (Image *) NULL)
- (void) SetPixelChannelMask(image,channel_mask);
+ (void) SetImageChannelMask(image,channel_mask);
break;
}
case 71: /* OrderedDither */
@@ -9522,10 +9522,10 @@
argument_list[0].string_reference="o8x8";
if (attribute_flag[1] != 0)
channel=(ChannelType) argument_list[1].integer_reference;
- channel_mask=SetPixelChannelMask(image,channel);
+ channel_mask=SetImageChannelMask(image,channel);
(void) OrderedPosterizeImage(image,argument_list[0].string_reference,
exception);
- (void) SetPixelChannelMask(image,channel_mask);
+ (void) SetImageChannelMask(image,channel_mask);
break;
}
case 72: /* Shave */
@@ -9580,9 +9580,9 @@
argument_list[0].real_reference=argument_list[5].real_reference;
attribute_flag[0]=attribute_flag[5];
}
- channel_mask=SetPixelChannelMask(image,channel);
+ channel_mask=SetImageChannelMask(image,channel);
(void) LevelImage(image,black_point,white_point,gamma,exception);
- (void) SetPixelChannelMask(image,channel_mask);
+ (void) SetImageChannelMask(image,channel_mask);
break;
}
case 74: /* Clip */
@@ -9801,10 +9801,10 @@
argument_list[0].string_reference="50%";
if (attribute_flag[2] != 0)
channel=(ChannelType) argument_list[2].integer_reference;
- channel_mask=SetPixelChannelMask(image,channel);
+ channel_mask=SetImageChannelMask(image,channel);
BlackThresholdImage(image,argument_list[0].string_reference,
exception);
- (void) SetPixelChannelMask(image,channel_mask);
+ (void) SetImageChannelMask(image,channel_mask);
break;
}
case 81: /* WhiteThreshold */
@@ -9813,10 +9813,10 @@
argument_list[0].string_reference="50%";
if (attribute_flag[2] != 0)
channel=(ChannelType) argument_list[2].integer_reference;
- channel_mask=SetPixelChannelMask(image,channel);
+ channel_mask=SetImageChannelMask(image,channel);
WhiteThresholdImage(image,argument_list[0].string_reference,
exception);
- (void) SetPixelChannelMask(image,channel_mask);
+ (void) SetImageChannelMask(image,channel_mask);
break;
}
case 82: /* RadialBlur */
@@ -9830,10 +9830,10 @@
geometry_info.rho=argument_list[1].real_reference;
if (attribute_flag[2] != 0)
channel=(ChannelType) argument_list[2].integer_reference;
- channel_mask=SetPixelChannelMask(image,channel);
+ channel_mask=SetImageChannelMask(image,channel);
image=RadialBlurImage(image,geometry_info.rho,exception);
if (image != (Image *) NULL)
- (void) SetPixelChannelMask(image,channel_mask);
+ (void) SetImageChannelMask(image,channel_mask);
break;
}
case 83: /* Thumbnail */
@@ -9982,10 +9982,10 @@
if (attribute_flag[4] != 0)
sharpen=argument_list[4].integer_reference != 0 ? MagickTrue :
MagickFalse;
- channel_mask=SetPixelChannelMask(image,channel);
+ channel_mask=SetImageChannelMask(image,channel);
(void) SigmoidalContrastImage(image,sharpen,geometry_info.rho,
geometry_info.sigma,exception);
- (void) SetPixelChannelMask(image,channel_mask);
+ (void) SetImageChannelMask(image,channel_mask);
break;
}
case 93: /* Extent */
@@ -10080,9 +10080,9 @@
white_point=argument_list[2].real_reference;
if (attribute_flag[4] != 0)
channel=(ChannelType) argument_list[4].integer_reference;
- channel_mask=SetPixelChannelMask(image,channel);
+ channel_mask=SetImageChannelMask(image,channel);
(void) ContrastStretchImage(image,black_point,white_point,exception);
- (void) SetPixelChannelMask(image,channel_mask);
+ (void) SetImageChannelMask(image,channel_mask);
break;
}
case 96: /* Sans0 */
@@ -10112,11 +10112,11 @@
geometry_info.xi=argument_list[3].real_reference;
if (attribute_flag[4] != 0)
channel=(ChannelType) argument_list[4].integer_reference;
- channel_mask=SetPixelChannelMask(image,channel);
+ channel_mask=SetImageChannelMask(image,channel);
image=AdaptiveSharpenImage(image,geometry_info.rho,
geometry_info.sigma,exception);
if (image != (Image *) NULL)
- (void) SetPixelChannelMask(image,channel_mask);
+ (void) SetImageChannelMask(image,channel_mask);
break;
}
case 99: /* Transpose */
@@ -10190,11 +10190,11 @@
geometry_info.sigma=argument_list[2].real_reference;
if (attribute_flag[3] != 0)
channel=(ChannelType) argument_list[3].integer_reference;
- channel_mask=SetPixelChannelMask(image,channel);
+ channel_mask=SetImageChannelMask(image,channel);
image=AdaptiveBlurImage(image,geometry_info.rho,geometry_info.sigma,
exception);
if (image != (Image *) NULL)
- (void) SetPixelChannelMask(image,channel_mask);
+ (void) SetImageChannelMask(image,channel_mask);
break;
}
case 103: /* Sketch */
@@ -10440,10 +10440,10 @@
invert=MagickFalse;
if (attribute_flag[7] != 0)
invert=(MagickBooleanType) argument_list[7].integer_reference;
- channel_mask=SetPixelChannelMask(image,channel);
+ channel_mask=SetImageChannelMask(image,channel);
(void) FloodfillPaintImage(image,draw_info,&target,geometry.x,
geometry.y,invert,exception);
- (void) SetPixelChannelMask(image,channel_mask);
+ (void) SetImageChannelMask(image,channel_mask);
draw_info=DestroyDrawInfo(draw_info);
break;
}
@@ -10510,10 +10510,10 @@
method=(PixelInterpolateMethod) argument_list[1].integer_reference;
if (attribute_flag[2] != 0)
channel=(ChannelType) argument_list[2].integer_reference;
- channel_mask=SetPixelChannelMask(image,channel);
+ channel_mask=SetImageChannelMask(image,channel);
(void) ClutImage(image,argument_list[0].image_reference,method,
exception);
- (void) SetPixelChannelMask(image,channel_mask);
+ (void) SetImageChannelMask(image,channel_mask);
break;
}
case 114: /* LiquidRescale */
@@ -10618,11 +10618,11 @@
argument_list[2].integer_reference,exception);
if (attribute_flag[3] != 0)
channel=(ChannelType) argument_list[3].integer_reference;
- channel_mask=SetPixelChannelMask(image,channel);
+ channel_mask=SetImageChannelMask(image,channel);
image=SparseColorImage(image,method,number_coordinates,coordinates,
exception);
if (image != (Image *) NULL)
- (void) SetPixelChannelMask(image,channel_mask);
+ (void) SetImageChannelMask(image,channel_mask);
if ((attribute_flag[2] != 0) && (image != (Image *) NULL))
virtual_pixel=SetImageVirtualPixelMethod(image,virtual_pixel,
exception);
@@ -10694,11 +10694,11 @@
geometry_info.xi=argument_list[3].integer_reference;;
if (attribute_flag[5] != 0)
channel=(ChannelType) argument_list[5].integer_reference;
- channel_mask=SetPixelChannelMask(image,channel);
+ channel_mask=SetImageChannelMask(image,channel);
image=SelectiveBlurImage(image,geometry_info.rho,geometry_info.sigma,
geometry_info.xi,exception);
if (image != (Image *) NULL)
- (void) SetPixelChannelMask(image,channel_mask);
+ (void) SetImageChannelMask(image,channel_mask);
break;
}
case 122: /* HaldClut */
@@ -10711,10 +10711,10 @@
}
if (attribute_flag[1] != 0)
channel=(ChannelType) argument_list[1].integer_reference;
- channel_mask=SetPixelChannelMask(image,channel);
+ channel_mask=SetImageChannelMask(image,channel);
(void) HaldClutImage(image,argument_list[0].image_reference,
exception);
- (void) SetPixelChannelMask(image,channel_mask);
+ (void) SetImageChannelMask(image,channel_mask);
break;
}
case 123: /* BlueShift */
@@ -10751,18 +10751,18 @@
{
if (attribute_flag[0] != 0)
channel=(ChannelType) argument_list[0].integer_reference;
- channel_mask=SetPixelChannelMask(image,channel);
+ channel_mask=SetImageChannelMask(image,channel);
(void) AutoGammaImage(image,exception);
- (void) SetPixelChannelMask(image,channel_mask);
+ (void) SetImageChannelMask(image,channel_mask);
break;
}
case 128: /* AutoLevel */
{
if (attribute_flag[0] != 0)
channel=(ChannelType) argument_list[0].integer_reference;
- channel_mask=SetPixelChannelMask(image,channel);
+ channel_mask=SetImageChannelMask(image,channel);
(void) AutoLevelImage(image,exception);
- (void) SetPixelChannelMask(image,channel_mask);
+ (void) SetImageChannelMask(image,channel_mask);
break;
}
case 129: /* LevelColors */
@@ -10785,20 +10785,20 @@
exception);
if (attribute_flag[3] != 0)
channel=(ChannelType) argument_list[3].integer_reference;
- channel_mask=SetPixelChannelMask(image,channel);
+ channel_mask=SetImageChannelMask(image,channel);
(void) LevelImageColors(image,&black_point,&white_point,
argument_list[0].integer_reference != 0 ? MagickTrue : MagickFalse,
exception);
- (void) SetPixelChannelMask(image,channel_mask);
+ (void) SetImageChannelMask(image,channel_mask);
break;
}
case 130: /* Clamp */
{
if (attribute_flag[0] != 0)
channel=(ChannelType) argument_list[0].integer_reference;
- channel_mask=SetPixelChannelMask(image,channel);
+ channel_mask=SetImageChannelMask(image,channel);
(void) ClampImage(image,exception);
- (void) SetPixelChannelMask(image,channel_mask);
+ (void) SetImageChannelMask(image,channel_mask);
break;
}
case 131: /* BrightnessContrast */
@@ -10823,9 +10823,9 @@
contrast=argument_list[2].real_reference;
if (attribute_flag[4] != 0)
channel=(ChannelType) argument_list[4].integer_reference;
- channel_mask=SetPixelChannelMask(image,channel);
+ channel_mask=SetImageChannelMask(image,channel);
(void) BrightnessContrastImage(image,brightness,contrast,exception);
- (void) SetPixelChannelMask(image,channel_mask);
+ (void) SetImageChannelMask(image,channel_mask);
break;
}
case 132: /* Morphology */
@@ -10852,10 +10852,10 @@
iterations=1;
if (attribute_flag[3] != 0)
iterations=argument_list[3].integer_reference;
- channel_mask=SetPixelChannelMask(image,channel);
+ channel_mask=SetImageChannelMask(image,channel);
image=MorphologyImage(image,method,iterations,kernel,exception);
if (image != (Image *) NULL)
- (void) SetPixelChannelMask(image,channel_mask);
+ (void) SetImageChannelMask(image,channel_mask);
kernel=DestroyKernelInfo(kernel);
break;
}
@@ -10874,11 +10874,11 @@
geometry_info.sigma=argument_list[2].real_reference;
if (attribute_flag[3] != 0)
channel=(ChannelType) argument_list[3].integer_reference;
- channel_mask=SetPixelChannelMask(image,channel);
+ channel_mask=SetImageChannelMask(image,channel);
image=StatisticImage(image,ModeStatistic,(size_t) geometry_info.rho,
(size_t) geometry_info.sigma,exception);
if (image != (Image *) NULL)
- (void) SetPixelChannelMask(image,channel_mask);
+ (void) SetImageChannelMask(image,channel_mask);
break;
}
case 134: /* Statistic */
@@ -10902,11 +10902,11 @@
channel=(ChannelType) argument_list[3].integer_reference;
if (attribute_flag[4] != 0)
statistic=(StatisticType) argument_list[4].integer_reference;
- channel_mask=SetPixelChannelMask(image,channel);
+ channel_mask=SetImageChannelMask(image,channel);
image=StatisticImage(image,statistic,(size_t) geometry_info.rho,
(size_t) geometry_info.sigma,exception);
if (image != (Image *) NULL)
- (void) SetPixelChannelMask(image,channel_mask);
+ (void) SetImageChannelMask(image,channel_mask);
break;
}
}
@@ -13631,7 +13631,7 @@
}
}
(void) SetImageStorageClass(image,DirectClass,exception);
- channel_mask=SetPixelChannelMask(image,channel);
+ channel_mask=SetImageChannelMask(image,channel);
q=GetAuthenticPixels(image,region.x,region.y,1,1,exception);
if ((q == (Quantum *) NULL) || (av == (AV *) NULL) ||
(SvTYPE(av) != SVt_PVAV))
@@ -13685,7 +13685,7 @@
}
(void) SyncAuthenticPixels(image,exception);
}
- (void) SetPixelChannelMask(image,channel_mask);
+ (void) SetImageChannelMask(image,channel_mask);
PerlException:
InheritPerlException(exception,perl_exception);
diff --git a/coders/msl.c b/coders/msl.c
index a6fb3c3..82c7c9b 100644
--- a/coders/msl.c
+++ b/coders/msl.c
@@ -745,10 +745,10 @@
}
}
}
- channel_mask=SetPixelChannelMask(msl_info->image[n],channel);
+ channel_mask=SetImageChannelMask(msl_info->image[n],channel);
noise_image=AddNoiseImage(msl_info->image[n],noise,1.0,
msl_info->exception);
- (void) SetPixelChannelMapMask(msl_info->image[n],channel_mask);
+ (void) SetPixelChannelMask(msl_info->image[n],channel_mask);
if (noise_image == (Image *) NULL)
break;
msl_info->image[n]=DestroyImage(msl_info->image[n]);
@@ -1240,10 +1240,10 @@
}
}
}
- channel_mask=SetPixelChannelMask(msl_info->image[n],channel);
+ channel_mask=SetImageChannelMask(msl_info->image[n],channel);
blur_image=BlurImage(msl_info->image[n],geometry_info.rho,
geometry_info.sigma,msl_info->exception);
- (void) SetPixelChannelMapMask(msl_info->image[n],channel_mask);
+ (void) SetPixelChannelMask(msl_info->image[n],channel_mask);
if (blur_image == (Image *) NULL)
break;
msl_info->image[n]=DestroyImage(msl_info->image[n]);
@@ -2072,7 +2072,7 @@
geometry.y);
flags=ParseGravityGeometry(image,composite_geometry,&geometry,
&exception);
- channel_mask=SetPixelChannelMask(image,channel);
+ channel_mask=SetImageChannelMask(image,channel);
if (rotate_image == (Image *) NULL)
CompositeImage(image,composite_image,compose,MagickTrue,geometry.x,
geometry.y,&exception);
@@ -2089,7 +2089,7 @@
geometry.y,&exception);
rotate_image=DestroyImage(rotate_image);
}
- (void) SetPixelChannelMask(image,channel_mask);
+ (void) SetImageChannelMask(image,channel_mask);
composite_image=DestroyImage(composite_image);
break;
}
@@ -3784,11 +3784,11 @@
draw_info=CloneDrawInfo(msl_info->image_info[n],
msl_info->draw_info[n]);
draw_info->fill.alpha=ClampToQuantum(opacity);
- channel_mask=SetPixelChannelMask(msl_info->image[n],AlphaChannel);
+ channel_mask=SetImageChannelMask(msl_info->image[n],AlphaChannel);
(void) FloodfillPaintImage(msl_info->image[n],draw_info,&target,
geometry.x,geometry.y,paint_method == FloodfillMethod ?
MagickFalse : MagickTrue,msl_info->exception);
- (void) SetPixelChannelMapMask(msl_info->image[n],channel_mask);
+ (void) SetPixelChannelMask(msl_info->image[n],channel_mask);
draw_info=DestroyDrawInfo(draw_info);
break;
}
@@ -4089,10 +4089,10 @@
}
}
}
- channel_mask=SetPixelChannelMask(msl_info->image[n],channel);
+ channel_mask=SetImageChannelMask(msl_info->image[n],channel);
(void) NegateImage(msl_info->image[n],gray,
msl_info->exception);
- (void) SetPixelChannelMapMask(msl_info->image[n],channel_mask);
+ (void) SetPixelChannelMask(msl_info->image[n],channel_mask);
break;
}
if (LocaleCompare((const char *) tag,"normalize") == 0)
@@ -4288,10 +4288,10 @@
}
}
}
- channel_mask=SetPixelChannelMask(msl_info->image[n],channel);
+ channel_mask=SetImageChannelMask(msl_info->image[n],channel);
(void) OpaquePaintImage(msl_info->image[n],&target,&fill_color,
MagickFalse,msl_info->exception);
- (void) SetPixelChannelMapMask(msl_info->image[n],channel_mask);
+ (void) SetPixelChannelMask(msl_info->image[n],channel_mask);
break;
}
ThrowMSLException(OptionError,"UnrecognizedElement",(const char *) tag);