(no commit message)

diff --git a/ChangeLog b/ChangeLog
index fd72cb125002922bbac375f120cf159f86491998..209f89a533d816070249d3cf0da4f635e21d38e1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
-2009-11-19  6.5.7-10 Cristy  <quetzlzacatenango@image...>
+2009-11-25  6.5.8-1 Jee Teck  <jee.teck@cteca...>
+  * The mogridy program +opaque option now recognizes its required argument.
+
+2009-11-19  6.5.8-0 Cristy  <quetzlzacatenango@image...>
   * 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 556c8eda6fa2041fcd15a9db3f279c034b0a9f14..8f32e4368e22e931c20fbfe41c7b3e5459ef3b19 100644 (file)
--- 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 398ab684a5ed6b91f3b3bbdde22c0499f34a7adf..1f610fd64ba9125456ac5593455660dd72d436cb 100644 (file)
--- 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);