From 3ad1d2252b7080ada0a3fd151b11f1988091bd9e Mon Sep 17 00:00:00 2001 From: Cristy Date: Sun, 5 Aug 2018 17:15:04 -0400 Subject: [PATCH] ... --- MagickWand/mogrify.c | 2 +- MagickWand/operation.c | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c index 7e3546e2f..fc8e9e95c 100644 --- a/MagickWand/mogrify.c +++ b/MagickWand/mogrify.c @@ -2566,7 +2566,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, geometry_info.xi*=(double) (0.01*QuantumRange); geometry_info.psi*=(double) (0.01*QuantumRange); } - (void) RandomThresholdImage(*image,geometry_info.rho, + (void) RangeThresholdImage(*image,geometry_info.rho, geometry_info.sigma,geometry_info.xi,geometry_info.psi,exception); break; } diff --git a/MagickWand/operation.c b/MagickWand/operation.c index c083b832f..085e6d048 100644 --- a/MagickWand/operation.c +++ b/MagickWand/operation.c @@ -3052,27 +3052,28 @@ static MagickBooleanType CLISimpleOperatorImage(MagickCLI *cli_wand, _exception); break; } - if (LocaleCompare("random-threshold",option+1) == 0) + if (LocaleCompare("range-threshold",option+1) == 0) { /* Range threshold image. */ - (void) SyncImageSettings(mogrify_info,*image,exception); - flags=ParseGeometry(argv[i+1],&geometry_info); + if (IsGeometry(arg1) == MagickFalse) + CLIWandExceptArgBreak(OptionError,"InvalidArgument",option,arg1); + flags=ParseGeometry(arg1,&geometry_info); if ((flags & SigmaValue) == 0) geometry_info.sigma=geometry_info.rho; if ((flags & XiValue) == 0) geometry_info.xi=geometry_info.sigma; if ((flags & PsiValue) == 0) geometry_info.psi=geometry_info.xi; - if (strchr(argv[i+1],'%') != (char *) NULL) + if (strchr(argv1,'%') != (char *) NULL) { geometry_info.rho*=(double) (0.01*QuantumRange); geometry_info.sigma*=(double) (0.01*QuantumRange); geometry_info.xi*=(double) (0.01*QuantumRange); geometry_info.psi*=(double) (0.01*QuantumRange); } - (void) RandomThresholdImage(*image,geometry_info.rho, + (void) RangeThresholdImage(_image,geometry_info.rho, geometry_info.sigma,geometry_info.xi,geometry_info.psi,exception); break; } -- 2.40.0