(no commit message)

diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c
index f4f04293929382842615fad2a22ce6ae76fd839f..ce1148baacad89907a6b2fbb558eb5dcd431013d 100644 (file)
--- a/MagickWand/mogrify.c
+++ b/MagickWand/mogrify.c
@@ -3094,6 +3094,13 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
               geometry_info.xi=0.1*(*image)->columns;
             if ((flags & PsiValue) == 0)
               geometry_info.psi=0.1*(*image)->rows;
+            if ((flags & PercentValue) != 0)
+              {
+                geometry_info.xi*=(double) (*image)->columns*(*image)->rows/
+                  100.0;
+                geometry_info.psi*=(double) (*image)->columns*(*image)->rows/
+                  100.0;
+              }
             mogrify_image=VignetteImage(*image,geometry_info.rho,
               geometry_info.sigma,(ssize_t) ceil(geometry_info.xi-0.5),
               (ssize_t) ceil(geometry_info.psi-0.5),exception);

diff --git a/MagickWand/operation.c b/MagickWand/operation.c
index 86b18244b7617013c8488dad50a7a139983a9d34..09ead23110f04484e60b065683fab722ec16f32d 100644 (file)
--- a/MagickWand/operation.c
+++ b/MagickWand/operation.c
@@ -3380,6 +3380,13 @@ static MagickBooleanType CLISimpleOperatorImage(MagickCLI *cli_wand,
             geometry_info.xi=0.1*_image->columns;
           if ((flags & PsiValue) == 0)
             geometry_info.psi=0.1*_image->rows;
+          if ((flags & PercentValue) != 0)
+            {
+              geometry_info.xi*=(double) (*image)->columns*(*image)->rows/
+                100.0;
+              geometry_info.psi*=(double) (*image)->columns*(*image)->rows/
+               100.0;
+            }
           new_image=VignetteImage(_image,geometry_info.rho,geometry_info.sigma,
             (ssize_t) ceil(geometry_info.xi-0.5),(ssize_t)
             ceil(geometry_info.psi-0.5),_exception);