From 5f4cc976f6e3995767ed65505a28c80a04298e8e Mon Sep 17 00:00:00 2001 From: cristy Date: Sun, 18 Oct 2009 13:52:27 +0000 Subject: [PATCH] --- PerlMagick/Changelog | 3 +++ PerlMagick/Magick.xs | 22 +++++++++++----------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/PerlMagick/Changelog b/PerlMagick/Changelog index e99641d2f..dcfd0822f 100644 --- a/PerlMagick/Changelog +++ b/PerlMagick/Changelog @@ -1,3 +1,6 @@ +2009-10-18 6.5.7-0 Cristy + * Interpret gravity properly for ExtentImage(). + 2009-10-08 6.5.6-10 * Improve PerlMagick.PL to work with Strawberry Perl under Windows. diff --git a/PerlMagick/Magick.xs b/PerlMagick/Magick.xs index b0063850b..a7a1714ea 100644 --- a/PerlMagick/Magick.xs +++ b/PerlMagick/Magick.xs @@ -9259,19 +9259,20 @@ Mogrify(ref,...) } case 93: /* Extent */ { - GravityType - gravity; - - gravity=image->gravity; if (attribute_flag[7] != 0) - gravity=(GravityType) argument_list[7].long_reference; + image->gravity=(GravityType) argument_list[7].long_reference; if (attribute_flag[0] != 0) { - SetGeometry(image,&geometry); - (void) ParseAbsoluteGeometry(argument_list[0].string_reference, - &geometry); - GravityAdjustGeometry(image->columns,image->rows,image->gravity, - &geometry); + int + flags; + + flags=ParseGravityGeometry(image, + argument_list[0].string_reference,&geometry,exception); + if ((geometry.width != 0) || (geometry.height != 0)) + { + geometry.x=(-geometry.x); + geometry.y=(-geometry.y); + } } if (attribute_flag[1] != 0) geometry.width=argument_list[1].long_reference; @@ -9287,7 +9288,6 @@ Mogrify(ref,...) if (attribute_flag[6] != 0) (void) QueryColorDatabase(argument_list[6].string_reference, &image->background_color,exception); - GravityAdjustGeometry(image->columns,image->rows,gravity,&geometry); image=ExtentImage(image,&geometry,exception); break; } -- 2.40.0