averello/ImageMagick-mirror
1
0
Fork 0
mirror of https://github.com/ImageMagick/ImageMagick.git synced 2026-05-25 11:24:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Renamed OrderedPosterizeImage to OrderedDitherImage

Browse Source
This commit is contained in:
dirk
2016-02-01 22:44:38 +01:00
parent a4f7ef3cc8
commit cd69a2d4e4
9 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Magick++/lib/Image.cpp
+2 -2
View File
@@ -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;
}
Magick++/lib/Magick++/Include.h
+1 -1
View File
@@ -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;
MagickCore/methods.h
-3
View File
@@ -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)
MagickCore/threshold.c
+6 -6
View File
@@ -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)
MagickCore/threshold.h
+1 -1
View File
@@ -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 *);
MagickWand/magick-image.c
+6 -6
View File
@@ -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);
}
MagickWand/magick-image.h
+1 -1
View File
@@ -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 *),
MagickWand/mogrify.c
+1 -1
View File
@@ -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;
MagickWand/operation.c
+1 -1
View File
@@ -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);