From ec9e3a668dedc70cfdf9b110af2bb470c67d3fcb Mon Sep 17 00:00:00 2001 From: cristy Date: Wed, 1 Feb 2012 02:09:32 +0000 Subject: [PATCH] --- MagickCore/enhance.c | 11 ++++------- MagickCore/fx.c | 9 ++------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/MagickCore/enhance.c b/MagickCore/enhance.c index 65bb0d6b7..d163de0cd 100644 --- a/MagickCore/enhance.c +++ b/MagickCore/enhance.c @@ -3172,11 +3172,6 @@ MagickExport MagickBooleanType NegateImage(Image *image, register ssize_t i; - if (GetPixelMask(image,q) != 0) - { - q+=GetPixelChannels(image); - continue; - } for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { PixelChannel @@ -3187,8 +3182,10 @@ MagickExport MagickBooleanType NegateImage(Image *image, channel=GetPixelChannelMapChannel(image,i); traits=GetPixelChannelMapTraits(image,channel); - if ((traits & UpdatePixelTrait) != 0) - q[i]=QuantumRange-q[i]; + if (((traits & CopyPixelTrait) != 0) || + (GetPixelMask(image,q) != 0)) + continue; + q[i]=QuantumRange-q[i]; } q+=GetPixelChannels(image); } diff --git a/MagickCore/fx.c b/MagickCore/fx.c index d0989a647..860900813 100644 --- a/MagickCore/fx.c +++ b/MagickCore/fx.c @@ -335,12 +335,6 @@ MagickExport Image *AddNoiseImage(const Image *image,const NoiseType noise_type, register ssize_t i; - if (GetPixelMask(image,p) != 0) - { - p+=GetPixelChannels(image); - q+=GetPixelChannels(noise_image); - continue; - } for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { PixelChannel @@ -356,7 +350,8 @@ MagickExport Image *AddNoiseImage(const Image *image,const NoiseType noise_type, if ((traits == UndefinedPixelTrait) || (noise_traits == UndefinedPixelTrait)) continue; - if ((noise_traits & CopyPixelTrait) != 0) + if (((noise_traits & CopyPixelTrait) != 0) || + (GetPixelMask(image,p) != 0)) { SetPixelChannel(noise_image,channel,p[i],q); continue; -- 2.40.0