diff --git a/magick/effect.c b/magick/effect.c index dd72e6e..59de164 100644 --- a/magick/effect.c +++ b/magick/effect.c
@@ -283,12 +283,12 @@ register IndexPacket *restrict blur_indexes; - register ssize_t - x; - register PixelPacket *restrict q; + register ssize_t + x; + if (status == MagickFalse) continue; r=GetCacheViewVirtualPixels(edge_view,0,y,edge_image->columns,1,exception); @@ -600,12 +600,12 @@ register IndexPacket *restrict sharp_indexes; - register ssize_t - x; - register PixelPacket *restrict q; + register ssize_t + x; + if (status == MagickFalse) continue; r=GetCacheViewVirtualPixels(edge_view,0,y,edge_image->columns,1,exception); @@ -644,8 +644,8 @@ i=(ssize_t) width; if ((i & 0x01) != 0) i--; - p=GetCacheViewVirtualPixels(image_view,x-((ssize_t) (width-i)/2L),y-(ssize_t) - ((width-i)/2L),width-i,width-i,exception); + p=GetCacheViewVirtualPixels(image_view,x-((ssize_t) (width-i)/2L),y- + (ssize_t) ((width-i)/2L),width-i,width-i,exception); if (p == (const PixelPacket *) NULL) break; indexes=GetCacheViewVirtualIndexQueue(image_view); @@ -777,13 +777,13 @@ *kernel, normalize; + register ssize_t + i; + ssize_t j, k; - register ssize_t - i; - /* Generate a 1-D convolution kernel. */ @@ -915,16 +915,16 @@ register IndexPacket *restrict blur_indexes; - register ssize_t - x; - register PixelPacket *restrict q; + register ssize_t + x; + if (status == MagickFalse) continue; - p=GetCacheViewVirtualPixels(image_view,-((ssize_t) width/2L),y,image->columns+ - width,1,exception); + p=GetCacheViewVirtualPixels(image_view,-((ssize_t) width/2L),y, + image->columns+width,1,exception); q=GetCacheViewAuthenticPixels(blur_view,0,y,blur_image->columns,1, exception); if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL)) @@ -1095,16 +1095,16 @@ register IndexPacket *restrict blur_indexes; - register ssize_t - y; - register PixelPacket *restrict q; + register ssize_t + y; + if (status == MagickFalse) continue; - p=GetCacheViewVirtualPixels(image_view,x,-((ssize_t) width/2L),1,image->rows+ - width,exception); + p=GetCacheViewVirtualPixels(image_view,x,-((ssize_t) width/2L),1, + image->rows+width,exception); q=GetCacheViewAuthenticPixels(blur_view,x,0,1,blur_image->rows,exception); if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL)) { @@ -1280,8 +1280,7 @@ % Image *ConvolveImage(const Image *image,const size_t order, % const double *kernel,ExceptionInfo *exception) % Image *ConvolveImageChannel(const Image *image,const ChannelType channel, -% const size_t order,const double *kernel, -% ExceptionInfo *exception) +% const size_t order,const double *kernel,ExceptionInfo *exception) % % A description of each parameter follows: % @@ -1372,13 +1371,13 @@ format[MaxTextExtent], *message; + register const double + *k; + ssize_t u, v; - register const double - *k; - (void) LogMagickEvent(TransformEvent,GetMagickModule(), " ConvolveImage with %.20gx%.20g kernel:",(double) width,(double) width); @@ -1440,12 +1439,12 @@ register IndexPacket *restrict convolve_indexes; - register ssize_t - x; - register PixelPacket *restrict q; + register ssize_t + x; + if (status == MagickFalse) continue; p=GetCacheViewVirtualPixels(image_view,-((ssize_t) width/2L),y-(ssize_t) @@ -1461,9 +1460,6 @@ convolve_indexes=GetCacheViewAuthenticIndexQueue(convolve_view); for (x=0; x < (ssize_t) image->columns; x++) { - ssize_t - v; - MagickPixelPacket pixel; @@ -1476,6 +1472,9 @@ register ssize_t u; + ssize_t + v; + pixel=bias; k=normal_kernel; kernel_pixels=p; @@ -1670,12 +1669,12 @@ static Quantum **AcquirePixelThreadSet(const size_t count) { - register ssize_t - i; - Quantum **pixels; + register ssize_t + i; + size_t number_threads; @@ -1697,21 +1696,21 @@ const size_t columns,const size_t rows,Quantum *f,Quantum *g, const int polarity) { - ssize_t - y; - MagickRealType v; - register ssize_t - x; - register Quantum *p, *q, *r, *s; + register ssize_t + x; + + ssize_t + y; + assert(f != (Quantum *) NULL); assert(g != (Quantum *) NULL); p=f+(columns+2); @@ -1804,9 +1803,6 @@ Image *despeckle_image; - ssize_t - channel; - MagickBooleanType status; @@ -1817,6 +1813,9 @@ size_t length; + ssize_t + channel; + static const ssize_t X[4] = {0, 1, 1,-1}, Y[4] = {1, 0, 1, 1}; @@ -1869,10 +1868,6 @@ int id; - ssize_t - j, - y; - register ssize_t i, x; @@ -1881,6 +1876,10 @@ *buffer, *pixel; + ssize_t + j, + y; + if (status == MagickFalse) continue; id=GetOpenMPThreadId(); @@ -2083,18 +2082,18 @@ Image *emboss_image; - ssize_t - j, - k, - u, - v; - register ssize_t i; size_t width; + ssize_t + j, + k, + u, + v; + assert(image != (Image *) NULL); assert(image->signature == MagickSignature); if (image->debug != MagickFalse) @@ -2220,13 +2219,13 @@ format[MaxTextExtent], *message; + register const double + *k; + ssize_t u, v; - register const double - *k; - (void) LogMagickEvent(TransformEvent,GetMagickModule(), " FilterImage with %.20gx%.20g kernel:",(double) kernel->width,(double) kernel->height); @@ -2275,17 +2274,17 @@ register IndexPacket *restrict filter_indexes; - register ssize_t - x; - register PixelPacket *restrict q; + register ssize_t + x; + if (status == MagickFalse) continue; p=GetCacheViewVirtualPixels(image_view,-((ssize_t) kernel->width/2L), - y-(ssize_t) (kernel->height/2L),image->columns+kernel->width,kernel->height, - exception); + y-(ssize_t) (kernel->height/2L),image->columns+kernel->width, + kernel->height,exception); q=GetCacheViewAuthenticPixels(filter_view,0,y,filter_image->columns,1, exception); if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL)) @@ -2297,9 +2296,6 @@ filter_indexes=GetCacheViewAuthenticIndexQueue(filter_view); for (x=0; x < (ssize_t) image->columns; x++) { - ssize_t - v; - MagickPixelPacket pixel; @@ -2312,6 +2308,9 @@ register ssize_t u; + ssize_t + v; + pixel=bias; k=kernel->values; kernel_pixels=p; @@ -2524,17 +2523,17 @@ Image *blur_image; - ssize_t - j, - u, - v; - register ssize_t i; size_t width; + ssize_t + j, + u, + v; + assert(image != (const Image *) NULL); assert(image->signature == MagickSignature); if (image->debug != MagickFalse) @@ -2678,15 +2677,14 @@ return(pixel_list); } -static MedianPixelList **AcquireMedianPixelListThreadSet( - const size_t width) +static MedianPixelList **AcquireMedianPixelListThreadSet(const size_t width) { - register ssize_t - i; - MedianPixelList **pixel_list; + register ssize_t + i; + size_t number_threads; @@ -2708,12 +2706,12 @@ static void AddNodeMedianPixelList(MedianPixelList *pixel_list, const ssize_t channel,const size_t color) { - register ssize_t - level; - register MedianSkipList *list; + register ssize_t + level; + size_t search, update[9]; @@ -2771,12 +2769,12 @@ MagickPixelPacket pixel; - register ssize_t - channel; - register MedianSkipList *list; + register ssize_t + channel; + size_t center, color, @@ -2859,15 +2857,15 @@ int level; - register ssize_t - channel; - register MedianListNode *root; register MedianSkipList *list; + register ssize_t + channel; + /* Reset the skip-list. */ @@ -2961,12 +2959,12 @@ register IndexPacket *restrict median_indexes; - register ssize_t - x; - register PixelPacket *restrict q; + register ssize_t + x; + if (status == MagickFalse) continue; p=GetCacheViewVirtualPixels(image_view,-((ssize_t) width/2L),y-(ssize_t) @@ -2986,12 +2984,12 @@ MagickPixelPacket pixel; - register const PixelPacket - *restrict r; - register const IndexPacket *restrict s; + register const PixelPacket + *restrict r; + register ssize_t u, v; @@ -3208,12 +3206,12 @@ register IndexPacket *restrict blur_indexes; - register ssize_t - x; - register PixelPacket *restrict q; + register ssize_t + x; + if (status == MagickFalse) continue; q=GetCacheViewAuthenticPixels(blur_view,0,y,blur_image->columns,1, @@ -3232,15 +3230,15 @@ PixelPacket pixel; + register const IndexPacket + *restrict indexes; + register double *restrict k; register ssize_t i; - register const IndexPacket - *restrict indexes; - k=kernel; qixel=bias; if (((channel & OpacityChannel) == 0) || (image->matte == MagickFalse)) @@ -3395,9 +3393,6 @@ ImageInfo *preview_info; - ssize_t - y; - MagickBooleanType proceed; @@ -3417,6 +3412,9 @@ size_t colors; + ssize_t + y; + /* Open output image file. */ @@ -3960,8 +3958,7 @@ blur_center.x=(double) image->columns/2.0; blur_center.y=(double) image->rows/2.0; blur_radius=hypot(blur_center.x,blur_center.y); - n=(size_t) fabs(4.0*DegreesToRadians(angle)*sqrt((double) blur_radius)+ - 2UL); + n=(size_t) fabs(4.0*DegreesToRadians(angle)*sqrt((double) blur_radius)+2UL); theta=DegreesToRadians(angle)/(MagickRealType) (n-1); cos_theta=(MagickRealType *) AcquireQuantumMemory((size_t) n, sizeof(*cos_theta)); @@ -3998,12 +3995,12 @@ register IndexPacket *restrict blur_indexes; - register ssize_t - x; - register PixelPacket *restrict q; + register ssize_t + x; + if (status == MagickFalse) continue; q=GetCacheViewAuthenticPixels(blur_view,0,y,blur_image->columns,1, @@ -4189,12 +4186,12 @@ MagickPixelPacket pixel; - register ssize_t - channel; - register MedianSkipList *list; + register ssize_t + channel; + size_t center, color, @@ -4318,12 +4315,12 @@ register IndexPacket *restrict noise_indexes; - register ssize_t - x; - register PixelPacket *restrict q; + register ssize_t + x; + if (status == MagickFalse) continue; p=GetCacheViewVirtualPixels(image_view,-((ssize_t) width/2L),y-(ssize_t) @@ -4514,13 +4511,13 @@ format[MaxTextExtent], *message; + register const double + *k; + ssize_t u, v; - register const double - *k; - (void) LogMagickEvent(TransformEvent,GetMagickModule(), " SelectiveBlurImage with %.20gx%.20g kernel:",(double) width,(double) width); @@ -4578,16 +4575,16 @@ register IndexPacket *restrict blur_indexes; - register ssize_t - x; - register PixelPacket *restrict q; + register ssize_t + x; + if (status == MagickFalse) continue; - p=GetCacheViewVirtualPixels(image_view,-((ssize_t) width/2L),y-(ssize_t) (width/ - 2L),image->columns+width,width,exception); + p=GetCacheViewVirtualPixels(image_view,-((ssize_t) width/2L),y-(ssize_t) + (width/2L),image->columns+width,width,exception); q=GetCacheViewAuthenticPixels(blur_view,0,y,blur_image->columns,1, exception); if ((p == (const PixelPacket *) NULL) || (q == (PixelPacket *) NULL)) @@ -4599,10 +4596,6 @@ blur_indexes=GetCacheViewAuthenticIndexQueue(blur_view); for (x=0; x < (ssize_t) image->columns; x++) { - ssize_t - j, - v; - MagickPixelPacket pixel; @@ -4612,6 +4605,10 @@ register ssize_t u; + ssize_t + j, + v; + pixel=bias; k=kernel; gamma=0.0; @@ -4919,12 +4916,12 @@ *restrict s1, *restrict s2; - register ssize_t - x; - register PixelPacket *restrict q; + register ssize_t + x; + if (status == MagickFalse) continue; p=GetCacheViewVirtualPixels(image_view,-1,y-1,image->columns+2,3,exception); @@ -5071,17 +5068,17 @@ Image *sharp_image; - ssize_t - j, - u, - v; - register ssize_t i; size_t width; + ssize_t + j, + u, + v; + assert(image != (const Image *) NULL); assert(image->signature == MagickSignature); if (image->debug != MagickFalse) @@ -5215,12 +5212,12 @@ register IndexPacket *restrict indexes; - register ssize_t - x; - register PixelPacket *restrict q; + register ssize_t + x; + if (status == MagickFalse) continue; q=QueueCacheViewAuthenticPixels(image_view,0,y,spread_image->columns,1, @@ -5381,12 +5378,12 @@ register IndexPacket *restrict unsharp_indexes; - register ssize_t - x; - register PixelPacket *restrict q; + register ssize_t + x; + if (status == MagickFalse) continue; p=GetCacheViewVirtualPixels(image_view,0,y,image->columns,1,exception);