From 827944d54938c1f8a74ff53cd35c11801060d995 Mon Sep 17 00:00:00 2001 From: dirk Date: Mon, 1 Feb 2016 22:34:39 +0100 Subject: [PATCH] Renamed DistortImageMethod to DistortMethod. --- Magick++/lib/Image.cpp | 2 +- Magick++/lib/Magick++/Image.h | 2 +- Magick++/lib/Magick++/Include.h | 2 +- Magick++/lib/Magick++/STL.h | 6 +++--- Magick++/lib/STL.cpp | 4 ++-- MagickCore/distort.c | 14 +++++++------- MagickCore/distort.h | 4 ++-- MagickWand/magick-image.c | 4 ++-- MagickWand/magick-image.h | 2 +- MagickWand/mogrify.c | 4 ++-- MagickWand/operation.c | 6 +++--- 11 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Magick++/lib/Image.cpp b/Magick++/lib/Image.cpp index a287148ff..d2addd599 100644 --- a/Magick++/lib/Image.cpp +++ b/Magick++/lib/Image.cpp @@ -2734,7 +2734,7 @@ void Magick::Image::display(void) ThrowImageException; } -void Magick::Image::distort(const DistortImageMethod method_, +void Magick::Image::distort(const DistortMethod method_, const size_t numberArguments_,const double *arguments_,const bool bestfit_) { MagickCore::Image diff --git a/Magick++/lib/Magick++/Image.h b/Magick++/lib/Magick++/Image.h index 680f12b9a..7d668fae3 100644 --- a/Magick++/lib/Magick++/Image.h +++ b/Magick++/lib/Magick++/Image.h @@ -837,7 +837,7 @@ namespace Magick // mapping color lookups of the source image to a new destination image // usally of the same size as the source image, unless 'bestfit' is set to // true. - void distort(const DistortImageMethod method_, + void distort(const DistortMethod method_, const size_t numberArguments_,const double *arguments_, const bool bestfit_=false); diff --git a/Magick++/lib/Magick++/Include.h b/Magick++/lib/Magick++/Include.h index cd3d68c58..195e22ab5 100644 --- a/Magick++/lib/Magick++/Include.h +++ b/Magick++/lib/Magick++/Include.h @@ -530,7 +530,7 @@ namespace Magick using MagickCore::PreviousDispose; // Distort methods - using MagickCore::DistortImageMethod; + using MagickCore::DistortMethod; using MagickCore::UndefinedDistortion; using MagickCore::AffineDistortion; using MagickCore::AffineProjectionDistortion; diff --git a/Magick++/lib/Magick++/STL.h b/Magick++/lib/Magick++/STL.h index 6b0c5d79b..061d74fc7 100644 --- a/Magick++/lib/Magick++/STL.h +++ b/Magick++/lib/Magick++/STL.h @@ -351,19 +351,19 @@ namespace Magick class MagickPPExport distortImage : public std::unary_function { public: - distortImage( const Magick::DistortImageMethod method_, + distortImage( const Magick::DistortMethod method_, const size_t number_arguments_, const double *arguments_, const bool bestfit_ ); - distortImage( const Magick::DistortImageMethod method_, + distortImage( const Magick::DistortMethod method_, const size_t number_arguments_, const double *arguments_ ); void operator()( Image &image_ ) const; private: - DistortImageMethod _method; + DistortMethod _method; size_t _number_arguments; const double *_arguments; bool _bestfit; diff --git a/Magick++/lib/STL.cpp b/Magick++/lib/STL.cpp index 57a3ebd00..1ed57b620 100644 --- a/Magick++/lib/STL.cpp +++ b/Magick++/lib/STL.cpp @@ -297,7 +297,7 @@ void Magick::despeckleImage::operator()( Magick::Image &image_ ) const // mapping color lookups of the source image to a new destination image // usally of the same size as the source image, unless 'bestfit' is set to // true. -Magick::distortImage::distortImage( const Magick::DistortImageMethod method_, +Magick::distortImage::distortImage( const Magick::DistortMethod method_, const size_t number_arguments_, const double *arguments_, const bool bestfit_ ) @@ -307,7 +307,7 @@ Magick::distortImage::distortImage( const Magick::DistortImageMethod method_, _bestfit( bestfit_ ) { } -Magick::distortImage::distortImage( const Magick::DistortImageMethod method_, +Magick::distortImage::distortImage( const Magick::DistortMethod method_, const size_t number_arguments_, const double *arguments_ ) : _method ( method_ ), diff --git a/MagickCore/distort.c b/MagickCore/distort.c index 36598dfae..033e26d1f 100644 --- a/MagickCore/distort.c +++ b/MagickCore/distort.c @@ -328,7 +328,7 @@ MagickExport Image *AffineTransformImage(const Image *image, % % The format of the GenerateCoefficients() method is: % -% Image *GenerateCoefficients(const Image *image,DistortImageMethod method, +% Image *GenerateCoefficients(const Image *image,DistortMethod method, % const size_t number_arguments,const double *arguments, % size_t number_values, ExceptionInfo *exception) % @@ -371,8 +371,8 @@ static inline double MagickRound(double x) } static double *GenerateCoefficients(const Image *image, - DistortImageMethod *method,const size_t number_arguments, - const double *arguments,size_t number_values,ExceptionInfo *exception) + DistortMethod *method,const size_t number_arguments,const double *arguments, + size_t number_values,ExceptionInfo *exception) { double *coeff; @@ -1609,7 +1609,7 @@ MagickExport Image *DistortResizeImage(const Image *image, % % The format of the DistortImage() method is: % -% Image *DistortImage(const Image *image,const DistortImageMethod method, +% Image *DistortImage(const Image *image,const DistortMethod method, % const size_t number_arguments,const double *arguments, % MagickBooleanType bestfit, ExceptionInfo *exception) % @@ -1670,7 +1670,7 @@ MagickExport Image *DistortResizeImage(const Image *image, % instead % */ -MagickExport Image *DistortImage(const Image *image,DistortImageMethod method, +MagickExport Image *DistortImage(const Image *image, DistortMethod method, const size_t number_arguments,const double *arguments, MagickBooleanType bestfit,ExceptionInfo *exception) { @@ -2923,10 +2923,10 @@ MagickExport Image *SparseColorImage(const Image *image, Convert input arguments into mapping coefficients, this this case we are mapping (distorting) colors, rather than coordinates. */ - { DistortImageMethod + { DistortMethod distort_method; - distort_method=(DistortImageMethod) method; + distort_method=(DistortMethod) method; if ( distort_method >= SentinelDistortion ) distort_method = ShepardsDistortion; /* Pretend to be Shepards */ coeff = GenerateCoefficients(image, &distort_method, number_arguments, diff --git a/MagickCore/distort.h b/MagickCore/distort.h index 480f61d04..555c2adc4 100644 --- a/MagickCore/distort.h +++ b/MagickCore/distort.h @@ -53,7 +53,7 @@ typedef enum ShepardsDistortion, ResizeDistortion, SentinelDistortion -} DistortImageMethod; +} DistortMethod; typedef enum { @@ -72,7 +72,7 @@ typedef enum extern MagickExport Image *AffineTransformImage(const Image *,const AffineMatrix *,ExceptionInfo *), - *DistortImage(const Image *,const DistortImageMethod,const size_t, + *DistortImage(const Image *,const DistortMethod,const size_t, const double *,MagickBooleanType,ExceptionInfo *exception), *DistortResizeImage(const Image *,const size_t,const size_t,ExceptionInfo *), *RotateImage(const Image *,const double,ExceptionInfo *), diff --git a/MagickWand/magick-image.c b/MagickWand/magick-image.c index 12ad6e02e..1b06d8515 100644 --- a/MagickWand/magick-image.c +++ b/MagickWand/magick-image.c @@ -2642,7 +2642,7 @@ WandExport MagickBooleanType MagickDisplayImages(MagickWand *wand, % The format of the MagickDistortImage method is: % % MagickBooleanType MagickDistortImage(MagickWand *wand, -% const DistortImageMethod method,const size_t number_arguments, +% const DistortMethod method,const size_t number_arguments, % const double *arguments,const MagickBooleanType bestfit) % % A description of each parameter follows: @@ -2678,7 +2678,7 @@ WandExport MagickBooleanType MagickDisplayImages(MagickWand *wand, % */ WandExport MagickBooleanType MagickDistortImage(MagickWand *wand, - const DistortImageMethod method,const size_t number_arguments, + const DistortMethod method,const size_t number_arguments, const double *arguments,const MagickBooleanType bestfit) { Image diff --git a/MagickWand/magick-image.h b/MagickWand/magick-image.h index b7f1ed4ce..63f248ada 100644 --- a/MagickWand/magick-image.h +++ b/MagickWand/magick-image.h @@ -128,7 +128,7 @@ extern WandExport MagickBooleanType MagickDespeckleImage(MagickWand *), MagickDisplayImage(MagickWand *,const char *), MagickDisplayImages(MagickWand *,const char *), - MagickDistortImage(MagickWand *,const DistortImageMethod,const size_t, + MagickDistortImage(MagickWand *,const DistortMethod,const size_t, const double *,const MagickBooleanType), MagickDrawImage(MagickWand *,const DrawingWand *), MagickEdgeImage(MagickWand *,const double), diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c index 2cdb43114..c57551da9 100644 --- a/MagickWand/mogrify.c +++ b/MagickWand/mogrify.c @@ -1360,7 +1360,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, const char *p; - DistortImageMethod + DistortMethod method; double @@ -1376,7 +1376,7 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc, Distort image. */ (void) SyncImageSettings(mogrify_info,*image,exception); - method=(DistortImageMethod) ParseCommandOption(MagickDistortOptions, + method=(DistortMethod) ParseCommandOption(MagickDistortOptions, MagickFalse,argv[i+1]); if (method == ResizeDistortion) { diff --git a/MagickWand/operation.c b/MagickWand/operation.c index 9d58bcf82..0a3d87ae7 100644 --- a/MagickWand/operation.c +++ b/MagickWand/operation.c @@ -2236,7 +2236,7 @@ static MagickBooleanType CLISimpleOperatorImage(MagickCLI *cli_wand, if ( parse < 0 ) CLIWandExceptArgBreak(OptionError,"UnrecognizedDistortMethod", option,arg1); - if ((DistortImageMethod) parse == ResizeDistortion) + if ((DistortMethod) parse == ResizeDistortion) { double resize_args[2]; @@ -2250,7 +2250,7 @@ static MagickBooleanType CLISimpleOperatorImage(MagickCLI *cli_wand, (void) ParseRegionGeometry(_image,arg2,&geometry,_exception); resize_args[0]=(double) geometry.width; resize_args[1]=(double) geometry.height; - new_image=DistortImage(_image,(DistortImageMethod) parse, + new_image=DistortImage(_image,(DistortMethod) parse, (size_t)2,resize_args,MagickTrue,_exception); break; } @@ -2259,7 +2259,7 @@ static MagickBooleanType CLISimpleOperatorImage(MagickCLI *cli_wand, if (args == (double *) NULL ) CLIWandExceptArgBreak(OptionError,"InvalidNumberList",option,arg2); - new_image=DistortImage(_image,(DistortImageMethod) parse,(size_t) + new_image=DistortImage(_image,(DistortMethod) parse,(size_t) count,args,IsPlusOp,_exception); args=(double *) RelinquishMagickMemory(args); break; -- 2.40.0