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

diff --git a/MagickCore/enhance.h b/MagickCore/enhance.h
index e72a914112b7007cab39d9bbffbb66434ca1bbdd..ff16a6ea30122672266a70045a5cc00143b6bea6 100644 (file)
--- a/MagickCore/enhance.h
+++ b/MagickCore/enhance.h
@@ -28,7 +28,7 @@ extern MagickExport MagickBooleanType
   AutoGammaImage(Image *,ExceptionInfo *),
   AutoLevelImage(Image *,ExceptionInfo *),
   BrightnessContrastImage(Image *,const double,const double,ExceptionInfo *),
-  CLAHEImage(Image *,const size_t,const size_t,const double,const double,
+  CLAHEImage(Image *,const size_t,const size_t,const size_t,const double,
     ExceptionInfo *),
   ClutImage(Image *,const Image *,const PixelInterpolateMethod,ExceptionInfo *),
   ColorDecisionListImage(Image *,const char *,ExceptionInfo *),

diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c
index b907fbca1c2c637f973726f7613febb5ec50936e..5646b32674616c2af5f38fccf68db3c006521334 100644 (file)
--- a/MagickWand/mogrify.c
+++ b/MagickWand/mogrify.c
@@ -1088,7 +1088,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
             (void) SyncImageSettings(mogrify_info,*image,exception);
             flags=ParseGeometry(argv[i+1],&geometry_info);
             (void) CLAHEImage(*image,(size_t) geometry_info.rho,(size_t)
-              geometry_info.sigma,(double) geometry_info.xi,geometry_info.psi,
+              geometry_info.sigma,(size_t) geometry_info.xi,geometry_info.psi,
               exception);
             break;
           }

diff --git a/PerlMagick/Magick.xs b/PerlMagick/Magick.xs
index 4ef0bc6ddf590d0f763926a1ded400be81583f2c..c6524970aff5047dea4fc18d421e8c34d24086a4 100644 (file)
--- a/PerlMagick/Magick.xs
+++ b/PerlMagick/Magick.xs
@@ -572,8 +572,8 @@ static struct
       {"high-white", RealReference}, {"high-black", RealReference},
       {"channel", MagickChannelOptions} } },
     { "CLAHE", { {"geometry", StringReference},
-      {"width", IntegerReference}, {"height", IntegerReference},
-      {"bias", RealReference}, {"sans", RealReference} } },
+      {"x-tiles", IntegerReference}, {"y-tiles", IntegerReference},
+      {"number-bins", RealReference}, {"clip-limit", RealReference} } },
   };
 
 static SplayTreeInfo
@@ -11492,9 +11492,10 @@ Mogrify(ref,...)
           if (attribute_flag[3] != 0)
             geometry_info.xi=argument_list[3].integer_reference;;
           if (attribute_flag[4] != 0)
-            geometry_info.psi=argument_list[4].integer_reference;;
+            geometry_info.psi=argument_list[4].real_reference;
           (void) CLAHEImage(image,(size_t) geometry_info.rho,(size_t)
-            geometry_info.sigma,geometry_info.xi,geometry_info.psi,exception);
+            (size_t) geometry_info.sigma,geometry_info.xi,geometry_info.psi,
+            exception);
           break;
         }
       }

diff --git a/PerlMagick/quantum/quantum.xs.in b/PerlMagick/quantum/quantum.xs.in
index 09a097b07dd8b92c852ac9b66902e4360aad9c4a..53c3ccbb99d9e0a0d101b2b018c5d1589d5d9276 100644 (file)
--- a/PerlMagick/quantum/quantum.xs.in
+++ b/PerlMagick/quantum/quantum.xs.in
@@ -572,8 +572,8 @@ static struct
       {"high-white", RealReference}, {"high-black", RealReference},
       {"channel", MagickChannelOptions} } },
     { "CLAHE", { {"geometry", StringReference},
-      {"width", IntegerReference}, {"height", IntegerReference},
-      {"bias", RealReference}, {"sans", RealReference} } },
+      {"x-tiles", IntegerReference}, {"y-tiles", IntegerReference},
+      {"number-bins", RealReference}, {"clip-limit", RealReference} } },
   };
 
 static SplayTreeInfo
@@ -11498,9 +11498,10 @@ Mogrify(ref,...)
           if (attribute_flag[3] != 0)
             geometry_info.xi=argument_list[3].integer_reference;;
           if (attribute_flag[4] != 0)
-            geometry_info.psi=argument_list[4].integer_reference;;
+            geometry_info.psi=argument_list[4].real_reference;;
           (void) CLAHEImage(image,(size_t) geometry_info.rho,(size_t)
-            geometry_info.sigma,geometry_info.xi,geometry.psi,exception);
+            (size_t) geometry_info.sigma,geometry_info.xi,geometry_info.psi,
+            exception);
           break;
         }
       }