From: cristy Date: Thu, 21 Mar 2013 01:30:35 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~4047 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0a9bf2a1ed518a1e70fd3bc2891684e17f0cb702;p=imagemagick --- diff --git a/MagickCore/attribute.c b/MagickCore/attribute.c index 50a30a311..76e9d9c4e 100644 --- a/MagickCore/attribute.c +++ b/MagickCore/attribute.c @@ -413,7 +413,7 @@ MagickExport size_t GetImageDepth(const Image *image,ExceptionInfo *exception) register ssize_t i; - if (GetPixelMask(image,p) != 0) + if (GetPixelMask(image,p) == 0) { p+=GetPixelChannels(image); continue; @@ -471,7 +471,7 @@ MagickExport size_t GetImageDepth(const Image *image,ExceptionInfo *exception) register ssize_t i; - if (GetPixelMask(image,p) != 0) + if (GetPixelMask(image,p) == 0) { p+=GetPixelChannels(image); continue; @@ -996,7 +996,7 @@ MagickExport MagickBooleanType SetImageDepth(Image *image, register ssize_t i; - if (GetPixelMask(image,q) != 0) + if (GetPixelMask(image,q) == 0) { q+=GetPixelChannels(image); continue; @@ -1059,7 +1059,7 @@ MagickExport MagickBooleanType SetImageDepth(Image *image, register ssize_t i; - if (GetPixelMask(image,q) != 0) + if (GetPixelMask(image,q) == 0) { q+=GetPixelChannels(image); continue; diff --git a/MagickCore/channel.c b/MagickCore/channel.c index f8c58eb36..cbd280e27 100644 --- a/MagickCore/channel.c +++ b/MagickCore/channel.c @@ -677,7 +677,7 @@ MagickExport Image *SeparateImage(const Image *image, register ssize_t i; - if (GetPixelMask(image,p) != 0) + if (GetPixelMask(image,p) == 0) { p+=GetPixelChannels(image); q+=GetPixelChannels(separate_image); diff --git a/MagickCore/compare.c b/MagickCore/compare.c index 9dc1a3aaa..192397b4f 100644 --- a/MagickCore/compare.c +++ b/MagickCore/compare.c @@ -221,7 +221,7 @@ MagickExport Image *CompareImages(Image *image,const Image *reconstruct_image, register ssize_t i; - if (GetPixelMask(image,p) != 0) + if (GetPixelMask(image,p) == 0) { SetPixelInfoPixel(highlight_image,&lowlight,r); p+=GetPixelChannels(image); @@ -385,7 +385,7 @@ static MagickBooleanType GetAbsoluteDistortion(const Image *image, register ssize_t i; - if (GetPixelMask(image,p) != 0) + if (GetPixelMask(image,p) == 0) { p+=GetPixelChannels(image); q+=GetPixelChannels(reconstruct_image); @@ -508,7 +508,7 @@ static MagickBooleanType GetFuzzDistortion(const Image *image, register ssize_t i; - if (GetPixelMask(image,p) != 0) + if (GetPixelMask(image,p) == 0) { p+=GetPixelChannels(image); q+=GetPixelChannels(reconstruct_image); @@ -608,7 +608,7 @@ static MagickBooleanType GetMeanAbsoluteDistortion(const Image *image, register ssize_t i; - if (GetPixelMask(image,p) != 0) + if (GetPixelMask(image,p) == 0) { p+=GetPixelChannels(image); q+=GetPixelChannels(reconstruct_image); @@ -701,7 +701,7 @@ static MagickBooleanType GetMeanErrorPerPixel(Image *image, register ssize_t i; - if (GetPixelMask(image,p) != 0) + if (GetPixelMask(image,p) == 0) { p+=GetPixelChannels(image); q+=GetPixelChannels(reconstruct_image); @@ -799,7 +799,7 @@ static MagickBooleanType GetMeanSquaredDistortion(const Image *image, register ssize_t i; - if (GetPixelMask(image,p) != 0) + if (GetPixelMask(image,p) == 0) { p+=GetPixelChannels(image); q+=GetPixelChannels(reconstruct_image); @@ -911,7 +911,7 @@ static MagickBooleanType GetNormalizedCrossCorrelationDistortion( register ssize_t i; - if (GetPixelMask(image,p) != 0) + if (GetPixelMask(image,p) == 0) { p+=GetPixelChannels(image); q+=GetPixelChannels(reconstruct_image); @@ -1030,7 +1030,7 @@ static MagickBooleanType GetPeakAbsoluteDistortion(const Image *image, register ssize_t i; - if (GetPixelMask(image,p) != 0) + if (GetPixelMask(image,p) == 0) { p+=GetPixelChannels(image); q+=GetPixelChannels(reconstruct_image); @@ -1439,7 +1439,7 @@ MagickExport MagickBooleanType IsImagesEqual(Image *image, register ssize_t i; - if (GetPixelMask(image,p) != 0) + if (GetPixelMask(image,p) == 0) { p+=GetPixelChannels(image); q+=GetPixelChannels(reconstruct_image); @@ -1645,7 +1645,7 @@ MagickExport Image *SimilarityImage(Image *image,const Image *reference, offset->y=y; *similarity_metric=similarity; } - if (GetPixelMask(similarity_image,q) != 0) + if (GetPixelMask(similarity_image,q) == 0) { q+=GetPixelChannels(similarity_image); continue; diff --git a/MagickCore/composite.c b/MagickCore/composite.c index d1b49b2df..c4e807ea3 100644 --- a/MagickCore/composite.c +++ b/MagickCore/composite.c @@ -431,7 +431,7 @@ static MagickBooleanType CompositeOverImage(Image *image, Sc: source color. Dc: destination color. */ - if (GetPixelMask(image,q) != 0) + if (GetPixelMask(image,q) == 0) { q+=GetPixelChannels(image); continue; @@ -457,7 +457,7 @@ static MagickBooleanType CompositeOverImage(Image *image, Sa: normalized source alpha. Da: normalized destination alpha. */ - if (GetPixelMask(composite_image,p) != 0) + if (GetPixelMask(composite_image,p) == 0) { p+=GetPixelChannels(composite_image); channels=GetPixelChannels(composite_image); @@ -647,7 +647,7 @@ MagickExport MagickBooleanType CompositeImage(Image *image, register ssize_t i; - if (GetPixelMask(composite_image,p) != 0) + if (GetPixelMask(composite_image,p) == 0) { p+=GetPixelChannels(composite_image); q+=GetPixelChannels(image); @@ -1287,7 +1287,7 @@ MagickExport MagickBooleanType CompositeImage(Image *image, */ (void) GetOneVirtualPixel(composite_image,x-x_offset,y-y_offset, source,exception); - if (GetPixelMask(image,q) != 0) + if (GetPixelMask(image,q) == 0) { q+=GetPixelChannels(image); continue; @@ -1453,7 +1453,7 @@ MagickExport MagickBooleanType CompositeImage(Image *image, break; } } - if (GetPixelMask(image,q) != 0) + if (GetPixelMask(image,q) == 0) { p+=GetPixelChannels(composite_image); q+=GetPixelChannels(image); @@ -2461,7 +2461,7 @@ MagickExport MagickBooleanType TextureImage(Image *image,const Image *texture, register ssize_t i; - if (GetPixelMask(image,q) != 0) + if (GetPixelMask(image,q) == 0) { p+=GetPixelChannels(texture_image); q+=GetPixelChannels(image); diff --git a/MagickCore/decorate.c b/MagickCore/decorate.c index 884a74228..455a6f45c 100644 --- a/MagickCore/decorate.c +++ b/MagickCore/decorate.c @@ -451,7 +451,7 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info, register ssize_t i; - if (GetPixelMask(image,q) != 0) + if (GetPixelMask(image,q) == 0) { p+=GetPixelChannels(image); q+=GetPixelChannels(frame_image); @@ -720,7 +720,7 @@ MagickExport MagickBooleanType RaiseImage(Image *image, } for (x=0; x < y; x++) { - if (GetPixelMask(image,q) != 0) + if (GetPixelMask(image,q) == 0) { q+=GetPixelChannels(image); continue; @@ -738,7 +738,7 @@ MagickExport MagickBooleanType RaiseImage(Image *image, } for ( ; x < (ssize_t) (image->columns-y); x++) { - if (GetPixelMask(image,q) != 0) + if (GetPixelMask(image,q) == 0) { q+=GetPixelChannels(image); continue; @@ -756,7 +756,7 @@ MagickExport MagickBooleanType RaiseImage(Image *image, } for ( ; x < (ssize_t) image->columns; x++) { - if (GetPixelMask(image,q) != 0) + if (GetPixelMask(image,q) == 0) { q+=GetPixelChannels(image); continue; @@ -810,7 +810,7 @@ MagickExport MagickBooleanType RaiseImage(Image *image, } for (x=0; x < (ssize_t) raise_info->width; x++) { - if (GetPixelMask(image,q) != 0) + if (GetPixelMask(image,q) == 0) { q+=GetPixelChannels(image); continue; @@ -830,7 +830,7 @@ MagickExport MagickBooleanType RaiseImage(Image *image, q+=GetPixelChannels(image); for ( ; x < (ssize_t) image->columns; x++) { - if (GetPixelMask(image,q) != 0) + if (GetPixelMask(image,q) == 0) { q+=GetPixelChannels(image); continue; @@ -884,7 +884,7 @@ MagickExport MagickBooleanType RaiseImage(Image *image, } for (x=0; x < (ssize_t) (image->rows-y); x++) { - if (GetPixelMask(image,q) != 0) + if (GetPixelMask(image,q) == 0) { q+=GetPixelChannels(image); continue; @@ -915,7 +915,7 @@ MagickExport MagickBooleanType RaiseImage(Image *image, } for ( ; x < (ssize_t) image->columns; x++) { - if (GetPixelMask(image,q) != 0) + if (GetPixelMask(image,q) == 0) { q+=GetPixelChannels(image); continue; diff --git a/MagickCore/effect.c b/MagickCore/effect.c index 970bc055b..08aed152e 100644 --- a/MagickCore/effect.c +++ b/MagickCore/effect.c @@ -383,7 +383,7 @@ MagickExport Image *AdaptiveBlurImage(const Image *image,const double radius, (blur_traits == UndefinedPixelTrait)) continue; if (((blur_traits & CopyPixelTrait) != 0) || - (GetPixelMask(image,p+center) != 0)) + (GetPixelMask(image,p+center) == 0)) { SetPixelChannel(blur_image,channel,p[center+i],q); continue; @@ -708,7 +708,7 @@ MagickExport Image *AdaptiveSharpenImage(const Image *image,const double radius, (sharp_traits == UndefinedPixelTrait)) continue; if (((sharp_traits & CopyPixelTrait) != 0) || - (GetPixelMask(image,p+center) != 0)) + (GetPixelMask(image,p+center) == 0)) { SetPixelChannel(sharp_image,channel,p[center+i],q); continue; @@ -1702,7 +1702,7 @@ MagickExport Image *MotionBlurImage(const Image *image,const double radius, (blur_traits == UndefinedPixelTrait)) continue; if (((blur_traits & CopyPixelTrait) != 0) || - (GetPixelMask(image,p) != 0)) + (GetPixelMask(image,p) == 0)) { SetPixelChannel(blur_image,channel,p[i],q); continue; @@ -2495,7 +2495,7 @@ MagickExport Image *RadialBlurImage(const Image *image,const double angle, (blur_traits == UndefinedPixelTrait)) continue; if (((blur_traits & CopyPixelTrait) != 0) || - (GetPixelMask(image,p) != 0)) + (GetPixelMask(image,p) == 0)) { SetPixelChannel(blur_image,channel,p[i],q); continue; @@ -2804,7 +2804,7 @@ MagickExport Image *SelectiveBlurImage(const Image *image,const double radius, (blur_traits == UndefinedPixelTrait)) continue; if (((blur_traits & CopyPixelTrait) != 0) || - (GetPixelMask(image,p+center) != 0)) + (GetPixelMask(image,p+center) == 0)) { SetPixelChannel(blur_image,channel,p[center+i],q); continue; @@ -3095,7 +3095,7 @@ MagickExport Image *ShadeImage(const Image *image,const MagickBooleanType gray, (shade_traits == UndefinedPixelTrait)) continue; if (((shade_traits & CopyPixelTrait) != 0) || - (GetPixelMask(linear_image,center) != 0)) + (GetPixelMask(linear_image,center) == 0)) { SetPixelChannel(shade_image,channel,center[i],q); continue; @@ -3523,7 +3523,7 @@ MagickExport Image *UnsharpMaskImage(const Image *image,const double radius, (unsharp_traits == UndefinedPixelTrait)) continue; if (((unsharp_traits & CopyPixelTrait) != 0) || - (GetPixelMask(image,p) != 0)) + (GetPixelMask(image,p) == 0)) { SetPixelChannel(unsharp_image,channel,p[i],q); continue; diff --git a/MagickCore/enhance.c b/MagickCore/enhance.c index d77813336..dc11ff89e 100644 --- a/MagickCore/enhance.c +++ b/MagickCore/enhance.c @@ -372,7 +372,7 @@ MagickExport MagickBooleanType ClutImage(Image *image,const Image *clut_image, GetPixelInfo(image,&pixel); for (x=0; x < (ssize_t) image->columns; x++) { - if (GetPixelMask(image,q) != 0) + if (GetPixelMask(image,q) == 0) { q+=GetPixelChannels(image); continue; @@ -1216,7 +1216,7 @@ MagickExport MagickBooleanType ContrastStretchImage(Image *image, register ssize_t i; - if (GetPixelMask(image,q) != 0) + if (GetPixelMask(image,q) == 0) { q+=GetPixelChannels(image); continue; @@ -1370,7 +1370,7 @@ MagickExport Image *EnhanceImage(const Image *image,ExceptionInfo *exception) register ssize_t i; - if (GetPixelMask(image,p) != 0) + if (GetPixelMask(image,p) == 0) { p+=GetPixelChannels(image); q+=GetPixelChannels(enhance_image); @@ -1671,7 +1671,7 @@ MagickExport MagickBooleanType EqualizeImage(Image *image, register ssize_t i; - if (GetPixelMask(image,q) != 0) + if (GetPixelMask(image,q) == 0) { q+=GetPixelChannels(image); continue; @@ -1832,7 +1832,7 @@ MagickExport MagickBooleanType GammaImage(Image *image,const double gamma, register ssize_t i; - if (GetPixelMask(image,q) != 0) + if (GetPixelMask(image,q) == 0) { q+=GetPixelChannels(image); continue; @@ -2203,7 +2203,7 @@ MagickExport MagickBooleanType LevelImage(Image *image,const double black_point, register ssize_t i; - if (GetPixelMask(image,q) != 0) + if (GetPixelMask(image,q) == 0) { q+=GetPixelChannels(image); continue; @@ -2360,7 +2360,7 @@ MagickExport MagickBooleanType LevelizeImage(Image *image, register ssize_t i; - if (GetPixelMask(image,q) != 0) + if (GetPixelMask(image,q) == 0) { q+=GetPixelChannels(image); continue; @@ -3063,7 +3063,7 @@ MagickExport MagickBooleanType NegateImage(Image *image, register ssize_t i; - if ((GetPixelMask(image,q) != 0) || + if ((GetPixelMask(image,q) == 0) || (IsPixelGray(image,q) != MagickFalse)) { q+=GetPixelChannels(image); @@ -3127,7 +3127,7 @@ MagickExport MagickBooleanType NegateImage(Image *image, register ssize_t i; - if (GetPixelMask(image,q) != 0) + if (GetPixelMask(image,q) == 0) { q+=GetPixelChannels(image); continue; @@ -3423,7 +3423,7 @@ MagickExport MagickBooleanType SigmoidalContrastImage(Image *image, register ssize_t i; - if (GetPixelMask(image,q) != 0) + if (GetPixelMask(image,q) == 0) { q+=GetPixelChannels(image); continue; diff --git a/MagickCore/fx.c b/MagickCore/fx.c index 709a6fdf8..473a3daa9 100644 --- a/MagickCore/fx.c +++ b/MagickCore/fx.c @@ -362,7 +362,7 @@ MagickExport Image *AddNoiseImage(const Image *image,const NoiseType noise_type, (noise_traits == UndefinedPixelTrait)) continue; if (((noise_traits & CopyPixelTrait) != 0) || - (GetPixelMask(image,p) != 0)) + (GetPixelMask(image,p) == 0)) { SetPixelChannel(noise_image,channel,p[i],q); continue; @@ -778,7 +778,7 @@ MagickExport Image *ColorizeImage(const Image *image,const char *blend, (colorize_traits == UndefinedPixelTrait)) continue; if (((colorize_traits & CopyPixelTrait) != 0) || - (GetPixelMask(image,p) != 0)) + (GetPixelMask(image,p) == 0)) { SetPixelChannel(colorize_image,channel,p[i],q); continue; @@ -3103,7 +3103,7 @@ MagickExport Image *FxImage(const Image *image,const char *expression, (fx_traits == UndefinedPixelTrait)) continue; if (((fx_traits & CopyPixelTrait) != 0) || - (GetPixelMask(image,p) != 0)) + (GetPixelMask(image,p) == 0)) { SetPixelChannel(fx_image,channel,p[i],q); continue; @@ -3286,7 +3286,7 @@ MagickExport Image *ImplodeImage(const Image *image,const double amount, /* Determine if the pixel is within an ellipse. */ - if (GetPixelMask(image,p) != 0) + if (GetPixelMask(image,p) == 0) { p+=GetPixelChannels(image); q+=GetPixelChannels(implode_image); @@ -3528,7 +3528,7 @@ MagickExport Image *MorphImages(const Image *image,const size_t number_frames, (morph_traits == UndefinedPixelTrait)) continue; if (((morph_traits & CopyPixelTrait) != 0) || - (GetPixelMask(image,p) != 0)) + (GetPixelMask(image,p) == 0)) { SetPixelChannel(morph_image,channel,p[i],q); continue; @@ -4450,7 +4450,7 @@ MagickExport Image *SketchImage(const Image *image,const double radius, register ssize_t i; - if (GetPixelMask(random_image,q) != 0) + if (GetPixelMask(random_image,q) == 0) { q+=GetPixelChannels(random_image); continue; @@ -4613,7 +4613,7 @@ MagickExport MagickBooleanType SolarizeImage(Image *image, register ssize_t i; - if (GetPixelMask(image,q) != 0) + if (GetPixelMask(image,q) == 0) { q+=GetPixelChannels(image); continue; @@ -5099,7 +5099,7 @@ MagickExport Image *SwirlImage(const Image *image,double degrees, /* Determine if the pixel is within an ellipse. */ - if (GetPixelMask(image,p) != 0) + if (GetPixelMask(image,p) == 0) { p+=GetPixelChannels(image); q+=GetPixelChannels(swirl_image); @@ -5337,7 +5337,7 @@ MagickExport Image *TintImage(const Image *image,const char *blend, (tint_traits == UndefinedPixelTrait)) continue; if (((tint_traits & CopyPixelTrait) != 0) || - (GetPixelMask(image,p) != 0)) + (GetPixelMask(image,p) == 0)) { SetPixelChannel(tint_image,channel,p[i],q); continue; diff --git a/MagickCore/image.c b/MagickCore/image.c index 1050897de..8deb52508 100644 --- a/MagickCore/image.c +++ b/MagickCore/image.c @@ -577,7 +577,7 @@ MagickExport Image *AppendImages(const Image *images, GetPixelInfo(image,&pixel); for (x=0; x < (ssize_t) image->columns; x++) { - if (GetPixelMask(image,p) != 0) + if (GetPixelMask(image,p) == 0) { p+=GetPixelChannels(image); q+=GetPixelChannels(append_image); @@ -1686,7 +1686,7 @@ MagickExport MagickBooleanType IsHighDynamicRangeImage(const Image *image, register ssize_t i; - if (GetPixelMask(image,p) != 0) + if (GetPixelMask(image,p) == 0) { p+=GetPixelChannels(image); continue; diff --git a/MagickCore/morphology.c b/MagickCore/morphology.c index 435320089..155c703bf 100644 --- a/MagickCore/morphology.c +++ b/MagickCore/morphology.c @@ -2696,7 +2696,7 @@ static ssize_t MorphologyPrimitive(const Image *image,Image *morphology_image, (morphology_traits == UndefinedPixelTrait)) continue; if (((morphology_traits & CopyPixelTrait) != 0) || - (GetPixelMask(image,p+center) != 0)) + (GetPixelMask(image,p+center) == 0)) { SetPixelChannel(morphology_image,channel,p[center+i],q); continue; @@ -2842,7 +2842,7 @@ static ssize_t MorphologyPrimitive(const Image *image,Image *morphology_image, (morphology_traits == UndefinedPixelTrait)) continue; if (((morphology_traits & CopyPixelTrait) != 0) || - (GetPixelMask(image,p+center) != 0)) + (GetPixelMask(image,p+center) == 0)) { SetPixelChannel(morphology_image,channel,p[center+i],q); continue; @@ -3296,7 +3296,7 @@ static ssize_t MorphologyPrimitiveDirect(Image *image, if (traits == UndefinedPixelTrait) continue; if (((traits & CopyPixelTrait) != 0) || - (GetPixelMask(image,p+center) != 0)) + (GetPixelMask(image,p+center) == 0)) continue; pixels=p; pixel=(double) QuantumRange; @@ -3459,7 +3459,7 @@ static ssize_t MorphologyPrimitiveDirect(Image *image, if (traits == UndefinedPixelTrait) continue; if (((traits & CopyPixelTrait) != 0) || - (GetPixelMask(image,p+center) != 0)) + (GetPixelMask(image,p+center) == 0)) continue; pixels=p; pixel=(double) QuantumRange; diff --git a/MagickCore/paint.c b/MagickCore/paint.c index e25342ee4..9259a99f8 100644 --- a/MagickCore/paint.c +++ b/MagickCore/paint.c @@ -676,7 +676,7 @@ MagickExport Image *OilPaintImage(const Image *image,const double radius, (paint_traits == UndefinedPixelTrait)) continue; if (((paint_traits & CopyPixelTrait) != 0) || - (GetPixelMask(linear_image,p) != 0)) + (GetPixelMask(linear_image,p) == 0)) { SetPixelChannel(paint_image,channel,p[center+i],q); continue; diff --git a/MagickCore/pixel-accessor.h b/MagickCore/pixel-accessor.h index b8311a624..4aec80823 100644 --- a/MagickCore/pixel-accessor.h +++ b/MagickCore/pixel-accessor.h @@ -277,7 +277,7 @@ static inline Quantum GetPixelMask(const Image *restrict image, const Quantum *restrict pixel) { if (image->channel_map[MaskPixelChannel].traits == UndefinedPixelTrait) - return((Quantum) 0); + return((Quantum) QuantumRange); return(pixel[image->channel_map[MaskPixelChannel].offset]); } diff --git a/MagickCore/quantum-export.c b/MagickCore/quantum-export.c index 7da0ee9ed..e4a1b2147 100644 --- a/MagickCore/quantum-export.c +++ b/MagickCore/quantum-export.c @@ -3240,7 +3240,7 @@ MagickExport size_t ExportQuantumPixels(const Image *image, register ssize_t i; - if (GetPixelMask(image,q) != 0) + if (GetPixelMask(image,q) == 0) { q+=GetPixelChannels(image); continue; diff --git a/MagickCore/quantum-import.c b/MagickCore/quantum-import.c index cd6e32911..406a7d706 100644 --- a/MagickCore/quantum-import.c +++ b/MagickCore/quantum-import.c @@ -3604,7 +3604,7 @@ MagickExport size_t ImportQuantumPixels(const Image *image, register ssize_t i; - if (GetPixelMask(image,q) != 0) + if (GetPixelMask(image,q) == 0) { q+=GetPixelChannels(image); continue; diff --git a/MagickCore/resize.c b/MagickCore/resize.c index 9825dadf9..40b8d78e1 100644 --- a/MagickCore/resize.c +++ b/MagickCore/resize.c @@ -1652,7 +1652,7 @@ MagickExport Image *InterpolativeResizeImage(const Image *image, register ssize_t i; - if (GetPixelMask(resize_image,q) != 0) + if (GetPixelMask(resize_image,q) == 0) { q+=GetPixelChannels(resize_image); continue; @@ -2328,7 +2328,7 @@ static MagickBooleanType HorizontalFilter(const ResizeFilter *resize_filter, (resize_traits == UndefinedPixelTrait)) continue; if (((resize_traits & CopyPixelTrait) != 0) || - (GetPixelMask(resize_image,q) != 0)) + (GetPixelMask(resize_image,q) == 0)) { j=(ssize_t) (MagickMin(MagickMax(bisect,(double) start),(double) stop-1.0)+0.5); @@ -2543,7 +2543,7 @@ static MagickBooleanType VerticalFilter(const ResizeFilter *resize_filter, (resize_traits == UndefinedPixelTrait)) continue; if (((resize_traits & CopyPixelTrait) != 0) || - (GetPixelMask(resize_image,q) != 0)) + (GetPixelMask(resize_image,q) == 0)) { j=(ssize_t) (MagickMin(MagickMax(bisect,(double) start),(double) stop-1.0)+0.5); @@ -2835,7 +2835,7 @@ MagickExport Image *SampleImage(const Image *image,const size_t columns, register ssize_t i; - if (GetPixelMask(sample_image,q) != 0) + if (GetPixelMask(sample_image,q) == 0) { q+=GetPixelChannels(sample_image); continue; @@ -3049,7 +3049,7 @@ MagickExport Image *ScaleImage(const Image *image,const size_t columns, } for (x=0; x < (ssize_t) image->columns; x++) { - if (GetPixelMask(image,p) != 0) + if (GetPixelMask(image,p) == 0) { p+=GetPixelChannels(image); continue; @@ -3096,7 +3096,7 @@ MagickExport Image *ScaleImage(const Image *image,const size_t columns, } for (x=0; x < (ssize_t) image->columns; x++) { - if (GetPixelMask(image,p) != 0) + if (GetPixelMask(image,p) == 0) { p+=GetPixelChannels(image); continue; @@ -3146,7 +3146,7 @@ MagickExport Image *ScaleImage(const Image *image,const size_t columns, } for (x=0; x < (ssize_t) image->columns; x++) { - if (GetPixelMask(image,p) != 0) + if (GetPixelMask(image,p) == 0) { p+=GetPixelChannels(image); continue; @@ -3199,7 +3199,7 @@ MagickExport Image *ScaleImage(const Image *image,const size_t columns, */ for (x=0; x < (ssize_t) scale_image->columns; x++) { - if (GetPixelMask(scale_image,q) != 0) + if (GetPixelMask(scale_image,q) == 0) { q+=GetPixelChannels(scale_image); continue; @@ -3305,7 +3305,7 @@ MagickExport Image *ScaleImage(const Image *image,const size_t columns, */ for (x=0; x < (ssize_t) scale_image->columns; x++) { - if (GetPixelMask(scale_image,q) != 0) + if (GetPixelMask(scale_image,q) == 0) { q+=GetPixelChannels(scale_image); continue; diff --git a/MagickCore/shear.c b/MagickCore/shear.c index 6de880d60..dc0b62a29 100644 --- a/MagickCore/shear.c +++ b/MagickCore/shear.c @@ -1093,7 +1093,7 @@ MagickExport Image *IntegralRotateImage(const Image *image,size_t rotations, register ssize_t i; - if (GetPixelMask(image,tile_pixels) != 0) + if (GetPixelMask(image,tile_pixels) == 0) { tile_pixels-=width*GetPixelChannels(image); q+=GetPixelChannels(rotate_image); @@ -1180,7 +1180,7 @@ MagickExport Image *IntegralRotateImage(const Image *image,size_t rotations, i; q-=GetPixelChannels(rotate_image); - if (GetPixelMask(image,p) != 0) + if (GetPixelMask(image,p) == 0) { p+=GetPixelChannels(image); continue; @@ -1303,7 +1303,7 @@ MagickExport Image *IntegralRotateImage(const Image *image,size_t rotations, register ssize_t i; - if (GetPixelMask(image,tile_pixels) != 0) + if (GetPixelMask(image,tile_pixels) == 0) { tile_pixels+=width*GetPixelChannels(image); q+=GetPixelChannels(rotate_image); diff --git a/MagickCore/signature.c b/MagickCore/signature.c index f8f82ade3..6ca54b5b8 100644 --- a/MagickCore/signature.c +++ b/MagickCore/signature.c @@ -526,7 +526,7 @@ MagickExport MagickBooleanType SignatureImage(Image *image, register ssize_t i; - if (GetPixelMask(image,p) != 0) + if (GetPixelMask(image,p) == 0) { p+=GetPixelChannels(image); continue; diff --git a/MagickCore/statistic.c b/MagickCore/statistic.c index 45325542c..81ae530ad 100644 --- a/MagickCore/statistic.c +++ b/MagickCore/statistic.c @@ -650,7 +650,7 @@ MagickExport Image *EvaluateImages(const Image *images, register ssize_t i; - if (GetPixelMask(next,p) != 0) + if (GetPixelMask(next,p) == 0) { p+=GetPixelChannels(next); continue; @@ -708,7 +708,7 @@ MagickExport Image *EvaluateImages(const Image *images, register ssize_t i; - if (GetPixelMask(image,q) != 0) + if (GetPixelMask(image,q) == 0) { q+=GetPixelChannels(image); continue; @@ -823,7 +823,7 @@ MagickExport MagickBooleanType EvaluateImage(Image *image, if (traits == UndefinedPixelTrait) continue; if (((traits & CopyPixelTrait) != 0) || - (GetPixelMask(image,q) != 0)) + (GetPixelMask(image,q) == 0)) continue; q[i]=ClampToQuantum(ApplyEvaluateOperator(random_info[id],q[i],op, value)); @@ -1036,7 +1036,7 @@ MagickExport MagickBooleanType FunctionImage(Image *image, register ssize_t i; - if (GetPixelMask(image,q) != 0) + if (GetPixelMask(image,q) == 0) { q+=GetPixelChannels(image); continue; @@ -1288,7 +1288,7 @@ MagickExport MagickBooleanType GetImageKurtosis(const Image *image, register ssize_t i; - if (GetPixelMask(image,p) != 0) + if (GetPixelMask(image,p) == 0) { p+=GetPixelChannels(image); continue; @@ -1413,7 +1413,7 @@ MagickExport MagickBooleanType GetImageRange(const Image *image,double *minima, register ssize_t i; - if (GetPixelMask(image,p) != 0) + if (GetPixelMask(image,p) == 0) { p+=GetPixelChannels(image); continue; @@ -1559,7 +1559,7 @@ MagickExport ChannelStatistics *GetImageStatistics(const Image *image, register ssize_t i; - if (GetPixelMask(image,p) != 0) + if (GetPixelMask(image,p) == 0) { p+=GetPixelChannels(image); continue; @@ -1825,7 +1825,7 @@ MagickExport Image *PolynomialImage(const Image *images, register ssize_t i; - if (GetPixelMask(next,p) != 0) + if (GetPixelMask(next,p) == 0) { p+=GetPixelChannels(next); continue; @@ -1859,7 +1859,7 @@ MagickExport Image *PolynomialImage(const Image *images, register ssize_t i; - if (GetPixelMask(image,q) != 0) + if (GetPixelMask(image,q) == 0) { q+=GetPixelChannels(image); continue; @@ -2485,7 +2485,7 @@ MagickExport Image *StatisticImage(const Image *image,const StatisticType type, (statistic_traits == UndefinedPixelTrait)) continue; if (((statistic_traits & CopyPixelTrait) != 0) || - (GetPixelMask(image,p) != 0)) + (GetPixelMask(image,p) == 0)) { SetPixelChannel(statistic_image,channel,p[center+i],q); continue; diff --git a/MagickCore/threshold.c b/MagickCore/threshold.c index 20f0c6a83..fb821da53 100644 --- a/MagickCore/threshold.c +++ b/MagickCore/threshold.c @@ -273,7 +273,7 @@ MagickExport Image *AdaptiveThresholdImage(const Image *image, (threshold_traits == UndefinedPixelTrait)) continue; if (((threshold_traits & CopyPixelTrait) != 0) || - (GetPixelMask(image,p) != 0)) + (GetPixelMask(image,p) == 0)) { SetPixelChannel(threshold_image,channel,p[center+i],q); continue; @@ -308,7 +308,7 @@ MagickExport Image *AdaptiveThresholdImage(const Image *image, (threshold_traits == UndefinedPixelTrait)) continue; if (((threshold_traits & CopyPixelTrait) != 0) || - (GetPixelMask(image,p) != 0)) + (GetPixelMask(image,p) == 0)) { SetPixelChannel(threshold_image,channel,p[center+i],q); continue; @@ -454,7 +454,7 @@ MagickExport MagickBooleanType BilevelImage(Image *image,const double threshold, register ssize_t i; - if (GetPixelMask(image,q) != 0) + if (GetPixelMask(image,q) == 0) { q+=GetPixelChannels(image); continue; @@ -619,7 +619,7 @@ MagickExport MagickBooleanType BlackThresholdImage(Image *image, register ssize_t i; - if (GetPixelMask(image,q) != 0) + if (GetPixelMask(image,q) == 0) { q+=GetPixelChannels(image); continue; @@ -768,7 +768,7 @@ MagickExport MagickBooleanType ClampImage(Image *image,ExceptionInfo *exception) register ssize_t i; - if (GetPixelMask(image,q) != 0) + if (GetPixelMask(image,q) == 0) { q+=GetPixelChannels(image); continue; @@ -1397,7 +1397,7 @@ MagickExport MagickBooleanType OrderedPosterizeImage(Image *image, n; n=0; - if (GetPixelMask(image,q) != 0) + if (GetPixelMask(image,q) == 0) { q+=GetPixelChannels(image); continue; @@ -1561,7 +1561,7 @@ MagickExport MagickBooleanType PerceptibleImage(Image *image, register ssize_t i; - if (GetPixelMask(image,q) != 0) + if (GetPixelMask(image,q) == 0) { q+=GetPixelChannels(image); continue; @@ -1725,7 +1725,7 @@ MagickExport MagickBooleanType RandomThresholdImage(Image *image, register ssize_t i; - if (GetPixelMask(image,q) != 0) + if (GetPixelMask(image,q) == 0) { q+=GetPixelChannels(image); continue; @@ -1899,7 +1899,7 @@ MagickExport MagickBooleanType WhiteThresholdImage(Image *image, register ssize_t i; - if (GetPixelMask(image,q) != 0) + if (GetPixelMask(image,q) == 0) { q+=GetPixelChannels(image); continue; diff --git a/MagickCore/transform.c b/MagickCore/transform.c index 0aa87fac4..bc95c641f 100644 --- a/MagickCore/transform.c +++ b/MagickCore/transform.c @@ -696,7 +696,7 @@ MagickExport Image *CropImage(const Image *image,const RectangleInfo *geometry, register ssize_t i; - if (GetPixelMask(image,p) != 0) + if (GetPixelMask(image,p) == 0) { p+=GetPixelChannels(image); q+=GetPixelChannels(crop_image); @@ -1051,7 +1051,7 @@ MagickExport Image *ExcerptImage(const Image *image, register ssize_t i; - if (GetPixelMask(image,p) != 0) + if (GetPixelMask(image,p) == 0) { p+=GetPixelChannels(image); q+=GetPixelChannels(excerpt_image); @@ -1251,7 +1251,7 @@ MagickExport Image *FlipImage(const Image *image,ExceptionInfo *exception) register ssize_t i; - if (GetPixelMask(image,p) != 0) + if (GetPixelMask(image,p) == 0) { p+=GetPixelChannels(image); q+=GetPixelChannels(flip_image); @@ -1393,7 +1393,7 @@ MagickExport Image *FlopImage(const Image *image,ExceptionInfo *exception) i; q-=GetPixelChannels(flop_image); - if (GetPixelMask(image,p) != 0) + if (GetPixelMask(image,p) == 0) { p+=GetPixelChannels(image); continue; @@ -1519,7 +1519,7 @@ static inline MagickBooleanType CopyImageRegion(Image *destination, register ssize_t i; - if (GetPixelMask(source,p) != 0) + if (GetPixelMask(source,p) == 0) { p+=GetPixelChannels(source); q+=GetPixelChannels(destination); @@ -1837,7 +1837,7 @@ MagickExport Image *SpliceImage(const Image *image, register ssize_t i; - if (GetPixelMask(image,p) != 0) + if (GetPixelMask(image,p) == 0) { p+=GetPixelChannels(image); q+=GetPixelChannels(splice_image); @@ -1863,7 +1863,7 @@ MagickExport Image *SpliceImage(const Image *image, register ssize_t i; - if (GetPixelMask(image,p) != 0) + if (GetPixelMask(image,p) == 0) { p+=GetPixelChannels(image); q+=GetPixelChannels(splice_image); @@ -1932,7 +1932,7 @@ MagickExport Image *SpliceImage(const Image *image, register ssize_t i; - if (GetPixelMask(image,q) != 0) + if (GetPixelMask(image,q) == 0) { p+=GetPixelChannels(image); q+=GetPixelChannels(splice_image); @@ -1958,7 +1958,7 @@ MagickExport Image *SpliceImage(const Image *image, register ssize_t i; - if (GetPixelMask(image,q) != 0) + if (GetPixelMask(image,q) == 0) { p+=GetPixelChannels(image); q+=GetPixelChannels(splice_image); @@ -2267,7 +2267,7 @@ MagickExport Image *TransposeImage(const Image *image,ExceptionInfo *exception) register ssize_t i; - if (GetPixelMask(image,q) != 0) + if (GetPixelMask(image,q) == 0) { p+=GetPixelChannels(image); q+=GetPixelChannels(transpose_image); @@ -2415,7 +2415,7 @@ MagickExport Image *TransverseImage(const Image *image,ExceptionInfo *exception) i; q-=GetPixelChannels(transverse_image); - if (GetPixelMask(image,p) != 0) + if (GetPixelMask(image,p) == 0) { p+=GetPixelChannels(image); continue;