From d9440c061f86482b3b6863d8893b50d654022223 Mon Sep 17 00:00:00 2001 From: Cristy Date: Fri, 23 Nov 2018 19:46:32 -0500 Subject: [PATCH] https://github.com/ImageMagick/ImageMagick/issues/1396 --- MagickCore/enhance.h | 2 +- MagickWand/mogrify.c | 2 +- PerlMagick/Magick.xs | 9 +++++---- PerlMagick/quantum/quantum.xs.in | 9 +++++---- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/MagickCore/enhance.h b/MagickCore/enhance.h index e72a91411..ff16a6ea3 100644 --- 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 b907fbca1..5646b3267 100644 --- 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 4ef0bc6dd..c6524970a 100644 --- 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 09a097b07..53c3ccbb9 100644 --- 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; } } -- 2.40.0