From: cristy <urban-warrior@git.imagemagick.org>
Date: Sat, 29 Mar 2014 21:58:22 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~2532
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d47682e4cd88adda0b5023b18e33260406e3cda6;p=imagemagick

---

diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c
index 2857f9ac1..5f9ba39e6 100644
--- a/MagickWand/mogrify.c
+++ b/MagickWand/mogrify.c
@@ -991,9 +991,14 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
             if ((flags & SigmaValue) == 0)
               geometry_info.sigma=1.0;
             if ((flags & XiValue) == 0)
-              geometry_info.xi=0.35;
+              geometry_info.xi=0.35*QuantumRange;
             if ((flags & PsiValue) == 0)
-              geometry_info.psi=0.75;
+              geometry_info.psi=0.75*QuantumRange;
+            if ((flags & PercentValue) != 0)
+              {
+                geometry_info.xi=(double) QuantumRange*geometry_info.xi/100.0;
+                geometry_info.psi=(double) QuantumRange*geometry_info.psi/100.0;
+              }
             mogrify_image=CannyEdgeImage(*image,geometry_info.rho,
               geometry_info.sigma,geometry_info.xi,geometry_info.psi,exception);
             break;