]> granicus.if.org Git - imagemagick/commitdiff
(no commit message)
authorcristy <urban-warrior@git.imagemagick.org>
Fri, 4 Apr 2014 11:40:36 +0000 (11:40 +0000)
committercristy <urban-warrior@git.imagemagick.org>
Fri, 4 Apr 2014 11:40:36 +0000 (11:40 +0000)
MagickWand/mogrify.c
MagickWand/operation.c

index 5f9ba39e6d635f8a747878506a96c117fc0329ff..64b93cc17cacee1fa8a4613fe24ca3f3c9bfdee2 100644 (file)
@@ -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);
index ee2c391ae121243f0c7f030a706d5f36786745f8..2b675c4279a90a03d382cebb127283cebfb189fc 100644 (file)
@@ -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);