https://github.com/ImageMagick/ImageMagick/issues/1404

diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c
index da235741b72799683531caf816de4eb63671efd0..f51d92a7138f4db824cfd04ae2e8fde3e602be25 100644 (file)
--- a/MagickWand/mogrify.c
+++ b/MagickWand/mogrify.c
@@ -1087,12 +1087,6 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
             */
             (void) SyncImageSettings(mogrify_info,*image,exception);
             flags=ParseGeometry(argv[i+1],&geometry_info);
-            if ((flags & XiValue) == 0)
-              geometry_info.xi=128.0;
-            if ((flags & PercentValue) != 0)
-              geometry_info.psi=(double) ((PerceptibleReciprocal(
-                geometry_info.xi)*(geometry_info.rho*geometry_info.sigma))*
-                (1.0+65535.0*geometry_info.psi/100.0));
             (void) CLAHEImage(*image,(size_t) geometry_info.rho,(size_t)
               geometry_info.sigma,(size_t) geometry_info.xi,(double)
               geometry_info.psi,exception);

diff --git a/MagickWand/operation.c b/MagickWand/operation.c
index af33f5b80a7330fb475318fe31e8cb90d4656881..de0250bb5e382608a1ecf256a2dacb43fe207ae5 100644 (file)
--- a/MagickWand/operation.c
+++ b/MagickWand/operation.c
@@ -1971,12 +1971,6 @@ static MagickBooleanType CLISimpleOperatorImage(MagickCLI *cli_wand,
           flags=ParseGeometry(arg1,&geometry_info);
           if ((flags & (RhoValue|SigmaValue)) == 0)
             CLIWandExceptArgBreak(OptionError,"InvalidArgument",option,arg1);
-           if ((flags & XiValue) == 0)
-             geometry_info.xi=128.0;
-           if ((flags & PercentValue) != 0)
-             geometry_info.psi=(double) ((PerceptibleReciprocal(
-               geometry_info.xi)*(geometry_info.rho*geometry_info.sigma))*
-               (1.0+65535.0*geometry_info.psi/100.0));
           (void) CLAHEImage(_image,(size_t) geometry_info.rho,(size_t)
             geometry_info.sigma,geometry_info.xi,geometry_info.psi,_exception);
           break;

diff --git a/PerlMagick/Magick.xs b/PerlMagick/Magick.xs
index cbeeb9fc514b2b1c37ceb3798e534d9c40610f1e..df06c0e87b9694496c6d6b361daf5db2bf0979c8 100644 (file)
--- a/PerlMagick/Magick.xs
+++ b/PerlMagick/Magick.xs
@@ -11479,16 +11479,8 @@ Mogrify(ref,...)
         case 149:  /* CLAHE */
         {
           if (attribute_flag[0] != 0)
-            {
-              flags=ParseGeometry(argument_list[0].string_reference,
-                &geometry_info);
-              if ((flags & XiValue) == 0)
-                geometry_info.xi=128.0;
-              if ((flags & PercentValue) != 0)
-                geometry_info.psi=(double) ((PerceptibleReciprocal(
-                  geometry_info.xi)*(geometry_info.rho*geometry_info.sigma))*
-                  (1.0+65535.0*geometry_info.psi/100.0));
-            }
+            flags=ParseGeometry(argument_list[0].string_reference,
+              &geometry_info);
           if (attribute_flag[1] != 0)
             geometry_info.rho=argument_list[1].integer_reference;
           if (attribute_flag[2] != 0)

diff --git a/PerlMagick/quantum/quantum.xs.in b/PerlMagick/quantum/quantum.xs.in
index cd8b8782c98706fdcd617b789f61129411040adc..886f5b6036cb4053227fb0a3be7d009a96b9e050 100644 (file)
--- a/PerlMagick/quantum/quantum.xs.in
+++ b/PerlMagick/quantum/quantum.xs.in
@@ -11485,16 +11485,8 @@ Mogrify(ref,...)
         case 149:  /* CLAHE */
         {
           if (attribute_flag[0] != 0)
-            {
-              flags=ParseGeometry(argument_list[0].string_reference,
-                &geometry_info);
-              if ((flags & XiValue) == 0)
-                geometry_info.xi=128.0;
-              if ((flags & PercentValue) != 0)
-                geometry_info.psi=(double) ((PerceptibleReciprocal(
-                  geometry_info.xi)*(geometry_info.rho*geometry_info.sigma))*
-                  (1.0+65535.0*geometry_info.psi/100.0));
-            }
+            flags=ParseGeometry(argument_list[0].string_reference,
+              &geometry_info);
           if (attribute_flag[1] != 0)
             geometry_info.rho=argument_list[1].integer_reference;
           if (attribute_flag[2] != 0)