From: cristy <urban-warrior@git.imagemagick.org>
Date: Fri, 4 Apr 2014 11:40:36 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~2516
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1cf98a4a3741eeffd9d80f2e13fcbee7ec8e0a9c;p=imagemagick

---

diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c
index 5f9ba39e6..64b93cc17 100644
--- a/MagickWand/mogrify.c
+++ b/MagickWand/mogrify.c
@@ -991,13 +991,13 @@ 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*QuantumRange;
+              geometry_info.xi=0.35;
             if ((flags & PsiValue) == 0)
-              geometry_info.psi=0.75*QuantumRange;
+              geometry_info.psi=0.75;
             if ((flags & PercentValue) != 0)
               {
-                geometry_info.xi=(double) QuantumRange*geometry_info.xi/100.0;
-                geometry_info.psi=(double) QuantumRange*geometry_info.psi/100.0;
+                geometry_info.xi=(double) geometry_info.xi/100.0;
+                geometry_info.psi=(double) geometry_info.psi/100.0;
               }
             mogrify_image=CannyEdgeImage(*image,geometry_info.rho,
               geometry_info.sigma,geometry_info.xi,geometry_info.psi,exception);
diff --git a/MagickWand/operation.c b/MagickWand/operation.c
index ee2c391ae..2b675c427 100644
--- a/MagickWand/operation.c
+++ b/MagickWand/operation.c
@@ -1922,13 +1922,13 @@ static MagickBooleanType CLISimpleOperatorImage(MagickCLI *cli_wand,
           if ((flags & SigmaValue) == 0)
             geometry_info.sigma=1.0;
           if ((flags & XiValue) == 0)
-            geometry_info.xi=0.35*QuantumRange;
+            geometry_info.xi=0.35;
           if ((flags & PsiValue) == 0)
-            geometry_info.psi=0.75*QuantumRange;
+            geometry_info.psi=0.75;
           if ((flags & PercentValue) != 0)
             {
-              geometry_info.xi=(double) QuantumRange*geometry_info.xi/100.0;
-              geometry_info.psi=(double) QuantumRange*geometry_info.psi/100.0;
+              geometry_info.xi=(double) geometry_info.xi/100.0;
+              geometry_info.psi=(double) geometry_info.psi/100.0;
             }
           new_image=CannyEdgeImage(_image,geometry_info.rho,
             geometry_info.sigma,geometry_info.xi,geometry_info.psi,_exception);