(no commit message)

[imagemagick] / MagickWand / operation.c

diff --git a/MagickWand/operation.c b/MagickWand/operation.c
index 96ad3327b31cfd24273f92ab6a7e4bb6c3d1d74b..a88f83f49f7bd9485e6621755506ceef617f5f6b 100644 (file)
--- a/MagickWand/operation.c
+++ b/MagickWand/operation.c
@@ -2496,13 +2496,11 @@ static MagickBooleanType CLISimpleOperatorImage(MagickCLI *cli_wand,
           if ((flags & (RhoValue|SigmaValue)) == 0)
             CLIWandExceptArgBreak(OptionError,"InvalidArgument",option,arg1);
           if ((flags & SigmaValue) == 0)
-            geometry_info.sigma=1.0;
+            geometry_info.sigma=geometry_info.rho;
           if ((flags & XiValue) == 0)
-            geometry_info.xi=3;
-          if ((flags & PsiValue) == 0)
-            geometry_info.psi10030;
-          new_image=HoughLineImage(_image,geometry_info.rho,
-            geometry_info.sigma,geometry_info.xi,geometry_info.psi,_exception);
+            geometry_info.xi=40;
+          new_image=HoughLineImage(_image,(size_t) geometry_info.rho,
+            (size_t) geometry_info.sigma,(size_t) geometry_info.xi,_exception);
           break;
         }
       CLIWandExceptionBreak(OptionError,"UnrecognizedOption",option);
@@ -2719,7 +2717,7 @@ static MagickBooleanType CLISimpleOperatorImage(MagickCLI *cli_wand,
         {
           CLIWandWarnReplaced(IfNormalOp?"-alpha Set":"-alpha Off");
           (void) SetImageAlphaChannel(_image,IfNormalOp ? SetAlphaChannel :
-                         DeactivateAlphaChannel, _exception);
+            DeactivateAlphaChannel, _exception);
           break;
         }
       if (LocaleCompare("mean-shift",option+1) == 0)
@@ -2730,11 +2728,11 @@ static MagickBooleanType CLISimpleOperatorImage(MagickCLI *cli_wand,
           if ((flags & SigmaValue) == 0)
             geometry_info.sigma=1.0;
           if ((flags & XiValue) == 0)
-            geometry_info.xi=3;
-          if ((flags & PsiValue) == 0)
-            geometry_info.psi10030;
-          new_image=MeanShiftImage(_image,geometry_info.rho,
-            geometry_info.sigma,geometry_info.xi,geometry_info.psi,_exception);
+            geometry_info.xi=0.10*QuantumRange;
+          if ((flags & PercentValue) != 0)
+            geometry_info.xi=(double) QuantumRange*geometry_info.xi/100.0;
+          new_image=MeanShiftImage(_image,(size_t) geometry_info.rho,
+            (size_t) geometry_info.sigma,geometry_info.xi,_exception);
           break;
         }
       if (LocaleCompare("median",option+1) == 0)