From: cristy <urban-warrior@git.imagemagick.org>
Date: Mon, 11 Nov 2013 17:58:38 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~3129
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8e2392e316bec6019460d46c03a8f45b0619d72a;p=imagemagick

---

diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c
index f4f042939..ce1148baa 100644
--- 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 86b18244b..09ead2311 100644
--- 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);