From: cristy Date: Sat, 3 Mar 2012 15:11:08 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~6089 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9ec43c19ff392b1ff2642ff2e946c0a9f3aff40c;p=imagemagick --- diff --git a/MagickCore/transform.c b/MagickCore/transform.c index 0969de2b5..30adedc56 100644 --- a/MagickCore/transform.c +++ b/MagickCore/transform.c @@ -703,7 +703,7 @@ static inline ssize_t MagickRound(MagickRealType x) } MagickExport Image *CropImageToTiles(const Image *image, - const char *crop_geometry, ExceptionInfo *exception) + const char *crop_geometry,ExceptionInfo *exception) { Image *next, @@ -756,8 +756,10 @@ MagickExport Image *CropImageToTiles(const Image *image, } delta.x=(double) width/geometry.width; delta.y=(double) height/geometry.height; - if ( delta.x < 1.0 ) delta.x = 1.0; - if ( delta.y < 1.0 ) delta.y = 1.0; + if (delta.x < 1.0) + delta.x=1.0; + if (delta.y < 1.0) + delta.y=1.0; for (offset.y=0; offset.y < (double) height; ) { if ((flags & AspectValue) == 0) @@ -809,7 +811,6 @@ MagickExport Image *CropImageToTiles(const Image *image, ClearMagickException(exception); return(crop_image); } - if (((geometry.width == 0) && (geometry.height == 0)) || ((flags & XValue) != 0) || ((flags & YValue) != 0)) { @@ -825,7 +826,7 @@ MagickExport Image *CropImageToTiles(const Image *image, crop_image->page.y-=geometry.y; } return(crop_image); - } + } if ((image->columns > geometry.width) || (image->rows > geometry.height)) { RectangleInfo diff --git a/PerlMagick/Magick.xs b/PerlMagick/Magick.xs index 6f725a79d..8b52cfca4 100644 --- a/PerlMagick/Magick.xs +++ b/PerlMagick/Magick.xs @@ -14052,26 +14052,6 @@ Transform(ref,...) geometry=SvPV(ST(i),na); break; } - if (LocaleCompare(attribute,"gravity") == 0) - { - Image - *next; - - ssize_t - in; - - in=!SvPOK(ST(i)) ? SvIV(ST(i)) : ParseCommandOption( - MagickGravityOptions,MagickFalse,SvPV(ST(i),na)); - if (in < 0) - { - ThrowPerlException(exception,OptionError,"UnrecognizedType", - SvPV(ST(i),na)); - return; - } - for (next=image; next; next=next->next) - next->gravity=(GravityType) in; - break; - } ThrowPerlException(exception,OptionError,"UnrecognizedAttribute", attribute); break;