From abace416e67464ca6dac2324410667b05076a9c2 Mon Sep 17 00:00:00 2001 From: cristy Date: Sun, 11 Dec 2011 15:56:53 +0000 Subject: [PATCH] --- MagickCore/attribute.c | 12 ++++- MagickCore/compare.c | 26 ++++++----- MagickCore/composite-private.h | 2 +- MagickCore/decorate.c | 81 +++++++++++++++++++++++++++------- MagickCore/effect.c | 22 ++++----- MagickCore/enhance.c | 58 +++++++++++++++++++----- MagickCore/fx.c | 28 +++++++----- MagickCore/histogram.c | 6 ++- MagickCore/image.c | 16 +++++-- MagickCore/pixel-accessor.h | 6 +-- MagickCore/pixel.c | 16 +++---- MagickCore/resize.c | 51 ++++++++++++++++----- MagickCore/shear.c | 6 +-- MagickCore/signature.c | 6 ++- MagickCore/statistic.c | 59 ++++++++++++++++++------- MagickCore/threshold.c | 38 +++++++++++++--- MagickCore/transform.c | 52 +++++++++++----------- MagickCore/version.h | 2 +- config/configure.xml | 2 +- 19 files changed, 345 insertions(+), 144 deletions(-) diff --git a/MagickCore/attribute.c b/MagickCore/attribute.c index 3880cc1c5..5bf4760fb 100644 --- a/MagickCore/attribute.c +++ b/MagickCore/attribute.c @@ -377,10 +377,14 @@ MagickExport size_t GetImageDepth(const Image *image, for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { + PixelChannel + channel; + PixelTrait traits; - traits=GetPixelChannelMapTraits(image,i); + channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); if (traits == UndefinedPixelTrait) continue; while (current_depth[id] < MAGICKCORE_QUANTUM_DEPTH) @@ -854,10 +858,14 @@ MagickExport MagickBooleanType SetImageDepth(Image *image, for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { + PixelChannel + channel; + PixelTrait traits; - traits=GetPixelChannelMapTraits(image,i); + channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); if (traits == UndefinedPixelTrait) continue; q[i]=ScaleAnyToQuantum(ScaleQuantumToAny(q[i],range),range); diff --git a/MagickCore/compare.c b/MagickCore/compare.c index 5909207bc..784871255 100644 --- a/MagickCore/compare.c +++ b/MagickCore/compare.c @@ -231,8 +231,8 @@ MagickExport Image *CompareImages(Image *image,const Image *reconstruct_image, reconstruct_traits, traits; - traits=GetPixelChannelMapTraits(image,i); channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); reconstruct_traits=GetPixelChannelMapTraits(reconstruct_image,channel); if ((traits == UndefinedPixelTrait) || (reconstruct_traits == UndefinedPixelTrait)) @@ -365,8 +365,8 @@ static MagickBooleanType GetAbsoluteDistortion(const Image *image, reconstruct_traits, traits; - traits=GetPixelChannelMapTraits(image,i); channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); reconstruct_traits=GetPixelChannelMapTraits(reconstruct_image,channel); if ((traits == UndefinedPixelTrait) || (reconstruct_traits == UndefinedPixelTrait)) @@ -406,10 +406,14 @@ static size_t GetImageChannels(const Image *image) channels=0; for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { + PixelChannel + channel; + PixelTrait traits; - traits=GetPixelChannelMapTraits(image,i); + channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); if ((traits & UpdatePixelTrait) != 0) channels++; } @@ -479,8 +483,8 @@ static MagickBooleanType GetFuzzDistortion(const Image *image, reconstruct_traits, traits; - traits=GetPixelChannelMapTraits(image,i); channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); reconstruct_traits=GetPixelChannelMapTraits(reconstruct_image,channel); if ((traits == UndefinedPixelTrait) || (reconstruct_traits == UndefinedPixelTrait)) @@ -574,8 +578,8 @@ static MagickBooleanType GetMeanAbsoluteDistortion(const Image *image, reconstruct_traits, traits; - traits=GetPixelChannelMapTraits(image,i); channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); reconstruct_traits=GetPixelChannelMapTraits(reconstruct_image,channel); if ((traits == UndefinedPixelTrait) || (reconstruct_traits == UndefinedPixelTrait)) @@ -666,8 +670,8 @@ static MagickBooleanType GetMeanErrorPerPixel(Image *image, reconstruct_traits, traits; - traits=GetPixelChannelMapTraits(image,i); channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); reconstruct_traits=GetPixelChannelMapTraits(reconstruct_image,channel); if ((traits == UndefinedPixelTrait) || (reconstruct_traits == UndefinedPixelTrait)) @@ -758,8 +762,8 @@ static MagickBooleanType GetMeanSquaredDistortion(const Image *image, reconstruct_traits, traits; - traits=GetPixelChannelMapTraits(image,i); channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); reconstruct_traits=GetPixelChannelMapTraits(reconstruct_image,channel); if ((traits == UndefinedPixelTrait) || (reconstruct_traits == UndefinedPixelTrait)) @@ -863,8 +867,8 @@ static MagickBooleanType GetNormalizedCrossCorrelationDistortion( reconstruct_traits, traits; - traits=GetPixelChannelMapTraits(image,i); channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); reconstruct_traits=GetPixelChannelMapTraits(reconstruct_image,channel); if ((traits == UndefinedPixelTrait) || (reconstruct_traits == UndefinedPixelTrait)) @@ -982,8 +986,8 @@ static MagickBooleanType GetPeakAbsoluteDistortion(const Image *image, reconstruct_traits, traits; - traits=GetPixelChannelMapTraits(image,i); channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); reconstruct_traits=GetPixelChannelMapTraits(reconstruct_image,channel); if ((traits == UndefinedPixelTrait) || (reconstruct_traits == UndefinedPixelTrait)) @@ -1390,8 +1394,8 @@ MagickExport MagickBooleanType IsImagesEqual(Image *image, reconstruct_traits, traits; - traits=GetPixelChannelMapTraits(image,i); channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); reconstruct_traits=GetPixelChannelMapTraits(reconstruct_image,channel); if ((traits == UndefinedPixelTrait) || (reconstruct_traits == UndefinedPixelTrait)) @@ -1584,8 +1588,8 @@ MagickExport Image *SimilarityImage(Image *image,const Image *reference, similarity_traits, traits; - traits=GetPixelChannelMapTraits(image,i); channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); similarity_traits=GetPixelChannelMapTraits(similarity_image,channel); if ((traits == UndefinedPixelTrait) || (similarity_traits == UndefinedPixelTrait)) diff --git a/MagickCore/composite-private.h b/MagickCore/composite-private.h index 7a9851fa3..bf8a909e8 100644 --- a/MagickCore/composite-private.h +++ b/MagickCore/composite-private.h @@ -70,8 +70,8 @@ static inline void CompositePixelOver(const Image *image,const PixelInfo *p, PixelTrait traits; - traits=GetPixelChannelMapTraits(image,i); channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); if (traits == UndefinedPixelTrait) continue; switch (channel) diff --git a/MagickCore/decorate.c b/MagickCore/decorate.c index dca8921fd..4ed61a648 100644 --- a/MagickCore/decorate.c +++ b/MagickCore/decorate.c @@ -683,9 +683,6 @@ MagickExport MagickBooleanType RaiseImage(Image *image, #endif for (y=0; y < (ssize_t) raise_info->height; y++) { - PixelTrait - traits; - register ssize_t i, x; @@ -705,7 +702,14 @@ MagickExport MagickBooleanType RaiseImage(Image *image, { for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - traits=GetPixelChannelMapTraits(image,i); + PixelChannel + channel; + + PixelTrait + traits; + + channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); if ((traits & UpdatePixelTrait) != 0) q[i]=ClampToQuantum(QuantumScale*((MagickRealType) q[i]* HighlightFactor+(MagickRealType) foreground*(QuantumRange- @@ -717,7 +721,14 @@ MagickExport MagickBooleanType RaiseImage(Image *image, { for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - traits=GetPixelChannelMapTraits(image,i); + PixelChannel + channel; + + PixelTrait + traits; + + channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); if ((traits & UpdatePixelTrait) != 0) q[i]=ClampToQuantum(QuantumScale*((MagickRealType) q[i]* AccentuateFactor+(MagickRealType) foreground*(QuantumRange- @@ -729,7 +740,14 @@ MagickExport MagickBooleanType RaiseImage(Image *image, { for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - traits=GetPixelChannelMapTraits(image,i); + PixelChannel + channel; + + PixelTrait + traits; + + channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); if ((traits & UpdatePixelTrait) != 0) q[i]=ClampToQuantum(QuantumScale*((MagickRealType) q[i]* ShadowFactor+(MagickRealType) background*(QuantumRange- @@ -754,9 +772,6 @@ MagickExport MagickBooleanType RaiseImage(Image *image, #endif for (y=(ssize_t) raise_info->height; y < (ssize_t) (image->rows-raise_info->height); y++) { - PixelTrait - traits; - register ssize_t i, x; @@ -776,7 +791,14 @@ MagickExport MagickBooleanType RaiseImage(Image *image, { for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - traits=GetPixelChannelMapTraits(image,i); + PixelChannel + channel; + + PixelTrait + traits; + + channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); if ((traits & UpdatePixelTrait) != 0) q[i]=ClampToQuantum(QuantumScale*((MagickRealType) q[i]* HighlightFactor+(MagickRealType) foreground*(QuantumRange- @@ -790,7 +812,14 @@ MagickExport MagickBooleanType RaiseImage(Image *image, { for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - traits=GetPixelChannelMapTraits(image,i); + PixelChannel + channel; + + PixelTrait + traits; + + channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); if ((traits & UpdatePixelTrait) != 0) q[i]=ClampToQuantum(QuantumScale*((MagickRealType) q[i]* ShadowFactor+(MagickRealType) background*(QuantumRange- @@ -815,9 +844,6 @@ MagickExport MagickBooleanType RaiseImage(Image *image, #endif for (y=(ssize_t) (image->rows-raise_info->height); y < (ssize_t) image->rows; y++) { - PixelTrait - traits; - register ssize_t i, x; @@ -837,7 +863,14 @@ MagickExport MagickBooleanType RaiseImage(Image *image, { for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - traits=GetPixelChannelMapTraits(image,i); + PixelChannel + channel; + + PixelTrait + traits; + + channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); if ((traits & UpdatePixelTrait) != 0) q[i]=ClampToQuantum(QuantumScale*((MagickRealType) q[i]* HighlightFactor+(MagickRealType) foreground*(QuantumRange- @@ -849,7 +882,14 @@ MagickExport MagickBooleanType RaiseImage(Image *image, { for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - traits=GetPixelChannelMapTraits(image,i); + PixelChannel + channel; + + PixelTrait + traits; + + channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); if ((traits & UpdatePixelTrait) != 0) q[i]=ClampToQuantum(QuantumScale*((MagickRealType) q[i]* TroughFactor+(MagickRealType) background*(QuantumRange- @@ -861,7 +901,14 @@ MagickExport MagickBooleanType RaiseImage(Image *image, { for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - traits=GetPixelChannelMapTraits(image,i); + PixelChannel + channel; + + PixelTrait + traits; + + channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); if ((traits & UpdatePixelTrait) != 0) q[i]=ClampToQuantum(QuantumScale*((MagickRealType) q[i]* ShadowFactor+(MagickRealType) background*(QuantumRange- diff --git a/MagickCore/effect.c b/MagickCore/effect.c index 0b5f2617f..2d00e3095 100644 --- a/MagickCore/effect.c +++ b/MagickCore/effect.c @@ -372,8 +372,8 @@ MagickExport Image *AdaptiveBlurImage(const Image *image,const double radius, ssize_t v; - traits=GetPixelChannelMapTraits(image,i); channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); blur_traits=GetPixelChannelMapTraits(blur_image,channel); if ((traits == UndefinedPixelTrait) || (blur_traits == UndefinedPixelTrait)) @@ -694,8 +694,8 @@ MagickExport Image *AdaptiveSharpenImage(const Image *image,const double radius, ssize_t v; - traits=GetPixelChannelMapTraits(image,i); channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); sharp_traits=GetPixelChannelMapTraits(sharp_image,channel); if ((traits == UndefinedPixelTrait) || (sharp_traits == UndefinedPixelTrait)) @@ -995,8 +995,8 @@ MagickExport Image *BlurImage(const Image *image,const double radius, register ssize_t u; - traits=GetPixelChannelMapTraits(image,i); channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); blur_traits=GetPixelChannelMapTraits(blur_image,channel); if ((traits == UndefinedPixelTrait) || (blur_traits == UndefinedPixelTrait)) @@ -1116,8 +1116,8 @@ MagickExport Image *BlurImage(const Image *image,const double radius, register ssize_t u; - traits=GetPixelChannelMapTraits(blur_image,i); channel=GetPixelChannelMapChannel(blur_image,i); + traits=GetPixelChannelMapTraits(blur_image,channel); blur_traits=GetPixelChannelMapTraits(blur_image,channel); if ((traits == UndefinedPixelTrait) || (blur_traits == UndefinedPixelTrait)) @@ -1360,8 +1360,8 @@ MagickExport Image *ConvolveImage(const Image *image, ssize_t v; - traits=GetPixelChannelMapTraits(image,i); channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); convolve_traits=GetPixelChannelMapTraits(convolve_image,channel); if ((traits == UndefinedPixelTrait) || (convolve_traits == UndefinedPixelTrait)) @@ -1653,8 +1653,8 @@ MagickExport Image *DespeckleImage(const Image *image,ExceptionInfo *exception) if (status == MagickFalse) continue; - traits=GetPixelChannelMapTraits(image,i); channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); despeckle_traits=GetPixelChannelMapTraits(despeckle_image,channel); if ((traits == UndefinedPixelTrait) || (despeckle_traits == UndefinedPixelTrait)) @@ -2217,8 +2217,8 @@ MagickExport Image *MotionBlurImage(const Image *image,const double radius, register ssize_t j; - traits=GetPixelChannelMapTraits(image,i); channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); blur_traits=GetPixelChannelMapTraits(blur_image,channel); if ((traits == UndefinedPixelTrait) || (blur_traits == UndefinedPixelTrait)) @@ -3008,8 +3008,8 @@ MagickExport Image *RadialBlurImage(const Image *image,const double angle, register ssize_t j; - traits=GetPixelChannelMapTraits(image,i); channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); blur_traits=GetPixelChannelMapTraits(blur_image,channel); if ((traits == UndefinedPixelTrait) || (blur_traits == UndefinedPixelTrait)) @@ -3291,8 +3291,8 @@ MagickExport Image *SelectiveBlurImage(const Image *image,const double radius, ssize_t v; - traits=GetPixelChannelMapTraits(image,i); channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); blur_traits=GetPixelChannelMapTraits(blur_image,channel); if ((traits == UndefinedPixelTrait) || (blur_traits == UndefinedPixelTrait)) @@ -3559,8 +3559,8 @@ MagickExport Image *ShadeImage(const Image *image,const MagickBooleanType gray, shade_traits, traits; - traits=GetPixelChannelMapTraits(image,i); channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); shade_traits=GetPixelChannelMapTraits(shade_image,channel); if ((traits == UndefinedPixelTrait) || (shade_traits == UndefinedPixelTrait)) @@ -3977,8 +3977,8 @@ MagickExport Image *UnsharpMaskImage(const Image *image,const double radius, traits, unsharp_traits; - traits=GetPixelChannelMapTraits(image,i); channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); unsharp_traits=GetPixelChannelMapTraits(unsharp_image,channel); if ((traits == UndefinedPixelTrait) || (unsharp_traits == UndefinedPixelTrait)) diff --git a/MagickCore/enhance.c b/MagickCore/enhance.c index 9a00a21b1..7d39a400f 100644 --- a/MagickCore/enhance.c +++ b/MagickCore/enhance.c @@ -134,10 +134,14 @@ MagickExport MagickBooleanType AutoGammaImage(Image *image, ChannelType channel_mask; + PixelChannel + channel; + PixelTrait traits; - traits=GetPixelChannelMapTraits(image,i); + channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); if ((traits & UpdatePixelTrait) == 0) continue; channel_mask=SetPixelChannelMask(image,(ChannelType) (1 << i)); @@ -384,8 +388,8 @@ MagickExport MagickBooleanType ClutImage(Image *image,const Image *clut_image, clut_traits, traits; - clut_traits=GetPixelChannelMapTraits(clut_image,i); channel=GetPixelChannelMapChannel(clut_image,i); + clut_traits=GetPixelChannelMapTraits(clut_image,channel); traits=GetPixelChannelMapTraits(clut_image,channel); if ((traits == UndefinedPixelTrait) || (clut_traits == UndefinedPixelTrait) || @@ -1219,10 +1223,14 @@ MagickExport MagickBooleanType ContrastStretchImage(Image *image, for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { + PixelChannel + channel; + PixelTrait traits; - traits=GetPixelChannelMapTraits(image,i); + channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); if (((traits & UpdatePixelTrait) != 0) && (black[i] != white[i])) q[i]=ClampToQuantum(stretch_map[GetPixelChannels(image)* ScaleQuantumToMap(q[i])+i]); @@ -1387,8 +1395,8 @@ MagickExport Image *EnhanceImage(const Image *image,ExceptionInfo *exception) register const Quantum *restrict r; - traits=GetPixelChannelMapTraits(image,i); channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); enhance_traits=GetPixelChannelMapTraits(enhance_image,channel); if ((traits == UndefinedPixelTrait) || (enhance_traits == UndefinedPixelTrait)) @@ -1673,10 +1681,14 @@ MagickExport MagickBooleanType EqualizeImage(Image *image, for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { + PixelChannel + channel; + PixelTrait traits; - traits=GetPixelChannelMapTraits(image,i); + channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); if (((traits & UpdatePixelTrait) != 0) && (black[i] != white[i])) q[i]=ClampToQuantum(equalize_map[GetPixelChannels(image)* ScaleQuantumToMap(q[i])+i]); @@ -1837,10 +1849,14 @@ MagickExport MagickBooleanType GammaImage(Image *image,const double gamma, for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { + PixelChannel + channel; + PixelTrait traits; - traits=GetPixelChannelMapTraits(image,i); + channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); if ((traits & UpdatePixelTrait) != 0) q[i]=ClampToQuantum(gamma_map[ScaleQuantumToMap(q[i])]); } @@ -2193,10 +2209,14 @@ MagickExport MagickBooleanType LevelImage(Image *image,const double black_point, for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { + PixelChannel + channel; + PixelTrait traits; - traits=GetPixelChannelMapTraits(image,i); + channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); if ((traits == UndefinedPixelTrait) || ((traits & UpdatePixelTrait) == 0)) continue; @@ -2350,10 +2370,14 @@ MagickExport MagickBooleanType LevelizeImage(Image *image, for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { + PixelChannel + channel; + PixelTrait traits; - traits=GetPixelChannelMapTraits(image,i); + channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); if ((traits & UpdatePixelTrait) != 0) q[i]=LevelizeValue(q[i]); } @@ -3029,10 +3053,14 @@ MagickExport MagickBooleanType NegateImage(Image *image, } for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { + PixelChannel + channel; + PixelTrait traits; - traits=GetPixelChannelMapTraits(image,i); + channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); if ((traits & UpdatePixelTrait) != 0) q[i]=QuantumRange-q[i]; } @@ -3087,10 +3115,14 @@ MagickExport MagickBooleanType NegateImage(Image *image, for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { + PixelChannel + channel; + PixelTrait traits; - traits=GetPixelChannelMapTraits(image,i); + channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); if ((traits & UpdatePixelTrait) != 0) q[i]=QuantumRange-q[i]; } @@ -3309,10 +3341,14 @@ MagickExport MagickBooleanType SigmoidalContrastImage(Image *image, for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { + PixelChannel + channel; + PixelTrait traits; - traits=GetPixelChannelMapTraits(image,i); + channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); if ((traits & UpdatePixelTrait) != 0) q[i]=ClampToQuantum(sigmoidal_map[ScaleQuantumToMap(q[i])]); } diff --git a/MagickCore/fx.c b/MagickCore/fx.c index 16f73d0be..b341743f1 100644 --- a/MagickCore/fx.c +++ b/MagickCore/fx.c @@ -344,8 +344,8 @@ MagickExport Image *AddNoiseImage(const Image *image,const NoiseType noise_type, noise_traits, traits; - traits=GetPixelChannelMapTraits(image,i); channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); noise_traits=GetPixelChannelMapTraits(noise_image,channel); if ((traits == UndefinedPixelTrait) || (noise_traits == UndefinedPixelTrait)) @@ -761,8 +761,8 @@ MagickExport Image *ColorizeImage(const Image *image,const char *blend, colorize_traits, traits; - traits=GetPixelChannelMapTraits(image,i); channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); colorize_traits=GetPixelChannelMapTraits(colorize_image,channel); if ((traits == UndefinedPixelTrait) || (colorize_traits == UndefinedPixelTrait)) @@ -3108,8 +3108,8 @@ MagickExport Image *FxImage(const Image *image,const char *expression, fx_traits, traits; - traits=GetPixelChannelMapTraits(image,i); channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); fx_traits=GetPixelChannelMapTraits(fx_image,channel); if ((traits == UndefinedPixelTrait) || (fx_traits == UndefinedPixelTrait)) @@ -3708,8 +3708,8 @@ static MagickBooleanType PlasmaImageProxy(Image *image,CacheView *image_view, return(MagickTrue); for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - traits=GetPixelChannelMapTraits(image,i); channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); if (traits == UndefinedPixelTrait) continue; q[i]=PlasmaPixel(random_info,(u[channel]+v[channel])/2.0,plasma); @@ -3731,8 +3731,8 @@ static MagickBooleanType PlasmaImageProxy(Image *image,CacheView *image_view, return(MagickTrue); for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - traits=GetPixelChannelMapTraits(image,i); channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); if (traits == UndefinedPixelTrait) continue; q[i]=PlasmaPixel(random_info,(u[channel]+v[channel])/2.0,plasma); @@ -3758,8 +3758,8 @@ static MagickBooleanType PlasmaImageProxy(Image *image,CacheView *image_view, return(MagickTrue); for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - traits=GetPixelChannelMapTraits(image,i); channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); if (traits == UndefinedPixelTrait) continue; q[i]=PlasmaPixel(random_info,(u[channel]+v[channel])/2.0,plasma); @@ -3782,8 +3782,8 @@ static MagickBooleanType PlasmaImageProxy(Image *image,CacheView *image_view, return(MagickTrue); for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - traits=GetPixelChannelMapTraits(image,i); channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); if (traits == UndefinedPixelTrait) continue; q[i]=PlasmaPixel(random_info,(u[channel]+v[channel])/2.0,plasma); @@ -3808,8 +3808,8 @@ static MagickBooleanType PlasmaImageProxy(Image *image,CacheView *image_view, return(MagickTrue); for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - traits=GetPixelChannelMapTraits(image,i); channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); if (traits == UndefinedPixelTrait) continue; q[i]=PlasmaPixel(random_info,(u[channel]+v[channel])/2.0,plasma); @@ -4444,10 +4444,14 @@ MagickExport Image *SketchImage(const Image *image,const double radius, value=GetPseudoRandomValue(random_info[id]); for (i=0; i < (ssize_t) GetPixelChannels(random_image); i++) { + PixelChannel + channel; + PixelTrait traits; - traits=GetPixelChannelMapTraits(random_image,i); + channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); if (traits == UndefinedPixelTrait) continue; q[i]=ClampToQuantum(QuantumRange*value); @@ -4600,10 +4604,14 @@ MagickExport MagickBooleanType SolarizeImage(Image *image, for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { + PixelChannel + channel; + PixelTrait traits; - traits=GetPixelChannelMapTraits(image,i); + channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); if ((traits == UndefinedPixelTrait) || ((traits & CopyPixelTrait) != 0)) continue; diff --git a/MagickCore/histogram.c b/MagickCore/histogram.c index 60f0ec41c..04695fe52 100644 --- a/MagickCore/histogram.c +++ b/MagickCore/histogram.c @@ -1014,10 +1014,14 @@ MagickExport MagickBooleanType MinMaxStretchImage(Image *image, ChannelType channel_mask; + PixelChannel + channel; + PixelTrait traits; - traits=GetPixelChannelMapTraits(image,i); + channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); if ((traits & UpdatePixelTrait) == 0) continue; channel_mask=SetPixelChannelMask(image,(ChannelType) (1 << i)); diff --git a/MagickCore/image.c b/MagickCore/image.c index fe8e52ac7..12acbb7e5 100644 --- a/MagickCore/image.c +++ b/MagickCore/image.c @@ -556,8 +556,8 @@ MagickExport Image *AppendImages(const Image *images, append_traits, traits; - traits=GetPixelChannelMapTraits(image,i); channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); append_traits=GetPixelChannelMapTraits(append_image,channel); if ((traits == UndefinedPixelTrait) || (append_traits == UndefinedPixelTrait)) @@ -1114,8 +1114,8 @@ MagickExport Image *CombineImages(const Image *image,ExceptionInfo *exception) if (next == (Image *) NULL) continue; - traits=GetPixelChannelMapTraits(image,i); channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); combine_traits=GetPixelChannelMapTraits(combine_image,channel); if ((traits == UndefinedPixelTrait) || (combine_traits == UndefinedPixelTrait)) @@ -2270,13 +2270,17 @@ MagickExport MagickBooleanType SeparateImage(Image *image, for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { + PixelChannel + channel; + PixelTrait traits; register ssize_t j; - traits=GetPixelChannelMapTraits(image,i); + channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); if (traits == UndefinedPixelTrait) continue; if ((traits & UpdatePixelTrait) != 0) @@ -2350,10 +2354,14 @@ MagickExport Image *SeparateImages(const Image *image,ExceptionInfo *exception) images=NewImageList(); for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { + PixelChannel + channel; + PixelTrait traits; - traits=GetPixelChannelMapTraits(image,i); + channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); if (traits == UndefinedPixelTrait) continue; if ((traits & UpdatePixelTrait) != 0) diff --git a/MagickCore/pixel-accessor.h b/MagickCore/pixel-accessor.h index 6040c13b2..6e2dd59a0 100644 --- a/MagickCore/pixel-accessor.h +++ b/MagickCore/pixel-accessor.h @@ -86,7 +86,7 @@ static inline Quantum GetPixelChannel(const Image *restrict image, } static inline PixelChannel GetPixelChannelMapChannel( - const Image *restrict image,const int offset) + const Image *restrict image,const ssize_t offset) { return(image->channel_map[offset].channel); } @@ -470,14 +470,14 @@ static inline void SetPixelChannel(const Image *restrict image, } static inline void SetPixelChannelMapChannel(const Image *restrict image, - const PixelChannel channel,const int offset) + const PixelChannel channel,const ssize_t offset) { image->channel_map[offset].channel=channel; image->channel_map[channel].offset=offset; } static inline void SetPixelChannelMap(const Image *restrict image, - const PixelChannel channel,const PixelTrait traits,const int offset) + const PixelChannel channel,const PixelTrait traits,const ssize_t offset) { image->channel_map[offset].channel=channel; image->channel_map[channel].offset=offset; diff --git a/MagickCore/pixel.c b/MagickCore/pixel.c index 261a8d1ed..bf66c6716 100644 --- a/MagickCore/pixel.c +++ b/MagickCore/pixel.c @@ -4220,8 +4220,8 @@ MagickExport MagickBooleanType InterpolatePixelChannels(const Image *source, register ssize_t j; - traits=GetPixelChannelMapTraits(source,i); channel=GetPixelChannelMapChannel(source,i); + traits=GetPixelChannelMapTraits(source,channel); destination_traits=GetPixelChannelMapTraits(destination,channel); if ((traits == UndefinedPixelTrait) || (destination_traits == UndefinedPixelTrait)) @@ -4268,8 +4268,8 @@ MagickExport MagickBooleanType InterpolatePixelChannels(const Image *source, register ssize_t j; - traits=GetPixelChannelMapTraits(source,i); channel=GetPixelChannelMapChannel(source,i); + traits=GetPixelChannelMapTraits(source,channel); destination_traits=GetPixelChannelMapTraits(destination,channel); if ((traits == UndefinedPixelTrait) || (destination_traits == UndefinedPixelTrait)) @@ -4322,8 +4322,8 @@ MagickExport MagickBooleanType InterpolatePixelChannels(const Image *source, delta, epsilon; - traits=GetPixelChannelMapTraits(source,i); channel=GetPixelChannelMapChannel(source,i); + traits=GetPixelChannelMapTraits(source,channel); destination_traits=GetPixelChannelMapTraits(destination,channel); if ((traits == UndefinedPixelTrait) || (destination_traits == UndefinedPixelTrait)) @@ -4377,8 +4377,8 @@ MagickExport MagickBooleanType InterpolatePixelChannels(const Image *source, RectangleInfo geometry; - traits=GetPixelChannelMapTraits(source,i); channel=GetPixelChannelMapChannel(source,i); + traits=GetPixelChannelMapTraits(source,channel); destination_traits=GetPixelChannelMapTraits(destination,channel); if ((traits == UndefinedPixelTrait) || (destination_traits == UndefinedPixelTrait)) @@ -4419,8 +4419,8 @@ MagickExport MagickBooleanType InterpolatePixelChannels(const Image *source, } for (i=0; i < (ssize_t) GetPixelChannels(source); i++) { - traits=GetPixelChannelMapTraits(source,i); channel=GetPixelChannelMapChannel(source,i); + traits=GetPixelChannelMapTraits(source,channel); destination_traits=GetPixelChannelMapTraits(destination,channel); if ((traits == UndefinedPixelTrait) || (destination_traits == UndefinedPixelTrait)) @@ -4440,8 +4440,8 @@ MagickExport MagickBooleanType InterpolatePixelChannels(const Image *source, } for (i=0; i < (ssize_t) GetPixelChannels(source); i++) { - traits=GetPixelChannelMapTraits(source,i); channel=GetPixelChannelMapChannel(source,i); + traits=GetPixelChannelMapTraits(source,channel); destination_traits=GetPixelChannelMapTraits(destination,channel); if ((traits == UndefinedPixelTrait) || (destination_traits == UndefinedPixelTrait)) @@ -4464,8 +4464,8 @@ MagickExport MagickBooleanType InterpolatePixelChannels(const Image *source, delta, luminance; - traits=GetPixelChannelMapTraits(source,i); channel=GetPixelChannelMapChannel(source,i); + traits=GetPixelChannelMapTraits(source,channel); destination_traits=GetPixelChannelMapTraits(destination,channel); if ((traits == UndefinedPixelTrait) || (destination_traits == UndefinedPixelTrait)) @@ -4584,8 +4584,8 @@ MagickExport MagickBooleanType InterpolatePixelChannels(const Image *source, k, n; - traits=GetPixelChannelMapTraits(source,i); channel=GetPixelChannelMapChannel(source,i); + traits=GetPixelChannelMapTraits(source,channel); destination_traits=GetPixelChannelMapTraits(destination,channel); if ((traits == UndefinedPixelTrait) || (destination_traits == UndefinedPixelTrait)) diff --git a/MagickCore/resize.c b/MagickCore/resize.c index 182a4c57a..3774d9612 100644 --- a/MagickCore/resize.c +++ b/MagickCore/resize.c @@ -1745,8 +1745,8 @@ MagickExport Image *LiquidRescaleImage(const Image *image,const size_t columns, rescale_traits, traits; - traits=GetPixelChannelMapTraits(image,i); channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); rescale_traits=GetPixelChannelMapTraits(rescale_image,channel); if ((traits == UndefinedPixelTrait) || (rescale_traits == UndefinedPixelTrait)) @@ -2177,8 +2177,8 @@ static MagickBooleanType HorizontalFilter(const ResizeFilter *resize_filter, ssize_t k; - traits=GetPixelChannelMapTraits(image,i); channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); resize_traits=GetPixelChannelMapTraits(resize_image,channel); if ((traits == UndefinedPixelTrait) || (resize_traits == UndefinedPixelTrait)) @@ -2390,8 +2390,8 @@ static MagickBooleanType VerticalFilter(const ResizeFilter *resize_filter, ssize_t k; - traits=GetPixelChannelMapTraits(image,i); channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); resize_traits=GetPixelChannelMapTraits(resize_image,channel); if ((traits == UndefinedPixelTrait) || (resize_traits == UndefinedPixelTrait)) @@ -2700,8 +2700,8 @@ MagickExport Image *SampleImage(const Image *image,const size_t columns, sample_traits, traits; - traits=GetPixelChannelMapTraits(image,i); channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); sample_traits=GetPixelChannelMapTraits(sample_image,channel); if ((traits == UndefinedPixelTrait) || (sample_traits == UndefinedPixelTrait)) @@ -2890,7 +2890,14 @@ MagickExport Image *ScaleImage(const Image *image,const size_t columns, { for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - traits=GetPixelChannelMapTraits(image,i); + PixelChannel + channel; + + PixelTrait + traits; + + channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); if ((traits & BlendPixelTrait) == 0) { x_vector[x*GetPixelChannels(image)+i]=(MagickRealType) p[i]; @@ -2923,7 +2930,14 @@ MagickExport Image *ScaleImage(const Image *image,const size_t columns, { for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - traits=GetPixelChannelMapTraits(image,i); + PixelChannel + channel; + + PixelTrait + traits; + + channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); if ((traits & BlendPixelTrait) == 0) { x_vector[x*GetPixelChannels(image)+i]=(MagickRealType) @@ -2958,10 +2972,18 @@ MagickExport Image *ScaleImage(const Image *image,const size_t columns, { for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - traits=GetPixelChannelMapTraits(image,i); + PixelChannel + channel; + + PixelTrait + traits; + + channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); if ((traits & BlendPixelTrait) == 0) { - x_vector[x*GetPixelChannels(image)+i]=(MagickRealType) p[i]; + x_vector[x*GetPixelChannels(image)+i]=(MagickRealType) + p[i]; continue; } alpha=QuantumScale*GetPixelAlpha(image,p); @@ -2999,8 +3021,8 @@ MagickExport Image *ScaleImage(const Image *image,const size_t columns, { for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - traits=GetPixelChannelMapTraits(image,i); channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); scale_traits=GetPixelChannelMapTraits(scale_image,channel); if ((traits == UndefinedPixelTrait) || (scale_traits == UndefinedPixelTrait)) @@ -3046,7 +3068,14 @@ MagickExport Image *ScaleImage(const Image *image,const size_t columns, } for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - traits=GetPixelChannelMapTraits(image,i); + PixelChannel + channel; + + PixelTrait + traits; + + channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); if (traits == UndefinedPixelTrait) continue; pixel[i]+=span.x*scanline[x*GetPixelChannels(image)+i]; @@ -3086,8 +3115,8 @@ MagickExport Image *ScaleImage(const Image *image,const size_t columns, { for (i=0; i < (ssize_t) GetPixelChannels(scale_image); i++) { - traits=GetPixelChannelMapTraits(image,i); channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); scale_traits=GetPixelChannelMapTraits(scale_image,channel); if ((traits == UndefinedPixelTrait) || (scale_traits == UndefinedPixelTrait)) diff --git a/MagickCore/shear.c b/MagickCore/shear.c index b9dcc71fa..6cb2db151 100644 --- a/MagickCore/shear.c +++ b/MagickCore/shear.c @@ -1097,8 +1097,8 @@ MagickExport Image *IntegralRotateImage(const Image *image,size_t rotations, rotate_traits, traits; - traits=GetPixelChannelMapTraits(image,i); channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); rotate_traits=GetPixelChannelMapTraits(rotate_image,channel); if ((traits == UndefinedPixelTrait) || (rotate_traits == UndefinedPixelTrait)) @@ -1183,8 +1183,8 @@ MagickExport Image *IntegralRotateImage(const Image *image,size_t rotations, rotate_traits, traits; - traits=GetPixelChannelMapTraits(image,i); channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); rotate_traits=GetPixelChannelMapTraits(rotate_image,channel); if ((traits == UndefinedPixelTrait) || (rotate_traits == UndefinedPixelTrait)) @@ -1306,8 +1306,8 @@ MagickExport Image *IntegralRotateImage(const Image *image,size_t rotations, rotate_traits, traits; - traits=GetPixelChannelMapTraits(image,i); channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); rotate_traits=GetPixelChannelMapTraits(rotate_image,channel); if ((traits == UndefinedPixelTrait) || (rotate_traits == UndefinedPixelTrait)) diff --git a/MagickCore/signature.c b/MagickCore/signature.c index fb6162850..0a97cf4e5 100644 --- a/MagickCore/signature.c +++ b/MagickCore/signature.c @@ -526,13 +526,17 @@ MagickExport MagickBooleanType SignatureImage(Image *image, for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { + PixelChannel + channel; + PixelTrait traits; register ssize_t j; - traits=GetPixelChannelMapTraits(image,i); + channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); if (traits == UndefinedPixelTrait) continue; if ((traits & UpdatePixelTrait) == 0) diff --git a/MagickCore/statistic.c b/MagickCore/statistic.c index e346f890c..a7fd9f15a 100644 --- a/MagickCore/statistic.c +++ b/MagickCore/statistic.c @@ -561,10 +561,8 @@ MagickExport Image *EvaluateImages(const Image *images, evaluate_traits, traits; - evaluate_traits=GetPixelChannelMapTraits(evaluate_image, - (PixelChannel) i); - channel=GetPixelChannelMapChannel(evaluate_image, - (PixelChannel) i); + channel=GetPixelChannelMapChannel(evaluate_image,i); + evaluate_traits=GetPixelChannelMapTraits(evaluate_image,channel); traits=GetPixelChannelMapTraits(next,channel); if ((traits == UndefinedPixelTrait) || (evaluate_traits == UndefinedPixelTrait)) @@ -670,10 +668,9 @@ MagickExport Image *EvaluateImages(const Image *images, evaluate_traits, traits; - evaluate_traits=GetPixelChannelMapTraits(evaluate_image, - (PixelChannel) i); channel=GetPixelChannelMapChannel(evaluate_image,i); traits=GetPixelChannelMapTraits(next,channel); + evaluate_traits=GetPixelChannelMapTraits(evaluate_image,channel); if ((traits == UndefinedPixelTrait) || (evaluate_traits == UndefinedPixelTrait)) continue; @@ -724,10 +721,14 @@ MagickExport Image *EvaluateImages(const Image *images, for (i=0; i < (ssize_t) GetPixelChannels(evaluate_image); i++) { + PixelChannel + channel; + PixelTrait traits; - traits=GetPixelChannelMapTraits(evaluate_image,i); + channel=GetPixelChannelMapChannel(evaluate_image,i); + traits=GetPixelChannelMapTraits(evaluate_image,channel); if (traits == UndefinedPixelTrait) continue; if ((traits & UpdatePixelTrait) == 0) @@ -820,10 +821,14 @@ MagickExport MagickBooleanType EvaluateImage(Image *image, for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { + PixelChannel + channel; + PixelTrait traits; - traits=GetPixelChannelMapTraits(image,i); + channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); if (traits == UndefinedPixelTrait) continue; q[i]=ClampToQuantum(ApplyEvaluateOperator(random_info[id],q[i],op, @@ -1038,10 +1043,14 @@ MagickExport MagickBooleanType FunctionImage(Image *image, for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { + PixelChannel + channel; + PixelTrait traits; - traits=GetPixelChannelMapTraits(image,i); + channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); if (traits == UndefinedPixelTrait) continue; if ((traits & UpdatePixelTrait) == 0) @@ -1173,10 +1182,14 @@ MagickExport MagickBooleanType GetImageMean(const Image *image,double *mean, channel_statistics[CompositePixelChannel].standard_deviation=0.0; for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { + PixelChannel + channel; + PixelTrait traits; - traits=GetPixelChannelMapTraits(image,i); + channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); if (traits == UndefinedPixelTrait) continue; if ((traits & UpdatePixelTrait) == 0) @@ -1288,10 +1301,14 @@ MagickExport MagickBooleanType GetImageKurtosis(const Image *image, for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { + PixelChannel + channel; + PixelTrait traits; - traits=GetPixelChannelMapTraits(image,i); + channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); if (traits == UndefinedPixelTrait) continue; if ((traits & UpdatePixelTrait) == 0) @@ -1407,10 +1424,14 @@ MagickExport MagickBooleanType GetImageRange(const Image *image,double *minima, for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { + PixelChannel + channel; + PixelTrait traits; - traits=GetPixelChannelMapTraits(image,i); + channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); if (traits == UndefinedPixelTrait) continue; if ((traits & UpdatePixelTrait) == 0) @@ -1477,10 +1498,14 @@ static size_t GetImageChannels(const Image *image) channels=0; for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { + PixelChannel + channel; + PixelTrait traits; - traits=GetPixelChannelMapTraits(image,i); + channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); if ((traits & UpdatePixelTrait) != 0) channels++; } @@ -1546,10 +1571,14 @@ MagickExport ChannelStatistics *GetImageStatistics(const Image *image, for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { + PixelChannel + channel; + PixelTrait traits; - traits=GetPixelChannelMapTraits(image,i); + channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); if (traits == UndefinedPixelTrait) continue; if (channel_statistics[i].depth != MAGICKCORE_QUANTUM_DEPTH) @@ -2233,8 +2262,8 @@ MagickExport Image *StatisticImage(const Image *image,const StatisticType type, ssize_t v; - traits=GetPixelChannelMapTraits(image,i); channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); statistic_traits=GetPixelChannelMapTraits(statistic_image,channel); if ((traits == UndefinedPixelTrait) || (statistic_traits == UndefinedPixelTrait)) diff --git a/MagickCore/threshold.c b/MagickCore/threshold.c index 0ef604d74..7684cc207 100644 --- a/MagickCore/threshold.c +++ b/MagickCore/threshold.c @@ -260,8 +260,8 @@ MagickExport Image *AdaptiveThresholdImage(const Image *image, ssize_t v; - traits=GetPixelChannelMapTraits(image,i); channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); threshold_traits=GetPixelChannelMapTraits(threshold_image,channel); if ((traits == UndefinedPixelTrait) || (threshold_traits == UndefinedPixelTrait)) @@ -409,10 +409,14 @@ MagickExport MagickBooleanType BilevelImage(Image *image,const double threshold, for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { + PixelChannel + channel; + PixelTrait traits; - traits=GetPixelChannelMapTraits(image,i); + channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); if ((traits & UpdatePixelTrait) != 0) q[i]=(Quantum) ((MagickRealType) q[i] <= threshold ? 0 : QuantumRange); @@ -555,10 +559,14 @@ MagickExport MagickBooleanType BlackThresholdImage(Image *image, n=0; for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { + PixelChannel + channel; + PixelTrait traits; - traits=GetPixelChannelMapTraits(image,i); + channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); if ((traits & UpdatePixelTrait) == 0) continue; if ((MagickRealType) q[i] < threshold[n++ % 5]) @@ -695,10 +703,14 @@ MagickExport MagickBooleanType ClampImage(Image *image,ExceptionInfo *exception) for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { + PixelChannel + channel; + PixelTrait traits; - traits=GetPixelChannelMapTraits(image,i); + channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); if (traits == UndefinedPixelTrait) continue; q[i]=ClampToUnsignedQuantum(q[i]); @@ -1313,6 +1325,9 @@ MagickExport MagickBooleanType OrderedPosterizeImage(Image *image, n=0; for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { + PixelChannel + channel; + PixelTrait traits; @@ -1320,7 +1335,8 @@ MagickExport MagickBooleanType OrderedPosterizeImage(Image *image, level, threshold; - traits=GetPixelChannelMapTraits(image,i); + channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); if ((traits & UpdatePixelTrait) == 0) continue; if (fabs(levels[n++]) < MagickEpsilon) @@ -1480,10 +1496,14 @@ MagickExport MagickBooleanType RandomThresholdImage(Image *image, MagickRealType threshold; + PixelChannel + channel; + PixelTrait traits; - traits=GetPixelChannelMapTraits(image,i); + channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); if ((traits & UpdatePixelTrait) == 0) continue; if ((MagickRealType) q[i] < min_threshold) @@ -1636,10 +1656,14 @@ MagickExport MagickBooleanType WhiteThresholdImage(Image *image, n=0; for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { + PixelChannel + channel; + PixelTrait traits; - traits=GetPixelChannelMapTraits(image,i); + channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); if ((traits & UpdatePixelTrait) == 0) continue; if ((MagickRealType) q[i] > threshold[n++ % 5]) diff --git a/MagickCore/transform.c b/MagickCore/transform.c index 50d01fb59..8f7c67af3 100644 --- a/MagickCore/transform.c +++ b/MagickCore/transform.c @@ -199,8 +199,8 @@ MagickExport Image *ChopImage(const Image *image,const RectangleInfo *chop_info, chop_traits, traits; - traits=GetPixelChannelMapTraits(image,(PixelChannel) i); - channel=GetPixelChannelMapChannel(image,(PixelChannel) i); + channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); chop_traits=GetPixelChannelMapTraits(chop_image,channel); if ((traits == UndefinedPixelTrait) || (chop_traits == UndefinedPixelTrait)) @@ -270,8 +270,8 @@ MagickExport Image *ChopImage(const Image *image,const RectangleInfo *chop_info, chop_traits, traits; - traits=GetPixelChannelMapTraits(image,(PixelChannel) i); - channel=GetPixelChannelMapChannel(image,(PixelChannel) i); + channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); chop_traits=GetPixelChannelMapTraits(chop_image,channel); if ((traits == UndefinedPixelTrait) || (chop_traits == UndefinedPixelTrait)) @@ -623,8 +623,8 @@ MagickExport Image *CropImage(const Image *image,const RectangleInfo *geometry, crop_traits, traits; - traits=GetPixelChannelMapTraits(image,(PixelChannel) i); - channel=GetPixelChannelMapChannel(image,(PixelChannel) i); + channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); crop_traits=GetPixelChannelMapTraits(crop_image,channel); if ((traits == UndefinedPixelTrait) || (crop_traits == UndefinedPixelTrait)) @@ -977,8 +977,8 @@ MagickExport Image *ExcerptImage(const Image *image, excerpt_traits, traits; - traits=GetPixelChannelMapTraits(image,(PixelChannel) i); - channel=GetPixelChannelMapChannel(image,(PixelChannel) i); + channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); excerpt_traits=GetPixelChannelMapTraits(excerpt_image,channel); if ((traits == UndefinedPixelTrait) || (excerpt_traits == UndefinedPixelTrait)) @@ -1177,8 +1177,8 @@ MagickExport Image *FlipImage(const Image *image,ExceptionInfo *exception) flip_traits, traits; - traits=GetPixelChannelMapTraits(image,(PixelChannel) i); - channel=GetPixelChannelMapChannel(image,(PixelChannel) i); + channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); flip_traits=GetPixelChannelMapTraits(flip_image,channel); if ((traits == UndefinedPixelTrait) || (flip_traits == UndefinedPixelTrait)) @@ -1319,8 +1319,8 @@ MagickExport Image *FlopImage(const Image *image,ExceptionInfo *exception) flop_traits, traits; - traits=GetPixelChannelMapTraits(image,(PixelChannel) i); - channel=GetPixelChannelMapChannel(image,(PixelChannel) i); + channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); flop_traits=GetPixelChannelMapTraits(flop_image,channel); if ((traits == UndefinedPixelTrait) || (flop_traits == UndefinedPixelTrait)) @@ -1446,8 +1446,8 @@ static inline MagickBooleanType CopyImageRegion(Image *destination, destination_traits, source_traits; - source_traits=GetPixelChannelMapTraits(source,(PixelChannel) i); - channel=GetPixelChannelMapChannel(source,(PixelChannel) i); + channel=GetPixelChannelMapChannel(source,i); + source_traits=GetPixelChannelMapTraits(source,channel); destination_traits=GetPixelChannelMapTraits(destination,channel); if ((source_traits == UndefinedPixelTrait) || (destination_traits == UndefinedPixelTrait)) @@ -1764,8 +1764,8 @@ MagickExport Image *SpliceImage(const Image *image, splice_traits, traits; - traits=GetPixelChannelMapTraits(image,(PixelChannel) i); - channel=GetPixelChannelMapChannel(image,(PixelChannel) i); + channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); splice_traits=GetPixelChannelMapTraits(splice_image,channel); if ((traits == UndefinedPixelTrait) || (splice_traits == UndefinedPixelTrait)) @@ -1791,8 +1791,8 @@ MagickExport Image *SpliceImage(const Image *image, traits, splice_traits; - traits=GetPixelChannelMapTraits(image,(PixelChannel) i); - channel=GetPixelChannelMapChannel(image,(PixelChannel) i); + channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); splice_traits=GetPixelChannelMapTraits(splice_image,channel); if ((traits == UndefinedPixelTrait) || (splice_traits == UndefinedPixelTrait)) @@ -1860,8 +1860,8 @@ MagickExport Image *SpliceImage(const Image *image, traits, splice_traits; - traits=GetPixelChannelMapTraits(image,(PixelChannel) i); - channel=GetPixelChannelMapChannel(image,(PixelChannel) i); + channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); splice_traits=GetPixelChannelMapTraits(splice_image,channel); if ((traits == UndefinedPixelTrait) || (splice_traits == UndefinedPixelTrait)) @@ -1887,8 +1887,8 @@ MagickExport Image *SpliceImage(const Image *image, traits, splice_traits; - traits=GetPixelChannelMapTraits(image,(PixelChannel) i); - channel=GetPixelChannelMapChannel(image,(PixelChannel) i); + channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); splice_traits=GetPixelChannelMapTraits(splice_image,channel); if ((traits == UndefinedPixelTrait) || (splice_traits == UndefinedPixelTrait)) @@ -2196,8 +2196,8 @@ MagickExport Image *TransposeImage(const Image *image,ExceptionInfo *exception) traits, transpose_traits; - traits=GetPixelChannelMapTraits(image,(PixelChannel) i); - channel=GetPixelChannelMapChannel(image,(PixelChannel) i); + channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); transpose_traits=GetPixelChannelMapTraits(transpose_image,channel); if ((traits == UndefinedPixelTrait) || (transpose_traits == UndefinedPixelTrait)) @@ -2343,8 +2343,8 @@ MagickExport Image *TransverseImage(const Image *image,ExceptionInfo *exception) traits, transverse_traits; - traits=GetPixelChannelMapTraits(image,(PixelChannel) i); - channel=GetPixelChannelMapChannel(image,(PixelChannel) i); + channel=GetPixelChannelMapChannel(image,i); + traits=GetPixelChannelMapTraits(image,channel); transverse_traits=GetPixelChannelMapTraits(transverse_image,channel); if ((traits == UndefinedPixelTrait) || (transverse_traits == UndefinedPixelTrait)) diff --git a/MagickCore/version.h b/MagickCore/version.h index 8d8b78a30..f44ba66a5 100644 --- a/MagickCore/version.h +++ b/MagickCore/version.h @@ -34,7 +34,7 @@ extern "C" { #define MagickLibAddendum "-0" #define MagickLibInterface 7 #define MagickLibMinInterface 7 -#define MagickReleaseDate "2011-12-08" +#define MagickReleaseDate "2011-12-11" #define MagickChangeDate "20110801" #define MagickAuthoritativeURL "http://www.imagemagick.org" #if defined(MAGICKCORE_OPENMP_SUPPORT) diff --git a/config/configure.xml b/config/configure.xml index 01825a330..eec6d4aee 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -11,7 +11,7 @@ - + -- 2.40.0