diff --git a/MagickCore/effect.c b/MagickCore/effect.c
index d4ca019..a230214 100644
--- a/MagickCore/effect.c
+++ b/MagickCore/effect.c
@@ -344,6 +344,12 @@
break;
center=(ssize_t) GetPixelChannels(image)*(width-j)*((width-j)/2L)+
GetPixelChannels(image)*((width-j)/2L);
+ if (GetPixelMask(image,p) != 0)
+ {
+ q+=GetPixelChannels(blur_image);
+ r+=GetPixelChannels(edge_image);
+ continue;
+ }
for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
{
MagickRealType
@@ -376,8 +382,7 @@
if ((traits == UndefinedPixelTrait) ||
(blur_traits == UndefinedPixelTrait))
continue;
- if (((blur_traits & CopyPixelTrait) != 0) ||
- (GetPixelMask(image,q) != 0))
+ if ((blur_traits & CopyPixelTrait) != 0)
{
SetPixelChannel(blur_image,channel,p[center+i],q);
continue;
@@ -665,6 +670,12 @@
break;
center=(ssize_t) GetPixelChannels(image)*(width-j)*((width-j)/2L)+
GetPixelChannels(image)*((width-j)/2);
+ if (GetPixelMask(image,p) != 0)
+ {
+ q+=GetPixelChannels(sharp_image);
+ r+=GetPixelChannels(edge_image);
+ continue;
+ }
for (i=0; i < (ssize_t) GetPixelChannels(sharp_image); i++)
{
MagickRealType
@@ -697,8 +708,7 @@
if ((traits == UndefinedPixelTrait) ||
(sharp_traits == UndefinedPixelTrait))
continue;
- if (((sharp_traits & CopyPixelTrait) != 0) ||
- (GetPixelMask(image,q) != 0))
+ if ((sharp_traits & CopyPixelTrait) != 0)
{
SetPixelChannel(sharp_image,channel,p[center+i],q);
continue;
@@ -968,6 +978,12 @@
register ssize_t
i;
+ if (GetPixelMask(image,p) != 0)
+ {
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(blur_image);
+ continue;
+ }
for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
{
MagickRealType
@@ -997,8 +1013,7 @@
if ((traits == UndefinedPixelTrait) ||
(blur_traits == UndefinedPixelTrait))
continue;
- if (((blur_traits & CopyPixelTrait) != 0) ||
- (GetPixelMask(image,p) != 0))
+ if ((blur_traits & CopyPixelTrait) != 0)
{
SetPixelChannel(blur_image,channel,p[center+i],q);
continue;
@@ -1091,6 +1106,12 @@
register ssize_t
i;
+ if (GetPixelMask(image,p) != 0)
+ {
+ p+=GetPixelChannels(blur_image);
+ q+=GetPixelChannels(blur_image);
+ continue;
+ }
for (i=0; i < (ssize_t) GetPixelChannels(blur_image); i++)
{
MagickRealType
@@ -1120,8 +1141,7 @@
if ((traits == UndefinedPixelTrait) ||
(blur_traits == UndefinedPixelTrait))
continue;
- if (((blur_traits & CopyPixelTrait) != 0) ||
- (GetPixelMask(blur_image,p) != 0))
+ if ((blur_traits & CopyPixelTrait) != 0)
{
SetPixelChannel(blur_image,channel,p[center+i],q);
continue;
@@ -1957,6 +1977,12 @@
register ssize_t
i;
+ if (GetPixelMask(image,p) != 0)
+ {
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(blur_image);
+ continue;
+ }
for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
{
MagickRealType
@@ -1986,8 +2012,7 @@
if ((traits == UndefinedPixelTrait) ||
(blur_traits == UndefinedPixelTrait))
continue;
- if (((blur_traits & CopyPixelTrait) != 0) ||
- (GetPixelMask(image,p) != 0))
+ if ((blur_traits & CopyPixelTrait) != 0)
{
SetPixelChannel(blur_image,channel,p[i],q);
continue;
@@ -2752,6 +2777,12 @@
if (step >= n)
step=n-1;
}
+ if (GetPixelMask(image,p) != 0)
+ {
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(blur_image);
+ continue;
+ }
for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
{
MagickRealType
@@ -2777,8 +2808,7 @@
if ((traits == UndefinedPixelTrait) ||
(blur_traits == UndefinedPixelTrait))
continue;
- if (((blur_traits & CopyPixelTrait) != 0) ||
- (GetPixelMask(image,p) != 0))
+ if ((blur_traits & CopyPixelTrait) != 0)
{
SetPixelChannel(blur_image,channel,p[i],q);
continue;
@@ -3025,6 +3055,12 @@
register ssize_t
i;
+ if (GetPixelMask(image,p) != 0)
+ {
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(blur_image);
+ continue;
+ }
for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
{
MagickRealType
@@ -3058,8 +3094,7 @@
if ((traits == UndefinedPixelTrait) ||
(blur_traits == UndefinedPixelTrait))
continue;
- if (((blur_traits & CopyPixelTrait) != 0) ||
- (GetPixelMask(image,p) != 0))
+ if ((blur_traits & CopyPixelTrait) != 0)
{
SetPixelChannel(blur_image,channel,p[center+i],q);
continue;
@@ -3312,6 +3347,14 @@
shade=distance/sqrt((double) normal_distance);
}
}
+ if (GetPixelMask(image,p) != 0)
+ {
+ pre+=GetPixelChannels(image);
+ center+=GetPixelChannels(image);
+ post+=GetPixelChannels(image);
+ q+=GetPixelChannels(shade_image);
+ continue;
+ }
for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
{
PixelChannel
@@ -3327,8 +3370,7 @@
if ((traits == UndefinedPixelTrait) ||
(shade_traits == UndefinedPixelTrait))
continue;
- if (((shade_traits & CopyPixelTrait) != 0) ||
- (GetPixelMask(image,pre) != 0))
+ if ((shade_traits & CopyPixelTrait) != 0)
{
SetPixelChannel(shade_image,channel,center[i],q);
continue;
@@ -3724,6 +3766,12 @@
register ssize_t
i;
+ if (GetPixelMask(image,p) != 0)
+ {
+ p+=GetPixelChannels(image);
+ q+=GetPixelChannels(unsharp_image);
+ continue;
+ }
for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
{
MagickRealType
@@ -3742,8 +3790,7 @@
if ((traits == UndefinedPixelTrait) ||
(unsharp_traits == UndefinedPixelTrait))
continue;
- if (((unsharp_traits & CopyPixelTrait) != 0) ||
- (GetPixelMask(image,p) != 0))
+ if ((unsharp_traits & CopyPixelTrait) != 0)
{
SetPixelChannel(unsharp_image,channel,p[i],q);
continue;