summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Magick++/lib/Image.cpp4
-rw-r--r--Magick++/lib/Magick++/Include.h2
-rw-r--r--MagickCore/methods.h3
-rw-r--r--MagickCore/threshold.c12
-rw-r--r--MagickCore/threshold.h2
-rw-r--r--MagickWand/magick-image.c12
-rw-r--r--MagickWand/magick-image.h2
-rw-r--r--MagickWand/mogrify.c2
-rw-r--r--MagickWand/operation.c2
9 files changed, 19 insertions, 22 deletions
diff --git a/Magick++/lib/Image.cpp b/Magick++/lib/Image.cpp
index d2addd599..098e66ada 100644
--- 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 195e22ab5..7adf1c0c3 100644
--- 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 4a96588a5..8474614ec 100644
--- 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 9e2bf6261..522d94f85 100644
--- 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 cb7e8726a..2ba521c64 100644
--- 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 1b06d8515..65ea81a58 100644
--- 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);
}
diff --git a/MagickWand/magick-image.h b/MagickWand/magick-image.h
index 63f248ada..e8d525ce9 100644
--- 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 c57551da9..f6eb52ee5 100644
--- 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 0a3d87ae7..61c0f8eaa 100644
--- 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);
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-20 17:36:06 +0000