diff --git a/Magick++/lib/Image.cpp b/Magick++/lib/Image.cpp
index 0a8ae32..05a61bf 100644
--- a/Magick++/lib/Image.cpp
+++ b/Magick++/lib/Image.cpp
@@ -345,12 +345,12 @@
{
ExceptionInfo exceptionInfo;
GetExceptionInfo( &exceptionInfo );
- PushPixelComponentMap( image(), channel_);
+ PushPixelChannelMap( image(), channel_);
MagickCore::Image* newImage =
AddNoiseImage ( image(),
noiseType_,
&exceptionInfo );
- PopPixelComponentMap( image() );
+ PopPixelChannelMap( image() );
replaceImage( newImage );
throwException( exceptionInfo );
(void) DestroyExceptionInfo( &exceptionInfo );
@@ -495,10 +495,10 @@
{
ExceptionInfo exceptionInfo;
GetExceptionInfo( &exceptionInfo );
- PushPixelComponentMap( image(), channel_ );
+ PushPixelChannelMap( image(), channel_ );
MagickCore::Image* newImage =
BlurImage( image(), radius_, sigma_, &exceptionInfo);
- PopPixelComponentMap( image() );
+ PopPixelChannelMap( image() );
replaceImage( newImage );
throwException( exceptionInfo );
(void) DestroyExceptionInfo( &exceptionInfo );
@@ -522,9 +522,9 @@
void Magick::Image::channel ( const ChannelType channel_ )
{
modifyImage();
- PushPixelComponentMap( image(), channel_ );
+ PushPixelChannelMap( image(), channel_ );
SeparateImage ( image() );
- PopPixelComponentMap( image() );
+ PopPixelChannelMap( image() );
throwImageException();
}
@@ -1125,10 +1125,10 @@
{
ExceptionInfo exceptionInfo;
GetExceptionInfo( &exceptionInfo );
- PushPixelComponentMap( image(), channel );
+ PushPixelChannelMap( image(), channel );
MagickCore::Image* newImage =
FxImage ( image(), expression.c_str(), &exceptionInfo );
- PopPixelComponentMap( image() );
+ PopPixelChannelMap( image() );
replaceImage( newImage );
throwException( exceptionInfo );
(void) DestroyExceptionInfo( &exceptionInfo );
@@ -1175,10 +1175,10 @@
{
ExceptionInfo exceptionInfo;
GetExceptionInfo( &exceptionInfo );
- PushPixelComponentMap( image(), channel_ );
+ PushPixelChannelMap( image(), channel_ );
MagickCore::Image* newImage =
GaussianBlurImage( image(), width_, sigma_, &exceptionInfo );
- PopPixelComponentMap( image() );
+ PopPixelChannelMap( image() );
replaceImage( newImage );
throwException( exceptionInfo );
(void) DestroyExceptionInfo( &exceptionInfo );
@@ -1282,10 +1282,10 @@
target.green=static_cast<PixelPacket>(target_).green;
target.blue=static_cast<PixelPacket>(target_).blue;
target.alpha=alpha_;
- PushPixelComponentMap( image(), AlphaChannel );
+ PushPixelChannelMap( image(), AlphaChannel );
FloodfillPaintImage ( image(), options()->drawInfo(), &target, x_, y_,
method_ == FloodfillMethod ? MagickFalse : MagickTrue);
- PopPixelComponentMap( image() );
+ PopPixelChannelMap( image() );
throwImageException();
}
@@ -1486,9 +1486,9 @@
{
ExceptionInfo exceptionInfo;
GetExceptionInfo( &exceptionInfo );
- PushPixelComponentMap( image(), channel_ );
+ PushPixelChannelMap( image(), channel_ );
EvaluateImage( image(), operator_, rvalue_, &exceptionInfo);
- PopPixelComponentMap( image() );
+ PopPixelChannelMap( image() );
throwException( exceptionInfo );
(void) DestroyExceptionInfo( &exceptionInfo );
}
@@ -1509,9 +1509,9 @@
geometry.y = y_;
MagickCore::Image *crop_image = CropImage( image(), &geometry,
&exceptionInfo );
- PushPixelComponentMap( image(), channel_);
+ PushPixelChannelMap( image(), channel_);
EvaluateImage( crop_image, operator_, rvalue_, &exceptionInfo );
- PopPixelComponentMap( image() );
+ PopPixelChannelMap( image() );
(void) CompositeImage( image(), image()->matte != MagickFalse ?
OverCompositeOp : CopyCompositeOp, crop_image, geometry.x, geometry.y );
crop_image = DestroyImageList(crop_image);
@@ -1551,11 +1551,11 @@
ExceptionInfo exceptionInfo;
GetExceptionInfo( &exceptionInfo );
modifyImage();
- PushPixelComponentMap( image(), channel_);
+ PushPixelChannelMap( image(), channel_);
(void) RandomThresholdImage( image(),
static_cast<std::string>(thresholds_).c_str(),
&exceptionInfo );
- PopPixelComponentMap( image() );
+ PopPixelChannelMap( image() );
throwImageException();
(void) DestroyExceptionInfo( &exceptionInfo );
}
@@ -1868,13 +1868,13 @@
{
ExceptionInfo exceptionInfo;
GetExceptionInfo( &exceptionInfo );
- PushPixelComponentMap( image(), channel_ );
+ PushPixelChannelMap( image(), channel_ );
MagickCore::Image* newImage =
SharpenImage( image(),
radius_,
sigma_,
&exceptionInfo );
- PopPixelComponentMap( image() );
+ PopPixelChannelMap( image() );
replaceImage( newImage );
throwException( exceptionInfo );
(void) DestroyExceptionInfo( &exceptionInfo );
@@ -1939,10 +1939,10 @@
ExceptionInfo exceptionInfo;
GetExceptionInfo( &exceptionInfo );
- PushPixelComponentMap( image(), channel );
+ PushPixelChannelMap( image(), channel );
MagickCore::Image* newImage = SparseColorImage ( image(), method,
number_arguments, arguments, &exceptionInfo );
- PopPixelComponentMap( image() );
+ PopPixelChannelMap( image() );
replaceImage( newImage );
throwException( exceptionInfo );
(void) DestroyExceptionInfo( &exceptionInfo );
@@ -2132,7 +2132,7 @@
{
ExceptionInfo exceptionInfo;
GetExceptionInfo( &exceptionInfo );
- PushPixelComponentMap( image(), channel_ );
+ PushPixelChannelMap( image(), channel_ );
MagickCore::Image* newImage =
UnsharpMaskImage( image(),
radius_,
@@ -2140,7 +2140,7 @@
amount_,
threshold_,
&exceptionInfo );
- PopPixelComponentMap( image() );
+ PopPixelChannelMap( image() );
replaceImage( newImage );
throwException( exceptionInfo );
(void) DestroyExceptionInfo( &exceptionInfo );
@@ -3572,7 +3572,7 @@
ExceptionInfo exceptionInfo;
GetExceptionInfo( &exceptionInfo );
- PushPixelComponentMap( image(), RedChannel);
+ PushPixelChannelMap( image(), RedChannel);
(void) GetImageRange( image(),&minimum,&maximum,&exceptionInfo);
statistics->red.minimum=minimum;
statistics->red.maximum=maximum;
@@ -3580,9 +3580,9 @@
&statistics->red.standard_deviation,&exceptionInfo);
(void) GetImageKurtosis( image(),&statistics->red.kurtosis,
&statistics->red.skewness,&exceptionInfo);
- PopPixelComponentMap( image() );
+ PopPixelChannelMap( image() );
- PushPixelComponentMap( image(), GreenChannel);
+ PushPixelChannelMap( image(), GreenChannel);
(void) GetImageRange( image(),&minimum,&maximum,&exceptionInfo);
statistics->green.minimum=minimum;
statistics->green.maximum=maximum;
@@ -3590,9 +3590,9 @@
&statistics->green.standard_deviation,&exceptionInfo);
(void) GetImageKurtosis( image(),&statistics->green.kurtosis,
&statistics->green.skewness,&exceptionInfo);
- PopPixelComponentMap( image() );
+ PopPixelChannelMap( image() );
- PushPixelComponentMap( image(), GreenChannel);
+ PushPixelChannelMap( image(), GreenChannel);
(void) GetImageRange( image(),&minimum,&maximum,&exceptionInfo);
statistics->blue.minimum=minimum;
statistics->blue.maximum=maximum;
@@ -3600,9 +3600,9 @@
&statistics->blue.standard_deviation,&exceptionInfo);
(void) GetImageKurtosis( image(),&statistics->blue.kurtosis,
&statistics->blue.skewness,&exceptionInfo);
- PopPixelComponentMap( image() );
+ PopPixelChannelMap( image() );
- PushPixelComponentMap( image(), AlphaChannel);
+ PushPixelChannelMap( image(), AlphaChannel);
(void) GetImageRange( image(),&minimum,&maximum,&exceptionInfo);
statistics->alpha.minimum=minimum;
statistics->alpha.maximum=maximum;
@@ -3610,7 +3610,7 @@
&statistics->alpha.standard_deviation,&exceptionInfo);
(void) GetImageKurtosis( image(),&statistics->alpha.kurtosis,
&statistics->alpha.skewness,&exceptionInfo);
- PopPixelComponentMap( image() );
+ PopPixelChannelMap( image() );
throwException( exceptionInfo );
(void) DestroyExceptionInfo( &exceptionInfo );
diff --git a/Magick++/lib/Magick++/Include.h b/Magick++/lib/Magick++/Include.h
index e6cf742..f5dc84c 100644
--- a/Magick++/lib/Magick++/Include.h
+++ b/Magick++/lib/Magick++/Include.h
@@ -810,11 +810,11 @@
using MagickCore::PixelWand;
using MagickCore::PointInfo;
using MagickCore::PopDrawingWand;
- using MagickCore::PopPixelComponentMap;
+ using MagickCore::PopPixelChannelMap;
using MagickCore::ProfileImage;
using MagickCore::ProfileInfo;
using MagickCore::PushDrawingWand;
- using MagickCore::PushPixelComponentMap;
+ using MagickCore::PushPixelChannelMap;
using MagickCore::QuantizeImage;
using MagickCore::QuantizeInfo;
using MagickCore::QuantumInfo;
diff --git a/MagickCore/annotate.c b/MagickCore/annotate.c
index a7a5b58..ccdf213 100644
--- a/MagickCore/annotate.c
+++ b/MagickCore/annotate.c
@@ -1393,7 +1393,7 @@
(x_offset >= (ssize_t) image->columns))
{
p++;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
continue;
}
fill_opacity=(MagickRealType) (*p)/(bitmap->bitmap.num_grays-1);
@@ -1405,7 +1405,7 @@
if (q == (const Quantum *) NULL)
{
p++;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
continue;
}
(void) GetFillColor(draw_info,x_offset,y_offset,&fill_color);
@@ -1419,7 +1419,7 @@
status=MagickFalse;
}
p++;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
if (sync == MagickFalse)
@@ -1798,7 +1798,7 @@
SetPixelRed(annotate_image,fill_color.red,q);
SetPixelGreen(annotate_image,fill_color.green,q);
SetPixelBlue(annotate_image,fill_color.blue,q);
- q+=GetPixelComponents(annotate_image);
+ q+=GetPixelChannels(annotate_image);
}
sync=SyncCacheViewAuthenticPixels(annotate_view,exception);
if (sync == MagickFalse)
diff --git a/MagickCore/attribute.c b/MagickCore/attribute.c
index 482c284..c53016e 100644
--- a/MagickCore/attribute.c
+++ b/MagickCore/attribute.c
@@ -211,7 +211,7 @@
if ((y > (ssize_t) bounding_box.height) &&
(IsFuzzyEquivalencePixelInfo(&pixel,&target[2]) == MagickFalse))
bounding_box.height=(size_t) y;
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
#if defined(MAGICKCORE_OPENMP_SUPPORT)
# pragma omp critical (MagickCore_GetImageBoundingBox)
@@ -327,13 +327,13 @@
status=0;
range=GetQuantumRange(current_depth[id]);
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
status|=p->red != ScaleAnyToQuantum(ScaleQuantumToAny(p->red,
range),range);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
status|=p->green != ScaleAnyToQuantum(ScaleQuantumToAny(p->green,
range),range);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
status|=p->blue != ScaleAnyToQuantum(ScaleQuantumToAny(p->blue,
range),range);
if (status == 0)
@@ -381,20 +381,20 @@
status=0;
range=GetQuantumRange(current_depth[id]);
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
status|=GetPixelRed(image,p) != ScaleAnyToQuantum(ScaleQuantumToAny(
GetPixelRed(image,p),range),range);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
status|=GetPixelGreen(image,p) != ScaleAnyToQuantum(ScaleQuantumToAny(
GetPixelGreen(image,p),range),range);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
status|=GetPixelBlue(image,p) != ScaleAnyToQuantum(ScaleQuantumToAny(
GetPixelBlue(image,p),range),range);
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) &&
(image->matte != MagickFalse))
status|=GetPixelAlpha(image,p) != ScaleAnyToQuantum(ScaleQuantumToAny(
GetPixelAlpha(image,p),range),range);
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
status|=GetPixelBlack(image,p) != ScaleAnyToQuantum(ScaleQuantumToAny(
GetPixelBlack(image,p),range),range);
@@ -402,7 +402,7 @@
break;
current_depth[id]++;
}
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
if (current_depth[id] == MAGICKCORE_QUANTUM_DEPTH)
status=MagickFalse;
@@ -608,7 +608,7 @@
if ((type == BilevelType) &&
(IsPixelMonochrome(image,p) == MagickFalse))
type=GrayscaleType;
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
if (type == UndefinedType)
break;
@@ -689,7 +689,7 @@
type=UndefinedType;
break;
}
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
if (type == UndefinedType)
break;
@@ -761,7 +761,7 @@
{
if (GetPixelAlpha(image,p) != OpaqueAlpha)
break;
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
if (x < (ssize_t) image->columns)
break;
@@ -855,24 +855,24 @@
}
for (x=0; x < (ssize_t) image->columns; x++)
{
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
SetPixelRed(image,ScaleAnyToQuantum(ScaleQuantumToAny(
GetPixelRed(image,q),range),range),q);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
SetPixelGreen(image,ScaleAnyToQuantum(ScaleQuantumToAny(
GetPixelGreen(image,q),range),range),q);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
SetPixelBlue(image,ScaleAnyToQuantum(ScaleQuantumToAny(
GetPixelBlue(image,q),range),range),q);
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
SetPixelBlack(image,ScaleAnyToQuantum(ScaleQuantumToAny(
GetPixelBlack(image,q),range),range),q);
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) &&
(image->matte != MagickFalse))
SetPixelAlpha(image,ScaleAnyToQuantum(ScaleQuantumToAny(
GetPixelAlpha(image,q),range),range),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
{
@@ -895,13 +895,13 @@
#endif
for (i=0; i < (ssize_t) image->colors; i++)
{
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
p->red=ScaleAnyToQuantum(ScaleQuantumToAny(p->red,range),range);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
p->green=ScaleAnyToQuantum(ScaleQuantumToAny(p->green,range),range);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
p->blue=ScaleAnyToQuantum(ScaleQuantumToAny(p->blue,range),range);
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
p->alpha=ScaleAnyToQuantum(ScaleQuantumToAny(p->alpha,range),range);
p++;
}
diff --git a/MagickCore/cache-private.h b/MagickCore/cache-private.h
index b61e9c2..5a2ff62 100644
--- a/MagickCore/cache-private.h
+++ b/MagickCore/cache-private.h
@@ -120,7 +120,7 @@
size_t
metacontent_extent,
- pixel_components;
+ number_channels;
CacheType
type;
diff --git a/MagickCore/cache.c b/MagickCore/cache.c
index 8e8c2d5..8315ad1 100644
--- a/MagickCore/cache.c
+++ b/MagickCore/cache.c
@@ -460,9 +460,9 @@
SetPixelBlack(image,GetPixelBlack(image,p),q);
SetPixelAlpha(image,GetPixelAlpha(image,p),q);
}
- p+=GetPixelComponents(image);
- q+=GetPixelComponents(image);
- r+=GetPixelComponents(image->clip_mask);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(image);
+ r+=GetPixelChannels(image->clip_mask);
}
clip_nexus=DestroyPixelCacheNexus(clip_nexus,1);
image_nexus=DestroyPixelCacheNexus(image_nexus,1);
@@ -945,8 +945,8 @@
else
(void) LogMagickEvent(CacheEvent,GetMagickModule(),"disk => disk");
}
- length=(size_t) MagickMax(MagickMax(cache_info->pixel_components,
- clone_info->pixel_components)*sizeof(Quantum),MagickMax(
+ length=(size_t) MagickMax(MagickMax(cache_info->number_channels,
+ clone_info->number_channels)*sizeof(Quantum),MagickMax(
cache_info->metacontent_extent,clone_info->metacontent_extent));
blob=(unsigned char *) AcquireQuantumMemory(length,sizeof(*blob));
if (blob == (unsigned char *) NULL)
@@ -1000,7 +1000,7 @@
/*
Read a set of pixel channels.
*/
- length=cache_info->pixel_components*sizeof(Quantum);
+ length=cache_info->number_channels*sizeof(Quantum);
if (cache_info->type != DiskCache)
(void) memcpy(blob,(unsigned char *) cache_info->pixels+cache_offset,
length);
@@ -1020,7 +1020,7 @@
/*
Write a set of pixel channels.
*/
- length=clone_info->pixel_components*sizeof(Quantum);
+ length=clone_info->number_channels*sizeof(Quantum);
if (clone_info->type != DiskCache)
(void) memcpy((unsigned char *) clone_info->pixels+clone_offset,
blob,length);
@@ -1037,7 +1037,7 @@
clone_offset+=length;
}
}
- length=clone_info->pixel_components*sizeof(Quantum);
+ length=clone_info->number_channels*sizeof(Quantum);
(void) ResetMagickMemory(blob,0,length*sizeof(*blob));
for ( ; x < (ssize_t) clone_info->columns; x++)
{
@@ -1059,7 +1059,7 @@
clone_offset+=length;
}
}
- length=clone_info->pixel_components*sizeof(Quantum);
+ length=clone_info->number_channels*sizeof(Quantum);
(void) ResetMagickMemory(blob,0,length*sizeof(*blob));
for ( ; y < (ssize_t) clone_info->rows; y++)
{
@@ -1196,7 +1196,7 @@
return(MagickTrue);
if ((cache_info->columns == clone_info->columns) &&
(cache_info->rows == clone_info->rows) &&
- (cache_info->pixel_components == clone_info->pixel_components) &&
+ (cache_info->number_channels == clone_info->number_channels) &&
(cache_info->metacontent_extent == clone_info->metacontent_extent))
return(OptimizedPixelCacheClone(clone_info,cache_info,exception));
return(UnoptimizedPixelCacheClone(clone_info,cache_info,exception));
@@ -1638,7 +1638,7 @@
offset=(MagickOffsetType) nexus_info->region.y*cache_info->columns+
nexus_info->region.x;
status=nexus_info->pixels == (cache_info->pixels+offset*
- cache_info->pixel_components) ? MagickTrue : MagickFalse;
+ cache_info->number_channels) ? MagickTrue : MagickFalse;
return(status);
}
@@ -1972,7 +1972,7 @@
(image->colorspace != cache_info->colorspace) ||
(image->columns != cache_info->columns) ||
(image->rows != cache_info->rows) ||
- (image->pixel_components != cache_info->pixel_components) ||
+ (image->number_channels != cache_info->number_channels) ||
(image->metacontent_extent != cache_info->metacontent_extent) ||
(cache_info->nexus_info == (NexusInfo **) NULL) ||
(cache_info->number_threads < GetOpenMPMaximumThreads()))
@@ -2785,9 +2785,9 @@
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
cache_info=(CacheInfo *) image->cache;
assert(cache_info->signature == MagickSignature);
- *width=2048UL/(cache_info->pixel_components*sizeof(Quantum));
+ *width=2048UL/(cache_info->number_channels*sizeof(Quantum));
if (GetPixelCacheType(image) == DiskCache)
- *width=8192UL/(cache_info->pixel_components*sizeof(Quantum));
+ *width=8192UL/(cache_info->number_channels*sizeof(Quantum));
*height=(*width);
}
@@ -3247,7 +3247,7 @@
Acquire virtual pixel and associated channels.
*/
virtual_pixel=(Quantum *) AcquireQuantumMemory(
- cache_info->pixel_components,sizeof(*virtual_pixel));
+ cache_info->number_channels,sizeof(*virtual_pixel));
if (virtual_pixel == (Quantum *) NULL)
{
virtual_nexus=DestroyPixelCacheNexus(virtual_nexus,1);
@@ -3255,7 +3255,7 @@
"UnableToGetCacheNexus","`%s'",image->filename);
return((const Quantum *) NULL);
}
- (void) ResetMagickMemory(virtual_pixel,0,cache_info->pixel_components*
+ (void) ResetMagickMemory(virtual_pixel,0,cache_info->number_channels*
sizeof(*virtual_pixel));
if (cache_info->metacontent_extent != 0)
{
@@ -3475,9 +3475,9 @@
}
if (p == (const Quantum *) NULL)
break;
- (void) memcpy(q,p,(size_t) length*cache_info->pixel_components*
+ (void) memcpy(q,p,(size_t) length*cache_info->number_channels*
sizeof(*p));
- q+=cache_info->pixel_components;
+ q+=cache_info->number_channels;
if ((s != (void *) NULL) &&
(r != (const void *) NULL))
{
@@ -3494,8 +3494,8 @@
if (p == (const Quantum *) NULL)
break;
r=GetVirtualMetacontentFromNexus(cache_info,*virtual_nexus);
- (void) memcpy(q,p,(size_t) length*cache_info->pixel_components*sizeof(*p));
- q+=length*cache_info->pixel_components;
+ (void) memcpy(q,p,(size_t) length*cache_info->number_channels*sizeof(*p));
+ q+=length*cache_info->number_channels;
if ((s != (void *) NULL) && (r != (const void *) NULL))
{
(void) memcpy(s,r,(size_t) length);
@@ -4009,7 +4009,7 @@
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
if ((image->columns == 0) || (image->rows == 0))
ThrowBinaryException(CacheError,"NoPixelsDefinedInCache",image->filename);
- StandardPixelComponentMap(image);
+ StandardPixelChannelMap(image);
cache_info=(CacheInfo *) image->cache;
assert(cache_info->signature == MagickSignature);
source_info=(*cache_info);
@@ -4021,7 +4021,7 @@
cache_info->mode=mode;
cache_info->rows=image->rows;
cache_info->columns=image->columns;
- cache_info->pixel_components=GetPixelComponents(image);
+ cache_info->number_channels=GetPixelChannels(image);
cache_info->metacontent_extent=image->metacontent_extent;
if (image->ping != MagickFalse)
{
@@ -4032,7 +4032,7 @@
return(MagickTrue);
}
number_pixels=(MagickSizeType) cache_info->columns*cache_info->rows;
- packet_size=cache_info->pixel_components*sizeof(Quantum);
+ packet_size=cache_info->number_channels*sizeof(Quantum);
if (image->metacontent_extent != 0)
packet_size+=cache_info->metacontent_extent;
length=number_pixels*packet_size;
@@ -4044,7 +4044,7 @@
if ((cache_info->type != UndefinedCache) &&
(cache_info->columns <= source_info.columns) &&
(cache_info->rows <= source_info.rows) &&
- (cache_info->pixel_components <= source_info.pixel_components) &&
+ (cache_info->number_channels <= source_info.number_channels) &&
(cache_info->metacontent_extent <= source_info.metacontent_extent))
{
/*
@@ -4052,13 +4052,13 @@
*/
if ((cache_info->columns == source_info.columns) &&
(cache_info->rows == source_info.rows) &&
- (cache_info->pixel_components == source_info.pixel_components) &&
+ (cache_info->number_channels == source_info.number_channels) &&
(cache_info->metacontent_extent == source_info.metacontent_extent))
return(MagickTrue);
return(ClonePixelCachePixels(cache_info,&source_info,exception));
}
status=AcquireMagickResource(AreaResource,cache_info->length);
- length=number_pixels*(cache_info->pixel_components*sizeof(Quantum)+
+ length=number_pixels*(cache_info->number_channels*sizeof(Quantum)+
cache_info->metacontent_extent);
if ((status != MagickFalse) && (length == (MagickSizeType) ((size_t) length)))
{
@@ -4083,7 +4083,7 @@
"open %s (%s memory, %.20gx%.20gx%.20g %s)",
cache_info->filename,cache_info->mapped != MagickFalse ?
"anonymous" : "heap",(double) cache_info->columns,(double)
- cache_info->rows,(double) cache_info->pixel_components,
+ cache_info->rows,(double) cache_info->number_channels,
format);
(void) LogMagickEvent(CacheEvent,GetMagickModule(),"%s",
message);
@@ -4092,7 +4092,7 @@
cache_info->metacontent=(void *) NULL;
if (cache_info->metacontent_extent != 0)
cache_info->metacontent=(void *) (cache_info->pixels+
- number_pixels*cache_info->pixel_components);
+ number_pixels*cache_info->number_channels);
if (source_info.storage_class != UndefinedClass)
{
status=ClonePixelCachePixels(cache_info,&source_info,
@@ -4129,7 +4129,7 @@
image->filename);
return(MagickFalse);
}
- length=number_pixels*(cache_info->pixel_components*sizeof(Quantum)+
+ length=number_pixels*(cache_info->number_channels*sizeof(Quantum)+
cache_info->metacontent_extent);
status=AcquireMagickResource(AreaResource,cache_info->length);
if ((status == MagickFalse) || (length != (MagickSizeType) ((size_t) length)))
@@ -4161,7 +4161,7 @@
cache_info->metacontent=(void *) NULL;
if (cache_info->metacontent_extent != 0)
cache_info->metacontent=(void *) (cache_info->pixels+
- number_pixels*cache_info->pixel_components);
+ number_pixels*cache_info->number_channels);
if (source_info.storage_class != UndefinedClass)
{
status=ClonePixelCachePixels(cache_info,&source_info,
@@ -4176,7 +4176,7 @@
"open %s (%s[%d], memory-mapped, %.20gx%.20gx%.20g %s)",
cache_info->filename,cache_info->cache_filename,
cache_info->file,(double) cache_info->columns,(double)
- cache_info->rows,(double) cache_info->pixel_components,
+ cache_info->rows,(double) cache_info->number_channels,
format);
(void) LogMagickEvent(CacheEvent,GetMagickModule(),"%s",
message);
@@ -4199,7 +4199,7 @@
"open %s (%s[%d], disk, %.20gx%.20gx%.20g %s)",cache_info->filename,
cache_info->cache_filename,cache_info->file,(double)
cache_info->columns,(double) cache_info->rows,(double)
- cache_info->pixel_components,format);
+ cache_info->number_channels,format);
(void) LogMagickEvent(CacheEvent,GetMagickModule(),"%s",message);
}
return(status);
@@ -4678,7 +4678,7 @@
for (y=0; y < (ssize_t) rows; y++)
{
count=ReadPixelCacheRegion(cache_info,cache_info->offset+extent*
- cache_info->pixel_components*sizeof(Quantum)+offset*
+ cache_info->number_channels*sizeof(Quantum)+offset*
cache_info->metacontent_extent,length,(unsigned char *) q);
if ((MagickSizeType) count != length)
break;
@@ -4757,7 +4757,7 @@
return(MagickTrue);
offset=(MagickOffsetType) nexus_info->region.y*cache_info->columns+
nexus_info->region.x;
- length=(MagickSizeType) nexus_info->region.width*cache_info->pixel_components*
+ length=(MagickSizeType) nexus_info->region.width*cache_info->number_channels*
sizeof(Quantum);
rows=nexus_info->region.height;
extent=length*rows;
@@ -4779,12 +4779,12 @@
length=extent;
rows=1UL;
}
- p=cache_info->pixels+offset*cache_info->pixel_components;
+ p=cache_info->pixels+offset*cache_info->number_channels;
for (y=0; y < (ssize_t) rows; y++)
{
(void) memcpy(q,p,(size_t) length);
- p+=cache_info->pixel_components*cache_info->columns;
- q+=cache_info->pixel_components*nexus_info->region.width;
+ p+=cache_info->number_channels*cache_info->columns;
+ q+=cache_info->number_channels*nexus_info->region.width;
}
break;
}
@@ -4808,11 +4808,11 @@
for (y=0; y < (ssize_t) rows; y++)
{
count=ReadPixelCacheRegion(cache_info,cache_info->offset+offset*
- cache_info->pixel_components*sizeof(*q),length,(unsigned char *) q);
+ cache_info->number_channels*sizeof(*q),length,(unsigned char *) q);
if ((MagickSizeType) count != length)
break;
offset+=cache_info->columns;
- q+=cache_info->pixel_components*nexus_info->region.width;
+ q+=cache_info->number_channels*nexus_info->region.width;
}
if (y < (ssize_t) rows)
{
@@ -5058,7 +5058,7 @@
*/
offset=(MagickOffsetType) nexus_info->region.y*cache_info->columns+
nexus_info->region.x;
- nexus_info->pixels=cache_info->pixels+cache_info->pixel_components*
+ nexus_info->pixels=cache_info->pixels+cache_info->number_channels*
offset;
nexus_info->metacontent=(void *) NULL;
if (cache_info->metacontent_extent != 0)
@@ -5072,7 +5072,7 @@
*/
number_pixels=(MagickSizeType) nexus_info->region.width*
nexus_info->region.height;
- length=number_pixels*cache_info->pixel_components*sizeof(Quantum);
+ length=number_pixels*cache_info->number_channels*sizeof(Quantum);
if (cache_info->metacontent_extent != 0)
length+=number_pixels*cache_info->metacontent_extent;
if (nexus_info->cache == (Quantum *) NULL)
@@ -5101,7 +5101,7 @@
nexus_info->metacontent=(void *) NULL;
if (cache_info->metacontent_extent != 0)
nexus_info->metacontent=(void *) (nexus_info->pixels+number_pixels*
- cache_info->pixel_components);
+ cache_info->number_channels);
return(nexus_info->pixels);
}
@@ -5432,7 +5432,7 @@
for (y=0; y < (ssize_t) rows; y++)
{
count=WritePixelCacheRegion(cache_info,cache_info->offset+extent*
- cache_info->pixel_components*sizeof(Quantum)+offset*
+ cache_info->number_channels*sizeof(Quantum)+offset*
cache_info->metacontent_extent,length,(const unsigned char *) p);
if ((MagickSizeType) count != length)
break;
@@ -5511,7 +5511,7 @@
return(MagickTrue);
offset=(MagickOffsetType) nexus_info->region.y*cache_info->columns+
nexus_info->region.x;
- length=(MagickSizeType) nexus_info->region.width*cache_info->pixel_components*
+ length=(MagickSizeType) nexus_info->region.width*cache_info->number_channels*
sizeof(Quantum);
rows=nexus_info->region.height;
extent=length*rows;
@@ -5533,12 +5533,12 @@
length=extent;
rows=1UL;
}
- q=cache_info->pixels+offset*cache_info->pixel_components;
+ q=cache_info->pixels+offset*cache_info->number_channels;
for (y=0; y < (ssize_t) rows; y++)
{
(void) memcpy(q,p,(size_t) length);
- p+=nexus_info->region.width*cache_info->pixel_components;
- q+=cache_info->columns*cache_info->pixel_components;
+ p+=nexus_info->region.width*cache_info->number_channels;
+ q+=cache_info->columns*cache_info->number_channels;
}
break;
}
@@ -5562,11 +5562,11 @@
for (y=0; y < (ssize_t) rows; y++)
{
count=WritePixelCacheRegion(cache_info,cache_info->offset+offset*
- cache_info->pixel_components*sizeof(*p),length,(const unsigned char *)
+ cache_info->number_channels*sizeof(*p),length,(const unsigned char *)
p);
if ((MagickSizeType) count != length)
break;
- p+=nexus_info->region.width*cache_info->pixel_components;
+ p+=nexus_info->region.width*cache_info->number_channels;
offset+=cache_info->columns;
}
if (y < (ssize_t) rows)
diff --git a/MagickCore/color.c b/MagickCore/color.c
index 7ac6ce9..0937beb 100644
--- a/MagickCore/color.c
+++ b/MagickCore/color.c
@@ -1004,7 +1004,7 @@
% The format of the ConcatenateColorComponent() method is:
%
% void ConcatenateColorComponent(const PixelInfo *pixel,
-% const PixelComponent component,const ComplianceType compliance,
+% const PixelChannel component,const ComplianceType compliance,
% char *tuple)
%
% A description of each parameter follows.
@@ -1019,7 +1019,7 @@
%
*/
MagickExport void ConcatenateColorComponent(const PixelInfo *pixel,
- const PixelComponent component,const ComplianceType compliance,char *tuple)
+ const PixelChannel component,const ComplianceType compliance,char *tuple)
{
char
text[MaxTextExtent];
@@ -1030,27 +1030,27 @@
color=0.0;
switch (component)
{
- case RedPixelComponent:
+ case RedPixelChannel:
{
color=pixel->red;
break;
}
- case GreenPixelComponent:
+ case GreenPixelChannel:
{
color=pixel->green;
break;
}
- case BluePixelComponent:
+ case BluePixelChannel:
{
color=pixel->blue;
break;
}
- case AlphaPixelComponent:
+ case AlphaPixelChannel:
{
color=pixel->alpha;
break;
}
- case BlackPixelComponent:
+ case BlackPixelChannel:
{
color=pixel->black;
break;
@@ -1079,7 +1079,7 @@
(void) ConcatenateMagickString(tuple,text,MaxTextExtent);
return;
}
- if (component == AlphaPixelComponent)
+ if (component == AlphaPixelChannel)
{
(void) FormatLocaleString(text,MaxTextExtent,"%g",(double)
(QuantumScale*color));
@@ -1446,20 +1446,20 @@
if (color.matte != MagickFalse)
(void) ConcatenateMagickString(tuple,"a",MaxTextExtent);
(void) ConcatenateMagickString(tuple,"(",MaxTextExtent);
- ConcatenateColorComponent(&color,RedPixelComponent,SVGCompliance,tuple);
+ ConcatenateColorComponent(&color,RedPixelChannel,SVGCompliance,tuple);
(void) ConcatenateMagickString(tuple,",",MaxTextExtent);
- ConcatenateColorComponent(&color,GreenPixelComponent,SVGCompliance,tuple);
+ ConcatenateColorComponent(&color,GreenPixelChannel,SVGCompliance,tuple);
(void) ConcatenateMagickString(tuple,",",MaxTextExtent);
- ConcatenateColorComponent(&color,BluePixelComponent,SVGCompliance,tuple);
+ ConcatenateColorComponent(&color,BluePixelChannel,SVGCompliance,tuple);
if (color.colorspace == CMYKColorspace)
{
(void) ConcatenateMagickString(tuple,",",MaxTextExtent);
- ConcatenateColorComponent(&color,BlackPixelComponent,SVGCompliance,tuple);
+ ConcatenateColorComponent(&color,BlackPixelChannel,SVGCompliance,tuple);
}
if (color.matte != MagickFalse)
{
(void) ConcatenateMagickString(tuple,",",MaxTextExtent);
- ConcatenateColorComponent(&color,AlphaPixelComponent,SVGCompliance,tuple);
+ ConcatenateColorComponent(&color,AlphaPixelChannel,SVGCompliance,tuple);
}
(void) ConcatenateMagickString(tuple,")",MaxTextExtent);
LocaleLower(tuple);
diff --git a/MagickCore/color.h b/MagickCore/color.h
index e65dae0..d56fa14 100644
--- a/MagickCore/color.h
+++ b/MagickCore/color.h
@@ -89,7 +89,7 @@
extern MagickExport void
ColorComponentTerminus(void),
- ConcatenateColorComponent(const PixelInfo *,const PixelComponent,
+ ConcatenateColorComponent(const PixelInfo *,const PixelChannel,
const ComplianceType,char *),
GetColorTuple(const PixelInfo *,const MagickBooleanType,char *);
diff --git a/MagickCore/colormap.c b/MagickCore/colormap.c
index b89f1ed..42be2fc 100644
--- a/MagickCore/colormap.c
+++ b/MagickCore/colormap.c
@@ -233,7 +233,7 @@
index+=(ssize_t) image->colors;
SetPixelIndex(image,(Quantum) index,q);
SetPixelPacket(image,image->colormap+(ssize_t) index,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -370,7 +370,7 @@
index=(Quantum) pixels[(ssize_t) GetPixelIndex(image,q)];
SetPixelIndex(image,index,q);
SetPixelPacket(image,image->colormap+(ssize_t) index,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
diff --git a/MagickCore/colorspace.c b/MagickCore/colorspace.c
index e70513a..ce0d66c 100644
--- a/MagickCore/colorspace.c
+++ b/MagickCore/colorspace.c
@@ -276,7 +276,7 @@
GetPixelGreen(image,q))),q);
SetPixelBlue(image,ClampToQuantum((MagickRealType) (QuantumRange-
GetPixelBlue(image,q))),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
if (sync == MagickFalse)
@@ -333,7 +333,7 @@
SetPixelInfo(image,q,&pixel);
ConvertRGBToCMYK(&pixel);
SetPixelPixelInfo(image,&pixel,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
if (sync == MagickFalse)
@@ -395,7 +395,7 @@
saturation),q);
SetPixelBlue(image,ClampToQuantum((MagickRealType) QuantumRange*
brightness),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
if (sync == MagickFalse)
@@ -455,7 +455,7 @@
saturation),q);
SetPixelBlue(image,ClampToQuantum((MagickRealType) QuantumRange*
lightness),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
if (sync == MagickFalse)
@@ -515,7 +515,7 @@
whiteness),q);
SetPixelBlue(image,ClampToQuantum((MagickRealType) QuantumRange*
blackness),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
if (sync == MagickFalse)
@@ -582,7 +582,7 @@
a),q);
SetPixelBlue(image,ClampToQuantum((MagickRealType) QuantumRange*
b),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
if (sync == MagickFalse)
@@ -676,7 +676,7 @@
GetPixelGreen(image,q))],q);
SetPixelBlue(image,logmap[ScaleQuantumToMap(
GetPixelBlue(image,q))],q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
if (sync == MagickFalse)
@@ -1098,7 +1098,7 @@
SetPixelRed(image,ScaleMapToQuantum(pixel.red),q);
SetPixelGreen(image,ScaleMapToQuantum(pixel.green),q);
SetPixelBlue(image,ScaleMapToQuantum(pixel.blue),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
if (sync == MagickFalse)
@@ -1700,7 +1700,7 @@
GetPixelGreen(image,q))),q);
SetPixelBlue(image,ClampToQuantum((MagickRealType) (QuantumRange-
GetPixelBlue(image,q))),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
if (sync == MagickFalse)
@@ -1760,7 +1760,7 @@
SetPixelInfo(image,q,&pixel);
ConvertCMYKToRGB(&pixel);
SetPixelPixelInfo(image,&pixel,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
if (sync == MagickFalse)
@@ -1826,7 +1826,7 @@
SetPixelRed(image,red,q);
SetPixelGreen(image,green,q);
SetPixelBlue(image,blue,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
if (sync == MagickFalse)
@@ -1892,7 +1892,7 @@
SetPixelRed(image,red,q);
SetPixelGreen(image,green,q);
SetPixelBlue(image,blue,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
if (sync == MagickFalse)
@@ -1958,7 +1958,7 @@
SetPixelRed(image,red,q);
SetPixelGreen(image,green,q);
SetPixelBlue(image,blue,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
if (sync == MagickFalse)
@@ -2031,7 +2031,7 @@
SetPixelRed(image,red,q);
SetPixelGreen(image,green,q);
SetPixelBlue(image,blue,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
if (sync == MagickFalse)
@@ -2128,7 +2128,7 @@
GetPixelGreen(image,q))],q);
SetPixelBlue(image,logmap[ScaleQuantumToMap(
GetPixelBlue(image,q))],q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
if (sync == MagickFalse)
@@ -2548,7 +2548,7 @@
QuantumScale*pixel.green),q);
SetPixelBlue(image,ScaleMapToQuantum((MagickRealType) MaxMap*
QuantumScale*pixel.blue),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
if (sync == MagickFalse)
diff --git a/MagickCore/compare.c b/MagickCore/compare.c
index dc266f4..9fc5488 100644
--- a/MagickCore/compare.c
+++ b/MagickCore/compare.c
@@ -235,20 +235,20 @@
}
else
{
- if (((GetPixelRedTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelRedTraits(image) & UpdatePixelTrait) != 0) &&
(GetPixelRed(image,p) != GetPixelRed(reconstruct_image,q)))
difference=MagickTrue;
- if (((GetPixelGreenTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0) &&
(GetPixelGreen(image,p) != GetPixelGreen(reconstruct_image,q)))
difference=MagickTrue;
- if (((GetPixelBlueTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0) &&
(GetPixelBlue(image,p) != GetPixelBlue(reconstruct_image,q)))
difference=MagickTrue;
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) &&
(image->matte != MagickFalse) &&
(GetPixelAlpha(image,p) != GetPixelAlpha(reconstruct_image,q)))
difference=MagickTrue;
- if ((((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if ((((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace) &&
(reconstruct_image->colorspace == CMYKColorspace)) &&
(GetPixelBlack(image,p) != GetPixelBlack(reconstruct_image,q)))
@@ -258,9 +258,9 @@
SetPixelPixelInfo(highlight_image,&highlight,r);
else
SetPixelPixelInfo(highlight_image,&lowlight,r);
- p+=GetPixelComponents(image);
- q+=GetPixelComponents(reconstruct_image);
- r+=GetPixelComponents(highlight_image);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(reconstruct_image);
+ r+=GetPixelChannels(highlight_image);
}
sync=SyncCacheViewAuthenticPixels(highlight_view,exception);
if (sync == MagickFalse)
@@ -372,22 +372,22 @@
SetPixelInfo(reconstruct_image,q,&reconstruct_pixel);
if (IsFuzzyEquivalencePixelInfo(&pixel,&reconstruct_pixel) == MagickFalse)
{
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
channel_distortion[RedChannel]++;
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
channel_distortion[GreenChannel]++;
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
channel_distortion[BlueChannel]++;
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) &&
(image->matte != MagickFalse))
channel_distortion[OpacityChannel]++;
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
channel_distortion[BlackChannel]++;
channel_distortion[CompositeChannels]++;
}
- p+=GetPixelComponents(image);
- q+=GetPixelComponents(reconstruct_image);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(reconstruct_image);
}
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp critical (MagickCore_GetAbsoluteError)
@@ -406,16 +406,16 @@
channels;
channels=0;
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
channels++;
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
channels++;
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
channels++;
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
channels++;
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) &&
(image->matte != MagickFalse))
channels++;
return(channels);
@@ -472,28 +472,28 @@
MagickRealType
distance;
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
{
distance=QuantumScale*(GetPixelRed(image,p)-(MagickRealType)
GetPixelRed(reconstruct_image,q));
channel_distortion[RedChannel]+=distance*distance;
channel_distortion[CompositeChannels]+=distance*distance;
}
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
{
distance=QuantumScale*(GetPixelGreen(image,p)-(MagickRealType)
GetPixelGreen(reconstruct_image,q));
channel_distortion[GreenChannel]+=distance*distance;
channel_distortion[CompositeChannels]+=distance*distance;
}
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
{
distance=QuantumScale*(GetPixelBlue(image,p)-(MagickRealType)
GetPixelBlue(reconstruct_image,q));
channel_distortion[BlueChannel]+=distance*distance;
channel_distortion[CompositeChannels]+=distance*distance;
}
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) && ((image->matte != MagickFalse) ||
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) && ((image->matte != MagickFalse) ||
(reconstruct_image->matte != MagickFalse)))
{
distance=QuantumScale*((image->matte != MagickFalse ?
@@ -502,7 +502,7 @@
channel_distortion[OpacityChannel]+=distance*distance;
channel_distortion[CompositeChannels]+=distance*distance;
}
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace) &&
(reconstruct_image->colorspace == CMYKColorspace))
{
@@ -511,8 +511,8 @@
channel_distortion[BlackChannel]+=distance*distance;
channel_distortion[CompositeChannels]+=distance*distance;
}
- p+=GetPixelComponents(image);
- q+=GetPixelComponents(reconstruct_image);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(reconstruct_image);
}
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp critical (MagickCore_GetMeanSquaredError)
@@ -524,7 +524,7 @@
image_view=DestroyCacheView(image_view);
for (i=0; i <= (ssize_t) CompositeChannels; i++)
distortion[i]/=((double) image->columns*image->rows);
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) &&
((image->matte != MagickFalse) ||
(reconstruct_image->matte != MagickFalse)))
distortion[CompositeChannels]/=(double) (GetNumberChannels(image)-1);
@@ -585,28 +585,28 @@
MagickRealType
distance;
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
{
distance=QuantumScale*fabs(GetPixelRed(image,p)-(double)
GetPixelRed(reconstruct_image,q));
channel_distortion[RedChannel]+=distance;
channel_distortion[CompositeChannels]+=distance;
}
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
{
distance=QuantumScale*fabs(GetPixelGreen(image,p)-(double)
GetPixelGreen(reconstruct_image,q));
channel_distortion[GreenChannel]+=distance;
channel_distortion[CompositeChannels]+=distance;
}
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
{
distance=QuantumScale*fabs(GetPixelBlue(image,p)-(double)
GetPixelBlue(reconstruct_image,q));
channel_distortion[BlueChannel]+=distance;
channel_distortion[CompositeChannels]+=distance;
}
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
{
distance=QuantumScale*fabs(GetPixelBlack(image,p)-(double)
@@ -614,7 +614,7 @@
channel_distortion[BlackChannel]+=distance;
channel_distortion[CompositeChannels]+=distance;
}
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) &&
(image->matte != MagickFalse))
{
distance=QuantumScale*fabs(GetPixelAlpha(image,p)-(double)
@@ -622,8 +622,8 @@
channel_distortion[OpacityChannel]+=distance;
channel_distortion[CompositeChannels]+=distance;
}
- p+=GetPixelComponents(image);
- q+=GetPixelComponents(reconstruct_image);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(reconstruct_image);
}
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp critical (MagickCore_GetMeanAbsoluteError)
@@ -689,7 +689,7 @@
MagickRealType
distance;
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
{
if (image->matte != MagickFalse)
alpha=(MagickRealType) (QuantumScale*(
@@ -698,7 +698,7 @@
beta=(MagickRealType) (QuantumScale*
GetPixelAlpha(reconstruct_image,q));
}
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
{
distance=fabs(alpha*GetPixelRed(image,p)-beta*
GetPixelRed(reconstruct_image,q));
@@ -709,7 +709,7 @@
maximum_error=distance;
area++;
}
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
{
distance=fabs(alpha*GetPixelGreen(image,p)-beta*
GetPixelGreen(reconstruct_image,q));
@@ -720,7 +720,7 @@
maximum_error=distance;
area++;
}
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
{
distance=fabs(alpha*GetPixelBlue(image,p)-beta*
GetPixelBlue(reconstruct_image,q));
@@ -731,7 +731,7 @@
maximum_error=distance;
area++;
}
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace) &&
(reconstruct_image->colorspace == CMYKColorspace))
{
@@ -744,7 +744,7 @@
maximum_error=distance;
area++;
}
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) &&
(image->matte != MagickFalse))
{
distance=fabs((double) GetPixelAlpha(image,p)-
@@ -756,8 +756,8 @@
maximum_error=distance;
area++;
}
- p+=GetPixelComponents(image);
- q+=GetPixelComponents(reconstruct_image);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(reconstruct_image);
}
}
reconstruct_view=DestroyCacheView(reconstruct_view);
@@ -819,28 +819,28 @@
MagickRealType
distance;
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
{
distance=QuantumScale*(GetPixelRed(image,p)-(MagickRealType)
GetPixelRed(reconstruct_image,q));
channel_distortion[RedChannel]+=distance*distance;
channel_distortion[CompositeChannels]+=distance*distance;
}
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
{
distance=QuantumScale*(GetPixelGreen(image,p)-(MagickRealType)
GetPixelGreen(reconstruct_image,q));
channel_distortion[GreenChannel]+=distance*distance;
channel_distortion[CompositeChannels]+=distance*distance;
}
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
{
distance=QuantumScale*(GetPixelBlue(image,p)-(MagickRealType)
GetPixelBlue(reconstruct_image,q));
channel_distortion[BlueChannel]+=distance*distance;
channel_distortion[CompositeChannels]+=distance*distance;
}
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace) &&
(reconstruct_image->colorspace == CMYKColorspace))
{
@@ -849,7 +849,7 @@
channel_distortion[BlackChannel]+=distance*distance;
channel_distortion[CompositeChannels]+=distance*distance;
}
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) &&
(image->matte != MagickFalse))
{
distance=QuantumScale*(GetPixelAlpha(image,p)-(MagickRealType)
@@ -857,8 +857,8 @@
channel_distortion[OpacityChannel]+=distance*distance;
channel_distortion[CompositeChannels]+=distance*distance;
}
- p+=GetPixelComponents(image);
- q+=GetPixelComponents(reconstruct_image);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(reconstruct_image);
}
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp critical (MagickCore_GetMeanSquaredError)
@@ -936,36 +936,36 @@
}
for (x=0; x < (ssize_t) image->columns; x++)
{
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
distortion[RedChannel]+=area*QuantumScale*(GetPixelRed(image,p)-
image_statistics[RedChannel].mean)*(
GetPixelRed(reconstruct_image,q)-
reconstruct_statistics[RedChannel].mean);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
distortion[GreenChannel]+=area*QuantumScale*(GetPixelGreen(image,p)-
image_statistics[GreenChannel].mean)*(
GetPixelGreen(reconstruct_image,q)-
reconstruct_statistics[GreenChannel].mean);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
distortion[BlueChannel]+=area*QuantumScale*(GetPixelBlue(image,p)-
image_statistics[BlueChannel].mean)*(
GetPixelBlue(reconstruct_image,q)-
reconstruct_statistics[BlueChannel].mean);
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace) &&
(reconstruct_image->colorspace == CMYKColorspace))
distortion[BlackChannel]+=area*QuantumScale*(GetPixelBlack(image,p)-
image_statistics[OpacityChannel].mean)*(
GetPixelBlack(reconstruct_image,q)-
reconstruct_statistics[OpacityChannel].mean);
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) &&
(image->matte != MagickFalse))
distortion[OpacityChannel]+=area*QuantumScale*(GetPixelAlpha(image,p)-
image_statistics[OpacityChannel].mean)*
(GetPixelAlpha(reconstruct_image,q)-
reconstruct_statistics[OpacityChannel].mean);
- p+=GetPixelComponents(image);
- q+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(image);
}
if (image->progress_monitor != (MagickProgressMonitor) NULL)
{
@@ -994,19 +994,19 @@
distortion[i]=QuantumRange*gamma*distortion[i];
}
distortion[CompositeChannels]=0.0;
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
distortion[CompositeChannels]+=distortion[RedChannel]*
distortion[RedChannel];
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
distortion[CompositeChannels]+=distortion[GreenChannel]*
distortion[GreenChannel];
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
distortion[CompositeChannels]+=distortion[BlueChannel]*
distortion[BlueChannel];
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) && (image->matte != MagickFalse))
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) && (image->matte != MagickFalse))
distortion[CompositeChannels]+=distortion[OpacityChannel]*
distortion[OpacityChannel];
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
distortion[CompositeChannels]+=distortion[BlackChannel]*
distortion[BlackChannel];
@@ -1070,7 +1070,7 @@
MagickRealType
distance;
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
{
distance=QuantumScale*fabs(GetPixelRed(image,p)-(double)
GetPixelRed(reconstruct_image,q));
@@ -1079,7 +1079,7 @@
if (distance > channel_distortion[CompositeChannels])
channel_distortion[CompositeChannels]=distance;
}
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
{
distance=QuantumScale*fabs(GetPixelGreen(image,p)-(double)
GetPixelGreen(reconstruct_image,q));
@@ -1088,7 +1088,7 @@
if (distance > channel_distortion[CompositeChannels])
channel_distortion[CompositeChannels]=distance;
}
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
{
distance=QuantumScale*fabs(GetPixelBlue(image,p)-(double)
GetPixelBlue(reconstruct_image,q));
@@ -1097,7 +1097,7 @@
if (distance > channel_distortion[CompositeChannels])
channel_distortion[CompositeChannels]=distance;
}
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace) &&
(reconstruct_image->colorspace == CMYKColorspace))
{
@@ -1108,7 +1108,7 @@
if (distance > channel_distortion[CompositeChannels])
channel_distortion[CompositeChannels]=distance;
}
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) &&
(image->matte != MagickFalse))
{
distance=QuantumScale*fabs(GetPixelAlpha(image,p)-(double)
@@ -1118,8 +1118,8 @@
if (distance > channel_distortion[CompositeChannels])
channel_distortion[CompositeChannels]=distance;
}
- p+=GetPixelComponents(image);
- q+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(image);
}
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#pragma omp critical (MagickCore_GetPeakAbsoluteError)
@@ -1140,20 +1140,20 @@
status;
status=GetMeanSquaredDistortion(image,reconstruct_image,distortion,exception);
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
distortion[RedChannel]=20.0*log10((double) 1.0/sqrt(
distortion[RedChannel]));
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
distortion[GreenChannel]=20.0*log10((double) 1.0/sqrt(
distortion[GreenChannel]));
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
distortion[BlueChannel]=20.0*log10((double) 1.0/sqrt(
distortion[BlueChannel]));
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) &&
(image->matte != MagickFalse))
distortion[OpacityChannel]=20.0*log10((double) 1.0/sqrt(
distortion[OpacityChannel]));
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
distortion[BlackChannel]=20.0*log10((double) 1.0/sqrt(
distortion[BlackChannel]));
@@ -1169,16 +1169,16 @@
status;
status=GetMeanSquaredDistortion(image,reconstruct_image,distortion,exception);
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
distortion[RedChannel]=sqrt(distortion[RedChannel]);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
distortion[GreenChannel]=sqrt(distortion[GreenChannel]);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
distortion[BlueChannel]=sqrt(distortion[BlueChannel]);
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
distortion[BlackChannel]=sqrt(distortion[BlackChannel]);
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) &&
(image->matte != MagickFalse))
distortion[OpacityChannel]=sqrt(distortion[OpacityChannel]);
distortion[CompositeChannels]=sqrt(distortion[CompositeChannels]);
@@ -1565,8 +1565,8 @@
maximum_error=distance;
area++;
}
- p+=GetPixelComponents(image);
- q+=GetPixelComponents(reconstruct_image);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(reconstruct_image);
}
}
reconstruct_view=DestroyCacheView(reconstruct_view);
@@ -1696,8 +1696,8 @@
image_statistics[OpacityChannel].mean)*(
GetPixelAlpha(reconstruct_image,q)-
reconstruct_statistics[OpacityChannel].mean);
- p+=GetPixelComponents(image);
- q+=GetPixelComponents(reconstruct_image);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(reconstruct_image);
}
}
reconstruct_view=DestroyCacheView(reconstruct_view);
@@ -1839,7 +1839,7 @@
QuantumRange*similarity),q);
SetPixelGreen(similarity_image,GetPixelRed(image,q),q);
SetPixelBlue(similarity_image,GetPixelRed(image,q),q);
- q+=GetPixelComponents(similarity_image);
+ q+=GetPixelChannels(similarity_image);
}
if (SyncCacheViewAuthenticPixels(similarity_view,exception) == MagickFalse)
status=MagickFalse;
diff --git a/MagickCore/composite.c b/MagickCore/composite.c
index eea733b..ebd239a 100644
--- a/MagickCore/composite.c
+++ b/MagickCore/composite.c
@@ -343,16 +343,16 @@
/*
Handle channels as separate grayscale channels.
*/
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
composite->red=MagickMin(p->red,q->red);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
composite->green=MagickMin(p->green,q->green);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
composite->blue=MagickMin(p->blue,q->blue);
- if ((GetPixelBlackTraits(image) & ActivePixelTrait) != 0 &&
+ if ((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0 &&
(q->colorspace == CMYKColorspace))
composite->black=MagickMin(p->black,q->black);
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
composite->alpha=MagickMax(p->alpha,q->alpha);
return;
}
@@ -385,16 +385,16 @@
from_p=GetPixelInfoIntensity(p) < GetPixelInfoIntensity(q) ? MagickTrue :
MagickFalse;
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
composite->red=from_p != MagickFalse ? p->red : q->red;
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
composite->green=from_p != MagickFalse ? p->green : q->green;
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
composite->blue=from_p != MagickFalse ? p->blue : q->blue;
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(q->colorspace == CMYKColorspace))
composite->black=from_p != MagickFalse ? p->black : q->black;
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
composite->alpha=from_p != MagickFalse ? p->alpha : q->alpha;
return;
}
@@ -428,16 +428,16 @@
/*
Handle channels as separate grayscale channels.
*/
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
composite->red=fabs((double) (p->red-q->red));
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
composite->green=fabs((double) (p->green-q->green));
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
composite->blue=fabs((double) (p->blue-q->blue));
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(q->colorspace == CMYKColorspace))
composite->black=fabs((double) (p->black-q->black));
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
composite->alpha=fabs((double) (p->alpha-q->alpha));
return;
}
@@ -486,20 +486,20 @@
/*
Handle channels as separate grayscale channels.
*/
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
composite->red=QuantumRange*Divide(QuantumScale*p->red,1.0,
QuantumScale*q->red,1.0);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
composite->green=QuantumRange*Divide(QuantumScale*p->green,1.0,
QuantumScale*q->green,1.0);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
composite->blue=QuantumRange*Divide(QuantumScale*p->blue,1.0,
QuantumScale*q->blue,1.0);
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(q->colorspace == CMYKColorspace))
composite->black=QuantumRange*Divide(QuantumScale*p->black,1.0,
QuantumScale*q->black,1.0);
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
composite->alpha=QuantumRange*(1.0-Divide(Sa,1.0,Da,1.0));
return;
}
@@ -538,20 +538,20 @@
/*
Handle channels as separate grayscale channels.
*/
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
composite->red=QuantumRange*Exclusion(QuantumScale*p->red,1.0,
QuantumScale*q->red,1.0);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
composite->green=QuantumRange*Exclusion(QuantumScale*p->green,1.0,
QuantumScale*q->green,1.0);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
composite->blue=QuantumRange*Exclusion(QuantumScale*p->blue,1.0,
QuantumScale*q->blue,1.0);
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(q->colorspace == CMYKColorspace))
composite->black=QuantumRange*Exclusion(QuantumScale*p->black,1.0,
QuantumScale*q->black,1.0);
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
composite->alpha=QuantumRange*(1.0-Exclusion(Sa,1.0,Da,1.0));
return;
}
@@ -692,16 +692,16 @@
/*
Handle channels as separate grayscale channels
*/
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
composite->red=MagickMax(p->red,q->red);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
composite->green=MagickMax(p->green,q->green);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
composite->blue=MagickMax(p->blue,q->blue);
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(q->colorspace == CMYKColorspace))
composite->black=MagickMax(p->black,q->black);
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
composite->alpha=MagickMin(p->alpha,q->alpha);
return;
}
@@ -734,16 +734,16 @@
from_p=GetPixelInfoIntensity(p) > GetPixelInfoIntensity(q) ? MagickTrue :
MagickFalse;
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
composite->red=from_p != MagickFalse ? p->red : q->red;
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
composite->green=from_p != MagickFalse ? p->green : q->green;
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
composite->blue=from_p != MagickFalse ? p->blue : q->blue;
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(q->colorspace == CMYKColorspace))
composite->black=from_p != MagickFalse ? p->black : q->black;
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
composite->alpha=from_p != MagickFalse ? p->alpha : q->alpha;
return;
}
@@ -892,20 +892,20 @@
/*
Handle channels as separate grayscale channels.
*/
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
composite->red=QuantumRange*Mathematics(QuantumScale*p->red,1.0,
QuantumScale*q->red,1.0,args);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
composite->green=QuantumRange*Mathematics(QuantumScale*p->green,1.0,
QuantumScale*q->green,1.0,args);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
composite->blue=QuantumRange*Mathematics(QuantumScale*p->blue,1.0,
QuantumScale*q->blue,1.0,args);
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(q->colorspace == CMYKColorspace))
composite->black=QuantumRange*Mathematics(QuantumScale*p->black,1.0,
QuantumScale*q->black,1.0,args);
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
composite->alpha=QuantumRange*(1.0-Mathematics(Sa,1.0,Da,1.0,args));
return;
}
@@ -946,16 +946,16 @@
/*
Handle channels as separate grayscale channels.
*/
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
composite->red=p->red+q->red;
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
composite->green=p->green+q->green;
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
composite->blue=p->blue+q->blue;
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(q->colorspace == CMYKColorspace))
composite->black=p->black+q->black;
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
composite->alpha=p->alpha+q->alpha-QuantumRange;
return;
}
@@ -989,16 +989,16 @@
/*
Handle channels as separate grayscale channels.
*/
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
composite->red=p->red-q->red;
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
composite->green=p->green-q->green;
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
composite->blue=p->blue-q->blue;
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(q->colorspace == CMYKColorspace))
composite->black=p->black-q->black;
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
composite->alpha=QuantumRange*(1.0-(Sa-Da));
return;
}
@@ -1037,16 +1037,16 @@
/*
Handle channels as separate grayscale channels.
*/
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
composite->red=ModulusAdd(p->red,1.0,q->red,1.0);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
composite->green=ModulusAdd(p->green,1.0,q->green,1.0);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
composite->blue=ModulusAdd(p->blue,1.0,q->blue,1.0);
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(q->colorspace == CMYKColorspace))
composite->black=ModulusAdd(p->black,1.0,q->black,1.0);
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
composite->alpha=ModulusAdd(p->alpha,1.0,q->alpha,1.0);
return;
}
@@ -1087,16 +1087,16 @@
/*
Handle channels as separate grayscale channels,
*/
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
composite->red=ModulusSubtract(p->red,1.0,q->red,1.0);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
composite->green=ModulusSubtract(p->green,1.0,q->green,1.0);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
composite->blue=ModulusSubtract(p->blue,1.0,q->blue,1.0);
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(q->colorspace == CMYKColorspace))
composite->black=ModulusSubtract(p->black,1.0,q->black,1.0);
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
composite->alpha=ModulusSubtract(p->alpha,1.0,q->alpha,1.0);
return;
}
@@ -1133,16 +1133,16 @@
/*
Handle channels as separate grayscale channels.
*/
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
composite->red=QuantumScale*p->red*q->red;
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
composite->green=QuantumScale*p->green*q->green;
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
composite->blue=QuantumScale*p->blue*q->blue;
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(q->colorspace == CMYKColorspace))
composite->black=QuantumScale*p->black*q->black;
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
composite->alpha=QuantumRange*(1.0-Sa*Da);
return;
}
@@ -1291,20 +1291,20 @@
/*
Handle channels as separate grayscale channels.
*/
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
composite->red=QuantumRange*Screen(QuantumScale*p->red,
QuantumScale*q->red);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
composite->green=QuantumRange*Screen(QuantumScale*p->green,
QuantumScale*q->green);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
composite->blue=QuantumRange*Screen(QuantumScale*p->blue,
QuantumScale*q->blue);
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(q->colorspace == CMYKColorspace))
composite->black=QuantumRange*Screen(QuantumScale*p->black,
QuantumScale*q->black);
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
composite->alpha=QuantumRange*(1.0-Screen(Sa,Da));
return;
}
@@ -1677,8 +1677,8 @@
SetPixelAlpha(image,GetPixelAlpha(composite_image,p),q);
if (image->colorspace == CMYKColorspace)
SetPixelBlack(image,GetPixelBlack(composite_image,p),q);
- p+=GetPixelComponents(composite_image);
- q+=GetPixelComponents(image);
+ p+=GetPixelChannels(composite_image);
+ q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
if (sync == MagickFalse)
@@ -1816,7 +1816,7 @@
{
if (((x_offset+x) < 0) || ((x_offset+x) >= (ssize_t) image->columns))
{
- p+=GetPixelComponents(composite_image);
+ p+=GetPixelChannels(composite_image);
continue;
}
if (fabs(angle_range) > MagickEpsilon)
@@ -1839,8 +1839,8 @@
(void) ResamplePixelColor(resample_filter,(double) x_offset+x,
(double) y_offset+y,&pixel);
SetPixelPixelInfo(destination_image,&pixel,q);
- p+=GetPixelComponents(composite_image);
- q+=GetPixelComponents(destination_image);
+ p+=GetPixelChannels(composite_image);
+ q+=GetPixelChannels(destination_image);
}
sync=SyncCacheViewAuthenticPixels(destination_view,exception);
if (sync == MagickFalse)
@@ -1988,7 +1988,7 @@
{
if (((x_offset+x) < 0) || ((x_offset+x) >= (ssize_t) image->columns))
{
- p+=GetPixelComponents(composite_image);
+ p+=GetPixelChannels(composite_image);
continue;
}
/*
@@ -2012,8 +2012,8 @@
pixel.alpha)*(1.0-QuantumScale*
GetPixelAlpha(composite_image,p)));
SetPixelPixelInfo(destination_image,&pixel,q);
- p+=GetPixelComponents(composite_image);
- q+=GetPixelComponents(destination_image);
+ p+=GetPixelChannels(composite_image);
+ q+=GetPixelChannels(destination_image);
}
sync=SyncCacheViewAuthenticPixels(destination_view,exception);
if (sync == MagickFalse)
@@ -2188,7 +2188,7 @@
}
pixels=p;
if (x_offset < 0)
- p-=x_offset*GetPixelComponents(composite_image);
+ p-=x_offset*GetPixelChannels(composite_image);
}
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
if (q == (const Quantum *) NULL)
@@ -2207,7 +2207,7 @@
{
if (x < x_offset)
{
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
continue;
}
if ((x-x_offset) >= (ssize_t) composite_image->columns)
@@ -2281,7 +2281,7 @@
SetPixelAlpha(image,ClampToQuantum(composite.alpha),q);
if (image->colorspace == CMYKColorspace)
SetPixelBlack(image,ClampToQuantum(composite.black),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
continue;
}
/*
@@ -2693,10 +2693,10 @@
if (image->colorspace == CMYKColorspace)
SetPixelBlack(image,ClampToQuantum(composite.black),q);
SetPixelAlpha(image,ClampToQuantum(composite.alpha),q);
- p+=GetPixelComponents(composite_image);
- if (p >= (pixels+composite_image->columns*GetPixelComponents(composite_image)))
+ p+=GetPixelChannels(composite_image);
+ if (p >= (pixels+composite_image->columns*GetPixelChannels(composite_image)))
p=pixels;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -2878,8 +2878,8 @@
if ((image->colorspace == CMYKColorspace) &&
(texture->colorspace == CMYKColorspace))
SetPixelBlack(image,GetPixelBlack(texture,p),q);
- p+=GetPixelComponents(texture);
- q+=GetPixelComponents(image);
+ p+=GetPixelChannels(texture);
+ q+=GetPixelChannels(image);
}
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
diff --git a/MagickCore/compress.c b/MagickCore/compress.c
index fb08647..6e735ed 100644
--- a/MagickCore/compress.c
+++ b/MagickCore/compress.c
@@ -636,7 +636,7 @@
index=(Quantum) (*p++);
SetPixelIndex(image,index,q);
SetPixelPacket(image,image->colormap+(ssize_t) index,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
break;
@@ -808,7 +808,7 @@
{
*q++=(unsigned char) (GetPixelIntensity(huffman_image,p) >=
((MagickRealType) QuantumRange/2.0) ? 0 : 1);
- p+=GetPixelComponents(huffman_image);
+ p+=GetPixelChannels(huffman_image);
}
/*
Huffman encode scanline.
diff --git a/MagickCore/decorate.c b/MagickCore/decorate.c
index e675105..2ca3369 100644
--- a/MagickCore/decorate.c
+++ b/MagickCore/decorate.c
@@ -313,12 +313,12 @@
SetPixelPixelInfo(frame_image,&highlight,q);
else
SetPixelPixelInfo(frame_image,&accentuate,q);
- q+=GetPixelComponents(frame_image);
+ q+=GetPixelChannels(frame_image);
}
for ( ; x < (ssize_t) frame_image->columns; x++)
{
SetPixelPixelInfo(frame_image,&shadow,q);
- q+=GetPixelComponents(frame_image);
+ q+=GetPixelChannels(frame_image);
}
}
for (y=0; y < (ssize_t) (frame_info->y-bevel_width); y++)
@@ -326,18 +326,18 @@
for (x=0; x < (ssize_t) frame_info->outer_bevel; x++)
{
SetPixelPixelInfo(frame_image,&highlight,q);
- q+=GetPixelComponents(frame_image);
+ q+=GetPixelChannels(frame_image);
}
width=frame_image->columns-2*frame_info->outer_bevel;
for (x=0; x < (ssize_t) width; x++)
{
SetPixelPixelInfo(frame_image,&matte,q);
- q+=GetPixelComponents(frame_image);
+ q+=GetPixelChannels(frame_image);
}
for (x=0; x < (ssize_t) frame_info->outer_bevel; x++)
{
SetPixelPixelInfo(frame_image,&shadow,q);
- q+=GetPixelComponents(frame_image);
+ q+=GetPixelChannels(frame_image);
}
}
for (y=0; y < (ssize_t) frame_info->inner_bevel; y++)
@@ -345,12 +345,12 @@
for (x=0; x < (ssize_t) frame_info->outer_bevel; x++)
{
SetPixelPixelInfo(frame_image,&highlight,q);
- q+=GetPixelComponents(frame_image);
+ q+=GetPixelChannels(frame_image);
}
for (x=0; x < (ssize_t) (frame_info->x-bevel_width); x++)
{
SetPixelPixelInfo(frame_image,&matte,q);
- q+=GetPixelComponents(frame_image);
+ q+=GetPixelChannels(frame_image);
}
width=image->columns+((size_t) frame_info->inner_bevel << 1)-
y;
@@ -360,23 +360,23 @@
SetPixelPixelInfo(frame_image,&shadow,q);
else
SetPixelPixelInfo(frame_image,&trough,q);
- q+=GetPixelComponents(frame_image);
+ q+=GetPixelChannels(frame_image);
}
for ( ; x < (ssize_t) (image->columns+2*frame_info->inner_bevel); x++)
{
SetPixelPixelInfo(frame_image,&highlight,q);
- q+=GetPixelComponents(frame_image);
+ q+=GetPixelChannels(frame_image);
}
width=frame_info->width-frame_info->x-image->columns-bevel_width;
for (x=0; x < (ssize_t) width; x++)
{
SetPixelPixelInfo(frame_image,&matte,q);
- q+=GetPixelComponents(frame_image);
+ q+=GetPixelChannels(frame_image);
}
for (x=0; x < (ssize_t) frame_info->outer_bevel; x++)
{
SetPixelPixelInfo(frame_image,&shadow,q);
- q+=GetPixelComponents(frame_image);
+ q+=GetPixelChannels(frame_image);
}
}
(void) SyncCacheViewAuthenticPixels(frame_view,exception);
@@ -411,17 +411,17 @@
for (x=0; x < (ssize_t) frame_info->outer_bevel; x++)
{
SetPixelPixelInfo(frame_image,&highlight,q);
- q+=GetPixelComponents(frame_image);
+ q+=GetPixelChannels(frame_image);
}
for (x=0; x < (ssize_t) (frame_info->x-bevel_width); x++)
{
SetPixelPixelInfo(frame_image,&matte,q);
- q+=GetPixelComponents(frame_image);
+ q+=GetPixelChannels(frame_image);
}
for (x=0; x < (ssize_t) frame_info->inner_bevel; x++)
{
SetPixelPixelInfo(frame_image,&shadow,q);
- q+=GetPixelComponents(frame_image);
+ q+=GetPixelChannels(frame_image);
}
/*
Set frame interior to interior color.
@@ -431,7 +431,7 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
SetPixelPixelInfo(frame_image,&interior,q);
- q+=GetPixelComponents(frame_image);
+ q+=GetPixelChannels(frame_image);
}
else
{
@@ -452,25 +452,25 @@
if (image->colorspace == CMYKColorspace)
SetPixelBlack(frame_image,GetPixelBlack(image,p),q);
SetPixelAlpha(frame_image,GetPixelAlpha(image,p),q);
- p+=GetPixelComponents(image);
- q+=GetPixelComponents(frame_image);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(frame_image);
}
}
for (x=0; x < (ssize_t) frame_info->inner_bevel; x++)
{
SetPixelPixelInfo(frame_image,&highlight,q);
- q+=GetPixelComponents(frame_image);
+ q+=GetPixelChannels(frame_image);
}
width=frame_info->width-frame_info->x-image->columns-bevel_width;
for (x=0; x < (ssize_t) width; x++)
{
SetPixelPixelInfo(frame_image,&matte,q);
- q+=GetPixelComponents(frame_image);
+ q+=GetPixelChannels(frame_image);
}
for (x=0; x < (ssize_t) frame_info->outer_bevel; x++)
{
SetPixelPixelInfo(frame_image,&shadow,q);
- q+=GetPixelComponents(frame_image);
+ q+=GetPixelChannels(frame_image);
}
if (SyncCacheViewAuthenticPixels(frame_view,exception) == MagickFalse)
status=MagickFalse;
@@ -512,17 +512,17 @@
for (x=0; x < (ssize_t) frame_info->outer_bevel; x++)
{
SetPixelPixelInfo(frame_image,&highlight,q);
- q+=GetPixelComponents(frame_image);
+ q+=GetPixelChannels(frame_image);
}
for (x=0; x < (ssize_t) (frame_info->x-bevel_width); x++)
{
SetPixelPixelInfo(frame_image,&matte,q);
- q+=GetPixelComponents(frame_image);
+ q+=GetPixelChannels(frame_image);
}
for (x=0; x < y; x++)
{
SetPixelPixelInfo(frame_image,&shadow,q);
- q+=GetPixelComponents(frame_image);
+ q+=GetPixelChannels(frame_image);
}
for ( ; x < (ssize_t) (image->columns+2*frame_info->inner_bevel); x++)
{
@@ -530,18 +530,18 @@
SetPixelPixelInfo(frame_image,&highlight,q);
else
SetPixelPixelInfo(frame_image,&accentuate,q);
- q+=GetPixelComponents(frame_image);
+ q+=GetPixelChannels(frame_image);
}
width=frame_info->width-frame_info->x-image->columns-bevel_width;
for (x=0; x < (ssize_t) width; x++)
{
SetPixelPixelInfo(frame_image,&matte,q);
- q+=GetPixelComponents(frame_image);
+ q+=GetPixelChannels(frame_image);
}
for (x=0; x < (ssize_t) frame_info->outer_bevel; x++)
{
SetPixelPixelInfo(frame_image,&shadow,q);
- q+=GetPixelComponents(frame_image);
+ q+=GetPixelChannels(frame_image);
}
}
height=frame_info->height-frame_info->y-image->rows-bevel_width;
@@ -550,18 +550,18 @@
for (x=0; x < (ssize_t) frame_info->outer_bevel; x++)
{
SetPixelPixelInfo(frame_image,&highlight,q);
- q+=GetPixelComponents(frame_image);
+ q+=GetPixelChannels(frame_image);
}
width=frame_image->columns-2*frame_info->outer_bevel;
for (x=0; x < (ssize_t) width; x++)
{
SetPixelPixelInfo(frame_image,&matte,q);
- q+=GetPixelComponents(frame_image);
+ q+=GetPixelChannels(frame_image);
}
for (x=0; x < (ssize_t) frame_info->outer_bevel; x++)
{
SetPixelPixelInfo(frame_image,&shadow,q);
- q+=GetPixelComponents(frame_image);
+ q+=GetPixelChannels(frame_image);
}
}
for (y=frame_info->outer_bevel-1; y >= 0; y--)
@@ -569,7 +569,7 @@
for (x=0; x < y; x++)
{
SetPixelPixelInfo(frame_image,&highlight,q);
- q+=GetPixelComponents(frame_image);
+ q+=GetPixelChannels(frame_image);
}
for ( ; x < (ssize_t) frame_image->columns; x++)
{
@@ -577,7 +577,7 @@
SetPixelPixelInfo(frame_image,&shadow,q);
else
SetPixelPixelInfo(frame_image,&trough,q);
- q+=GetPixelComponents(frame_image);
+ q+=GetPixelChannels(frame_image);
}
}
(void) SyncCacheViewAuthenticPixels(frame_view,exception);
@@ -711,7 +711,7 @@
SetPixelBlue(image,ClampToQuantum(QuantumScale*((MagickRealType)
GetPixelBlue(image,q)*HighlightFactor+(MagickRealType) foreground*
(QuantumRange-HighlightFactor))),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
for ( ; x < (ssize_t) (image->columns-y); x++)
{
@@ -724,7 +724,7 @@
SetPixelBlue(image,ClampToQuantum(QuantumScale*((MagickRealType)
GetPixelBlue(image,q)*AccentuateFactor+(MagickRealType) foreground*
(QuantumRange-AccentuateFactor))),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
for ( ; x < (ssize_t) image->columns; x++)
{
@@ -737,7 +737,7 @@
SetPixelBlue(image,ClampToQuantum(QuantumScale*((MagickRealType)
GetPixelBlue(image,q)*ShadowFactor+(MagickRealType) background*
(QuantumRange-ShadowFactor))),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -781,10 +781,10 @@
SetPixelBlue(image,ClampToQuantum(QuantumScale*((MagickRealType)
GetPixelBlue(image,q)*HighlightFactor+(MagickRealType) foreground*
(QuantumRange-HighlightFactor))),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
for ( ; x < (ssize_t) (image->columns-raise_info->width); x++)
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
for ( ; x < (ssize_t) image->columns; x++)
{
SetPixelRed(image,ClampToQuantum(QuantumScale*((MagickRealType)
@@ -796,7 +796,7 @@
SetPixelBlue(image,ClampToQuantum(QuantumScale*((MagickRealType)
GetPixelBlue(image,q)*ShadowFactor+(MagickRealType) background*
(QuantumRange-ShadowFactor))),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -840,7 +840,7 @@
SetPixelBlue(image,ClampToQuantum(QuantumScale*((MagickRealType)
GetPixelBlue(image,q)*HighlightFactor+(MagickRealType) foreground*
(QuantumRange-HighlightFactor))),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
for ( ; x < (ssize_t) (image->columns-(image->rows-y)); x++)
{
@@ -853,7 +853,7 @@
SetPixelBlue(image,ClampToQuantum(QuantumScale*((MagickRealType)
GetPixelBlue(image,q)*TroughFactor+(MagickRealType) background*
(QuantumRange-TroughFactor))),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
for ( ; x < (ssize_t) image->columns; x++)
{
@@ -866,7 +866,7 @@
SetPixelBlue(image,ClampToQuantum(QuantumScale*((MagickRealType)
GetPixelBlue(image,q)*ShadowFactor+(MagickRealType) background*
(QuantumRange-ShadowFactor))),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
diff --git a/MagickCore/display.c b/MagickCore/display.c
index 4ba34eb..a059951 100644
--- a/MagickCore/display.c
+++ b/MagickCore/display.c
@@ -3752,7 +3752,7 @@
SetPixelBlue(*image,ScaleShortToQuantum(
color.blue),q);
}
- q+=GetPixelComponents(*image);
+ q+=GetPixelChannels(*image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
break;
@@ -3825,7 +3825,7 @@
SetPixelRed(*image,ScaleShortToQuantum(color.red),q);
SetPixelGreen(*image,ScaleShortToQuantum(color.green),q);
SetPixelBlue(*image,ScaleShortToQuantum(color.blue),q);
- q+=GetPixelComponents(*image);
+ q+=GetPixelChannels(*image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
break;
@@ -4312,7 +4312,7 @@
for (x=0; x < (int) image->columns; x++)
{
SetPixelAlpha(image,opacity,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
break;
@@ -5330,7 +5330,7 @@
for (x=0; x < (int) crop_info.width; x++)
{
SetPixelAlpha(image,TransparentAlpha,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
break;
@@ -10043,7 +10043,7 @@
GetPixelPacket(*image,q,&pixel);
if (IsFuzzyEquivalencePixelPacket(*image,&pixel,&target))
SetPixelAlpha(*image,(Quantum) StringToLong(matte),q);
- q+=GetPixelComponents(*image);
+ q+=GetPixelChannels(*image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
break;
@@ -10077,11 +10077,11 @@
(DrawInfo *) NULL);
draw_info->fill.alpha=ClampToQuantum(InterpretLocaleValue(matte,
(char **) NULL));
- PushPixelComponentMap(*image,AlphaChannel);
+ PushPixelChannelMap(*image,AlphaChannel);
(void) FloodfillPaintImage(*image,draw_info,&target,(ssize_t)
x_offset,(ssize_t) y_offset,method == FloodfillMethod ?
MagickFalse : MagickTrue);
- PopPixelComponentMap(*image);
+ PopPixelChannelMap(*image);
draw_info=DestroyDrawInfo(draw_info);
break;
}
@@ -10101,7 +10101,7 @@
for (x=0; x < (int) (*image)->columns; x++)
{
SetPixelAlpha(*image,(Quantum) StringToLong(matte),q);
- q+=GetPixelComponents(*image);
+ q+=GetPixelChannels(*image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
break;
@@ -13149,7 +13149,7 @@
for (j=0; j < (int) width; j++)
{
SetPixelPacket(image,&pixel,s);
- s+=GetPixelComponents(image);
+ s+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
break;
diff --git a/MagickCore/distort.c b/MagickCore/distort.c
index 4459f20..70050e7 100644
--- a/MagickCore/distort.c
+++ b/MagickCore/distort.c
@@ -1469,9 +1469,9 @@
*resize_alpha;
/* distort alpha channel separately */
- PushPixelComponentMap(tmp_image,AlphaChannel);
+ PushPixelChannelMap(tmp_image,AlphaChannel);
(void) SeparateImage(tmp_image);
- PopPixelComponentMap(tmp_image);
+ PopPixelChannelMap(tmp_image);
(void) SetImageAlphaChannel(tmp_image,OpaqueAlphaChannel);
resize_alpha=DistortImage(tmp_image,AffineDistortion,12,distort_args,
MagickTrue,exception),
@@ -2660,7 +2660,7 @@
}
SetPixelPixelInfo(distort_image,&pixel,q);
}
- q+=GetPixelComponents(distort_image);
+ q+=GetPixelChannels(distort_image);
}
sync=SyncCacheViewAuthenticPixels(distort_view,exception);
if (sync == MagickFalse)
@@ -2763,16 +2763,16 @@
/* Determine number of color values needed per control point */
number_colors=0;
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
number_colors++;
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
number_colors++;
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
number_colors++;
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
number_colors++;
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) &&
(image->matte != MagickFalse))
number_colors++;
@@ -2809,20 +2809,20 @@
{
register ssize_t x=0;
(void) FormatLocaleFile(stderr, "Barycentric Sparse Color:\n");
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
(void) FormatLocaleFile(stderr, " -channel R -fx '%+lf*i %+lf*j %+lf' \\\n",
coeff[x], coeff[x+1], coeff[x+2]),x+=3;
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
(void) FormatLocaleFile(stderr, " -channel G -fx '%+lf*i %+lf*j %+lf' \\\n",
coeff[x], coeff[x+1], coeff[x+2]),x+=3;
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
(void) FormatLocaleFile(stderr, " -channel B -fx '%+lf*i %+lf*j %+lf' \\\n",
coeff[x], coeff[x+1], coeff[x+2]),x+=3;
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
(void) FormatLocaleFile(stderr, " -channel K -fx '%+lf*i %+lf*j %+lf' \\\n",
coeff[x], coeff[x+1], coeff[x+2]),x+=3;
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) &&
(image->matte != MagickFalse))
(void) FormatLocaleFile(stderr, " -channel A -fx '%+lf*i %+lf*j %+lf' \\\n",
coeff[x], coeff[x+1], coeff[x+2]),x+=3;
@@ -2832,24 +2832,24 @@
{
register ssize_t x=0;
(void) FormatLocaleFile(stderr, "Bilinear Sparse Color\n");
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
(void) FormatLocaleFile(stderr, " -channel R -fx '%+lf*i %+lf*j %+lf*i*j %+lf;\n",
coeff[ x ], coeff[x+1],
coeff[x+2], coeff[x+3]),x+=4;
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
(void) FormatLocaleFile(stderr, " -channel G -fx '%+lf*i %+lf*j %+lf*i*j %+lf;\n",
coeff[ x ], coeff[x+1],
coeff[x+2], coeff[x+3]),x+=4;
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
(void) FormatLocaleFile(stderr, " -channel B -fx '%+lf*i %+lf*j %+lf*i*j %+lf;\n",
coeff[ x ], coeff[x+1],
coeff[x+2], coeff[x+3]),x+=4;
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
(void) FormatLocaleFile(stderr, " -channel K -fx '%+lf*i %+lf*j %+lf*i*j %+lf;\n",
coeff[ x ], coeff[x+1],
coeff[x+2], coeff[x+3]),x+=4;
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) &&
(image->matte != MagickFalse))
(void) FormatLocaleFile(stderr, " -channel A -fx '%+lf*i %+lf*j %+lf*i*j %+lf;\n",
coeff[ x ], coeff[x+1],
@@ -2926,20 +2926,20 @@
case BarycentricColorInterpolate:
{
register ssize_t x=0;
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
pixel.red = coeff[x]*i +coeff[x+1]*j
+coeff[x+2], x+=3;
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
pixel.green = coeff[x]*i +coeff[x+1]*j
+coeff[x+2], x+=3;
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
pixel.blue = coeff[x]*i +coeff[x+1]*j
+coeff[x+2], x+=3;
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
pixel.black = coeff[x]*i +coeff[x+1]*j
+coeff[x+2], x+=3;
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) &&
(image->matte != MagickFalse))
pixel.alpha = coeff[x]*i +coeff[x+1]*j
+coeff[x+2], x+=3;
@@ -2948,20 +2948,20 @@
case BilinearColorInterpolate:
{
register ssize_t x=0;
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
pixel.red = coeff[x]*i + coeff[x+1]*j +
coeff[x+2]*i*j + coeff[x+3], x+=4;
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
pixel.green = coeff[x]*i + coeff[x+1]*j +
coeff[x+2]*i*j + coeff[x+3], x+=4;
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
pixel.blue = coeff[x]*i + coeff[x+1]*j +
coeff[x+2]*i*j + coeff[x+3], x+=4;
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
pixel.black = coeff[x]*i + coeff[x+1]*j +
coeff[x+2]*i*j + coeff[x+3], x+=4;
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) &&
(image->matte != MagickFalse))
pixel.alpha = coeff[x]*i + coeff[x+1]*j +
coeff[x+2]*i*j + coeff[x+3], x+=4;
@@ -2975,16 +2975,16 @@
double
denominator;
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
pixel.red=0.0;
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
pixel.green=0.0;
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
pixel.blue=0.0;
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
pixel.black=0.0;
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) &&
(image->matte != MagickFalse))
pixel.alpha=0.0;
denominator = 0.0;
@@ -2996,30 +2996,30 @@
if ( method == InverseColorInterpolate )
weight = sqrt(weight); /* inverse, not inverse squared */
weight = ( weight < 1.0 ) ? 1.0 : 1.0/weight;
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
pixel.red += arguments[x++]*weight;
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
pixel.green += arguments[x++]*weight;
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
pixel.blue += arguments[x++]*weight;
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
pixel.black += arguments[x++]*weight;
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) &&
(image->matte != MagickFalse))
pixel.alpha += arguments[x++]*weight;
denominator += weight;
}
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
pixel.red/=denominator;
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
pixel.green/=denominator;
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
pixel.blue/=denominator;
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
pixel.black/=denominator;
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) &&
(image->matte != MagickFalse))
pixel.alpha/=denominator;
break;
@@ -3038,16 +3038,16 @@
+ ((double)j-arguments[k+1])*((double)j-arguments[k+1]);
if ( distance < minimum ) {
register ssize_t x=(ssize_t) k+2;
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
pixel.red=arguments[x++];
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
pixel.green=arguments[x++];
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
pixel.blue=arguments[x++];
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
pixel.black=arguments[x++];
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) &&
(image->matte != MagickFalse))
pixel.alpha=arguments[x++];
minimum = distance;
@@ -3057,20 +3057,20 @@
}
}
/* set the color directly back into the source image */
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
pixel.red*=QuantumRange;
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
pixel.green*=QuantumRange;
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
pixel.blue*=QuantumRange;
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
pixel.black*=QuantumRange;
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) &&
(image->matte != MagickFalse))
pixel.alpha*=QuantumRange;
SetPixelPixelInfo(sparse_image,&pixel,q);
- q+=GetPixelComponents(sparse_image);
+ q+=GetPixelChannels(sparse_image);
}
sync=SyncCacheViewAuthenticPixels(sparse_view,exception);
if (sync == MagickFalse)
diff --git a/MagickCore/draw.c b/MagickCore/draw.c
index 4f02ad5..975f9d5 100644
--- a/MagickCore/draw.c
+++ b/MagickCore/draw.c
@@ -1208,7 +1208,7 @@
&composite);
SetPixelPixelInfo(image,&composite,q);
x_offset++;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -3439,7 +3439,7 @@
CompositePixelInfoOver(&composite,composite.alpha,&pixel,pixel.alpha,
&pixel);
SetPixelPixelInfo(image,&pixel,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -3905,7 +3905,7 @@
(void) GetStrokeColor(draw_info,x,y,&pixel);
SetPixelPacket(image,&pixel,q);
}
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
if (sync == MagickFalse)
@@ -3974,7 +3974,7 @@
stroke_opacity=stroke_opacity*stroke_color.alpha;
CompositePixelOver(image,&stroke_color,stroke_opacity,q,(MagickRealType)
GetPixelAlpha(image,q),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -4217,12 +4217,12 @@
GetPixelPacket(image,q,&pixel);
if (IsFuzzyEquivalencePixelPacket(image,&pixel,&target) == MagickFalse)
{
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
continue;
}
(void) GetFillColor(draw_info,x,y,&pixel);
SetPixelPacket(image,&pixel,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
if (sync == MagickFalse)
@@ -4272,7 +4272,7 @@
{
(void) GetFillColor(draw_info,x,y,&pixel);
SetPixelPacket(image,&pixel,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
if (sync == MagickFalse)
@@ -4333,12 +4333,12 @@
GetPixelPacket(image,q,&pixel);
if (IsFuzzyEquivalencePixelPacket(image,&pixel,&target) == MagickFalse)
{
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
continue;
}
(void) GetFillColor(draw_info,x,y,&pixel);
SetPixelAlpha(image,pixel.alpha,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
if (sync == MagickFalse)
@@ -4359,11 +4359,11 @@
target.green=(MagickRealType) draw_info->border_color.green;
target.blue=(MagickRealType) draw_info->border_color.blue;
}
- PushPixelComponentMap(image,AlphaChannel);
+ PushPixelChannelMap(image,AlphaChannel);
(void) FloodfillPaintImage(image,draw_info,&target,x,y,
primitive_info->method == FloodfillMethod ? MagickFalse :
MagickTrue);
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
break;
}
case ResetMethod:
@@ -4390,7 +4390,7 @@
{
(void) GetFillColor(draw_info,x,y,&pixel);
SetPixelAlpha(image,pixel.alpha,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
if (sync == MagickFalse)
diff --git a/MagickCore/effect.c b/MagickCore/effect.c
index 5f6c832..8b84b91 100644
--- a/MagickCore/effect.c
+++ b/MagickCore/effect.c
@@ -359,39 +359,39 @@
for (u=0; u < (ssize_t) (width-i); u++)
{
alpha=1.0;
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) &&
(image->matte != MagickFalse))
alpha=(MagickRealType) (QuantumScale*GetPixelAlpha(image,p));
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
pixel.red+=(*k)*alpha*GetPixelRed(image,p);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
pixel.green+=(*k)*alpha*GetPixelGreen(image,p);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
pixel.blue+=(*k)*alpha*GetPixelBlue(image,p);
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
pixel.black+=(*k)*alpha*GetPixelBlack(image,p);
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
pixel.alpha+=(*k)*GetPixelAlpha(image,p);
gamma+=(*k)*alpha;
k++;
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
SetPixelRed(blur_image,ClampToQuantum(gamma*pixel.red),q);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
SetPixelGreen(blur_image,ClampToQuantum(gamma*pixel.green),q);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
SetPixelBlue(blur_image,ClampToQuantum(gamma*pixel.blue),q);
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
SetPixelBlack(blur_image,ClampToQuantum(gamma*pixel.black),q);
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
SetPixelAlpha(blur_image,ClampToQuantum(pixel.alpha),q);
- q+=GetPixelComponents(blur_image);
- r+=GetPixelComponents(edge_image);
+ q+=GetPixelChannels(blur_image);
+ r+=GetPixelChannels(edge_image);
}
if (SyncCacheViewAuthenticPixels(blur_view,exception) == MagickFalse)
status=MagickFalse;
@@ -651,39 +651,39 @@
for (u=0; u < (ssize_t) (width-i); u++)
{
alpha=1.0;
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) &&
(image->matte != MagickFalse))
alpha=(MagickRealType) (QuantumScale*GetPixelAlpha(image,p));
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
pixel.red+=(*k)*alpha*GetPixelRed(image,p);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
pixel.green+=(*k)*alpha*GetPixelGreen(image,p);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
pixel.blue+=(*k)*alpha*GetPixelBlue(image,p);
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
pixel.black+=(*k)*alpha*GetPixelBlack(image,p);
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
pixel.alpha+=(*k)*GetPixelAlpha(image,p);
gamma+=(*k)*alpha;
k++;
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
SetPixelRed(sharp_image,ClampToQuantum(gamma*pixel.red),q);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
SetPixelGreen(sharp_image,ClampToQuantum(gamma*pixel.green),q);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
SetPixelBlue(sharp_image,ClampToQuantum(gamma*pixel.blue),q);
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
SetPixelBlack(sharp_image,ClampToQuantum(gamma*pixel.black),q);
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
SetPixelAlpha(sharp_image,ClampToQuantum(pixel.alpha),q);
- q+=GetPixelComponents(sharp_image);
- r+=GetPixelComponents(edge_image);
+ q+=GetPixelChannels(sharp_image);
+ r+=GetPixelChannels(edge_image);
}
if (SyncCacheViewAuthenticPixels(sharp_view,exception) == MagickFalse)
status=MagickFalse;
@@ -923,7 +923,7 @@
pixel=bias;
k=kernel;
kernel_pixels=p;
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) == 0) ||
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) == 0) ||
(image->matte == MagickFalse))
{
for (i=0; i < (ssize_t) width; i++)
@@ -934,18 +934,18 @@
if (image->colorspace == CMYKColorspace)
pixel.black+=(*k)*GetPixelBlack(image,kernel_pixels);
k++;
- kernel_pixels+=GetPixelComponents(image);
+ kernel_pixels+=GetPixelChannels(image);
}
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
SetPixelRed(blur_image,ClampToQuantum(pixel.red),q);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
SetPixelGreen(blur_image,ClampToQuantum(pixel.green),q);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
SetPixelBlue(blur_image,ClampToQuantum(pixel.blue),q);
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(blur_image->colorspace == CMYKColorspace))
SetPixelBlack(blur_image,ClampToQuantum(pixel.black),q);
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
{
k=kernel;
kernel_pixels=p;
@@ -953,7 +953,7 @@
{
pixel.alpha+=(*k)*GetPixelAlpha(image,kernel_pixels);
k++;
- kernel_pixels+=GetPixelComponents(image);
+ kernel_pixels+=GetPixelChannels(image);
}
SetPixelAlpha(blur_image,ClampToQuantum(pixel.alpha),q);
}
@@ -976,19 +976,19 @@
pixel.black+=(*k)*alpha*GetPixelBlack(image,kernel_pixels);
gamma+=(*k)*alpha;
k++;
- kernel_pixels+=GetPixelComponents(image);
+ kernel_pixels+=GetPixelChannels(image);
}
gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
SetPixelRed(blur_image,ClampToQuantum(gamma*pixel.red),q);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
SetPixelGreen(blur_image,ClampToQuantum(gamma*pixel.green),q);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
SetPixelBlue(blur_image,ClampToQuantum(gamma*pixel.blue),q);
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(blur_image->colorspace == CMYKColorspace))
SetPixelBlack(blur_image,ClampToQuantum(gamma*pixel.black),q);
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
{
k=kernel;
kernel_pixels=p;
@@ -996,13 +996,13 @@
{
pixel.alpha+=(*k)*GetPixelAlpha(image,kernel_pixels);
k++;
- kernel_pixels+=GetPixelComponents(image);
+ kernel_pixels+=GetPixelChannels(image);
}
SetPixelAlpha(blur_image,ClampToQuantum(pixel.alpha),q);
}
}
- p+=GetPixelComponents(image);
- q+=GetPixelComponents(blur_image);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(blur_image);
}
if (SyncCacheViewAuthenticPixels(blur_view,exception) == MagickFalse)
status=MagickFalse;
@@ -1068,7 +1068,7 @@
pixel=bias;
k=kernel;
kernel_pixels=p;
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) == 0) ||
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) == 0) ||
(blur_image->matte == MagickFalse))
{
for (i=0; i < (ssize_t) width; i++)
@@ -1079,18 +1079,18 @@
if (blur_image->colorspace == CMYKColorspace)
pixel.black+=(*k)*GetPixelBlack(blur_image,kernel_pixels);
k++;
- kernel_pixels+=GetPixelComponents(blur_image);
+ kernel_pixels+=GetPixelChannels(blur_image);
}
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
SetPixelRed(blur_image,ClampToQuantum(pixel.red),q);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
SetPixelGreen(blur_image,ClampToQuantum(pixel.green),q);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
SetPixelBlue(blur_image,ClampToQuantum(pixel.blue),q);
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(blur_image->colorspace == CMYKColorspace))
SetPixelBlack(blur_image,ClampToQuantum(pixel.black),q);
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
{
k=kernel;
kernel_pixels=p;
@@ -1098,7 +1098,7 @@
{
pixel.alpha+=(*k)*GetPixelAlpha(blur_image,kernel_pixels);
k++;
- kernel_pixels+=GetPixelComponents(blur_image);
+ kernel_pixels+=GetPixelChannels(blur_image);
}
SetPixelAlpha(blur_image,ClampToQuantum(pixel.alpha),q);
}
@@ -1121,19 +1121,19 @@
pixel.black+=(*k)*alpha*GetPixelBlack(blur_image,kernel_pixels);
gamma+=(*k)*alpha;
k++;
- kernel_pixels+=GetPixelComponents(blur_image);
+ kernel_pixels+=GetPixelChannels(blur_image);
}
gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
SetPixelRed(blur_image,ClampToQuantum(gamma*pixel.red),q);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
SetPixelGreen(blur_image,ClampToQuantum(gamma*pixel.green),q);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
SetPixelBlue(blur_image,ClampToQuantum(gamma*pixel.blue),q);
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(blur_image->colorspace == CMYKColorspace))
SetPixelBlack(blur_image,ClampToQuantum(gamma*pixel.black),q);
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
{
k=kernel;
kernel_pixels=p;
@@ -1141,13 +1141,13 @@
{
pixel.alpha+=(*k)*GetPixelAlpha(blur_image,kernel_pixels);
k++;
- kernel_pixels+=GetPixelComponents(blur_image);
+ kernel_pixels+=GetPixelChannels(blur_image);
}
SetPixelAlpha(blur_image,ClampToQuantum(pixel.alpha),q);
}
}
- p+=GetPixelComponents(blur_image);
- q+=GetPixelComponents(blur_image);
+ p+=GetPixelChannels(blur_image);
+ q+=GetPixelChannels(blur_image);
}
if (SyncCacheViewAuthenticPixels(blur_view,exception) == MagickFalse)
status=MagickFalse;
@@ -1223,9 +1223,6 @@
MagickOffsetType
progress;
- PixelInfo
- bias;
-
MagickRealType
gamma;
@@ -1312,8 +1309,6 @@
*/
status=MagickTrue;
progress=0;
- GetPixelInfo(image,&bias);
- SetPixelInfoBias(image,&bias);
image_view=AcquireCacheView(image);
convolve_view=AcquireCacheView(convolve_image);
#if defined(MAGICKCORE_OPENMP_SUPPORT)
@@ -1321,9 +1316,6 @@
#endif
for (y=0; y < (ssize_t) image->rows; y++)
{
- MagickBooleanType
- sync;
-
register const Quantum
*restrict p;
@@ -1333,6 +1325,10 @@
register ssize_t
x;
+ size_t
+ channels,
+ convolve_channels;
+
if (status == MagickFalse)
continue;
p=GetCacheViewVirtualPixels(image_view,-((ssize_t) width/2L),y-(ssize_t)
@@ -1344,131 +1340,115 @@
status=MagickFalse;
continue;
}
+ channels=GetPixelChannels(image);
+ convolve_channels=GetPixelChannels(convolve_image);
for (x=0; x < (ssize_t) image->columns; x++)
{
- PixelInfo
- pixel;
-
- register const double
- *restrict k;
-
- register const Quantum
- *restrict kernel_pixels;
-
register ssize_t
- u;
+ i;
- ssize_t
- v;
+ for (i=0; i < (ssize_t) channels; i++)
+ {
+ const Quantum
+ *restrict center;
- pixel=bias;
- k=normal_kernel;
- kernel_pixels=p;
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) == 0) ||
- (image->matte == MagickFalse))
- {
- for (v=0; v < (ssize_t) width; v++)
+ MagickRealType
+ pixel;
+
+ PixelChannel
+ channel;
+
+ PixelTrait
+ convolve_traits,
+ traits;
+
+ register const double
+ *restrict k;
+
+ register const Quantum
+ *restrict kernel_pixels;
+
+ register ssize_t
+ u;
+
+ ssize_t
+ v;
+
+ channel=GetPixelChannelMapChannel(image,i);
+ traits=GetPixelChannelMapTraits(image,i);
+ convolve_traits=GetPixelChannelMapTraits(convolve_image,channel);
+ if ((traits == UndefinedPixelTrait) ||
+ (convolve_traits == UndefinedPixelTrait))
+ continue;
+ pixel=image->bias;
+ k=normal_kernel;
+ kernel_pixels=p;
+ center=p+((image->columns+width)*width/2)*channels+i;
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) == 0) ||
+ (image->matte == MagickFalse))
{
- for (u=0; u < (ssize_t) width; u++)
+ /*
+ No alpha blending (optimized).
+ */
+ for (v=0; v < (ssize_t) width; v++)
{
- pixel.red+=(*k)*GetPixelRed(image,kernel_pixels+u*
- GetPixelComponents(image));
- pixel.green+=(*k)*GetPixelGreen(image,kernel_pixels+u*
- GetPixelComponents(image));
- pixel.blue+=(*k)*GetPixelBlue(image,kernel_pixels+u*
- GetPixelComponents(image));
- if (image->colorspace == CMYKColorspace)
- pixel.black+=(*k)*GetPixelBlack(image,kernel_pixels+u*
- GetPixelComponents(image));
- k++;
- }
- kernel_pixels+=(image->columns+width)*GetPixelComponents(image);
- }
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
- SetPixelRed(convolve_image,ClampToQuantum(pixel.red),q);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
- SetPixelGreen(convolve_image,ClampToQuantum(pixel.green),q);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
- SetPixelBlue(convolve_image,ClampToQuantum(pixel.blue),q);
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
- (image->colorspace == CMYKColorspace))
- SetPixelBlack(convolve_image,ClampToQuantum(pixel.black),q);
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
- {
- k=normal_kernel;
- kernel_pixels=p;
- for (v=0; v < (ssize_t) width; v++)
+ for (u=0; u < (ssize_t) width; u++)
{
- for (u=0; u < (ssize_t) width; u++)
- {
- pixel.alpha+=(*k)*GetPixelAlpha(image,kernel_pixels+u*
- GetPixelComponents(image));
- k++;
- }
- kernel_pixels+=(image->columns+width)*GetPixelComponents(image);
+ pixel+=(*k)*kernel_pixels[u*channels+i];
+ k++;
}
- SetPixelAlpha(convolve_image,ClampToQuantum(pixel.alpha),q);
+ kernel_pixels+=(image->columns+width)*channels;
}
- }
- else
- {
- MagickRealType
- alpha,
- gamma;
-
- gamma=0.0;
- for (v=0; v < (ssize_t) width; v++)
+ if ((convolve_traits & UpdatePixelTrait) != 0)
+ SetPixelChannel(convolve_image,channel,ClampToQuantum(pixel),q);
+ else
+ if ((convolve_traits & CopyPixelTrait) != 0)
+ SetPixelChannel(convolve_image,channel,*center,q);
+ }
+ else
{
- for (u=0; u < (ssize_t) width; u++)
+ MagickRealType
+ alpha,
+ gamma;
+
+ /*
+ Alpha blending (unoptimized).
+ */
+ gamma=0.0;
+ for (v=0; v < (ssize_t) width; v++)
{
- alpha=(MagickRealType) (QuantumScale*GetPixelAlpha(image,
- kernel_pixels+u*GetPixelComponents(image)));
- pixel.red+=(*k)*alpha*GetPixelRed(image,kernel_pixels+u*
- GetPixelComponents(image));
- pixel.green+=(*k)*alpha*GetPixelGreen(image,kernel_pixels+u*
- GetPixelComponents(image));
- pixel.blue+=(*k)*alpha*GetPixelBlue(image,kernel_pixels+u*
- GetPixelComponents(image));
- if (image->colorspace == CMYKColorspace)
- pixel.black+=(*k)*alpha*GetPixelBlack(image,kernel_pixels+u*
- GetPixelComponents(image));
- gamma+=(*k)*alpha;
- k++;
- }
- kernel_pixels+=(image->columns+width)*GetPixelComponents(image);
- }
- gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
- SetPixelRed(convolve_image,ClampToQuantum(gamma*pixel.red),q);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
- SetPixelGreen(convolve_image,ClampToQuantum(gamma*pixel.green),q);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
- SetPixelBlue(convolve_image,ClampToQuantum(gamma*pixel.blue),q);
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
- (image->colorspace == CMYKColorspace))
- SetPixelBlack(convolve_image,ClampToQuantum(gamma*pixel.black),q);
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
- {
- k=normal_kernel;
- kernel_pixels=p;
- for (v=0; v < (ssize_t) width; v++)
+ for (u=0; u < (ssize_t) width; u++)
{
- for (u=0; u < (ssize_t) width; u++)
- {
- pixel.alpha+=(*k)*GetPixelAlpha(image,kernel_pixels+u*
- GetPixelComponents(image));
- k++;
- }
- kernel_pixels+=(image->columns+width)*GetPixelComponents(image);
+ alpha=(MagickRealType) (QuantumScale*GetPixelAlpha(image,
+ kernel_pixels+u*channels));
+ if ((traits & BlendPixelTrait) != 0)
+ pixel+=(*k)*alpha*kernel_pixels[u*channels+i];
+ else
+ pixel+=(*k)*kernel_pixels[u*channels+i];
+ gamma+=(*k)*alpha;
+ k++;
}
- SetPixelAlpha(convolve_image,ClampToQuantum(pixel.alpha),q);
+ kernel_pixels+=(image->columns+width)*channels;
}
- }
- p+=GetPixelComponents(image);
- q+=GetPixelComponents(convolve_image);
+ gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
+ if ((convolve_traits & UpdatePixelTrait) != 0)
+ {
+ if ((convolve_traits & BlendPixelTrait) == 0)
+ SetPixelChannel(convolve_image,channel,ClampToQuantum(pixel),
+ q);
+ else
+ SetPixelChannel(convolve_image,channel,ClampToQuantum(gamma*
+ pixel),q);
+ }
+ else
+ if ((convolve_traits & CopyPixelTrait) != 0)
+ SetPixelChannel(convolve_image,channel,*center,q);
+ }
+ }
+ p+=channels;
+ q+=convolve_channels;
}
- sync=SyncCacheViewAuthenticPixels(convolve_view,exception);
- if (sync == MagickFalse)
+ if (SyncCacheViewAuthenticPixels(convolve_view,exception) == MagickFalse)
status=MagickFalse;
if (image->progress_monitor != (MagickProgressMonitor) NULL)
{
@@ -1728,7 +1708,7 @@
case 4: pixel[j]=GetPixelBlack(image,p); break;
default: break;
}
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
j++;
}
j++;
@@ -1766,7 +1746,7 @@
case 4: SetPixelBlack(despeckle_image,pixel[j],q); break;
default: break;
}
- q+=GetPixelComponents(despeckle_image);
+ q+=GetPixelChannels(despeckle_image);
j++;
}
sync=SyncCacheViewAuthenticPixels(despeckle_view,exception);
@@ -2111,7 +2091,7 @@
pixel=bias;
k=kernel->values;
kernel_pixels=p;
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) == 0) ||
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) == 0) ||
(image->matte == MagickFalse))
{
for (v=0; v < (ssize_t) kernel->width; v++)
@@ -2119,29 +2099,29 @@
for (u=0; u < (ssize_t) kernel->height; u++)
{
pixel.red+=(*k)*GetPixelRed(image,kernel_pixels+u*
- GetPixelComponents(image));
+ GetPixelChannels(image));
pixel.green+=(*k)*GetPixelGreen(image,kernel_pixels+u*
- GetPixelComponents(image));
+ GetPixelChannels(image));
pixel.blue+=(*k)*GetPixelBlue(image,kernel_pixels+u*
- GetPixelComponents(image));
+ GetPixelChannels(image));
if (image->colorspace == CMYKColorspace)
pixel.black+=(*k)*GetPixelBlack(image,kernel_pixels+u*
- GetPixelComponents(image));
+ GetPixelChannels(image));
k++;
}
kernel_pixels+=(image->columns+kernel->width)*
- GetPixelComponents(image);
+ GetPixelChannels(image);
}
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
SetPixelRed(filter_image,ClampToQuantum(pixel.red),q);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
SetPixelGreen(filter_image,ClampToQuantum(pixel.green),q);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
SetPixelBlue(filter_image,ClampToQuantum(pixel.blue),q);
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
SetPixelBlack(filter_image,ClampToQuantum(pixel.black),q);
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
{
k=kernel->values;
kernel_pixels=p;
@@ -2150,11 +2130,11 @@
for (u=0; u < (ssize_t) kernel->height; u++)
{
pixel.alpha+=(*k)*GetPixelRed(image,kernel_pixels+u*
- GetPixelComponents(image));
+ GetPixelChannels(image));
k++;
}
kernel_pixels+=(image->columns+kernel->width)*
- GetPixelComponents(image);
+ GetPixelChannels(image);
}
SetPixelAlpha(filter_image,ClampToQuantum(pixel.alpha),q);
}
@@ -2171,33 +2151,33 @@
for (u=0; u < (ssize_t) kernel->height; u++)
{
alpha=(MagickRealType) (QuantumScale*GetPixelAlpha(image,
- kernel_pixels+u*GetPixelComponents(image)));
+ kernel_pixels+u*GetPixelChannels(image)));
pixel.red+=(*k)*alpha*GetPixelRed(image,kernel_pixels+u*
- GetPixelComponents(image));
+ GetPixelChannels(image));
pixel.green+=(*k)*alpha*GetPixelGreen(image,kernel_pixels+u*
- GetPixelComponents(image));
+ GetPixelChannels(image));
pixel.blue+=(*k)*alpha*GetPixelBlue(image,kernel_pixels+u*
- GetPixelComponents(image));
+ GetPixelChannels(image));
if (image->colorspace == CMYKColorspace)
pixel.black+=(*k)*alpha*GetPixelBlack(image,kernel_pixels+u*
- GetPixelComponents(image));
+ GetPixelChannels(image));
gamma+=(*k)*alpha;
k++;
}
kernel_pixels+=(image->columns+kernel->width)*
- GetPixelComponents(image);
+ GetPixelChannels(image);
}
gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
SetPixelRed(filter_image,ClampToQuantum(gamma*pixel.red),q);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
SetPixelGreen(filter_image,ClampToQuantum(gamma*pixel.green),q);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
SetPixelBlue(filter_image,ClampToQuantum(gamma*pixel.blue),q);
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
SetPixelBlack(filter_image,ClampToQuantum(gamma*pixel.black),q);
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
{
k=kernel->values;
kernel_pixels=p;
@@ -2206,17 +2186,17 @@
for (u=0; u < (ssize_t) kernel->height; u++)
{
pixel.alpha+=(*k)*GetPixelAlpha(image,kernel_pixels+u*
- GetPixelComponents(image));
+ GetPixelChannels(image));
k++;
}
kernel_pixels+=(image->columns+kernel->width)*
- GetPixelComponents(image);
+ GetPixelChannels(image);
}
SetPixelAlpha(filter_image,ClampToQuantum(pixel.alpha),q);
}
}
- p+=GetPixelComponents(image);
- q+=GetPixelComponents(filter_image);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(filter_image);
}
sync=SyncCacheViewAuthenticPixels(filter_view,exception);
if (sync == MagickFalse)
@@ -2504,7 +2484,7 @@
k=kernel;
qixel=bias;
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) == 0) || (image->matte == MagickFalse))
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) == 0) || (image->matte == MagickFalse))
{
for (i=0; i < (ssize_t) width; i++)
{
@@ -2518,20 +2498,20 @@
qixel.black+=(*k)*pixel.black;
k++;
}
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
SetPixelRed(blur_image,
ClampToQuantum(qixel.red),q);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
SetPixelGreen(blur_image,
ClampToQuantum(qixel.green),q);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
SetPixelBlue(blur_image,
ClampToQuantum(qixel.blue),q);
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
SetPixelBlack(blur_image,
ClampToQuantum(qixel.black),q);
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
SetPixelAlpha(blur_image,
ClampToQuantum(qixel.alpha),q);
}
@@ -2558,24 +2538,24 @@
k++;
}
gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
SetPixelRed(blur_image,
ClampToQuantum(gamma*qixel.red),q);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
SetPixelGreen(blur_image,
ClampToQuantum(gamma*qixel.green),q);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
SetPixelBlue(blur_image,
ClampToQuantum(gamma*qixel.blue),q);
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
SetPixelBlack(blur_image,
ClampToQuantum(gamma*qixel.black),q);
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
SetPixelAlpha(blur_image,
ClampToQuantum(qixel.alpha),q);
}
- q+=GetPixelComponents(blur_image);
+ q+=GetPixelChannels(blur_image);
}
if (SyncCacheViewAuthenticPixels(blur_view,exception) == MagickFalse)
status=MagickFalse;
@@ -3294,7 +3274,7 @@
}
normalize=0.0;
qixel=bias;
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) == 0) || (image->matte == MagickFalse))
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) == 0) || (image->matte == MagickFalse))
{
for (i=0; i < (ssize_t) n; i+=(ssize_t) step)
{
@@ -3312,20 +3292,20 @@
}
normalize=1.0/(fabs((double) normalize) <= MagickEpsilon ? 1.0 :
normalize);
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
SetPixelRed(blur_image,
ClampToQuantum(normalize*qixel.red),q);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
SetPixelGreen(blur_image,
ClampToQuantum(normalize*qixel.green),q);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
SetPixelBlue(blur_image,
ClampToQuantum(normalize*qixel.blue),q);
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
SetPixelBlack(blur_image,
ClampToQuantum(normalize*qixel.black),q);
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
SetPixelAlpha(blur_image,
ClampToQuantum(normalize*qixel.alpha),q);
}
@@ -3356,24 +3336,24 @@
gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
normalize=1.0/(fabs((double) normalize) <= MagickEpsilon ? 1.0 :
normalize);
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
SetPixelRed(blur_image,
ClampToQuantum(gamma*qixel.red),q);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
SetPixelGreen(blur_image,
ClampToQuantum(gamma*qixel.green),q);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
SetPixelBlue(blur_image,
ClampToQuantum(gamma*qixel.blue),q);
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
SetPixelBlack(blur_image,
ClampToQuantum(gamma*qixel.black),q);
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
SetPixelAlpha(blur_image,
ClampToQuantum(normalize*qixel.alpha),q);
}
- q+=GetPixelComponents(blur_image);
+ q+=GetPixelChannels(blur_image);
}
if (SyncCacheViewAuthenticPixels(blur_view,exception) == MagickFalse)
status=MagickFalse;
@@ -3595,25 +3575,25 @@
k=kernel;
gamma=0.0;
j=0;
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) == 0) || (image->matte == MagickFalse))
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) == 0) || (image->matte == MagickFalse))
{
for (v=0; v < (ssize_t) width; v++)
{
for (u=0; u < (ssize_t) width; u++)
{
- contrast=GetPixelIntensity(image,p+(u+j)*GetPixelComponents(image))-
+ contrast=GetPixelIntensity(image,p+(u+j)*GetPixelChannels(image))-
(double) GetPixelIntensity(blur_image,q);
if (fabs(contrast) < threshold)
{
pixel.red+=(*k)*
- GetPixelRed(image,p+(u+j)*GetPixelComponents(image));
+ GetPixelRed(image,p+(u+j)*GetPixelChannels(image));
pixel.green+=(*k)*
- GetPixelGreen(image,p+(u+j)*GetPixelComponents(image));
+ GetPixelGreen(image,p+(u+j)*GetPixelChannels(image));
pixel.blue+=(*k)*
- GetPixelBlue(image,p+(u+j)*GetPixelComponents(image));
+ GetPixelBlue(image,p+(u+j)*GetPixelChannels(image));
if (image->colorspace == CMYKColorspace)
pixel.black+=(*k)*
- GetPixelBlack(image,p+(u+j)*GetPixelComponents(image));
+ GetPixelBlack(image,p+(u+j)*GetPixelChannels(image));
gamma+=(*k);
k++;
}
@@ -3623,17 +3603,17 @@
if (gamma != 0.0)
{
gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
SetPixelRed(blur_image,ClampToQuantum(gamma*pixel.red),q);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
SetPixelGreen(blur_image,ClampToQuantum(gamma*pixel.green),q);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
SetPixelBlue(blur_image,ClampToQuantum(gamma*pixel.blue),q);
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
SetPixelBlack(blur_image,ClampToQuantum(gamma*pixel.black),q);
}
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
{
gamma=0.0;
j=0;
@@ -3642,12 +3622,12 @@
for (u=0; u < (ssize_t) width; u++)
{
contrast=GetPixelIntensity(image,p+(u+j)*
- GetPixelComponents(image))-(double)
+ GetPixelChannels(image))-(double)
GetPixelIntensity(blur_image,q);
if (fabs(contrast) < threshold)
{
pixel.alpha+=(*k)*
- GetPixelAlpha(image,p+(u+j)*GetPixelComponents(image));
+ GetPixelAlpha(image,p+(u+j)*GetPixelChannels(image));
gamma+=(*k);
k++;
}
@@ -3672,23 +3652,23 @@
for (u=0; u < (ssize_t) width; u++)
{
contrast=GetPixelIntensity(image,p+(u+j)*
- GetPixelComponents(image))-(double)
+ GetPixelChannels(image))-(double)
GetPixelIntensity(blur_image,q);
if (fabs(contrast) < threshold)
{
alpha=(MagickRealType) (QuantumScale*
- GetPixelAlpha(image,p+(u+j)*GetPixelComponents(image)));
+ GetPixelAlpha(image,p+(u+j)*GetPixelChannels(image)));
pixel.red+=(*k)*alpha*
- GetPixelRed(image,p+(u+j)*GetPixelComponents(image));
+ GetPixelRed(image,p+(u+j)*GetPixelChannels(image));
pixel.green+=(*k)*alpha*GetPixelGreen(image,p+(u+j)*
- GetPixelComponents(image));
+ GetPixelChannels(image));
pixel.blue+=(*k)*alpha*GetPixelBlue(image,p+(u+j)*
- GetPixelComponents(image));
+ GetPixelChannels(image));
pixel.alpha+=(*k)*GetPixelAlpha(image,p+(u+j)*
- GetPixelComponents(image));
+ GetPixelChannels(image));
if (image->colorspace == CMYKColorspace)
pixel.black+=(*k)*GetPixelBlack(image,p+(u+j)*
- GetPixelComponents(image));
+ GetPixelChannels(image));
gamma+=(*k)*alpha;
k++;
}
@@ -3698,17 +3678,17 @@
if (gamma != 0.0)
{
gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
SetPixelRed(blur_image,ClampToQuantum(gamma*pixel.red),q);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
SetPixelGreen(blur_image,ClampToQuantum(gamma*pixel.green),q);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
SetPixelBlue(blur_image,ClampToQuantum(gamma*pixel.blue),q);
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
SetPixelBlack(blur_image,ClampToQuantum(gamma*pixel.black),q);
}
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
{
gamma=0.0;
j=0;
@@ -3717,12 +3697,12 @@
for (u=0; u < (ssize_t) width; u++)
{
contrast=GetPixelIntensity(image,p+(u+j)*
- GetPixelComponents(image))-(double)
+ GetPixelChannels(image))-(double)
GetPixelIntensity(blur_image,q);
if (fabs(contrast) < threshold)
{
pixel.alpha+=(*k)*
- GetPixelAlpha(image,p+(u+j)*GetPixelComponents(image));
+ GetPixelAlpha(image,p+(u+j)*GetPixelChannels(image));
gamma+=(*k);
k++;
}
@@ -3737,8 +3717,8 @@
}
}
}
- p+=GetPixelComponents(image);
- q+=GetPixelComponents(blur_image);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(blur_image);
}
sync=SyncCacheViewAuthenticPixels(blur_view,exception);
if (sync == MagickFalse)
@@ -3894,26 +3874,26 @@
Shade this row of pixels.
*/
normal.z=2.0*(double) QuantumRange; /* constant Z of surface normal */
- s0=p+GetPixelComponents(image);
- s1=s0+(image->columns+2)*GetPixelComponents(image);
- s2=s1+(image->columns+2)*GetPixelComponents(image);
+ s0=p+GetPixelChannels(image);
+ s1=s0+(image->columns+2)*GetPixelChannels(image);
+ s2=s1+(image->columns+2)*GetPixelChannels(image);
for (x=0; x < (ssize_t) image->columns; x++)
{
/*
Determine the surface normal and compute shading.
*/
- normal.x=(double) (GetPixelIntensity(image,s0-GetPixelComponents(image))+
- GetPixelIntensity(image,s1-GetPixelComponents(image))+
- GetPixelIntensity(image,s2-GetPixelComponents(image))-
- GetPixelIntensity(image,s0+GetPixelComponents(image))-
- GetPixelIntensity(image,s1+GetPixelComponents(image))-
- GetPixelIntensity(image,s2+GetPixelComponents(image)));
- normal.y=(double) (GetPixelIntensity(image,s2-GetPixelComponents(image))+
+ normal.x=(double) (GetPixelIntensity(image,s0-GetPixelChannels(image))+
+ GetPixelIntensity(image,s1-GetPixelChannels(image))+
+ GetPixelIntensity(image,s2-GetPixelChannels(image))-
+ GetPixelIntensity(image,s0+GetPixelChannels(image))-
+ GetPixelIntensity(image,s1+GetPixelChannels(image))-
+ GetPixelIntensity(image,s2+GetPixelChannels(image)));
+ normal.y=(double) (GetPixelIntensity(image,s2-GetPixelChannels(image))+
GetPixelIntensity(image,s2)+
- GetPixelIntensity(image,s2+GetPixelComponents(image))-
- GetPixelIntensity(image,s0-GetPixelComponents(image))-
+ GetPixelIntensity(image,s2+GetPixelChannels(image))-
+ GetPixelIntensity(image,s0-GetPixelChannels(image))-
GetPixelIntensity(image,s0)-
- GetPixelIntensity(image,s0+GetPixelComponents(image)));
+ GetPixelIntensity(image,s0+GetPixelChannels(image)));
if ((normal.x == 0.0) && (normal.y == 0.0))
shade=light.z;
else
@@ -3944,10 +3924,10 @@
GetPixelBlue(image,s1)),q);
}
SetPixelAlpha(shade_image,GetPixelAlpha(image,s1),q);
- s0+=GetPixelComponents(image);
- s1+=GetPixelComponents(image);
- s2+=GetPixelComponents(image);
- q+=GetPixelComponents(shade_image);
+ s0+=GetPixelChannels(image);
+ s1+=GetPixelChannels(image);
+ s2+=GetPixelChannels(image);
+ q+=GetPixelChannels(shade_image);
}
if (SyncCacheViewAuthenticPixels(shade_view,exception) == MagickFalse)
status=MagickFalse;
@@ -4180,7 +4160,7 @@
random_info[id])-0.5),(double) y+width*(GetPseudoRandomValue(
random_info[id])-0.5),&pixel,exception);
SetPixelPixelInfo(spread_image,&pixel,q);
- q+=GetPixelComponents(spread_image);
+ q+=GetPixelChannels(spread_image);
}
if (SyncCacheViewAuthenticPixels(spread_view,exception) == MagickFalse)
status=MagickFalse;
@@ -4944,12 +4924,12 @@
for (v=0; v < (ssize_t) StatisticHeight; v++)
{
for (u=0; u < (ssize_t) StatisticWidth; u++)
- InsertPixelList(image,r+u*GetPixelComponents(image),pixel_list[id]);
- r+=(image->columns+StatisticWidth)*GetPixelComponents(image);
+ InsertPixelList(image,r+u*GetPixelChannels(image),pixel_list[id]);
+ r+=(image->columns+StatisticWidth)*GetPixelChannels(image);
}
GetPixelInfo(image,&pixel);
SetPixelInfo(image,p+(StatisticWidth*StatisticHeight/2)*
- GetPixelComponents(image),&pixel);
+ GetPixelChannels(image),&pixel);
switch (type)
{
case GradientStatistic:
@@ -5005,20 +4985,20 @@
break;
}
}
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
SetPixelRed(statistic_image,ClampToQuantum(pixel.red),q);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
SetPixelGreen(statistic_image,ClampToQuantum(pixel.green),q);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
SetPixelBlue(statistic_image,ClampToQuantum(pixel.blue),q);
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
SetPixelBlack(statistic_image,ClampToQuantum(pixel.black),q);
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) &&
(image->matte != MagickFalse))
SetPixelAlpha(statistic_image,ClampToQuantum(pixel.alpha),q);
- p+=GetPixelComponents(image);
- q+=GetPixelComponents(statistic_image);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(statistic_image);
}
if (SyncCacheViewAuthenticPixels(statistic_view,exception) == MagickFalse)
status=MagickFalse;
@@ -5156,7 +5136,7 @@
pixel=bias;
for (x=0; x < (ssize_t) image->columns; x++)
{
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
{
pixel.red=GetPixelRed(image,p)-(MagickRealType) GetPixelRed(image,q);
if (fabs(2.0*pixel.red) < quantum_threshold)
@@ -5165,7 +5145,7 @@
pixel.red=(MagickRealType) GetPixelRed(image,p)+(pixel.red*amount);
SetPixelRed(unsharp_image,ClampToQuantum(pixel.red),q);
}
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
{
pixel.green=GetPixelGreen(image,p)-
(MagickRealType) GetPixelGreen(image,q);
@@ -5179,7 +5159,7 @@
SetPixelGreen(unsharp_image,
ClampToQuantum(pixel.green),q);
}
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
{
pixel.blue=GetPixelBlue(image,p)-
(MagickRealType) GetPixelBlue(image,q);
@@ -5192,7 +5172,7 @@
SetPixelBlue(unsharp_image,
ClampToQuantum(pixel.blue),q);
}
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
{
pixel.black=GetPixelBlack(image,p)-
@@ -5207,7 +5187,7 @@
SetPixelBlack(unsharp_image,
ClampToQuantum(pixel.black),q);
}
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
{
pixel.alpha=GetPixelAlpha(image,p)-
(MagickRealType) GetPixelAlpha(image,q);
@@ -5220,8 +5200,8 @@
SetPixelAlpha(unsharp_image,
ClampToQuantum(pixel.alpha),q);
}
- p+=GetPixelComponents(image);
- q+=GetPixelComponents(unsharp_image);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(unsharp_image);
}
if (SyncCacheViewAuthenticPixels(unsharp_view,exception) == MagickFalse)
status=MagickFalse;
diff --git a/MagickCore/enhance.c b/MagickCore/enhance.c
index 2b43895..c078ef0 100644
--- a/MagickCore/enhance.c
+++ b/MagickCore/enhance.c
@@ -121,47 +121,47 @@
Auto-gamma each channel separately.
*/
status=MagickTrue;
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
{
- PushPixelComponentMap(image,RedChannel);
+ PushPixelChannelMap(image,RedChannel);
(void) GetImageMean(image,&mean,&sans,&image->exception);
gamma=log(mean*QuantumScale)/log_mean;
status=status && LevelImage(image,0.0,(double) QuantumRange,gamma);
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
}
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
{
- PushPixelComponentMap(image,GreenChannel);
+ PushPixelChannelMap(image,GreenChannel);
(void) GetImageMean(image,&mean,&sans,&image->exception);
gamma=log(mean*QuantumScale)/log_mean;
status=status && LevelImage(image,0.0,(double) QuantumRange,gamma);
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
}
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
{
- PushPixelComponentMap(image,BlueChannel);
+ PushPixelChannelMap(image,BlueChannel);
(void) GetImageMean(image,&mean,&sans,&image->exception);
gamma=log(mean*QuantumScale)/log_mean;
status=status && LevelImage(image,0.0,(double) QuantumRange,gamma);
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
}
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
{
- PushPixelComponentMap(image,BlackChannel);
+ PushPixelChannelMap(image,BlackChannel);
(void) GetImageMean(image,&mean,&sans,&image->exception);
gamma=log(mean*QuantumScale)/log_mean;
status=status && LevelImage(image,0.0,(double) QuantumRange,gamma);
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
}
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) &&
(image->matte == MagickTrue))
{
- PushPixelComponentMap(image,AlphaChannel);
+ PushPixelChannelMap(image,AlphaChannel);
(void) GetImageMean(image,&mean,&sans,&image->exception);
gamma=log(mean*QuantumScale)/log_mean;
status=status && LevelImage(image,0.0,(double) QuantumRange,gamma);
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
}
return(status != 0 ? MagickTrue : MagickFalse);
}
@@ -620,7 +620,7 @@
(cdl_map[ScaleQuantumToMap(GetPixelGreen(image,q))].green-luma)),q);
SetPixelBlue(image,ClampToQuantum(luma+color_correction.saturation*
(cdl_map[ScaleQuantumToMap(GetPixelBlue(image,q))].blue-luma)),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -687,11 +687,11 @@
*/
MagickExport MagickBooleanType ClutImage(Image *image,const Image *clut_image)
{
-#define ClampAlphaPixelComponent(pixel) ClampToQuantum((pixel)->alpha)
-#define ClampBlackPixelComponent(pixel) ClampToQuantum((pixel)->black)
-#define ClampBluePixelComponent(pixel) ClampToQuantum((pixel)->blue)
-#define ClampGreenPixelComponent(pixel) ClampToQuantum((pixel)->green)
-#define ClampRedPixelComponent(pixel) ClampToQuantum((pixel)->red)
+#define ClampAlphaPixelChannel(pixel) ClampToQuantum((pixel)->alpha)
+#define ClampBlackPixelChannel(pixel) ClampToQuantum((pixel)->black)
+#define ClampBluePixelChannel(pixel) ClampToQuantum((pixel)->blue)
+#define ClampGreenPixelChannel(pixel) ClampToQuantum((pixel)->green)
+#define ClampRedPixelChannel(pixel) ClampToQuantum((pixel)->red)
#define ClutImageTag "Clut/Image"
CacheView
@@ -776,33 +776,33 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
SetPixelInfo(image,q,&pixel);
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
- SetPixelRed(image,ClampRedPixelComponent(clut_map+
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
+ SetPixelRed(image,ClampRedPixelChannel(clut_map+
ScaleQuantumToMap(GetPixelRed(image,q))),q);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
- SetPixelGreen(image,ClampGreenPixelComponent(clut_map+
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
+ SetPixelGreen(image,ClampGreenPixelChannel(clut_map+
ScaleQuantumToMap(GetPixelGreen(image,q))),q);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
- SetPixelBlue(image,ClampBluePixelComponent(clut_map+
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
+ SetPixelBlue(image,ClampBluePixelChannel(clut_map+
ScaleQuantumToMap(GetPixelBlue(image,q))),q);
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
- SetPixelBlack(image,ClampBlackPixelComponent(clut_map+
+ SetPixelBlack(image,ClampBlackPixelChannel(clut_map+
ScaleQuantumToMap(GetPixelBlack(image,q))),q);
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
{
if (clut_image->matte == MagickFalse)
SetPixelAlpha(image,GetPixelInfoIntensity(clut_map+
ScaleQuantumToMap((Quantum) GetPixelAlpha(image,q))),q);
else
if (image->matte == MagickFalse)
- SetPixelAlpha(image,ClampAlphaPixelComponent(clut_map+
+ SetPixelAlpha(image,ClampAlphaPixelChannel(clut_map+
ScaleQuantumToMap((Quantum) GetPixelInfoIntensity(&pixel))),q);
else
- SetPixelAlpha(image,ClampAlphaPixelComponent(clut_map+
+ SetPixelAlpha(image,ClampAlphaPixelChannel(clut_map+
ScaleQuantumToMap(GetPixelAlpha(image,q))),q);
}
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -822,7 +822,7 @@
image_view=DestroyCacheView(image_view);
clut_map=(PixelInfo *) RelinquishMagickMemory(clut_map);
if ((clut_image->matte != MagickFalse) &&
- ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0))
+ ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0))
(void) SetImageAlphaChannel(image,ActivateAlphaChannel);
return(status);
}
@@ -962,7 +962,7 @@
SetPixelRed(image,red,q);
SetPixelGreen(image,green,q);
SetPixelBlue(image,blue,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -1100,23 +1100,23 @@
histogram[ScaleQuantumToMap(intensity)].green++;
histogram[ScaleQuantumToMap(intensity)].blue++;
histogram[ScaleQuantumToMap(intensity)].black++;
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
else
for (x=0; x < (ssize_t) image->columns; x++)
{
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
histogram[ScaleQuantumToMap(GetPixelRed(image,p))].red++;
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
histogram[ScaleQuantumToMap(GetPixelGreen(image,p))].green++;
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
histogram[ScaleQuantumToMap(GetPixelBlue(image,p))].blue++;
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
histogram[ScaleQuantumToMap(GetPixelBlack(image,p))].black++;
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
histogram[ScaleQuantumToMap(GetPixelAlpha(image,p))].alpha++;
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
/*
@@ -1124,7 +1124,7 @@
*/
black.red=0.0;
white.red=MaxRange(QuantumRange);
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
{
intensity=0.0;
for (i=0; i <= (ssize_t) MaxMap; i++)
@@ -1145,7 +1145,7 @@
}
black.green=0.0;
white.green=MaxRange(QuantumRange);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
{
intensity=0.0;
for (i=0; i <= (ssize_t) MaxMap; i++)
@@ -1166,7 +1166,7 @@
}
black.blue=0.0;
white.blue=MaxRange(QuantumRange);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
{
intensity=0.0;
for (i=0; i <= (ssize_t) MaxMap; i++)
@@ -1187,7 +1187,7 @@
}
black.alpha=0.0;
white.alpha=MaxRange(QuantumRange);
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
{
intensity=0.0;
for (i=0; i <= (ssize_t) MaxMap; i++)
@@ -1208,7 +1208,7 @@
}
black.black=0.0;
white.black=MaxRange(QuantumRange);
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) && (image->colorspace == CMYKColorspace))
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) && (image->colorspace == CMYKColorspace))
{
intensity=0.0;
for (i=0; i <= (ssize_t) MaxMap; i++)
@@ -1237,7 +1237,7 @@
#endif
for (i=0; i <= (ssize_t) MaxMap; i++)
{
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
{
if (i < (ssize_t) black.red)
stretch_map[i].red=0.0;
@@ -1249,7 +1249,7 @@
stretch_map[i].red=(MagickRealType) ScaleMapToQuantum(
(MagickRealType) (MaxMap*(i-black.red)/(white.red-black.red)));
}
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
{
if (i < (ssize_t) black.green)
stretch_map[i].green=0.0;
@@ -1262,7 +1262,7 @@
(MagickRealType) (MaxMap*(i-black.green)/(white.green-
black.green)));
}
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
{
if (i < (ssize_t) black.blue)
stretch_map[i].blue=0.0;
@@ -1275,7 +1275,7 @@
(MagickRealType) (MaxMap*(i-black.blue)/(white.blue-
black.blue)));
}
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
{
if (i < (ssize_t) black.alpha)
stretch_map[i].alpha=0.0;
@@ -1288,7 +1288,7 @@
(MagickRealType) (MaxMap*(i-black.alpha)/(white.alpha-
black.alpha)));
}
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
{
if (i < (ssize_t) black.black)
@@ -1306,7 +1306,7 @@
/*
Stretch the image.
*/
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) || (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) || (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace)))
image->storage_class=DirectClass;
if (image->storage_class == PseudoClass)
@@ -1319,25 +1319,25 @@
#endif
for (i=0; i < (ssize_t) image->colors; i++)
{
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
{
if (black.red != white.red)
image->colormap[i].red=ClampToQuantum(stretch_map[
ScaleQuantumToMap(image->colormap[i].red)].red);
}
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
{
if (black.green != white.green)
image->colormap[i].green=ClampToQuantum(stretch_map[
ScaleQuantumToMap(image->colormap[i].green)].green);
}
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
{
if (black.blue != white.blue)
image->colormap[i].blue=ClampToQuantum(stretch_map[
ScaleQuantumToMap(image->colormap[i].blue)].blue);
}
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
{
if (black.alpha != white.alpha)
image->colormap[i].alpha=ClampToQuantum(stretch_map[
@@ -1371,38 +1371,38 @@
}
for (x=0; x < (ssize_t) image->columns; x++)
{
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
{
if (black.red != white.red)
SetPixelRed(image,ClampToQuantum(stretch_map[ScaleQuantumToMap(
GetPixelRed(image,q))].red),q);
}
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
{
if (black.green != white.green)
SetPixelGreen(image,ClampToQuantum(stretch_map[ScaleQuantumToMap(
GetPixelGreen(image,q))].green),q);
}
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
{
if (black.blue != white.blue)
SetPixelBlue(image,ClampToQuantum(stretch_map[ScaleQuantumToMap(
GetPixelBlue(image,q))].blue),q);
}
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
{
if (black.black != white.black)
SetPixelBlack(image,ClampToQuantum(stretch_map[ScaleQuantumToMap(
GetPixelBlack(image,q))].black),q);
}
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
{
if (black.alpha != white.alpha)
SetPixelAlpha(image,ClampToQuantum(stretch_map[ScaleQuantumToMap(
GetPixelAlpha(image,q))].alpha),q);
}
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -1599,8 +1599,8 @@
(total_weight/2)-1)/total_weight),q);
SetPixelAlpha(enhance_image,(Quantum) ((aggregate.alpha+
(total_weight/2)-1)/total_weight),q);
- p+=GetPixelComponents(image);
- q+=GetPixelComponents(enhance_image);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(enhance_image);
}
if (SyncCacheViewAuthenticPixels(enhance_view,exception) == MagickFalse)
status=MagickFalse;
@@ -1719,18 +1719,18 @@
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
histogram[ScaleQuantumToMap(GetPixelRed(image,p))].red++;
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
histogram[ScaleQuantumToMap(GetPixelGreen(image,p))].green++;
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
histogram[ScaleQuantumToMap(GetPixelBlue(image,p))].blue++;
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
histogram[ScaleQuantumToMap(GetPixelBlack(image,p))].black++;
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
histogram[ScaleQuantumToMap(GetPixelAlpha(image,p))].alpha++;
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
/*
@@ -1739,16 +1739,16 @@
(void) ResetMagickMemory(&intensity,0,sizeof(intensity));
for (i=0; i <= (ssize_t) MaxMap; i++)
{
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
intensity.red+=histogram[i].red;
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
intensity.green+=histogram[i].green;
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
intensity.blue+=histogram[i].blue;
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
intensity.black+=histogram[i].black;
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
intensity.alpha+=histogram[i].alpha;
map[i]=intensity;
}
@@ -1760,24 +1760,24 @@
#endif
for (i=0; i <= (ssize_t) MaxMap; i++)
{
- if (((GetPixelRedTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelRedTraits(image) & UpdatePixelTrait) != 0) &&
(white.red != black.red))
equalize_map[i].red=(MagickRealType) ScaleMapToQuantum((MagickRealType)
((MaxMap*(map[i].red-black.red))/(white.red-black.red)));
- if (((GetPixelGreenTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0) &&
(white.green != black.green))
equalize_map[i].green=(MagickRealType) ScaleMapToQuantum((MagickRealType)
((MaxMap*(map[i].green-black.green))/(white.green-black.green)));
- if (((GetPixelBlueTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0) &&
(white.blue != black.blue))
equalize_map[i].blue=(MagickRealType) ScaleMapToQuantum((MagickRealType)
((MaxMap*(map[i].blue-black.blue))/(white.blue-black.blue)));
- if ((((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if ((((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace)) &&
(white.black != black.black))
equalize_map[i].black=(MagickRealType) ScaleMapToQuantum((MagickRealType)
((MaxMap*(map[i].black-black.black))/(white.black-black.black)));
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) &&
(white.alpha != black.alpha))
equalize_map[i].alpha=(MagickRealType) ScaleMapToQuantum(
(MagickRealType) ((MaxMap*(map[i].alpha-black.alpha))/
@@ -1795,19 +1795,19 @@
#endif
for (i=0; i < (ssize_t) image->colors; i++)
{
- if (((GetPixelRedTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelRedTraits(image) & UpdatePixelTrait) != 0) &&
(white.red != black.red))
image->colormap[i].red=ClampToQuantum(equalize_map[
ScaleQuantumToMap(image->colormap[i].red)].red);
- if (((GetPixelGreenTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0) &&
(white.green != black.green))
image->colormap[i].green=ClampToQuantum(equalize_map[
ScaleQuantumToMap(image->colormap[i].green)].green);
- if (((GetPixelBlueTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0) &&
(white.blue != black.blue))
image->colormap[i].blue=ClampToQuantum(equalize_map[
ScaleQuantumToMap(image->colormap[i].blue)].blue);
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) &&
(white.alpha != black.alpha))
image->colormap[i].alpha=ClampToQuantum(equalize_map[
ScaleQuantumToMap(image->colormap[i].alpha)].alpha);
@@ -1841,28 +1841,28 @@
}
for (x=0; x < (ssize_t) image->columns; x++)
{
- if (((GetPixelRedTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelRedTraits(image) & UpdatePixelTrait) != 0) &&
(white.red != black.red))
SetPixelRed(image,ClampToQuantum(equalize_map[
ScaleQuantumToMap(GetPixelRed(image,q))].red),q);
- if (((GetPixelGreenTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0) &&
(white.green != black.green))
SetPixelGreen(image,ClampToQuantum(equalize_map[
ScaleQuantumToMap(GetPixelGreen(image,q))].green),q);
- if (((GetPixelBlueTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0) &&
(white.blue != black.blue))
SetPixelBlue(image,ClampToQuantum(equalize_map[
ScaleQuantumToMap(GetPixelBlue(image,q))].blue),q);
- if ((((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if ((((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace)) &&
(white.black != black.black))
SetPixelBlack(image,ClampToQuantum(equalize_map[
ScaleQuantumToMap(GetPixelBlack(image,q))].black),q);
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) &&
(white.alpha != black.alpha))
SetPixelAlpha(image,ClampToQuantum(equalize_map[
ScaleQuantumToMap(GetPixelAlpha(image,q))].alpha),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -1973,16 +1973,16 @@
#endif
for (i=0; i < (ssize_t) image->colors; i++)
{
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
image->colormap[i].red=gamma_map[
ScaleQuantumToMap(image->colormap[i].red)];
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
image->colormap[i].green=gamma_map[
ScaleQuantumToMap(image->colormap[i].green)];
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
image->colormap[i].blue=gamma_map[
ScaleQuantumToMap(image->colormap[i].blue)];
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
image->colormap[i].alpha=gamma_map[
ScaleQuantumToMap(image->colormap[i].alpha)];
}
@@ -2026,16 +2026,16 @@
}
else
{
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
SetPixelRed(image,gamma_map[ScaleQuantumToMap(
GetPixelRed(image,q))],q);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
SetPixelGreen(image,gamma_map[
ScaleQuantumToMap(GetPixelGreen(image,q))],q);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
SetPixelBlue(image,gamma_map[
ScaleQuantumToMap(GetPixelBlue(image,q))],q);
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
{
if (image->matte == MagickFalse)
SetPixelAlpha(image,gamma_map[
@@ -2045,9 +2045,9 @@
ScaleQuantumToMap(GetPixelAlpha(image,q))],q);
}
}
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
for (x=0; x < (ssize_t) image->columns; x++)
SetPixelBlack(image,gamma_map[ScaleQuantumToMap(
@@ -2240,23 +2240,23 @@
pixel2.alpha,point.y,&pixel4);
CompositePixelInfoAreaBlend(&pixel3,pixel3.alpha,&pixel4,
pixel4.alpha,point.z,&pixel);
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
SetPixelRed(image,
ClampToQuantum(pixel.red),q);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
SetPixelGreen(image,
ClampToQuantum(pixel.green),q);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
SetPixelBlue(image,
ClampToQuantum(pixel.blue),q);
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
SetPixelBlack(image,
ClampToQuantum(pixel.black),q);
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) && (image->matte != MagickFalse))
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) && (image->matte != MagickFalse))
SetPixelAlpha(image,
ClampToQuantum(pixel.alpha),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -2363,13 +2363,13 @@
/*
Level colormap.
*/
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
image->colormap[i].red=LevelQuantum(image->colormap[i].red);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
image->colormap[i].green=LevelQuantum(image->colormap[i].green);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
image->colormap[i].blue=LevelQuantum(image->colormap[i].blue);
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
image->colormap[i].alpha=LevelQuantum(image->colormap[i].alpha);
}
/*
@@ -2400,24 +2400,24 @@
}
for (x=0; x < (ssize_t) image->columns; x++)
{
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
SetPixelRed(image,LevelQuantum(
GetPixelRed(image,q)),q);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
SetPixelGreen(image,
LevelQuantum(GetPixelGreen(image,q)),q);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
SetPixelBlue(image,
LevelQuantum(GetPixelBlue(image,q)),q);
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) &&
(image->matte == MagickTrue))
SetPixelAlpha(image,
LevelQuantum(GetPixelAlpha(image,q)),q);
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
SetPixelBlack(image,
LevelQuantum(GetPixelBlack(image,q)),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -2520,13 +2520,13 @@
/*
Level colormap.
*/
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
image->colormap[i].red=LevelizeValue(image->colormap[i].red);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
image->colormap[i].green=LevelizeValue(image->colormap[i].green);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
image->colormap[i].blue=LevelizeValue(image->colormap[i].blue);
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
image->colormap[i].alpha=LevelizeValue(image->colormap[i].alpha);
}
/*
@@ -2557,19 +2557,19 @@
}
for (x=0; x < (ssize_t) image->columns; x++)
{
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
SetPixelRed(image,LevelizeValue(GetPixelRed(image,q)),q);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
SetPixelGreen(image,LevelizeValue(GetPixelGreen(image,q)),q);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
SetPixelBlue(image,LevelizeValue(GetPixelBlue(image,q)),q);
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
SetPixelBlack(image,LevelizeValue(GetPixelBlack(image,q)),q);
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) &&
(image->matte == MagickTrue))
SetPixelAlpha(image,LevelizeValue(GetPixelAlpha(image,q)),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -2646,75 +2646,75 @@
status=MagickFalse;
if (invert == MagickFalse)
{
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
{
- PushPixelComponentMap(image,RedChannel);
+ PushPixelChannelMap(image,RedChannel);
status|=LevelImage(image,black_color->red,white_color->red,1.0);
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
}
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
{
- PushPixelComponentMap(image,GreenChannel);
+ PushPixelChannelMap(image,GreenChannel);
status|=LevelImage(image,black_color->green,white_color->green,1.0);
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
}
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
{
- PushPixelComponentMap(image,BlueChannel);
+ PushPixelChannelMap(image,BlueChannel);
status|=LevelImage(image,black_color->blue,white_color->blue,1.0);
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
}
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
{
- PushPixelComponentMap(image,BlackChannel);
+ PushPixelChannelMap(image,BlackChannel);
status|=LevelImage(image,black_color->black,white_color->black,1.0);
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
}
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) &&
(image->matte == MagickTrue))
{
- PushPixelComponentMap(image,AlphaChannel);
+ PushPixelChannelMap(image,AlphaChannel);
status|=LevelImage(image,black_color->alpha,white_color->alpha,1.0);
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
}
}
else
{
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
{
- PushPixelComponentMap(image,RedChannel);
+ PushPixelChannelMap(image,RedChannel);
status|=LevelizeImage(image,black_color->red,white_color->red,1.0);
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
}
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
{
- PushPixelComponentMap(image,GreenChannel);
+ PushPixelChannelMap(image,GreenChannel);
status|=LevelizeImage(image,black_color->green,white_color->green,
1.0);
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
}
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
{
- PushPixelComponentMap(image,BlueChannel);
+ PushPixelChannelMap(image,BlueChannel);
status|=LevelizeImage(image,black_color->blue,white_color->blue,1.0);
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
}
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
{
- PushPixelComponentMap(image,BlackChannel);
+ PushPixelChannelMap(image,BlackChannel);
status|=LevelizeImage(image,black_color->black,white_color->black,
1.0);
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
}
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) &&
(image->matte == MagickTrue))
{
- PushPixelComponentMap(image,AlphaChannel);
+ PushPixelChannelMap(image,AlphaChannel);
status|=LevelizeImage(image,black_color->alpha,white_color->alpha,
1.0);
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
}
}
return(status == 0 ? MagickFalse : MagickTrue);
@@ -2797,7 +2797,7 @@
for (x=(ssize_t) image->columns-1; x >= 0; x--)
{
histogram[ScaleQuantumToMap(GetPixelIntensity(image,p))]++;
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
/*
@@ -3085,7 +3085,7 @@
SetPixelRed(image,red,q);
SetPixelGreen(image,green,q);
SetPixelBlue(image,blue,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -3173,13 +3173,13 @@
if ((image->colormap[i].red != image->colormap[i].green) ||
(image->colormap[i].green != image->colormap[i].blue))
continue;
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
image->colormap[i].red=(Quantum) QuantumRange-
image->colormap[i].red;
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
image->colormap[i].green=(Quantum) QuantumRange-
image->colormap[i].green;
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
image->colormap[i].blue=(Quantum) QuantumRange-
image->colormap[i].blue;
}
@@ -3221,21 +3221,21 @@
if ((GetPixelRed(image,q) != GetPixelGreen(image,q)) ||
(GetPixelGreen(image,q) != GetPixelBlue(image,q)))
{
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
continue;
}
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
SetPixelRed(image,QuantumRange-GetPixelRed(image,q),q);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
SetPixelGreen(image,QuantumRange-GetPixelGreen(image,q),q);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
SetPixelBlue(image,QuantumRange-GetPixelBlue(image,q),q);
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
SetPixelBlack(image,QuantumRange-GetPixelBlack(image,q),q);
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
SetPixelAlpha(image,QuantumRange-GetPixelAlpha(image,q),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
if (sync == MagickFalse)
@@ -3281,18 +3281,18 @@
}
for (x=0; x < (ssize_t) image->columns; x++)
{
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
SetPixelRed(image,QuantumRange-GetPixelRed(image,q),q);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
SetPixelGreen(image,QuantumRange-GetPixelGreen(image,q),q);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
SetPixelBlue(image,QuantumRange-GetPixelBlue(image,q),q);
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
SetPixelBlack(image,QuantumRange-GetPixelBlack(image,q),q);
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
SetPixelAlpha(image,QuantumRange-GetPixelAlpha(image,q),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -3458,16 +3458,16 @@
#endif
for (i=0; i < (ssize_t) image->colors; i++)
{
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
image->colormap[i].red=ClampToQuantum(sigmoidal_map[
ScaleQuantumToMap(image->colormap[i].red)]);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
image->colormap[i].green=ClampToQuantum(sigmoidal_map[
ScaleQuantumToMap(image->colormap[i].green)]);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
image->colormap[i].blue=ClampToQuantum(sigmoidal_map[
ScaleQuantumToMap(image->colormap[i].blue)]);
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
image->colormap[i].alpha=ClampToQuantum(sigmoidal_map[
ScaleQuantumToMap(image->colormap[i].alpha)]);
}
@@ -3500,23 +3500,23 @@
}
for (x=0; x < (ssize_t) image->columns; x++)
{
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
SetPixelRed(image,ClampToQuantum(sigmoidal_map[ScaleQuantumToMap(
GetPixelRed(image,q))]),q);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
SetPixelGreen(image,ClampToQuantum(sigmoidal_map[ScaleQuantumToMap(
GetPixelGreen(image,q))]),q);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
SetPixelBlue(image,ClampToQuantum(sigmoidal_map[ScaleQuantumToMap(
GetPixelBlue(image,q))]),q);
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
SetPixelBlack(image,ClampToQuantum(sigmoidal_map[ScaleQuantumToMap(
GetPixelBlack(image,q))]),q);
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
SetPixelAlpha(image,ClampToQuantum(sigmoidal_map[ScaleQuantumToMap(
GetPixelAlpha(image,q))]),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
diff --git a/MagickCore/feature.c b/MagickCore/feature.c
index 806a693..bc1f0d0 100644
--- a/MagickCore/feature.c
+++ b/MagickCore/feature.c
@@ -255,7 +255,7 @@
if (image->matte != MagickFalse)
grays[ScaleQuantumToMap(GetPixelAlpha(image,p))].alpha=
ScaleQuantumToMap(GetPixelAlpha(image,p));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
image_view=DestroyCacheView(image_view);
@@ -419,7 +419,7 @@
status=MagickFalse;
continue;
}
- p+=distance*GetPixelComponents(image);;
+ p+=distance*GetPixelChannels(image);;
for (x=0; x < (ssize_t) image->columns; x++)
{
for (i=0; i < 4; i++)
@@ -464,7 +464,7 @@
v=0;
while (grays[u].red != ScaleQuantumToMap(GetPixelRed(image,p)))
u++;
- while (grays[v].red != ScaleQuantumToMap(GetPixelRed(image,p+offset*GetPixelComponents(image))))
+ while (grays[v].red != ScaleQuantumToMap(GetPixelRed(image,p+offset*GetPixelChannels(image))))
v++;
cooccurrence[u][v].direction[i].red++;
cooccurrence[v][u].direction[i].red++;
@@ -472,7 +472,7 @@
v=0;
while (grays[u].green != ScaleQuantumToMap(GetPixelGreen(image,p)))
u++;
- while (grays[v].green != ScaleQuantumToMap(GetPixelGreen(image,p+offset*GetPixelComponents(image))))
+ while (grays[v].green != ScaleQuantumToMap(GetPixelGreen(image,p+offset*GetPixelChannels(image))))
v++;
cooccurrence[u][v].direction[i].green++;
cooccurrence[v][u].direction[i].green++;
@@ -480,7 +480,7 @@
v=0;
while (grays[u].blue != ScaleQuantumToMap(GetPixelBlue(image,p)))
u++;
- while (grays[v].blue != ScaleQuantumToMap(GetPixelBlue(image,p+offset*GetPixelComponents(image))))
+ while (grays[v].blue != ScaleQuantumToMap(GetPixelBlue(image,p+offset*GetPixelChannels(image))))
v++;
cooccurrence[u][v].direction[i].blue++;
cooccurrence[v][u].direction[i].blue++;
@@ -490,7 +490,7 @@
v=0;
while (grays[u].black != ScaleQuantumToMap(GetPixelBlack(image,p)))
u++;
- while (grays[v].black != ScaleQuantumToMap(GetPixelBlack(image,p+offset*GetPixelComponents(image))))
+ while (grays[v].black != ScaleQuantumToMap(GetPixelBlack(image,p+offset*GetPixelChannels(image))))
v++;
cooccurrence[u][v].direction[i].black++;
cooccurrence[v][u].direction[i].black++;
@@ -501,13 +501,13 @@
v=0;
while (grays[u].alpha != ScaleQuantumToMap(GetPixelAlpha(image,p)))
u++;
- while (grays[v].alpha != ScaleQuantumToMap(GetPixelAlpha(image,p+offset*GetPixelComponents(image))))
+ while (grays[v].alpha != ScaleQuantumToMap(GetPixelAlpha(image,p+offset*GetPixelChannels(image))))
v++;
cooccurrence[u][v].direction[i].alpha++;
cooccurrence[v][u].direction[i].alpha++;
}
}
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
grays=(LongPixelPacket *) RelinquishMagickMemory(grays);
diff --git a/MagickCore/fourier.c b/MagickCore/fourier.c
index 948b67f..b7fbf67 100644
--- a/MagickCore/fourier.c
+++ b/MagickCore/fourier.c
@@ -339,7 +339,7 @@
}
}
i++;
- q+=GetPixelComponents(magnitude_image);
+ q+=GetPixelChannels(magnitude_image);
}
status=SyncCacheViewAuthenticPixels(magnitude_view,exception);
if (status == MagickFalse)
@@ -395,7 +395,7 @@
}
}
i++;
- q+=GetPixelComponents(phase_image);
+ q+=GetPixelChannels(phase_image);
}
status=SyncCacheViewAuthenticPixels(phase_view,exception);
if (status == MagickFalse)
@@ -492,7 +492,7 @@
}
}
i++;
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
image_view=DestroyCacheView(image_view);
@@ -913,7 +913,7 @@
}
}
i++;
- p+=GetPixelComponents(magnitude_image);
+ p+=GetPixelChannels(magnitude_image);
}
}
i=0L;
@@ -961,7 +961,7 @@
}
}
i++;
- p+=GetPixelComponents(phase_image);
+ p+=GetPixelChannels(phase_image);
}
}
if (fourier_info->modulus != MagickFalse)
@@ -1125,7 +1125,7 @@
}
}
i++;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
break;
diff --git a/MagickCore/fx.c b/MagickCore/fx.c
index 923495b..836e43f 100644
--- a/MagickCore/fx.c
+++ b/MagickCore/fx.c
@@ -393,24 +393,24 @@
}
for (x=0; x < (ssize_t) image->columns; x++)
{
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
SetPixelRed(noise_image,ClampToQuantum(GenerateDifferentialNoise(
random_info[id],GetPixelRed(image,p),noise_type,attenuate)),q);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
SetPixelGreen(noise_image,ClampToQuantum(GenerateDifferentialNoise(
random_info[id],GetPixelGreen(image,p),noise_type,attenuate)),q);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
SetPixelBlue(noise_image,ClampToQuantum(GenerateDifferentialNoise(
random_info[id],GetPixelBlue(image,p),noise_type,attenuate)),q);
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
SetPixelBlack(noise_image,ClampToQuantum(GenerateDifferentialNoise(
random_info[id],GetPixelBlack(image,p),noise_type,attenuate)),q);
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
SetPixelAlpha(noise_image,ClampToQuantum(GenerateDifferentialNoise(
random_info[id],GetPixelAlpha(image,p),noise_type,attenuate)),q);
- p+=GetPixelComponents(image);
- q+=GetPixelComponents(noise_image);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(noise_image);
}
sync=SyncCacheViewAuthenticPixels(noise_view,exception);
if (sync == MagickFalse)
@@ -566,8 +566,8 @@
SetPixelRed(shift_image,ClampToQuantum(pixel.red),q);
SetPixelGreen(shift_image,ClampToQuantum(pixel.green),q);
SetPixelBlue(shift_image,ClampToQuantum(pixel.blue),q);
- p+=GetPixelComponents(image);
- q+=GetPixelComponents(shift_image);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(shift_image);
}
sync=SyncCacheViewAuthenticPixels(shift_view,exception);
if (sync == MagickFalse)
@@ -798,8 +798,8 @@
(100.0-pixel.blue)+colorize.blue*pixel.blue)/100.0),q);
SetPixelAlpha(colorize_image,ClampToQuantum((GetPixelAlpha(image,p)*
(100.0-pixel.alpha)+colorize.alpha*pixel.alpha)/100.0),q);
- p+=GetPixelComponents(image);
- q+=GetPixelComponents(colorize_image);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(colorize_image);
}
sync=SyncCacheViewAuthenticPixels(colorize_view,exception);
if (sync == MagickFalse)
@@ -1018,8 +1018,8 @@
}
}
}
- p+=GetPixelComponents(image);
- q+=GetPixelComponents(color_image);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(color_image);
}
if (SyncCacheViewAuthenticPixels(color_view,exception) == MagickFalse)
status=MagickFalse;
@@ -2979,28 +2979,28 @@
alpha=0.0;
for (x=0; x < (ssize_t) fx_image->columns; x++)
{
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
{
(void) FxEvaluateChannelExpression(fx_info[id],RedChannel,x,y,
&alpha,exception);
SetPixelRed(fx_image,ClampToQuantum((MagickRealType) QuantumRange*
alpha),q);
}
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
{
(void) FxEvaluateChannelExpression(fx_info[id],GreenChannel,x,y,
&alpha,exception);
SetPixelGreen(fx_image,ClampToQuantum((MagickRealType) QuantumRange*
alpha),q);
}
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
{
(void) FxEvaluateChannelExpression(fx_info[id],BlueChannel,x,y,
&alpha,exception);
SetPixelBlue(fx_image,ClampToQuantum((MagickRealType) QuantumRange*
alpha),q);
}
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(fx_image->colorspace == CMYKColorspace))
{
(void) FxEvaluateChannelExpression(fx_info[id],BlackChannel,x,y,
@@ -3008,14 +3008,14 @@
SetPixelBlack(fx_image,ClampToQuantum((MagickRealType) QuantumRange*
alpha),q);
}
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
{
(void) FxEvaluateChannelExpression(fx_info[id],AlphaChannel,x,y,
&alpha,exception);
SetPixelAlpha(fx_image,ClampToQuantum((MagickRealType) QuantumRange*
alpha),q);
}
- q+=GetPixelComponents(fx_image);
+ q+=GetPixelChannels(fx_image);
}
if (SyncCacheViewAuthenticPixels(fx_view,exception) == MagickFalse)
status=MagickFalse;
@@ -3204,7 +3204,7 @@
exception);
SetPixelPixelInfo(implode_image,&pixel,q);
}
- q+=GetPixelComponents(implode_image);
+ q+=GetPixelChannels(implode_image);
}
if (SyncCacheViewAuthenticPixels(implode_view,exception) == MagickFalse)
status=MagickFalse;
@@ -3411,8 +3411,8 @@
SetPixelBlack(morph_images,ClampToQuantum(alpha*
GetPixelBlack(morph_images,q)+beta*GetPixelBlack(morph_image,p)),
q);
- p+=GetPixelComponents(morph_image);
- q+=GetPixelComponents(morph_images);
+ p+=GetPixelChannels(morph_image);
+ q+=GetPixelChannels(morph_images);
}
sync=SyncCacheViewAuthenticPixels(morph_view,exception);
if (sync == MagickFalse)
@@ -4023,8 +4023,8 @@
SetPixelGreen(sepia_image,ClampToQuantum(tone),q);
if ((MagickRealType) GetPixelBlue(image,q) < tone)
SetPixelBlue(sepia_image,ClampToQuantum(tone),q);
- p+=GetPixelComponents(image);
- q+=GetPixelComponents(sepia_image);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(sepia_image);
}
if (SyncCacheViewAuthenticPixels(sepia_view,exception) == MagickFalse)
status=MagickFalse;
@@ -4169,7 +4169,7 @@
else
SetPixelAlpha(border_image,ClampToQuantum((MagickRealType)
(GetPixelAlpha(border_image,q)*opacity/100.0)),q);
- q+=GetPixelComponents(border_image);
+ q+=GetPixelChannels(border_image);
}
if (SyncCacheViewAuthenticPixels(border_view,exception) == MagickFalse)
status=MagickFalse;
@@ -4188,9 +4188,9 @@
}
}
border_view=DestroyCacheView(border_view);
- PushPixelComponentMap(border_image,AlphaChannel);
+ PushPixelChannelMap(border_image,AlphaChannel);
shadow_image=BlurImage(border_image,0.0,sigma,exception);
- PopPixelComponentMap(border_image);
+ PopPixelChannelMap(border_image);
border_image=DestroyImage(border_image);
if (shadow_image == (Image *) NULL)
return((Image *) NULL);
@@ -4313,7 +4313,7 @@
if (image->colorspace == CMYKColorspace)
pixel.black=pixel.red;
SetPixelPixelInfo(random_image,&pixel,q);
- q+=GetPixelComponents(random_image);
+ q+=GetPixelChannels(random_image);
}
if (SyncCacheViewAuthenticPixels(random_view,exception) == MagickFalse)
status=MagickFalse;
@@ -4462,7 +4462,7 @@
SetPixelGreen(image,QuantumRange-GetPixelGreen(image,q),q);
if ((MagickRealType) GetPixelBlue(image,q) > threshold)
SetPixelBlue(image,QuantumRange-GetPixelBlue(image,q),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -4775,7 +4775,7 @@
SetPixelBlue(image,GetPixelBlue(left_image,q),r);
SetPixelAlpha(image,(GetPixelAlpha(left_image,p)+
GetPixelAlpha(left_image,q))/2,r);
- p+=GetPixelComponents(left_image);
+ p+=GetPixelChannels(left_image);
q++;
r++;
}
@@ -4959,7 +4959,7 @@
center.y),&pixel,exception);
SetPixelPixelInfo(swirl_image,&pixel,q);
}
- q+=GetPixelComponents(swirl_image);
+ q+=GetPixelChannels(swirl_image);
}
if (SyncCacheViewAuthenticPixels(swirl_view,exception) == MagickFalse)
status=MagickFalse;
@@ -5140,8 +5140,8 @@
(1.0-(4.0*(weight*weight)));
SetPixelBlue(tint_image,ClampToQuantum(pixel.blue),q);
SetPixelAlpha(tint_image,GetPixelAlpha(image,p),q);
- p+=GetPixelComponents(image);
- q+=GetPixelComponents(tint_image);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(tint_image);
}
if (SyncCacheViewAuthenticPixels(tint_view,exception) == MagickFalse)
status=MagickFalse;
@@ -5394,7 +5394,7 @@
UndefinedInterpolatePixel,(double) x,(double) (y-sine_map[x]),&pixel,
exception);
SetPixelPixelInfo(wave_image,&pixel,q);
- q+=GetPixelComponents(wave_image);
+ q+=GetPixelChannels(wave_image);
}
if (SyncCacheViewAuthenticPixels(wave_view,exception) == MagickFalse)
status=MagickFalse;
diff --git a/MagickCore/histogram.c b/MagickCore/histogram.c
index 4d259b1..eaaba4b 100644
--- a/MagickCore/histogram.c
+++ b/MagickCore/histogram.c
@@ -288,7 +288,7 @@
node_info->number_unique++;
cube_info->colors++;
}
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
proceed=SetImageProgress(image,EvaluateImageTag,(MagickOffsetType) y,
image->rows);
@@ -761,7 +761,7 @@
if (cube_info->colors > MaximumUniqueColors)
break;
}
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
if (x < (ssize_t) image->columns)
break;
@@ -921,7 +921,7 @@
if (cube_info->colors > 256)
break;
}
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
if (x < (ssize_t) image->columns)
break;
@@ -1001,57 +1001,57 @@
/*
Auto-level each channel separately.
*/
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
{
- PushPixelComponentMap(image,RedChannel);
+ PushPixelChannelMap(image,RedChannel);
(void) GetImageRange(image,&min,&max,&image->exception);
min+=black;
max-=white;
if (fabs(min-max) >= MagickEpsilon)
status&=LevelImage(image,min,max,1.0);
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
}
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
{
- PushPixelComponentMap(image,GreenChannel);
+ PushPixelChannelMap(image,GreenChannel);
(void) GetImageRange(image,&min,&max,&image->exception);
min+=black;
max-=white;
if (fabs(min-max) >= MagickEpsilon)
status&=LevelImage(image,min,max,1.0);
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
}
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
{
- PushPixelComponentMap(image,BlueChannel);
+ PushPixelChannelMap(image,BlueChannel);
(void) GetImageRange(image,&min,&max,&image->exception);
min+=black;
max-=white;
if (fabs(min-max) >= MagickEpsilon)
status&=LevelImage(image,min,max,1.0);
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
}
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
{
- PushPixelComponentMap(image,BlackChannel);
+ PushPixelChannelMap(image,BlackChannel);
(void) GetImageRange(image,&min,&max,&image->exception);
min+=black;
max-=white;
if (fabs(min-max) >= MagickEpsilon)
status&=LevelImage(image,min,max,1.0);
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
}
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) &&
(image->matte == MagickTrue))
{
- PushPixelComponentMap(image,AlphaChannel);
+ PushPixelChannelMap(image,AlphaChannel);
(void) GetImageRange(image,&min,&max,&image->exception);
min+=black;
max-=white;
if (fabs(min-max) >= MagickEpsilon)
status&=LevelImage(image,min,max,1.0);
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
}
return(status != 0 ? MagickTrue : MagickFalse);
}
@@ -1161,21 +1161,21 @@
{
SetPixelInfoPacket(image,p,&pixel);
(void) CopyMagickString(tuple,"(",MaxTextExtent);
- ConcatenateColorComponent(&pixel,RedPixelComponent,X11Compliance,tuple);
+ ConcatenateColorComponent(&pixel,RedPixelChannel,X11Compliance,tuple);
(void) ConcatenateMagickString(tuple,",",MaxTextExtent);
- ConcatenateColorComponent(&pixel,GreenPixelComponent,X11Compliance,tuple);
+ ConcatenateColorComponent(&pixel,GreenPixelChannel,X11Compliance,tuple);
(void) ConcatenateMagickString(tuple,",",MaxTextExtent);
- ConcatenateColorComponent(&pixel,BluePixelComponent,X11Compliance,tuple);
+ ConcatenateColorComponent(&pixel,BluePixelChannel,X11Compliance,tuple);
if (pixel.colorspace == CMYKColorspace)
{
(void) ConcatenateMagickString(tuple,",",MaxTextExtent);
- ConcatenateColorComponent(&pixel,BlackPixelComponent,X11Compliance,
+ ConcatenateColorComponent(&pixel,BlackPixelChannel,X11Compliance,
tuple);
}
if (pixel.matte != MagickFalse)
{
(void) ConcatenateMagickString(tuple,",",MaxTextExtent);
- ConcatenateColorComponent(&pixel,AlphaPixelComponent,X11Compliance,
+ ConcatenateColorComponent(&pixel,AlphaPixelChannel,X11Compliance,
tuple);
}
(void) ConcatenateMagickString(tuple,")",MaxTextExtent);
diff --git a/MagickCore/identify.c b/MagickCore/identify.c
index 6ff5a5e..19e316d 100644
--- a/MagickCore/identify.c
+++ b/MagickCore/identify.c
@@ -588,7 +588,7 @@
{
if (GetPixelAlpha(image,p) == (Quantum) TransparentAlpha)
break;
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
if (x < (ssize_t) image->columns)
break;
@@ -646,24 +646,24 @@
{
SetPixelInfoPacket(image,p,&pixel);
(void) CopyMagickString(tuple,"(",MaxTextExtent);
- ConcatenateColorComponent(&pixel,RedPixelComponent,X11Compliance,
+ ConcatenateColorComponent(&pixel,RedPixelChannel,X11Compliance,
tuple);
(void) ConcatenateMagickString(tuple,",",MaxTextExtent);
- ConcatenateColorComponent(&pixel,GreenPixelComponent,X11Compliance,
+ ConcatenateColorComponent(&pixel,GreenPixelChannel,X11Compliance,
tuple);
(void) ConcatenateMagickString(tuple,",",MaxTextExtent);
- ConcatenateColorComponent(&pixel,BluePixelComponent,X11Compliance,
+ ConcatenateColorComponent(&pixel,BluePixelChannel,X11Compliance,
tuple);
if (pixel.colorspace == CMYKColorspace)
{
(void) ConcatenateMagickString(tuple,",",MaxTextExtent);
- ConcatenateColorComponent(&pixel,BlackPixelComponent,
+ ConcatenateColorComponent(&pixel,BlackPixelChannel,
X11Compliance,tuple);
}
if (pixel.matte != MagickFalse)
{
(void) ConcatenateMagickString(tuple,",",MaxTextExtent);
- ConcatenateColorComponent(&pixel,AlphaPixelComponent,
+ ConcatenateColorComponent(&pixel,AlphaPixelChannel,
X11Compliance,tuple);
}
(void) ConcatenateMagickString(tuple,")",MaxTextExtent);
diff --git a/MagickCore/image.c b/MagickCore/image.c
index fd88b44..7f25d9f 100644
--- a/MagickCore/image.c
+++ b/MagickCore/image.c
@@ -185,7 +185,7 @@
GetTimerInfo(&image->timer);
image->ping=MagickFalse;
image->cache=AcquirePixelCache(0);
- image->component_map=AcquirePixelComponentMap();
+ image->channel_map=AcquirePixelChannelMap();
image->blob=CloneBlobInfo((BlobInfo *) NULL);
image->debug=IsEventLogging();
image->reference_count=1;
@@ -543,8 +543,8 @@
SetPixelAlpha(append_image,OpaqueAlpha,q);
if (image->matte != MagickFalse)
SetPixelAlpha(append_image,GetPixelAlpha(image,p),q);
- p+=GetPixelComponents(image);
- q+=GetPixelComponents(append_image);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(append_image);
}
sync=SyncCacheViewAuthenticPixels(append_view,exception);
if (sync == MagickFalse)
@@ -773,7 +773,7 @@
(void) ResetMagickMemory(clone_image,0,sizeof(*clone_image));
clone_image->signature=MagickSignature;
clone_image->storage_class=image->storage_class;
- clone_image->pixel_components=image->pixel_components;
+ clone_image->number_channels=image->number_channels;
clone_image->metacontent_extent=image->metacontent_extent;
clone_image->colorspace=image->colorspace;
clone_image->matte=image->matte;
@@ -806,7 +806,7 @@
clone_image->magick_rows=image->magick_rows;
clone_image->type=image->type;
clone_image->map=image->map;
- clone_image->component_map=ClonePixelComponentMap(image->component_map);
+ clone_image->channel_map=ClonePixelChannelMap(image->channel_map);
(void) CopyMagickString(clone_image->magick_filename,image->magick_filename,
MaxTextExtent);
(void) CopyMagickString(clone_image->magick,image->magick,MaxTextExtent);
@@ -1044,7 +1044,7 @@
combine_image=DestroyImage(combine_image);
return((Image *) NULL);
}
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
combine_image->matte=MagickTrue;
(void) SetImageBackgroundColor(combine_image);
/*
@@ -1083,7 +1083,7 @@
continue;
}
next=image;
- if (((GetPixelRedTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelRedTraits(image) & UpdatePixelTrait) != 0) &&
(next != (Image *) NULL))
{
image_view=AcquireCacheView(next);
@@ -1094,13 +1094,13 @@
for (x=0; x < (ssize_t) combine_image->columns; x++)
{
SetPixelRed(image,GetPixelIntensity(image,p),q);
- p+=GetPixelComponents(image);
- q+=GetPixelComponents(combine_image);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(combine_image);
}
image_view=DestroyCacheView(image_view);
next=GetNextImageInList(next);
}
- if (((GetPixelGreenTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0) &&
(next != (Image *) NULL))
{
image_view=AcquireCacheView(next);
@@ -1111,13 +1111,13 @@
for (x=0; x < (ssize_t) combine_image->columns; x++)
{
SetPixelGreen(image,GetPixelIntensity(image,p),q);
- p+=GetPixelComponents(image);
- q+=GetPixelComponents(combine_image);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(combine_image);
}
image_view=DestroyCacheView(image_view);
next=GetNextImageInList(next);
}
- if (((GetPixelBlueTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0) &&
(next != (Image *) NULL))
{
image_view=AcquireCacheView(next);
@@ -1128,13 +1128,13 @@
for (x=0; x < (ssize_t) combine_image->columns; x++)
{
SetPixelBlue(image,GetPixelIntensity(image,p),q);
- p+=GetPixelComponents(image);
- q+=GetPixelComponents(combine_image);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(combine_image);
}
image_view=DestroyCacheView(image_view);
next=GetNextImageInList(next);
}
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace) && (next != (Image *) NULL))
{
image_view=AcquireCacheView(next);
@@ -1145,13 +1145,13 @@
for (x=0; x < (ssize_t) combine_image->columns; x++)
{
SetPixelBlack(image,GetPixelIntensity(image,p),q);
- p+=GetPixelComponents(image);
- q+=GetPixelComponents(combine_image);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(combine_image);
}
image_view=DestroyCacheView(image_view);
next=GetNextImageInList(next);
}
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) &&
(next != (Image *) NULL))
{
image_view=AcquireCacheView(next);
@@ -1162,8 +1162,8 @@
for (x=0; x < (ssize_t) combine_image->columns; x++)
{
SetPixelAlpha(image,GetPixelIntensity(image,p),q);
- p+=GetPixelComponents(image);
- q+=GetPixelComponents(combine_image);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(combine_image);
}
image_view=DestroyCacheView(image_view);
next=GetNextImageInList(next);
@@ -1234,7 +1234,7 @@
Destroy image.
*/
DestroyImagePixels(image);
- image->component_map=DestroyPixelComponentMap(image->component_map);
+ image->channel_map=DestroyPixelChannelMap(image->channel_map);
if (image->clip_mask != (Image *) NULL)
image->clip_mask=DestroyImage(image->clip_mask);
if (image->mask != (Image *) NULL)
@@ -1921,7 +1921,7 @@
(pixel.alpha != (QuantumAny) pixel.alpha))
break;
}
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
if (x < (ssize_t) image->columns)
status=MagickFalse;
@@ -2152,7 +2152,7 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
SetPixelPixelInfo(image,background,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -2344,36 +2344,36 @@
}
for (x=0; x < (ssize_t) image->columns; x++)
{
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
{
SetPixelGreen(image,GetPixelRed(image,q),q);
SetPixelBlue(image,GetPixelRed(image,q),q);
}
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
{
SetPixelRed(image,GetPixelGreen(image,q),q);
SetPixelBlue(image,GetPixelGreen(image,q),q);
}
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
{
SetPixelRed(image,GetPixelBlue(image,q),q);
SetPixelGreen(image,GetPixelBlue(image,q),q);
}
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
{
SetPixelRed(image,GetPixelBlack(image,q),q);
SetPixelGreen(image,GetPixelBlack(image,q),q);
SetPixelBlue(image,GetPixelBlack(image,q),q);
}
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) &&
(image->matte != MagickFalse))
{
SetPixelRed(image,GetPixelAlpha(image,q),q);
SetPixelGreen(image,GetPixelAlpha(image,q),q);
SetPixelBlue(image,GetPixelAlpha(image,q),q);
}
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -2432,45 +2432,45 @@
if (image->debug != MagickFalse)
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
images=NewImageList();
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
{
separate_image=CloneImage(image,0,0,MagickTrue,exception);
- PushPixelComponentMap(separate_image,RedChannel);
+ PushPixelChannelMap(separate_image,RedChannel);
(void) SeparateImage(separate_image);
- PopPixelComponentMap(separate_image);
+ PopPixelChannelMap(separate_image);
AppendImageToList(&images,separate_image);
}
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
{
separate_image=CloneImage(image,0,0,MagickTrue,exception);
- PushPixelComponentMap(separate_image,GreenChannel);
+ PushPixelChannelMap(separate_image,GreenChannel);
(void) SeparateImage(separate_image);
- PopPixelComponentMap(separate_image);
+ PopPixelChannelMap(separate_image);
AppendImageToList(&images,separate_image);
}
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
{
separate_image=CloneImage(image,0,0,MagickTrue,exception);
- PushPixelComponentMap(separate_image,BlueChannel);
+ PushPixelChannelMap(separate_image,BlueChannel);
(void) SeparateImage(separate_image);
- PopPixelComponentMap(separate_image);
+ PopPixelChannelMap(separate_image);
AppendImageToList(&images,separate_image);
}
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
{
separate_image=CloneImage(image,0,0,MagickTrue,exception);
- PushPixelComponentMap(separate_image,BlackChannel);
+ PushPixelChannelMap(separate_image,BlackChannel);
(void) SeparateImage(separate_image);
- PopPixelComponentMap(separate_image);
+ PopPixelChannelMap(separate_image);
AppendImageToList(&images,separate_image);
}
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
{
separate_image=CloneImage(image,0,0,MagickTrue,exception);
- PushPixelComponentMap(separate_image,AlphaChannel);
+ PushPixelChannelMap(separate_image,AlphaChannel);
(void) SeparateImage(separate_image);
- PopPixelComponentMap(separate_image);
+ PopPixelChannelMap(separate_image);
AppendImageToList(&images,separate_image);
}
return(images);
@@ -2588,7 +2588,7 @@
if (image->colorspace == CMYKColorspace)
SetPixelBlack(image,pixel.black,q);
}
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -2608,9 +2608,9 @@
Special usage case for SeparateImage(): copy grayscale color to
the alpha channel.
*/
- PushPixelComponentMap(image,GrayChannel);
+ PushPixelChannelMap(image,GrayChannel);
status=SeparateImage(image);
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
image->matte=MagickTrue; /* make sure transparency is now on! */
if (alpha_type == ShapeAlphaChannel)
{
@@ -2628,9 +2628,9 @@
}
case ExtractAlphaChannel:
{
- PushPixelComponentMap(image,AlphaChannel);
+ PushPixelChannelMap(image,AlphaChannel);
status=SeparateImage(image);
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
image->matte=MagickFalse;
break;
}
@@ -2746,7 +2746,7 @@
SetPixelPacket(image,&pixel,q);
if (image->colorspace == CMYKColorspace)
SetPixelBlack(image,pixel.black,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -2829,7 +2829,7 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
SetPixelPixelInfo(image,color,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -3488,7 +3488,7 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
SetPixelAlpha(image,opacity,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -3602,9 +3602,9 @@
status=TransformImageColorspace(image,RGBColorspace);
if (image->matte == MagickFalse)
(void) SetImageAlphaChannel(image,OpaqueAlphaChannel);
- PushPixelComponentMap(image,AlphaChannel);
+ PushPixelChannelMap(image,AlphaChannel);
(void) BilevelImage(image,(double) QuantumRange/2.0);
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
quantize_info=AcquireQuantizeInfo(image_info);
status=QuantizeImage(quantize_info,image);
quantize_info=DestroyQuantizeInfo(quantize_info);
@@ -4141,7 +4141,7 @@
index=PushColormapIndex(image,(size_t) GetPixelIndex(image,q),
&range_exception);
SetPixelPacket(image,image->colormap+(ssize_t) index,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
diff --git a/MagickCore/image.h b/MagickCore/image.h
index 5f770b1..0218673 100644
--- a/MagickCore/image.h
+++ b/MagickCore/image.h
@@ -280,7 +280,7 @@
ping;
size_t
- pixel_components,
+ number_channels,
metacontent_extent;
MagickBooleanType
@@ -289,8 +289,8 @@
size_t
map;
- PixelComponentMap
- **component_map;
+ PixelChannelMap
+ **channel_map;
void
*cache;
diff --git a/MagickCore/layer.c b/MagickCore/layer.c
index d7f1e6c..2c90494 100644
--- a/MagickCore/layer.c
+++ b/MagickCore/layer.c
@@ -120,7 +120,7 @@
for (x=0; x < (ssize_t) bounds->width; x++)
{
SetPixelAlpha(image,TransparentAlpha,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -194,7 +194,7 @@
if ((GetPixelAlpha(image1,p) <= (Quantum) (QuantumRange/2)) &&
(GetPixelAlpha(image1,q) > (Quantum) (QuantumRange/2)))
break;
- p+=GetPixelComponents(image1);
+ p+=GetPixelChannels(image1);
q++;
}
if (x < (ssize_t) bounds->width)
@@ -633,7 +633,7 @@
SetPixelInfo(image2,q,&pixel2);
if (ComparePixels(method,&pixel1,&pixel2))
break;
- p+=GetPixelComponents(image1);
+ p+=GetPixelChannels(image1);
q++;
}
if (y < (ssize_t) image1->rows)
@@ -664,7 +664,7 @@
SetPixelInfo(image2,q,&pixel2);
if (ComparePixels(method,&pixel1,&pixel2))
break;
- p+=GetPixelComponents(image1);
+ p+=GetPixelChannels(image1);
q++;
}
if (y < (ssize_t) image1->rows)
@@ -684,7 +684,7 @@
SetPixelInfo(image2,q,&pixel2);
if (ComparePixels(method,&pixel1,&pixel2))
break;
- p+=GetPixelComponents(image1);
+ p+=GetPixelChannels(image1);
q++;
}
if (x < (ssize_t) image1->columns)
@@ -704,7 +704,7 @@
SetPixelInfo(image2,q,&pixel2);
if (ComparePixels(method,&pixel1,&pixel2))
break;
- p+=GetPixelComponents(image1);
+ p+=GetPixelChannels(image1);
q++;
}
if (x < (ssize_t) image1->columns)
diff --git a/MagickCore/mac.c b/MagickCore/mac.c
index ca540ab..f441c36 100644
--- a/MagickCore/mac.c
+++ b/MagickCore/mac.c
@@ -1365,7 +1365,7 @@
SetPixelBlue(image,ScaleCharToQuantum(Pixel.blue & 0xff),q);
if (image->storage_class == PseudoClass)
SetPixelIndex(image,Color2Index(&Pixel),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
diff --git a/MagickCore/magick-config.h b/MagickCore/magick-config.h
index 53e983a..9002a55 100644
--- a/MagickCore/magick-config.h
+++ b/MagickCore/magick-config.h
@@ -421,15 +421,15 @@
#endif
/* Define if you have the <lcms2.h> header file. */
-#ifndef MAGICKCORE_HAVE_LCMS2_H
-#define MAGICKCORE_HAVE_LCMS2_H 1
-#endif
+/* #undef HAVE_LCMS2_H */
/* Define if you have the <lcms2/lcms2.h> header file. */
/* #undef HAVE_LCMS2_LCMS2_H */
/* Define if you have the <lcms.h> header file. */
-/* #undef HAVE_LCMS_H */
+#ifndef MAGICKCORE_HAVE_LCMS_H
+#define MAGICKCORE_HAVE_LCMS_H 1
+#endif
/* Define if you have the <lcms/lcms.h> header file. */
/* #undef HAVE_LCMS_LCMS_H */
@@ -1152,7 +1152,9 @@
#endif
/* Define if you have JBIG library */
-/* #undef JBIG_DELEGATE */
+#ifndef MAGICKCORE_JBIG_DELEGATE
+#define MAGICKCORE_JBIG_DELEGATE 1
+#endif
/* Define if you have JPEG version 2 "Jasper" library */
#ifndef MAGICKCORE_JP2_DELEGATE
@@ -1181,7 +1183,9 @@
#endif
/* Define if you have LQR library */
-/* #undef LQR_DELEGATE */
+#ifndef MAGICKCORE_LQR_DELEGATE
+#define MAGICKCORE_LQR_DELEGATE 1
+#endif
/* Define if using libltdl to support dynamically loadable modules */
#ifndef MAGICKCORE_LTDL_DELEGATE
@@ -1193,7 +1197,7 @@
/* Define to the system default library search path. */
#ifndef MAGICKCORE_LT_DLSEARCH_PATH
-#define MAGICKCORE_LT_DLSEARCH_PATH "/lib64:/usr/lib64:/lib:/usr/lib:/usr/lib64/R/lib:/usr/lib64/alliance/lib:/usr/lib64/atlas:/opt/modules/pkg/intel/f77/10.0.025/lib:/usr/lib64/kicad:/usr/lib64/llvm:/usr/local/lib:/usr/lib64/mpich2/lib/:/usr/lib64/mysql:/usr/lib64/octave/3.4.0:/usr/lib64/openmotif:/usr/lib64/qt-3.3/lib:/usr/lib64/tcl8.5/tclx8.4:/usr/lib/wine/:/usr/lib64/wine/:/usr/lib64/xulrunner-2"
+#define MAGICKCORE_LT_DLSEARCH_PATH "/lib64:/usr/lib64:/lib:/usr/lib:/usr/lib64/R/lib:/usr/lib64/atlas:/opt/modules/pkg/intel/f77/10.0.025/lib:/usr/local/lib:/usr/lib64/mysql:/usr/lib64/qt-3.3/lib:/usr/lib64/xulrunner-2"
#endif
/* The archive extension */
@@ -1440,7 +1444,9 @@
/* Define if you have WEBP library */
-/* #undef WEBP_DELEGATE */
+#ifndef MAGICKCORE_WEBP_DELEGATE
+#define MAGICKCORE_WEBP_DELEGATE 1
+#endif
/* Define to use the Windows GDI32 library */
/* #undef WINGDI32_DELEGATE */
diff --git a/MagickCore/montage.c b/MagickCore/montage.c
index 6b23d9f..26050b9 100644
--- a/MagickCore/montage.c
+++ b/MagickCore/montage.c
@@ -758,9 +758,9 @@
if ((montage_info->frame != (char *) NULL) &&
(image->compose == DstOutCompositeOp))
{
- SetPixelComponentMap(image,AlphaChannel);
+ SetPixelChannelMap(image,AlphaChannel);
(void) NegateImage(image,MagickFalse);
- SetPixelComponentMap(image,DefaultChannels);
+ SetPixelChannelMap(image,DefaultChannels);
}
}
/*
diff --git a/MagickCore/morphology.c b/MagickCore/morphology.c
index 463bb67..44e0a6b 100644
--- a/MagickCore/morphology.c
+++ b/MagickCore/morphology.c
@@ -2629,14 +2629,14 @@
* This removes need for 'cloning' a new image every iteration
*/
SetPixelRed(morphology_image,GetPixelRed(image,p+r*
- GetPixelComponents(image)),q);
+ GetPixelChannels(image)),q);
SetPixelGreen(morphology_image,GetPixelGreen(image,p+r*
- GetPixelComponents(image)),q);
+ GetPixelChannels(image)),q);
SetPixelBlue(morphology_image,GetPixelBlue(image,p+r*
- GetPixelComponents(image)),q);
+ GetPixelChannels(image)),q);
if (image->colorspace == CMYKColorspace)
SetPixelBlack(morphology_image,GetPixelBlack(image,p+r*
- GetPixelComponents(image)),q);
+ GetPixelChannels(image)),q);
/* Set the bias of the weighted average output */
result.red =
@@ -2667,18 +2667,18 @@
result.black+=(*k)*GetPixelBlack(image,k_pixels);
result.alpha += (*k)*GetPixelAlpha(image,k_pixels);
k--;
- k_pixels+=GetPixelComponents(image);
+ k_pixels+=GetPixelChannels(image);
}
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
SetPixelRed(morphology_image,ClampToQuantum(result.red),q);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
SetPixelGreen(morphology_image,ClampToQuantum(result.green),q);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
SetPixelBlue(morphology_image,ClampToQuantum(result.blue),q);
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
SetPixelBlack(morphology_image,ClampToQuantum(result.black),q);
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) &&
(image->matte == MagickTrue))
SetPixelAlpha(morphology_image,ClampToQuantum(result.alpha),q);
}
@@ -2703,7 +2703,7 @@
result.black += alpha*GetPixelBlack(image,k_pixels);
result.alpha += (*k)*GetPixelAlpha(image,k_pixels);
k--;
- k_pixels+=GetPixelComponents(image);
+ k_pixels+=GetPixelChannels(image);
}
/* Sync'ed channels, all channels are modified */
gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
@@ -2721,15 +2721,15 @@
}
/* Count up changed pixels */
- if ((GetPixelRed(image,p+r*GetPixelComponents(image)) != GetPixelRed(morphology_image,q))
- || (GetPixelGreen(image,p+r*GetPixelComponents(image)) != GetPixelGreen(morphology_image,q))
- || (GetPixelBlue(image,p+r*GetPixelComponents(image)) != GetPixelBlue(morphology_image,q))
- || (GetPixelAlpha(image,p+r*GetPixelComponents(image)) != GetPixelAlpha(morphology_image,q))
+ if ((GetPixelRed(image,p+r*GetPixelChannels(image)) != GetPixelRed(morphology_image,q))
+ || (GetPixelGreen(image,p+r*GetPixelChannels(image)) != GetPixelGreen(morphology_image,q))
+ || (GetPixelBlue(image,p+r*GetPixelChannels(image)) != GetPixelBlue(morphology_image,q))
+ || (GetPixelAlpha(image,p+r*GetPixelChannels(image)) != GetPixelAlpha(morphology_image,q))
|| ((image->colorspace == CMYKColorspace) &&
- (GetPixelBlack(image,p+r*GetPixelComponents(image)) != GetPixelBlack(morphology_image,q))))
+ (GetPixelBlack(image,p+r*GetPixelChannels(image)) != GetPixelBlack(morphology_image,q))))
changed++; /* The pixel was changed in some way! */
- p+=GetPixelComponents(image);
- q+=GetPixelComponents(morphology_image);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(morphology_image);
} /* y */
if ( SyncCacheViewAuthenticPixels(morphology_view,exception) == MagickFalse)
status=MagickFalse;
@@ -2809,14 +2809,14 @@
* This removes need for 'cloning' a new image every iteration
*/
SetPixelRed(morphology_image,GetPixelRed(image,p+r*
- GetPixelComponents(image)),q);
+ GetPixelChannels(image)),q);
SetPixelGreen(morphology_image,GetPixelGreen(image,p+r*
- GetPixelComponents(image)),q);
+ GetPixelChannels(image)),q);
SetPixelBlue(morphology_image,GetPixelBlue(image,p+r*
- GetPixelComponents(image)),q);
+ GetPixelChannels(image)),q);
if (image->colorspace == CMYKColorspace)
SetPixelBlack(morphology_image,GetPixelBlack(image,p+r*
- GetPixelComponents(image)),q);
+ GetPixelChannels(image)),q);
/* Defaults */
min.red =
@@ -2830,13 +2830,13 @@
max.alpha =
max.black = (MagickRealType) 0;
/* default result is the original pixel value */
- result.red = (MagickRealType) GetPixelRed(image,p+r*GetPixelComponents(image));
- result.green = (MagickRealType) GetPixelGreen(image,p+r*GetPixelComponents(image));
- result.blue = (MagickRealType) GetPixelBlue(image,p+r*GetPixelComponents(image));
+ result.red = (MagickRealType) GetPixelRed(image,p+r*GetPixelChannels(image));
+ result.green = (MagickRealType) GetPixelGreen(image,p+r*GetPixelChannels(image));
+ result.blue = (MagickRealType) GetPixelBlue(image,p+r*GetPixelChannels(image));
result.black = 0.0;
if (image->colorspace == CMYKColorspace)
- result.black = (MagickRealType) GetPixelBlack(image,p+r*GetPixelComponents(image));
- result.alpha=(MagickRealType) GetPixelAlpha(image,p+r*GetPixelComponents(image));
+ result.black = (MagickRealType) GetPixelBlack(image,p+r*GetPixelChannels(image));
+ result.alpha=(MagickRealType) GetPixelAlpha(image,p+r*GetPixelChannels(image));
switch (method) {
case ConvolveMorphology:
@@ -2887,33 +2887,33 @@
for (u=0; u < (ssize_t) kernel->width; u++, k--) {
if ( IsNan(*k) ) continue;
result.red += (*k)*
- GetPixelRed(image,k_pixels+u*GetPixelComponents(image));
+ GetPixelRed(image,k_pixels+u*GetPixelChannels(image));
result.green += (*k)*
- GetPixelGreen(image,k_pixels+u*GetPixelComponents(image));
+ GetPixelGreen(image,k_pixels+u*GetPixelChannels(image));
result.blue += (*k)*
- GetPixelBlue(image,k_pixels+u*GetPixelComponents(image));
+ GetPixelBlue(image,k_pixels+u*GetPixelChannels(image));
if (image->colorspace == CMYKColorspace)
result.black += (*k)*
- GetPixelBlack(image,k_pixels+u*GetPixelComponents(image));
+ GetPixelBlack(image,k_pixels+u*GetPixelChannels(image));
result.alpha += (*k)*
- GetPixelAlpha(image,k_pixels+u*GetPixelComponents(image));
+ GetPixelAlpha(image,k_pixels+u*GetPixelChannels(image));
}
- k_pixels += virt_width*GetPixelComponents(image);
+ k_pixels += virt_width*GetPixelChannels(image);
}
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
SetPixelRed(morphology_image,ClampToQuantum(result.red),
q);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
SetPixelGreen(morphology_image,ClampToQuantum(result.green),
q);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
SetPixelBlue(morphology_image,ClampToQuantum(result.blue),
q);
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
SetPixelBlack(morphology_image,ClampToQuantum(result.black),
q);
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) &&
(image->matte == MagickTrue))
SetPixelAlpha(morphology_image,ClampToQuantum(result.alpha),
q);
@@ -2932,21 +2932,21 @@
for (u=0; u < (ssize_t) kernel->width; u++, k--) {
if ( IsNan(*k) ) continue;
alpha=(*k)*(QuantumScale*GetPixelAlpha(image,k_pixels+u*
- GetPixelComponents(image)));
+ GetPixelChannels(image)));
gamma += alpha;
result.red += alpha*
- GetPixelRed(image,k_pixels+u*GetPixelComponents(image));
+ GetPixelRed(image,k_pixels+u*GetPixelChannels(image));
result.green += alpha*
- GetPixelGreen(image,k_pixels+u*GetPixelComponents(image));
+ GetPixelGreen(image,k_pixels+u*GetPixelChannels(image));
result.blue += alpha*
- GetPixelBlue(image,k_pixels+u*GetPixelComponents(image));
+ GetPixelBlue(image,k_pixels+u*GetPixelChannels(image));
if (image->colorspace == CMYKColorspace)
result.black+=alpha*
- GetPixelBlack(image,k_pixels+u*GetPixelComponents(image));
+ GetPixelBlack(image,k_pixels+u*GetPixelChannels(image));
result.alpha += (*k)*
- GetPixelAlpha(image,k_pixels+u*GetPixelComponents(image));
+ GetPixelAlpha(image,k_pixels+u*GetPixelChannels(image));
}
- k_pixels += virt_width*GetPixelComponents(image);
+ k_pixels += virt_width*GetPixelChannels(image);
}
/* Sync'ed channels, all channels are modified */
gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
@@ -2978,18 +2978,18 @@
for (u=0; u < (ssize_t) kernel->width; u++, k++) {
if ( IsNan(*k) || (*k) < 0.5 ) continue;
Minimize(min.red, (double)
- GetPixelRed(image,k_pixels+u*GetPixelComponents(image)));
+ GetPixelRed(image,k_pixels+u*GetPixelChannels(image)));
Minimize(min.green, (double)
- GetPixelGreen(image,k_pixels+u*GetPixelComponents(image)));
+ GetPixelGreen(image,k_pixels+u*GetPixelChannels(image)));
Minimize(min.blue, (double)
- GetPixelBlue(image,k_pixels+u*GetPixelComponents(image)));
+ GetPixelBlue(image,k_pixels+u*GetPixelChannels(image)));
if (image->colorspace == CMYKColorspace)
Minimize(min.black,(double)
- GetPixelBlack(image,k_pixels+u*GetPixelComponents(image)));
+ GetPixelBlack(image,k_pixels+u*GetPixelChannels(image)));
Minimize(min.alpha,(double)
- GetPixelAlpha(image,k_pixels+u*GetPixelComponents(image)));
+ GetPixelAlpha(image,k_pixels+u*GetPixelChannels(image)));
}
- k_pixels += virt_width*GetPixelComponents(image);
+ k_pixels += virt_width*GetPixelChannels(image);
}
break;
@@ -3011,18 +3011,18 @@
for (u=0; u < (ssize_t) kernel->width; u++, k--) {
if ( IsNan(*k) || (*k) < 0.5 ) continue;
Maximize(max.red, (double)
- GetPixelRed(image,k_pixels+u*GetPixelComponents(image)));
+ GetPixelRed(image,k_pixels+u*GetPixelChannels(image)));
Maximize(max.green, (double)
- GetPixelGreen(image,k_pixels+u*GetPixelComponents(image)));
+ GetPixelGreen(image,k_pixels+u*GetPixelChannels(image)));
Maximize(max.blue, (double)
- GetPixelBlue(image,k_pixels+u*GetPixelComponents(image)));
+ GetPixelBlue(image,k_pixels+u*GetPixelChannels(image)));
if (image->colorspace == CMYKColorspace)
Maximize(max.black, (double)
- GetPixelBlack(image,k_pixels+u*GetPixelComponents(image)));
+ GetPixelBlack(image,k_pixels+u*GetPixelChannels(image)));
Maximize(max.alpha,(double)
- GetPixelAlpha(image,k_pixels+u*GetPixelComponents(image)));
+ GetPixelAlpha(image,k_pixels+u*GetPixelChannels(image)));
}
- k_pixels += virt_width*GetPixelComponents(image);
+ k_pixels += virt_width*GetPixelChannels(image);
}
break;
@@ -3048,33 +3048,33 @@
if ( (*k) > 0.7 )
{ /* minimim of foreground pixels */
Minimize(min.red, (double)
- GetPixelRed(image,k_pixels+u*GetPixelComponents(image)));
+ GetPixelRed(image,k_pixels+u*GetPixelChannels(image)));
Minimize(min.green, (double)
- GetPixelGreen(image,k_pixels+u*GetPixelComponents(image)));
+ GetPixelGreen(image,k_pixels+u*GetPixelChannels(image)));
Minimize(min.blue, (double)
- GetPixelBlue(image,k_pixels+u*GetPixelComponents(image)));
+ GetPixelBlue(image,k_pixels+u*GetPixelChannels(image)));
if ( image->colorspace == CMYKColorspace)
Minimize(min.black,(double)
- GetPixelBlack(image,k_pixels+u*GetPixelComponents(image)));
+ GetPixelBlack(image,k_pixels+u*GetPixelChannels(image)));
Minimize(min.alpha,(double)
- GetPixelAlpha(image,k_pixels+u*GetPixelComponents(image)));
+ GetPixelAlpha(image,k_pixels+u*GetPixelChannels(image)));
}
else if ( (*k) < 0.3 )
{ /* maximum of background pixels */
Maximize(max.red, (double)
- GetPixelRed(image,k_pixels+u*GetPixelComponents(image)));
+ GetPixelRed(image,k_pixels+u*GetPixelChannels(image)));
Maximize(max.green, (double)
- GetPixelGreen(image,k_pixels+u*GetPixelComponents(image)));
+ GetPixelGreen(image,k_pixels+u*GetPixelChannels(image)));
Maximize(max.blue, (double)
- GetPixelBlue(image,k_pixels+u*GetPixelComponents(image)));
+ GetPixelBlue(image,k_pixels+u*GetPixelChannels(image)));
if (image->colorspace == CMYKColorspace)
Maximize(max.black, (double)
- GetPixelBlack(image,k_pixels+u*GetPixelComponents(image)));
+ GetPixelBlack(image,k_pixels+u*GetPixelChannels(image)));
Maximize(max.alpha,(double)
- GetPixelAlpha(image,k_pixels+u*GetPixelComponents(image)));
+ GetPixelAlpha(image,k_pixels+u*GetPixelChannels(image)));
}
}
- k_pixels += virt_width*GetPixelComponents(image);
+ k_pixels += virt_width*GetPixelChannels(image);
}
/* Pattern Match if difference is positive */
min.red -= max.red; Maximize( min.red, 0.0 );
@@ -3099,21 +3099,21 @@
for (u=0; u < (ssize_t) kernel->width; u++, k++) {
if ( IsNan(*k) || (*k) < 0.5 ) continue;
if ( result.red == 0.0 ||
- GetPixelIntensity(image,k_pixels+u*GetPixelComponents(image)) < GetPixelIntensity(morphology_image,q) ) {
+ GetPixelIntensity(image,k_pixels+u*GetPixelChannels(image)) < GetPixelIntensity(morphology_image,q) ) {
/* copy the whole pixel - no channel selection */
SetPixelRed(morphology_image,GetPixelRed(image,
- k_pixels+u*GetPixelComponents(image)),q);
+ k_pixels+u*GetPixelChannels(image)),q);
SetPixelGreen(morphology_image,GetPixelGreen(image,
- k_pixels+u*GetPixelComponents(image)),q);
+ k_pixels+u*GetPixelChannels(image)),q);
SetPixelBlue(morphology_image,GetPixelBlue(image,
- k_pixels+u*GetPixelComponents(image)),q);
+ k_pixels+u*GetPixelChannels(image)),q);
SetPixelAlpha(morphology_image,GetPixelAlpha(image,
- k_pixels+u*GetPixelComponents(image)),q);
+ k_pixels+u*GetPixelChannels(image)),q);
if ( result.red > 0.0 ) changed++;
result.red = 1.0;
}
}
- k_pixels += virt_width*GetPixelComponents(image);
+ k_pixels += virt_width*GetPixelChannels(image);
}
break;
@@ -3134,21 +3134,21 @@
for (u=0; u < (ssize_t) kernel->width; u++, k--) {
if ( IsNan(*k) || (*k) < 0.5 ) continue; /* boolean kernel */
if ( result.red == 0.0 ||
- GetPixelIntensity(image,k_pixels+u*GetPixelComponents(image)) > GetPixelIntensity(morphology_image,q) ) {
+ GetPixelIntensity(image,k_pixels+u*GetPixelChannels(image)) > GetPixelIntensity(morphology_image,q) ) {
/* copy the whole pixel - no channel selection */
SetPixelRed(morphology_image,GetPixelRed(image,
- k_pixels+u*GetPixelComponents(image)),q);
+ k_pixels+u*GetPixelChannels(image)),q);
SetPixelGreen(morphology_image,GetPixelGreen(image,
- k_pixels+u*GetPixelComponents(image)),q);
+ k_pixels+u*GetPixelChannels(image)),q);
SetPixelBlue(morphology_image,GetPixelBlue(image,
- k_pixels+u*GetPixelComponents(image)),q);
+ k_pixels+u*GetPixelChannels(image)),q);
SetPixelAlpha(morphology_image,GetPixelAlpha(image,
- k_pixels+u*GetPixelComponents(image)),q);
+ k_pixels+u*GetPixelChannels(image)),q);
if ( result.red > 0.0 ) changed++;
result.red = 1.0;
}
}
- k_pixels += virt_width*GetPixelComponents(image);
+ k_pixels += virt_width*GetPixelChannels(image);
}
break;
#if 0
@@ -3182,7 +3182,7 @@
if ( image->colorspace == CMYKColorspace)
Minimize(result.black,(*k)+GetPixelBlack(p_image,k_indexes+u));
}
- k_pixels += virt_width*GetPixelComponents(image);
+ k_pixels += virt_width*GetPixelChannels(image);
}
break;
#endif
@@ -3233,30 +3233,30 @@
case ErodeIntensityMorphology:
break; /* full pixel was directly assigned - not a channel method */
default:
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
SetPixelRed(morphology_image,ClampToQuantum(result.red),q);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
SetPixelGreen(morphology_image,ClampToQuantum(result.green),q);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
SetPixelBlue(morphology_image,ClampToQuantum(result.blue),q);
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
SetPixelBlack(morphology_image,ClampToQuantum(result.black),q);
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) &&
(image->matte == MagickTrue))
SetPixelAlpha(morphology_image,ClampToQuantum(result.alpha),q);
break;
}
/* Count up changed pixels */
- if ((GetPixelRed(image,p+r*GetPixelComponents(image)) != GetPixelRed(morphology_image,q)) ||
- (GetPixelGreen(image,p+r*GetPixelComponents(image)) != GetPixelGreen(morphology_image,q)) ||
- (GetPixelBlue(image,p+r*GetPixelComponents(image)) != GetPixelBlue(morphology_image,q)) ||
- (GetPixelAlpha(image,p+r*GetPixelComponents(image)) != GetPixelAlpha(morphology_image,q)) ||
+ if ((GetPixelRed(image,p+r*GetPixelChannels(image)) != GetPixelRed(morphology_image,q)) ||
+ (GetPixelGreen(image,p+r*GetPixelChannels(image)) != GetPixelGreen(morphology_image,q)) ||
+ (GetPixelBlue(image,p+r*GetPixelChannels(image)) != GetPixelBlue(morphology_image,q)) ||
+ (GetPixelAlpha(image,p+r*GetPixelChannels(image)) != GetPixelAlpha(morphology_image,q)) ||
((image->colorspace == CMYKColorspace) &&
- (GetPixelBlack(image,p+r*GetPixelComponents(image)) != GetPixelBlack(morphology_image,q))))
+ (GetPixelBlack(image,p+r*GetPixelChannels(image)) != GetPixelBlack(morphology_image,q))))
changed++; /* The pixel was changed in some way! */
- p+=GetPixelComponents(image);
- q+=GetPixelComponents(morphology_image);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(morphology_image);
} /* x */
if ( SyncCacheViewAuthenticPixels(morphology_view,exception) == MagickFalse)
status=MagickFalse;
@@ -3415,36 +3415,36 @@
for (u=0; u < (ssize_t) kernel->width; u++, k--) {
if ( IsNan(*k) ) continue;
Minimize(result.red, (*k)+
- GetPixelRed(image,k_pixels+u*GetPixelComponents(image)));
+ GetPixelRed(image,k_pixels+u*GetPixelChannels(image)));
Minimize(result.green, (*k)+
- GetPixelGreen(image,k_pixels+u*GetPixelComponents(image)));
+ GetPixelGreen(image,k_pixels+u*GetPixelChannels(image)));
Minimize(result.blue, (*k)+
- GetPixelBlue(image,k_pixels+u*GetPixelComponents(image)));
+ GetPixelBlue(image,k_pixels+u*GetPixelChannels(image)));
if (image->colorspace == CMYKColorspace)
Minimize(result.black,(*k)+
- GetPixelBlue(image,k_pixels+u*GetPixelComponents(image)));
+ GetPixelBlue(image,k_pixels+u*GetPixelChannels(image)));
Minimize(result.alpha, (*k)+
- GetPixelAlpha(image,k_pixels+u*GetPixelComponents(image)));
+ GetPixelAlpha(image,k_pixels+u*GetPixelChannels(image)));
}
- k_pixels += virt_width*GetPixelComponents(image);
+ k_pixels += virt_width*GetPixelChannels(image);
}
/* repeat with the just processed pixels of this row */
k = &kernel->values[ kernel->width*(kernel->y+1)-1 ];
- k_pixels = q-offx*GetPixelComponents(image);
+ k_pixels = q-offx*GetPixelChannels(image);
for (u=0; u < (ssize_t) offx; u++, k--) {
if ( x+u-offx < 0 ) continue; /* off the edge! */
if ( IsNan(*k) ) continue;
Minimize(result.red, (*k)+
- GetPixelRed(image,k_pixels+u*GetPixelComponents(image)));
+ GetPixelRed(image,k_pixels+u*GetPixelChannels(image)));
Minimize(result.green, (*k)+
- GetPixelGreen(image,k_pixels+u*GetPixelComponents(image)));
+ GetPixelGreen(image,k_pixels+u*GetPixelChannels(image)));
Minimize(result.blue, (*k)+
- GetPixelBlue(image,k_pixels+u*GetPixelComponents(image)));
+ GetPixelBlue(image,k_pixels+u*GetPixelChannels(image)));
if (image->colorspace == CMYKColorspace)
Minimize(result.black,(*k)+
- GetPixelBlack(image,k_pixels+u*GetPixelComponents(image)));
+ GetPixelBlack(image,k_pixels+u*GetPixelChannels(image)));
Minimize(result.alpha,(*k)+
- GetPixelAlpha(image,k_pixels+u*GetPixelComponents(image)));
+ GetPixelAlpha(image,k_pixels+u*GetPixelChannels(image)));
}
break;
case VoronoiMorphology:
@@ -3458,24 +3458,24 @@
for (v=0; v <= (ssize_t) offy; v++) {
for (u=0; u < (ssize_t) kernel->width; u++, k--) {
if ( IsNan(*k) ) continue;
- if( result.alpha > (*k)+GetPixelAlpha(image,k_pixels+u*GetPixelComponents(image)) )
+ if( result.alpha > (*k)+GetPixelAlpha(image,k_pixels+u*GetPixelChannels(image)) )
{
- SetPixelInfo(image,k_pixels+u*GetPixelComponents(image),
+ SetPixelInfo(image,k_pixels+u*GetPixelChannels(image),
&result);
result.alpha += *k;
}
}
- k_pixels += virt_width*GetPixelComponents(image);
+ k_pixels += virt_width*GetPixelChannels(image);
}
/* repeat with the just processed pixels of this row */
k = &kernel->values[ kernel->width*(kernel->y+1)-1 ];
- k_pixels = q-offx*GetPixelComponents(image);
+ k_pixels = q-offx*GetPixelChannels(image);
for (u=0; u < (ssize_t) offx; u++, k--) {
if ( x+u-offx < 0 ) continue; /* off the edge! */
if ( IsNan(*k) ) continue;
- if( result.alpha > (*k)+GetPixelAlpha(image,k_pixels+u*GetPixelComponents(image)) )
+ if( result.alpha > (*k)+GetPixelAlpha(image,k_pixels+u*GetPixelChannels(image)) )
{
- SetPixelInfo(image,k_pixels+u*GetPixelComponents(image),
+ SetPixelInfo(image,k_pixels+u*GetPixelChannels(image),
&result);
result.alpha += *k;
}
@@ -3491,31 +3491,31 @@
SetPixelPixelInfo(image,&result,q);
break;
default:
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
SetPixelRed(image,ClampToQuantum(result.red),q);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
SetPixelGreen(image,ClampToQuantum(result.green),q);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
SetPixelBlue(image,ClampToQuantum(result.blue),q);
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
SetPixelBlack(image,ClampToQuantum(result.black),q);
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0 &&
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0 &&
(image->matte == MagickTrue))
SetPixelAlpha(image,ClampToQuantum(result.alpha),q);
break;
}
/* Count up changed pixels */
- if ((GetPixelRed(image,p+r*GetPixelComponents(image)) != GetPixelRed(image,q)) ||
- (GetPixelGreen(image,p+r*GetPixelComponents(image)) != GetPixelGreen(image,q)) ||
- (GetPixelBlue(image,p+r*GetPixelComponents(image)) != GetPixelBlue(image,q)) ||
- (GetPixelAlpha(image,p+r*GetPixelComponents(image)) != GetPixelAlpha(image,q)) ||
+ if ((GetPixelRed(image,p+r*GetPixelChannels(image)) != GetPixelRed(image,q)) ||
+ (GetPixelGreen(image,p+r*GetPixelChannels(image)) != GetPixelGreen(image,q)) ||
+ (GetPixelBlue(image,p+r*GetPixelChannels(image)) != GetPixelBlue(image,q)) ||
+ (GetPixelAlpha(image,p+r*GetPixelChannels(image)) != GetPixelAlpha(image,q)) ||
((image->colorspace == CMYKColorspace) &&
- (GetPixelBlack(image,p+r*GetPixelComponents(image)) != GetPixelBlack(image,q))))
+ (GetPixelBlack(image,p+r*GetPixelChannels(image)) != GetPixelBlack(image,q))))
changed++; /* The pixel was changed in some way! */
- p+=GetPixelComponents(image); /* increment pixel buffers */
- q+=GetPixelComponents(image);
+ p+=GetPixelChannels(image); /* increment pixel buffers */
+ q+=GetPixelChannels(image);
} /* x */
if ( SyncCacheViewAuthenticPixels(auth_view,exception) == MagickFalse)
@@ -3561,8 +3561,8 @@
break;
/* adjust positions to end of row */
- p += (image->columns-1)*GetPixelComponents(image);
- q += (image->columns-1)*GetPixelComponents(image);
+ p += (image->columns-1)*GetPixelChannels(image);
+ q += (image->columns-1)*GetPixelChannels(image);
/* offset to origin in 'p'. while 'q' points to it directly */
r = offx;
@@ -3599,36 +3599,36 @@
for (u=0; u < (ssize_t) kernel->width; u++, k--) {
if ( IsNan(*k) ) continue;
Minimize(result.red, (*k)+
- GetPixelRed(image,k_pixels+u*GetPixelComponents(image)));
+ GetPixelRed(image,k_pixels+u*GetPixelChannels(image)));
Minimize(result.green, (*k)+
- GetPixelGreen(image,k_pixels+u*GetPixelComponents(image)));
+ GetPixelGreen(image,k_pixels+u*GetPixelChannels(image)));
Minimize(result.blue, (*k)+
- GetPixelBlue(image,k_pixels+u*GetPixelComponents(image)));
+ GetPixelBlue(image,k_pixels+u*GetPixelChannels(image)));
if ( image->colorspace == CMYKColorspace)
Minimize(result.black,(*k)+
- GetPixelBlack(image,k_pixels+u*GetPixelComponents(image)));
+ GetPixelBlack(image,k_pixels+u*GetPixelChannels(image)));
Minimize(result.alpha, (*k)+
- GetPixelAlpha(image,k_pixels+u*GetPixelComponents(image)));
+ GetPixelAlpha(image,k_pixels+u*GetPixelChannels(image)));
}
- k_pixels += virt_width*GetPixelComponents(image);
+ k_pixels += virt_width*GetPixelChannels(image);
}
/* repeat with the just processed pixels of this row */
k = &kernel->values[ kernel->width*(kernel->y)+kernel->x-1 ];
- k_pixels = q-offx*GetPixelComponents(image);
+ k_pixels = q-offx*GetPixelChannels(image);
for (u=offx+1; u < (ssize_t) kernel->width; u++, k--) {
if ( (x+u-offx) >= (ssize_t)image->columns ) continue;
if ( IsNan(*k) ) continue;
Minimize(result.red, (*k)+
- GetPixelRed(image,k_pixels+u*GetPixelComponents(image)));
+ GetPixelRed(image,k_pixels+u*GetPixelChannels(image)));
Minimize(result.green, (*k)+
- GetPixelGreen(image,k_pixels+u*GetPixelComponents(image)));
+ GetPixelGreen(image,k_pixels+u*GetPixelChannels(image)));
Minimize(result.blue, (*k)+
- GetPixelBlue(image,k_pixels+u*GetPixelComponents(image)));
+ GetPixelBlue(image,k_pixels+u*GetPixelChannels(image)));
if ( image->colorspace == CMYKColorspace)
Minimize(result.black, (*k)+
- GetPixelBlack(image,k_pixels+u*GetPixelComponents(image)));
+ GetPixelBlack(image,k_pixels+u*GetPixelChannels(image)));
Minimize(result.alpha, (*k)+
- GetPixelAlpha(image,k_pixels+u*GetPixelComponents(image)));
+ GetPixelAlpha(image,k_pixels+u*GetPixelChannels(image)));
}
break;
case VoronoiMorphology:
@@ -3642,24 +3642,24 @@
for (v=offy; v < (ssize_t) kernel->height; v++) {
for (u=0; u < (ssize_t) kernel->width; u++, k--) {
if ( IsNan(*k) ) continue;
- if( result.alpha > (*k)+GetPixelAlpha(image,k_pixels+u*GetPixelComponents(image)) )
+ if( result.alpha > (*k)+GetPixelAlpha(image,k_pixels+u*GetPixelChannels(image)) )
{
- SetPixelInfo(image,k_pixels+u*GetPixelComponents(image),
+ SetPixelInfo(image,k_pixels+u*GetPixelChannels(image),
&result);
result.alpha += *k;
}
}
- k_pixels += virt_width*GetPixelComponents(image);
+ k_pixels += virt_width*GetPixelChannels(image);
}
/* repeat with the just processed pixels of this row */
k = &kernel->values[ kernel->width*(kernel->y)+kernel->x-1 ];
- k_pixels = q-offx*GetPixelComponents(image);
+ k_pixels = q-offx*GetPixelChannels(image);
for (u=offx+1; u < (ssize_t) kernel->width; u++, k--) {
if ( (x+u-offx) >= (ssize_t)image->columns ) continue;
if ( IsNan(*k) ) continue;
- if( result.alpha > (*k)+GetPixelAlpha(image,k_pixels+u*GetPixelComponents(image)) )
+ if( result.alpha > (*k)+GetPixelAlpha(image,k_pixels+u*GetPixelChannels(image)) )
{
- SetPixelInfo(image,k_pixels+u*GetPixelComponents(image),
+ SetPixelInfo(image,k_pixels+u*GetPixelChannels(image),
&result);
result.alpha += *k;
}
@@ -3675,31 +3675,31 @@
SetPixelPixelInfo(image,&result,q);
break;
default:
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
SetPixelRed(image,ClampToQuantum(result.red),q);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
SetPixelGreen(image,ClampToQuantum(result.green),q);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
SetPixelBlue(image,ClampToQuantum(result.blue),q);
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
SetPixelBlack(image,ClampToQuantum(result.black),q);
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0 &&
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0 &&
(image->matte == MagickTrue))
SetPixelAlpha(image,ClampToQuantum(result.alpha),q);
break;
}
/* Count up changed pixels */
- if ( (GetPixelRed(image,p+r*GetPixelComponents(image)) != GetPixelRed(image,q))
- || (GetPixelGreen(image,p+r*GetPixelComponents(image)) != GetPixelGreen(image,q))
- || (GetPixelBlue(image,p+r*GetPixelComponents(image)) != GetPixelBlue(image,q))
- || (GetPixelAlpha(image,p+r*GetPixelComponents(image)) != GetPixelAlpha(image,q))
+ if ( (GetPixelRed(image,p+r*GetPixelChannels(image)) != GetPixelRed(image,q))
+ || (GetPixelGreen(image,p+r*GetPixelChannels(image)) != GetPixelGreen(image,q))
+ || (GetPixelBlue(image,p+r*GetPixelChannels(image)) != GetPixelBlue(image,q))
+ || (GetPixelAlpha(image,p+r*GetPixelChannels(image)) != GetPixelAlpha(image,q))
|| ((image->colorspace == CMYKColorspace) &&
- (GetPixelBlack(image,p+r*GetPixelComponents(image)) != GetPixelBlack(image,q))))
+ (GetPixelBlack(image,p+r*GetPixelChannels(image)) != GetPixelBlack(image,q))))
changed++; /* The pixel was changed in some way! */
- p-=GetPixelComponents(image); /* go backward through pixel buffers */
- q-=GetPixelComponents(image);
+ p-=GetPixelChannels(image); /* go backward through pixel buffers */
+ q-=GetPixelChannels(image);
} /* x */
if ( SyncCacheViewAuthenticPixels(auth_view,exception) == MagickFalse)
status=MagickFalse;
diff --git a/MagickCore/nt-feature.c b/MagickCore/nt-feature.c
index 822c935..b7e8436 100644
--- a/MagickCore/nt-feature.c
+++ b/MagickCore/nt-feature.c
@@ -649,7 +649,7 @@
q->rgbGreen=ScaleQuantumToChar(GetPixelGreen(image,p));
q->rgbBlue=ScaleQuantumToChar(GetPixelBlue(image,p));
q->rgbReserved=0;
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
q++;
}
}
diff --git a/MagickCore/paint.c b/MagickCore/paint.c
index dd4c468..4466361 100644
--- a/MagickCore/paint.c
+++ b/MagickCore/paint.c
@@ -229,8 +229,8 @@
exception);
if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL))
break;
- p+=x1*GetPixelComponents(image);
- q+=x1*GetPixelComponents(floodplane_image);
+ p+=x1*GetPixelChannels(image);
+ q+=x1*GetPixelChannels(floodplane_image);
for (x=x1; x >= 0; x--)
{
if (GetPixelAlpha(image,q) == TransparentAlpha)
@@ -239,8 +239,8 @@
if (IsFuzzyEquivalencePixelInfo(&pixel,target) == invert)
break;
SetPixelAlpha(floodplane_image,TransparentAlpha,q);
- p-=GetPixelComponents(image);
- q-=GetPixelComponents(floodplane_image);
+ p-=GetPixelChannels(image);
+ q-=GetPixelChannels(floodplane_image);
}
if (SyncCacheViewAuthenticPixels(floodplane_view,exception) == MagickFalse)
break;
@@ -274,8 +274,8 @@
break;
SetPixelAlpha(floodplane_image,
TransparentAlpha,q);
- p+=GetPixelComponents(image);
- q+=GetPixelComponents(floodplane_image);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(floodplane_image);
}
if (SyncCacheViewAuthenticPixels(floodplane_view,exception) == MagickFalse)
break;
@@ -302,8 +302,8 @@
SetPixelInfo(image,p,&pixel);
if (IsFuzzyEquivalencePixelInfo(&pixel,target) != invert)
break;
- p+=GetPixelComponents(image);
- q+=GetPixelComponents(floodplane_image);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(floodplane_image);
}
}
start=x;
@@ -336,20 +336,20 @@
SetPixelInfoPacket(image,&fill_color,&fill);
if (image->colorspace == CMYKColorspace)
ConvertRGBToCMYK(&fill);
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
SetPixelRed(image,ClampToQuantum(fill.red),q);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
SetPixelGreen(image,ClampToQuantum(fill.green),q);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
SetPixelBlue(image,ClampToQuantum(fill.blue),q);
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
SetPixelBlack(image,ClampToQuantum(fill.black),q);
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
SetPixelAlpha(image,ClampToQuantum(fill.alpha),q);
}
- p+=GetPixelComponents(floodplane_image);
- q+=GetPixelComponents(image);
+ p+=GetPixelChannels(floodplane_image);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
break;
@@ -662,19 +662,19 @@
i+=(ssize_t) (image->columns+width);
}
SetPixelRed(paint_image,GetPixelRed(image,p+j*
- GetPixelComponents(image)),q);
+ GetPixelChannels(image)),q);
SetPixelGreen(paint_image,GetPixelGreen(image,p+j*
- GetPixelComponents(image)),q);
+ GetPixelChannels(image)),q);
SetPixelBlue(paint_image,GetPixelBlue(image,p+j*
- GetPixelComponents(image)),q);
+ GetPixelChannels(image)),q);
if (image->colorspace == CMYKColorspace)
SetPixelBlack(paint_image,GetPixelBlack(image,p+j*
- GetPixelComponents(image)),q);
+ GetPixelChannels(image)),q);
if (image->matte != MagickFalse)
SetPixelAlpha(paint_image,GetPixelAlpha(image,p+j*
- GetPixelComponents(image)),q);
- p+=GetPixelComponents(image);
- q+=GetPixelComponents(paint_image);
+ GetPixelChannels(image)),q);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(paint_image);
}
if (SyncCacheViewAuthenticPixels(paint_view,exception) == MagickFalse)
status=MagickFalse;
@@ -803,19 +803,19 @@
SetPixelInfo(image,q,&pixel);
if (IsFuzzyEquivalencePixelInfo(&pixel,target) != invert)
{
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
SetPixelRed(image,ClampToQuantum(fill->red),q);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
SetPixelGreen(image,ClampToQuantum(fill->green),q);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
SetPixelBlue(image,ClampToQuantum(fill->blue),q);
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
SetPixelBlack(image,ClampToQuantum(fill->black),q);
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
SetPixelAlpha(image,ClampToQuantum(fill->alpha),q);
}
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -943,7 +943,7 @@
SetPixelInfo(image,q,&pixel);
if (IsFuzzyEquivalencePixelInfo(&pixel,target) != invert)
SetPixelAlpha(image,opacity,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -1078,7 +1078,7 @@
MagickTrue : MagickFalse;
if (match != invert)
SetPixelAlpha(image,opacity,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
diff --git a/MagickCore/pixel-accessor.h b/MagickCore/pixel-accessor.h
index 038f76a..3799e47 100644
--- a/MagickCore/pixel-accessor.h
+++ b/MagickCore/pixel-accessor.h
@@ -29,129 +29,125 @@
static inline Quantum GetPixelAlpha(const Image *image,const Quantum *pixel)
{
- return(pixel[image->component_map[image->map][AlphaPixelComponent].component]);
+ return(pixel[image->channel_map[image->map][AlphaPixelChannel].channel]);
}
static inline PixelTrait GetPixelAlphaTraits(const Image *image)
{
- return(image->component_map[image->map][AlphaPixelComponent].traits);
+ return(image->channel_map[image->map][AlphaPixelChannel].traits);
}
static inline Quantum GetPixelBlack(const Image *image,const Quantum *pixel)
{
- return(pixel[image->component_map[image->map][BlackPixelComponent].component]);
+ return(pixel[image->channel_map[image->map][BlackPixelChannel].channel]);
}
static inline PixelTrait GetPixelBlackTraits(const Image *image)
{
- return(image->component_map[image->map][BlackPixelComponent].traits);
+ return(image->channel_map[image->map][BlackPixelChannel].traits);
}
static inline Quantum GetPixelBlue(const Image *image,const Quantum *pixel)
{
- return(pixel[image->component_map[image->map][BluePixelComponent].component]);
+ return(pixel[image->channel_map[image->map][BluePixelChannel].channel]);
}
static inline PixelTrait GetPixelBlueTraits(const Image *image)
{
- return(image->component_map[image->map][BluePixelComponent].traits);
+ return(image->channel_map[image->map][BluePixelChannel].traits);
}
static inline Quantum GetPixelCb(const Image *image,const Quantum *pixel)
{
- return(pixel[image->component_map[image->map][CbPixelComponent].component]);
+ return(pixel[image->channel_map[image->map][CbPixelChannel].channel]);
}
static inline PixelTrait GetPixelCbTraits(const Image *image)
{
- return(image->component_map[image->map][CbPixelComponent].traits);
+ return(image->channel_map[image->map][CbPixelChannel].traits);
}
-static inline Quantum GetPixelComponent(const Image *image,
- const PixelComponent component,const Quantum *pixel)
+static inline Quantum GetPixelChannel(const Image *image,
+ const PixelChannel channel,const Quantum *pixel)
{
- return(pixel[image->component_map[image->map][component].component]);
+ return(pixel[image->channel_map[image->map][channel].channel]);
}
-static inline Quantum GetPixelComponentMapComponent(const Image *image,
- const PixelComponent component)
+static inline Quantum GetPixelChannelMapChannel(const Image *image,
+ const PixelChannel channel)
{
- return(image->component_map[image->map][component].component);
+ return(image->channel_map[image->map][channel].channel);
}
-static inline PixelTrait GetPixelComponentMapTraits(const Image *image,
- const PixelComponent component)
+static inline PixelTrait GetPixelChannelMapTraits(const Image *image,
+ const PixelChannel channel)
{
- return(image->component_map[image->map][component].traits);
+ return(image->channel_map[image->map][channel].traits);
}
-static inline size_t GetPixelComponents(const Image *image)
+static inline size_t GetPixelChannels(const Image *image)
{
- return(image->pixel_components);
-}
-
-static inline PixelTrait GetPixelComponentTraits(const Image *image,
- const PixelComponent component)
-{
- return(image->component_map[image->map][component].traits);
+ return(image->number_channels);
}
static inline Quantum GetPixelCr(const Image *image,const Quantum *pixel)
{
- return(pixel[image->component_map[image->map][CrPixelComponent].component]);
+ return(pixel[image->channel_map[image->map][CrPixelChannel].channel]);
}
static inline PixelTrait GetPixelCrTraits(const Image *image)
{
- return(image->component_map[image->map][CrPixelComponent].traits);
+ return(image->channel_map[image->map][CrPixelChannel].traits);
}
static inline Quantum GetPixelCyan(const Image *image,const Quantum *pixel)
{
- return(pixel[image->component_map[image->map][CyanPixelComponent].component]);
+ return(pixel[image->channel_map[image->map][CyanPixelChannel].channel]);
}
static inline PixelTrait GetPixelCyanTraits(const Image *image)
{
- return(image->component_map[image->map][CyanPixelComponent].traits);
+ return(image->channel_map[image->map][CyanPixelChannel].traits);
}
static inline Quantum GetPixelGray(const Image *image,const Quantum *pixel)
{
- return(pixel[image->component_map[image->map][GrayPixelComponent].component]);
+ return(pixel[image->channel_map[image->map][GrayPixelChannel].channel]);
}
static inline PixelTrait GetPixelGrayTraits(const Image *image)
{
- return(image->component_map[image->map][GrayPixelComponent].traits);
+ return(image->channel_map[image->map][GrayPixelChannel].traits);
}
static inline Quantum GetPixelGreen(const Image *image,const Quantum *pixel)
{
- return(pixel[image->component_map[image->map][GreenPixelComponent].component]);
+ return(pixel[image->channel_map[image->map][GreenPixelChannel].channel]);
}
static inline PixelTrait GetPixelGreenTraits(const Image *image)
{
- return(image->component_map[image->map][GreenPixelComponent].traits);
+ return(image->channel_map[image->map][GreenPixelChannel].traits);
}
static inline Quantum GetPixelIndex(const Image *image,const Quantum *pixel)
{
- return(pixel[image->component_map[image->map][IndexPixelComponent].component]);
+ return(pixel[image->channel_map[image->map][IndexPixelChannel].channel]);
}
static inline PixelTrait GetPixelIndexTraits(const Image *image)
{
- return(image->component_map[image->map][IndexPixelComponent].traits);
+ return(image->channel_map[image->map][IndexPixelChannel].traits);
}
static inline Quantum GetPixelInfoIntensity(const PixelInfo *pixel_info)
{
#if !defined(MAGICKCORE_HDRI_SUPPORT)
- return((Quantum) (0.299*pixel_info->red+0.587*pixel_info->green+0.114*pixel_info->blue+0.5));
+ return((Quantum) (0.299*pixel_info->red+0.587*pixel_info->green+0.114*
+ pixel_info->blue+0.5));
#else
- return((Quantum) (0.299*pixel_info->red+0.587*pixel_info->green+0.114*pixel_info->blue));
+ return((Quantum) (0.299*pixel_info->red+0.587*pixel_info->green+0.114*
+ pixel_info->blue));
#endif
}
@@ -170,15 +166,14 @@
return((Quantum) luminance);
}
-static inline Quantum GetPixelMagenta(const Image *image,
- const Quantum *pixel)
+static inline Quantum GetPixelMagenta(const Image *image,const Quantum *pixel)
{
- return(pixel[image->component_map[image->map][MagentaPixelComponent].component]);
+ return(pixel[image->channel_map[image->map][MagentaPixelChannel].channel]);
}
static inline PixelTrait GetPixelMagentaTraits(const Image *image)
{
- return(image->component_map[image->map][MagentaPixelComponent].traits);
+ return(image->channel_map[image->map][MagentaPixelChannel].traits);
}
static inline size_t GetPixelMetacontentExtent(const Image *image)
@@ -188,12 +183,12 @@
static inline Quantum GetPixelRed(const Image *image,const Quantum *pixel)
{
- return(pixel[image->component_map[image->map][RedPixelComponent].component]);
+ return(pixel[image->channel_map[image->map][RedPixelChannel].channel]);
}
static inline PixelTrait GetPixelRedTraits(const Image *image)
{
- return(image->component_map[image->map][RedPixelComponent].traits);
+ return(image->channel_map[image->map][RedPixelChannel].traits);
}
static inline void GetPixelPacket(const Image *image,const Quantum *pixel,
@@ -227,30 +222,29 @@
}
static inline PixelTrait GetPixelTraits(const Image *image,
- const PixelComponent component)
+ const PixelChannel channel)
{
- return(image->component_map[image->map][component].traits);
+ return(image->channel_map[image->map][channel].traits);
}
static inline Quantum GetPixelY(const Image *image,const Quantum *pixel)
{
- return(pixel[image->component_map[image->map][YPixelComponent].component]);
+ return(pixel[image->channel_map[image->map][YPixelChannel].channel]);
}
static inline PixelTrait GetPixelYTraits(const Image *image)
{
- return(image->component_map[image->map][YPixelComponent].traits);
+ return(image->channel_map[image->map][YPixelChannel].traits);
}
-static inline Quantum GetPixelYellow(const Image *image,
- const Quantum *pixel)
+static inline Quantum GetPixelYellow(const Image *image,const Quantum *pixel)
{
- return(pixel[image->component_map[image->map][YellowPixelComponent].component]);
+ return(pixel[image->channel_map[image->map][YellowPixelChannel].channel]);
}
static inline PixelTrait GetPixelYellowTraits(const Image *image)
{
- return(image->component_map[image->map][YellowPixelComponent].traits);
+ return(image->channel_map[image->map][YellowPixelChannel].traits);
}
static inline MagickBooleanType IsPixelEquivalent(const Image *image,
@@ -430,124 +424,124 @@
static inline void SetPixelAlpha(const Image *image,const Quantum alpha,
Quantum *pixel)
{
- pixel[image->component_map[image->map][AlphaPixelComponent].component]=alpha;
+ pixel[image->channel_map[image->map][AlphaPixelChannel].channel]=alpha;
}
static inline void SetPixelAlphaTraits(Image *image,const PixelTrait traits)
{
- image->component_map[image->map][AlphaPixelComponent].traits=traits;
+ image->channel_map[image->map][AlphaPixelChannel].traits=traits;
}
static inline void SetPixelBlack(const Image *image,const Quantum black,
Quantum *pixel)
{
- pixel[image->component_map[image->map][BlackPixelComponent].component]=black;
+ pixel[image->channel_map[image->map][BlackPixelChannel].channel]=black;
}
static inline void SetPixelBlackTraits(Image *image,const PixelTrait traits)
{
- image->component_map[image->map][BlackPixelComponent].traits=traits;
+ image->channel_map[image->map][BlackPixelChannel].traits=traits;
}
static inline void SetPixelBlue(const Image *image,const Quantum blue,
Quantum *pixel)
{
- pixel[image->component_map[image->map][BluePixelComponent].component]=blue;
+ pixel[image->channel_map[image->map][BluePixelChannel].channel]=blue;
}
static inline void SetPixelBlueTraits(Image *image,const PixelTrait traits)
{
- image->component_map[image->map][BluePixelComponent].traits=traits;
+ image->channel_map[image->map][BluePixelChannel].traits=traits;
}
static inline void SetPixelCb(const Image *image,const Quantum cb,
Quantum *pixel)
{
- pixel[image->component_map[image->map][CbPixelComponent].component]=cb;
+ pixel[image->channel_map[image->map][CbPixelChannel].channel]=cb;
}
static inline void SetPixelCbTraits(Image *image,const PixelTrait traits)
{
- image->component_map[image->map][CbPixelComponent].traits=traits;
+ image->channel_map[image->map][CbPixelChannel].traits=traits;
}
-static inline void SetPixelComponent(const Image *image,
- const PixelComponent component,const Quantum quantum,Quantum *pixel)
+static inline void SetPixelChannel(const Image *image,
+ const PixelChannel channel,const Quantum quantum,Quantum *pixel)
{
- pixel[image->component_map[image->map][component].component]=quantum;
+ pixel[image->channel_map[image->map][channel].channel]=quantum;
}
-static inline void SetPixelComponentMapComponent(const Image *image,
- const PixelComponent component,const PixelComponent components)
+static inline void SetPixelChannelMapComponent(const Image *image,
+ const PixelChannel channel,const PixelChannel channels)
{
- image->component_map[image->map][component].component=components;
+ image->channel_map[image->map][channel].channel=channels;
}
-static inline void SetPixelComponents(Image *image,const size_t channels)
+static inline void SetPixelChannels(Image *image,const size_t number_channels)
{
- image->pixel_components=channels;
+ image->number_channels=number_channels;
}
-static inline void SetPixelComponentTraits(Image *image,
- const PixelComponent component,const PixelTrait traits)
+static inline void SetPixelChannelTraits(Image *image,
+ const PixelChannel channel,const PixelTrait traits)
{
- image->component_map[image->map][component].traits=traits;
+ image->channel_map[image->map][channel].traits=traits;
}
-static inline void SetPixelComponentMapTraits(Image *image,
- const PixelComponent component,const PixelTrait traits)
+static inline void SetPixelChannelMapTraits(Image *image,
+ const PixelChannel channel,const PixelTrait traits)
{
- image->component_map[image->map][component].traits=traits;
+ image->channel_map[image->map][channel].traits=traits;
}
static inline void SetPixelCr(const Image *image,const Quantum cr,
Quantum *pixel)
{
- pixel[image->component_map[image->map][CrPixelComponent].component]=cr;
+ pixel[image->channel_map[image->map][CrPixelChannel].channel]=cr;
}
static inline void SetPixelCrTraits(Image *image,const PixelTrait traits)
{
- image->component_map[image->map][CrPixelComponent].traits=traits;
+ image->channel_map[image->map][CrPixelChannel].traits=traits;
}
static inline void SetPixelCyan(const Image *image,const Quantum cyan,
Quantum *pixel)
{
- pixel[image->component_map[image->map][CyanPixelComponent].component]=cyan;
+ pixel[image->channel_map[image->map][CyanPixelChannel].channel]=cyan;
}
static inline void SetPixelGray(const Image *image,const Quantum gray,
Quantum *pixel)
{
- pixel[image->component_map[image->map][GrayPixelComponent].component]=gray;
+ pixel[image->channel_map[image->map][GrayPixelChannel].channel]=gray;
}
static inline void SetPixelGrayTraits(Image *image,const PixelTrait traits)
{
- image->component_map[image->map][GrayPixelComponent].traits=traits;
+ image->channel_map[image->map][GrayPixelChannel].traits=traits;
}
static inline void SetPixelGreen(const Image *image,const Quantum green,
Quantum *pixel)
{
- pixel[image->component_map[image->map][GreenPixelComponent].component]=green;
+ pixel[image->channel_map[image->map][GreenPixelChannel].channel]=green;
}
static inline void SetPixelGreenTraits(Image *image,const PixelTrait traits)
{
- image->component_map[image->map][GreenPixelComponent].traits=traits;
+ image->channel_map[image->map][GreenPixelChannel].traits=traits;
}
static inline void SetPixelIndex(const Image *image,const Quantum index,
Quantum *pixel)
{
- pixel[image->component_map[image->map][IndexPixelComponent].component]=index;
+ pixel[image->channel_map[image->map][IndexPixelChannel].channel]=index;
}
static inline void SetPixelIndexTraits(Image *image,const PixelTrait traits)
{
- image->component_map[image->map][IndexPixelComponent].traits=traits;
+ image->channel_map[image->map][IndexPixelChannel].traits=traits;
}
static inline void SetPixelInfo(const Image *image,const Quantum *pixel,
@@ -563,8 +557,7 @@
pixel_info->index=(MagickRealType) GetPixelIndex(image,pixel);
}
-static inline void SetPixelInfoBias(const Image *image,
- PixelInfo *pixel_info)
+static inline void SetPixelInfoBias(const Image *image,PixelInfo *pixel_info)
{
/*
Obsoleted by MorphologyApply().
@@ -592,13 +585,13 @@
static inline void SetPixelMagenta(const Image *image,const Quantum magenta,
Quantum *pixel)
{
- pixel[image->component_map[image->map][MagentaPixelComponent].component]=
+ pixel[image->channel_map[image->map][MagentaPixelChannel].channel]=
magenta;
}
static inline void SetPixelMagentaTraits(Image *image,const PixelTrait traits)
{
- image->component_map[image->map][MagentaPixelComponent].traits=traits;
+ image->channel_map[image->map][MagentaPixelChannel].traits=traits;
}
static inline void SetPixelMetacontentExtent(Image *image,const size_t extent)
@@ -609,12 +602,12 @@
static inline void SetPixelRed(const Image *image,const Quantum red,
Quantum *pixel)
{
- pixel[image->component_map[image->map][RedPixelComponent].component]=red;
+ pixel[image->channel_map[image->map][RedPixelChannel].channel]=red;
}
static inline void SetPixelRedTraits(Image *image,const PixelTrait traits)
{
- image->component_map[image->map][RedPixelComponent].traits=traits;
+ image->channel_map[image->map][RedPixelChannel].traits=traits;
}
static inline void SetPixelPacket(const Image *image,const PixelPacket *packet,
@@ -640,27 +633,26 @@
static inline void SetPixelYellow(const Image *image,const Quantum yellow,
Quantum *pixel)
{
- pixel[image->component_map[image->map][YellowPixelComponent].component]=
+ pixel[image->channel_map[image->map][YellowPixelChannel].channel]=
yellow;
}
static inline void SetPixelYellowTraits(Image *image,const PixelTrait traits)
{
- image->component_map[image->map][YellowPixelComponent].traits=traits;
+ image->channel_map[image->map][YellowPixelChannel].traits=traits;
}
static inline void SetPixelY(const Image *image,const Quantum y,Quantum *pixel)
{
- pixel[image->component_map[image->map][YPixelComponent].component]=y;
+ pixel[image->channel_map[image->map][YPixelChannel].channel]=y;
}
static inline void SetPixelYTraits(Image *image,const PixelTrait traits)
{
- image->component_map[image->map][YPixelComponent].traits=traits;
+ image->channel_map[image->map][YPixelChannel].traits=traits;
}
-static inline Quantum GetPixelIntensity(const Image *image,
- const Quantum *pixel)
+static inline Quantum GetPixelIntensity(const Image *image,const Quantum *pixel)
{
#if !defined(MAGICKCORE_HDRI_SUPPORT)
if ((GetPixelRed(image,pixel) == GetPixelGreen(image,pixel)) &&
diff --git a/MagickCore/pixel.c b/MagickCore/pixel.c
index bc1784a..81f61e3 100644
--- a/MagickCore/pixel.c
+++ b/MagickCore/pixel.c
@@ -73,46 +73,46 @@
% %
% %
% %
-+ A c q u i r e P i x e l C o m p o n e n t M a p %
++ A c q u i r e P i x e l C h a n n e l M a p %
% %
% %
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% AcquirePixelComponentMap() acquires a pixel component map.
+% AcquirePixelChannelMap() acquires a pixel component map.
%
-% The format of the AcquirePixelComponentMap() method is:
+% The format of the AcquirePixelChannelMap() method is:
%
-% PixelComponentMap **AcquirePixelComponentMap(void)
+% PixelChannelMap **AcquirePixelChannelMap(void)
%
*/
-MagickExport PixelComponentMap **AcquirePixelComponentMap(void)
+MagickExport PixelChannelMap **AcquirePixelChannelMap(void)
{
- PixelComponentMap
- **component_map;
+ PixelChannelMap
+ **channel_map;
register ssize_t
i;
- component_map=(PixelComponentMap **) AcquireAlignedMemory(
- MaxPixelComponentMaps,sizeof(**component_map));
- if (component_map == (PixelComponentMap **) NULL)
+ channel_map=(PixelChannelMap **) AcquireAlignedMemory(MaxPixelChannelMaps,
+ sizeof(**channel_map));
+ if (channel_map == (PixelChannelMap **) NULL)
ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
- for (i=0; i < MaxPixelComponentMaps; i++)
+ for (i=0; i < MaxPixelChannelMaps; i++)
{
register ssize_t
j;
- component_map[i]=(PixelComponentMap *) AcquireQuantumMemory(
- MaxPixelComponents,sizeof(*component_map[i]));
- if (component_map[i] == (PixelComponentMap *) NULL)
+ channel_map[i]=(PixelChannelMap *) AcquireQuantumMemory(MaxPixelChannels,
+ sizeof(*channel_map[i]));
+ if (channel_map[i] == (PixelChannelMap *) NULL)
ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
- (void) ResetMagickMemory(component_map[i],0,MaxPixelComponents*
- sizeof(*component_map[i]));
- for (j=0; j < MaxPixelComponents; j++)
- component_map[i][j].component=(PixelComponent) j;
+ (void) ResetMagickMemory(channel_map[i],0,MaxPixelChannels*
+ sizeof(*channel_map[i]));
+ for (j=0; j < MaxPixelChannels; j++)
+ channel_map[i][j].channel=(PixelChannel) j;
}
- return(component_map);
+ return(channel_map);
}
/*
@@ -120,40 +120,40 @@
% %
% %
% %
-+ C l o n e P i x e l C o m p o n e n t M a p %
++ C l o n e P i x e l C h a n n e l M a p %
% %
% %
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% ClonePixelComponentMap() clones a pixel component map.
+% ClonePixelChannelMap() clones a pixel component map.
%
-% The format of the ClonePixelComponentMap() method is:
+% The format of the ClonePixelChannelMap() method is:
%
-% PixelComponentMap **ClonePixelComponentMap(
-% PixelComponentMap **component_map)
+% PixelChannelMap **ClonePixelChannelMap(
+% PixelChannelMap **channel_map)
%
% A description of each parameter follows:
%
-% o component_map: the pixel component map.
+% o channel_map: the pixel component map.
%
*/
-MagickExport PixelComponentMap **ClonePixelComponentMap(
- PixelComponentMap **component_map)
+MagickExport PixelChannelMap **ClonePixelChannelMap(
+ PixelChannelMap **channel_map)
{
- PixelComponentMap
+ PixelChannelMap
**clone_map;
register ssize_t
i;
- assert(component_map != (PixelComponentMap **) NULL);
- clone_map=AcquirePixelComponentMap();
- if (clone_map == (PixelComponentMap **) NULL)
- return((PixelComponentMap **) NULL);
- for (i=0; i < MaxPixelComponentMaps; i++)
- (void) CopyMagickMemory(clone_map[i],component_map[i],MaxPixelComponents*
- sizeof(*component_map[i]));
+ assert(channel_map != (PixelChannelMap **) NULL);
+ clone_map=AcquirePixelChannelMap();
+ if (clone_map == (PixelChannelMap **) NULL)
+ return((PixelChannelMap **) NULL);
+ for (i=0; i < MaxPixelChannelMaps; i++)
+ (void) CopyMagickMemory(clone_map[i],channel_map[i],MaxPixelChannels*
+ sizeof(*channel_map[i]));
return(clone_map);
}
@@ -197,36 +197,34 @@
% %
% %
% %
-+ D e s t r o y P i x e l C o m p o n e n t M a p %
++ D e s t r o y P i x e l C h a n n e l M a p %
% %
% %
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% DestroyPixelComponentMap() deallocates memory associated with the pixel
-% component map.
+% DestroyPixelChannelMap() deallocates memory associated with the pixel
+% channel map.
%
-% The format of the DestroyPixelComponentMap() method is:
+% The format of the DestroyPixelChannelMap() method is:
%
-% PixelComponentMap **DestroyPixelComponentMap(
-% PixelComponentMap **component_map)
+% PixelChannelMap **DestroyPixelChannelMap(PixelChannelMap **channel_map)
%
% A description of each parameter follows:
%
-% o component_map: the pixel component map.
+% o channel_map: the pixel component map.
%
*/
-MagickExport PixelComponentMap **DestroyPixelComponentMap(
- PixelComponentMap **component_map)
+MagickExport PixelChannelMap **DestroyPixelChannelMap(
+ PixelChannelMap **channel_map)
{
register ssize_t
i;
- assert(component_map != (PixelComponentMap **) NULL);
- for (i=0; i < MaxPixelComponentMaps; i++)
- component_map[i]=(PixelComponentMap *) RelinquishMagickMemory(
- component_map[i]);
- return((PixelComponentMap **) RelinquishMagickMemory(component_map));
+ assert(channel_map != (PixelChannelMap **) NULL);
+ for (i=0; i < MaxPixelChannelMaps; i++)
+ channel_map[i]=(PixelChannelMap *) RelinquishMagickMemory(channel_map[i]);
+ return((PixelChannelMap **) RelinquishMagickMemory(channel_map));
}
/*
@@ -434,7 +432,7 @@
*q++=ScaleQuantumToChar(GetPixelBlue(image,p));
*q++=ScaleQuantumToChar(GetPixelGreen(image,p));
*q++=ScaleQuantumToChar(GetPixelRed(image,p));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
break;
@@ -452,7 +450,7 @@
*q++=ScaleQuantumToChar(GetPixelGreen(image,p));
*q++=ScaleQuantumToChar(GetPixelRed(image,p));
*q++=ScaleQuantumToChar(GetPixelAlpha(image,p));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
break;
@@ -470,7 +468,7 @@
*q++=ScaleQuantumToChar(GetPixelGreen(image,p));
*q++=ScaleQuantumToChar(GetPixelRed(image,p));
*q++=ScaleQuantumToChar((Quantum) 0);
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
break;
@@ -485,7 +483,7 @@
for (x=0; x < (ssize_t) columns; x++)
{
*q++=ScaleQuantumToChar(GetPixelIntensity(image,p));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
break;
@@ -502,7 +500,7 @@
*q++=ScaleQuantumToChar(GetPixelRed(image,p));
*q++=ScaleQuantumToChar(GetPixelGreen(image,p));
*q++=ScaleQuantumToChar(GetPixelBlue(image,p));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
break;
@@ -520,7 +518,7 @@
*q++=ScaleQuantumToChar(GetPixelGreen(image,p));
*q++=ScaleQuantumToChar(GetPixelBlue(image,p));
*q++=ScaleQuantumToChar(GetPixelAlpha(image,p));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
break;
@@ -538,7 +536,7 @@
*q++=ScaleQuantumToChar(GetPixelGreen(image,p));
*q++=ScaleQuantumToChar(GetPixelBlue(image,p));
*q++=ScaleQuantumToChar((Quantum) 0);
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
break;
@@ -599,7 +597,7 @@
}
q++;
}
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
break;
@@ -622,7 +620,7 @@
*q++=(double) (QuantumScale*GetPixelBlue(image,p));
*q++=(double) (QuantumScale*GetPixelGreen(image,p));
*q++=(double) (QuantumScale*GetPixelRed(image,p));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
break;
@@ -640,7 +638,7 @@
*q++=(double) (QuantumScale*GetPixelGreen(image,p));
*q++=(double) (QuantumScale*GetPixelRed(image,p));
*q++=(double) (QuantumScale*GetPixelAlpha(image,p));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
break;
@@ -658,7 +656,7 @@
*q++=(double) (QuantumScale*GetPixelGreen(image,p));
*q++=(double) (QuantumScale*GetPixelRed(image,p));
*q++=0.0;
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
break;
@@ -673,7 +671,7 @@
for (x=0; x < (ssize_t) columns; x++)
{
*q++=(double) (QuantumScale*GetPixelIntensity(image,p));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
break;
@@ -690,7 +688,7 @@
*q++=(double) (QuantumScale*GetPixelRed(image,p));
*q++=(double) (QuantumScale*GetPixelGreen(image,p));
*q++=(double) (QuantumScale*GetPixelBlue(image,p));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
break;
@@ -708,7 +706,7 @@
*q++=(double) (QuantumScale*GetPixelGreen(image,p));
*q++=(double) (QuantumScale*GetPixelBlue(image,p));
*q++=(double) (QuantumScale*GetPixelAlpha(image,p));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
break;
@@ -726,7 +724,7 @@
*q++=(double) (QuantumScale*GetPixelGreen(image,p));
*q++=(double) (QuantumScale*GetPixelBlue(image,p));
*q++=0.0;
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
break;
@@ -788,7 +786,7 @@
}
q++;
}
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
break;
@@ -811,7 +809,7 @@
*q++=(float) (QuantumScale*GetPixelBlue(image,p));
*q++=(float) (QuantumScale*GetPixelGreen(image,p));
*q++=(float) (QuantumScale*GetPixelRed(image,p));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
break;
@@ -829,7 +827,7 @@
*q++=(float) (QuantumScale*GetPixelGreen(image,p));
*q++=(float) (QuantumScale*GetPixelRed(image,p));
*q++=(float) (QuantumScale*GetPixelAlpha(image,p));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
break;
@@ -847,7 +845,7 @@
*q++=(float) (QuantumScale*GetPixelGreen(image,p));
*q++=(float) (QuantumScale*GetPixelRed(image,p));
*q++=0.0;
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
break;
@@ -862,7 +860,7 @@
for (x=0; x < (ssize_t) columns; x++)
{
*q++=(float) (QuantumScale*GetPixelIntensity(image,p));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
break;
@@ -879,7 +877,7 @@
*q++=(float) (QuantumScale*GetPixelRed(image,p));
*q++=(float) (QuantumScale*GetPixelGreen(image,p));
*q++=(float) (QuantumScale*GetPixelBlue(image,p));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
break;
@@ -897,7 +895,7 @@
*q++=(float) (QuantumScale*GetPixelGreen(image,p));
*q++=(float) (QuantumScale*GetPixelBlue(image,p));
*q++=(float) (QuantumScale*GetPixelAlpha(image,p));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
break;
@@ -915,7 +913,7 @@
*q++=(float) (QuantumScale*GetPixelGreen(image,p));
*q++=(float) (QuantumScale*GetPixelBlue(image,p));
*q++=0.0;
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
break;
@@ -976,7 +974,7 @@
}
q++;
}
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
break;
@@ -999,7 +997,7 @@
*q++=(unsigned int) ScaleQuantumToLong(GetPixelBlue(image,p));
*q++=(unsigned int) ScaleQuantumToLong(GetPixelGreen(image,p));
*q++=(unsigned int) ScaleQuantumToLong(GetPixelRed(image,p));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
break;
@@ -1017,7 +1015,7 @@
*q++=(unsigned int) ScaleQuantumToLong(GetPixelGreen(image,p));
*q++=(unsigned int) ScaleQuantumToLong(GetPixelRed(image,p));
*q++=(unsigned int) ScaleQuantumToLong(GetPixelAlpha(image,p));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
break;
@@ -1035,7 +1033,7 @@
*q++=(unsigned int) ScaleQuantumToLong(GetPixelGreen(image,p));
*q++=(unsigned int) ScaleQuantumToLong(GetPixelRed(image,p));
*q++=0U;
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
break;
@@ -1051,7 +1049,7 @@
{
*q++=(unsigned int) ScaleQuantumToLong(
GetPixelIntensity(image,p));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
break;
@@ -1068,7 +1066,7 @@
*q++=(unsigned int) ScaleQuantumToLong(GetPixelRed(image,p));
*q++=(unsigned int) ScaleQuantumToLong(GetPixelGreen(image,p));
*q++=(unsigned int) ScaleQuantumToLong(GetPixelBlue(image,p));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
break;
@@ -1086,7 +1084,7 @@
*q++=(unsigned int) ScaleQuantumToLong(GetPixelGreen(image,p));
*q++=(unsigned int) ScaleQuantumToLong(GetPixelBlue(image,p));
*q++=(unsigned int) ScaleQuantumToLong(GetPixelAlpha(image,p));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
break;
@@ -1104,7 +1102,7 @@
*q++=(unsigned int) ScaleQuantumToLong(GetPixelGreen(image,p));
*q++=(unsigned int) ScaleQuantumToLong(GetPixelBlue(image,p));
*q++=0U;
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
break;
@@ -1166,7 +1164,7 @@
}
q++;
}
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
break;
@@ -1189,7 +1187,7 @@
*q++=ScaleQuantumToLong(GetPixelBlue(image,p));
*q++=ScaleQuantumToLong(GetPixelGreen(image,p));
*q++=ScaleQuantumToLong(GetPixelRed(image,p));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
break;
@@ -1207,7 +1205,7 @@
*q++=ScaleQuantumToLong(GetPixelGreen(image,p));
*q++=ScaleQuantumToLong(GetPixelRed(image,p));
*q++=ScaleQuantumToLong(GetPixelAlpha(image,p));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
break;
@@ -1225,7 +1223,7 @@
*q++=ScaleQuantumToLong(GetPixelGreen(image,p));
*q++=ScaleQuantumToLong(GetPixelRed(image,p));
*q++=0;
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
break;
@@ -1240,7 +1238,7 @@
for (x=0; x < (ssize_t) columns; x++)
{
*q++=ScaleQuantumToLong(GetPixelIntensity(image,p));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
break;
@@ -1257,7 +1255,7 @@
*q++=ScaleQuantumToLong(GetPixelRed(image,p));
*q++=ScaleQuantumToLong(GetPixelGreen(image,p));
*q++=ScaleQuantumToLong(GetPixelBlue(image,p));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
break;
@@ -1275,7 +1273,7 @@
*q++=ScaleQuantumToLong(GetPixelGreen(image,p));
*q++=ScaleQuantumToLong(GetPixelBlue(image,p));
*q++=ScaleQuantumToLong(GetPixelAlpha(image,p));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
break;
@@ -1293,7 +1291,7 @@
*q++=ScaleQuantumToLong(GetPixelGreen(image,p));
*q++=ScaleQuantumToLong(GetPixelBlue(image,p));
*q++=0;
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
break;
@@ -1354,7 +1352,7 @@
}
q++;
}
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
break;
@@ -1377,7 +1375,7 @@
*q++=GetPixelBlue(image,p);
*q++=GetPixelGreen(image,p);
*q++=GetPixelRed(image,p);
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
break;
@@ -1395,7 +1393,7 @@
*q++=GetPixelGreen(image,p);
*q++=GetPixelRed(image,p);
*q++=(Quantum) (GetPixelAlpha(image,p));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
break;
@@ -1413,7 +1411,7 @@
*q++=GetPixelGreen(image,p);
*q++=GetPixelRed(image,p);
*q++=(Quantum) 0;
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
break;
@@ -1428,7 +1426,7 @@
for (x=0; x < (ssize_t) columns; x++)
{
*q++=GetPixelIntensity(image,p);
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
break;
@@ -1445,7 +1443,7 @@
*q++=GetPixelRed(image,p);
*q++=GetPixelGreen(image,p);
*q++=GetPixelBlue(image,p);
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
break;
@@ -1463,7 +1461,7 @@
*q++=GetPixelGreen(image,p);
*q++=GetPixelBlue(image,p);
*q++=(Quantum) (GetPixelAlpha(image,p));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
break;
@@ -1481,7 +1479,7 @@
*q++=GetPixelGreen(image,p);
*q++=GetPixelBlue(image,p);
*q++=(Quantum) 0;
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
break;
@@ -1542,7 +1540,7 @@
}
q++;
}
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
break;
@@ -1565,7 +1563,7 @@
*q++=ScaleQuantumToShort(GetPixelBlue(image,p));
*q++=ScaleQuantumToShort(GetPixelGreen(image,p));
*q++=ScaleQuantumToShort(GetPixelRed(image,p));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
break;
@@ -1583,7 +1581,7 @@
*q++=ScaleQuantumToShort(GetPixelGreen(image,p));
*q++=ScaleQuantumToShort(GetPixelRed(image,p));
*q++=ScaleQuantumToShort(GetPixelAlpha(image,p));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
break;
@@ -1601,7 +1599,7 @@
*q++=ScaleQuantumToShort(GetPixelGreen(image,p));
*q++=ScaleQuantumToShort(GetPixelRed(image,p));
*q++=0;
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
break;
@@ -1616,7 +1614,7 @@
for (x=0; x < (ssize_t) columns; x++)
{
*q++=ScaleQuantumToShort(GetPixelIntensity(image,p));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
break;
@@ -1633,7 +1631,7 @@
*q++=ScaleQuantumToShort(GetPixelRed(image,p));
*q++=ScaleQuantumToShort(GetPixelGreen(image,p));
*q++=ScaleQuantumToShort(GetPixelBlue(image,p));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
break;
@@ -1651,7 +1649,7 @@
*q++=ScaleQuantumToShort(GetPixelGreen(image,p));
*q++=ScaleQuantumToShort(GetPixelBlue(image,p));
*q++=ScaleQuantumToShort(GetPixelAlpha(image,p));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
break;
@@ -1669,7 +1667,7 @@
*q++=ScaleQuantumToShort(GetPixelGreen(image,p));
*q++=ScaleQuantumToShort(GetPixelBlue(image,p));
*q++=0;
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
break;
@@ -1730,7 +1728,7 @@
}
q++;
}
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
break;
@@ -1992,7 +1990,7 @@
SetPixelBlue(image,ScaleCharToQuantum(*p++),q);
SetPixelGreen(image,ScaleCharToQuantum(*p++),q);
SetPixelRed(image,ScaleCharToQuantum(*p++),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -2012,7 +2010,7 @@
SetPixelGreen(image,ScaleCharToQuantum(*p++),q);
SetPixelRed(image,ScaleCharToQuantum(*p++),q);
SetPixelAlpha(image,ScaleCharToQuantum(*p++),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -2032,7 +2030,7 @@
SetPixelGreen(image,ScaleCharToQuantum(*p++),q);
SetPixelRed(image,ScaleCharToQuantum(*p++),q);
SetPixelAlpha(image,ScaleCharToQuantum(*p++),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -2052,7 +2050,7 @@
SetPixelGreen(image,ScaleCharToQuantum(*p++),q);
SetPixelRed(image,ScaleCharToQuantum(*p++),q);
p++;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -2071,7 +2069,7 @@
SetPixelRed(image,ScaleCharToQuantum(*p++),q);
SetPixelGreen(image,GetPixelRed(image,q),q);
SetPixelBlue(image,GetPixelRed(image,q),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -2090,7 +2088,7 @@
SetPixelRed(image,ScaleCharToQuantum(*p++),q);
SetPixelGreen(image,ScaleCharToQuantum(*p++),q);
SetPixelBlue(image,ScaleCharToQuantum(*p++),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -2110,7 +2108,7 @@
SetPixelGreen(image,ScaleCharToQuantum(*p++),q);
SetPixelBlue(image,ScaleCharToQuantum(*p++),q);
SetPixelAlpha(image,ScaleCharToQuantum(*p++),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -2130,7 +2128,7 @@
SetPixelGreen(image,ScaleCharToQuantum(*p++),q);
SetPixelBlue(image,ScaleCharToQuantum(*p++),q);
SetPixelAlpha(image,ScaleCharToQuantum(*p++),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -2150,7 +2148,7 @@
SetPixelGreen(image,ScaleCharToQuantum(*p++),q);
SetPixelBlue(image,ScaleCharToQuantum(*p++),q);
p++;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -2213,7 +2211,7 @@
}
p++;
}
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -2244,7 +2242,7 @@
SetPixelRed(image,ClampToQuantum((MagickRealType) QuantumRange*
(*p)),q);
p++;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -2272,7 +2270,7 @@
SetPixelAlpha(image,ClampToQuantum((MagickRealType) QuantumRange*
(*p)),q);
p++;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -2298,7 +2296,7 @@
(*p)),q);
p++;
p++;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -2319,7 +2317,7 @@
SetPixelGreen(image,GetPixelRed(image,q),q);
SetPixelBlue(image,GetPixelRed(image,q),q);
p++;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -2344,7 +2342,7 @@
SetPixelBlue(image,ClampToQuantum((MagickRealType) QuantumRange*
(*p)),q);
p++;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -2372,7 +2370,7 @@
SetPixelAlpha(image,ClampToQuantum((MagickRealType) QuantumRange*
(*p)),q);
p++;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -2397,7 +2395,7 @@
SetPixelBlue(image,ClampToQuantum((MagickRealType) QuantumRange*
(*p)),q);
p++;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -2467,7 +2465,7 @@
}
p++;
}
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -2498,7 +2496,7 @@
SetPixelRed(image,ClampToQuantum((MagickRealType) QuantumRange*
(*p)),q);
p++;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -2526,7 +2524,7 @@
SetPixelAlpha(image,ClampToQuantum((MagickRealType) QuantumRange*
(*p)),q);
p++;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -2552,7 +2550,7 @@
(*p)),q);
p++;
p++;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -2573,7 +2571,7 @@
SetPixelGreen(image,GetPixelRed(image,q),q);
SetPixelBlue(image,GetPixelRed(image,q),q);
p++;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -2598,7 +2596,7 @@
SetPixelBlue(image,ClampToQuantum((MagickRealType) QuantumRange*
(*p)),q);
p++;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -2626,7 +2624,7 @@
SetPixelAlpha(image,ClampToQuantum((MagickRealType) QuantumRange*
(*p)),q);
p++;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -2651,7 +2649,7 @@
SetPixelBlue(image,ClampToQuantum((MagickRealType) QuantumRange*
(*p)),q);
p++;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -2721,7 +2719,7 @@
}
p++;
}
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -2746,7 +2744,7 @@
SetPixelBlue(image,ScaleLongToQuantum(*p++),q);
SetPixelGreen(image,ScaleLongToQuantum(*p++),q);
SetPixelRed(image,ScaleLongToQuantum(*p++),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -2766,7 +2764,7 @@
SetPixelGreen(image,ScaleLongToQuantum(*p++),q);
SetPixelRed(image,ScaleLongToQuantum(*p++),q);
SetPixelAlpha(image,ScaleLongToQuantum(*p++),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -2786,7 +2784,7 @@
SetPixelGreen(image,ScaleLongToQuantum(*p++),q);
SetPixelRed(image,ScaleLongToQuantum(*p++),q);
p++;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -2805,7 +2803,7 @@
SetPixelRed(image,ScaleLongToQuantum(*p++),q);
SetPixelGreen(image,GetPixelRed(image,q),q);
SetPixelBlue(image,GetPixelRed(image,q),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -2824,7 +2822,7 @@
SetPixelRed(image,ScaleLongToQuantum(*p++),q);
SetPixelGreen(image,ScaleLongToQuantum(*p++),q);
SetPixelBlue(image,ScaleLongToQuantum(*p++),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -2844,7 +2842,7 @@
SetPixelGreen(image,ScaleLongToQuantum(*p++),q);
SetPixelBlue(image,ScaleLongToQuantum(*p++),q);
SetPixelAlpha(image,ScaleLongToQuantum(*p++),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -2864,7 +2862,7 @@
SetPixelGreen(image,ScaleLongToQuantum(*p++),q);
SetPixelBlue(image,ScaleLongToQuantum(*p++),q);
p++;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -2927,7 +2925,7 @@
}
p++;
}
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -2952,7 +2950,7 @@
SetPixelBlue(image,ScaleLongToQuantum(*p++),q);
SetPixelGreen(image,ScaleLongToQuantum(*p++),q);
SetPixelRed(image,ScaleLongToQuantum(*p++),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -2972,7 +2970,7 @@
SetPixelGreen(image,ScaleLongToQuantum(*p++),q);
SetPixelRed(image,ScaleLongToQuantum(*p++),q);
SetPixelAlpha(image,ScaleLongToQuantum(*p++),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -2992,7 +2990,7 @@
SetPixelGreen(image,ScaleLongToQuantum(*p++),q);
SetPixelRed(image,ScaleLongToQuantum(*p++),q);
p++;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -3011,7 +3009,7 @@
SetPixelRed(image,ScaleLongToQuantum(*p++),q);
SetPixelGreen(image,GetPixelRed(image,q),q);
SetPixelBlue(image,GetPixelRed(image,q),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -3030,7 +3028,7 @@
SetPixelRed(image,ScaleLongToQuantum(*p++),q);
SetPixelGreen(image,ScaleLongToQuantum(*p++),q);
SetPixelBlue(image,ScaleLongToQuantum(*p++),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -3050,7 +3048,7 @@
SetPixelGreen(image,ScaleLongToQuantum(*p++),q);
SetPixelBlue(image,ScaleLongToQuantum(*p++),q);
SetPixelAlpha(image,ScaleLongToQuantum(*p++),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -3070,7 +3068,7 @@
SetPixelGreen(image,ScaleLongToQuantum(*p++),q);
SetPixelBlue(image,ScaleLongToQuantum(*p++),q);
p++;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -3133,7 +3131,7 @@
}
p++;
}
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -3158,7 +3156,7 @@
SetPixelBlue(image,*p++,q);
SetPixelGreen(image,*p++,q);
SetPixelRed(image,*p++,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -3178,7 +3176,7 @@
SetPixelGreen(image,*p++,q);
SetPixelRed(image,*p++,q);
SetPixelAlpha(image,*p++,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -3198,7 +3196,7 @@
SetPixelGreen(image,*p++,q);
SetPixelRed(image,*p++,q);
p++;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -3217,7 +3215,7 @@
SetPixelRed(image,*p++,q);
SetPixelGreen(image,GetPixelRed(image,q),q);
SetPixelBlue(image,GetPixelRed(image,q),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -3236,7 +3234,7 @@
SetPixelRed(image,*p++,q);
SetPixelGreen(image,*p++,q);
SetPixelBlue(image,*p++,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -3256,7 +3254,7 @@
SetPixelGreen(image,*p++,q);
SetPixelBlue(image,*p++,q);
SetPixelAlpha(image,*p++,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -3276,7 +3274,7 @@
SetPixelGreen(image,*p++,q);
SetPixelBlue(image,*p++,q);
p++;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -3339,7 +3337,7 @@
}
p++;
}
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -3364,7 +3362,7 @@
SetPixelBlue(image,ScaleShortToQuantum(*p++),q);
SetPixelGreen(image,ScaleShortToQuantum(*p++),q);
SetPixelRed(image,ScaleShortToQuantum(*p++),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -3384,7 +3382,7 @@
SetPixelGreen(image,ScaleShortToQuantum(*p++),q);
SetPixelRed(image,ScaleShortToQuantum(*p++),q);
SetPixelAlpha(image,ScaleShortToQuantum(*p++),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -3404,7 +3402,7 @@
SetPixelGreen(image,ScaleShortToQuantum(*p++),q);
SetPixelRed(image,ScaleShortToQuantum(*p++),q);
p++;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -3423,7 +3421,7 @@
SetPixelRed(image,ScaleShortToQuantum(*p++),q);
SetPixelGreen(image,GetPixelRed(image,q),q);
SetPixelBlue(image,GetPixelRed(image,q),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -3442,7 +3440,7 @@
SetPixelRed(image,ScaleShortToQuantum(*p++),q);
SetPixelGreen(image,ScaleShortToQuantum(*p++),q);
SetPixelBlue(image,ScaleShortToQuantum(*p++),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -3462,7 +3460,7 @@
SetPixelGreen(image,ScaleShortToQuantum(*p++),q);
SetPixelBlue(image,ScaleShortToQuantum(*p++),q);
SetPixelAlpha(image,ScaleShortToQuantum(*p++),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -3482,7 +3480,7 @@
SetPixelGreen(image,ScaleShortToQuantum(*p++),q);
SetPixelBlue(image,ScaleShortToQuantum(*p++),q);
p++;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -3545,7 +3543,7 @@
}
p++;
}
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -3748,26 +3746,26 @@
break;
}
AlphaBlendPixelInfo(image,p,pixels+0,alpha+0);
- AlphaBlendPixelInfo(image,p+1*GetPixelComponents(image),pixels+1,alpha+1);
- AlphaBlendPixelInfo(image,p+2*GetPixelComponents(image),pixels+2,alpha+2);
- AlphaBlendPixelInfo(image,p+3*GetPixelComponents(image),pixels+3,alpha+3);
- AlphaBlendPixelInfo(image,p+4*GetPixelComponents(image),pixels+4,alpha+4);
- AlphaBlendPixelInfo(image,p+5*GetPixelComponents(image),pixels+5,alpha+5);
- AlphaBlendPixelInfo(image,p+6*GetPixelComponents(image),pixels+6,alpha+6);
- AlphaBlendPixelInfo(image,p+7*GetPixelComponents(image),pixels+7,alpha+7);
- AlphaBlendPixelInfo(image,p+8*GetPixelComponents(image),pixels+8,alpha+8);
- AlphaBlendPixelInfo(image,p+9*GetPixelComponents(image),pixels+9,alpha+9);
- AlphaBlendPixelInfo(image,p+10*GetPixelComponents(image),pixels+10,alpha+
+ AlphaBlendPixelInfo(image,p+1*GetPixelChannels(image),pixels+1,alpha+1);
+ AlphaBlendPixelInfo(image,p+2*GetPixelChannels(image),pixels+2,alpha+2);
+ AlphaBlendPixelInfo(image,p+3*GetPixelChannels(image),pixels+3,alpha+3);
+ AlphaBlendPixelInfo(image,p+4*GetPixelChannels(image),pixels+4,alpha+4);
+ AlphaBlendPixelInfo(image,p+5*GetPixelChannels(image),pixels+5,alpha+5);
+ AlphaBlendPixelInfo(image,p+6*GetPixelChannels(image),pixels+6,alpha+6);
+ AlphaBlendPixelInfo(image,p+7*GetPixelChannels(image),pixels+7,alpha+7);
+ AlphaBlendPixelInfo(image,p+8*GetPixelChannels(image),pixels+8,alpha+8);
+ AlphaBlendPixelInfo(image,p+9*GetPixelChannels(image),pixels+9,alpha+9);
+ AlphaBlendPixelInfo(image,p+10*GetPixelChannels(image),pixels+10,alpha+
10);
- AlphaBlendPixelInfo(image,p+11*GetPixelComponents(image),pixels+11,alpha+
+ AlphaBlendPixelInfo(image,p+11*GetPixelChannels(image),pixels+11,alpha+
11);
- AlphaBlendPixelInfo(image,p+12*GetPixelComponents(image),pixels+12,alpha+
+ AlphaBlendPixelInfo(image,p+12*GetPixelChannels(image),pixels+12,alpha+
12);
- AlphaBlendPixelInfo(image,p+13*GetPixelComponents(image),pixels+13,alpha+
+ AlphaBlendPixelInfo(image,p+13*GetPixelChannels(image),pixels+13,alpha+
13);
- AlphaBlendPixelInfo(image,p+14*GetPixelComponents(image),pixels+14,alpha+
+ AlphaBlendPixelInfo(image,p+14*GetPixelChannels(image),pixels+14,alpha+
14);
- AlphaBlendPixelInfo(image,p+15*GetPixelComponents(image),pixels+15,alpha+
+ AlphaBlendPixelInfo(image,p+15*GetPixelChannels(image),pixels+15,alpha+
15);
pixel->red=0.0;
pixel->green=0.0;
@@ -3802,26 +3800,26 @@
break;
}
AlphaBlendPixelInfo(image,p,pixels+0,alpha+0);
- AlphaBlendPixelInfo(image,p+1*GetPixelComponents(image),pixels+1,alpha+1);
- AlphaBlendPixelInfo(image,p+2*GetPixelComponents(image),pixels+2,alpha+2);
- AlphaBlendPixelInfo(image,p+3*GetPixelComponents(image),pixels+3,alpha+3);
- AlphaBlendPixelInfo(image,p+4*GetPixelComponents(image),pixels+4,alpha+4);
- AlphaBlendPixelInfo(image,p+5*GetPixelComponents(image),pixels+5,alpha+5);
- AlphaBlendPixelInfo(image,p+6*GetPixelComponents(image),pixels+6,alpha+6);
- AlphaBlendPixelInfo(image,p+7*GetPixelComponents(image),pixels+7,alpha+7);
- AlphaBlendPixelInfo(image,p+8*GetPixelComponents(image),pixels+8,alpha+8);
- AlphaBlendPixelInfo(image,p+9*GetPixelComponents(image),pixels+9,alpha+9);
- AlphaBlendPixelInfo(image,p+10*GetPixelComponents(image),pixels+10,alpha+
+ AlphaBlendPixelInfo(image,p+1*GetPixelChannels(image),pixels+1,alpha+1);
+ AlphaBlendPixelInfo(image,p+2*GetPixelChannels(image),pixels+2,alpha+2);
+ AlphaBlendPixelInfo(image,p+3*GetPixelChannels(image),pixels+3,alpha+3);
+ AlphaBlendPixelInfo(image,p+4*GetPixelChannels(image),pixels+4,alpha+4);
+ AlphaBlendPixelInfo(image,p+5*GetPixelChannels(image),pixels+5,alpha+5);
+ AlphaBlendPixelInfo(image,p+6*GetPixelChannels(image),pixels+6,alpha+6);
+ AlphaBlendPixelInfo(image,p+7*GetPixelChannels(image),pixels+7,alpha+7);
+ AlphaBlendPixelInfo(image,p+8*GetPixelChannels(image),pixels+8,alpha+8);
+ AlphaBlendPixelInfo(image,p+9*GetPixelChannels(image),pixels+9,alpha+9);
+ AlphaBlendPixelInfo(image,p+10*GetPixelChannels(image),pixels+10,alpha+
10);
- AlphaBlendPixelInfo(image,p+11*GetPixelComponents(image),pixels+11,alpha+
+ AlphaBlendPixelInfo(image,p+11*GetPixelChannels(image),pixels+11,alpha+
11);
- AlphaBlendPixelInfo(image,p+12*GetPixelComponents(image),pixels+12,alpha+
+ AlphaBlendPixelInfo(image,p+12*GetPixelChannels(image),pixels+12,alpha+
12);
- AlphaBlendPixelInfo(image,p+13*GetPixelComponents(image),pixels+13,alpha+
+ AlphaBlendPixelInfo(image,p+13*GetPixelChannels(image),pixels+13,alpha+
13);
- AlphaBlendPixelInfo(image,p+14*GetPixelComponents(image),pixels+14,alpha+
+ AlphaBlendPixelInfo(image,p+14*GetPixelChannels(image),pixels+14,alpha+
14);
- AlphaBlendPixelInfo(image,p+15*GetPixelComponents(image),pixels+15,alpha+
+ AlphaBlendPixelInfo(image,p+15*GetPixelChannels(image),pixels+15,alpha+
15);
delta.x=x-x_offset;
delta.y=y-y_offset;
@@ -3844,9 +3842,9 @@
break;
}
AlphaBlendPixelInfo(image,p,pixels+0,alpha+0);
- AlphaBlendPixelInfo(image,p+1*GetPixelComponents(image),pixels+1,alpha+1);
- AlphaBlendPixelInfo(image,p+2*GetPixelComponents(image),pixels+2,alpha+2);
- AlphaBlendPixelInfo(image,p+3*GetPixelComponents(image),pixels+3,alpha+3);
+ AlphaBlendPixelInfo(image,p+1*GetPixelChannels(image),pixels+1,alpha+1);
+ AlphaBlendPixelInfo(image,p+2*GetPixelChannels(image),pixels+2,alpha+2);
+ AlphaBlendPixelInfo(image,p+3*GetPixelChannels(image),pixels+3,alpha+3);
delta.x=x-x_offset;
delta.y=y-y_offset;
epsilon.x=1.0-delta.x;
@@ -3931,9 +3929,9 @@
break;
}
AlphaBlendPixelInfo(image,p,pixels+0,alpha+0);
- AlphaBlendPixelInfo(image,p+1*GetPixelComponents(image),pixels+1,alpha+1);
- AlphaBlendPixelInfo(image,p+2*GetPixelComponents(image),pixels+2,alpha+2);
- AlphaBlendPixelInfo(image,p+3*GetPixelComponents(image),pixels+3,alpha+3);
+ AlphaBlendPixelInfo(image,p+1*GetPixelChannels(image),pixels+1,alpha+1);
+ AlphaBlendPixelInfo(image,p+2*GetPixelChannels(image),pixels+2,alpha+2);
+ AlphaBlendPixelInfo(image,p+3*GetPixelChannels(image),pixels+3,alpha+3);
delta.x=x-x_offset;
delta.y=y-y_offset;
luminance.x=GetPixelInfoLuminance(pixels+0)-(double)
@@ -4067,26 +4065,26 @@
break;
}
AlphaBlendPixelInfo(image,p,pixels+0,alpha+0);
- AlphaBlendPixelInfo(image,p+1*GetPixelComponents(image),pixels+1,alpha+1);
- AlphaBlendPixelInfo(image,p+2*GetPixelComponents(image),pixels+2,alpha+2);
- AlphaBlendPixelInfo(image,p+3*GetPixelComponents(image),pixels+3,alpha+3);
- AlphaBlendPixelInfo(image,p+4*GetPixelComponents(image),pixels+4,alpha+4);
- AlphaBlendPixelInfo(image,p+5*GetPixelComponents(image),pixels+5,alpha+5);
- AlphaBlendPixelInfo(image,p+6*GetPixelComponents(image),pixels+6,alpha+6);
- AlphaBlendPixelInfo(image,p+7*GetPixelComponents(image),pixels+7,alpha+7);
- AlphaBlendPixelInfo(image,p+8*GetPixelComponents(image),pixels+8,alpha+8);
- AlphaBlendPixelInfo(image,p+9*GetPixelComponents(image),pixels+9,alpha+9);
- AlphaBlendPixelInfo(image,p+10*GetPixelComponents(image),pixels+10,alpha+
+ AlphaBlendPixelInfo(image,p+1*GetPixelChannels(image),pixels+1,alpha+1);
+ AlphaBlendPixelInfo(image,p+2*GetPixelChannels(image),pixels+2,alpha+2);
+ AlphaBlendPixelInfo(image,p+3*GetPixelChannels(image),pixels+3,alpha+3);
+ AlphaBlendPixelInfo(image,p+4*GetPixelChannels(image),pixels+4,alpha+4);
+ AlphaBlendPixelInfo(image,p+5*GetPixelChannels(image),pixels+5,alpha+5);
+ AlphaBlendPixelInfo(image,p+6*GetPixelChannels(image),pixels+6,alpha+6);
+ AlphaBlendPixelInfo(image,p+7*GetPixelChannels(image),pixels+7,alpha+7);
+ AlphaBlendPixelInfo(image,p+8*GetPixelChannels(image),pixels+8,alpha+8);
+ AlphaBlendPixelInfo(image,p+9*GetPixelChannels(image),pixels+9,alpha+9);
+ AlphaBlendPixelInfo(image,p+10*GetPixelChannels(image),pixels+10,alpha+
10);
- AlphaBlendPixelInfo(image,p+11*GetPixelComponents(image),pixels+11,alpha+
+ AlphaBlendPixelInfo(image,p+11*GetPixelChannels(image),pixels+11,alpha+
11);
- AlphaBlendPixelInfo(image,p+12*GetPixelComponents(image),pixels+12,alpha+
+ AlphaBlendPixelInfo(image,p+12*GetPixelChannels(image),pixels+12,alpha+
12);
- AlphaBlendPixelInfo(image,p+13*GetPixelComponents(image),pixels+13,alpha+
+ AlphaBlendPixelInfo(image,p+13*GetPixelChannels(image),pixels+13,alpha+
13);
- AlphaBlendPixelInfo(image,p+14*GetPixelComponents(image),pixels+14,alpha+
+ AlphaBlendPixelInfo(image,p+14*GetPixelChannels(image),pixels+14,alpha+
14);
- AlphaBlendPixelInfo(image,p+15*GetPixelComponents(image),pixels+15,alpha+
+ AlphaBlendPixelInfo(image,p+15*GetPixelChannels(image),pixels+15,alpha+
15);
pixel->red=0.0;
pixel->green=0.0;
@@ -4449,28 +4447,28 @@
% %
% %
% %
-% P o p P i x e l C o m p o n e n t M a p %
+% P o p P i x e l C h a n n e l M a p %
% %
% %
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% PopPixelComponentMap() pops the pixel component map.
+% PopPixelChannelMap() pops the pixel component map.
%
-% The format of the PopPixelComponentMap method is:
+% The format of the PopPixelChannelMap method is:
%
-% void PopPixelComponentMap(Image *image)
+% void PopPixelChannelMap(Image *image)
%
% A description of each parameter follows:
%
% o image: the image.
%
*/
-MagickExport void PopPixelComponentMap(Image *image)
+MagickExport void PopPixelChannelMap(Image *image)
{
image->map--;
if (image->map < 0)
- ThrowFatalException(ResourceLimitFatalError,"PixelComponentMapStack");
+ ThrowFatalException(ResourceLimitFatalError,"PixelChannelMapStack");
}
/*
@@ -4478,18 +4476,18 @@
% %
% %
% %
-% P u s h P i x e l C o m p o n e n t M a p %
+% P u s h P i x e l C h a n n e l M a p %
% %
% %
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% PushPixelComponentMap() pushes the pixel component map from the specified
+% PushPixelChannelMap() pushes the pixel channel map from the specified
% channel mask.
%
-% The format of the PushPixelComponentMap method is:
+% The format of the PushPixelChannelMap method is:
%
-% void PushPixelComponentMap(Image *image,const ChannelType channel_mask)
+% void PushPixelChannelMap(Image *image,const ChannelType channel_mask)
%
% A description of each parameter follows:
%
@@ -4498,13 +4496,13 @@
% o channel_mask: the channel mask.
%
*/
-MagickExport void PushPixelComponentMap(Image *image,
+MagickExport void PushPixelChannelMap(Image *image,
const ChannelType channel_mask)
{
image->map++;
- if (image->map >= MaxPixelComponentMaps)
- ThrowFatalException(ResourceLimitFatalError,"PixelComponentMapStack");
- SetPixelComponentMap(image,channel_mask);
+ if (image->map >= MaxPixelChannelMaps)
+ ThrowFatalException(ResourceLimitFatalError,"PixelChannelMapStack");
+ SetPixelChannelMap(image,channel_mask);
}
/*
@@ -4512,18 +4510,18 @@
% %
% %
% %
-% S e t P i x e l C o m p o n e n t M a p %
+% S e t P i x e l C h a n n e l M a p %
% %
% %
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% SetPixelComponentMap() sets the pixel component map from the specified
-% channel mask.
+% SetPixelChannelMap() sets the pixel channel map from the specified channel
+% mask.
%
-% The format of the SetPixelComponentMap method is:
+% The format of the SetPixelChannelMap method is:
%
-% void SetPixelComponentMap(Image *image,const ChannelType channel_mask)
+% void SetPixelChannelMap(Image *image,const ChannelType channel_mask)
%
% A description of each parameter follows:
%
@@ -4532,25 +4530,25 @@
% o channel_mask: the channel mask.
%
*/
-MagickExport void SetPixelComponentMap(Image *image,
+MagickExport void SetPixelChannelMap(Image *image,
const ChannelType channel_mask)
{
register ssize_t
i;
- for (i=0; i < MaxPixelComponents; i++)
- SetPixelComponentMapTraits(image,(PixelComponent) i,UndefinedPixelTrait);
+ for (i=0; i < MaxPixelChannels; i++)
+ SetPixelChannelMapTraits(image,(PixelChannel) i,UndefinedPixelTrait);
image->sync=(channel_mask & SyncChannels) != 0 ? MagickTrue : MagickFalse;
if ((channel_mask & RedChannel) != 0)
- SetPixelRedTraits(image,ActivePixelTrait);
+ SetPixelRedTraits(image,UpdatePixelTrait);
if ((channel_mask & GreenChannel) != 0)
- SetPixelGreenTraits(image,ActivePixelTrait);
+ SetPixelGreenTraits(image,UpdatePixelTrait);
if ((channel_mask & BlueChannel) != 0)
- SetPixelBlueTraits(image,ActivePixelTrait);
+ SetPixelBlueTraits(image,UpdatePixelTrait);
if ((channel_mask & BlackChannel) != 0)
- SetPixelBlackTraits(image,ActivePixelTrait);
+ SetPixelBlackTraits(image,UpdatePixelTrait);
if ((channel_mask & AlphaChannel) != 0)
- SetPixelAlphaTraits(image,ActivePixelTrait);
+ SetPixelAlphaTraits(image,UpdatePixelTrait);
}
/*
@@ -4558,50 +4556,48 @@
% %
% %
% %
-+ S t a n d a r d P i x e l C o m p o n e n t M a p %
++ S t a n d a r d P i x e l C h a n n e l M a p %
% %
% %
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% StandardPixelComponentMap() defines the standard pixel component map.
+% StandardPixelChannelMap() defines the standard pixel component map.
%
-% The format of the StandardPixelComponentMap() method is:
+% The format of the StandardPixelChannelMap() method is:
%
-% void StandardPixelComponentMap(Image *image)
+% void StandardPixelChannelMap(Image *image)
%
% A description of each parameter follows:
%
% o image: the image.
%
*/
-MagickExport void StandardPixelComponentMap(Image *image)
+MagickExport void StandardPixelChannelMap(Image *image)
{
- image->pixel_components=4;
- SetPixelComponentMapComponent(image,RedPixelComponent,RedPixelComponent);
- SetPixelComponentMapTraits(image,RedPixelComponent,(PixelTrait)
- (ActivePixelTrait | BlendPixelTrait));
- SetPixelComponentMapComponent(image,GreenPixelComponent,GreenPixelComponent);
- SetPixelComponentMapTraits(image,GreenPixelComponent,(PixelTrait)
- (ActivePixelTrait | BlendPixelTrait));
- SetPixelComponentMapComponent(image,BluePixelComponent,BluePixelComponent);
- SetPixelComponentMapTraits(image,BluePixelComponent,(PixelTrait)
- (ActivePixelTrait | BlendPixelTrait));
- SetPixelComponentMapComponent(image,AlphaPixelComponent,AlphaPixelComponent);
- SetPixelComponentMapTraits(image,AlphaPixelComponent,ActivePixelTrait);
+ image->number_channels=4;
+ SetPixelChannelMapComponent(image,RedPixelChannel,RedPixelChannel);
+ SetPixelChannelMapTraits(image,RedPixelChannel,(PixelTrait)
+ (UpdatePixelTrait | BlendPixelTrait));
+ SetPixelChannelMapComponent(image,GreenPixelChannel,GreenPixelChannel);
+ SetPixelChannelMapTraits(image,GreenPixelChannel,(PixelTrait)
+ (UpdatePixelTrait | BlendPixelTrait));
+ SetPixelChannelMapComponent(image,BluePixelChannel,BluePixelChannel);
+ SetPixelChannelMapTraits(image,BluePixelChannel,(PixelTrait)
+ (UpdatePixelTrait | BlendPixelTrait));
+ SetPixelChannelMapComponent(image,AlphaPixelChannel,AlphaPixelChannel);
+ SetPixelChannelMapTraits(image,AlphaPixelChannel,UpdatePixelTrait);
if (image->colorspace == CMYKColorspace)
{
- image->pixel_components++;
- SetPixelComponentMapComponent(image,BlackPixelComponent,
- BlackPixelComponent);
- SetPixelComponentMapTraits(image,BlackPixelComponent,(PixelTrait)
- (ActivePixelTrait | BlendPixelTrait));
+ image->number_channels++;
+ SetPixelChannelMapComponent(image,BlackPixelChannel,BlackPixelChannel);
+ SetPixelChannelMapTraits(image,BlackPixelChannel,(PixelTrait)
+ (UpdatePixelTrait | BlendPixelTrait));
}
if (image->storage_class == PseudoClass)
{
- image->pixel_components++;
- SetPixelComponentMapComponent(image,IndexPixelComponent,
- IndexPixelComponent);
- SetPixelComponentMapTraits(image,IndexPixelComponent,UndefinedPixelTrait);
+ image->number_channels++;
+ SetPixelChannelMapComponent(image,IndexPixelChannel,IndexPixelChannel);
+ SetPixelChannelMapTraits(image,IndexPixelChannel,CopyPixelTrait);
}
}
diff --git a/MagickCore/pixel.h b/MagickCore/pixel.h
index 35bc8d7..66751f8 100644
--- a/MagickCore/pixel.h
+++ b/MagickCore/pixel.h
@@ -25,8 +25,8 @@
#include <MagickCore/colorspace.h>
#include <MagickCore/constitute.h>
-#define MaxPixelComponents 32
-#define MaxPixelComponentMaps 8
+#define MaxPixelChannels 32
+#define MaxPixelChannelMaps 8
typedef enum
{
@@ -43,38 +43,30 @@
typedef enum
{
- RedPixelComponent = 0,
- CyanPixelComponent = 0,
- GrayPixelComponent = 0,
- YPixelComponent = 0,
- GreenPixelComponent = 1,
- MagentaPixelComponent = 1,
- CbPixelComponent = 1,
- BluePixelComponent = 2,
- YellowPixelComponent = 2,
- CrPixelComponent = 2,
- AlphaPixelComponent = 3,
- BlackPixelComponent = 4,
- IndexPixelComponent = 4,
- MaskPixelComponent = 5
-} PixelComponent;
+ RedPixelChannel = 0,
+ CyanPixelChannel = 0,
+ GrayPixelChannel = 0,
+ YPixelChannel = 0,
+ GreenPixelChannel = 1,
+ MagentaPixelChannel = 1,
+ CbPixelChannel = 1,
+ BluePixelChannel = 2,
+ YellowPixelChannel = 2,
+ CrPixelChannel = 2,
+ AlphaPixelChannel = 3,
+ BlackPixelChannel = 4,
+ IndexPixelChannel = 4,
+ MaskPixelChannel = 5
+} PixelChannel;
typedef enum
{
UndefinedPixelTrait = 0x000000,
- ActivePixelTrait = 0x000001,
- BlendPixelTrait = 0x000002
+ CopyPixelTrait = 0x000001,
+ UpdatePixelTrait = 0x000002,
+ BlendPixelTrait = 0x000004
} PixelTrait;
-typedef struct _PixelComponentMap
-{
- PixelComponent
- component;
-
- PixelTrait
- traits;
-} PixelComponentMap;
-
typedef struct _DoublePixelPacket
{
double
@@ -95,6 +87,15 @@
black;
} LongPixelPacket;
+typedef struct _PixelChannelMap
+{
+ PixelChannel
+ channel;
+
+ PixelTrait
+ traits;
+} PixelChannelMap;
+
typedef struct _PixelInfo
{
ClassType
@@ -152,20 +153,20 @@
IsFuzzyEquivalencePixelPacket(const Image *,const PixelPacket *,
const PixelPacket *);
-extern MagickExport PixelComponentMap
- **AcquirePixelComponentMap(void),
- **ClonePixelComponentMap(PixelComponentMap **),
- **DestroyPixelComponentMap(PixelComponentMap **);
+extern MagickExport PixelChannelMap
+ **AcquirePixelChannelMap(void),
+ **ClonePixelChannelMap(PixelChannelMap **),
+ **DestroyPixelChannelMap(PixelChannelMap **);
extern MagickExport PixelInfo
*ClonePixelInfo(const PixelInfo *);
extern MagickExport void
- StandardPixelComponentMap(Image *),
+ StandardPixelChannelMap(Image *),
GetPixelInfo(const Image *,PixelInfo *),
- PopPixelComponentMap(Image *),
- PushPixelComponentMap(Image *,const ChannelType),
- SetPixelComponentMap(Image *,const ChannelType);
+ PopPixelChannelMap(Image *),
+ PushPixelChannelMap(Image *,const ChannelType),
+ SetPixelChannelMap(Image *,const ChannelType);
#if defined(__cplusplus) || defined(c_plusplus)
}
diff --git a/MagickCore/prepress.c b/MagickCore/prepress.c
index 78c4ac6..76b09f6 100644
--- a/MagickCore/prepress.c
+++ b/MagickCore/prepress.c
@@ -141,7 +141,7 @@
if (density > total_ink_density)
total_ink_density=density;
}
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
image_view=DestroyCacheView(image_view);
diff --git a/MagickCore/profile.c b/MagickCore/profile.c
index c50b7ef..e6f9c83 100644
--- a/MagickCore/profile.c
+++ b/MagickCore/profile.c
@@ -1242,12 +1242,12 @@
}
if (source_channels > 3)
*p++=ScaleQuantumToShort(GetPixelBlack(image,q));
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
cmsDoTransform(transform[id],source_pixels[id],target_pixels[id],
(unsigned int) image->columns);
p=target_pixels[id];
- q-=image->columns*GetPixelComponents(image);
+ q-=image->columns*GetPixelChannels(image);
for (x=0; x < (ssize_t) image->columns; x++)
{
SetPixelRed(image,ScaleShortToQuantum(*p),q);
@@ -1266,7 +1266,7 @@
SetPixelBlack(image,ScaleShortToQuantum(*p),q);
p++;
}
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
if (sync == MagickFalse)
diff --git a/MagickCore/quantize.c b/MagickCore/quantize.c
index 73e6e24..9ad658b 100644
--- a/MagickCore/quantize.c
+++ b/MagickCore/quantize.c
@@ -594,7 +594,7 @@
PixelPacket
packet;
- GetPixelPacket(image,q+count*GetPixelComponents(image),&packet);
+ GetPixelPacket(image,q+count*GetPixelChannels(image),&packet);
if (IsPixelEquivalent(image,q,&packet) == MagickFalse)
break;
}
@@ -627,7 +627,7 @@
if (cube.associate_alpha != MagickFalse)
SetPixelAlpha(image,image->colormap[index].alpha,q);
}
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
@@ -838,7 +838,7 @@
PixelPacket
packet;
- GetPixelPacket(image,p+count*GetPixelComponents(image),&packet);
+ GetPixelPacket(image,p+count*GetPixelChannels(image),&packet);
if (IsPixelEquivalent(image,p,&packet) == MagickFalse)
break;
}
@@ -892,7 +892,7 @@
node_info->total_color.blue+=count*QuantumScale*pixel.blue;
if (cube_info->associate_alpha != MagickFalse)
node_info->total_color.alpha+=count*QuantumScale*pixel.alpha;
- p+=count*GetPixelComponents(image);
+ p+=count*GetPixelChannels(image);
}
if (cube_info->colors > cube_info->maximum_colors)
{
@@ -933,7 +933,7 @@
PixelPacket
packet;
- GetPixelPacket(image,p+count*GetPixelComponents(image),&packet);
+ GetPixelPacket(image,p+count*GetPixelChannels(image),&packet);
if (IsPixelEquivalent(image,p,&packet) == MagickFalse)
break;
}
@@ -987,7 +987,7 @@
node_info->total_color.blue+=count*QuantumScale*pixel.blue;
if (cube_info->associate_alpha != MagickFalse)
node_info->total_color.alpha+=count*QuantumScale*pixel.alpha;
- p+=count*GetPixelComponents(image);
+ p+=count*GetPixelChannels(image);
}
proceed=SetImageProgress(image,ClassifyImageTag,(MagickOffsetType) y,
image->rows);
@@ -1525,7 +1525,7 @@
status=MagickFalse;
continue;
}
- q+=(y & 0x01)*image->columns*GetPixelComponents(image);
+ q+=(y & 0x01)*image->columns*GetPixelChannels(image);
cube=(*cube_info);
current=pixels[id]+(y & 0x01)*image->columns;
previous=pixels[id]+((y+1) & 0x01)*image->columns;
@@ -1542,7 +1542,7 @@
ssize_t
u;
- q-=(y & 0x01)*GetPixelComponents(image);
+ q-=(y & 0x01)*GetPixelChannels(image);
u=(y & 0x01) != 0 ? (ssize_t) image->columns-1-x : x;
AssociateAlphaPixel(image,&cube,q,&pixel);
if (x > 0)
@@ -1649,7 +1649,7 @@
if (proceed == MagickFalse)
status=MagickFalse;
}
- q+=((y+1) & 0x01)*GetPixelComponents(image);
+ q+=((y+1) & 0x01)*GetPixelChannels(image);
}
}
image_view=DestroyCacheView(image_view);
@@ -2215,7 +2215,7 @@
mean_error+=distance*distance;
if (distance > maximum_error)
maximum_error=distance;
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
image_view=DestroyCacheView(image_view);
@@ -2343,13 +2343,13 @@
/*
Posterize colormap.
*/
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
image->colormap[i].red=PosterizePixel(image->colormap[i].red);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
image->colormap[i].green=PosterizePixel(image->colormap[i].green);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
image->colormap[i].blue=PosterizePixel(image->colormap[i].blue);
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
image->colormap[i].alpha=PosterizePixel(image->colormap[i].alpha);
}
/*
@@ -2380,19 +2380,19 @@
}
for (x=0; x < (ssize_t) image->columns; x++)
{
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
SetPixelRed(image,PosterizePixel(GetPixelRed(image,q)),q);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
SetPixelGreen(image,PosterizePixel(GetPixelGreen(image,q)),q);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
SetPixelBlue(image,PosterizePixel(GetPixelBlue(image,q)),q);
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
SetPixelBlack(image,PosterizePixel(GetPixelBlack(image,q)),q);
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) &&
(image->matte == MagickTrue))
SetPixelAlpha(image,PosterizePixel(GetPixelAlpha(image,q)),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -3228,7 +3228,7 @@
}
SetPixelIndex(image,(Quantum)
colormap_index[intensity],q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -3284,7 +3284,7 @@
{
SetPixelIndex(image,(Quantum) colormap_index[ScaleQuantumToMap(
GetPixelIndex(image,q))],q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
diff --git a/MagickCore/quantum-export.c b/MagickCore/quantum-export.c
index 1799a21..cef5547 100644
--- a/MagickCore/quantum-export.c
+++ b/MagickCore/quantum-export.c
@@ -280,13 +280,13 @@
{
number_pixels=GetImageExtent(image);
p=GetVirtualPixelQueue(image);
- channels=GetPixelComponents(image);
+ channels=GetPixelChannels(image);
}
else
{
number_pixels=GetCacheViewExtent(image_view);
p=GetCacheViewVirtualPixelQueue(image_view);
- channels=GetPixelComponents(image);
+ channels=GetPixelChannels(image);
}
if (quantum_info->alpha_type == AssociatedQuantumAlpha)
{
diff --git a/MagickCore/quantum-import.c b/MagickCore/quantum-import.c
index 455f5fd..0da2d48 100644
--- a/MagickCore/quantum-import.c
+++ b/MagickCore/quantum-import.c
@@ -300,13 +300,13 @@
{
number_pixels=GetImageExtent(image);
q=GetAuthenticPixelQueue(image);
- channels=GetPixelComponents(image);
+ channels=GetPixelChannels(image);
}
else
{
number_pixels=GetCacheViewExtent(image_view);
q=GetCacheViewAuthenticPixelQueue(image_view);
- channels=GetPixelComponents(image);
+ channels=GetPixelChannels(image);
}
InitializeQuantumState(quantum_info,image->endian,&quantum_state);
extent=GetQuantumExtent(image,quantum_info,quantum_type);
diff --git a/MagickCore/resample.c b/MagickCore/resample.c
index 59ef93d..7da164c 100644
--- a/MagickCore/resample.c
+++ b/MagickCore/resample.c
@@ -626,7 +626,7 @@
#else
}
#endif
- pixels+=GetPixelComponents(resample_filter->image);
+ pixels+=GetPixelChannels(resample_filter->image);
Q += DQ;
DQ += DDQ;
}
diff --git a/MagickCore/resize.c b/MagickCore/resize.c
index 2258f78..116bcfd 100644
--- a/MagickCore/resize.c
+++ b/MagickCore/resize.c
@@ -1202,7 +1202,7 @@
(void) InterpolatePixelInfo(image,image_view,
MeshInterpolatePixel,offset.x-0.5,offset.y-0.5,&pixel,exception);
SetPixelPixelInfo(resize_image,&pixel,q);
- q+=GetPixelComponents(resize_image);
+ q+=GetPixelChannels(resize_image);
}
if (SyncCacheViewAuthenticPixels(resize_view,exception) == MagickFalse)
continue;
@@ -2164,17 +2164,17 @@
(contribution[i].pixel-contribution[0].pixel);
alpha=contribution[i].weight;
pixel.red+=alpha*GetPixelRed(image,p+j*
- GetPixelComponents(image));
+ GetPixelChannels(image));
pixel.green+=alpha*GetPixelGreen(image,p+j*
- GetPixelComponents(image));
+ GetPixelChannels(image));
pixel.blue+=alpha*GetPixelBlue(image,p+j*
- GetPixelComponents(image));
+ GetPixelChannels(image));
if ((image->colorspace == CMYKColorspace) &&
(resize_image->colorspace == CMYKColorspace))
pixel.black+=alpha*GetPixelBlue(image,p+j*
- GetPixelComponents(image));
+ GetPixelChannels(image));
pixel.alpha+=alpha*GetPixelAlpha(image,p+j*
- GetPixelComponents(image));
+ GetPixelChannels(image));
}
SetPixelRed(resize_image,ClampToQuantum(pixel.red),q);
SetPixelGreen(resize_image,ClampToQuantum(pixel.green),q);
@@ -2195,19 +2195,19 @@
j=y*(contribution[n-1].pixel-contribution[0].pixel+1)+
(contribution[i].pixel-contribution[0].pixel);
alpha=contribution[i].weight*QuantumScale*
- GetPixelAlpha(image,p+j*GetPixelComponents(image));
+ GetPixelAlpha(image,p+j*GetPixelChannels(image));
pixel.red+=alpha*GetPixelRed(image,p+j*
- GetPixelComponents(image));
+ GetPixelChannels(image));
pixel.green+=alpha*GetPixelGreen(image,p+j*
- GetPixelComponents(image));
+ GetPixelChannels(image));
pixel.blue+=alpha*GetPixelBlue(image,p+j*
- GetPixelComponents(image));
+ GetPixelChannels(image));
if ((image->colorspace == CMYKColorspace) &&
(resize_image->colorspace == CMYKColorspace))
pixel.black+=alpha*GetPixelBlack(image,p+j*
- GetPixelComponents(image));
+ GetPixelChannels(image));
pixel.alpha+=contribution[i].weight*
- GetPixelAlpha(image,p+j*GetPixelComponents(image));
+ GetPixelAlpha(image,p+j*GetPixelChannels(image));
gamma+=alpha;
}
gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
@@ -2227,9 +2227,9 @@
j=y*(contribution[n-1].pixel-contribution[0].pixel+1)+
(contribution[i-start].pixel-contribution[0].pixel);
SetPixelIndex(resize_image,GetPixelIndex(image,p+j*
- GetPixelComponents(image)),q);
+ GetPixelChannels(image)),q);
}
- q+=GetPixelComponents(resize_image);
+ q+=GetPixelChannels(resize_image);
}
if (SyncCacheViewAuthenticPixels(resize_view,exception) == MagickFalse)
status=MagickFalse;
@@ -2396,17 +2396,17 @@
image->columns+x);
alpha=contribution[i].weight;
pixel.red+=alpha*GetPixelRed(image,p+j*
- GetPixelComponents(image));
+ GetPixelChannels(image));
pixel.green+=alpha*GetPixelGreen(image,p+j*
- GetPixelComponents(image));
+ GetPixelChannels(image));
pixel.blue+=alpha*GetPixelBlue(image,p+j*
- GetPixelComponents(image));
+ GetPixelChannels(image));
if ((image->colorspace == CMYKColorspace) &&
(resize_image->colorspace == CMYKColorspace))
pixel.black+=alpha*GetPixelBlack(image,p+j*
- GetPixelComponents(image));
+ GetPixelChannels(image));
pixel.alpha+=alpha*GetPixelAlpha(image,p+j*
- GetPixelComponents(image));
+ GetPixelChannels(image));
}
SetPixelRed(resize_image,ClampToQuantum(pixel.red),q);
SetPixelGreen(resize_image,ClampToQuantum(pixel.green),q);
@@ -2427,19 +2427,19 @@
j=(ssize_t) ((contribution[i].pixel-contribution[0].pixel)*
image->columns+x);
alpha=contribution[i].weight*QuantumScale*
- GetPixelAlpha(image,p+j*GetPixelComponents(image));
+ GetPixelAlpha(image,p+j*GetPixelChannels(image));
pixel.red+=alpha*GetPixelRed(image,p+j*
- GetPixelComponents(image));
+ GetPixelChannels(image));
pixel.green+=alpha*GetPixelGreen(image,p+j*
- GetPixelComponents(image));
+ GetPixelChannels(image));
pixel.blue+=alpha*GetPixelBlue(image,p+j*
- GetPixelComponents(image));
+ GetPixelChannels(image));
if ((image->colorspace == CMYKColorspace) &&
(resize_image->colorspace == CMYKColorspace))
pixel.black+=alpha*GetPixelBlack(image,p+j*
- GetPixelComponents(image));
+ GetPixelChannels(image));
pixel.alpha+=contribution[i].weight*GetPixelAlpha(image,p+j*
- GetPixelComponents(image));
+ GetPixelChannels(image));
gamma+=alpha;
}
gamma=1.0/(fabs((double) gamma) <= MagickEpsilon ? 1.0 : gamma);
@@ -2459,9 +2459,9 @@
j=(ssize_t) ((contribution[i-start].pixel-contribution[0].pixel)*
image->columns+x);
SetPixelIndex(resize_image,GetPixelIndex(image,p+j*
- GetPixelComponents(image)),q);
+ GetPixelChannels(image)),q);
}
- q+=GetPixelComponents(resize_image);
+ q+=GetPixelChannels(resize_image);
}
if (SyncCacheViewAuthenticPixels(resize_view,exception) == MagickFalse)
status=MagickFalse;
@@ -2712,21 +2712,21 @@
for (x=0; x < (ssize_t) sample_image->columns; x++)
{
SetPixelRed(sample_image,GetPixelRed(image,p+x_offset[x]*
- GetPixelComponents(image)),q);
+ GetPixelChannels(image)),q);
SetPixelGreen(sample_image,GetPixelGreen(image,p+x_offset[x]*
- GetPixelComponents(image)),q);
+ GetPixelChannels(image)),q);
SetPixelBlue(sample_image,GetPixelBlue(image,p+x_offset[x]*
- GetPixelComponents(image)),q);
+ GetPixelChannels(image)),q);
if (image->colorspace == CMYKColorspace)
SetPixelBlack(sample_image,GetPixelBlack(image,p+x_offset[x]*
- GetPixelComponents(image)),q);
+ GetPixelChannels(image)),q);
if (image->matte != MagickFalse)
SetPixelAlpha(sample_image,GetPixelAlpha(image,p+x_offset[x]*
- GetPixelComponents(image)),q);
+ GetPixelChannels(image)),q);
if (image->storage_class == PseudoClass)
SetPixelIndex(sample_image,GetPixelIndex(image,p+x_offset[x]*
- GetPixelComponents(image)),q);
- q+=GetPixelComponents(sample_image);
+ GetPixelChannels(image)),q);
+ q+=GetPixelChannels(sample_image);
}
if (SyncCacheViewAuthenticPixels(sample_view,exception) == MagickFalse)
status=MagickFalse;
@@ -2915,7 +2915,7 @@
x_vector[x].alpha=(MagickRealType) GetPixelAlpha(image,p);
if (image->colorspace == CMYKColorspace)
x_vector[x].black=(MagickRealType) (alpha*GetPixelBlack(image,p));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
else
@@ -2952,7 +2952,7 @@
if (image->matte != MagickFalse)
x_vector[x].alpha=(MagickRealType)
GetPixelAlpha(image,p);
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
number_rows++;
}
@@ -2991,7 +2991,7 @@
GetPixelBlack(image,p));
if (image->matte != MagickFalse)
x_vector[x].alpha=(MagickRealType) GetPixelAlpha(image,p);
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
number_rows++;
next_row=MagickFalse;
@@ -3042,7 +3042,7 @@
SetPixelBlack(scale_image,ClampToQuantum(alpha*s->black),q);
if (scale_image->matte != MagickFalse)
SetPixelAlpha(scale_image,ClampToQuantum(s->alpha),q);
- q+=GetPixelComponents(scale_image);
+ q+=GetPixelChannels(scale_image);
s++;
}
}
@@ -3142,7 +3142,7 @@
if (scale_image->matte != MagickFalse)
SetPixelAlpha(scale_image,ClampToQuantum(t->alpha),q);
t++;
- q+=GetPixelComponents(scale_image);
+ q+=GetPixelChannels(scale_image);
}
}
if (SyncCacheViewAuthenticPixels(scale_view,exception) == MagickFalse)
diff --git a/MagickCore/segment.c b/MagickCore/segment.c
index e14f3e1..beb7e72 100644
--- a/MagickCore/segment.c
+++ b/MagickCore/segment.c
@@ -394,7 +394,7 @@
cluster->count++;
break;
}
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
if (image->progress_monitor != (MagickProgressMonitor) NULL)
{
@@ -633,7 +633,7 @@
}
}
}
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -1126,7 +1126,7 @@
cluster->count++;
break;
}
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
proceed=SetImageProgress(image,SegmentImageTag,(MagickOffsetType) y,
2*image->rows);
@@ -1267,7 +1267,7 @@
histogram[Red][(ssize_t) ScaleQuantumToChar(GetPixelRed(image,p))]++;
histogram[Green][(ssize_t) ScaleQuantumToChar(GetPixelGreen(image,p))]++;
histogram[Blue][(ssize_t) ScaleQuantumToChar(GetPixelBlue(image,p))]++;
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
}
diff --git a/MagickCore/shear.c b/MagickCore/shear.c
index 44dfca6..0f3a15b 100644
--- a/MagickCore/shear.c
+++ b/MagickCore/shear.c
@@ -750,7 +750,7 @@
bit=0;
byte=0;
}
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
if (bit != 0)
{
@@ -801,7 +801,7 @@
bit=0;
byte=0;
}
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
if (bit != 0)
{
@@ -861,7 +861,7 @@
background.blue+=QuantumScale*GetPixelBlue(image,p);
background.alpha+=QuantumScale*GetPixelAlpha(image,p);
count++;
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
image_view=DestroyCacheView(image_view);
@@ -1140,15 +1140,15 @@
status=MagickFalse;
break;
}
- tile_pixels=p+((height-1)*width+y)*GetPixelComponents(image);
+ tile_pixels=p+((height-1)*width+y)*GetPixelChannels(image);
for (x=0; x < (ssize_t) height; x++)
{
SetPixelRed(rotate_image,GetPixelRed(image,tile_pixels),q);
SetPixelGreen(rotate_image,GetPixelGreen(image,tile_pixels),q);
SetPixelBlue(rotate_image,GetPixelBlue(image,tile_pixels),q);
SetPixelAlpha(rotate_image,GetPixelAlpha(image,tile_pixels),q);
- tile_pixels-=width*GetPixelComponents(image);
- q+=GetPixelComponents(rotate_image);
+ tile_pixels-=width*GetPixelChannels(image);
+ q+=GetPixelChannels(rotate_image);
}
sync=SyncCacheViewAuthenticPixels(rotate_view,exception);
if (sync == MagickFalse)
@@ -1207,15 +1207,15 @@
status=MagickFalse;
continue;
}
- q+=GetPixelComponents(rotate_image)*image->columns;
+ q+=GetPixelChannels(rotate_image)*image->columns;
for (x=0; x < (ssize_t) image->columns; x++)
{
- q-=GetPixelComponents(rotate_image);
+ q-=GetPixelChannels(rotate_image);
SetPixelRed(rotate_image,GetPixelRed(image,p),q);
SetPixelGreen(rotate_image,GetPixelGreen(image,p),q);
SetPixelBlue(rotate_image,GetPixelBlue(image,p),q);
SetPixelAlpha(rotate_image,GetPixelAlpha(image,p),q);
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(rotate_view,exception);
if (sync == MagickFalse)
@@ -1308,15 +1308,15 @@
status=MagickFalse;
break;
}
- tile_pixels=p+((width-1)-y)*GetPixelComponents(image);
+ tile_pixels=p+((width-1)-y)*GetPixelChannels(image);
for (x=0; x < (ssize_t) height; x++)
{
SetPixelRed(rotate_image,GetPixelRed(image,tile_pixels),q);
SetPixelGreen(rotate_image,GetPixelGreen(image,tile_pixels),q);
SetPixelBlue(rotate_image,GetPixelBlue(image,tile_pixels),q);
SetPixelAlpha(rotate_image,GetPixelAlpha(image,tile_pixels),q);
- tile_pixels+=width*GetPixelComponents(image);
- q+=GetPixelComponents(rotate_image);
+ tile_pixels+=width*GetPixelChannels(image);
+ q+=GetPixelChannels(rotate_image);
}
sync=SyncCacheViewAuthenticPixels(rotate_view,exception);
if (sync == MagickFalse)
@@ -1465,7 +1465,7 @@
status=MagickFalse;
continue;
}
- p+=x_offset*GetPixelComponents(image);
+ p+=x_offset*GetPixelChannels(image);
displacement=degrees*(MagickRealType) (y-height/2.0);
if (displacement == 0.0)
continue;
@@ -1491,14 +1491,14 @@
*/
if (step > x_offset)
break;
- q=p-step*GetPixelComponents(image);
+ q=p-step*GetPixelChannels(image);
for (i=0; i < (ssize_t) width; i++)
{
if ((x_offset+i) < step)
{
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
SetPixelInfo(image,p,&pixel);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
continue;
}
SetPixelInfo(image,p,&source);
@@ -1507,17 +1507,17 @@
&destination);
SetPixelPixelInfo(image,&destination,q);
SetPixelInfo(image,p,&pixel);
- p+=GetPixelComponents(image);
- q+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(image);
}
CompositePixelInfoAreaBlend(&pixel,(MagickRealType) pixel.alpha,
&background,(MagickRealType) background.alpha,area,&destination);
SetPixelPixelInfo(image,&destination,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
for (i=0; i < (step-1); i++)
{
SetPixelPixelInfo(image,&background,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
break;
}
@@ -1526,12 +1526,12 @@
/*
Transfer pixels right-to-left.
*/
- p+=width*GetPixelComponents(image);
- q=p+step*GetPixelComponents(image);
+ p+=width*GetPixelChannels(image);
+ q=p+step*GetPixelChannels(image);
for (i=0; i < (ssize_t) width; i++)
{
- p-=GetPixelComponents(image);
- q-=GetPixelComponents(image);
+ p-=GetPixelChannels(image);
+ q-=GetPixelChannels(image);
if ((size_t) (x_offset+width+step-i) >= image->columns)
continue;
SetPixelInfo(image,p,&source);
@@ -1543,11 +1543,11 @@
}
CompositePixelInfoAreaBlend(&pixel,(MagickRealType) pixel.alpha,
&background,(MagickRealType) background.alpha,area,&destination);
- q-=GetPixelComponents(image);
+ q-=GetPixelChannels(image);
SetPixelPixelInfo(image,&destination,q);
for (i=0; i < (step-1); i++)
{
- q-=GetPixelComponents(image);
+ q-=GetPixelChannels(image);
SetPixelPixelInfo(image,&background,q);
}
break;
@@ -1685,7 +1685,7 @@
status=MagickFalse;
continue;
}
- p+=y_offset*GetPixelComponents(image);
+ p+=y_offset*GetPixelChannels(image);
displacement=degrees*(MagickRealType) (x-width/2.0);
if (displacement == 0.0)
continue;
@@ -1711,14 +1711,14 @@
*/
if (step > y_offset)
break;
- q=p-step*GetPixelComponents(image);
+ q=p-step*GetPixelChannels(image);
for (i=0; i < (ssize_t) height; i++)
{
if ((y_offset+i) < step)
{
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
SetPixelInfo(image,p,&pixel);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
continue;
}
SetPixelInfo(image,p,&source);
@@ -1727,17 +1727,17 @@
&destination);
SetPixelPixelInfo(image,&destination,q);
SetPixelInfo(image,p,&pixel);
- p+=GetPixelComponents(image);
- q+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(image);
}
CompositePixelInfoAreaBlend(&pixel,(MagickRealType) pixel.alpha,
&background,(MagickRealType) background.alpha,area,&destination);
SetPixelPixelInfo(image,&destination,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
for (i=0; i < (step-1); i++)
{
SetPixelPixelInfo(image,&background,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
break;
}
@@ -1746,12 +1746,12 @@
/*
Transfer pixels bottom-to-top.
*/
- p+=height*GetPixelComponents(image);
- q=p+step*GetPixelComponents(image);
+ p+=height*GetPixelChannels(image);
+ q=p+step*GetPixelChannels(image);
for (i=0; i < (ssize_t) height; i++)
{
- p-=GetPixelComponents(image);
- q-=GetPixelComponents(image);
+ p-=GetPixelChannels(image);
+ q-=GetPixelChannels(image);
if ((size_t) (y_offset+height+step-i) >= image->rows)
continue;
SetPixelInfo(image,p,&source);
@@ -1763,11 +1763,11 @@
}
CompositePixelInfoAreaBlend(&pixel,(MagickRealType) pixel.alpha,
&background,(MagickRealType) background.alpha,area,&destination);
- q-=GetPixelComponents(image);
+ q-=GetPixelChannels(image);
SetPixelPixelInfo(image,&destination,q);
for (i=0; i < (step-1); i++)
{
- q-=GetPixelComponents(image);
+ q-=GetPixelChannels(image);
SetPixelPixelInfo(image,&background,q);
}
break;
diff --git a/MagickCore/statistic.c b/MagickCore/statistic.c
index f26b3e8..cb282a6 100644
--- a/MagickCore/statistic.c
+++ b/MagickCore/statistic.c
@@ -562,7 +562,7 @@
else
SetPixelAlpha(evaluate_image,
ClampToQuantum(evaluate_pixel[i/2].alpha),q);
- q+=GetPixelComponents(evaluate_image);
+ q+=GetPixelChannels(evaluate_image);
}
if (SyncCacheViewAuthenticPixels(evaluate_view,exception) == MagickFalse)
status=MagickFalse;
@@ -648,7 +648,7 @@
evaluate_pixel[x].alpha=ApplyEvaluateOperator(random_info[id],
GetPixelAlpha(next,p),i == 0 ? AddEvaluateOperator : op,
evaluate_pixel[x].alpha);
- p+=GetPixelComponents(next);
+ p+=GetPixelChannels(next);
}
image_view=DestroyCacheView(image_view);
next=GetNextImageInList(next);
@@ -676,7 +676,7 @@
else
SetPixelAlpha(evaluate_image,ClampToQuantum(evaluate_pixel[x].alpha),
q);
- q+=GetPixelComponents(evaluate_image);
+ q+=GetPixelChannels(evaluate_image);
}
if (SyncCacheViewAuthenticPixels(evaluate_view,exception) == MagickFalse)
status=MagickFalse;
@@ -759,20 +759,20 @@
}
for (x=0; x < (ssize_t) image->columns; x++)
{
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
SetPixelRed(image,ClampToQuantum(ApplyEvaluateOperator(
random_info[id],GetPixelRed(image,q),op,value)),q);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
SetPixelGreen(image,ClampToQuantum(ApplyEvaluateOperator(
random_info[id],GetPixelGreen(image,q),op,value)),q);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
SetPixelBlue(image,ClampToQuantum(ApplyEvaluateOperator(
random_info[id],GetPixelBlue(image,q),op,value)),q);
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
SetPixelBlack(image,ClampToQuantum(ApplyEvaluateOperator(
random_info[id],GetPixelBlack(image,q),op,value)),q);
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
{
if (image->matte == MagickFalse)
SetPixelAlpha(image,ClampToQuantum(ApplyEvaluateOperator(
@@ -781,7 +781,7 @@
SetPixelAlpha(image,ClampToQuantum(ApplyEvaluateOperator(
random_info[id],GetPixelAlpha(image,q),op,value)),q);
}
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -972,20 +972,20 @@
}
for (x=0; x < (ssize_t) image->columns; x++)
{
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
SetPixelRed(image,ApplyFunction(GetPixelRed(image,q),function,
number_parameters,parameters,exception),q);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
SetPixelGreen(image,ApplyFunction(GetPixelGreen(image,q),function,
number_parameters,parameters,exception),q);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
SetPixelBlue(image,ApplyFunction(GetPixelBlue(image,q),function,
number_parameters,parameters,exception),q);
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
SetPixelBlack(image,ApplyFunction(GetPixelBlack(image,q),function,
number_parameters,parameters,exception),q);
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
{
if (image->matte == MagickFalse)
SetPixelAlpha(image,ApplyFunction(GetPixelAlpha(image,q),function,
@@ -994,7 +994,7 @@
SetPixelAlpha(image,ApplyFunction(GetPixelAlpha(image,q),function,
number_parameters,parameters,exception),q);
}
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -1113,7 +1113,7 @@
channels=0;
channel_statistics[CompositeChannels].mean=0.0;
channel_statistics[CompositeChannels].standard_deviation=0.0;
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
{
channel_statistics[CompositeChannels].mean+=
channel_statistics[RedChannel].mean;
@@ -1123,7 +1123,7 @@
channel_statistics[RedChannel].mean;
channels++;
}
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
{
channel_statistics[CompositeChannels].mean+=
channel_statistics[GreenChannel].mean;
@@ -1133,7 +1133,7 @@
channel_statistics[GreenChannel].mean;
channels++;
}
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
{
channel_statistics[CompositeChannels].mean+=
channel_statistics[BlueChannel].mean;
@@ -1143,7 +1143,7 @@
channel_statistics[BlueChannel].mean;
channels++;
}
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
{
channel_statistics[CompositeChannels].mean+=
@@ -1154,7 +1154,7 @@
channel_statistics[BlackChannel].mean;
channels++;
}
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) &&
(image->matte != MagickFalse))
{
channel_statistics[CompositeChannels].mean+=
@@ -1244,7 +1244,7 @@
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
{
mean+=GetPixelRed(image,p);
sum_squares+=(double) GetPixelRed(image,p)*GetPixelRed(image,p);
@@ -1254,7 +1254,7 @@
GetPixelRed(image,p)*GetPixelRed(image,p)*GetPixelRed(image,p);
area++;
}
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
{
mean+=GetPixelGreen(image,p);
sum_squares+=(double) GetPixelGreen(image,p)*GetPixelGreen(image,p);
@@ -1265,7 +1265,7 @@
GetPixelGreen(image,p);
area++;
}
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
{
mean+=GetPixelBlue(image,p);
sum_squares+=(double) GetPixelBlue(image,p)*GetPixelBlue(image,p);
@@ -1276,7 +1276,7 @@
GetPixelBlue(image,p);
area++;
}
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
{
mean+=GetPixelBlack(image,p);
@@ -1288,7 +1288,7 @@
GetPixelBlack(image,p);
area++;
}
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
{
mean+=GetPixelAlpha(image,p);
sum_squares+=(double) GetPixelAlpha(image,p)*GetPixelAlpha(image,p);
@@ -1299,7 +1299,7 @@
GetPixelAlpha(image,p);
area++;
}
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
if (y < (ssize_t) image->rows)
@@ -1384,28 +1384,28 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
SetPixelInfo(image,p,&pixel);
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
{
if (pixel.red < *minima)
*minima=(double) pixel.red;
if (pixel.red > *maxima)
*maxima=(double) pixel.red;
}
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
{
if (pixel.green < *minima)
*minima=(double) pixel.green;
if (pixel.green > *maxima)
*maxima=(double) pixel.green;
}
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
{
if (pixel.blue < *minima)
*minima=(double) pixel.blue;
if (pixel.blue > *maxima)
*maxima=(double) pixel.blue;
}
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
{
if (pixel.black < *minima)
@@ -1413,14 +1413,14 @@
if (pixel.black > *maxima)
*maxima=(double) pixel.black;
}
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
{
if (pixel.alpha < *minima)
*minima=(double) pixel.alpha;
if (pixel.alpha > *maxima)
*maxima=(double) pixel.alpha;
}
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
return(y == (ssize_t) image->rows ? MagickTrue : MagickFalse);
@@ -1657,7 +1657,7 @@
GetPixelAlpha(image,p)*GetPixelAlpha(image,p);
}
x++;
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
area=(double) image->columns*image->rows;
diff --git a/MagickCore/stream.c b/MagickCore/stream.c
index c567a2c..c24872b 100644
--- a/MagickCore/stream.c
+++ b/MagickCore/stream.c
@@ -708,7 +708,7 @@
Pixels are stored in a temporary buffer until they are synced to the cache.
*/
number_pixels=(MagickSizeType) columns*rows;
- length=(size_t) number_pixels*cache_info->pixel_components*sizeof(Quantum);
+ length=(size_t) number_pixels*cache_info->number_channels*sizeof(Quantum);
if (cache_info->metacontent_extent != 0)
length+=number_pixels*cache_info->metacontent_extent;
if (cache_info->pixels == (Quantum *) NULL)
@@ -736,7 +736,7 @@
cache_info->metacontent=(void *) NULL;
if (cache_info->metacontent_extent != 0)
cache_info->metacontent=(void *) (cache_info->pixels+number_pixels*
- cache_info->pixel_components);
+ cache_info->number_channels);
return(cache_info->pixels);
}
@@ -867,7 +867,7 @@
cache_info->columns=columns;
cache_info->rows=rows;
number_pixels=(MagickSizeType) columns*rows;
- length=(size_t) number_pixels*cache_info->pixel_components*sizeof(Quantum);
+ length=(size_t) number_pixels*cache_info->number_channels*sizeof(Quantum);
if (cache_info->metacontent_extent != 0)
length+=number_pixels*cache_info->metacontent_extent;
if (cache_info->pixels == (Quantum *) NULL)
@@ -887,7 +887,7 @@
cache_info->metacontent=(void *) NULL;
if (cache_info->metacontent_extent != 0)
cache_info->metacontent=(void *) (cache_info->pixels+number_pixels*
- cache_info->pixel_components);
+ cache_info->number_channels);
return(cache_info->pixels);
}
diff --git a/MagickCore/threshold.c b/MagickCore/threshold.c
index 1fffd59..4f173f5 100644
--- a/MagickCore/threshold.c
+++ b/MagickCore/threshold.c
@@ -244,14 +244,14 @@
{
for (u=0; u < (ssize_t) width; u++)
{
- pixel.red+=GetPixelAlpha(image,r+u*GetPixelComponents(image));
- pixel.green+=GetPixelGreen(image,r+u*GetPixelComponents(image));
- pixel.blue+=GetPixelBlue(image,r+u*GetPixelComponents(image));
+ pixel.red+=GetPixelAlpha(image,r+u*GetPixelChannels(image));
+ pixel.green+=GetPixelGreen(image,r+u*GetPixelChannels(image));
+ pixel.blue+=GetPixelBlue(image,r+u*GetPixelChannels(image));
if (image->colorspace == CMYKColorspace)
- pixel.black+=GetPixelBlack(image,r+u*GetPixelComponents(image));
- pixel.alpha+=GetPixelAlpha(image,r+u*GetPixelComponents(image));
+ pixel.black+=GetPixelBlack(image,r+u*GetPixelChannels(image));
+ pixel.alpha+=GetPixelAlpha(image,r+u*GetPixelChannels(image));
}
- r+=(image->columns+width)*GetPixelComponents(image);
+ r+=(image->columns+width)*GetPixelChannels(image);
}
mean.red=(MagickRealType) (pixel.red/number_pixels+offset);
mean.green=(MagickRealType) (pixel.green/number_pixels+offset);
@@ -270,8 +270,8 @@
q);
SetPixelAlpha(threshold_image,(Quantum) (((MagickRealType)
GetPixelAlpha(threshold_image,q) <= mean.alpha) ? 0 : QuantumRange),q);
- p+=GetPixelComponents(image);
- q+=GetPixelComponents(threshold_image);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(threshold_image);
}
sync=SyncCacheViewAuthenticPixels(threshold_view,exception);
if (sync == MagickFalse)
@@ -395,26 +395,26 @@
GetPixelIntensity(image,q) <= threshold ? 0 : QuantumRange),q);
SetPixelGreen(image,GetPixelRed(image,q),q);
SetPixelBlue(image,GetPixelRed(image,q),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
}
else
for (x=0; x < (ssize_t) image->columns; x++)
{
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
SetPixelRed(image,(Quantum) ((MagickRealType)
GetPixelRed(image,q) <= threshold ? 0 : QuantumRange),q);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
SetPixelGreen(image,(Quantum) ((MagickRealType)
GetPixelGreen(image,q) <= threshold ? 0 : QuantumRange),q);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
SetPixelBlue(image,(Quantum) ((MagickRealType)
GetPixelBlue(image,q) <= threshold ? 0 : QuantumRange),q);
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
SetPixelBlack(image,(Quantum) ((MagickRealType)
GetPixelBlack(image,q) <= threshold ? 0 : QuantumRange),q);
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
{
if (image->matte == MagickFalse)
SetPixelAlpha(image,(Quantum) ((MagickRealType)
@@ -424,7 +424,7 @@
GetPixelAlpha(image,q) >= threshold ? OpaqueAlpha :
TransparentAlpha),q);
}
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -572,24 +572,24 @@
}
else
{
- if (((GetPixelRedTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelRedTraits(image) & UpdatePixelTrait) != 0) &&
((MagickRealType) GetPixelRed(image,q) < threshold.red))
SetPixelRed(image,0,q);
- if (((GetPixelGreenTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0) &&
((MagickRealType) GetPixelGreen(image,q) < threshold.green))
SetPixelGreen(image,0,q);
- if (((GetPixelBlueTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0) &&
((MagickRealType) GetPixelBlue(image,q) < threshold.blue))
SetPixelBlue(image,0,q);
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace) &&
((MagickRealType) GetPixelBlack(image,q) < threshold.black))
SetPixelBlack(image,0,q);
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) &&
((MagickRealType) GetPixelAlpha(image,q) < threshold.alpha))
SetPixelAlpha(image,0,q);
}
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -717,18 +717,18 @@
}
for (x=0; x < (ssize_t) image->columns; x++)
{
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
SetPixelRed(image,ClampToUnsignedQuantum(GetPixelRed(image,q)),q);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
SetPixelGreen(image,ClampToUnsignedQuantum(GetPixelGreen(image,q)),q);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
SetPixelBlue(image,ClampToUnsignedQuantum(GetPixelBlue(image,q)),q);
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
SetPixelBlack(image,ClampToUnsignedQuantum(GetPixelBlack(image,q)),q);
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
SetPixelAlpha(image,ClampToUnsignedQuantum(GetPixelAlpha(image,q)),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -1297,16 +1297,16 @@
else
levels.black = 2;
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
levels.red=levels.black;
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
levels.green=levels.black;
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
levels.blue=levels.black;
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
levels.black=levels.black;
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) &&
(image->matte != MagickFalse))
levels.alpha=levels.black;
@@ -1314,16 +1314,16 @@
if ( p != (char *) NULL && *p == ',' ) {
p=strchr((char *) threshold_map,',');
p++;
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
levels.red = (unsigned int) strtoul(p, &p, 10), (void)(*p == ',' && p++);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
levels.green = (unsigned int) strtoul(p, &p, 10), (void)(*p == ',' && p++);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
levels.blue = (unsigned int) strtoul(p, &p, 10), (void)(*p == ',' && p++);
- if ((GetPixelBlackTraits(image) & ActivePixelTrait) != 0 &&
+ if ((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0 &&
(image->colorspace == CMYKColorspace))
levels.black=(unsigned int) strtoul(p, &p, 10), (void)(*p == ',' && p++);
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
levels.alpha = (unsigned int) strtoul(p, &p, 10), (void)(*p == ',' && p++);
}
}
@@ -1445,7 +1445,7 @@
SetPixelBlack(image,RoundToQuantum((MagickRealType)
((l+(t>=threshold))*(MagickRealType) QuantumRange/levels.black)),q);
}
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -1611,7 +1611,7 @@
index=(Quantum) (intensity <= threshold.black ? 0 : 1);
SetPixelIndex(image,index,q);
SetPixelPacket(image,image->colormap+(ssize_t) index,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(image_view,exception);
if (sync == MagickFalse)
@@ -1665,7 +1665,7 @@
}
for (x=0; x < (ssize_t) image->columns; x++)
{
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
{
if ((MagickRealType) GetPixelRed(image,q) < min_threshold)
threshold.red=min_threshold;
@@ -1676,7 +1676,7 @@
threshold.red=(MagickRealType) (QuantumRange*
GetPseudoRandomValue(random_info[id]));
}
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
{
if ((MagickRealType) GetPixelGreen(image,q) < min_threshold)
threshold.green=min_threshold;
@@ -1687,7 +1687,7 @@
threshold.green=(MagickRealType) (QuantumRange*
GetPseudoRandomValue(random_info[id]));
}
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
{
if ((MagickRealType) GetPixelBlue(image,q) < min_threshold)
threshold.blue=min_threshold;
@@ -1698,7 +1698,7 @@
threshold.blue=(MagickRealType) (QuantumRange*
GetPseudoRandomValue(random_info[id]));
}
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
{
if ((MagickRealType) GetPixelBlack(image,q) < min_threshold)
@@ -1710,7 +1710,7 @@
threshold.black=(MagickRealType) (QuantumRange*
GetPseudoRandomValue(random_info[id]));
}
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
{
if ((MagickRealType) GetPixelAlpha(image,q) < min_threshold)
threshold.alpha=min_threshold;
@@ -1721,23 +1721,23 @@
threshold.alpha=(MagickRealType) (QuantumRange*
GetPseudoRandomValue(random_info[id]));
}
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
SetPixelRed(image,(Quantum) ((MagickRealType)
GetPixelRed(image,q) <= threshold.red ? 0 : QuantumRange),q);
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
SetPixelGreen(image,(Quantum) ((MagickRealType)
GetPixelGreen(image,q) <= threshold.green ? 0 : QuantumRange),q);
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
SetPixelBlue(image,(Quantum) ((MagickRealType)
GetPixelBlue(image,q) <= threshold.blue ? 0 : QuantumRange),q);
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
SetPixelBlack(image,(Quantum) ((MagickRealType)
GetPixelBlack(image,q) <= threshold.black ? 0 : QuantumRange),q);
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
SetPixelAlpha(image,(Quantum) ((MagickRealType)
GetPixelAlpha(image,q) <= threshold.alpha ? 0 : QuantumRange),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
@@ -1886,24 +1886,24 @@
}
else
{
- if (((GetPixelRedTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelRedTraits(image) & UpdatePixelTrait) != 0) &&
((MagickRealType) GetPixelRed(image,q) > threshold.red))
SetPixelRed(image,QuantumRange,q);
- if (((GetPixelGreenTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0) &&
((MagickRealType) GetPixelGreen(image,q) > threshold.green))
SetPixelGreen(image,QuantumRange,q);
- if (((GetPixelBlueTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0) &&
((MagickRealType) GetPixelBlue(image,q) > threshold.blue))
SetPixelBlue(image,QuantumRange,q);
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace) &&
((MagickRealType) GetPixelBlack(image,q)) > threshold.black)
SetPixelBlack(image,QuantumRange,q);
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) &&
((MagickRealType) GetPixelAlpha(image,q) > threshold.alpha))
SetPixelAlpha(image,QuantumRange,q);
}
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
status=MagickFalse;
diff --git a/MagickCore/transform.c b/MagickCore/transform.c
index b83723c..c5f2726 100644
--- a/MagickCore/transform.c
+++ b/MagickCore/transform.c
@@ -192,9 +192,9 @@
SetPixelBlue(chop_image,GetPixelBlue(image,p),q);
if (image->colorspace == CMYKColorspace)
SetPixelBlack(chop_image,GetPixelBlack(image,p),q);
- q+=GetPixelComponents(chop_image);
+ q+=GetPixelChannels(chop_image);
}
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(chop_view,exception) == MagickFalse)
status=MagickFalse;
@@ -246,10 +246,10 @@
SetPixelRed(chop_image,GetPixelRed(image,p),q);
SetPixelGreen(chop_image,GetPixelGreen(image,p),q);
SetPixelBlue(chop_image,GetPixelBlue(image,p),q);
- p+=GetPixelComponents(image);
- q+=GetPixelComponents(chop_image);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(chop_image);
}
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(chop_view,exception) == MagickFalse)
status=MagickFalse;
@@ -354,8 +354,8 @@
for (x=0; x < (ssize_t) images->columns; x++)
{
SetPixelRed(cmyk_image,QuantumRange-GetPixelIntensity(images,p),q);
- p+=GetPixelComponents(images);
- q+=GetPixelComponents(cmyk_image);
+ p+=GetPixelChannels(images);
+ q+=GetPixelChannels(cmyk_image);
}
if (SyncCacheViewAuthenticPixels(cmyk_view,exception) == MagickFalse)
break;
@@ -386,8 +386,8 @@
for (x=0; x < (ssize_t) images->columns; x++)
{
SetPixelGreen(cmyk_image,QuantumRange-GetPixelIntensity(images,p),q);
- p+=GetPixelComponents(images);
- q+=GetPixelComponents(cmyk_image);
+ p+=GetPixelChannels(images);
+ q+=GetPixelChannels(cmyk_image);
}
if (SyncCacheViewAuthenticPixels(cmyk_view,exception) == MagickFalse)
break;
@@ -418,8 +418,8 @@
for (x=0; x < (ssize_t) images->columns; x++)
{
SetPixelBlue(cmyk_image,QuantumRange-GetPixelIntensity(images,p),q);
- p+=GetPixelComponents(images);
- q+=GetPixelComponents(cmyk_image);
+ p+=GetPixelChannels(images);
+ q+=GetPixelChannels(cmyk_image);
}
if (SyncCacheViewAuthenticPixels(cmyk_view,exception) == MagickFalse)
break;
@@ -450,8 +450,8 @@
for (x=0; x < (ssize_t) images->columns; x++)
{
SetPixelBlack(cmyk_image,QuantumRange-GetPixelIntensity(images,p),q);
- p+=GetPixelComponents(images);
- q+=GetPixelComponents(cmyk_image);
+ p+=GetPixelChannels(images);
+ q+=GetPixelChannels(cmyk_image);
}
if (SyncCacheViewAuthenticPixels(cmyk_view,exception) == MagickFalse)
break;
@@ -662,8 +662,8 @@
SetPixelAlpha(crop_image,GetPixelAlpha(image,p),q);
if (image->storage_class == PseudoClass)
SetPixelIndex(crop_image,GetPixelIndex(image,p),q);
- p+=GetPixelComponents(image);
- q+=GetPixelComponents(crop_image);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(crop_image);
}
if (SyncCacheViewAuthenticPixels(crop_view,exception) == MagickFalse)
status=MagickFalse;
@@ -1069,8 +1069,8 @@
if (image->storage_class == PseudoClass)
SetPixelIndex(excerpt_image,GetPixelIndex(image,p),q);
SetPixelAlpha(excerpt_image,GetPixelAlpha(image,p),q);
- p+=GetPixelComponents(image);
- q+=GetPixelComponents(excerpt_image);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(excerpt_image);
}
if (SyncCacheViewAuthenticPixels(excerpt_view,exception) == MagickFalse)
status=MagickFalse;
@@ -1258,8 +1258,8 @@
if (image->storage_class == PseudoClass)
SetPixelIndex(flip_image,GetPixelIndex(image,p),q);
SetPixelAlpha(flip_image,GetPixelAlpha(image,p),q);
- p+=GetPixelComponents(image);
- q+=GetPixelComponents(flip_image);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(flip_image);
}
if (SyncCacheViewAuthenticPixels(flip_view,exception) == MagickFalse)
status=MagickFalse;
@@ -1376,10 +1376,10 @@
status=MagickFalse;
continue;
}
- q+=GetPixelComponents(flop_image)*flop_image->columns;
+ q+=GetPixelChannels(flop_image)*flop_image->columns;
for (x=0; x < (ssize_t) flop_image->columns; x++)
{
- q-=GetPixelComponents(flop_image);
+ q-=GetPixelChannels(flop_image);
SetPixelRed(flop_image,GetPixelRed(image,p),q);
SetPixelGreen(flop_image,GetPixelGreen(image,p),q);
SetPixelBlue(flop_image,GetPixelBlue(image,p),q);
@@ -1388,7 +1388,7 @@
SetPixelAlpha(flop_image,GetPixelAlpha(image,p),q);
if (image->storage_class == PseudoClass)
SetPixelIndex(flop_image,GetPixelIndex(image,p),q);
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
if (SyncCacheViewAuthenticPixels(flop_view,exception) == MagickFalse)
status=MagickFalse;
@@ -1501,8 +1501,8 @@
if (destination->colorspace == CMYKColorspace)
SetPixelBlack(destination,GetPixelBlack(source,p),q);
SetPixelAlpha(destination,GetPixelAlpha(source,p),q);
- p+=GetPixelComponents(source);
- q+=GetPixelComponents(destination);
+ p+=GetPixelChannels(source);
+ q+=GetPixelChannels(destination);
}
sync=SyncCacheViewAuthenticPixels(destination_view,exception);
if (sync == MagickFalse)
@@ -1808,11 +1808,11 @@
SetPixelAlpha(splice_image,OpaqueAlpha,q);
if (image->matte != MagickFalse)
SetPixelAlpha(splice_image,GetPixelAlpha(image,p),q);
- p+=GetPixelComponents(image);
- q+=GetPixelComponents(splice_image);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(splice_image);
}
for ( ; x < (ssize_t) (splice_geometry.x+splice_geometry.width); x++)
- q+=GetPixelComponents(splice_image);
+ q+=GetPixelChannels(splice_image);
for ( ; x < (ssize_t) splice_image->columns; x++)
{
SetPixelRed(splice_image,GetPixelRed(image,p),q);
@@ -1823,8 +1823,8 @@
SetPixelAlpha(splice_image,OpaqueAlpha,q);
if (image->matte != MagickFalse)
SetPixelAlpha(splice_image,GetPixelAlpha(image,p),q);
- p+=GetPixelComponents(image);
- q+=GetPixelComponents(splice_image);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(splice_image);
}
if (SyncCacheViewAuthenticPixels(splice_view,exception) == MagickFalse)
status=MagickFalse;
@@ -1880,11 +1880,11 @@
SetPixelBlack(splice_image,GetPixelBlack(image,p),q);
if (image->matte != MagickFalse)
SetPixelAlpha(splice_image,GetPixelAlpha(image,p),q);
- p+=GetPixelComponents(image);
- q+=GetPixelComponents(splice_image);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(splice_image);
}
for ( ; x < (ssize_t) (splice_geometry.x+splice_geometry.width); x++)
- q+=GetPixelComponents(splice_image);
+ q+=GetPixelChannels(splice_image);
for ( ; x < (ssize_t) splice_image->columns; x++)
{
SetPixelRed(splice_image,GetPixelRed(image,p),q);
@@ -1895,8 +1895,8 @@
SetPixelBlack(splice_image,GetPixelBlack(image,p),q);
if (image->matte != MagickFalse)
SetPixelAlpha(splice_image,GetPixelAlpha(image,p),q);
- p+=GetPixelComponents(image);
- q+=GetPixelComponents(splice_image);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(splice_image);
}
if (SyncCacheViewAuthenticPixels(splice_view,exception) == MagickFalse)
status=MagickFalse;
@@ -2188,8 +2188,8 @@
if (image->colorspace == CMYKColorspace)
SetPixelBlack(transpose_image,GetPixelBlack(image,p),q);
SetPixelAlpha(transpose_image,GetPixelAlpha(image,p),q);
- p+=GetPixelComponents(image);
- q+=GetPixelComponents(transpose_image);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(transpose_image);
}
if (SyncCacheViewAuthenticPixels(transpose_view,exception) == MagickFalse)
status=MagickFalse;
@@ -2311,17 +2311,17 @@
status=MagickFalse;
continue;
}
- q+=GetPixelComponents(transverse_image)*image->columns;
+ q+=GetPixelChannels(transverse_image)*image->columns;
for (x=0; x < (ssize_t) image->columns; x++)
{
- q-=GetPixelComponents(transverse_image);
+ q-=GetPixelChannels(transverse_image);
SetPixelRed(transverse_image,GetPixelRed(image,p),q);
SetPixelGreen(transverse_image,GetPixelGreen(image,p),q);
SetPixelBlue(transverse_image,GetPixelBlue(image,p),q);
SetPixelAlpha(transverse_image,GetPixelAlpha(image,p),q);
if (image->colorspace == CMYKColorspace)
SetPixelBlack(transverse_image,GetPixelBlack(image,p),q);
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
sync=SyncCacheViewAuthenticPixels(transverse_view,exception);
if (sync == MagickFalse)
diff --git a/MagickCore/version.h b/MagickCore/version.h
index ce127fa..8155df2 100644
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,14 +27,14 @@
*/
#define MagickPackageName "ImageMagick"
#define MagickCopyright "Copyright (C) 1999-2011 ImageMagick Studio LLC"
-#define MagickSVNRevision "4739"
+#define MagickSVNRevision "exported"
#define MagickLibVersion 0x700
#define MagickLibVersionText "7.0.0"
#define MagickLibVersionNumber 5,0,0
#define MagickLibAddendum "-0"
#define MagickLibInterface 5
#define MagickLibMinInterface 5
-#define MagickReleaseDate "2011-07-08"
+#define MagickReleaseDate "2011-07-11"
#define MagickChangeDate "20110701"
#define MagickAuthoritativeURL "http://www.imagemagick.org"
#if defined(MAGICKCORE_OPENMP_SUPPORT)
diff --git a/MagickCore/xwindow.c b/MagickCore/xwindow.c
index a109a71..b48296d 100644
--- a/MagickCore/xwindow.c
+++ b/MagickCore/xwindow.c
@@ -599,7 +599,7 @@
if (annotate_info->stencil == BackgroundStencil)
SetPixelAlpha(annotate_image,TransparentAlpha,q);
}
- q+=GetPixelComponents(annotate_image);
+ q+=GetPixelChannels(annotate_image);
}
if (SyncCacheViewAuthenticPixels(annotate_view,exception) == MagickFalse)
break;
@@ -2230,7 +2230,7 @@
(((size_t) color.green & 0xe0) >> 3) |
(((size_t) color.blue & 0xc0) >> 6));
*q++=(char) pixel;
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
j++;
if (j == 16)
j=0;
@@ -2506,7 +2506,7 @@
SetPixelAlpha(draw_image,(Quantum) (draw_info->stencil ==
OpaqueStencil ? OpaqueAlpha : TransparentAlpha),q);
}
- q+=GetPixelComponents(draw_image);
+ q+=GetPixelChannels(draw_image);
}
if (SyncCacheViewAuthenticPixels(draw_view,exception) == MagickFalse)
break;
@@ -2610,7 +2610,7 @@
{
if (GetPixelAlpha(image,q) != TransparentAlpha)
SetPixelAlpha(draw_image,OpaqueAlpha,q);
- q+=GetPixelComponents(draw_image);
+ q+=GetPixelChannels(draw_image);
}
if (SyncCacheViewAuthenticPixels(draw_view,exception) == MagickFalse)
break;
@@ -4404,7 +4404,7 @@
index=(pixel >> blue_shift) & blue_mask;
SetPixelBlue(composite_image,
ScaleShortToQuantum(colors[index].blue),q);
- q+=GetPixelComponents(composite_image);
+ q+=GetPixelChannels(composite_image);
}
if (SyncCacheViewAuthenticPixels(composite_view,exception) == MagickFalse)
break;
@@ -4431,7 +4431,7 @@
color=(65535UL*color)/blue_mask;
SetPixelBlue(composite_image,
ScaleShortToQuantum((unsigned short) color),q);
- q+=GetPixelComponents(composite_image);
+ q+=GetPixelChannels(composite_image);
}
if (SyncCacheViewAuthenticPixels(composite_view,exception) == MagickFalse)
break;
@@ -4473,7 +4473,7 @@
SetPixelIndex(composite_image,index,q);
SetPixelPacket(composite_image,
composite_image->colormap+(ssize_t) index,q);
- q+=GetPixelComponents(composite_image);
+ q+=GetPixelChannels(composite_image);
}
if (SyncCacheViewAuthenticPixels(composite_view,exception) == MagickFalse)
break;
@@ -5960,7 +5960,7 @@
bit=0;
byte=0;
}
- p+=GetPixelComponents(canvas);
+ p+=GetPixelChannels(canvas);
}
if (bit != 0)
*q=byte >> (8-bit);
@@ -6017,7 +6017,7 @@
break;
}
}
- p+=GetPixelComponents(canvas);
+ p+=GetPixelChannels(canvas);
}
q+=scanline_pad;
}
@@ -6057,7 +6057,7 @@
break;
}
}
- p+=GetPixelComponents(canvas);
+ p+=GetPixelChannels(canvas);
}
q+=scanline_pad;
}
@@ -6085,7 +6085,7 @@
{
pixel=pixels[(ssize_t) GetPixelIndex(canvas,p)];
*q++=(unsigned char) pixel;
- p+=GetPixelComponents(canvas);
+ p+=GetPixelChannels(canvas);
}
q+=scanline_pad;
}
@@ -6122,7 +6122,7 @@
}
for (k=0; k < (int) bytes_per_pixel; k++)
*q++=channel[k];
- p+=GetPixelComponents(canvas);
+ p+=GetPixelChannels(canvas);
}
q+=scanline_pad;
}
@@ -6179,7 +6179,7 @@
break;
}
}
- p+=GetPixelComponents(canvas);
+ p+=GetPixelChannels(canvas);
}
q+=scanline_pad;
}
@@ -6220,7 +6220,7 @@
break;
}
}
- p+=GetPixelComponents(canvas);
+ p+=GetPixelChannels(canvas);
}
q+=scanline_pad;
}
@@ -6248,7 +6248,7 @@
{
pixel=XGammaPixel(canvas,map_info,p);
*q++=(unsigned char) pixel;
- p+=GetPixelComponents(canvas);
+ p+=GetPixelChannels(canvas);
}
q+=scanline_pad;
}
@@ -6285,7 +6285,7 @@
*q++=ScaleQuantumToChar(XRedGamma(
GetPixelRed(canvas,p)));
*q++=0;
- p+=GetPixelComponents(canvas);
+ p+=GetPixelChannels(canvas);
}
continue;
}
@@ -6298,7 +6298,7 @@
*q++=ScaleQuantumToChar((Quantum)
GetPixelRed(canvas,p));
*q++=0;
- p+=GetPixelComponents(canvas);
+ p+=GetPixelChannels(canvas);
}
}
}
@@ -6332,7 +6332,7 @@
*q++=ScaleQuantumToChar(XBlueGamma(
GetPixelBlue(canvas,p)));
*q++=0;
- p+=GetPixelComponents(canvas);
+ p+=GetPixelChannels(canvas);
}
continue;
}
@@ -6345,7 +6345,7 @@
*q++=ScaleQuantumToChar((Quantum)
GetPixelBlue(canvas,p));
*q++=0;
- p+=GetPixelComponents(canvas);
+ p+=GetPixelChannels(canvas);
}
}
}
@@ -6380,7 +6380,7 @@
}
for (k=0; k < (int) bytes_per_pixel; k++)
*q++=channel[k];
- p+=GetPixelComponents(canvas);
+ p+=GetPixelChannels(canvas);
}
q+=scanline_pad;
}
@@ -6416,7 +6416,7 @@
bit=0;
byte=0;
}
- p+=GetPixelComponents(canvas);
+ p+=GetPixelChannels(canvas);
}
if (bit != 0)
*q=byte >> (8-bit);
@@ -6587,7 +6587,7 @@
bit=0;
byte=0;
}
- p+=GetPixelComponents(canvas);
+ p+=GetPixelChannels(canvas);
}
if (bit != 0)
*q=byte << (8-bit);
@@ -6645,7 +6645,7 @@
break;
}
}
- p+=GetPixelComponents(canvas);
+ p+=GetPixelChannels(canvas);
}
q+=scanline_pad;
}
@@ -6686,7 +6686,7 @@
break;
}
}
- p+=GetPixelComponents(canvas);
+ p+=GetPixelChannels(canvas);
}
q+=scanline_pad;
}
@@ -6715,7 +6715,7 @@
pixel=pixels[(ssize_t)
GetPixelIndex(canvas,p)];
*q++=(unsigned char) pixel;
- p+=GetPixelComponents(canvas);
+ p+=GetPixelChannels(canvas);
}
q+=scanline_pad;
}
@@ -6753,7 +6753,7 @@
}
for (k=0; k < (int) bytes_per_pixel; k++)
*q++=channel[k];
- p+=GetPixelComponents(canvas);
+ p+=GetPixelChannels(canvas);
}
q+=scanline_pad;
}
@@ -6810,7 +6810,7 @@
break;
}
}
- p+=GetPixelComponents(canvas);
+ p+=GetPixelChannels(canvas);
}
q+=scanline_pad;
}
@@ -6851,7 +6851,7 @@
break;
}
}
- p+=GetPixelComponents(canvas);
+ p+=GetPixelChannels(canvas);
}
q+=scanline_pad;
}
@@ -6879,7 +6879,7 @@
{
pixel=XGammaPixel(canvas,map_info,p);
*q++=(unsigned char) pixel;
- p+=GetPixelComponents(canvas);
+ p+=GetPixelChannels(canvas);
}
q+=scanline_pad;
}
@@ -6916,7 +6916,7 @@
GetPixelGreen(canvas,p)));
*q++=ScaleQuantumToChar(XBlueGamma(
GetPixelBlue(canvas,p)));
- p+=GetPixelComponents(canvas);
+ p+=GetPixelChannels(canvas);
}
continue;
}
@@ -6929,7 +6929,7 @@
GetPixelGreen(canvas,p));
*q++=ScaleQuantumToChar((Quantum)
GetPixelBlue(canvas,p));
- p+=GetPixelComponents(canvas);
+ p+=GetPixelChannels(canvas);
}
}
}
@@ -6963,7 +6963,7 @@
GetPixelGreen(canvas,p)));
*q++=ScaleQuantumToChar(XRedGamma(
GetPixelRed(canvas,p)));
- p+=GetPixelComponents(canvas);
+ p+=GetPixelChannels(canvas);
}
continue;
}
@@ -6976,7 +6976,7 @@
GetPixelGreen(canvas,p));
*q++=ScaleQuantumToChar((Quantum)
GetPixelRed(canvas,p));
- p+=GetPixelComponents(canvas);
+ p+=GetPixelChannels(canvas);
}
}
}
@@ -7011,7 +7011,7 @@
}
for (k=0; k < (int) bytes_per_pixel; k++)
*q++=channel[k];
- p+=GetPixelComponents(canvas);
+ p+=GetPixelChannels(canvas);
}
q+=scanline_pad;
}
@@ -7047,7 +7047,7 @@
bit=0;
byte=0;
}
- p+=GetPixelComponents(canvas);
+ p+=GetPixelChannels(canvas);
}
if (bit != 0)
*q=byte << (8-bit);
@@ -7481,20 +7481,20 @@
(void) FormatLocaleString(tuple,MaxTextExtent,"%d,%d: ",
windows->magnify.x,windows->magnify.y);
(void) ConcatenateMagickString(tuple,"(",MaxTextExtent);
- ConcatenateColorComponent(&pixel,RedPixelComponent,X11Compliance,tuple);
+ ConcatenateColorComponent(&pixel,RedPixelChannel,X11Compliance,tuple);
(void) ConcatenateMagickString(tuple,",",MaxTextExtent);
- ConcatenateColorComponent(&pixel,GreenPixelComponent,X11Compliance,tuple);
+ ConcatenateColorComponent(&pixel,GreenPixelChannel,X11Compliance,tuple);
(void) ConcatenateMagickString(tuple,",",MaxTextExtent);
- ConcatenateColorComponent(&pixel,BluePixelComponent,X11Compliance,tuple);
+ ConcatenateColorComponent(&pixel,BluePixelChannel,X11Compliance,tuple);
if (pixel.colorspace == CMYKColorspace)
{
(void) ConcatenateMagickString(tuple,",",MaxTextExtent);
- ConcatenateColorComponent(&pixel,BlackPixelComponent,X11Compliance,tuple);
+ ConcatenateColorComponent(&pixel,BlackPixelChannel,X11Compliance,tuple);
}
if (pixel.matte != MagickFalse)
{
(void) ConcatenateMagickString(tuple,",",MaxTextExtent);
- ConcatenateColorComponent(&pixel,AlphaPixelComponent,X11Compliance,tuple);
+ ConcatenateColorComponent(&pixel,AlphaPixelChannel,X11Compliance,tuple);
}
(void) ConcatenateMagickString(tuple,")",MaxTextExtent);
height=(unsigned int) windows->magnify.font_info->ascent+
@@ -7795,7 +7795,7 @@
map_info->blue_max),q);
SetPixelAlpha(affinity_image,
TransparentAlpha,q);
- q+=GetPixelComponents(affinity_image);
+ q+=GetPixelChannels(affinity_image);
}
(void) SyncAuthenticPixels(affinity_image,exception);
(void) RemapImage(resource_info->quantize_info,image,
@@ -7983,7 +7983,7 @@
for (x=(int) image->columns-1; x >= 0; x--)
{
diversity[(ssize_t) GetPixelIndex(image,p)].count++;
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
image_view=DestroyCacheView(image_view);
diff --git a/MagickWand/compare.c b/MagickWand/compare.c
index 18d29f8..15c7f93 100644
--- a/MagickWand/compare.c
+++ b/MagickWand/compare.c
@@ -393,7 +393,7 @@
if (channel < 0)
ThrowCompareException(OptionError,"UnrecognizedChannelType",
argv[i]);
- SetPixelComponentMap(image,(ChannelType) channel);
+ SetPixelChannelMap(image,(ChannelType) channel);
break;
}
if (LocaleCompare("colorspace",option+1) == 0)
diff --git a/MagickWand/composite.c b/MagickWand/composite.c
index 217cc38..ab4674b 100644
--- a/MagickWand/composite.c
+++ b/MagickWand/composite.c
@@ -122,7 +122,7 @@
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",(*image)->filename);
assert(exception != (ExceptionInfo *) NULL);
status=MagickTrue;
- PushPixelComponentMap(composite_image,composite_options->channel);
+ PushPixelChannelMap(composite_image,composite_options->channel);
if (composite_image != (Image *) NULL)
{
assert(composite_image->signature == MagickSignature);
@@ -218,7 +218,7 @@
GetImageException(*image,exception);
}
}
- PopPixelComponentMap(composite_image);
+ PopPixelChannelMap(composite_image);
return(status != 0 ? MagickTrue : MagickFalse);
}
diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c
index e6d1ec5..d879a9a 100644
--- a/MagickWand/mogrify.c
+++ b/MagickWand/mogrify.c
@@ -423,16 +423,16 @@
Limit channels according to image - and add up number of color channel.
*/
number_colors=0;
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
number_colors++;
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
number_colors++;
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
number_colors++;
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
number_colors++;
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) &&
(image->matte != MagickFalse))
number_colors++;
@@ -526,23 +526,23 @@
if ( isalpha((int) token[0]) || token[0] == '#' ) {
/* Color string given */
(void) QueryMagickColor(token,&color,exception);
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
sparse_arguments[x++] = QuantumScale*color.red;
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
sparse_arguments[x++] = QuantumScale*color.green;
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
sparse_arguments[x++] = QuantumScale*color.blue;
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
sparse_arguments[x++] = QuantumScale*color.black;
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) &&
(image->matte != MagickFalse))
sparse_arguments[x++] = QuantumScale*color.alpha;
}
else {
/* Colors given as a set of floating point values - experimental */
/* NB: token contains the first floating point value to use! */
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
{
while ( token[0] == ',' ) GetMagickToken(p,&p,token);
if ( token[0] == '\0' || isalpha((int)token[0]) || token[0] == '#' )
@@ -550,7 +550,7 @@
sparse_arguments[x++]=InterpretLocaleValue(token,(char **) NULL);
token[0] = ','; /* used this token - get another */
}
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
{
while ( token[0] == ',' ) GetMagickToken(p,&p,token);
if ( token[0] == '\0' || isalpha((int)token[0]) || token[0] == '#' )
@@ -558,7 +558,7 @@
sparse_arguments[x++]=InterpretLocaleValue(token,(char **) NULL);
token[0] = ','; /* used this token - get another */
}
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
{
while ( token[0] == ',' ) GetMagickToken(p,&p,token);
if ( token[0] == '\0' || isalpha((int)token[0]) || token[0] == '#' )
@@ -566,7 +566,7 @@
sparse_arguments[x++]=InterpretLocaleValue(token,(char **) NULL);
token[0] = ','; /* used this token - get another */
}
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
{
while ( token[0] == ',' ) GetMagickToken(p,&p,token);
@@ -575,7 +575,7 @@
sparse_arguments[x++]=InterpretLocaleValue(token,(char **) NULL);
token[0] = ','; /* used this token - get another */
}
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) &&
(image->matte != MagickFalse))
{
while ( token[0] == ',' ) GetMagickToken(p,&p,token);
@@ -979,7 +979,7 @@
channel=DefaultChannels;
else
channel=(ChannelType) ParseChannelOption(argv[i+1]);
- SetPixelComponentMap(*image,channel);
+ SetPixelChannelMap(*image,channel);
break;
}
if (LocaleCompare("charcoal",option+1) == 0)
@@ -1078,7 +1078,7 @@
SetPixelRed(mask_image,GetPixelAlpha(mask_image,q),q);
SetPixelGreen(mask_image,GetPixelAlpha(mask_image,q),q);
SetPixelBlue(mask_image,GetPixelAlpha(mask_image,q),q);
- q+=GetPixelComponents(mask_image);
+ q+=GetPixelChannels(mask_image);
}
if (SyncCacheViewAuthenticPixels(mask_view,exception) == MagickFalse)
break;
@@ -7344,7 +7344,7 @@
break;
}
channel=(ChannelType) ParseChannelOption(argv[i+1]);
- SetPixelComponentMap(*images,channel);
+ SetPixelChannelMap(*images,channel);
break;
}
if (LocaleCompare("clut",option+1) == 0)
diff --git a/MagickWand/pixel-iterator.c b/MagickWand/pixel-iterator.c
index 152aa70..20ce1db 100644
--- a/MagickWand/pixel-iterator.c
+++ b/MagickWand/pixel-iterator.c
@@ -512,7 +512,7 @@
for (x=0; x < (ssize_t) iterator->region.width; x++)
{
PixelSetQuantumPixel(iterator->image,pixels,iterator->pixel_wands[x]);
- pixels+=GetPixelComponents(iterator->image);
+ pixels+=GetPixelChannels(iterator->image);
}
*number_wands=iterator->region.width;
return(iterator->pixel_wands);
@@ -696,7 +696,7 @@
for (x=0; x < (ssize_t) iterator->region.width; x++)
{
PixelSetQuantumPixel(iterator->image,pixels,iterator->pixel_wands[x]);
- pixels+=GetPixelComponents(iterator->image);
+ pixels+=GetPixelChannels(iterator->image);
}
*number_wands=iterator->region.width;
return(iterator->pixel_wands);
@@ -767,7 +767,7 @@
for (x=0; x < (ssize_t) iterator->region.width; x++)
{
PixelSetQuantumPixel(iterator->image,pixels,iterator->pixel_wands[x]);
- pixels+=GetPixelComponents(iterator->image);
+ pixels+=GetPixelChannels(iterator->image);
}
*number_wands=iterator->region.width;
return(iterator->pixel_wands);
@@ -959,7 +959,7 @@
for (x=0; x < (ssize_t) iterator->region.width; x++)
{
PixelGetQuantumPixel(iterator->image,iterator->pixel_wands[x],pixels);
- pixels+=GetPixelComponents(iterator->image);
+ pixels+=GetPixelChannels(iterator->image);
}
if (SyncCacheViewAuthenticPixels(iterator->view,exception) == MagickFalse)
{
diff --git a/MagickWand/wand-view.c b/MagickWand/wand-view.c
index b819618..876f96c 100644
--- a/MagickWand/wand-view.c
+++ b/MagickWand/wand-view.c
@@ -323,7 +323,7 @@
for (x=0; x < (ssize_t) source->extent.width; x++)
{
PixelSetQuantumPixel(source->image,pixels,source->pixel_wands[id][x]);
- pixels+=GetPixelComponents(source->image);
+ pixels+=GetPixelChannels(source->image);
}
duplex_pixels=GetCacheViewVirtualPixels(duplex->view,duplex->extent.x,y,
duplex->extent.width,1,duplex->exception);
@@ -336,7 +336,7 @@
{
PixelSetQuantumPixel(duplex->image,duplex_pixels,
duplex->pixel_wands[id][x]);
- duplex_pixels+=GetPixelComponents(duplex->image);
+ duplex_pixels+=GetPixelChannels(duplex->image);
}
destination_pixels=GetCacheViewAuthenticPixels(destination->view,
destination->extent.x,y,destination->extent.width,1,exception);
@@ -349,7 +349,7 @@
{
PixelSetQuantumPixel(destination->image,destination_pixels,
destination->pixel_wands[id][x]);
- destination_pixels+=GetPixelComponents(destination->image);
+ destination_pixels+=GetPixelChannels(destination->image);
}
if (transfer(source,duplex,destination,y,id,context) == MagickFalse)
status=MagickFalse;
@@ -359,7 +359,7 @@
{
PixelGetQuantumPixel(destination->image,destination->pixel_wands[id][x],
destination_pixels);
- destination_pixels+=GetPixelComponents(destination->image);
+ destination_pixels+=GetPixelChannels(destination->image);
}
sync=SyncCacheViewAuthenticPixels(destination->view,exception);
if (sync == MagickFalse)
@@ -564,7 +564,7 @@
for (x=0; x < (ssize_t) source->extent.width; x++)
{
PixelSetQuantumPixel(source->image,pixels,source->pixel_wands[id][x]);
- pixels+=GetPixelComponents(source->image);
+ pixels+=GetPixelChannels(source->image);
}
if (get(source,y,id,context) == MagickFalse)
status=MagickFalse;
@@ -963,7 +963,7 @@
{
PixelGetQuantumPixel(destination->image,destination->pixel_wands[id][x],
pixels);
- pixels+=GetPixelComponents(destination->image);
+ pixels+=GetPixelChannels(destination->image);
}
sync=SyncCacheViewAuthenticPixels(destination->view,exception);
if (sync == MagickFalse)
@@ -1134,7 +1134,7 @@
for (x=0; x < (ssize_t) source->extent.width; x++)
{
PixelSetQuantumPixel(source->image,pixels,source->pixel_wands[id][x]);
- pixels+=GetPixelComponents(source->image);
+ pixels+=GetPixelChannels(source->image);
}
destination_pixels=GetCacheViewAuthenticPixels(destination->view,
destination->extent.x,y,destination->extent.width,1,exception);
@@ -1147,7 +1147,7 @@
{
PixelSetQuantumPixel(destination->image,destination_pixels,
destination->pixel_wands[id][x]);
- destination_pixels+=GetPixelComponents(destination->image);
+ destination_pixels+=GetPixelChannels(destination->image);
}
if (transfer(source,destination,y,id,context) == MagickFalse)
status=MagickFalse;
@@ -1157,7 +1157,7 @@
{
PixelGetQuantumPixel(destination->image,destination->pixel_wands[id][x],
destination_pixels);
- destination_pixels+=GetPixelComponents(destination->image);
+ destination_pixels+=GetPixelChannels(destination->image);
}
sync=SyncCacheViewAuthenticPixels(destination->view,exception);
if (sync == MagickFalse)
@@ -1282,14 +1282,14 @@
for (x=0; x < (ssize_t) source->extent.width; x++)
{
PixelSetQuantumPixel(source->image,pixels,source->pixel_wands[id][x]);
- pixels+=GetPixelComponents(source->image);
+ pixels+=GetPixelChannels(source->image);
}
if (update(source,y,id,context) == MagickFalse)
status=MagickFalse;
for (x=0; x < (ssize_t) source->extent.width; x++)
{
PixelGetQuantumPixel(source->image,source->pixel_wands[id][x],pixels);
- pixels+=GetPixelComponents(source->image);
+ pixels+=GetPixelChannels(source->image);
}
if (SyncCacheViewAuthenticPixels(source->view,exception) == MagickFalse)
{
diff --git a/PerlMagick/Magick.xs b/PerlMagick/Magick.xs
index 12d365e..4086819 100644
--- a/PerlMagick/Magick.xs
+++ b/PerlMagick/Magick.xs
@@ -3160,7 +3160,7 @@
"UnrecognizedType",SvPV(ST(i),na));
return;
}
- SetPixelComponentMap(image,(ChannelType) option);
+ SetPixelChannelMap(image,(ChannelType) option);
break;
}
ThrowPerlException(exception,OptionError,"UnrecognizedAttribute",
@@ -4150,10 +4150,10 @@
}
}
}
- PushPixelComponentMap(image,channel);
+ PushPixelChannelMap(image,channel);
image=FxImage(image,expression,exception);
if (image != (Image *) NULL)
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
if ((image == (Image *) NULL) || (exception->severity >= ErrorException))
goto PerlException;
for ( ; image; image=image->next)
@@ -6117,7 +6117,7 @@
SvPV(ST(i),na));
return;
}
- SetPixelComponentMap(image,(ChannelType) option);
+ SetPixelChannelMap(image,(ChannelType) option);
break;
}
ThrowPerlException(exception,OptionError,"UnrecognizedAttribute",
@@ -6199,16 +6199,16 @@
scale=1.0;
if (normalize != MagickFalse)
scale=1.0/QuantumRange;
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
PUSHs(sv_2mortal(newSVnv(scale*GetPixelRed(image,p))));
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
PUSHs(sv_2mortal(newSVnv(scale*GetPixelGreen(image,p))));
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
PUSHs(sv_2mortal(newSVnv(scale*GetPixelBlue(image,p))));
- if (((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace))
PUSHs(sv_2mortal(newSVnv(scale*GetPixelBlack(image,p))));
- if ((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0)
PUSHs(sv_2mortal(newSVnv(scale*GetPixelAlpha(image,p))));
}
@@ -7494,11 +7494,11 @@
argument_list[0].integer_reference=UniformNoise;
if (attribute_flag[1] != 0)
channel=(ChannelType) argument_list[1].integer_reference;
- PushPixelComponentMap(image,channel);
+ PushPixelChannelMap(image,channel);
image=AddNoiseImage(image,(NoiseType)
argument_list[0].integer_reference,exception);
if (image != (Image *) NULL)
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
break;
}
case 4: /* Colorize */
@@ -7560,11 +7560,11 @@
geometry_info.sigma=argument_list[2].real_reference;
if (attribute_flag[3] != 0)
channel=(ChannelType) argument_list[3].integer_reference;
- PushPixelComponentMap(image,channel);
+ PushPixelChannelMap(image,channel);
image=BlurImage(image,geometry_info.rho,geometry_info.sigma,
exception);
if (image != (Image *) NULL)
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
break;
}
case 7: /* Chop */
@@ -7720,11 +7720,11 @@
geometry_info.sigma=argument_list[2].real_reference;
if (attribute_flag[3] != 0)
channel=(ChannelType) argument_list[3].integer_reference;
- PushPixelComponentMap(image,channel);
+ PushPixelChannelMap(image,channel);
image=StatisticImage(image,MedianStatistic,(size_t) geometry_info.rho,
(size_t) geometry_info.sigma,exception);
if (image != (Image *) NULL)
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
break;
}
case 19: /* Minify */
@@ -7755,11 +7755,11 @@
geometry_info.sigma=argument_list[2].real_reference;
if (attribute_flag[3] != 0)
channel=(ChannelType) argument_list[3].integer_reference;
- PushPixelComponentMap(image,channel);
+ PushPixelChannelMap(image,channel);
image=StatisticImage(image,NonpeakStatistic,(size_t)
geometry_info.rho,(size_t) geometry_info.sigma,exception);
if (image != (Image *) NULL)
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
break;
}
case 22: /* Roll */
@@ -7847,11 +7847,11 @@
geometry_info.sigma=argument_list[2].real_reference;
if (attribute_flag[3] != 0)
channel=(ChannelType) argument_list[3].integer_reference;
- PushPixelComponentMap(image,channel);
+ PushPixelChannelMap(image,channel);
image=SharpenImage(image,geometry_info.rho,geometry_info.sigma,
exception);
if (image != (Image *) NULL)
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
break;
}
case 28: /* Shear */
@@ -8244,7 +8244,7 @@
{
if (GetPixelAlpha(image,q) == OpaqueAlpha)
SetPixelAlpha(composite_image,ClampToQuantum(opacity),q);
- q+=GetPixelComponents(composite_image);
+ q+=GetPixelChannels(composite_image);
}
sync=SyncCacheViewAuthenticPixels(composite_view,exception);
if (sync == MagickFalse)
@@ -8357,7 +8357,7 @@
geometry.y);
flags=ParseGravityGeometry(image,composite_geometry,&geometry,
exception);
- PushPixelComponentMap(image,channel);
+ PushPixelChannelMap(image,channel);
if (attribute_flag[8] == 0) /* no rotate */
CompositeImage(image,compose,composite_image,geometry.x,geometry.y);
else
@@ -8380,7 +8380,7 @@
else
image->mask=DestroyImage(image->mask);
}
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
break;
}
case 36: /* Contrast */
@@ -8643,9 +8643,9 @@
{
if (attribute_flag[0] != 0)
channel=(ChannelType) argument_list[0].integer_reference;
- PushPixelComponentMap(image,channel);
+ PushPixelChannelMap(image,channel);
EqualizeImage(image);
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
break;
}
case 40: /* Gamma */
@@ -8729,11 +8729,11 @@
invert=MagickFalse;
if (attribute_flag[6] != 0)
invert=(MagickBooleanType) argument_list[6].integer_reference;
- PushPixelComponentMap(image,AlphaChannel);
+ PushPixelChannelMap(image,AlphaChannel);
(void) FloodfillPaintImage(image,draw_info,&target,geometry.x,
geometry.y,invert);
- PopPixelComponentMap(image);
- StandardPixelComponentMap(image);
+ PopPixelChannelMap(image);
+ StandardPixelChannelMap(image);
draw_info=DestroyDrawInfo(draw_info);
break;
}
@@ -8783,19 +8783,19 @@
argument_list[0].integer_reference=0;
if (attribute_flag[1] != 0)
channel=(ChannelType) argument_list[1].integer_reference;
- PushPixelComponentMap(image,channel);
+ PushPixelChannelMap(image,channel);
(void) NegateImage(image,argument_list[0].integer_reference != 0 ?
MagickTrue : MagickFalse);
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
break;
}
case 45: /* Normalize */
{
if (attribute_flag[0] != 0)
channel=(ChannelType) argument_list[0].integer_reference;
- PushPixelComponentMap(image,channel);
+ PushPixelChannelMap(image,channel);
NormalizeImage(image);
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
break;
}
case 46: /* NumberColors */
@@ -8825,9 +8825,9 @@
invert=MagickFalse;
if (attribute_flag[4] != 0)
invert=(MagickBooleanType) argument_list[4].integer_reference;
- PushPixelComponentMap(image,channel);
+ PushPixelChannelMap(image,channel);
(void) OpaquePaintImage(image,&target,&fill_color,invert);
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
break;
}
case 48: /* Quantize */
@@ -8964,10 +8964,10 @@
op=(MagickEvaluateOperator) argument_list[1].integer_reference;
if (attribute_flag[2] != MagickFalse)
channel=(ChannelType) argument_list[2].integer_reference;
- PushPixelComponentMap(image,channel);
+ PushPixelChannelMap(image,channel);
(void) EvaluateImage(image,op,argument_list[0].real_reference,
exception);
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
break;
}
case 56: /* Transparent */
@@ -9012,9 +9012,9 @@
channel=(ChannelType) argument_list[1].integer_reference;
threshold=SiPrefixToDouble(argument_list[0].string_reference,
QuantumRange);
- PushPixelComponentMap(image,channel);
+ PushPixelChannelMap(image,channel);
(void) BilevelImage(image,threshold);
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
break;
}
case 58: /* Charcoal */
@@ -9066,9 +9066,9 @@
{
if (attribute_flag[0] != 0)
channel=(ChannelType) argument_list[0].integer_reference;
- PushPixelComponentMap(image,channel);
+ PushPixelChannelMap(image,channel);
(void) SeparateImage(image);
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
break;
}
case 63: /* Stereo */
@@ -9121,11 +9121,11 @@
geometry_info.sigma=argument_list[2].real_reference;
if (attribute_flag[3] != 0)
channel=(ChannelType) argument_list[3].integer_reference;
- PushPixelComponentMap(image,channel);
+ PushPixelChannelMap(image,channel);
image=GaussianBlurImage(image,geometry_info.rho,geometry_info.sigma,
exception);
if (image != (Image *) NULL)
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
break;
}
case 67: /* Convolve */
@@ -9159,10 +9159,10 @@
kernel[j]=(double) SvNV(*(av_fetch(av,j,0)));
for ( ; j < (ssize_t) (order*order); j++)
kernel[j]=0.0;
- PushPixelComponentMap(image,channel);
+ PushPixelChannelMap(image,channel);
image=ConvolveImage(image,order,kernel,exception);
if (image != (Image *) NULL)
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
kernel=(double *) RelinquishMagickMemory(kernel);
break;
}
@@ -9260,11 +9260,11 @@
geometry_info.psi=argument_list[4].real_reference;
if (attribute_flag[5] != 0)
channel=(ChannelType) argument_list[5].integer_reference;
- PushPixelComponentMap(image,channel);
+ PushPixelChannelMap(image,channel);
image=UnsharpMaskImage(image,geometry_info.rho,geometry_info.sigma,
geometry_info.xi,geometry_info.psi,exception);
if (image != (Image *) NULL)
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
break;
}
case 70: /* MotionBlur */
@@ -9286,11 +9286,11 @@
geometry_info.xi=argument_list[3].real_reference;
if (attribute_flag[4] != 0)
channel=(ChannelType) argument_list[4].integer_reference;
- PushPixelComponentMap(image,channel);
+ PushPixelChannelMap(image,channel);
image=MotionBlurImage(image,geometry_info.rho,geometry_info.sigma,
geometry_info.xi,exception);
if (image != (Image *) NULL)
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
break;
}
case 71: /* OrderedDither */
@@ -9299,10 +9299,10 @@
argument_list[0].string_reference="o8x8";
if (attribute_flag[1] != 0)
channel=(ChannelType) argument_list[1].integer_reference;
- PushPixelComponentMap(image,channel);
+ PushPixelChannelMap(image,channel);
(void) OrderedPosterizeImage(image,argument_list[0].string_reference,
exception);
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
break;
}
case 72: /* Shave */
@@ -9357,9 +9357,9 @@
argument_list[0].real_reference=argument_list[5].real_reference;
attribute_flag[0]=attribute_flag[5];
}
- PushPixelComponentMap(image,channel);
+ PushPixelChannelMap(image,channel);
(void) LevelImage(image,black_point,white_point,gamma);
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
break;
}
case 74: /* Clip */
@@ -9580,10 +9580,10 @@
argument_list[0].string_reference="50%";
if (attribute_flag[2] != 0)
channel=(ChannelType) argument_list[2].integer_reference;
- PushPixelComponentMap(image,channel);
+ PushPixelChannelMap(image,channel);
BlackThresholdImage(image,argument_list[0].string_reference,
exception);
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
break;
}
case 81: /* WhiteThreshold */
@@ -9592,10 +9592,10 @@
argument_list[0].string_reference="50%";
if (attribute_flag[2] != 0)
channel=(ChannelType) argument_list[2].integer_reference;
- PushPixelComponentMap(image,channel);
+ PushPixelChannelMap(image,channel);
WhiteThresholdImage(image,argument_list[0].string_reference,
exception);
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
break;
}
case 82: /* RadialBlur */
@@ -9611,10 +9611,10 @@
geometry_info.rho=argument_list[1].real_reference;
if (attribute_flag[2] != 0)
channel=(ChannelType) argument_list[2].integer_reference;
- PushPixelComponentMap(image,channel);
+ PushPixelChannelMap(image,channel);
image=RadialBlurImage(image,geometry_info.rho,exception);
if (image != (Image *) NULL)
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
break;
}
case 83: /* Thumbnail */
@@ -9653,9 +9653,9 @@
{
if (attribute_flag[0] != 0)
channel=(ChannelType) argument_list[0].integer_reference;
- PushPixelComponentMap(image,channel);
+ PushPixelChannelMap(image,channel);
(void) SeparateImage(image);
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
break;
}
case 87: /* Splice */
@@ -9764,10 +9764,10 @@
if (attribute_flag[4] != 0)
sharpen=argument_list[4].integer_reference != 0 ? MagickTrue :
MagickFalse;
- PushPixelComponentMap(image,channel);
+ PushPixelChannelMap(image,channel);
(void) SigmoidalContrastImage(image,sharpen,geometry_info.rho,
geometry_info.sigma);
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
break;
}
case 93: /* Extent */
@@ -9862,9 +9862,9 @@
white_point=argument_list[2].real_reference;
if (attribute_flag[4] != 0)
channel=(ChannelType) argument_list[4].integer_reference;
- PushPixelComponentMap(image,channel);
+ PushPixelChannelMap(image,channel);
(void) ContrastStretchImage(image,black_point,white_point);
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
break;
}
case 96: /* Sans0 */
@@ -9890,11 +9890,11 @@
geometry_info.sigma=argument_list[2].real_reference;
if (attribute_flag[3] != 0)
channel=(ChannelType) argument_list[3].integer_reference;
- PushPixelComponentMap(image,channel);
+ PushPixelChannelMap(image,channel);
image=AdaptiveSharpenImage(image,geometry_info.rho,
geometry_info.sigma,exception);
if (image != (Image *) NULL)
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
break;
}
case 99: /* Transpose */
@@ -9966,11 +9966,11 @@
geometry_info.sigma=argument_list[2].real_reference;
if (attribute_flag[3] != 0)
channel=(ChannelType) argument_list[3].integer_reference;
- PushPixelComponentMap(image,channel);
+ PushPixelChannelMap(image,channel);
image=AdaptiveBlurImage(image,geometry_info.rho,geometry_info.sigma,
exception);
if (image != (Image *) NULL)
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
break;
}
case 103: /* Sketch */
@@ -10149,10 +10149,10 @@
invert=MagickFalse;
if (attribute_flag[7] != 0)
invert=(MagickBooleanType) argument_list[7].integer_reference;
- PushPixelComponentMap(image,channel);
+ PushPixelChannelMap(image,channel);
(void) FloodfillPaintImage(image,draw_info,&target,geometry.x,
geometry.y,invert);
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
draw_info=DestroyDrawInfo(draw_info);
break;
}
@@ -10212,9 +10212,9 @@
}
if (attribute_flag[1] != 0)
channel=(ChannelType) argument_list[1].integer_reference;
- PushPixelComponentMap(image,channel);
+ PushPixelChannelMap(image,channel);
(void) ClutImage(image,argument_list[0].image_reference);
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
break;
}
case 114: /* LiquidRescale */
@@ -10322,11 +10322,11 @@
argument_list[2].integer_reference);
if (attribute_flag[3] != 0)
channel=(ChannelType) argument_list[3].integer_reference;
- PushPixelComponentMap(image,channel);
+ PushPixelChannelMap(image,channel);
image=SparseColorImage(image,method,number_coordinates,coordinates,
exception);
if (image != (Image *) NULL)
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
if ((attribute_flag[2] != 0) && (image != (Image *) NULL))
virtual_pixel=SetImageVirtualPixelMethod(image,virtual_pixel);
coordinates=(double *) RelinquishMagickMemory(coordinates);
@@ -10396,11 +10396,11 @@
geometry_info.xi=argument_list[3].integer_reference;;
if (attribute_flag[4] != 0)
channel=(ChannelType) argument_list[4].integer_reference;
- PushPixelComponentMap(image,channel);
+ PushPixelChannelMap(image,channel);
image=SelectiveBlurImage(image,geometry_info.rho,geometry_info.sigma,
geometry_info.xi,exception);
if (image != (Image *) NULL)
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
break;
}
case 122: /* HaldClut */
@@ -10413,9 +10413,9 @@
}
if (attribute_flag[1] != 0)
channel=(ChannelType) argument_list[1].integer_reference;
- PushPixelComponentMap(image,channel);
+ PushPixelChannelMap(image,channel);
(void) HaldClutImage(image,argument_list[0].image_reference);
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
break;
}
case 123: /* BlueShift */
@@ -10452,18 +10452,18 @@
{
if (attribute_flag[0] != 0)
channel=(ChannelType) argument_list[0].integer_reference;
- PushPixelComponentMap(image,channel);
+ PushPixelChannelMap(image,channel);
(void) AutoGammaImage(image);
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
break;
}
case 128: /* AutoLevel */
{
if (attribute_flag[0] != 0)
channel=(ChannelType) argument_list[0].integer_reference;
- PushPixelComponentMap(image,channel);
+ PushPixelChannelMap(image,channel);
(void) AutoLevelImage(image);
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
break;
}
case 129: /* LevelColors */
@@ -10482,19 +10482,19 @@
&white_point,exception);
if (attribute_flag[3] != 0)
channel=(ChannelType) argument_list[3].integer_reference;
- PushPixelComponentMap(image,channel);
+ PushPixelChannelMap(image,channel);
(void) LevelImageColors(image,&black_point,&white_point,
argument_list[0].integer_reference != 0 ? MagickTrue : MagickFalse);
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
break;
}
case 130: /* Clamp */
{
if (attribute_flag[0] != 0)
channel=(ChannelType) argument_list[0].integer_reference;
- PushPixelComponentMap(image,channel);
+ PushPixelChannelMap(image,channel);
(void) ClampImage(image);
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
break;
}
case 131: /* Filter */
@@ -10512,10 +10512,10 @@
if (attribute_flag[2] != 0)
image->bias=SiPrefixToDouble(argument_list[2].string_reference,
QuantumRange);
- PushPixelComponentMap(image,channel);
+ PushPixelChannelMap(image,channel);
image=FilterImage(image,kernel,exception);
if (image != (Image *) NULL)
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
kernel=DestroyKernelInfo(kernel);
break;
}
@@ -10541,9 +10541,9 @@
contrast=argument_list[2].real_reference;
if (attribute_flag[4] != 0)
channel=(ChannelType) argument_list[4].integer_reference;
- PushPixelComponentMap(image,channel);
+ PushPixelChannelMap(image,channel);
(void) BrightnessContrastImage(image,brightness,contrast);
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
break;
}
case 133: /* Morphology */
@@ -10570,10 +10570,10 @@
iterations=1;
if (attribute_flag[3] != 0)
iterations=argument_list[4].integer_reference;
- PushPixelComponentMap(image,channel);
+ PushPixelChannelMap(image,channel);
image=MorphologyImage(image,method,iterations,kernel,exception);
if (image != (Image *) NULL)
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
kernel=DestroyKernelInfo(kernel);
break;
}
@@ -10647,11 +10647,11 @@
geometry_info.sigma=argument_list[2].real_reference;
if (attribute_flag[3] != 0)
channel=(ChannelType) argument_list[3].integer_reference;
- PushPixelComponentMap(image,channel);
+ PushPixelChannelMap(image,channel);
image=StatisticImage(image,ModeStatistic,(size_t) geometry_info.rho,
(size_t) geometry_info.sigma,exception);
if (image != (Image *) NULL)
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
break;
}
case 137: /* Statistic */
@@ -10675,11 +10675,11 @@
channel=(ChannelType) argument_list[3].integer_reference;
if (attribute_flag[4] != 0)
statistic=(StatisticType) argument_list[4].integer_reference;
- PushPixelComponentMap(image,channel);
+ PushPixelChannelMap(image,channel);
image=StatisticImage(image,statistic,(size_t) geometry_info.rho,
(size_t) geometry_info.sigma,exception);
if (image != (Image *) NULL)
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
break;
}
}
@@ -13401,7 +13401,7 @@
}
}
(void) SetImageStorageClass(image,DirectClass);
- PushPixelComponentMap(image,channel);
+ PushPixelChannelMap(image,channel);
q=GetAuthenticPixels(image,region.x,region.y,1,1,exception);
if ((q == (const Quantum *) NULL) || (av == (AV *) NULL) ||
(SvTYPE(av) != SVt_PVAV))
@@ -13418,35 +13418,35 @@
scale=1.0;
if (normalize != MagickFalse)
scale=QuantumRange;
- if (((GetPixelRedTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelRedTraits(image) & UpdatePixelTrait) != 0) &&
(i <= av_len(av)))
{
SetPixelRed(image,ClampToQuantum(scale*SvNV(*(
av_fetch(av,i,0)))),q);
i++;
}
- if (((GetPixelGreenTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0) &&
(i <= av_len(av)))
{
SetPixelGreen(image,ClampToQuantum(scale*SvNV(*(
av_fetch(av,i,0)))),q);
i++;
}
- if (((GetPixelBlueTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0) &&
(i <= av_len(av)))
{
SetPixelBlue(image,ClampToQuantum(scale*SvNV(*(
av_fetch(av,i,0)))),q);
i++;
}
- if ((((GetPixelBlackTraits(image) & ActivePixelTrait) != 0) &&
+ if ((((GetPixelBlackTraits(image) & UpdatePixelTrait) != 0) &&
(image->colorspace == CMYKColorspace)) && (i <= av_len(av)))
{
SetPixelBlack(image,ClampToQuantum(scale*
SvNV(*(av_fetch(av,i,0)))),q);
i++;
}
- if (((GetPixelAlphaTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) &&
(i <= av_len(av)))
{
SetPixelAlpha(image,ClampToQuantum(scale*
@@ -13455,7 +13455,7 @@
}
(void) SyncAuthenticPixels(image,exception);
}
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
PerlException:
InheritPerlException(exception,perl_exception);
diff --git a/coders/aai.c b/coders/aai.c
index 76b9ccf..214b175 100644
--- a/coders/aai.c
+++ b/coders/aai.c
@@ -183,7 +183,7 @@
SetPixelAlpha(image,ScaleCharToQuantum(*p++),q);
if (GetPixelAlpha(image,q) != OpaqueAlpha)
image->matte=MagickTrue;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -387,7 +387,7 @@
GetPixelAlpha(image,p) : OpaqueAlpha));
if (*q == 255)
*q=254;
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
q++;
}
count=WriteBlob(image,(size_t) (q-pixels),pixels);
diff --git a/coders/avs.c b/coders/avs.c
index 12d881b..5f8441b 100644
--- a/coders/avs.c
+++ b/coders/avs.c
@@ -180,7 +180,7 @@
SetPixelBlue(image,ScaleCharToQuantum(*p++),q);
if (GetPixelAlpha(image,q) != OpaqueAlpha)
image->matte=MagickTrue;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -382,7 +382,7 @@
*q++=ScaleQuantumToChar(GetPixelRed(image,p));
*q++=ScaleQuantumToChar(GetPixelGreen(image,p));
*q++=ScaleQuantumToChar(GetPixelBlue(image,p));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
count=WriteBlob(image,(size_t) (q-pixels),pixels);
if (count != (ssize_t) (q-pixels))
diff --git a/coders/bgr.c b/coders/bgr.c
index 556863b..c882751 100644
--- a/coders/bgr.c
+++ b/coders/bgr.c
@@ -253,8 +253,8 @@
SetPixelAlpha(image,OpaqueAlpha,q);
if (image->matte != MagickFalse)
SetPixelAlpha(image,GetPixelAlpha(canvas_image,p),q);
- p+=GetPixelComponents(canvas_image);
- q+=GetPixelComponents(image);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -359,8 +359,8 @@
default:
break;
}
- p+=GetPixelComponents(canvas_image);
- q+=GetPixelComponents(image);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -425,8 +425,8 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
SetPixelRed(image,GetPixelRed(canvas_image,p),q);
- p+=GetPixelComponents(canvas_image);
- q+=GetPixelComponents(image);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -477,8 +477,8 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
SetPixelGreen(image,GetPixelGreen(canvas_image,p),q);
- p+=GetPixelComponents(canvas_image);
- q+=GetPixelComponents(image);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -529,8 +529,8 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
SetPixelBlue(image,GetPixelBlue(canvas_image,p),q);
- p+=GetPixelComponents(canvas_image);
- q+=GetPixelComponents(image);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -590,8 +590,8 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
SetPixelAlpha(image,GetPixelAlpha(canvas_image,p),q);
- p+=GetPixelComponents(canvas_image);
- q+=GetPixelComponents(image);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -677,8 +677,8 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
SetPixelRed(image,GetPixelRed(canvas_image,p),q);
- p+=GetPixelComponents(canvas_image);
- q+=GetPixelComponents(image);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -748,8 +748,8 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
SetPixelGreen(image,GetPixelGreen(canvas_image,p),q);
- p+=GetPixelComponents(canvas_image);
- q+=GetPixelComponents(image);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -819,8 +819,8 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
SetPixelBlue(image,GetPixelBlue(canvas_image,p),q);
- p+=GetPixelComponents(canvas_image);
- q+=GetPixelComponents(image);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -892,8 +892,8 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
SetPixelAlpha(image,GetPixelAlpha(canvas_image,p),q);
- p+=GetPixelComponents(canvas_image);
- q+=GetPixelComponents(image);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
diff --git a/coders/bmp.c b/coders/bmp.c
index a42f401..b0bc283 100644
--- a/coders/bmp.c
+++ b/coders/bmp.c
@@ -1009,7 +1009,7 @@
{
index=(Quantum) (((*p) & (0x80 >> bit)) != 0 ? 0x01 : 0x00);
SetPixelIndex(image,index,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
p++;
}
@@ -1019,7 +1019,7 @@
{
index=(Quantum) (((*p) & (0x80 >> bit)) != 0 ? 0x01 : 0x00);
SetPixelIndex(image,index,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
p++;
}
@@ -1051,17 +1051,17 @@
{
index=ConstrainColormapIndex(image,(*p >> 4) & 0x0f);
SetPixelIndex(image,index,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
index=ConstrainColormapIndex(image,*p & 0x0f);
SetPixelIndex(image,index,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
p++;
}
if ((image->columns % 2) != 0)
{
index=ConstrainColormapIndex(image,(*p >> 4) & 0xf);
SetPixelIndex(image,index,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
p++;
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -1095,7 +1095,7 @@
{
index=ConstrainColormapIndex(image,*p++);
SetPixelIndex(image,index,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -1165,7 +1165,7 @@
if (image->matte != MagickFalse)
SetPixelAlpha(image,
ScaleShortToQuantum((unsigned short) opacity),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -1198,7 +1198,7 @@
SetPixelGreen(image,ScaleCharToQuantum(*p++),q);
SetPixelRed(image,ScaleCharToQuantum(*p++),q);
SetPixelAlpha(image,OpaqueAlpha,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -1260,7 +1260,7 @@
if (image->matte != MagickFalse)
SetPixelAlpha(image,
ScaleShortToQuantum((unsigned short) opacity),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -1658,7 +1658,7 @@
bit=0;
byte=0;
}
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
if (bit != 0)
{
@@ -1707,7 +1707,7 @@
nibble=0;
byte=0;
}
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
if (nibble != 0)
{
@@ -1741,7 +1741,7 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
*q++=(unsigned char) GetPixelIndex(image,p);
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
for ( ; x < (ssize_t) bytes_per_line; x++)
*q++=0x00;
@@ -1771,7 +1771,7 @@
*q++=ScaleQuantumToChar(GetPixelBlue(image,p));
*q++=ScaleQuantumToChar(GetPixelGreen(image,p));
*q++=ScaleQuantumToChar(GetPixelRed(image,p));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
for (x=3L*(ssize_t) image->columns; x < (ssize_t) bytes_per_line; x++)
*q++=0x00;
@@ -1802,7 +1802,7 @@
*q++=ScaleQuantumToChar(GetPixelGreen(image,p));
*q++=ScaleQuantumToChar(GetPixelRed(image,p));
*q++=ScaleQuantumToChar(GetPixelAlpha(image,p));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
if (image->previous == (Image *) NULL)
{
diff --git a/coders/clipboard.c b/coders/clipboard.c
index 086758f..cd737db 100644
--- a/coders/clipboard.c
+++ b/coders/clipboard.c
@@ -218,7 +218,7 @@
SetPixelBlue(image,ScaleCharToQuantum(pBits->rgbBlue),q);
SetPixelAlpha(image,OpaqueAlpha,q);
pBits++;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
diff --git a/coders/cmyk.c b/coders/cmyk.c
index 0f37675..d736168 100644
--- a/coders/cmyk.c
+++ b/coders/cmyk.c
@@ -253,8 +253,8 @@
SetPixelAlpha(image,OpaqueAlpha,q);
if (image->matte != MagickFalse)
SetPixelAlpha(image,GetPixelAlpha(canvas_image,p),q);
- p+=GetPixelComponents(canvas_image);
- q+=GetPixelComponents(image);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -360,8 +360,8 @@
default:
break;
}
- p+=GetPixelComponents(canvas_image);
- q+=GetPixelComponents(image);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -426,8 +426,8 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
SetPixelRed(image,GetPixelRed(canvas_image,p),q);
- p+=GetPixelComponents(canvas_image);
- q+=GetPixelComponents(image);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -478,8 +478,8 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
SetPixelGreen(image,GetPixelGreen(canvas_image,p),q);
- p+=GetPixelComponents(canvas_image);
- q+=GetPixelComponents(image);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -530,8 +530,8 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
SetPixelBlue(image,GetPixelBlue(canvas_image,p),q);
- p+=GetPixelComponents(canvas_image);
- q+=GetPixelComponents(image);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -582,8 +582,8 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
SetPixelBlack(image,GetPixelBlack(canvas_image,p),q);
- p+=GetPixelComponents(canvas_image);
- q+=GetPixelComponents(image);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -637,8 +637,8 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
SetPixelAlpha(image,GetPixelAlpha(canvas_image,p),q);
- p+=GetPixelComponents(canvas_image);
- q+=GetPixelComponents(image);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -724,8 +724,8 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
SetPixelRed(image,GetPixelRed(canvas_image,p),q);
- p+=GetPixelComponents(canvas_image);
- q+=GetPixelComponents(image);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -795,8 +795,8 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
SetPixelGreen(image,GetPixelGreen(canvas_image,p),q);
- p+=GetPixelComponents(canvas_image);
- q+=GetPixelComponents(image);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -866,8 +866,8 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
SetPixelBlue(image,GetPixelBlue(canvas_image,p),q);
- p+=GetPixelComponents(canvas_image);
- q+=GetPixelComponents(image);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -937,8 +937,8 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
SetPixelBlack(image,GetPixelBlack(canvas_image,p),q);
- p+=GetPixelComponents(canvas_image);
- q+=GetPixelComponents(image);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -1010,8 +1010,8 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
SetPixelAlpha(image,GetPixelAlpha(canvas_image,p),q);
- p+=GetPixelComponents(canvas_image);
- q+=GetPixelComponents(image);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
diff --git a/coders/cut.c b/coders/cut.c
index f84ef1d..091d499 100644
--- a/coders/cut.c
+++ b/coders/cut.c
@@ -118,7 +118,7 @@
{
index=(Quantum) ((((*p) & (0x80 >> bit)) != 0) ? 0x01 : 0x00);
SetPixelIndex(image,index,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
p++;
}
@@ -128,7 +128,7 @@
{
index=(Quantum) ((((*p) & (0x80 >> bit)) != 0) ? 0x01 : 0x00);
SetPixelIndex(image,index,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
p++;
}
@@ -145,35 +145,35 @@
{
index=ConstrainColormapIndex(image,(*p >> 6) & 0x3);
SetPixelIndex(image,index,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
index=ConstrainColormapIndex(image,(*p >> 4) & 0x3);
SetPixelIndex(image,index,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
index=ConstrainColormapIndex(image,(*p >> 2) & 0x3);
SetPixelIndex(image,index,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
index=ConstrainColormapIndex(image,(*p) & 0x3);
SetPixelIndex(image,index,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
p++;
}
if ((image->columns % 4) != 0)
{
index=ConstrainColormapIndex(image,(*p >> 6) & 0x3);
SetPixelIndex(image,index,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
if ((image->columns % 4) >= 1)
{
index=ConstrainColormapIndex(image,(*p >> 4) & 0x3);
SetPixelIndex(image,index,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
if ((image->columns % 4) >= 2)
{
index=ConstrainColormapIndex(image,(*p >> 2) & 0x3);
SetPixelIndex(image,index,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
}
p++;
@@ -192,17 +192,17 @@
{
index=ConstrainColormapIndex(image,(*p >> 4) & 0xf);
SetPixelIndex(image,index,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
index=ConstrainColormapIndex(image,(*p) & 0xf);
SetPixelIndex(image,index,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
p++;
}
if ((image->columns % 2) != 0)
{
index=ConstrainColormapIndex(image,(*p >> 4) & 0xf);
SetPixelIndex(image,index,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
p++;
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -218,7 +218,7 @@
index=ConstrainColormapIndex(image,*p);
SetPixelIndex(image,index,q);
p++;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -259,7 +259,7 @@
intensity=GetPixelRed(image,q);
if (intensity >= scale_intensity)
return(255);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
}
if (intensity < ScaleCharToQuantum(2))
@@ -589,7 +589,7 @@
SetPixelGreen(image,QuantumRange,q);
SetPixelBlue(image,QuantumRange,q);
}
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse) goto Finish;
}
diff --git a/coders/dcm.c b/coders/dcm.c
index b3c4c7c..b207379 100644
--- a/coders/dcm.c
+++ b/coders/dcm.c
@@ -3752,7 +3752,7 @@
default:
break;
}
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -3907,7 +3907,7 @@
SetPixelRed(image,pixel.red,q);
SetPixelGreen(image,pixel.green,q);
SetPixelBlue(image,pixel.blue,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -4040,7 +4040,7 @@
(((size_t) pixel.green) << 8)),q);
SetPixelBlue(image,(((size_t) GetPixelBlue(image,q)) |
(((size_t) pixel.blue) << 8)),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
diff --git a/coders/dds.c b/coders/dds.c
index 0422561..dc7a796 100644
--- a/coders/dds.c
+++ b/coders/dds.c
@@ -554,7 +554,7 @@
SetPixelAlpha(image,ScaleCharToQuantum(colors.a[code]),q);
if (colors.a[code] && (image->matte == MagickFalse))
image->matte=MagickTrue; /* Correct matte */
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
}
}
@@ -643,7 +643,7 @@
else
alpha = 17U * (unsigned char) ((a1 >> (4*(4*(j-2)+i))) & 0xf);
SetPixelAlpha(image,ScaleCharToQuantum((unsigned char) alpha),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
}
}
@@ -747,7 +747,7 @@
else
alpha = (((6-alpha_code) * a0 + (alpha_code-1) * a1) / 5);
SetPixelAlpha(image,ScaleCharToQuantum((unsigned char) alpha),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
}
}
@@ -791,7 +791,7 @@
ReadBlobByte(image)),q);
if (dds_info->pixelformat.rgb_bitcount == 32)
(void) ReadBlobByte(image);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -832,7 +832,7 @@
ReadBlobByte(image)),q);
SetPixelAlpha(image,ScaleCharToQuantum((unsigned char)
ReadBlobByte(image)),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
diff --git a/coders/debug.c b/coders/debug.c
index 69743f7..1fb6753 100644
--- a/coders/debug.c
+++ b/coders/debug.c
@@ -247,7 +247,7 @@
}
(void) WriteBlobString(image,tuple);
(void) WriteBlobString(image,"\n");
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
image->rows);
diff --git a/coders/dib.c b/coders/dib.c
index 0f2a519..658a7ac 100644
--- a/coders/dib.c
+++ b/coders/dib.c
@@ -656,7 +656,7 @@
{
index=(Quantum) ((*p) & (0x80 >> bit) ? 0x01 : 0x00);
SetPixelIndex(image,index,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
p++;
}
@@ -666,7 +666,7 @@
{
index=(Quantum) ((*p) & (0x80 >> bit) ? 0x01 : 0x00);
SetPixelIndex(image,index,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
p++;
}
@@ -698,17 +698,17 @@
{
index=ConstrainColormapIndex(image,(*p >> 4) & 0xf);
SetPixelIndex(image,index,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
index=ConstrainColormapIndex(image,*p & 0xf);
SetPixelIndex(image,index,q);
p++;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if ((image->columns % 2) != 0)
{
index=ConstrainColormapIndex(image,(*p >> 4) & 0xf);
SetPixelIndex(image,index,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
p++;
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -743,7 +743,7 @@
index=ConstrainColormapIndex(image,*p);
SetPixelIndex(image,index,q);
p++;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -797,7 +797,7 @@
SetPixelBlue(image,ScaleCharToQuantum(ScaleColor5to8(
(unsigned char) (word & 0x1f))),q);
}
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -830,7 +830,7 @@
SetPixelRed(image,ScaleCharToQuantum(*p++),q);
if (image->matte != MagickFalse)
SetPixelAlpha(image,ScaleCharToQuantum(*p++),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -1092,7 +1092,7 @@
bit=0;
byte=0;
}
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
if (bit != 0)
{
@@ -1122,7 +1122,7 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
*q++=(unsigned char) GetPixelIndex(image,p);
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
for ( ; x < (ssize_t) bytes_per_line; x++)
*q++=0x00;
@@ -1155,7 +1155,7 @@
GetPixelBlue(image,p)) << 0)));
*q++=(unsigned char)(word & 0xff);
*q++=(unsigned char)(word >> 8);
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
for (x=(ssize_t) (2*image->columns); x < (ssize_t) bytes_per_line; x++)
*q++=0x00;
@@ -1185,7 +1185,7 @@
*q++=ScaleQuantumToChar(GetPixelRed(image,p));
if (image->matte != MagickFalse)
*q++=ScaleQuantumToChar(GetPixelAlpha(image,p));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
if (dib_info.bits_per_pixel == 24)
for (x=(ssize_t) (3*image->columns); x < (ssize_t) bytes_per_line; x++)
diff --git a/coders/djvu.c b/coders/djvu.c
index 0bdc893..5d6ae78 100644
--- a/coders/djvu.c
+++ b/coders/djvu.c
@@ -410,7 +410,7 @@
if (bit == 8)
bit=0;
byte>>=1;
- o+=GetPixelComponents(image);
+ o+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,&image->exception) == MagickFalse)
break;
@@ -444,7 +444,7 @@
SetPixelRed(image,ScaleCharToQuantum(*s++),r);
SetPixelGreen(image,ScaleCharToQuantum(*s++),r);
SetPixelBlue(image,ScaleCharToQuantum(*s++),r);
- r+=GetPixelComponents(image);
+ r+=GetPixelChannels(image);
}
SyncAuthenticPixels(image,&image->exception);
diff --git a/coders/dps.c b/coders/dps.c
index 2b2cf4d..22dfcff 100644
--- a/coders/dps.c
+++ b/coders/dps.c
@@ -385,7 +385,7 @@
SetPixelGreen(image,ScaleShortToQuantum(colors[index].green),q);
index=(pixel >> blue_shift) & blue_mask;
SetPixelBlue(image,ScaleShortToQuantum(colors[index].blue),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -410,7 +410,7 @@
color=(pixel >> blue_shift) & blue_mask;
color=(color*65535L)/blue_mask;
SetPixelBlue(image,ScaleShortToQuantum((unsigned short) color),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -452,7 +452,7 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
SetPixelIndex(image,(unsigned short) XGetPixel(dps_image,x,y),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -501,7 +501,7 @@
SetPixelAlpha(image,OpaqueAlpha,q);
if (XGetPixel(matte_image,x,y) == 0)
SetPixelAlpha(image,TransparentAlpha,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
diff --git a/coders/emf.c b/coders/emf.c
index c9ae41e..7df34b6 100644
--- a/coders/emf.c
+++ b/coders/emf.c
@@ -618,7 +618,7 @@
SetPixelBlue(image,ScaleCharToQuantum(pBits->rgbBlue),q);
SetPixelAlpha(image,OpaqueAlpha,q);
pBits++;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
diff --git a/coders/exr.c b/coders/exr.c
index c8c5969..7cd528c 100644
--- a/coders/exr.c
+++ b/coders/exr.c
@@ -233,7 +233,7 @@
ImfHalfToFloat(scanline[x].b)),q);
SetPixelAlpha(image,ClampToQuantum((MagickRealType) QuantumRange*
ImfHalfToFloat(scanline[x].a)),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -443,7 +443,7 @@
else
ImfFloatToHalf(QuantumScale*GetPixelAlpha(image,p),&half_quantum);
scanline[x].a=half_quantum;
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
ImfOutputSetFrameBuffer(file,scanline-(y*image->columns),1,image->columns);
ImfOutputWritePixels(file,1);
diff --git a/coders/fits.c b/coders/fits.c
index 694c16a..9058fc6 100644
--- a/coders/fits.c
+++ b/coders/fits.c
@@ -448,7 +448,7 @@
(pixel-fits_info.min_data)+fits_info.zero)),q);
SetPixelGreen(image,GetPixelRed(image,q),q);
SetPixelBlue(image,GetPixelRed(image,q),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
diff --git a/coders/fpx.c b/coders/fpx.c
index cefeb77..4c7d4a6 100644
--- a/coders/fpx.c
+++ b/coders/fpx.c
@@ -470,7 +470,7 @@
SetPixelAlpha(image,OpaqueAlpha,q);
if (image->matte != MagickFalse)
SetPixelAlpha(image,ScaleCharToQuantum(*a),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
r+=red_component->columnStride;
g+=green_component->columnStride;
b+=blue_component->columnStride;
diff --git a/coders/gif.c b/coders/gif.c
index b3c8bb9..def3599 100644
--- a/coders/gif.c
+++ b/coders/gif.c
@@ -450,7 +450,7 @@
SetPixelAlpha(image,(ssize_t) index == opacity ? TransparentAlpha :
OpaqueAlpha,q);
x++;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (x < (ssize_t) image->columns)
break;
@@ -666,7 +666,7 @@
if (y == 0)
{
waiting_code=(short) GetPixelIndex(image,p);
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
for (x=(ssize_t) (y == 0 ? 1 : 0); x < (ssize_t) image->columns; x++)
{
@@ -674,7 +674,7 @@
Probe hash table.
*/
index=(Quantum) ((size_t) GetPixelIndex(image,p) & 0xff);
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
k=(ssize_t) (((size_t) index << (MaxGIFBits-8))+waiting_code);
if (k >= MaxHashTable)
k-=MaxHashTable;
diff --git a/coders/gray.c b/coders/gray.c
index 699a485..c9d6e5e 100644
--- a/coders/gray.c
+++ b/coders/gray.c
@@ -228,8 +228,8 @@
SetPixelRed(image,GetPixelRed(canvas_image,p),q);
SetPixelGreen(image,GetPixelGreen(canvas_image,p),q);
SetPixelBlue(image,GetPixelBlue(canvas_image,p),q);
- p+=GetPixelComponents(canvas_image);
- q+=GetPixelComponents(image);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
diff --git a/coders/hald.c b/coders/hald.c
index 1e6cd25..95d075b 100644
--- a/coders/hald.c
+++ b/coders/hald.c
@@ -152,7 +152,7 @@
(cube_size-1.0)),q);
SetPixelBlue(image,ClampToQuantum(QuantumRange*blue/(cube_size-1.0)),q);
SetPixelAlpha(image,OpaqueAlpha,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
diff --git a/coders/hdr.c b/coders/hdr.c
index 86d5a2d..d5978aa 100644
--- a/coders/hdr.c
+++ b/coders/hdr.c
@@ -474,7 +474,7 @@
SetPixelGreen(image,ClampToQuantum(QuantumRange*gamma*pixel[1]),q);
SetPixelBlue(image,ClampToQuantum(QuantumRange*gamma*pixel[2]),q);
}
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -784,7 +784,7 @@
pixels[i++]=pixel[2];
pixels[i++]=pixel[3];
}
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
if ((image->columns >= 8) && (image->columns <= 0x7ffff))
{
diff --git a/coders/histogram.c b/coders/histogram.c
index 3ff651c..6ce7d7b 100644
--- a/coders/histogram.c
+++ b/coders/histogram.c
@@ -267,25 +267,25 @@
break;
for (x=0; x < (ssize_t) image->columns; x++)
{
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
histogram[ScaleQuantumToChar(GetPixelRed(image,p))].red++;
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
histogram[ScaleQuantumToChar(GetPixelGreen(image,p))].green++;
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
histogram[ScaleQuantumToChar(GetPixelBlue(image,p))].blue++;
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
maximum=histogram[0].red;
for (x=0; x < (ssize_t) histogram_image->columns; x++)
{
- if (((GetPixelRedTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelRedTraits(image) & UpdatePixelTrait) != 0) &&
(maximum < histogram[x].red))
maximum=histogram[x].red;
- if (((GetPixelGreenTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0) &&
(maximum < histogram[x].green))
maximum=histogram[x].green;
- if (((GetPixelBlueTraits(image) & ActivePixelTrait) != 0) &&
+ if (((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0) &&
(maximum < histogram[x].blue))
maximum=histogram[x].blue;
}
@@ -302,7 +302,7 @@
q=GetAuthenticPixels(histogram_image,x,0,1,histogram_image->rows,exception);
if (q == (const Quantum *) NULL)
break;
- if ((GetPixelRedTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0)
{
y=(ssize_t) ceil(histogram_image->rows-scale*histogram[x].red-0.5);
r=q+y;
@@ -312,7 +312,7 @@
r++;
}
}
- if ((GetPixelGreenTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0)
{
y=(ssize_t) ceil(histogram_image->rows-scale*histogram[x].green-0.5);
r=q+y;
@@ -322,7 +322,7 @@
r++;
}
}
- if ((GetPixelBlueTraits(image) & ActivePixelTrait) != 0)
+ if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0)
{
y=(ssize_t) ceil(histogram_image->rows-scale*histogram[x].blue-0.5);
r=q+y;
diff --git a/coders/hrz.c b/coders/hrz.c
index b337f40..92dc674 100644
--- a/coders/hrz.c
+++ b/coders/hrz.c
@@ -162,7 +162,7 @@
SetPixelGreen(image,4*ScaleCharToQuantum(*p++),q);
SetPixelBlue(image,4*ScaleCharToQuantum(*p++),q);
SetPixelAlpha(image,OpaqueAlpha,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -328,7 +328,7 @@
*q++=ScaleQuantumToChar(GetPixelRed(hrz_image,p))/4;
*q++=ScaleQuantumToChar(GetPixelGreen(hrz_image,p))/4;
*q++=ScaleQuantumToChar(GetPixelBlue(hrz_image,p))/4;
- p+=GetPixelComponents(hrz_image);
+ p+=GetPixelChannels(hrz_image);
}
count=WriteBlob(image,(size_t) (q-pixels),pixels);
if (count != (ssize_t) (q-pixels))
diff --git a/coders/icon.c b/coders/icon.c
index c13e235..3a7e7aa 100644
--- a/coders/icon.c
+++ b/coders/icon.c
@@ -409,7 +409,7 @@
{
SetPixelIndex(image,((byte & (0x80 >> bit)) != 0 ? 0x01 :
0x00),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
}
if ((image->columns % 8) != 0)
@@ -419,7 +419,7 @@
{
SetPixelIndex(image,((byte & (0x80 >> bit)) != 0 ? 0x01 :
0x00),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
}
for (x=0; x < (ssize_t) scanline_pad; x++)
@@ -450,15 +450,15 @@
{
byte=(size_t) ReadBlobByte(image);
SetPixelIndex(image,((byte >> 4) & 0xf),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
SetPixelIndex(image,((byte) & 0xf),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if ((image->columns % 2) != 0)
{
byte=(size_t) ReadBlobByte(image);
SetPixelIndex(image,((byte >> 4) & 0xf),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
for (x=0; x < (ssize_t) scanline_pad; x++)
(void) ReadBlobByte(image);
@@ -488,7 +488,7 @@
{
byte=(size_t) ReadBlobByte(image);
SetPixelIndex(image,byte,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
for (x=0; x < (ssize_t) scanline_pad; x++)
(void) ReadBlobByte(image);
@@ -519,7 +519,7 @@
byte=(size_t) ReadBlobByte(image);
byte|=(size_t) (ReadBlobByte(image) << 8);
SetPixelIndex(image,byte,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
for (x=0; x < (ssize_t) scanline_pad; x++)
(void) ReadBlobByte(image);
@@ -557,7 +557,7 @@
if (icon_info.bits_per_pixel == 32)
SetPixelAlpha(image,ScaleCharToQuantum((unsigned char)
ReadBlobByte(image)),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (icon_info.bits_per_pixel == 24)
for (x=0; x < (ssize_t) scanline_pad; x++)
@@ -597,7 +597,7 @@
{
SetPixelAlpha(image,(((byte & (0x80 >> bit)) != 0) ?
TransparentAlpha : OpaqueAlpha),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
}
if ((image->columns % 8) != 0)
@@ -607,7 +607,7 @@
{
SetPixelAlpha(image,(((byte & (0x80 >> bit)) != 0) ?
TransparentAlpha : OpaqueAlpha),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
}
if ((image->columns % 32) != 0)
@@ -1015,7 +1015,7 @@
bit=0;
byte=0;
}
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
if (bit != 0)
*q++=(unsigned char) (byte << (8-bit));
@@ -1056,7 +1056,7 @@
nibble=0;
byte=0;
}
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
if (nibble != 0)
*q++=(unsigned char) (byte << 4);
@@ -1083,7 +1083,7 @@
for (x=0; x < (ssize_t) next->columns; x++)
{
*q++=(unsigned char) GetPixelIndex(next,p);
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
if (next->previous == (Image *) NULL)
{
@@ -1115,7 +1115,7 @@
*q++=ScaleQuantumToChar(QuantumRange);
else
*q++=ScaleQuantumToChar(GetPixelAlpha(next,p));
- p+=GetPixelComponents(next);
+ p+=GetPixelChannels(next);
}
if (icon_info.bits_per_pixel == 24)
for (x=3L*(ssize_t) next->columns; x < (ssize_t) bytes_per_line; x++)
@@ -1211,7 +1211,7 @@
bit=0;
byte=0;
}
- p+=GetPixelComponents(next);
+ p+=GetPixelChannels(next);
}
if (bit != 0)
(void) WriteBlobByte(image,(unsigned char) (byte << (8-bit)));
diff --git a/coders/jbig.c b/coders/jbig.c
index d59cd3a..bdd4422 100644
--- a/coders/jbig.c
+++ b/coders/jbig.c
@@ -235,7 +235,7 @@
bit=0;
SetPixelIndex(image,index,q);
SetPixelPacket(image,image->colormap+(ssize_t) index,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -472,7 +472,7 @@
bit=0;
byte=0;
}
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
if (bit != 0)
*q++=byte << (8-bit);
diff --git a/coders/jp2.c b/coders/jp2.c
index 4274d8e..c8667dc 100644
--- a/coders/jp2.c
+++ b/coders/jp2.c
@@ -541,7 +541,7 @@
SetPixelRed(image,ScaleAnyToQuantum((QuantumAny) pixel,range[0]),q);
SetPixelGreen(image,GetPixelRed(image,q),q);
SetPixelBlue(image,GetPixelRed(image,q),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
break;
}
@@ -558,7 +558,7 @@
SetPixelGreen(image,ScaleAnyToQuantum((QuantumAny) pixel,range[1]),q);
pixel=(QuantumAny) jas_matrix_getv(pixels[2],x/x_step[2]);
SetPixelBlue(image,ScaleAnyToQuantum((QuantumAny) pixel,range[2]),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
break;
}
@@ -577,7 +577,7 @@
SetPixelBlue(image,ScaleAnyToQuantum((QuantumAny) pixel,range[2]),q);
pixel=(QuantumAny) jas_matrix_getv(pixels[3],x/x_step[3]);
SetPixelAlpha(image,ScaleAnyToQuantum((QuantumAny) pixel,range[3]),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
break;
}
@@ -939,7 +939,7 @@
jas_matrix_setv(pixels[3],x,(jas_seqent_t) ScaleQuantumToAny(
GetPixelAlpha(image,p),range));
}
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
for (i=0; i < (ssize_t) number_components; i++)
(void) jas_image_writecmpt(jp2_image,(short) i,0,(unsigned int) y,
diff --git a/coders/jpeg.c b/coders/jpeg.c
index 221ef00..7808d02 100644
--- a/coders/jpeg.c
+++ b/coders/jpeg.c
@@ -1247,7 +1247,7 @@
SetPixelIndex(image,index,q);
SetPixelPacket(image,image->colormap+(ssize_t) index,q);
p++;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
else
if (image->colorspace != CMYKColorspace)
@@ -1260,7 +1260,7 @@
SetPixelBlue(image,ScaleShortToQuantum((unsigned char)
(GETJSAMPLE(*p++) << 4)),q);
SetPixelAlpha(image,OpaqueAlpha,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
else
for (x=0; x < (ssize_t) image->columns; x++)
@@ -1274,7 +1274,7 @@
SetPixelBlack(image,QuantumRange-ScaleShortToQuantum(
(unsigned char) (GETJSAMPLE(*p++) << 4)),q);
SetPixelAlpha(image,OpaqueAlpha,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
}
else
@@ -1285,7 +1285,7 @@
SetPixelIndex(image,index,q);
SetPixelPacket(image,image->colormap+(ssize_t) index,q);
p++;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
else
if (image->colorspace != CMYKColorspace)
@@ -1298,7 +1298,7 @@
SetPixelBlue(image,ScaleCharToQuantum((unsigned char)
GETJSAMPLE(*p++)),q);
SetPixelAlpha(image,OpaqueAlpha,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
else
for (x=0; x < (ssize_t) image->columns; x++)
@@ -1312,7 +1312,7 @@
SetPixelBlack(image,QuantumRange-ScaleCharToQuantum(
(unsigned char) GETJSAMPLE(*p++)),q);
SetPixelAlpha(image,OpaqueAlpha,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -2227,7 +2227,7 @@
*q++=(JSAMPLE) ScaleQuantumToChar(GetPixelRed(image,p));
*q++=(JSAMPLE) ScaleQuantumToChar(GetPixelGreen(image,p));
*q++=(JSAMPLE) ScaleQuantumToChar(GetPixelBlue(image,p));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
(void) jpeg_write_scanlines(&jpeg_info,scanline,1);
status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
@@ -2252,7 +2252,7 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
*q++=(JSAMPLE) ScaleQuantumToChar(GetPixelIntensity(image,p));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
(void) jpeg_write_scanlines(&jpeg_info,scanline,1);
status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
@@ -2286,7 +2286,7 @@
GetPixelBlue(image,p))));
*q++=(JSAMPLE) (ScaleQuantumToChar((Quantum) (QuantumRange-
GetPixelBlack(image,p))));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
(void) jpeg_write_scanlines(&jpeg_info,scanline,1);
status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
@@ -2313,7 +2313,7 @@
{
*q++=(JSAMPLE) (ScaleQuantumToShort(GetPixelIntensity(image,p)) >>
4);
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
(void) jpeg_write_scanlines(&jpeg_info,scanline,1);
status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
@@ -2341,7 +2341,7 @@
*q++=(JSAMPLE) (ScaleQuantumToShort(GetPixelRed(image,p)) >> 4);
*q++=(JSAMPLE) (ScaleQuantumToShort(GetPixelGreen(image,p)) >> 4);
*q++=(JSAMPLE) (ScaleQuantumToShort(GetPixelBlue(image,p)) >> 4);
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
(void) jpeg_write_scanlines(&jpeg_info,scanline,1);
status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
@@ -2375,7 +2375,7 @@
GetPixelBlue(image,p)) >> 4));
*q++=(JSAMPLE) (4095-(ScaleQuantumToShort(
GetPixelBlack(image,p)) >> 4));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
(void) jpeg_write_scanlines(&jpeg_info,scanline,1);
status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
diff --git a/coders/mac.c b/coders/mac.c
index 10b1935..9d92162 100644
--- a/coders/mac.c
+++ b/coders/mac.c
@@ -193,7 +193,7 @@
byte<<=1;
if (bit == 8)
bit=0;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -228,7 +228,7 @@
byte<<=1;
if (bit == 8)
bit=0;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
diff --git a/coders/map.c b/coders/map.c
index 58b3ca5..0a08aee 100644
--- a/coders/map.c
+++ b/coders/map.c
@@ -227,7 +227,7 @@
}
SetPixelIndex(image,index,q);
SetPixelPacket(image,image->colormap+(ssize_t) index,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -423,7 +423,7 @@
if (image->colors > 256)
*q++=(unsigned char) ((size_t) GetPixelIndex(image,p) >> 8);
*q++=(unsigned char) GetPixelIndex(image,p);
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
(void) WriteBlob(image,(size_t) (q-pixels),pixels);
}
diff --git a/coders/mat.c b/coders/mat.c
index b969244..c35d967 100644
--- a/coders/mat.c
+++ b/coders/mat.c
@@ -235,7 +235,7 @@
}
}
p++;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (!SyncAuthenticPixels(image,exception))
return;
diff --git a/coders/matte.c b/coders/matte.c
index b037aab..43da963 100644
--- a/coders/matte.c
+++ b/coders/matte.c
@@ -199,8 +199,8 @@
SetPixelGreen(matte_image,GetPixelAlpha(image,p),q);
SetPixelBlue(matte_image,GetPixelAlpha(image,p),q);
SetPixelAlpha(matte_image,OpaqueAlpha,q);
- p+=GetPixelComponents(image);
- q+=GetPixelComponents(matte_image);
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(matte_image);
}
if (SyncAuthenticPixels(matte_image,exception) == MagickFalse)
break;
diff --git a/coders/miff.c b/coders/miff.c
index f73431e..25d28cc 100644
--- a/coders/miff.c
+++ b/coders/miff.c
@@ -1412,7 +1412,7 @@
}
if (image->matte != MagickFalse)
SetPixelAlpha(image,pixel.alpha,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
break;
}
@@ -2392,7 +2392,7 @@
{
length=0;
SetPixelInfo(image,p,&pixel);
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
for (x=1; x < (ssize_t) image->columns; x++)
{
SetPixelInfo(image,p,&target);
@@ -2405,7 +2405,7 @@
length=0;
}
SetPixelInfo(image,p,&pixel);
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
q=PopRunlengthPacket(image,q,length,&pixel);
(void) WriteBlob(image,(size_t) (q-pixels),pixels);
diff --git a/coders/mono.c b/coders/mono.c
index 32e071b..138b257 100644
--- a/coders/mono.c
+++ b/coders/mono.c
@@ -172,7 +172,7 @@
if (bit == 8)
bit=0;
byte>>=1;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -340,7 +340,7 @@
bit=0;
byte=0;
}
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
if (bit != 0)
(void) WriteBlobByte(image,(unsigned char) (byte >> (8-bit)));
diff --git a/coders/msl.c b/coders/msl.c
index 0e8ea07..3657506 100644
--- a/coders/msl.c
+++ b/coders/msl.c
@@ -736,10 +736,10 @@
}
}
}
- PushPixelComponentMap(msl_info->image[n],channel);
+ PushPixelChannelMap(msl_info->image[n],channel);
noise_image=AddNoiseImage(msl_info->image[n],noise,
&msl_info->image[n]->exception);
- PopPixelComponentMap(msl_info->image[n]);
+ PopPixelChannelMap(msl_info->image[n]);
if (noise_image == (Image *) NULL)
break;
msl_info->image[n]=DestroyImage(msl_info->image[n]);
@@ -1231,10 +1231,10 @@
}
}
}
- PushPixelComponentMap(msl_info->image[n],channel);
+ PushPixelChannelMap(msl_info->image[n],channel);
blur_image=BlurImage(msl_info->image[n],geometry_info.rho,
geometry_info.sigma,&msl_info->image[n]->exception);
- PopPixelComponentMap(msl_info->image[n]);
+ PopPixelChannelMap(msl_info->image[n]);
if (blur_image == (Image *) NULL)
break;
msl_info->image[n]=DestroyImage(msl_info->image[n]);
@@ -1945,7 +1945,7 @@
if (GetPixelAlpha(composite_image,q) == OpaqueAlpha)
SetPixelAlpha(composite_image,
ClampToQuantum(opacity),q);
- q+=GetPixelComponents(composite_image);
+ q+=GetPixelChannels(composite_image);
}
if (SyncCacheViewAuthenticPixels(composite_view,&exception) == MagickFalse)
break;
@@ -2055,7 +2055,7 @@
geometry.y);
flags=ParseGravityGeometry(image,composite_geometry,&geometry,
&exception);
- PushPixelComponentMap(image,channel);
+ PushPixelChannelMap(image,channel);
if (rotate_image == (Image *) NULL)
CompositeImage(image,compose,composite_image,geometry.x,geometry.y);
else
@@ -2069,7 +2069,7 @@
CompositeImage(image,compose,rotate_image,geometry.x,geometry.y);
rotate_image=DestroyImage(rotate_image);
}
- PopPixelComponentMap(image);
+ PopPixelChannelMap(image);
composite_image=DestroyImage(composite_image);
break;
}
@@ -3736,11 +3736,11 @@
draw_info=CloneDrawInfo(msl_info->image_info[n],
msl_info->draw_info[n]);
draw_info->fill.alpha=ClampToQuantum(opacity);
- PushPixelComponentMap(msl_info->image[n],AlphaChannel);
+ PushPixelChannelMap(msl_info->image[n],AlphaChannel);
(void) FloodfillPaintImage(msl_info->image[n],draw_info,&target,
geometry.x,geometry.y,paint_method == FloodfillMethod ?
MagickFalse : MagickTrue);
- PopPixelComponentMap(msl_info->image[n]);
+ PopPixelChannelMap(msl_info->image[n]);
draw_info=DestroyDrawInfo(draw_info);
break;
}
@@ -4036,9 +4036,9 @@
}
}
}
- PushPixelComponentMap(msl_info->image[n],channel);
+ PushPixelChannelMap(msl_info->image[n],channel);
(void) NegateImage(msl_info->image[n],gray);
- PopPixelComponentMap(msl_info->image[n]);
+ PopPixelChannelMap(msl_info->image[n]);
break;
}
if (LocaleCompare((const char *) tag,"normalize") == 0)
@@ -4227,10 +4227,10 @@
}
}
}
- PushPixelComponentMap(msl_info->image[n],channel);
+ PushPixelChannelMap(msl_info->image[n],channel);
(void) OpaquePaintImage(msl_info->image[n],&target,&fill_color,
MagickFalse);
- PopPixelComponentMap(msl_info->image[n]);
+ PopPixelChannelMap(msl_info->image[n]);
break;
}
ThrowMSLException(OptionError,"UnrecognizedElement",(const char *) tag);
diff --git a/coders/mtv.c b/coders/mtv.c
index 374b277..e3a2b9a 100644
--- a/coders/mtv.c
+++ b/coders/mtv.c
@@ -180,7 +180,7 @@
SetPixelGreen(image,ScaleCharToQuantum(*p++),q);
SetPixelBlue(image,ScaleCharToQuantum(*p++),q);
SetPixelAlpha(image,OpaqueAlpha,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -383,7 +383,7 @@
*q++=ScaleQuantumToChar(GetPixelRed(image,p));
*q++=ScaleQuantumToChar(GetPixelGreen(image,p));
*q++=ScaleQuantumToChar(GetPixelBlue(image,p));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
(void) WriteBlob(image,(size_t) (q-pixels),pixels);
if (image->previous == (Image *) NULL)
diff --git a/coders/null.c b/coders/null.c
index 3492c69..00f87e2 100644
--- a/coders/null.c
+++ b/coders/null.c
@@ -139,7 +139,7 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
SetPixelPixelInfo(image,&background,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
diff --git a/coders/otb.c b/coders/otb.c
index 53e925b..621650f 100644
--- a/coders/otb.c
+++ b/coders/otb.c
@@ -186,7 +186,7 @@
bit++;
if (bit == 8)
bit=0;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -367,7 +367,7 @@
bit=0;
byte=0;
}
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
if (bit != 0)
(void) WriteBlobByte(image,byte);
diff --git a/coders/palm.c b/coders/palm.c
index 66fa9b6..cc85499 100644
--- a/coders/palm.c
+++ b/coders/palm.c
@@ -477,7 +477,7 @@
SetPixelGreen(image,(QuantumRange*((color16 >> 5) & 0x3f))/0x3f,q);
SetPixelBlue(image,(QuantumRange*((color16 >> 0) & 0x1f))/0x1f,q);
SetPixelAlpha(image,OpaqueAlpha,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
}
else
@@ -497,7 +497,7 @@
ptr++;
bit=8-bits_per_pixel;
}
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -826,7 +826,7 @@
{
SetPixelIndex(image,FindColor(image,&image->colormap[(ssize_t)
GetPixelIndex(image,q)]),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
}
affinity_image=DestroyImage(affinity_image);
@@ -868,7 +868,7 @@
}
*ptr++=(unsigned char) ((color16 >> 8) & 0xff);
*ptr++=(unsigned char) (color16 & 0xff);
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
else
@@ -891,7 +891,7 @@
byte=0x00;
bit=(unsigned char) (8-bits_per_pixel);
}
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
if ((image->columns % (8/bits_per_pixel)) != 0)
*ptr++=byte;
diff --git a/coders/pcd.c b/coders/pcd.c
index 19f7e35..62fb2a7 100644
--- a/coders/pcd.c
+++ b/coders/pcd.c
@@ -676,7 +676,7 @@
SetPixelRed(image,ScaleCharToQuantum(*yy++),q);
SetPixelGreen(image,ScaleCharToQuantum(*c1++),q);
SetPixelBlue(image,ScaleCharToQuantum(*c2++),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -784,7 +784,7 @@
SetPixelRed(image,ScaleCharToQuantum(*yy++),q);
SetPixelGreen(image,ScaleCharToQuantum(*c1++),q);
SetPixelBlue(image,ScaleCharToQuantum(*c2++),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -1027,7 +1027,7 @@
for (x=0; x < (ssize_t) (tile_image->columns << 1); x++)
{
(void) WriteBlobByte(image,ScaleQuantumToChar(GetPixelRed(tile_image,p)));
- p+=GetPixelComponents(tile_image);
+ p+=GetPixelChannels(tile_image);
}
q=GetVirtualPixels(downsample_image,0,y >> 1,downsample_image->columns,
1,&downsample_image->exception);
diff --git a/coders/pcl.c b/coders/pcl.c
index e8d524c..ae35056 100644
--- a/coders/pcl.c
+++ b/coders/pcl.c
@@ -871,7 +871,7 @@
bit=0;
byte=0;
}
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
if (bit != 0)
*q++=byte << (8-bit);
@@ -885,7 +885,7 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
*q++=(unsigned char) GetPixelIndex(image,p);
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
break;
}
@@ -900,7 +900,7 @@
*q++=ScaleQuantumToChar(GetPixelRed(image,p));
*q++=ScaleQuantumToChar(GetPixelGreen(image,p));
*q++=ScaleQuantumToChar(GetPixelBlue(image,p));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
break;
}
diff --git a/coders/pcx.c b/coders/pcx.c
index 11e8202..91e0ab0 100644
--- a/coders/pcx.c
+++ b/coders/pcx.c
@@ -610,7 +610,7 @@
if (image->matte != MagickFalse)
SetPixelAlpha(image,ScaleCharToQuantum(*r++),q);
}
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -1008,7 +1008,7 @@
for (x=0; x < (ssize_t) pcx_info.bytes_per_line; x++)
{
*q++=ScaleQuantumToChar(GetPixelRed(image,p));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
break;
}
@@ -1017,7 +1017,7 @@
for (x=0; x < (ssize_t) pcx_info.bytes_per_line; x++)
{
*q++=ScaleQuantumToChar(GetPixelGreen(image,p));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
break;
}
@@ -1026,7 +1026,7 @@
for (x=0; x < (ssize_t) pcx_info.bytes_per_line; x++)
{
*q++=ScaleQuantumToChar(GetPixelBlue(image,p));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
break;
}
@@ -1036,7 +1036,7 @@
for (x=(ssize_t) pcx_info.bytes_per_line; x != 0; x--)
{
*q++=ScaleQuantumToChar((Quantum) (GetPixelAlpha(image,p)));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
break;
}
@@ -1065,7 +1065,7 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
*q++=(unsigned char) GetPixelIndex(image,p);
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
if (PCXWritePixels(&pcx_info,pcx_pixels,image) == MagickFalse)
break;
@@ -1115,7 +1115,7 @@
bit=0;
byte=0;
}
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
if (bit != 0)
*q++=byte << (8-bit);
diff --git a/coders/pdb.c b/coders/pdb.c
index 7bcebc4..dc4b374 100644
--- a/coders/pdb.c
+++ b/coders/pdb.c
@@ -442,7 +442,7 @@
{
index=(Quantum) (*p & (0x80 >> bit) ? 0x00 : 0x01);
SetPixelIndex(image,index,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
p++;
}
@@ -470,17 +470,17 @@
{
index=ConstrainColormapIndex(image,3UL-((*p >> 6) & 0x03));
SetPixelIndex(image,index,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
index=ConstrainColormapIndex(image,3UL-((*p >> 4) & 0x03));
SetPixelIndex(image,index,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
index=ConstrainColormapIndex(image,3UL-((*p >> 2) & 0x03));
SetPixelIndex(image,index,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
index=ConstrainColormapIndex(image,3UL-((*p) & 0x03));
SetPixelIndex(image,index,q);
p++;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -506,11 +506,11 @@
{
index=ConstrainColormapIndex(image,15UL-((*p >> 4) & 0x0f));
SetPixelIndex(image,index,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
index=ConstrainColormapIndex(image,15UL-((*p) & 0x0f));
SetPixelIndex(image,index,q);
p++;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
diff --git a/coders/pdf.c b/coders/pdf.c
index 06cf2f9..06483d9 100644
--- a/coders/pdf.c
+++ b/coders/pdf.c
@@ -1605,7 +1605,7 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
*q++=ScaleQuantumToChar(GetPixelIntensity(image,p));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
if (image->previous == (Image *) NULL)
{
@@ -1647,7 +1647,7 @@
{
Ascii85Encode(image,ScaleQuantumToChar(
GetPixelIntensity(image,p)));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
if (image->previous == (Image *) NULL)
{
@@ -1712,7 +1712,7 @@
*q++=ScaleQuantumToChar(GetPixelBlue(image,p));
if (image->colorspace == CMYKColorspace)
*q++=ScaleQuantumToChar(GetPixelBlack(image,p));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
if (image->previous == (Image *) NULL)
{
@@ -1758,7 +1758,7 @@
if (image->colorspace == CMYKColorspace)
Ascii85Encode(image,ScaleQuantumToChar(
GetPixelBlack(image,p)));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
if (image->previous == (Image *) NULL)
{
@@ -1804,7 +1804,7 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
*q++=(unsigned char) GetPixelIndex(image,p);
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
if (image->previous == (Image *) NULL)
{
@@ -1846,7 +1846,7 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
Ascii85Encode(image,(unsigned char) GetPixelIndex(image,p));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
if (image->previous == (Image *) NULL)
{
@@ -2054,7 +2054,7 @@
for (x=0; x < (ssize_t) tile_image->columns; x++)
{
*q++=ScaleQuantumToChar(GetPixelIntensity(tile_image,p));
- p+=GetPixelComponents(tile_image);
+ p+=GetPixelChannels(tile_image);
}
}
#if defined(MAGICKCORE_ZLIB_DELEGATE)
@@ -2090,7 +2090,7 @@
{
Ascii85Encode(image,
ScaleQuantumToChar(GetPixelIntensity(tile_image,p)));
- p+=GetPixelComponents(tile_image);
+ p+=GetPixelChannels(tile_image);
}
}
Ascii85Flush(image);
@@ -2153,7 +2153,7 @@
*q++=ScaleQuantumToChar(GetPixelBlue(tile_image,p));
if (image->colorspace == CMYKColorspace)
*q++=ScaleQuantumToChar(GetPixelBlack(tile_image,p));
- p+=GetPixelComponents(tile_image);
+ p+=GetPixelChannels(tile_image);
}
}
#if defined(MAGICKCORE_ZLIB_DELEGATE)
@@ -2196,7 +2196,7 @@
if (image->colorspace == CMYKColorspace)
Ascii85Encode(image,ScaleQuantumToChar(
GetPixelBlack(tile_image,p)));
- p+=GetPixelComponents(tile_image);
+ p+=GetPixelChannels(tile_image);
}
}
Ascii85Flush(image);
@@ -2238,7 +2238,7 @@
for (x=0; x < (ssize_t) tile_image->columns; x++)
{
*q++=(unsigned char) GetPixelIndex(tile_image,p);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
}
#if defined(MAGICKCORE_ZLIB_DELEGATE)
@@ -2274,7 +2274,7 @@
{
Ascii85Encode(image,(unsigned char)
GetPixelIndex(tile_image,p));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
Ascii85Flush(image);
@@ -2441,7 +2441,7 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
*q++=ScaleQuantumToChar(GetPixelAlpha(image,p));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
#if defined(MAGICKCORE_ZLIB_DELEGATE)
@@ -2475,7 +2475,7 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
Ascii85Encode(image,ScaleQuantumToChar(GetPixelAlpha(image,p)));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
Ascii85Flush(image);
diff --git a/coders/pict.c b/coders/pict.c
index 5ad5d97..c2e3776 100644
--- a/coders/pict.c
+++ b/coders/pict.c
@@ -494,7 +494,7 @@
*/
for (y=0; y < (ssize_t) image->rows; y++)
{
- q=pixels+y*width*GetPixelComponents(image);;
+ q=pixels+y*width*GetPixelChannels(image);;
number_pixels=bytes_per_line;
count=ReadBlob(blob,(size_t) number_pixels,scanline);
(void) count;
@@ -1219,7 +1219,7 @@
}
}
p++;
- q+=GetPixelComponents(tile_image);
+ q+=GetPixelChannels(tile_image);
}
if (SyncAuthenticPixels(tile_image,exception) == MagickFalse)
break;
@@ -1878,7 +1878,7 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
scanline[x]=(unsigned char) GetPixelIndex(image,p);
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
count+=EncodeImage(image,scanline,(size_t) (row_bytes & 0x7FFF),
packed_scanline);
@@ -1932,7 +1932,7 @@
*blue++=ScaleQuantumToChar(GetPixelBlue(image,p));
if (image->matte != MagickFalse)
*opacity++=ScaleQuantumToChar((Quantum) (GetPixelAlpha(image,p)));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
count+=EncodeImage(image,scanline,bytes_per_line & 0x7FFF,
packed_scanline);
diff --git a/coders/pix.c b/coders/pix.c
index bff50cf..bc0dbd1 100644
--- a/coders/pix.c
+++ b/coders/pix.c
@@ -189,7 +189,7 @@
SetPixelGreen(image,green,q);
SetPixelRed(image,red,q);
length--;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
diff --git a/coders/plasma.c b/coders/plasma.c
index c351b19..411398c 100644
--- a/coders/plasma.c
+++ b/coders/plasma.c
@@ -175,7 +175,7 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
SetPixelAlpha(image,QuantumRange/2,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
diff --git a/coders/png.c b/coders/png.c
index ca9edcd..92dfe2f 100644
--- a/coders/png.c
+++ b/coders/png.c
@@ -1028,7 +1028,7 @@
if (ok_to_reduce == MagickFalse)
break;
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
if (x >= 0)
break;
@@ -1158,7 +1158,7 @@
{
if (IsPixelGray(image,p) == MagickFalse)
return(MagickFalse);
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
return(MagickTrue);
@@ -2945,7 +2945,7 @@
found_transparent_pixel = MagickTrue;
break;
}
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
}
@@ -3078,7 +3078,7 @@
SetPixelAlpha(image,ScaleCharToQuantum((unsigned char) *p++),q);
if (GetPixelAlpha(image,q) != OpaqueAlpha)
found_transparent_pixel = MagickTrue;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
else
@@ -3117,7 +3117,7 @@
SetPixelAlpha(image,ScaleShortToQuantum(quantum),q);
if (GetPixelAlpha(image,q) != OpaqueAlpha)
found_transparent_pixel = MagickTrue;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
#else /* MAGICKCORE_QUANTUM_DEPTH == 8 */
@@ -3130,7 +3130,7 @@
if (GetPixelAlpha(image,q) != OpaqueAlpha)
found_transparent_pixel = MagickTrue;
p++;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
#endif
}
@@ -3154,7 +3154,7 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
SetPixelIndex(image,*r++,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -3304,7 +3304,7 @@
}
#endif
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -4323,8 +4323,8 @@
SetPixelRed(image,GetPixelRed(jng_image,s),q);
SetPixelGreen(image,GetPixelGreen(jng_image,s),q);
SetPixelBlue(image,GetPixelBlue(jng_image,s),q);
- q+=GetPixelComponents(image);
- s+=GetPixelComponents(jng_image);
+ q+=GetPixelChannels(image);
+ s+=GetPixelChannels(jng_image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -4370,8 +4370,8 @@
for (x=(ssize_t) image->columns; x != 0; x--)
{
SetPixelAlpha(image,GetPixelRed(jng_image,s),q);
- q+=GetPixelComponents(image);
- s+=GetPixelComponents(jng_image);
+ q+=GetPixelChannels(image);
+ s+=GetPixelChannels(jng_image);
}
else
@@ -4380,8 +4380,8 @@
SetPixelAlpha(image,GetPixelRed(jng_image,s),q);
if (GetPixelAlpha(image,q) != OpaqueAlpha)
image->matte=MagickTrue;
- q+=GetPixelComponents(image);
- s+=GetPixelComponents(jng_image);
+ q+=GetPixelChannels(image);
+ s+=GetPixelChannels(jng_image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -6211,7 +6211,7 @@
GetPixelBlue(image,q)),q);
SetPixelAlpha(image,ScaleQuantumToShort(
GetPixelAlpha(image,q)),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -6415,9 +6415,9 @@
+GetPixelAlpha(image,pixels)),q);
}
}
- n+=GetPixelComponents(image);
- q+=GetPixelComponents(large_image);
- pixels+=GetPixelComponents(image);
+ n+=GetPixelChannels(image);
+ q+=GetPixelChannels(large_image);
+ pixels+=GetPixelChannels(image);
} /* x */
if (SyncAuthenticPixels(large_image,exception) == 0)
@@ -6452,13 +6452,13 @@
*pixels;
q=GetAuthenticPixels(image,0,y,image->columns,1,exception);
- pixels=q+(image->columns-length)*GetPixelComponents(image);
- n=pixels+GetPixelComponents(image);
+ pixels=q+(image->columns-length)*GetPixelChannels(image);
+ n=pixels+GetPixelChannels(image);
for (x=(ssize_t) (image->columns-length);
x < (ssize_t) image->columns; x++)
{
- /* To do: Rewrite using Get/Set***PixelComponent() */
+ /* To do: Rewrite using Get/Set***PixelChannel() */
if (x == (ssize_t) (image->columns-length))
m=(ssize_t) mng_info->magn_ml;
@@ -6496,7 +6496,7 @@
SetPixelAlpha(image,GetPixelAlpha(image,pixels),q);
}
- /* To do: Rewrite using Get/Set***PixelComponent() */
+ /* To do: Rewrite using Get/Set***PixelChannel() */
else
{
/* Interpolate */
@@ -6570,10 +6570,10 @@
+GetPixelAlpha(image,pixels)),q);
}
}
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
- n+=GetPixelComponents(image);
- p+=GetPixelComponents(image);
+ n+=GetPixelChannels(image);
+ p+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -6599,7 +6599,7 @@
GetPixelBlue(image,q)),q);
SetPixelAlpha(image,ScaleShortToQuantum(
GetPixelAlpha(image,q)),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -8055,7 +8055,7 @@
}
}
}
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
}
@@ -8148,7 +8148,7 @@
ping_have_non_bw=MagickTrue;
break;
}
- s+=GetPixelComponents(image);
+ s+=GetPixelChannels(image);
}
}
@@ -8162,7 +8162,7 @@
{
ping_have_non_bw=MagickTrue;
}
- s+=GetPixelComponents(image);
+ s+=GetPixelChannels(image);
}
}
}
@@ -8283,7 +8283,7 @@
break;
}
}
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -8395,7 +8395,7 @@
}
else
SetPixelAlpha(image,OpaqueAlpha,r);
- r+=GetPixelComponents(image);
+ r+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -8605,7 +8605,7 @@
{
SetPixelRed(image,ScaleCharToQuantum(0x24),r);
}
- r+=GetPixelComponents(image);
+ r+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -8698,7 +8698,7 @@
break;
}
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (ping_have_cheap_transparency == MagickFalse)
@@ -11563,9 +11563,9 @@
ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed");
(void) CopyMagickString(jpeg_image->magick,"JPEG",MaxTextExtent);
- PushPixelComponentMap(jpeg_image,AlphaChannel);
+ PushPixelChannelMap(jpeg_image,AlphaChannel);
status=SeparateImage(jpeg_image);
- PopPixelComponentMap(jpeg_image);
+ PopPixelChannelMap(jpeg_image);
jpeg_image->matte=MagickFalse;
if (jng_quality >= 1000)
diff --git a/coders/pnm.c b/coders/pnm.c
index 3b9d5be..f82ba75 100644
--- a/coders/pnm.c
+++ b/coders/pnm.c
@@ -439,7 +439,7 @@
SetPixelRed(image,PNMInteger(image,2) == 0 ? QuantumRange : 0,q);
SetPixelGreen(image,GetPixelRed(image,q),q);
SetPixelBlue(image,GetPixelRed(image,q),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -495,7 +495,7 @@
max_value)],q);
SetPixelGreen(image,GetPixelRed(image,q),q);
SetPixelBlue(image,GetPixelRed(image,q),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -561,7 +561,7 @@
SetPixelRed(image,pixel.red,q);
SetPixelGreen(image,pixel.green,q);
SetPixelBlue(image,pixel.blue,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -725,7 +725,7 @@
SetPixelRed(image,ScaleAnyToQuantum(pixel,range),q);
SetPixelGreen(image,GetPixelRed(image,q),q);
SetPixelBlue(image,GetPixelRed(image,q),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
}
else
@@ -739,7 +739,7 @@
SetPixelRed(image,ScaleAnyToQuantum(pixel,range),q);
SetPixelGreen(image,GetPixelRed(image,q),q);
SetPixelBlue(image,GetPixelRed(image,q),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
}
sync=SyncAuthenticPixels(image,exception);
@@ -825,7 +825,7 @@
SetPixelGreen(image,ScaleCharToQuantum(*p++),q);
SetPixelBlue(image,ScaleCharToQuantum(*p++),q);
SetPixelAlpha(image,OpaqueAlpha,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
else
if (image->depth == 16)
@@ -842,7 +842,7 @@
p=PushShortPixel(MSBEndian,p,&pixel);
SetPixelBlue(image,ScaleShortToQuantum(pixel),q);
SetPixelAlpha(image,OpaqueAlpha,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
}
else
@@ -860,7 +860,7 @@
p=PushCharPixel(p,&pixel);
SetPixelBlue(image,ScaleAnyToQuantum(pixel,range),q);
SetPixelAlpha(image,OpaqueAlpha,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
}
else
@@ -877,7 +877,7 @@
p=PushShortPixel(MSBEndian,p,&pixel);
SetPixelBlue(image,ScaleAnyToQuantum(pixel,range),q);
SetPixelAlpha(image,OpaqueAlpha,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
}
if ((type == BilevelType) || (type == GrayscaleType))
@@ -894,7 +894,7 @@
type=UndefinedType;
if ((type != BilevelType) && (type != GrayscaleType))
break;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
}
sync=SyncAuthenticPixels(image,exception);
@@ -1020,7 +1020,7 @@
p=PushCharPixel(p,&pixel);
SetPixelAlpha(image,ScaleAnyToQuantum(pixel,range),q);
}
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
}
else
@@ -1040,7 +1040,7 @@
p=PushShortPixel(MSBEndian,p,&pixel);
SetPixelAlpha(image,ScaleAnyToQuantum(pixel,range),q);
}
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
}
break;
@@ -1069,7 +1069,7 @@
p=PushCharPixel(p,&pixel);
SetPixelAlpha(image,ScaleAnyToQuantum(pixel,range),q);
}
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
}
else
@@ -1093,7 +1093,7 @@
p=PushShortPixel(MSBEndian,p,&pixel);
SetPixelAlpha(image,ScaleAnyToQuantum(pixel,range),q);
}
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
}
break;
@@ -1119,7 +1119,7 @@
p=PushCharPixel(p,&pixel);
SetPixelAlpha(image,ScaleAnyToQuantum(pixel,range),q);
}
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
}
else
@@ -1141,7 +1141,7 @@
p=PushShortPixel(MSBEndian,p,&pixel);
SetPixelAlpha(image,ScaleAnyToQuantum(pixel,range),q);
}
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
}
break;
@@ -1645,7 +1645,7 @@
(void) WriteBlob(image,q-pixels,pixels);
q=pixels;
}
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
if (image->previous == (Image *) NULL)
{
@@ -1704,7 +1704,7 @@
(void) WriteBlob(image,q-pixels,pixels);
q=pixels;
}
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
if (image->previous == (Image *) NULL)
{
@@ -1766,7 +1766,7 @@
(void) WriteBlob(image,q-pixels,pixels);
q=pixels;
}
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
if (image->previous == (Image *) NULL)
{
@@ -1868,7 +1868,7 @@
pixel=ScaleQuantumToAny(GetPixelRed(image,p),range);
}
q=PopCharPixel((unsigned char) pixel,q);
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
else
for (x=0; x < (ssize_t) image->columns; x++)
@@ -1883,7 +1883,7 @@
pixel=ScaleQuantumToAny(GetPixelRed(image,p),range);
}
q=PopShortPixel(MSBEndian,(unsigned short) pixel,q);
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
extent=(size_t) (q-pixels);
}
@@ -1946,7 +1946,7 @@
q=PopCharPixel((unsigned char) pixel,q);
pixel=ScaleQuantumToAny(GetPixelBlue(image,p),range);
q=PopCharPixel((unsigned char) pixel,q);
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
else
for (x=0; x < (ssize_t) image->columns; x++)
@@ -1957,7 +1957,7 @@
q=PopShortPixel(MSBEndian,(unsigned short) pixel,q);
pixel=ScaleQuantumToAny(GetPixelBlue(image,p),range);
q=PopShortPixel(MSBEndian,(unsigned short) pixel,q);
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
extent=(size_t) (q-pixels);
}
@@ -2021,7 +2021,7 @@
GetPixelAlpha(image,p),range);
q=PopCharPixel((unsigned char) pixel,q);
}
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
else
for (x=0; x < (ssize_t) image->columns; x++)
@@ -2034,7 +2034,7 @@
GetPixelAlpha(image,p),range);
q=PopShortPixel(MSBEndian,(unsigned short) pixel,q);
}
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
break;
}
@@ -2057,7 +2057,7 @@
pixel=ScaleQuantumToAny(GetPixelAlpha(image,p),range);
q=PopCharPixel((unsigned char) pixel,q);
}
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
else
for (x=0; x < (ssize_t) image->columns; x++)
@@ -2075,7 +2075,7 @@
pixel=ScaleQuantumToAny(GetPixelAlpha(image,p),range);
q=PopShortPixel(MSBEndian,(unsigned short) pixel,q);
}
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
break;
}
@@ -2095,7 +2095,7 @@
pixel=ScaleQuantumToAny(GetPixelAlpha(image,p),range);
q=PopCharPixel((unsigned char) pixel,q);
}
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
else
for (x=0; x < (ssize_t) image->columns; x++)
@@ -2111,7 +2111,7 @@
pixel=ScaleQuantumToAny(GetPixelAlpha(image,p),range);
q=PopShortPixel(MSBEndian,(unsigned short) pixel,q);
}
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
break;
}
diff --git a/coders/ps.c b/coders/ps.c
index 7ce244e..9ea57be 100644
--- a/coders/ps.c
+++ b/coders/ps.c
@@ -1769,7 +1769,7 @@
(void) WriteBlob(image,q-pixels,pixels);
q=pixels;
}
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
if (image->previous == (Image *) NULL)
{
@@ -1828,7 +1828,7 @@
bit=0;
byte=0;
}
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
if (bit != 0)
{
@@ -1906,7 +1906,7 @@
length=0;
}
GetPixelPacket(image,p,&pixel);
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
WriteRunlengthPacket(image,pixel,length,p);
if ((q-pixels+10) >= 80)
@@ -1967,7 +1967,7 @@
(void) WriteBlob(image,q-pixels,pixels);
q=pixels;
}
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
if (image->previous == (Image *) NULL)
{
@@ -2054,7 +2054,7 @@
pixel.green=GetPixelGreen(image,p);
pixel.blue=GetPixelBlue(image,p);
pixel.alpha=GetPixelAlpha(image,p);
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
q=PopHexPixel(hex_digits,(size_t) index,q);
q=PopHexPixel(hex_digits,(size_t)
@@ -2096,7 +2096,7 @@
(void) WriteBlob(image,q-pixels,pixels);
q=pixels;
}
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
if (image->previous == (Image *) NULL)
{
diff --git a/coders/ps2.c b/coders/ps2.c
index 1190dd9..ae734eb 100644
--- a/coders/ps2.c
+++ b/coders/ps2.c
@@ -785,7 +785,7 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
*q++=ScaleQuantumToChar(GetPixelIntensity(image,p));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
progress=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
image->rows);
@@ -821,7 +821,7 @@
{
Ascii85Encode(image,ScaleQuantumToChar(
GetPixelIntensity(image,p)));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
progress=SetImageProgress(image,SaveImageTag,(MagickOffsetType)
y,image->rows);
@@ -902,7 +902,7 @@
*q++=ScaleQuantumToChar(GetPixelBlue(image,p));
*q++=ScaleQuantumToChar(GetPixelBlack(image,p));
}
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
progress=SetImageProgress(image,SaveImageTag,(MagickOffsetType)
y,image->rows);
@@ -967,7 +967,7 @@
Ascii85Encode(image,ScaleQuantumToChar(
GetPixelBlack(image,p)));
}
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
progress=SetImageProgress(image,SaveImageTag,(MagickOffsetType)
y,image->rows);
@@ -1032,7 +1032,7 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
*q++=(unsigned char) GetPixelIndex(image,p);
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
progress=SetImageProgress(image,SaveImageTag,(MagickOffsetType)
y,image->rows);
@@ -1067,7 +1067,7 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
Ascii85Encode(image,(unsigned char) GetPixelIndex(image,p));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
progress=SetImageProgress(image,SaveImageTag,(MagickOffsetType)
y,image->rows);
diff --git a/coders/ps3.c b/coders/ps3.c
index 84c10c8..e009f90 100644
--- a/coders/ps3.c
+++ b/coders/ps3.c
@@ -272,7 +272,7 @@
*q++=ScaleQuantumToChar(GetPixelRed(image,p));
*q++=ScaleQuantumToChar(GetPixelGreen(image,p));
*q++=ScaleQuantumToChar(GetPixelBlue(image,p));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
else
for (x=0; x < (ssize_t) image->columns; x++)
@@ -281,7 +281,7 @@
*q++=ScaleQuantumToChar(GetPixelGreen(image,p));
*q++=ScaleQuantumToChar(GetPixelBlue(image,p));
*q++=ScaleQuantumToChar(GetPixelBlack(image,p));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
if (image->previous == (Image *) NULL)
{
@@ -343,7 +343,7 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
*q++=ScaleQuantumToChar(GetPixelIntensity(image,p));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
else
{
@@ -360,7 +360,7 @@
*q++=code;
code='\0';
}
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
@@ -409,7 +409,7 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
*q++=(unsigned char) GetPixelIndex(image,p);
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
if (image->previous == (Image *) NULL)
{
@@ -515,9 +515,9 @@
mask_image=CloneImage(image,0,0,MagickTrue,&image->exception);
if (mask_image == (Image *) NULL)
ThrowWriterException(CoderError,image->exception.reason);
- PushPixelComponentMap(mask_image,AlphaChannel);
+ PushPixelChannelMap(mask_image,AlphaChannel);
status=SeparateImage(mask_image);
- PopPixelComponentMap(mask_image);
+ PopPixelChannelMap(mask_image);
if (status == MagickFalse)
{
mask_image=DestroyImage(mask_image);
diff --git a/coders/psd.c b/coders/psd.c
index e5fa83d..6b3e793 100644
--- a/coders/psd.c
+++ b/coders/psd.c
@@ -669,7 +669,7 @@
(0x01 << (7-bit))) != 0 ? 0 : 255,q);
SetPixelPacket(image,image->colormap+(ssize_t)
GetPixelIndex(image,q),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
x++;
}
q--;
@@ -712,7 +712,7 @@
default:
break;
}
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -1317,7 +1317,7 @@
SetPixelAlpha(layer_info[i].image,(Quantum)
(QuantumScale*(GetPixelAlpha(layer_info[i].image,q))*
layer_info[i].opacity),q);
- q+=GetPixelComponents(layer_info[i].image);
+ q+=GetPixelChannels(layer_info[i].image);
}
if (SyncAuthenticPixels(layer_info[i].image,exception) == MagickFalse)
break;
diff --git a/coders/raw.c b/coders/raw.c
index 30cb258..5fd602b 100644
--- a/coders/raw.c
+++ b/coders/raw.c
@@ -225,8 +225,8 @@
SetPixelRed(image,GetPixelRed(canvas_image,p),q);
SetPixelGreen(image,GetPixelGreen(canvas_image,p),q);
SetPixelBlue(image,GetPixelBlue(canvas_image,p),q);
- p+=GetPixelComponents(canvas_image);
- q+=GetPixelComponents(image);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
diff --git a/coders/rgb.c b/coders/rgb.c
index 14bf485..8f9e990 100644
--- a/coders/rgb.c
+++ b/coders/rgb.c
@@ -258,8 +258,8 @@
SetPixelAlpha(image,OpaqueAlpha,q);
if (image->matte != MagickFalse)
SetPixelAlpha(image,GetPixelAlpha(canvas_image,p),q);
- p+=GetPixelComponents(canvas_image);
- q+=GetPixelComponents(image);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -366,8 +366,8 @@
default:
break;
}
- p+=GetPixelComponents(canvas_image);
- q+=GetPixelComponents(image);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -432,8 +432,8 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
SetPixelRed(image,GetPixelRed(canvas_image,p),q);
- p+=GetPixelComponents(canvas_image);
- q+=GetPixelComponents(image);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -485,8 +485,8 @@
{
SetPixelGreen(image,
GetPixelGreen(canvas_image,p),q);
- p+=GetPixelComponents(canvas_image);
- q+=GetPixelComponents(image);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -538,8 +538,8 @@
{
SetPixelBlue(image,
GetPixelBlue(canvas_image,p),q);
- p+=GetPixelComponents(canvas_image);
- q+=GetPixelComponents(image);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -600,8 +600,8 @@
{
SetPixelAlpha(image,
GetPixelAlpha(canvas_image,p),q);
- p+=GetPixelComponents(canvas_image);
- q+=GetPixelComponents(image);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -687,8 +687,8 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
SetPixelRed(image,GetPixelRed(canvas_image,p),q);
- p+=GetPixelComponents(canvas_image);
- q+=GetPixelComponents(image);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -759,8 +759,8 @@
{
SetPixelGreen(image,
GetPixelGreen(canvas_image,p),q);
- p+=GetPixelComponents(canvas_image);
- q+=GetPixelComponents(image);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -831,8 +831,8 @@
{
SetPixelBlue(image,
GetPixelBlue(canvas_image,p),q);
- p+=GetPixelComponents(canvas_image);
- q+=GetPixelComponents(image);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -905,8 +905,8 @@
{
SetPixelAlpha(image,
GetPixelAlpha(canvas_image,p),q);
- p+=GetPixelComponents(canvas_image);
- q+=GetPixelComponents(image);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
diff --git a/coders/rle.c b/coders/rle.c
index 0b3b074..c2fecd9 100644
--- a/coders/rle.c
+++ b/coders/rle.c
@@ -447,7 +447,7 @@
SetPixelBlue(image,ScaleCharToQuantum(*p++),q);
if (image->matte != MagickFalse)
SetPixelAlpha(image,ScaleCharToQuantum(*p++),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -503,7 +503,7 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
SetPixelIndex(image,*p++,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -533,7 +533,7 @@
SetPixelGreen(image,image->colormap[*p++].green,q);
SetPixelBlue(image,image->colormap[*p++].blue,q);
SetPixelAlpha(image,ScaleCharToQuantum(*p++),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
diff --git a/coders/sct.c b/coders/sct.c
index bc12048..ad2f66e 100644
--- a/coders/sct.c
+++ b/coders/sct.c
@@ -262,7 +262,7 @@
break;
}
}
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
diff --git a/coders/sgi.c b/coders/sgi.c
index 327c23c..c72b488 100644
--- a/coders/sgi.c
+++ b/coders/sgi.c
@@ -562,7 +562,7 @@
SetPixelAlpha(image,ScaleShortToQuantum((unsigned short)
((*(p+6) << 8) | (*(p+7)))),q);
p+=8;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -591,7 +591,7 @@
if (image->matte != MagickFalse)
SetPixelAlpha(image,ScaleCharToQuantum(*(p+3)),q);
p+=4;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -628,7 +628,7 @@
quantum|=(*(p+1));
SetPixelIndex(image,quantum,q);
p+=8;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -652,7 +652,7 @@
{
SetPixelIndex(image,*p,q);
p+=4;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -986,7 +986,7 @@
*q++=ScaleQuantumToChar(GetPixelGreen(image,p));
*q++=ScaleQuantumToChar(GetPixelBlue(image,p));
*q++=ScaleQuantumToChar(GetPixelAlpha(image,p));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
else
for (x=0; x < (ssize_t) image->columns; x++)
@@ -1000,7 +1000,7 @@
*q++=ScaleQuantumToShort(GetPixelGreen(image,p));
*q++=ScaleQuantumToShort(GetPixelBlue(image,p));
*q++=ScaleQuantumToShort(GetPixelAlpha(image,p));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
if (image->previous == (Image *) NULL)
{
diff --git a/coders/sun.c b/coders/sun.c
index 8ca8a4f..b020379 100644
--- a/coders/sun.c
+++ b/coders/sun.c
@@ -448,7 +448,7 @@
for (bit=7; bit >= 0; bit--)
{
SetPixelIndex(image,((*p) & (0x01 << bit) ? 0x00 : 0x01),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
p++;
}
@@ -457,7 +457,7 @@
for (bit=7; bit >= (ssize_t) (8-(image->columns % 8)); bit--)
{
SetPixelIndex(image,(*p) & (0x01 << bit) ? 0x00 : 0x01,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
p++;
}
@@ -489,7 +489,7 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
SetPixelIndex(image,*p++,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if ((image->columns % 2) != 0)
p++;
@@ -548,7 +548,7 @@
SetPixelBlue(image,image->colormap[(ssize_t)
GetPixelBlue(image,q)].blue,q);
}
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (((bytes_per_pixel*image->columns) % 2) != 0)
p++;
@@ -858,7 +858,7 @@
*q++=ScaleQuantumToChar(GetPixelRed(image,p));
*q++=ScaleQuantumToChar(GetPixelGreen(image,p));
*q++=ScaleQuantumToChar(GetPixelBlue(image,p));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
if (((bytes_per_pixel*image->columns) & 0x01) != 0)
*q++='\0'; /* pad scanline */
@@ -903,7 +903,7 @@
bit=0;
byte=0;
}
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
if (bit != 0)
(void) WriteBlobByte(image,(unsigned char) (byte << (8-bit)));
@@ -945,7 +945,7 @@
{
(void) WriteBlobByte(image,(unsigned char)
GetPixelIndex(image,p));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
if (image->columns & 0x01)
(void) WriteBlobByte(image,0); /* pad scanline */
diff --git a/coders/svg.c b/coders/svg.c
index 984ebc4..8a60045 100644
--- a/coders/svg.c
+++ b/coders/svg.c
@@ -2938,7 +2938,7 @@
#endif
CompositePixelOver(image,&fill_color,fill_color.alpha,q,
(MagickRealType) GetPixelAlpha(image,q),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -3351,7 +3351,7 @@
trace->bitmap[i++]=GetPixelGreen(image,p);
trace->bitmap[i++]=GetPixelBlue(image,p);
}
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
splines=at_splines_new_full(trace,fitting_options,NULL,NULL,NULL,NULL,NULL,
@@ -3400,7 +3400,7 @@
" <circle cx=\"%.20g\" cy=\"%.20g\" r=\"1\" fill=\"%s\"/>\n",
(double) x,(double) y,tuple);
(void) WriteBlobString(image,message);
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
(void) WriteBlobString(image,"</svg>\n");
diff --git a/coders/tga.c b/coders/tga.c
index a6e6592..90ce761 100644
--- a/coders/tga.c
+++ b/coders/tga.c
@@ -446,7 +446,7 @@
SetPixelBlue(image,pixel.blue,q);
if (image->matte != MagickFalse)
SetPixelAlpha(image,pixel.alpha,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (((unsigned char) (tga_info.attributes & 0xc0) >> 6) == 4)
offset+=4;
@@ -791,7 +791,7 @@
if (image->matte != MagickFalse)
*q++=(unsigned char) ScaleQuantumToChar(GetPixelAlpha(image,p));
}
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
(void) WriteBlob(image,(size_t) (q-targa_pixels),targa_pixels);
if (image->previous == (Image *) NULL)
diff --git a/coders/tiff.c b/coders/tiff.c
index d48b0c2..ea73e3b 100644
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -1414,7 +1414,7 @@
SetPixelAlpha(image,ScaleCharToQuantum((unsigned char)
(TIFFGetA(*p))),q);
p++;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -1506,7 +1506,7 @@
SetPixelAlpha(image,ScaleCharToQuantum((unsigned char)
TIFFGetA(*p)),q);
p++;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
else
for (column=columns_remaining; column > 0; column--)
@@ -1518,10 +1518,10 @@
SetPixelBlue(image,ScaleCharToQuantum((unsigned char)
TIFFGetB(*p)),q);
p++;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
p+=columns-columns_remaining;
- q-=GetPixelComponents(image)*(image->columns+columns_remaining);
+ q-=GetPixelChannels(image)*(image->columns+columns_remaining);
}
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -1580,7 +1580,7 @@
q=QueueAuthenticPixels(image,0,y,image->columns,1,exception);
if (q == (const Quantum *) NULL)
break;
- q+=GetPixelComponents(image)*(image->columns-1);
+ q+=GetPixelChannels(image)*(image->columns-1);
for (x=0; x < (ssize_t) image->columns; x++)
{
SetPixelRed(image,ScaleCharToQuantum((unsigned char)
@@ -1593,7 +1593,7 @@
SetPixelAlpha(image,ScaleCharToQuantum((unsigned char)
TIFFGetA(*p)),q);
p--;
- q-=GetPixelComponents(image);;
+ q-=GetPixelChannels(image);;
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
diff --git a/coders/tim.c b/coders/tim.c
index 3c02c02..d68a947 100644
--- a/coders/tim.c
+++ b/coders/tim.c
@@ -262,16 +262,16 @@
for (x=0; x < ((ssize_t) image->columns-1); x+=2)
{
SetPixelIndex(image,(*p) & 0x0f,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
SetPixelIndex(image,(*p >> 4) & 0x0f,q);
p++;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if ((image->columns % 2) != 0)
{
SetPixelIndex(image,(*p >> 4) & 0x0f,q);
p++;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -299,7 +299,7 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
SetPixelIndex(image,*p++,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -334,7 +334,7 @@
(1UL*word >> 5) & 0x1f)),q);
SetPixelRed(image,ScaleCharToQuantum(ScaleColor5to8(
(1UL*word >> 0) & 0x1f)),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -364,7 +364,7 @@
SetPixelRed(image,ScaleCharToQuantum(*p++),q);
SetPixelGreen(image,ScaleCharToQuantum(*p++),q);
SetPixelBlue(image,ScaleCharToQuantum(*p++),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
diff --git a/coders/ttf.c b/coders/ttf.c
index c2d705e..c054e2d 100644
--- a/coders/ttf.c
+++ b/coders/ttf.c
@@ -238,7 +238,7 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
SetPixelPacket(image,&background_color,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
diff --git a/coders/txt.c b/coders/txt.c
index 5f91914..3a7d090 100644
--- a/coders/txt.c
+++ b/coders/txt.c
@@ -651,7 +651,7 @@
(void) FormatLocaleString(buffer,MaxTextExtent,
"# ImageMagick pixel enumeration: %.20g,%.20g,%.20g,%s\n",(double)
image->columns,(double) image->rows,(double)
- ((MagickOffsetType) GetQuantumRange(image->depth)),colorspace);
+ GetQuantumRange(image->depth),colorspace);
(void) WriteBlobString(image,buffer);
GetPixelInfo(image,&pixel);
for (y=0; y < (ssize_t) image->rows; y++)
@@ -666,24 +666,24 @@
(void) WriteBlobString(image,buffer);
SetPixelInfo(image,p,&pixel);
(void) CopyMagickString(tuple,"(",MaxTextExtent);
- ConcatenateColorComponent(&pixel,RedPixelComponent,X11Compliance,
+ ConcatenateColorComponent(&pixel,RedPixelChannel,X11Compliance,
tuple);
(void) ConcatenateMagickString(tuple,",",MaxTextExtent);
- ConcatenateColorComponent(&pixel,GreenPixelComponent,X11Compliance,
+ ConcatenateColorComponent(&pixel,GreenPixelChannel,X11Compliance,
tuple);
(void) ConcatenateMagickString(tuple,",",MaxTextExtent);
- ConcatenateColorComponent(&pixel,BluePixelComponent,X11Compliance,
+ ConcatenateColorComponent(&pixel,BluePixelChannel,X11Compliance,
tuple);
if (pixel.colorspace == CMYKColorspace)
{
(void) ConcatenateMagickString(tuple,",",MaxTextExtent);
- ConcatenateColorComponent(&pixel,BlackPixelComponent,X11Compliance,
+ ConcatenateColorComponent(&pixel,BlackPixelChannel,X11Compliance,
tuple);
}
if (pixel.matte != MagickFalse)
{
(void) ConcatenateMagickString(tuple,",",MaxTextExtent);
- ConcatenateColorComponent(&pixel,AlphaPixelComponent,X11Compliance,
+ ConcatenateColorComponent(&pixel,AlphaPixelChannel,X11Compliance,
tuple);
}
(void) ConcatenateMagickString(tuple,")",MaxTextExtent);
@@ -697,7 +697,7 @@
&image->exception);
(void) WriteBlobString(image,tuple);
(void) WriteBlobString(image,"\n");
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
image->rows);
diff --git a/coders/uil.c b/coders/uil.c
index 4e48f6e..da10b53 100644
--- a/coders/uil.c
+++ b/coders/uil.c
@@ -251,7 +251,7 @@
if (matte_image[i] != 0)
transparent=MagickTrue;
i++;
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
}
@@ -273,7 +273,7 @@
if (matte_image[i] != 0)
SetPixelIndex(image,image->colors,q);
p++;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
}
}
@@ -360,7 +360,7 @@
symbol[j]='\0';
(void) CopyMagickString(buffer,symbol,MaxTextExtent);
(void) WriteBlobString(image,buffer);
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
(void) FormatLocaleString(buffer,MaxTextExtent,"\"%s\n",
(y == (ssize_t) (image->rows-1) ? ");" : ","));
diff --git a/coders/uyvy.c b/coders/uyvy.c
index d0b799c..e74297b 100644
--- a/coders/uyvy.c
+++ b/coders/uyvy.c
@@ -162,11 +162,11 @@
SetPixelRed(image,ScaleCharToQuantum(y1),q);
SetPixelGreen(image,ScaleCharToQuantum(u),q);
SetPixelBlue(image,ScaleCharToQuantum(v),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
SetPixelRed(image,ScaleCharToQuantum(y2),q);
SetPixelGreen(image,ScaleCharToQuantum(u),q);
SetPixelBlue(image,ScaleCharToQuantum(v),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -351,7 +351,7 @@
pixel.green=(double) GetPixelGreen(uyvy_image,p);
pixel.blue=(double) GetPixelBlue(uyvy_image,p);
full=full == MagickFalse ? MagickTrue : MagickFalse;
- p+=GetPixelComponents(uyvy_image);
+ p+=GetPixelChannels(uyvy_image);
}
status=SetImageProgress(image,LoadImageTag,(MagickOffsetType) y,
image->rows);
diff --git a/coders/viff.c b/coders/viff.c
index 7463941..a4fae9d 100644
--- a/coders/viff.c
+++ b/coders/viff.c
@@ -632,7 +632,7 @@
quantum|=0x01;
SetPixelIndex(image,quantum,q);
}
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
p++;
}
@@ -644,7 +644,7 @@
quantum=(size_t) GetPixelIndex(image,q);
quantum|=0x01;
SetPixelIndex(image,quantum,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
p++;
}
@@ -669,7 +669,7 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
SetPixelIndex(image,*p++,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -709,7 +709,7 @@
SetPixelAlpha(image,image->matte != MagickFalse ?
ScaleCharToQuantum(*(p+number_pixels*3)) : OpaqueAlpha,q);
p++;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -1104,7 +1104,7 @@
if (image->matte != MagickFalse)
*(q+number_pixels*3)=ScaleQuantumToChar((Quantum)
(GetPixelAlpha(image,p)));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
q++;
}
if (image->previous == (Image *) NULL)
@@ -1150,7 +1150,7 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
*q++=(unsigned char) GetPixelIndex(image,p);
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
if (image->previous == (Image *) NULL)
{
@@ -1196,7 +1196,7 @@
bit=0;
byte=0;
}
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
if (bit != 0)
*q++=byte >> (8-bit);
@@ -1223,7 +1223,7 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
*q++=(unsigned char) GetPixelIntensity(image,p);
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
if (image->previous == (Image *) NULL)
{
diff --git a/coders/wbmp.c b/coders/wbmp.c
index 4464c19..5330f5f 100644
--- a/coders/wbmp.c
+++ b/coders/wbmp.c
@@ -203,7 +203,7 @@
bit++;
if (bit == 8)
bit=0;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -401,7 +401,7 @@
bit=0;
byte=0;
}
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
if (bit != 0)
(void) WriteBlobByte(image,byte);
diff --git a/coders/webp.c b/coders/webp.c
index dc4d595..57b07a2 100644
--- a/coders/webp.c
+++ b/coders/webp.c
@@ -177,7 +177,7 @@
SetPixelAlpha(image,ScaleCharToQuantum(*p++),q);
if (GetPixelAlpha(image,q) != OpaqueAlpha)
image->matte=MagickTrue;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -378,7 +378,7 @@
if (image->matte != MagickFalse)
*q++=ScaleQuantumToChar((Quantum) (image->matte != MagickFalse ?
GetPixelAlpha(image,p) : OpaqueAlpha));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
status=SetImageProgress(image,SaveImageTag,(MagickOffsetType) y,
image->rows);
diff --git a/coders/wpg.c b/coders/wpg.c
index 02c83da..48587e0 100644
--- a/coders/wpg.c
+++ b/coders/wpg.c
@@ -295,7 +295,7 @@
index=((*p) & (0x80 >> bit) ? 0x01 : 0x00);
SetPixelIndex(image,index,q);
SetPixelPacket(image,image->colormap+(ssize_t) index,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
p++;
}
@@ -306,7 +306,7 @@
index=((*p) & (0x80 >> bit) ? 0x01 : 0x00);
SetPixelIndex(image,index,q);
SetPixelPacket(image,image->colormap+(ssize_t) index,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
p++;
}
@@ -324,41 +324,41 @@
index=ConstrainColormapIndex(image,(*p >> 6) & 0x3);
SetPixelIndex(image,index,q);
SetPixelPacket(image,image->colormap+(ssize_t) index,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
index=ConstrainColormapIndex(image,(*p >> 4) & 0x3);
SetPixelIndex(image,index,q);
SetPixelPacket(image,image->colormap+(ssize_t) index,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
index=ConstrainColormapIndex(image,(*p >> 2) & 0x3);
SetPixelIndex(image,index,q);
SetPixelPacket(image,image->colormap+(ssize_t) index,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
index=ConstrainColormapIndex(image,(*p) & 0x3);
SetPixelIndex(image,index,q);
SetPixelPacket(image,image->colormap+(ssize_t) index,q);
p++;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if ((image->columns % 4) != 0)
{
index=ConstrainColormapIndex(image,(*p >> 6) & 0x3);
SetPixelIndex(image,index,q);
SetPixelPacket(image,image->colormap+(ssize_t) index,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
if ((image->columns % 4) >= 1)
{
index=ConstrainColormapIndex(image,(*p >> 4) & 0x3);
SetPixelIndex(image,index,q);
SetPixelPacket(image,image->colormap+(ssize_t) index,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
if ((image->columns % 4) >= 2)
{
index=ConstrainColormapIndex(image,(*p >> 2) & 0x3);
SetPixelIndex(image,index,q);
SetPixelPacket(image,image->colormap+(ssize_t) index,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
}
p++;
@@ -378,12 +378,12 @@
index=ConstrainColormapIndex(image,(*p >> 4) & 0x0f);
SetPixelIndex(image,index,q);
SetPixelPacket(image,image->colormap+(ssize_t) index,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
index=ConstrainColormapIndex(image,(*p) & 0x0f);
SetPixelIndex(image,index,q);
SetPixelPacket(image,image->colormap+(ssize_t) index,q);
p++;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if ((image->columns % 2) != 0)
{
@@ -391,7 +391,7 @@
SetPixelIndex(image,index,q);
SetPixelPacket(image,image->colormap+(ssize_t) index,q);
p++;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -408,7 +408,7 @@
SetPixelIndex(image,index,q);
SetPixelPacket(image,image->colormap+(ssize_t) index,q);
p++;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -424,7 +424,7 @@
SetPixelRed(image,ScaleCharToQuantum(*p++),q);
SetPixelGreen(image,ScaleCharToQuantum(*p++),q);
SetPixelBlue(image,ScaleCharToQuantum(*p++),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (!SyncAuthenticPixels(image,exception))
break;
diff --git a/coders/xbm.c b/coders/xbm.c
index 93a939f..8e0c5fe 100644
--- a/coders/xbm.c
+++ b/coders/xbm.c
@@ -366,7 +366,7 @@
byte>>=1;
if (bit == 8)
bit=0;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -562,7 +562,7 @@
bit=0;
byte=0;
}
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
if (bit != 0)
{
diff --git a/coders/xc.c b/coders/xc.c
index 15ca73d..82a6483 100644
--- a/coders/xc.c
+++ b/coders/xc.c
@@ -147,7 +147,7 @@
SetPixelPacket(image,&pixel,q);
if (image->colorspace == CMYKColorspace)
SetPixelBlack(image,pixel.black,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
diff --git a/coders/xcf.c b/coders/xcf.c
index 562bb07..26bc193 100644
--- a/coders/xcf.c
+++ b/coders/xcf.c
@@ -381,7 +381,7 @@
SetPixelAlpha(tile_image,ScaleCharToQuantum((unsigned char)
inLayerInfo->alpha),q);
graydata++;
- q+=GetPixelComponents(tile_image);
+ q+=GetPixelChannels(tile_image);
}
}
else
@@ -395,7 +395,7 @@
SetPixelAlpha(tile_image,xcfdata->alpha == 0U ? OpaqueAlpha :
ScaleCharToQuantum((unsigned char) inLayerInfo->alpha),q);
xcfdata++;
- q+=GetPixelComponents(tile_image);
+ q+=GetPixelChannels(tile_image);
}
}
if (SyncAuthenticPixels(tile_image,exception) == MagickFalse)
@@ -509,7 +509,7 @@
break;
}
}
- q+=GetPixelComponents(tile_image);
+ q+=GetPixelChannels(tile_image);
}
}
else
@@ -569,7 +569,7 @@
break;
}
}
- q+=GetPixelComponents(tile_image);
+ q+=GetPixelChannels(tile_image);
}
}
}
diff --git a/coders/xpm.c b/coders/xpm.c
index a4011b1..d13703c 100644
--- a/coders/xpm.c
+++ b/coders/xpm.c
@@ -407,7 +407,7 @@
SetPixelIndex(image,j,r);
SetPixelPacket(image,image->colormap+j,r);
p+=width;
- r+=GetPixelComponents(image);
+ r+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -683,7 +683,7 @@
transparent=MagickTrue;
else
SetPixelAlpha(picon,OpaqueAlpha,q);
- q+=GetPixelComponents(picon);
+ q+=GetPixelChannels(picon);
}
if (SyncAuthenticPixels(picon,exception) == MagickFalse)
break;
@@ -708,7 +708,7 @@
{
if (GetPixelAlpha(image,q) == (Quantum) TransparentAlpha)
SetPixelIndex(picon,picon->colors,q);
- q+=GetPixelComponents(picon);
+ q+=GetPixelChannels(picon);
}
if (SyncAuthenticPixels(picon,exception) == MagickFalse)
break;
@@ -787,7 +787,7 @@
symbol[j]='\0';
(void) CopyMagickString(buffer,symbol,MaxTextExtent);
(void) WriteBlobString(image,buffer);
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
(void) FormatLocaleString(buffer,MaxTextExtent,"\"%s\n",
y == (ssize_t) (picon->rows-1) ? "" : ",");
@@ -1015,7 +1015,7 @@
symbol[j]='\0';
(void) CopyMagickString(buffer,symbol,MaxTextExtent);
(void) WriteBlobString(image,buffer);
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
(void) FormatLocaleString(buffer,MaxTextExtent,"\"%s\n",
(y == (ssize_t) (image->rows-1) ? "" : ","));
diff --git a/coders/xwd.c b/coders/xwd.c
index 48776be..3223e46 100644
--- a/coders/xwd.c
+++ b/coders/xwd.c
@@ -412,7 +412,7 @@
index=(Quantum) ((pixel >> blue_shift) & blue_mask);
SetPixelBlue(image,ScaleShortToQuantum(
colors[(ssize_t) index].blue),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -442,7 +442,7 @@
color=(color*65535UL)/blue_mask;
SetPixelBlue(image,ScaleShortToQuantum((unsigned short)
color),q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -477,7 +477,7 @@
(int) y));
SetPixelIndex(image,index,q);
SetPixelPacket(image,image->colormap+(ssize_t) index,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -765,7 +765,7 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
*q++=(unsigned char) GetPixelIndex(image,p);
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
}
else
@@ -774,7 +774,7 @@
*q++=ScaleQuantumToChar(GetPixelRed(image,p));
*q++=ScaleQuantumToChar(GetPixelGreen(image,p));
*q++=ScaleQuantumToChar(GetPixelBlue(image,p));
- p+=GetPixelComponents(image);
+ p+=GetPixelChannels(image);
}
for (x=0; x < (ssize_t) scanline_pad; x++)
*q++='\0';
diff --git a/coders/ycbcr.c b/coders/ycbcr.c
index f156d37..305291d 100644
--- a/coders/ycbcr.c
+++ b/coders/ycbcr.c
@@ -249,8 +249,8 @@
SetPixelBlue(image,GetPixelBlue(canvas_image,p),q);
if (image->matte != MagickFalse)
SetPixelAlpha(image,GetPixelAlpha(canvas_image,p),q);
- p+=GetPixelComponents(canvas_image);
- q+=GetPixelComponents(image);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -341,8 +341,8 @@
default:
break;
}
- p+=GetPixelComponents(canvas_image);
- q+=GetPixelComponents(image);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -398,8 +398,8 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
SetPixelRed(image,GetPixelRed(canvas_image,p),q);
- p+=GetPixelComponents(canvas_image);
- q+=GetPixelComponents(image);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -441,8 +441,8 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
SetPixelGreen(image,GetPixelGreen(canvas_image,p),q);
- p+=GetPixelComponents(canvas_image);
- q+=GetPixelComponents(image);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -484,8 +484,8 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
SetPixelBlue(image,GetPixelBlue(canvas_image,p),q);
- p+=GetPixelComponents(canvas_image);
- q+=GetPixelComponents(image);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -530,8 +530,8 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
SetPixelAlpha(image,GetPixelAlpha(canvas_image,p),q);
- p+=GetPixelComponents(canvas_image);
- q+=GetPixelComponents(image);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -608,8 +608,8 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
SetPixelRed(image,GetPixelRed(canvas_image,p),q);
- p+=GetPixelComponents(canvas_image);
- q+=GetPixelComponents(image);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -670,8 +670,8 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
SetPixelGreen(image,GetPixelGreen(canvas_image,p),q);
- p+=GetPixelComponents(canvas_image);
- q+=GetPixelComponents(image);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -732,8 +732,8 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
SetPixelBlue(image,GetPixelBlue(canvas_image,p),q);
- p+=GetPixelComponents(canvas_image);
- q+=GetPixelComponents(image);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -797,8 +797,8 @@
for (x=0; x < (ssize_t) image->columns; x++)
{
SetPixelAlpha(image,GetPixelAlpha(canvas_image,p),q);
- p+=GetPixelComponents(canvas_image);
- q+=GetPixelComponents(image);
+ p+=GetPixelChannels(canvas_image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
diff --git a/coders/yuv.c b/coders/yuv.c
index c9177dc..5776b94 100644
--- a/coders/yuv.c
+++ b/coders/yuv.c
@@ -257,7 +257,7 @@
}
SetPixelGreen(image,0,q);
SetPixelBlue(image,0,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
SetPixelGreen(image,0,q);
SetPixelBlue(image,0,q);
if (quantum == 1)
@@ -276,7 +276,7 @@
p+=2;
}
chroma_pixels++;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
}
else
@@ -298,7 +298,7 @@
}
SetPixelGreen(image,0,q);
SetPixelBlue(image,0,q);
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
@@ -347,7 +347,7 @@
p+=2;
}
SetPixelBlue(chroma_image,0,q);
- q+=GetPixelComponents(chroma_image);
+ q+=GetPixelChannels(chroma_image);
}
if (SyncAuthenticPixels(chroma_image,exception) == MagickFalse)
break;
@@ -381,7 +381,7 @@
*(p+1)),q);
p+=2;
}
- q+=GetPixelComponents(chroma_image);
+ q+=GetPixelChannels(chroma_image);
}
if (SyncAuthenticPixels(chroma_image,exception) == MagickFalse)
break;
@@ -408,7 +408,7 @@
SetPixelGreen(image,GetPixelGreen(image,chroma_pixels),q);
SetPixelBlue(image,GetPixelBlue(image,chroma_pixels),q);
chroma_pixels++;
- q+=GetPixelComponents(image);
+ q+=GetPixelChannels(image);
}
if (SyncAuthenticPixels(image,exception) == MagickFalse)
break;
@@ -673,7 +673,7 @@
GetPixelGreen(yuv_image,s)));
(void) WriteBlobByte(image,ScaleQuantumToChar(
GetPixelRed(yuv_image,p)));
- p+=GetPixelComponents(yuv_image);
+ p+=GetPixelChannels(yuv_image);
(void) WriteBlobByte(image,ScaleQuantumToChar(
GetPixelBlue(yuv_image,s)));
(void) WriteBlobByte(image,ScaleQuantumToChar(
@@ -685,13 +685,13 @@
GetPixelGreen(yuv_image,s)));
(void) WriteBlobShort(image,ScaleQuantumToShort(
GetPixelRed(yuv_image,p)));
- p+=GetPixelComponents(yuv_image);
+ p+=GetPixelChannels(yuv_image);
(void) WriteBlobByte(image,ScaleQuantumToChar(
GetPixelBlue(yuv_image,s)));
(void) WriteBlobShort(image,ScaleQuantumToShort(
GetPixelRed(yuv_image,p)));
}
- p+=GetPixelComponents(yuv_image);
+ p+=GetPixelChannels(yuv_image);
s++;
x++;
}
@@ -724,7 +724,7 @@
else
(void) WriteBlobShort(image,ScaleQuantumToShort(
GetPixelRed(yuv_image,p)));
- p+=GetPixelComponents(yuv_image);
+ p+=GetPixelChannels(yuv_image);
}
if (image->previous == (Image *) NULL)
{
@@ -767,7 +767,7 @@
else
(void) WriteBlobShort(image,ScaleQuantumToShort(
GetPixelGreen(chroma_image,p)));
- p+=GetPixelComponents(chroma_image);
+ p+=GetPixelChannels(chroma_image);
}
}
if (image->previous == (Image *) NULL)
@@ -802,7 +802,7 @@
else
(void) WriteBlobShort(image,ScaleQuantumToShort(
GetPixelBlue(chroma_image,p)));
- p+=GetPixelComponents(chroma_image);
+ p+=GetPixelChannels(chroma_image);
}
}
if (image->previous == (Image *) NULL)
