Renamed OrderedPosterizeImage to OrderedDitherImage

diff --git a/Magick++/lib/Image.cpp b/Magick++/lib/Image.cpp
index d2addd599c00ec6656a1dc1ed3ba2e612298da16..098e66ada76ffd95e130410d34152b2dbbd53e71 100644 (file)
--- a/Magick++/lib/Image.cpp
+++ b/Magick++/lib/Image.cpp
@@ -3739,7 +3739,7 @@ void Magick::Image::orderedDither(std::string thresholdMap_)
 {
   modifyImage();
   GetPPException;
-  (void) OrderedPosterizeImage(image(),thresholdMap_.c_str(),exceptionInfo);
+  (void) OrderedDitherImage(image(),thresholdMap_.c_str(),exceptionInfo);
   ThrowImageException;
 }
 
@@ -3749,7 +3749,7 @@ void Magick::Image::orderedDitherChannel(const ChannelType channel_,
   modifyImage();
   GetPPException;
   GetAndSetPPChannelMask(channel_);
-  (void) OrderedPosterizeImage(image(),thresholdMap_.c_str(),exceptionInfo);
+  (void)OrderedDitherImage(image(),thresholdMap_.c_str(),exceptionInfo);
   RestorePPChannelMask;
   ThrowImageException;
 }

diff --git a/Magick++/lib/Magick++/Include.h b/Magick++/lib/Magick++/Include.h
index 195e22ab5222b7d8980fcf5408c3f8524b0bef3e..7adf1c0c30f88b4a7b1aa643e4fa14f021e364dc 100644 (file)
--- a/Magick++/lib/Magick++/Include.h
+++ b/Magick++/lib/Magick++/Include.h
@@ -1383,7 +1383,7 @@ namespace Magick
   using MagickCore::NormalizeImage;
   using MagickCore::OilPaintImage;
   using MagickCore::OpaquePaintImage;
-  using MagickCore::OrderedPosterizeImage;
+  using MagickCore::OrderedDitherImage;
   using MagickCore::OptimizeImageLayers;
   using MagickCore::OptimizeImageTransparency;
   using MagickCore::OptimizePlusImageLayers;

