From d40deb61bafb1410e2c648747feecccb80948c59 Mon Sep 17 00:00:00 2001 From: cristy Date: Wed, 9 Mar 2011 00:52:27 +0000 Subject: [PATCH] --- magick/shear.c | 60 ++++++++++++++++++++++++-------------------------- 1 file changed, 29 insertions(+), 31 deletions(-) diff --git a/magick/shear.c b/magick/shear.c index 2055b5c48..c8c14416d 100644 --- a/magick/shear.c +++ b/magick/shear.c @@ -328,14 +328,12 @@ static RadonInfo *DestroyRadonInfo(RadonInfo *radon_info) static MagickBooleanType ResetRadonCells(RadonInfo *radon_info) { - ssize_t - y; - register ssize_t x; ssize_t - count; + count, + y; unsigned short value; @@ -593,12 +591,12 @@ static void RadonProjection(RadonInfo *source_cells, { for (x=0; x < (ssize_t) p->width; x+=2*(ssize_t) step) { - ssize_t - y; - register ssize_t i; + ssize_t + y; + unsigned short cell; @@ -661,9 +659,6 @@ static MagickBooleanType RadonTransform(const Image *image, CacheView *image_view; - ssize_t - y; - MagickBooleanType status; @@ -674,13 +669,16 @@ static MagickBooleanType RadonTransform(const Image *image, register ssize_t i; - unsigned char - byte; - size_t count, width; + ssize_t + y; + + unsigned char + byte; + unsigned short bits[256]; @@ -824,15 +822,15 @@ static void GetImageBackgroundColor(Image *image,const ssize_t offset, CacheView *image_view; - ssize_t - y; - MagickPixelPacket background; MagickRealType count; + ssize_t + y; + /* Compute average background color. */ @@ -895,9 +893,6 @@ MagickExport Image *DeskewImage(const Image *image,const double threshold, *deskew_image, *median_image; - ssize_t - skew; - MagickBooleanType status; @@ -912,6 +907,9 @@ MagickExport Image *DeskewImage(const Image *image,const double threshold, *projection, width; + ssize_t + skew; + /* Compute deskew angle. */ @@ -1072,13 +1070,13 @@ static Image *IntegralRotateImage(const Image *image,size_t rotations, } case 1: { - ssize_t - tile_y; - size_t tile_height, tile_width; + ssize_t + tile_y; + /* Rotate 90 degrees. */ @@ -1263,13 +1261,13 @@ static Image *IntegralRotateImage(const Image *image,size_t rotations, } case 3: { - ssize_t - tile_y; - size_t tile_height, tile_width; + ssize_t + tile_y; + /* Rotate 270 degrees. */ @@ -1476,9 +1474,6 @@ static MagickBooleanType XShearImage(Image *image,const MagickRealType degrees, #endif for (y=0; y < (ssize_t) height; y++) { - ssize_t - step; - MagickPixelPacket pixel, source, @@ -1488,9 +1483,6 @@ static MagickBooleanType XShearImage(Image *image,const MagickRealType degrees, area, displacement; - register ssize_t - i; - register IndexPacket *restrict indexes, *restrict shear_indexes; @@ -1499,9 +1491,15 @@ static MagickBooleanType XShearImage(Image *image,const MagickRealType degrees, *restrict p, *restrict q; + register ssize_t + i; + ShearDirection direction; + ssize_t + step; + if (status == MagickFalse) continue; p=GetCacheViewAuthenticPixels(image_view,0,y_offset+y,image->columns,1, -- 2.40.0