From f0bbfd9571aea5be9ab7fcdeb99877e5e03a667c Mon Sep 17 00:00:00 2001 From: cristy Date: Wed, 25 Nov 2009 14:12:31 +0000 Subject: [PATCH] --- ChangeLog | 5 ++++- PerlMagick/Magick.xs | 11 ++++++----- wand/mogrify.c | 8 ++++---- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index fd72cb125..209f89a53 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ -2009-11-19 6.5.7-10 Cristy +2009-11-25 6.5.8-1 Jee Teck + * The mogridy program +opaque option now recognizes its required argument. + +2009-11-19 6.5.8-0 Cristy * Add magick/morphlogy.{c,h} source templates. * Sync image option when reading MPR images. * Optimize ping for SVG images. diff --git a/PerlMagick/Magick.xs b/PerlMagick/Magick.xs index 556c8eda6..8f32e4368 100644 --- a/PerlMagick/Magick.xs +++ b/PerlMagick/Magick.xs @@ -9272,11 +9272,12 @@ Mogrify(ref,...) 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 (geometry.width == 0) + geometry.width=image->columns; + if (geometry.height == 0) + geometry.height=image->rows; + geometry.x=(-geometry.x); + geometry.y=(-geometry.y); } if (attribute_flag[1] != 0) geometry.width=argument_list[1].long_reference; diff --git a/wand/mogrify.c b/wand/mogrify.c index 398ab684a..1f610fd64 100644 --- a/wand/mogrify.c +++ b/wand/mogrify.c @@ -1563,8 +1563,10 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, */ (void) SyncImageSettings(image_info,*image); flags=ParseGravityGeometry(*image,argv[i+1],&geometry,exception); - if ((geometry.width == 0) && (geometry.height == 0)) - break; + if (geometry.width == 0) + geometry.width=image->columns; + if (geometry.height == 0) + geometry.height=image->rows; geometry.x=(-geometry.x); geometry.y=(-geometry.y); extent_image=ExtentImage(*image,&geometry,exception); @@ -5331,8 +5333,6 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info, { if (LocaleCompare("opaque",option+1) == 0) { - if (*option == '+') - break; i++; if (i == (long) argc) ThrowMogrifyException(OptionError,"MissingArgument",option); -- 2.50.1