Changed arguments of RandomThresholdImage.

Author: dirk

Magick++/lib/Image.cpp

@@ -3939,22 +3939,20 @@ void Magick::Image::raise(const Geometry &geometry_,const bool raisedFlag_)
   ThrowImageException;
 }
 
-void Magick::Image::randomThreshold(const Geometry &thresholds_)
+void Magick::Image::randomThreshold(const double low_,const double high_)
 {
   GetPPException;
-  (void) RandomThresholdImage(image(),static_cast<std::string>(
-    thresholds_).c_str(),exceptionInfo);
+  (void) RandomThresholdImage(image(),low_,high_,exceptionInfo);
   ThrowImageException;
 }
 
 void Magick::Image::randomThresholdChannel(const ChannelType channel_,
-  const Geometry &thresholds_)
+  const double low_,const double high_)
 {
   modifyImage();
   GetPPException;
   GetAndSetPPChannelMask(channel_);
-  (void) RandomThresholdImage(image(),static_cast<std::string>(
-    thresholds_).c_str(),exceptionInfo);
+  (void) RandomThresholdImage(image(),low_,high_,exceptionInfo);
   RestorePPChannelMask;
   ThrowImageException;
 }

Magick++/lib/Magick++/Image.h

@@ -1184,15 +1184,10 @@ namespace Magick
     //
     // Changes the value of individual pixels based on the intensity
     // of each pixel compared to a random threshold.  The result is a
-    // low-contrast, two color image.  The thresholds_ argument is a
-    // geometry containing LOWxHIGH thresholds.  If the string
-    // contains 2x2, 3x3, or 4x4, then an ordered dither of order 2,
-    // 3, or 4 will be performed instead.  If a channel_ argument is
-    // specified then only the specified channel is altered.  This is
-    // a very fast alternative to 'quantize' based dithering.
-    void randomThreshold(const Geometry &thresholds_);
-    void randomThresholdChannel(const ChannelType channel_,
-      const Geometry &thresholds_);
+    // low-contrast, two color image.
+    void randomThreshold(const double low_,const double high_);
+    void randomThresholdChannel(const ChannelType channel_,const double low_,
+      const double high_);
 
     // Read single image frame from in-memory BLOB
     void read(const Blob &blob_);

MagickCore/threshold.c

