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;