(no commit message)

diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c
index 64b93cc17cacee1fa8a4613fe24ca3f3c9bfdee2..5f79b7a91426c620e6821e492bc5e4512105faf4 100644 (file)
--- a/MagickWand/mogrify.c
+++ b/MagickWand/mogrify.c
@@ -996,8 +996,8 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
               geometry_info.psi=0.75;
             if ((flags & PercentValue) != 0)
               {
-                geometry_info.xi=(double) geometry_info.xi/100.0;
-                geometry_info.psi=(double) geometry_info.psi/100.0;
+                geometry_info.xi/=100.0;
+                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 2b675c4279a90a03d382cebb127283cebfb189fc..045c97991e2fb0310c8999794af22817b33068bd 100644 (file)
--- a/MagickWand/operation.c
+++ b/MagickWand/operation.c
@@ -1927,11 +1927,11 @@ static MagickBooleanType CLISimpleOperatorImage(MagickCLI *cli_wand,
             geometry_info.psi=0.75;
           if ((flags & PercentValue) != 0)
             {
-              geometry_info.xi=(double) geometry_info.xi/100.0;
-              geometry_info.psi=(double) geometry_info.psi/100.0;
+              geometry_info.xi/=100.0;
+              geometry_info.psi/=100.0;
             }
-          new_image=CannyEdgeImage(_image,geometry_info.rho,
-            geometry_info.sigma,geometry_info.xi,geometry_info.psi,_exception);
+          new_image=CannyEdgeImage(_image,geometry_info.rho,geometry_info.sigma,
+            geometry_info.xi,geometry_info.psi,_exception);
           break;
         }
       if (LocaleCompare("cdl",option+1) == 0)

diff --git a/PerlMagick/Magick.xs b/PerlMagick/Magick.xs
index f981e67850f44ecf0a088798e8ff5bf6b49a8854..0cb31e7658e21afbec5186ecf4f784c396e67b4c 100644 (file)
--- a/PerlMagick/Magick.xs
+++ b/PerlMagick/Magick.xs
@@ -11109,6 +11109,11 @@ Mogrify(ref,...)
                 geometry_info.xi=0.35;
               if ((flags & PsiValue) == 0)
                 geometry_info.psi=0.75;
+              if ((flags & PercentValue) != 0)
+                {
+                  geometry_info.xi/=100.0;
+                  geometry_info.psi/=100.0;
+                }
             }
           if (attribute_flag[1] != 0)
             geometry_info.rho=argument_list[1].real_reference;

diff --git a/PerlMagick/quantum/quantum.xs.in b/PerlMagick/quantum/quantum.xs.in
index d3682507e29d27b3e086f97897b5f2c874dec23a..5724a941f31de305d58fe7fc50c2c7d2401fa05a 100644 (file)
--- a/PerlMagick/quantum/quantum.xs.in
+++ b/PerlMagick/quantum/quantum.xs.in
@@ -11109,6 +11109,11 @@ Mogrify(ref,...)
                 geometry_info.xi=0.35;
               if ((flags & PsiValue) == 0)
                 geometry_info.psi=0.75;
+              if ((flags & PercentValue) != 0)
+                {
+                  geometry_info.xi/=100.0;
+                  geometry_info.psi/=100.0;
+                }
             }
           if (attribute_flag[1] != 0)
             geometry_info.rho=argument_list[1].real_reference;