(no commit message)

diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c
index 2857f9ac1610546f6646f150fdd78c0265d3c1cb..5f9ba39e6d635f8a747878506a96c117fc0329ff 100644 (file)
--- 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;