From: Cristy Date: Sun, 20 Aug 2017 00:09:26 +0000 (-0400) Subject: ... X-Git-Tag: 7.0.6-9~5 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3c296d614a508cc2b89af3407906e8e970bbfb8f;p=imagemagick ... --- diff --git a/MagickCore/attribute.c b/MagickCore/attribute.c index 1d1ffbfea..b9eb8ace1 100644 --- a/MagickCore/attribute.c +++ b/MagickCore/attribute.c @@ -412,8 +412,8 @@ MagickExport size_t GetImageDepth(const Image *image,ExceptionInfo *exception) } for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); if ((traits == UndefinedPixelTrait) || (channel == IndexPixelChannel) || (channel == ReadMaskPixelChannel) || diff --git a/MagickCore/cache-view.c b/MagickCore/cache-view.c index 9e4d9a2f6..7a0a6cace 100644 --- a/MagickCore/cache-view.c +++ b/MagickCore/cache-view.c @@ -732,7 +732,7 @@ MagickExport MagickBooleanType GetOneCacheViewAuthenticPixel( } for (i=0; i < (ssize_t) GetPixelChannels(cache_view->image); i++) { - PixelChannel channel=GetPixelChannelChannel(cache_view->image,i); + PixelChannel channel = GetPixelChannelChannel(cache_view->image,i); pixel[channel]=q[i]; } return(MagickTrue); @@ -805,7 +805,7 @@ MagickExport MagickBooleanType GetOneCacheViewVirtualPixel( } for (i=0; i < (ssize_t) GetPixelChannels(cache_view->image); i++) { - PixelChannel channel=GetPixelChannelChannel(cache_view->image,i); + PixelChannel channel = GetPixelChannelChannel(cache_view->image,i); pixel[channel]=p[i]; } return(MagickTrue); @@ -936,7 +936,7 @@ MagickExport MagickBooleanType GetOneCacheViewVirtualMethodPixel( } for (i=0; i < (ssize_t) GetPixelChannels(cache_view->image); i++) { - PixelChannel channel=GetPixelChannelChannel(cache_view->image,i); + PixelChannel channel = GetPixelChannelChannel(cache_view->image,i); pixel[channel]=p[i]; } return(MagickTrue); diff --git a/MagickCore/cache.c b/MagickCore/cache.c index 40f98e74f..027881741 100644 --- a/MagickCore/cache.c +++ b/MagickCore/cache.c @@ -1765,7 +1765,7 @@ static inline MagickBooleanType CopyPixel(const Image *image, } for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); + PixelChannel channel = GetPixelChannelChannel(image,i); destination[channel]=source[i]; } return(MagickTrue); diff --git a/MagickCore/channel.c b/MagickCore/channel.c index ae0e034bd..3f802419e 100644 --- a/MagickCore/channel.c +++ b/MagickCore/channel.c @@ -588,8 +588,8 @@ MagickExport Image *CombineImages(const Image *image, register ssize_t x; - PixelChannel channel=GetPixelChannelChannel(combine_image,i); - PixelTrait traits=GetPixelChannelTraits(combine_image,channel); + PixelChannel channel = GetPixelChannelChannel(combine_image,i); + PixelTrait traits = GetPixelChannelTraits(combine_image,channel); if (traits == UndefinedPixelTrait) continue; if (next == (Image *) NULL) @@ -781,8 +781,8 @@ MagickExport Image *SeparateImage(const Image *image, SetPixelChannel(separate_image,GrayPixelChannel,0,q); for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); if ((traits == UndefinedPixelTrait) || (GetChannelBit(channel_type,channel) == 0)) continue; @@ -855,8 +855,8 @@ MagickExport Image *SeparateImages(const Image *image,ExceptionInfo *exception) images=NewImageList(); for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); if ((traits == UndefinedPixelTrait) || ((traits & UpdatePixelTrait) == 0)) continue; separate_image=SeparateImage(image,(ChannelType) (1 << channel),exception); @@ -922,8 +922,8 @@ static inline void FlattenPixelInfo(const Image *image,const PixelInfo *p, gamma=PerceptibleReciprocal(gamma); for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); if (traits == UndefinedPixelTrait) continue; switch (channel) @@ -1033,8 +1033,8 @@ MagickExport MagickBooleanType SetImageAlphaChannel(Image *image, gamma=QuantumScale*GetPixelAlpha(image,q); for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); if (channel == AlphaPixelChannel) continue; if ((traits & UpdatePixelTrait) == 0) @@ -1160,8 +1160,8 @@ MagickExport MagickBooleanType SetImageAlphaChannel(Image *image, gamma=PerceptibleReciprocal(Sa); for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); if (channel == AlphaPixelChannel) continue; if ((traits & UpdatePixelTrait) == 0) diff --git a/MagickCore/compare.c b/MagickCore/compare.c index 714c5df38..2b5704d38 100644 --- a/MagickCore/compare.c +++ b/MagickCore/compare.c @@ -117,8 +117,8 @@ static size_t GetImageChannels(const Image *image) channels=0; for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); if ((traits & UpdatePixelTrait) != 0) channels++; } @@ -284,9 +284,9 @@ MagickExport Image *CompareImages(Image *image,const Image *reconstruct_image, double distance; - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); - PixelTrait reconstruct_traits=GetPixelChannelTraits(reconstruct_image, + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); + PixelTrait reconstruct_traits = GetPixelChannelTraits(reconstruct_image, channel); if ((traits == UndefinedPixelTrait) || (reconstruct_traits == UndefinedPixelTrait) || @@ -439,9 +439,9 @@ static MagickBooleanType GetAbsoluteDistortion(const Image *image, double distance; - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); - PixelTrait reconstruct_traits=GetPixelChannelTraits(reconstruct_image, + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); + PixelTrait reconstruct_traits = GetPixelChannelTraits(reconstruct_image, channel); if ((traits == UndefinedPixelTrait) || (reconstruct_traits == UndefinedPixelTrait) || @@ -548,9 +548,9 @@ static MagickBooleanType GetFuzzDistortion(const Image *image, double distance; - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); - PixelTrait reconstruct_traits=GetPixelChannelTraits(reconstruct_image, + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); + PixelTrait reconstruct_traits = GetPixelChannelTraits(reconstruct_image, channel); if ((traits == UndefinedPixelTrait) || (reconstruct_traits == UndefinedPixelTrait) || @@ -659,9 +659,9 @@ static MagickBooleanType GetMeanAbsoluteDistortion(const Image *image, double distance; - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); - PixelTrait reconstruct_traits=GetPixelChannelTraits(reconstruct_image, + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); + PixelTrait reconstruct_traits = GetPixelChannelTraits(reconstruct_image, channel); if ((traits == UndefinedPixelTrait) || (reconstruct_traits == UndefinedPixelTrait) || @@ -760,9 +760,9 @@ static MagickBooleanType GetMeanErrorPerPixel(Image *image, double distance; - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); - PixelTrait reconstruct_traits=GetPixelChannelTraits(reconstruct_image, + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); + PixelTrait reconstruct_traits = GetPixelChannelTraits(reconstruct_image, channel); if ((traits == UndefinedPixelTrait) || (reconstruct_traits == UndefinedPixelTrait) || @@ -866,9 +866,9 @@ static MagickBooleanType GetMeanSquaredDistortion(const Image *image, double distance; - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); - PixelTrait reconstruct_traits=GetPixelChannelTraits(reconstruct_image, + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); + PixelTrait reconstruct_traits = GetPixelChannelTraits(reconstruct_image, channel); if ((traits == UndefinedPixelTrait) || (reconstruct_traits == UndefinedPixelTrait) || @@ -1022,9 +1022,9 @@ static MagickBooleanType GetNormalizedCrossCorrelationDistortion( GetPixelAlpha(reconstruct_image,q) : OpaqueAlpha); for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); - PixelTrait reconstruct_traits=GetPixelChannelTraits(reconstruct_image, + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); + PixelTrait reconstruct_traits = GetPixelChannelTraits(reconstruct_image, channel); if ((traits == UndefinedPixelTrait) || (reconstruct_traits == UndefinedPixelTrait) || @@ -1072,7 +1072,7 @@ static MagickBooleanType GetNormalizedCrossCorrelationDistortion( double gamma; - PixelChannel channel=GetPixelChannelChannel(image,i); + PixelChannel channel = GetPixelChannelChannel(image,i); gamma=image_statistics[channel].standard_deviation* reconstruct_statistics[channel].standard_deviation; gamma=PerceptibleReciprocal(gamma); @@ -1163,9 +1163,9 @@ static MagickBooleanType GetPeakAbsoluteDistortion(const Image *image, double distance; - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); - PixelTrait reconstruct_traits=GetPixelChannelTraits(reconstruct_image, + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); + PixelTrait reconstruct_traits = GetPixelChannelTraits(reconstruct_image, channel); if ((traits == UndefinedPixelTrait) || (reconstruct_traits == UndefinedPixelTrait) || @@ -1406,11 +1406,11 @@ static MagickBooleanType GetStructuralSimilarityDistortion(const Image *image, for ( ; tile_x < (ssize_t) image->columns; tile_x+=(ssize_t) kernel_info->width) { double - image_reconstruct_sum[MaxPixelChannels+1], image_sum[MaxPixelChannels+1], image_sum_squared[MaxPixelChannels+1], reconstruct_sum[MaxPixelChannels+1], - reconstruct_sum_squared[MaxPixelChannels+1]; + reconstruct_sum_squared[MaxPixelChannels+1], + sum[MaxPixelChannels+1]; register const Quantum *magick_restrict p, @@ -1439,8 +1439,7 @@ static MagickBooleanType GetStructuralSimilarityDistortion(const Image *image, sizeof(*reconstruct_sum)); (void) ResetMagickMemory(reconstruct_sum_squared,0,(MaxPixelChannels+1)* sizeof(*reconstruct_sum_squared)); - (void) ResetMagickMemory(image_reconstruct_sum,0,(MaxPixelChannels+1)* - sizeof(*image_reconstruct_sum)); + (void) ResetMagickMemory(sum,0,(MaxPixelChannels+1)*sizeof(*sum)); k=kernel_info->values; for (y=0; y < (ssize_t) kernel_info->height; y++) { @@ -1454,9 +1453,9 @@ static MagickBooleanType GetStructuralSimilarityDistortion(const Image *image, for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); - PixelTrait reconstruct_traits=GetPixelChannelTraits( + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); + PixelTrait reconstruct_traits = GetPixelChannelTraits( reconstruct_image,channel); if ((traits == UndefinedPixelTrait) || (reconstruct_traits == UndefinedPixelTrait) || @@ -1468,7 +1467,7 @@ static MagickBooleanType GetStructuralSimilarityDistortion(const Image *image, q); reconstruct_sum_squared[i]+=((*k)*GetPixelChannel(reconstruct_image, channel,q)*(*k)*GetPixelChannel(reconstruct_image,channel,q)); - image_reconstruct_sum[i]+=((*k)*p[i]*(*k)*GetPixelChannel( + sum[i]+=((*k)*p[i]*(*k)*GetPixelChannel( reconstruct_image,channel,q)); } p+=GetPixelChannels(image); @@ -1478,8 +1477,8 @@ static MagickBooleanType GetStructuralSimilarityDistortion(const Image *image, for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { double + covarience, image_mean, - image_reconstruct_covariance, image_variance, reconstruct_mean, reconstruct_variance; @@ -1494,12 +1493,10 @@ static MagickBooleanType GetStructuralSimilarityDistortion(const Image *image, reconstruct_mean=reconstruct_sum[i]/number_samples; reconstruct_variance=reconstruct_sum_squared[i]/number_samples- (reconstruct_mean*reconstruct_mean); - image_reconstruct_covariance=image_reconstruct_sum[i]/number_samples- - (image_mean*reconstruct_mean); + covarience=sum[i]/number_samples-(image_mean*reconstruct_mean); channel_distortion[i]+=((2.0*image_mean*reconstruct_mean+c1)*(2.0* - image_reconstruct_covariance+c2))/((image_mean*image_mean+ - reconstruct_mean*reconstruct_mean+c1)*(image_variance+ - reconstruct_variance+c2)); + covarience+c2))/((image_mean*image_mean+reconstruct_mean* + reconstruct_mean+c1)*(image_variance+reconstruct_variance+c2)); } n++; } @@ -1514,8 +1511,8 @@ static MagickBooleanType GetStructuralSimilarityDistortion(const Image *image, reconstruct_view=DestroyCacheView(reconstruct_view); for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); if ((traits == UndefinedPixelTrait) || ((traits & UpdatePixelTrait) == 0)) continue; distortion[i]/=(double) n; @@ -1885,9 +1882,9 @@ MagickExport MagickBooleanType IsImagesEqual(const Image *image, double distance; - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); - PixelTrait reconstruct_traits=GetPixelChannelTraits(reconstruct_image, + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); + PixelTrait reconstruct_traits = GetPixelChannelTraits(reconstruct_image, channel); if ((traits == UndefinedPixelTrait) || (reconstruct_traits == UndefinedPixelTrait) || @@ -2024,9 +2021,9 @@ MagickExport MagickBooleanType SetImageColorMetric(Image *image, double distance; - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); - PixelTrait reconstruct_traits=GetPixelChannelTraits(reconstruct_image, + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); + PixelTrait reconstruct_traits = GetPixelChannelTraits(reconstruct_image, channel); if ((traits == UndefinedPixelTrait) || (reconstruct_traits == UndefinedPixelTrait) || @@ -2239,8 +2236,8 @@ MagickExport Image *SimilarityImage(const Image *image,const Image *reference, } for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); PixelTrait similarity_traits=GetPixelChannelTraits(similarity_image, channel); if ((traits == UndefinedPixelTrait) || diff --git a/MagickCore/composite.c b/MagickCore/composite.c index 7a170105b..7e51289f6 100644 --- a/MagickCore/composite.c +++ b/MagickCore/composite.c @@ -430,8 +430,8 @@ static MagickBooleanType CompositeOverImage(Image *image, MagickRealType pixel; - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); PixelTrait source_traits=GetPixelChannelTraits(source_image, channel); if ((traits == UndefinedPixelTrait) || @@ -466,8 +466,8 @@ static MagickBooleanType CompositeOverImage(Image *image, MagickRealType pixel; - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); PixelTrait source_traits=GetPixelChannelTraits(source_image,channel); if (traits == UndefinedPixelTrait) continue; @@ -667,8 +667,8 @@ MagickExport MagickBooleanType CompositeImage(Image *image, } for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); PixelTrait source_traits=GetPixelChannelTraits(source_image, channel); if (traits == UndefinedPixelTrait) @@ -1351,8 +1351,8 @@ MagickExport MagickBooleanType CompositeImage(Image *image, MagickRealType pixel; - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); PixelTrait source_traits=GetPixelChannelTraits(source_image, channel); if ((traits == UndefinedPixelTrait) || @@ -1527,8 +1527,8 @@ MagickExport MagickBooleanType CompositeImage(Image *image, pixel, sans; - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); PixelTrait source_traits=GetPixelChannelTraits(source_image,channel); if (traits == UndefinedPixelTrait) continue; @@ -2511,8 +2511,8 @@ MagickExport MagickBooleanType TextureImage(Image *image,const Image *texture, } for (i=0; i < (ssize_t) GetPixelChannels(texture_image); i++) { - PixelChannel channel=GetPixelChannelChannel(texture_image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(texture_image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); PixelTrait texture_traits=GetPixelChannelTraits(texture_image, channel); if ((traits == UndefinedPixelTrait) || diff --git a/MagickCore/decorate.c b/MagickCore/decorate.c index 2378cbc1d..ad923628e 100644 --- a/MagickCore/decorate.c +++ b/MagickCore/decorate.c @@ -686,8 +686,8 @@ MagickExport MagickBooleanType RaiseImage(Image *image, } for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); if ((traits & UpdatePixelTrait) == 0) continue; q[i]=ClampToQuantum(QuantumScale*((double) q[i]*HighlightFactor+(double) @@ -704,8 +704,8 @@ MagickExport MagickBooleanType RaiseImage(Image *image, } for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); if ((traits & UpdatePixelTrait) == 0) continue; q[i]=ClampToQuantum(QuantumScale*((double) q[i]*AccentuateFactor+ @@ -722,8 +722,8 @@ MagickExport MagickBooleanType RaiseImage(Image *image, } for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); if ((traits & UpdatePixelTrait) == 0) continue; q[i]=ClampToQuantum(QuantumScale*((double) q[i]*ShadowFactor+(double) @@ -776,8 +776,8 @@ MagickExport MagickBooleanType RaiseImage(Image *image, } for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); if ((traits & UpdatePixelTrait) == 0) continue; q[i]=ClampToQuantum(QuantumScale*((double) q[i]*HighlightFactor+(double) @@ -796,8 +796,8 @@ MagickExport MagickBooleanType RaiseImage(Image *image, } for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); if ((traits & UpdatePixelTrait) == 0) continue; q[i]=ClampToQuantum(QuantumScale*((double) q[i]*ShadowFactor+(double) @@ -850,8 +850,8 @@ MagickExport MagickBooleanType RaiseImage(Image *image, } for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); if ((traits & UpdatePixelTrait) == 0) continue; q[i]=ClampToQuantum(QuantumScale*((double) q[i]*HighlightFactor+(double) @@ -863,8 +863,8 @@ MagickExport MagickBooleanType RaiseImage(Image *image, { for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); if ((traits & UpdatePixelTrait) == 0) continue; q[i]=ClampToQuantum(QuantumScale*((double) q[i]*TroughFactor+ @@ -881,8 +881,8 @@ MagickExport MagickBooleanType RaiseImage(Image *image, } for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); if ((traits & UpdatePixelTrait) == 0) continue; q[i]=ClampToQuantum(QuantumScale*((double) q[i]*ShadowFactor+(double) diff --git a/MagickCore/enhance.c b/MagickCore/enhance.c index 8c3923f79..2e7e789b8 100644 --- a/MagickCore/enhance.c +++ b/MagickCore/enhance.c @@ -142,8 +142,8 @@ MagickExport MagickBooleanType AutoGammaImage(Image *image, ChannelType channel_mask; - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); if ((traits & UpdatePixelTrait) == 0) continue; channel_mask=SetImageChannelMask(image,(ChannelType) (1 << i)); @@ -1242,8 +1242,8 @@ MagickExport MagickBooleanType ContrastStretchImage(Image *image, } for (j=0; j < (ssize_t) GetPixelChannels(image); j++) { - PixelChannel channel=GetPixelChannelChannel(image,j); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,j); + PixelTrait traits = GetPixelChannelTraits(image,channel); if ((traits & UpdatePixelTrait) == 0) continue; if (black[j] == white[j]) @@ -1642,7 +1642,7 @@ MagickExport MagickBooleanType EqualizeImage(Image *image, { if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0) { - PixelChannel channel=GetPixelChannelChannel(image,RedPixelChannel); + PixelChannel channel = GetPixelChannelChannel(image,RedPixelChannel); if (black[channel] != white[channel]) image->colormap[j].red=equalize_map[GetPixelChannels(image)* ScaleQuantumToMap(ClampToQuantum(image->colormap[j].red))+ @@ -1650,7 +1650,7 @@ MagickExport MagickBooleanType EqualizeImage(Image *image, } if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0) { - PixelChannel channel=GetPixelChannelChannel(image, + PixelChannel channel = GetPixelChannelChannel(image, GreenPixelChannel); if (black[channel] != white[channel]) image->colormap[j].green=equalize_map[GetPixelChannels(image)* @@ -1659,7 +1659,7 @@ MagickExport MagickBooleanType EqualizeImage(Image *image, } if ((GetPixelBlueTraits(image) & UpdatePixelTrait) != 0) { - PixelChannel channel=GetPixelChannelChannel(image,BluePixelChannel); + PixelChannel channel = GetPixelChannelChannel(image,BluePixelChannel); if (black[channel] != white[channel]) image->colormap[j].blue=equalize_map[GetPixelChannels(image)* ScaleQuantumToMap(ClampToQuantum(image->colormap[j].blue))+ @@ -1667,7 +1667,7 @@ MagickExport MagickBooleanType EqualizeImage(Image *image, } if ((GetPixelAlphaTraits(image) & UpdatePixelTrait) != 0) { - PixelChannel channel=GetPixelChannelChannel(image, + PixelChannel channel = GetPixelChannelChannel(image, AlphaPixelChannel); if (black[channel] != white[channel]) image->colormap[j].alpha=equalize_map[GetPixelChannels(image)* @@ -1713,8 +1713,8 @@ MagickExport MagickBooleanType EqualizeImage(Image *image, } for (j=0; j < (ssize_t) GetPixelChannels(image); j++) { - PixelChannel channel=GetPixelChannelChannel(image,j); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,j); + PixelTrait traits = GetPixelChannelTraits(image,channel); if (((traits & UpdatePixelTrait) == 0) || (black[j] == white[j])) continue; q[j]=ClampToQuantum(equalize_map[GetPixelChannels(image)* @@ -1895,8 +1895,8 @@ MagickExport MagickBooleanType GammaImage(Image *image,const double gamma, } for (j=0; j < (ssize_t) GetPixelChannels(image); j++) { - PixelChannel channel=GetPixelChannelChannel(image,j); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,j); + PixelTrait traits = GetPixelChannelTraits(image,channel); if ((traits & UpdatePixelTrait) == 0) continue; #if !defined(MAGICKCORE_HDRI_SUPPORT) @@ -2468,8 +2468,8 @@ MagickExport MagickBooleanType LevelImage(Image *image,const double black_point, } for (j=0; j < (ssize_t) GetPixelChannels(image); j++) { - PixelChannel channel=GetPixelChannelChannel(image,j); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,j); + PixelTrait traits = GetPixelChannelTraits(image,channel); if ((traits & UpdatePixelTrait) == 0) continue; q[j]=ClampToQuantum(LevelPixel(black_point,white_point,gamma, @@ -2624,8 +2624,8 @@ MagickExport MagickBooleanType LevelizeImage(Image *image, } for (j=0; j < (ssize_t) GetPixelChannels(image); j++) { - PixelChannel channel=GetPixelChannelChannel(image,j); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,j); + PixelTrait traits = GetPixelChannelTraits(image,channel); if ((traits & UpdatePixelTrait) == 0) continue; q[j]=LevelizeValue(q[j]); @@ -3479,8 +3479,8 @@ MagickExport MagickBooleanType NegateImage(Image *image, } for (j=0; j < (ssize_t) GetPixelChannels(image); j++) { - PixelChannel channel=GetPixelChannelChannel(image,j); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,j); + PixelTrait traits = GetPixelChannelTraits(image,channel); if ((traits & UpdatePixelTrait) == 0) continue; q[j]=QuantumRange-q[j]; @@ -3542,8 +3542,8 @@ MagickExport MagickBooleanType NegateImage(Image *image, } for (j=0; j < (ssize_t) GetPixelChannels(image); j++) { - PixelChannel channel=GetPixelChannelChannel(image,j); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,j); + PixelTrait traits = GetPixelChannelTraits(image,channel); if ((traits & UpdatePixelTrait) == 0) continue; q[j]=QuantumRange-q[j]; @@ -3846,8 +3846,8 @@ MagickExport MagickBooleanType SigmoidalContrastImage(Image *image, } for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); if ((traits & UpdatePixelTrait) == 0) continue; if( sharpen != MagickFalse ) diff --git a/MagickCore/fx.c b/MagickCore/fx.c index 36e6b0597..c8fec9f16 100644 --- a/MagickCore/fx.c +++ b/MagickCore/fx.c @@ -361,8 +361,8 @@ MagickExport Image *AddNoiseImage(const Image *image,const NoiseType noise_type, for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); PixelTrait noise_traits=GetPixelChannelTraits(noise_image,channel); if ((traits == UndefinedPixelTrait) || (noise_traits == UndefinedPixelTrait)) @@ -768,7 +768,7 @@ MagickExport Image *ColorizeImage(const Image *image,const char *blend, for (i=0; i < (ssize_t) GetPixelChannels(colorize_image); i++) { - PixelTrait traits=GetPixelChannelTraits(colorize_image, + PixelTrait traits = GetPixelChannelTraits(colorize_image, (PixelChannel) i); if (traits == UndefinedPixelTrait) continue; @@ -3151,8 +3151,8 @@ MagickExport Image *FxImage(const Image *image,const char *expression, double alpha; - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); PixelTrait fx_traits=GetPixelChannelTraits(fx_image,channel); if ((traits == UndefinedPixelTrait) || (fx_traits == UndefinedPixelTrait)) @@ -3590,8 +3590,8 @@ MagickExport Image *MorphImages(const Image *image,const size_t number_frames, for (i=0; i < (ssize_t) GetPixelChannels(morph_image); i++) { - PixelChannel channel=GetPixelChannelChannel(morph_image,i); - PixelTrait traits=GetPixelChannelTraits(morph_image,channel); + PixelChannel channel = GetPixelChannelChannel(morph_image,i); + PixelTrait traits = GetPixelChannelTraits(morph_image,channel); PixelTrait morph_traits=GetPixelChannelTraits(morph_images,channel); if ((traits == UndefinedPixelTrait) || (morph_traits == UndefinedPixelTrait)) @@ -3793,8 +3793,8 @@ static MagickBooleanType PlasmaImageProxy(Image *image,CacheView *image_view, return(MagickTrue); for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); if (traits == UndefinedPixelTrait) continue; q[i]=PlasmaPixel(random_info,(u[i]+v[i])/2.0,plasma); @@ -3816,8 +3816,8 @@ static MagickBooleanType PlasmaImageProxy(Image *image,CacheView *image_view, return(MagickTrue); for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); if (traits == UndefinedPixelTrait) continue; q[i]=PlasmaPixel(random_info,(u[i]+v[i])/2.0,plasma); @@ -3845,8 +3845,8 @@ static MagickBooleanType PlasmaImageProxy(Image *image,CacheView *image_view, return(MagickTrue); for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); if (traits == UndefinedPixelTrait) continue; q[i]=PlasmaPixel(random_info,(u[i]+v[i])/2.0,plasma); @@ -3869,8 +3869,8 @@ static MagickBooleanType PlasmaImageProxy(Image *image,CacheView *image_view, return(MagickTrue); for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); if (traits == UndefinedPixelTrait) continue; q[i]=PlasmaPixel(random_info,(u[i]+v[i])/2.0,plasma); @@ -3896,8 +3896,8 @@ static MagickBooleanType PlasmaImageProxy(Image *image,CacheView *image_view, return(MagickTrue); for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); if (traits == UndefinedPixelTrait) continue; q[i]=PlasmaPixel(random_info,(u[i]+v[i])/2.0,plasma); @@ -4547,8 +4547,8 @@ 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=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); if (traits == UndefinedPixelTrait) continue; q[i]=ClampToQuantum(QuantumRange*value); @@ -4709,8 +4709,8 @@ MagickExport MagickBooleanType SolarizeImage(Image *image, } for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); if ((traits & UpdatePixelTrait) == 0) continue; if ((double) q[i] > threshold) @@ -5429,8 +5429,8 @@ MagickExport Image *TintImage(const Image *image,const char *blend, for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); PixelTrait tint_traits=GetPixelChannelTraits(tint_image,channel); if ((traits == UndefinedPixelTrait) || (tint_traits == UndefinedPixelTrait)) diff --git a/MagickCore/histogram.c b/MagickCore/histogram.c index 5383d3bc3..03dc54ea1 100644 --- a/MagickCore/histogram.c +++ b/MagickCore/histogram.c @@ -921,8 +921,8 @@ MagickExport MagickBooleanType MinMaxStretchImage(Image *image, ChannelType channel_mask; - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); if ((traits & UpdatePixelTrait) == 0) continue; channel_mask=SetImageChannelMask(image,(ChannelType) (1 << i)); diff --git a/MagickCore/identify.c b/MagickCore/identify.c index ea185b0ae..2765e7fbd 100644 --- a/MagickCore/identify.c +++ b/MagickCore/identify.c @@ -187,8 +187,8 @@ static ChannelStatistics *GetLocationStatistics(const Image *image, } for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); if (traits == UndefinedPixelTrait) continue; switch (type) @@ -324,7 +324,7 @@ static ssize_t PrintChannelLocations(FILE *file,const Image *image, MagickBooleanType match; - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelTrait traits = GetPixelChannelTraits(image,channel); if (traits == UndefinedPixelTrait) continue; offset=GetPixelChannelOffset(image,channel); diff --git a/MagickCore/image.c b/MagickCore/image.c index 5e852fbdf..c63fdfcdd 100644 --- a/MagickCore/image.c +++ b/MagickCore/image.c @@ -1118,8 +1118,8 @@ MagickExport MagickBooleanType CopyImagePixels(Image *image, for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); PixelTrait source_traits=GetPixelChannelTraits(source_image,channel); if ((traits == UndefinedPixelTrait) || ((traits & UpdatePixelTrait) == 0) || diff --git a/MagickCore/paint.c b/MagickCore/paint.c index 01ee6a8e9..1e386a7ff 100644 --- a/MagickCore/paint.c +++ b/MagickCore/paint.c @@ -822,8 +822,8 @@ MagickExport Image *OilPaintImage(const Image *image,const double radius, } for (i=0; i < (ssize_t) GetPixelChannels(linear_image); i++) { - PixelChannel channel=GetPixelChannelChannel(linear_image,i); - PixelTrait traits=GetPixelChannelTraits(linear_image,channel); + PixelChannel channel = GetPixelChannelChannel(linear_image,i); + PixelTrait traits = GetPixelChannelTraits(linear_image,channel); PixelTrait paint_traits=GetPixelChannelTraits(paint_image,channel); if ((traits == UndefinedPixelTrait) || (paint_traits == UndefinedPixelTrait)) diff --git a/MagickCore/pixel.c b/MagickCore/pixel.c index d2649b161..e888f9caa 100644 --- a/MagickCore/pixel.c +++ b/MagickCore/pixel.c @@ -4966,8 +4966,8 @@ MagickExport MagickBooleanType InterpolatePixelChannels(const Image *source, register ssize_t j; - PixelChannel channel=GetPixelChannelChannel(source,i); - PixelTrait traits=GetPixelChannelTraits(source,channel); + PixelChannel channel = GetPixelChannelChannel(source,i); + PixelTrait traits = GetPixelChannelTraits(source,channel); PixelTrait destination_traits=GetPixelChannelTraits(destination, channel); if ((traits == UndefinedPixelTrait) || @@ -5012,8 +5012,8 @@ MagickExport MagickBooleanType InterpolatePixelChannels(const Image *source, delta, epsilon; - PixelChannel channel=GetPixelChannelChannel(source,i); - PixelTrait traits=GetPixelChannelTraits(source,channel); + PixelChannel channel = GetPixelChannelChannel(source,i); + PixelTrait traits = GetPixelChannelTraits(source,channel); PixelTrait destination_traits=GetPixelChannelTraits(destination, channel); if ((traits == UndefinedPixelTrait) || @@ -5068,8 +5068,8 @@ MagickExport MagickBooleanType InterpolatePixelChannels(const Image *source, register ssize_t j; - PixelChannel channel=GetPixelChannelChannel(source,i); - PixelTrait traits=GetPixelChannelTraits(source,channel); + PixelChannel channel = GetPixelChannelChannel(source,i); + PixelTrait traits = GetPixelChannelTraits(source,channel); PixelTrait destination_traits=GetPixelChannelTraits(destination, channel); if ((traits == UndefinedPixelTrait) || @@ -5145,8 +5145,8 @@ MagickExport MagickBooleanType InterpolatePixelChannels(const Image *source, register ssize_t j; - PixelChannel channel=GetPixelChannelChannel(source,i); - PixelTrait traits=GetPixelChannelTraits(source,channel); + PixelChannel channel = GetPixelChannelChannel(source,i); + PixelTrait traits = GetPixelChannelTraits(source,channel); PixelTrait destination_traits=GetPixelChannelTraits(destination, channel); if ((traits == UndefinedPixelTrait) || @@ -5192,8 +5192,8 @@ MagickExport MagickBooleanType InterpolatePixelChannels(const Image *source, } for (i=0; i < (ssize_t) GetPixelChannels(source); i++) { - PixelChannel channel=GetPixelChannelChannel(source,i); - PixelTrait traits=GetPixelChannelTraits(source,channel); + PixelChannel channel = GetPixelChannelChannel(source,i); + PixelTrait traits = GetPixelChannelTraits(source,channel); PixelTrait destination_traits=GetPixelChannelTraits(destination, channel); if ((traits == UndefinedPixelTrait) || @@ -5215,8 +5215,8 @@ MagickExport MagickBooleanType InterpolatePixelChannels(const Image *source, } for (i=0; i < (ssize_t) GetPixelChannels(source); i++) { - PixelChannel channel=GetPixelChannelChannel(source,i); - PixelTrait traits=GetPixelChannelTraits(source,channel); + PixelChannel channel = GetPixelChannelChannel(source,i); + PixelTrait traits = GetPixelChannelTraits(source,channel); PixelTrait destination_traits=GetPixelChannelTraits(destination, channel); if ((traits == UndefinedPixelTrait) || @@ -5240,8 +5240,8 @@ MagickExport MagickBooleanType InterpolatePixelChannels(const Image *source, delta, luminance; - PixelChannel channel=GetPixelChannelChannel(source,i); - PixelTrait traits=GetPixelChannelTraits(source,channel); + PixelChannel channel = GetPixelChannelChannel(source,i); + PixelTrait traits = GetPixelChannelTraits(source,channel); PixelTrait destination_traits=GetPixelChannelTraits(destination, channel); if ((traits == UndefinedPixelTrait) || @@ -5352,8 +5352,8 @@ MagickExport MagickBooleanType InterpolatePixelChannels(const Image *source, register ssize_t j; - PixelChannel channel=GetPixelChannelChannel(source,i); - PixelTrait traits=GetPixelChannelTraits(source,channel); + PixelChannel channel = GetPixelChannelChannel(source,i); + PixelTrait traits = GetPixelChannelTraits(source,channel); PixelTrait destination_traits=GetPixelChannelTraits(destination, channel); if ((traits == UndefinedPixelTrait) || @@ -6276,7 +6276,7 @@ MagickExport ChannelType SetPixelChannelMask(Image *image, image->channel_mask=channel_mask; for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); + PixelChannel channel = GetPixelChannelChannel(image,i); if (GetChannelBit(channel_mask,channel) == 0) { SetPixelChannelTraits(image,channel,CopyPixelTrait); diff --git a/MagickCore/quantum-export.c b/MagickCore/quantum-export.c index a0ee51c01..05bd817ad 100644 --- a/MagickCore/quantum-export.c +++ b/MagickCore/quantum-export.c @@ -3928,8 +3928,8 @@ MagickExport size_t ExportQuantumPixels(const Image *image, Sa=QuantumScale*GetPixelAlpha(image,q); for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); if ((traits & UpdatePixelTrait) == 0) continue; q[i]=ClampToQuantum(Sa*q[i]); diff --git a/MagickCore/quantum-import.c b/MagickCore/quantum-import.c index 2dc348ed1..4f1c9e8d1 100644 --- a/MagickCore/quantum-import.c +++ b/MagickCore/quantum-import.c @@ -4289,8 +4289,8 @@ MagickExport size_t ImportQuantumPixels(const Image *image, gamma=PerceptibleReciprocal(Sa); for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); if ((channel == AlphaPixelChannel) || ((traits & UpdatePixelTrait) == 0)) continue; diff --git a/MagickCore/resize.c b/MagickCore/resize.c index 608e086c3..fd1caf89b 100644 --- a/MagickCore/resize.c +++ b/MagickCore/resize.c @@ -3347,8 +3347,8 @@ MagickExport Image *ScaleImage(const Image *image,const size_t columns, alpha=QuantumScale*GetPixelAlpha(image,p); for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); if ((traits & BlendPixelTrait) == 0) { x_vector[x*GetPixelChannels(image)+i]=(double) p[i]; @@ -3390,8 +3390,8 @@ MagickExport Image *ScaleImage(const Image *image,const size_t columns, alpha=QuantumScale*GetPixelAlpha(image,p); for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); if ((traits & BlendPixelTrait) == 0) { x_vector[x*GetPixelChannels(image)+i]=(double) p[i]; @@ -3434,8 +3434,8 @@ MagickExport Image *ScaleImage(const Image *image,const size_t columns, alpha=QuantumScale*GetPixelAlpha(image,p); for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); if ((traits & BlendPixelTrait) == 0) { x_vector[x*GetPixelChannels(image)+i]=(double) p[i]; @@ -3486,8 +3486,8 @@ MagickExport Image *ScaleImage(const Image *image,const size_t columns, } for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); scale_traits=GetPixelChannelTraits(scale_image,channel); if ((traits == UndefinedPixelTrait) || (scale_traits == UndefinedPixelTrait)) @@ -3530,8 +3530,8 @@ MagickExport Image *ScaleImage(const Image *image,const size_t columns, } for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); if (traits == UndefinedPixelTrait) continue; pixel[i]+=span.x*scanline[x*GetPixelChannels(image)+i]; @@ -3582,8 +3582,8 @@ MagickExport Image *ScaleImage(const Image *image,const size_t columns, } for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); scale_traits=GetPixelChannelTraits(scale_image,channel); if ((traits == UndefinedPixelTrait) || (scale_traits == UndefinedPixelTrait)) diff --git a/MagickCore/shear.c b/MagickCore/shear.c index 0d0ea1f3b..dc213710e 100644 --- a/MagickCore/shear.c +++ b/MagickCore/shear.c @@ -838,8 +838,8 @@ MagickExport Image *IntegralRotateImage(const Image *image,size_t rotations, } for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); PixelTrait rotate_traits=GetPixelChannelTraits(rotate_image, channel); if ((traits == UndefinedPixelTrait) || @@ -927,8 +927,8 @@ MagickExport Image *IntegralRotateImage(const Image *image,size_t rotations, } for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); PixelTrait rotate_traits=GetPixelChannelTraits(rotate_image, channel); if ((traits == UndefinedPixelTrait) || @@ -1051,8 +1051,8 @@ MagickExport Image *IntegralRotateImage(const Image *image,size_t rotations, } for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); PixelTrait rotate_traits=GetPixelChannelTraits(rotate_image, channel); if ((traits == UndefinedPixelTrait) || diff --git a/MagickCore/signature.c b/MagickCore/signature.c index fbdaf0403..66f61c71f 100644 --- a/MagickCore/signature.c +++ b/MagickCore/signature.c @@ -530,8 +530,8 @@ MagickExport MagickBooleanType SignatureImage(Image *image, register ssize_t j; - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); if (traits == UndefinedPixelTrait) continue; pixel=QuantumScale*p[i]; diff --git a/MagickCore/statistic.c b/MagickCore/statistic.c index 9eeab8b79..ae4ecaf0b 100644 --- a/MagickCore/statistic.c +++ b/MagickCore/statistic.c @@ -545,9 +545,9 @@ MagickExport Image *EvaluateImages(const Image *images, } for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); + PixelChannel channel = GetPixelChannelChannel(image,i); PixelTrait evaluate_traits=GetPixelChannelTraits(image,channel); - PixelTrait traits=GetPixelChannelTraits(next,channel); + PixelTrait traits = GetPixelChannelTraits(next,channel); if ((traits == UndefinedPixelTrait) || (evaluate_traits == UndefinedPixelTrait)) continue; @@ -653,8 +653,8 @@ MagickExport Image *EvaluateImages(const Image *images, } for (i=0; i < (ssize_t) GetPixelChannels(next); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(next,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(next,channel); PixelTrait evaluate_traits=GetPixelChannelTraits(image,channel); if ((traits == UndefinedPixelTrait) || (evaluate_traits == UndefinedPixelTrait)) @@ -718,8 +718,8 @@ MagickExport Image *EvaluateImages(const Image *images, } for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); if (traits == UndefinedPixelTrait) continue; if ((traits & UpdatePixelTrait) == 0) @@ -822,8 +822,8 @@ MagickExport MagickBooleanType EvaluateImage(Image *image, for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); if (traits == UndefinedPixelTrait) continue; if (((traits & CopyPixelTrait) != 0) || @@ -1056,8 +1056,8 @@ MagickExport MagickBooleanType FunctionImage(Image *image, } for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); if (traits == UndefinedPixelTrait) continue; if ((traits & UpdatePixelTrait) == 0) @@ -1320,8 +1320,8 @@ static size_t GetImageChannels(const Image *image) channels=0; for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); if (traits == UndefinedPixelTrait) continue; channels++; @@ -1409,8 +1409,8 @@ MagickExport ChannelMoments *GetImageMoments(const Image *image, } for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); if (traits == UndefinedPixelTrait) continue; if ((traits & UpdatePixelTrait) == 0) @@ -1467,8 +1467,8 @@ MagickExport ChannelMoments *GetImageMoments(const Image *image, } for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); if (traits == UndefinedPixelTrait) continue; if ((traits & UpdatePixelTrait) == 0) @@ -1838,8 +1838,8 @@ MagickExport MagickBooleanType GetImageRange(const Image *image,double *minima, } for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); if (traits == UndefinedPixelTrait) continue; if ((traits & UpdatePixelTrait) == 0) @@ -1996,8 +1996,8 @@ MagickExport ChannelStatistics *GetImageStatistics(const Image *image, } for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); if (traits == UndefinedPixelTrait) continue; if ((traits & UpdatePixelTrait) == 0) @@ -2072,7 +2072,7 @@ MagickExport ChannelStatistics *GetImageStatistics(const Image *image, /* Compute pixel entropy. */ - PixelChannel channel=GetPixelChannelChannel(image,i); + PixelChannel channel = GetPixelChannelChannel(image,i); number_bins=0.0; for (j=0; j <= (ssize_t) MaxMap; j++) if (histogram[GetPixelChannels(image)*j+i] > 0.0) @@ -2283,8 +2283,8 @@ MagickExport Image *PolynomialImage(const Image *images, coefficient, degree; - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(next,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(next,channel); PixelTrait polynomial_traits=GetPixelChannelTraits(image,channel); if ((traits == UndefinedPixelTrait) || (polynomial_traits == UndefinedPixelTrait)) @@ -2313,8 +2313,8 @@ MagickExport Image *PolynomialImage(const Image *images, } for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); if (traits == UndefinedPixelTrait) continue; if ((traits & UpdatePixelTrait) == 0) @@ -2941,8 +2941,8 @@ MagickExport Image *StatisticImage(const Image *image,const StatisticType type, ssize_t v; - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); PixelTrait statistic_traits=GetPixelChannelTraits(statistic_image, channel); if ((traits == UndefinedPixelTrait) || diff --git a/MagickCore/stream.c b/MagickCore/stream.c index a6db6fcb0..7415e0d68 100644 --- a/MagickCore/stream.c +++ b/MagickCore/stream.c @@ -468,7 +468,7 @@ static MagickBooleanType GetOneAuthenticPixelFromStream(Image *image, } for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); + PixelChannel channel = GetPixelChannelChannel(image,i); pixel[channel]=p[i]; } return(MagickTrue); @@ -532,7 +532,7 @@ static MagickBooleanType GetOneVirtualPixelFromStream(const Image *image, } for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); + PixelChannel channel = GetPixelChannelChannel(image,i); pixel[channel]=p[i]; } return(MagickTrue); diff --git a/MagickCore/threshold.c b/MagickCore/threshold.c index 834de2de7..ab2e4a2d8 100644 --- a/MagickCore/threshold.c +++ b/MagickCore/threshold.c @@ -267,8 +267,8 @@ MagickExport Image *AdaptiveThresholdImage(const Image *image, GetPixelChannels(image)*(width/2); for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); PixelTrait threshold_traits=GetPixelChannelTraits(threshold_image, channel); if ((traits == UndefinedPixelTrait) || @@ -302,8 +302,8 @@ MagickExport Image *AdaptiveThresholdImage(const Image *image, double mean; - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); PixelTrait threshold_traits=GetPixelChannelTraits(threshold_image, channel); if ((traits == UndefinedPixelTrait) || @@ -865,8 +865,8 @@ MagickExport MagickBooleanType BilevelImage(Image *image,const double threshold, pixel=GetPixelIntensity(image,q); for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); if ((traits & UpdatePixelTrait) == 0) continue; if (image->channel_mask != DefaultChannels) @@ -1030,8 +1030,8 @@ MagickExport MagickBooleanType BlackThresholdImage(Image *image, pixel=GetPixelIntensity(image,q); for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); if ((traits & UpdatePixelTrait) == 0) continue; if (image->channel_mask != DefaultChannels) @@ -1165,8 +1165,8 @@ MagickExport MagickBooleanType ClampImage(Image *image,ExceptionInfo *exception) } for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); if ((traits & UpdatePixelTrait) == 0) continue; q[i]=ClampPixel((MagickRealType) q[i]); @@ -1810,8 +1810,8 @@ MagickExport MagickBooleanType OrderedDitherImage(Image *image, level, threshold; - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); if ((traits & UpdatePixelTrait) == 0) continue; if (fabs(levels[n]) < MagickEpsilon) @@ -1973,8 +1973,8 @@ MagickExport MagickBooleanType PerceptibleImage(Image *image, } for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); if (traits == UndefinedPixelTrait) continue; q[i]=PerceptibleThreshold(q[i],epsilon); @@ -2113,8 +2113,8 @@ MagickExport MagickBooleanType RandomThresholdImage(Image *image, double threshold; - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); if ((traits & UpdatePixelTrait) == 0) continue; if ((double) q[i] < min_threshold) @@ -2285,8 +2285,8 @@ MagickExport MagickBooleanType WhiteThresholdImage(Image *image, pixel=GetPixelIntensity(image,q); for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); if ((traits & UpdatePixelTrait) == 0) continue; if (image->channel_mask != DefaultChannels) diff --git a/MagickCore/transform.c b/MagickCore/transform.c index 773e1d180..2e04575d3 100644 --- a/MagickCore/transform.c +++ b/MagickCore/transform.c @@ -284,8 +284,8 @@ MagickExport Image *ChopImage(const Image *image,const RectangleInfo *chop_info, for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); PixelTrait chop_traits=GetPixelChannelTraits(chop_image,channel); if ((traits == UndefinedPixelTrait) || (chop_traits == UndefinedPixelTrait)) @@ -349,8 +349,8 @@ MagickExport Image *ChopImage(const Image *image,const RectangleInfo *chop_info, for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); PixelTrait chop_traits=GetPixelChannelTraits(chop_image,channel); if ((traits == UndefinedPixelTrait) || (chop_traits == UndefinedPixelTrait)) @@ -707,8 +707,8 @@ MagickExport Image *CropImage(const Image *image,const RectangleInfo *geometry, } for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); PixelTrait crop_traits=GetPixelChannelTraits(crop_image,channel); if ((traits == UndefinedPixelTrait) || (crop_traits == UndefinedPixelTrait)) @@ -1060,8 +1060,8 @@ MagickExport Image *ExcerptImage(const Image *image, } for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); PixelTrait excerpt_traits=GetPixelChannelTraits(excerpt_image,channel); if ((traits == UndefinedPixelTrait) || (excerpt_traits == UndefinedPixelTrait)) @@ -1258,8 +1258,8 @@ MagickExport Image *FlipImage(const Image *image,ExceptionInfo *exception) } for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); PixelTrait flip_traits=GetPixelChannelTraits(flip_image,channel); if ((traits == UndefinedPixelTrait) || (flip_traits == UndefinedPixelTrait)) @@ -1399,8 +1399,8 @@ MagickExport Image *FlopImage(const Image *image,ExceptionInfo *exception) } for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); PixelTrait flop_traits=GetPixelChannelTraits(flop_image,channel); if ((traits == UndefinedPixelTrait) || (flop_traits == UndefinedPixelTrait)) @@ -1527,7 +1527,7 @@ static MagickBooleanType CopyImageRegion(Image *destination,const Image *source, } for (i=0; i < (ssize_t) GetPixelChannels(source); i++) { - PixelChannel channel=GetPixelChannelChannel(source,i); + PixelChannel channel = GetPixelChannelChannel(source,i); PixelTrait source_traits=GetPixelChannelTraits(source,channel); PixelTrait destination_traits=GetPixelChannelTraits(destination, channel); @@ -1855,8 +1855,8 @@ MagickExport Image *SpliceImage(const Image *image, } for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); PixelTrait splice_traits=GetPixelChannelTraits(splice_image,channel); if ((traits == UndefinedPixelTrait) || (splice_traits == UndefinedPixelTrait)) @@ -1886,8 +1886,8 @@ MagickExport Image *SpliceImage(const Image *image, } for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); PixelTrait splice_traits=GetPixelChannelTraits(splice_image,channel); if ((traits == UndefinedPixelTrait) || (splice_traits == UndefinedPixelTrait)) @@ -1960,8 +1960,8 @@ MagickExport Image *SpliceImage(const Image *image, } for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); PixelTrait splice_traits=GetPixelChannelTraits(splice_image,channel); if ((traits == UndefinedPixelTrait) || (splice_traits == UndefinedPixelTrait)) @@ -1991,8 +1991,8 @@ MagickExport Image *SpliceImage(const Image *image, } for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); PixelTrait splice_traits=GetPixelChannelTraits(splice_image,channel); if ((traits == UndefinedPixelTrait) || (splice_traits == UndefinedPixelTrait)) @@ -2234,8 +2234,8 @@ MagickExport Image *TransposeImage(const Image *image,ExceptionInfo *exception) } for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); PixelTrait transpose_traits=GetPixelChannelTraits(transpose_image, channel); if ((traits == UndefinedPixelTrait) || @@ -2381,8 +2381,8 @@ MagickExport Image *TransverseImage(const Image *image,ExceptionInfo *exception) } for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); PixelTrait transverse_traits=GetPixelChannelTraits(transverse_image, channel); if ((traits == UndefinedPixelTrait) || diff --git a/coders/json.c b/coders/json.c index 164591252..433623048 100644 --- a/coders/json.c +++ b/coders/json.c @@ -328,8 +328,8 @@ static ChannelStatistics *GetLocationStatistics(const Image *image, } for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); if (traits == UndefinedPixelTrait) continue; switch (type) @@ -541,7 +541,7 @@ static ssize_t PrintChannelLocations(FILE *file,const Image *image, MagickBooleanType match; - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelTrait traits = GetPixelChannelTraits(image,channel); if (traits == UndefinedPixelTrait) continue; offset=GetPixelChannelOffset(image,channel); @@ -631,8 +631,8 @@ static ssize_t PrintChannelPerceptualHash(Image *image,FILE *file, register ssize_t j; - PixelChannel channel=GetPixelChannelChannel(image,i); - PixelTrait traits=GetPixelChannelTraits(image,channel); + PixelChannel channel = GetPixelChannelChannel(image,i); + PixelTrait traits = GetPixelChannelTraits(image,channel); if (traits == UndefinedPixelTrait) continue; n=FormatLocaleFile(file," \"Channel%.20g\": {\n",(double) channel); diff --git a/coders/psd.c b/coders/psd.c index de5578bac..e5bdd622a 100644 --- a/coders/psd.c +++ b/coders/psd.c @@ -331,7 +331,7 @@ static MagickBooleanType CorrectPSDAlphaBlend(const ImageInfo *image_info, { for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { - PixelChannel channel=GetPixelChannelChannel(image,i); + PixelChannel channel = GetPixelChannelChannel(image,i); if (channel != AlphaPixelChannel) q[i]=ClampToQuantum((q[i]-((1.0-gamma)*QuantumRange))/gamma); }