@@ -1610,31 +1610,20 @@ MagickExport MagickBooleanType PerceptibleImage(Image *image,
 %
 %    o image: the image.
 %
-%    o thresholds: a geometry string containing low,high thresholds.  If the
-%      string contains 2x2, 3x3, or 4x4, an ordered dither of order 2, 3, or 4
-%      is performed instead.
+%    o low,high: Specify the high and low thresholds. These values range from
+%      0 to QuantumRange.
 %
 %    o exception: return any errors or warnings in this structure.
 %
 */
 MagickExport MagickBooleanType RandomThresholdImage(Image *image,
-  const char *thresholds,ExceptionInfo *exception)
+  const double min_threshold, const double max_threshold,ExceptionInfo *exception)
 {
 #define ThresholdImageTag  "Threshold/Image"
 
   CacheView
     *image_view;
 
-  double
-    min_threshold,
-    max_threshold;
-
-  GeometryInfo
-    geometry_info;
-
-  MagickStatusType
-    flags;
-
   MagickBooleanType
     status;
 
@@ -1661,23 +1650,9 @@ MagickExport MagickBooleanType RandomThresholdImage(Image *image,
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
   assert(exception != (ExceptionInfo *) NULL);
   assert(exception->signature == MagickCoreSignature);
-  if (thresholds == (const char *) NULL)
-    return(MagickTrue);
   if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse)
     return(MagickFalse);
   GetPixelInfo(image,&threshold);
-  min_threshold=0.0;
-  max_threshold=(double) QuantumRange;
-  flags=ParseGeometry(thresholds,&geometry_info);
-  min_threshold=geometry_info.rho;
-  max_threshold=geometry_info.sigma;
-  if ((flags & SigmaValue) == 0)
-    max_threshold=min_threshold;
-  if (strchr(thresholds,'%') != (char *) NULL)
-    {
-      max_threshold*=(double) (0.01*QuantumRange);
-      min_threshold*=(double) (0.01*QuantumRange);
-    }
   /*
     Random threshold image.
   */

MagickCore/threshold.h

@@ -40,7 +40,7 @@ extern MagickExport MagickBooleanType
   ListThresholdMaps(FILE *,ExceptionInfo *),
   OrderedDitherImage(Image *,const char *,ExceptionInfo *),
   PerceptibleImage(Image *,const double,ExceptionInfo *),
-  RandomThresholdImage(Image *,const char *,ExceptionInfo *),
+  RandomThresholdImage(Image *,const double,const double,ExceptionInfo *),
   WhiteThresholdImage(Image *,const char *,ExceptionInfo *);
 
 #if defined(__cplusplus) || defined(c_plusplus)

MagickWand/magick-image.c

@@ -8140,24 +8140,20 @@ WandExport MagickBooleanType MagickRaiseImage(MagickWand *wand,
 %
 %    o wand: the magick wand.
 %
-%    o low,high: Specify the high and low thresholds.  These values range from
+%    o low,high: Specify the high and low thresholds. These values range from
 %      0 to QuantumRange.
 %
 */
 WandExport MagickBooleanType MagickRandomThresholdImage(MagickWand *wand,
   const double low,const double high)
 {
-  char
-    threshold[MagickPathExtent];
-
   assert(wand != (MagickWand *) NULL);
   assert(wand->signature == MagickWandSignature);
   if (wand->debug != MagickFalse)
     (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
   if (wand->images == (Image *) NULL)
     ThrowWandException(WandError,"ContainsNoImages",wand->name);
-  (void) FormatLocaleString(threshold,MagickPathExtent,"%gx%g",low,high);
-  return(RandomThresholdImage(wand->images,threshold,wand->exception));
+  return(RandomThresholdImage(wand->images,low,high,wand->exception));
 }
 
 /*

MagickWand/mogrify.c

@@ -2533,8 +2533,25 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
             /*
               Threshold image.
             */
+            double
+              min_threshold,
+              max_threshold;
+
             (void) SyncImageSettings(mogrify_info,*image,exception);
-            (void) RandomThresholdImage(*image,argv[i+1],exception);
+            min_threshold=0.0;
+            max_threshold=(double) QuantumRange;
+            flags=ParseGeometry(argv[i+1],&geometry_info);
+            min_threshold=geometry_info.rho;
+            max_threshold=geometry_info.sigma;
+            if ((flags & SigmaValue) == 0)
+              max_threshold=min_threshold;
+            if (strchr(argv[i+1],'%') != (char *) NULL)
+              {
+                max_threshold*=(double) (0.01*QuantumRange);
+                min_threshold*=(double) (0.01*QuantumRange);
+              }
+            (void) RandomThresholdImage(*image,min_threshold,max_threshold,
+              exception);
             break;
           }
         if (LocaleCompare("read-mask",option+1) == 0)

MagickWand/operation.c

@@ -3060,9 +3060,26 @@ static MagickBooleanType CLISimpleOperatorImage(MagickCLI *cli_wand,
         }
       if (LocaleCompare("random-threshold",option+1) == 0)
         {
+          double
+            min_threshold,
+            max_threshold;
+
           if (IsGeometry(arg1) == MagickFalse)
             CLIWandExceptArgBreak(OptionError,"InvalidArgument",option,arg1);
-          (void) RandomThresholdImage(_image,arg1,_exception);
+          min_threshold=0.0;
+          max_threshold=(double) QuantumRange;
+          flags=ParseGeometry(arg1,&geometry_info);
+          min_threshold=geometry_info.rho;
+          max_threshold=geometry_info.sigma;
+          if ((flags & SigmaValue) == 0)
+            max_threshold=min_threshold;
+          if (strchr(arg1,'%') != (char *) NULL)
+            {
+              max_threshold*=(double) (0.01*QuantumRange);
+              min_threshold*=(double) (0.01*QuantumRange);
+            }
+          (void) RandomThresholdImage(_image,min_threshold,max_threshold,
+            _exception);
           break;
         }
       if (LocaleCompare("read-mask",option+1) == 0)