diff options
Diffstat (limited to 'MagickCore/distort.c')
| -rw-r--r-- | MagickCore/distort.c | 43 |
1 files changed, 20 insertions, 23 deletions
diff --git a/MagickCore/distort.c b/MagickCore/distort.c index be91ae16a..9da736658 100644 --- a/MagickCore/distort.c +++ b/MagickCore/distort.c @@ -18,7 +18,7 @@ % June 2007 % % % % % -% Copyright 1999-2020 ImageMagick Studio LLC, a non-profit organization % +% Copyright 1999-2021 ImageMagick Studio LLC, a non-profit organization % % dedicated to making software imaging solutions freely available. % % % % You may not use this file except in compliance with the License. You may % @@ -377,7 +377,7 @@ static double *GenerateCoefficients(const Image *image, double *coeff; - register size_t + size_t i; size_t @@ -1121,7 +1121,7 @@ static double *GenerateCoefficients(const Image *image, size_t nterms; /* number of polynomial terms per number_values */ - register ssize_t + ssize_t j; MagickBooleanType @@ -1540,8 +1540,8 @@ static double *GenerateCoefficients(const Image *image, % o exception: return any errors or warnings in this structure. % */ -MagickExport Image *DistortResizeImage(const Image *image, - const size_t columns,const size_t rows,ExceptionInfo *exception) +MagickExport Image *DistortResizeImage(const Image *image,const size_t columns, + const size_t rows,ExceptionInfo *exception) { #define DistortResizeImageTag "Distort/Image" @@ -1588,18 +1588,15 @@ MagickExport Image *DistortResizeImage(const Image *image, if (image->alpha_trait == UndefinedPixelTrait) { /* - Image has not transparency channel, so we free to use it + Image has no alpha channel, so we are free to use it. */ (void) SetImageAlphaChannel(tmp_image,SetAlphaChannel,exception); resize_image=DistortImage(tmp_image,AffineDistortion,12,distort_args, MagickTrue,exception), - tmp_image=DestroyImage(tmp_image); if (resize_image == (Image *) NULL) return((Image *) NULL); - - (void) SetImageAlphaChannel(resize_image,DeactivateAlphaChannel, - exception); + (void) SetImageAlphaChannel(resize_image,OffAlphaChannel,exception); } else { @@ -2048,7 +2045,7 @@ MagickExport Image *DistortImage(const Image *image, DistortMethod method, /* Verbose output */ if (IsStringTrue(GetImageArtifact(image,"verbose")) != MagickFalse) { - register ssize_t + ssize_t i; char image_gen[MagickPathExtent]; const char *lookup; @@ -2491,10 +2488,10 @@ MagickExport Image *DistortImage(const Image *image, DistortMethod method, d, s; /* transform destination image x,y to source image x,y */ - register ssize_t + ssize_t i; - register Quantum + Quantum *magick_restrict q; q=QueueCacheViewAuthenticPixels(distort_view,0,j,distort_image->columns,1, @@ -2634,7 +2631,7 @@ MagickExport Image *DistortImage(const Image *image, DistortMethod method, case PolynomialDistortion: { /* multi-ordered polynomial */ - register ssize_t + ssize_t k; ssize_t @@ -3105,7 +3102,7 @@ MagickExport Image *SparseColorImage(const Image *image, switch (sparse_method) { case BarycentricColorInterpolate: { - register ssize_t x=0; + ssize_t x=0; (void) FormatLocaleFile(stderr, "Barycentric Sparse Color:\n"); if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0) (void) FormatLocaleFile(stderr, " -channel R -fx '%+lf*i %+lf*j %+lf' \\\n", @@ -3128,7 +3125,7 @@ MagickExport Image *SparseColorImage(const Image *image, } case BilinearColorInterpolate: { - register ssize_t x=0; + ssize_t x=0; (void) FormatLocaleFile(stderr, "Bilinear Sparse Color\n"); if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0) (void) FormatLocaleFile(stderr, " -channel R -fx '%+lf*i %+lf*j %+lf*i*j %+lf;\n", @@ -3202,10 +3199,10 @@ MagickExport Image *SparseColorImage(const Image *image, PixelInfo pixel; /* pixel to assign to distorted image */ - register ssize_t + ssize_t i; - register Quantum + Quantum *magick_restrict q; q=GetCacheViewAuthenticPixels(sparse_view,0,j,sparse_image->columns, @@ -3223,7 +3220,7 @@ MagickExport Image *SparseColorImage(const Image *image, { case BarycentricColorInterpolate: { - register ssize_t x=0; + ssize_t x=0; if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0) pixel.red = coeff[x]*i +coeff[x+1]*j +coeff[x+2], x+=3; @@ -3245,7 +3242,7 @@ MagickExport Image *SparseColorImage(const Image *image, } case BilinearColorInterpolate: { - register ssize_t x=0; + ssize_t x=0; if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0) pixel.red = coeff[x]*i + coeff[x+1]*j + coeff[x+2]*i*j + coeff[x+3], x+=4; @@ -3287,7 +3284,7 @@ MagickExport Image *SparseColorImage(const Image *image, pixel.alpha=0.0; denominator = 0.0; for(k=0; k<number_arguments; k+=2+number_colors) { - register ssize_t x=(ssize_t) k+2; + ssize_t x=(ssize_t) k+2; double weight = ((double)i-arguments[ k ])*((double)i-arguments[ k ]) + ((double)j-arguments[k+1])*((double)j-arguments[k+1]); @@ -3337,7 +3334,7 @@ MagickExport Image *SparseColorImage(const Image *image, fabs((double)i-arguments[ k ]) + fabs((double)j-arguments[k+1]); if ( distance < minimum ) { - register ssize_t x=(ssize_t) k+2; + ssize_t x=(ssize_t) k+2; if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0) pixel.red=arguments[x++]; if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0) @@ -3372,7 +3369,7 @@ MagickExport Image *SparseColorImage(const Image *image, ((double)i-arguments[ k ])*((double)i-arguments[ k ]) + ((double)j-arguments[k+1])*((double)j-arguments[k+1]); if ( distance < minimum ) { - register ssize_t x=(ssize_t) k+2; + ssize_t x=(ssize_t) k+2; if ((GetPixelRedTraits(image) & UpdatePixelTrait) != 0) pixel.red=arguments[x++]; if ((GetPixelGreenTraits(image) & UpdatePixelTrait) != 0) |