diff --git a/MagickCore/methods.h b/MagickCore/methods.h
index 4a96588a57bcb356c09bbf691f2edf1271ef9817..8474614ecd2a586175a99485ba9c986748e3e91b 100644 (file)
--- a/MagickCore/methods.h
+++ b/MagickCore/methods.h
@@ -785,10 +785,7 @@ extern "C" {
 #define OptimizeImageLayers  PrependMagickMethod(OptimizeImageLayers)
 #define OptimizeImageTransparency  PrependMagickMethod(OptimizeImageTransparency)
 #define OptimizePlusImageLayers  PrependMagickMethod(OptimizePlusImageLayers)
-#define OrderedDitherImageChannel  PrependMagickMethod(OrderedDitherImageChannel)
 #define OrderedDitherImage  PrependMagickMethod(OrderedDitherImage)
-#define OrderedPosterizeImage  PrependMagickMethod(OrderedPosterizeImage)
-#define OrderedPosterizeImage  PrependMagickMethod(OrderedPosterizeImage)
 #define PackbitsEncodeImage  PrependMagickMethod(PackbitsEncodeImage)
 #define PaintFloodfillImage  PrependMagickMethod(PaintFloodfillImage)
 #define PaintOpaqueImageChannel  PrependMagickMethod(PaintOpaqueImageChannel)

diff --git a/MagickCore/threshold.c b/MagickCore/threshold.c
index 9e2bf6261cd9c041c0cbb93884861960d09887f3..522d94f8533dd1356f7c9191b0828f13cc15f923 100644 (file)
--- a/MagickCore/threshold.c
+++ b/MagickCore/threshold.c
@@ -1237,20 +1237,20 @@ MagickExport MagickBooleanType ListThresholdMaps(FILE *file,
 %                                                                             %
 %                                                                             %
 %                                                                             %
-%     O r d e r e d P o s t e r i z e I m a g e                               %
+%     O r d e r e d D i t h e r I m a g e                                     %
 %                                                                             %
 %                                                                             %
 %                                                                             %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-%  OrderedPosterizeImage() will perform a ordered dither based on a number
+%  OrderedDitherImage() will perform a ordered dither based on a number
 %  of pre-defined dithering threshold maps, but over multiple intensity
 %  levels, which can be different for different channels, according to the
 %  input argument.
 %
-%  The format of the OrderedPosterizeImage method is:
+%  The format of the OrderedDitherImage method is:
 %
-%      MagickBooleanType OrderedPosterizeImage(Image *image,
+%      MagickBooleanType OrderedDitherImage(Image *image,
 %        const char *threshold_map,ExceptionInfo *exception)
 %
 %  A description of each parameter follows:
@@ -1279,7 +1279,7 @@ MagickExport MagickBooleanType ListThresholdMaps(FILE *file,
 %    o exception: return any errors or warnings in this structure.
 %
 */
-MagickExport MagickBooleanType OrderedPosterizeImage(Image *image,
+MagickExport MagickBooleanType OrderedDitherImage(Image *image,
   const char *threshold_map,ExceptionInfo *exception)
 {
 #define DitherImageTag  "Dither/Image"
@@ -1423,7 +1423,7 @@ MagickExport MagickBooleanType OrderedPosterizeImage(Image *image,
           proceed;
 
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-        #pragma omp critical (MagickCore_OrderedPosterizeImage)
+        #pragma omp critical (MagickCore_OrderedDitherImage)
 #endif
         proceed=SetImageProgress(image,DitherImageTag,progress++,image->rows);
         if (proceed == MagickFalse)

diff --git a/MagickCore/threshold.h b/MagickCore/threshold.h
index cb7e8726afc0e2185e18557e872a9f8e54dee915..2ba521c642b20579229270088055ebe34f2c6888 100644 (file)
--- a/MagickCore/threshold.h
+++ b/MagickCore/threshold.h
@@ -38,7 +38,7 @@ extern MagickExport MagickBooleanType
   BlackThresholdImage(Image *,const char *,ExceptionInfo *),
   ClampImage(Image *,ExceptionInfo *),
   ListThresholdMaps(FILE *,ExceptionInfo *),
-  OrderedPosterizeImage(Image *,const char *,ExceptionInfo *),
+  OrderedDitherImage(Image *,const char *,ExceptionInfo *),
   PerceptibleImage(Image *,const double,ExceptionInfo *),
   RandomThresholdImage(Image *,const char *,ExceptionInfo *),
   WhiteThresholdImage(Image *,const char *,ExceptionInfo *);

diff --git a/MagickWand/magick-image.c b/MagickWand/magick-image.c
index 1b06d85154e37a969eda9c006ed813a7cacd2677..65ea81a58e31108ca07cb3bc3103a7ba2589c35b 100644 (file)
--- a/MagickWand/magick-image.c
+++ b/MagickWand/magick-image.c
@@ -7449,20 +7449,20 @@ WandExport MagickBooleanType MagickOptimizeImageTransparency(MagickWand *wand)
 %                                                                             %
 %                                                                             %
 %                                                                             %
-%     M a g i c k O r d e r e d P o s t e r i z e I m a g e                   %
+%     M a g i c k O r d e r e d D i t h e r I m a g e                         %
 %                                                                             %
 %                                                                             %
 %                                                                             %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-%  MagickOrderedPosterizeImage() performs an ordered dither based on a number
+%  MagickOrderedDitherImage() performs an ordered dither based on a number
 %  of pre-defined dithering threshold maps, but over multiple intensity levels,
 %  which can be different for different channels, according to the input
 %  arguments.
 %
-%  The format of the MagickOrderedPosterizeImage method is:
+%  The format of the MagickOrderedDitherImage method is:
 %
-%      MagickBooleanType MagickOrderedPosterizeImage(MagickWand *wand,
+%      MagickBooleanType MagickOrderedDitherImage(MagickWand *wand,
 %        const char *threshold_map)
 %
 %  A description of each parameter follows:
@@ -7489,7 +7489,7 @@ WandExport MagickBooleanType MagickOptimizeImageTransparency(MagickWand *wand)
 %      minimim of dithering.
 %
 */
-WandExport MagickBooleanType MagickOrderedPosterizeImage(MagickWand *wand,
+WandExport MagickBooleanType MagickOrderedDitherImage(MagickWand *wand,
   const char *threshold_map)
 {
   MagickBooleanType
@@ -7501,7 +7501,7 @@ WandExport MagickBooleanType MagickOrderedPosterizeImage(MagickWand *wand,
     (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",wand->name);
   if (wand->images == (Image *) NULL)
     ThrowWandException(WandError,"ContainsNoImages",wand->name);
-  status=OrderedPosterizeImage(wand->images,threshold_map,wand->exception);
+  status=OrderedDitherImage(wand->images,threshold_map,wand->exception);
   return(status);
 }
 \f

diff --git a/MagickWand/magick-image.h b/MagickWand/magick-image.h
index 63f248ada3b3629955f54d14168d27ada9038e3c..e8d525ce9faf07446b4abce0a378d3a5c27d359b 100644 (file)
--- a/MagickWand/magick-image.h
+++ b/MagickWand/magick-image.h
@@ -205,7 +205,7 @@ extern WandExport MagickBooleanType
   MagickOpaquePaintImage(MagickWand *,const PixelWand *,const PixelWand *,
     const double,const MagickBooleanType),
   MagickOptimizeImageTransparency(MagickWand *),
-  MagickOrderedPosterizeImage(MagickWand *,const char *),
+  MagickOrderedDitherImage(MagickWand *,const char *),
   MagickTransparentPaintImage(MagickWand *,const PixelWand *,
     const double,const double,const MagickBooleanType invert),
   MagickPingImage(MagickWand *,const char *),

diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c
index c57551da954ba890b4f1d34947eb5c0b16810a96..f6eb52ee5bc949298c885aaca7c9d37355417ad4 100644 (file)
--- a/MagickWand/mogrify.c
+++ b/MagickWand/mogrify.c
@@ -2333,7 +2333,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
         if (LocaleCompare("ordered-dither",option+1) == 0)
           {
             (void) SyncImageSettings(mogrify_info,*image,exception);
-            (void) OrderedPosterizeImage(*image,argv[i+1],exception);
+            (void) OrderedDitherImage(*image,argv[i+1],exception);
             break;
           }
         break;

diff --git a/MagickWand/operation.c b/MagickWand/operation.c
index 0a3d87ae751932edb0c204f3c3613d009cf54a75..61c0f8eaa2970a6812e64ff0a95c4391befa0636 100644 (file)
--- a/MagickWand/operation.c
+++ b/MagickWand/operation.c
@@ -2907,7 +2907,7 @@ static MagickBooleanType CLISimpleOperatorImage(MagickCLI *cli_wand,
         }
       if (LocaleCompare("ordered-dither",option+1) == 0)
         {
-          (void) OrderedPosterizeImage(_image,arg1,_exception);
+          (void) OrderedDitherImage(_image,arg1,_exception);
           break;
         }
       CLIWandExceptionBreak(OptionError,"UnrecognizedOption",option);