diff options
Diffstat (limited to 'MagickWand/operation.c')
| -rw-r--r-- | MagickWand/operation.c | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/MagickWand/operation.c b/MagickWand/operation.c index 6258894d1..3c2dfddd3 100644 --- a/MagickWand/operation.c +++ b/MagickWand/operation.c @@ -17,7 +17,7 @@ % September 2011 % % % % % -% Copyright 1999-2020 ImageMagick Studio LLC, a non-profit organization % +% Copyright 1999-2021 ImageMagick Studio LLC, a non-profit organization % % dedicated to making software imaging solutions freely available. % % % % You may not use this file except in compliance with the License. You may % @@ -104,7 +104,7 @@ static MagickBooleanType MonitorProgress(const char *text, const char *locale_message; - register char + char *p; magick_unreferenced(client_data); @@ -201,7 +201,7 @@ static Image *SparseColorOption(const Image *image, MagickBooleanType error; - register size_t + size_t x; size_t @@ -909,15 +909,6 @@ WandPrivate void CLISettingOptionInfo(MagickCLI *cli_wand, } if (LocaleCompare("format",option+1) == 0) { - /* FUTURE: why the ping test, you could set ping after this! */ - /* - register const char - *q; - - for (q=strchr(arg1,'%'); q != (char *) NULL; q=strchr(q+1,'%')) - if (strchr("Agkrz@[#",*(q+1)) != (char *) NULL) - _image_info->ping=MagickFalse; - */ (void) SetImageOption(_image_info,option+1,ArgOption(NULL)); break; } @@ -1226,7 +1217,7 @@ WandPrivate void CLISettingOptionInfo(MagickCLI *cli_wand, } if (LocaleCompare("ping",option+1) == 0) { - _image_info->ping = ArgBoolean; + _image_info->ping=ArgBoolean; break; } if (LocaleCompare("pointsize",option+1) == 0) @@ -1848,10 +1839,10 @@ static MagickBooleanType CLISimpleOperatorImage(MagickCLI *cli_wand, if ((flags & SigmaValue) == 0) geometry_info.sigma=geometry_info.rho; if ((flags & XiValue) == 0) - geometry_info.xi=2.0*sqrt(geometry_info.rho*geometry_info.rho+ + geometry_info.xi=1.0*sqrt(geometry_info.rho*geometry_info.rho+ geometry_info.sigma*geometry_info.sigma); if ((flags & PsiValue) == 0) - geometry_info.psi=0.5*sqrt(geometry_info.rho*geometry_info.rho+ + geometry_info.psi=0.25*sqrt(geometry_info.rho*geometry_info.rho+ geometry_info.sigma*geometry_info.sigma); new_image=BilateralBlurImage(_image,(size_t) geometry_info.rho, (size_t) geometry_info.sigma,geometry_info.xi,geometry_info.psi, @@ -2164,7 +2155,7 @@ static MagickBooleanType CLISimpleOperatorImage(MagickCLI *cli_wand, KernelInfo *kernel_info; - register ssize_t + ssize_t j; kernel_info=AcquireKernelInfo(arg1,exception); @@ -2374,6 +2365,18 @@ static MagickBooleanType CLISimpleOperatorImage(MagickCLI *cli_wand, } case 'f': { + if (LocaleCompare("features",option+1) == 0) + { + CLIWandWarnReplaced("-version -define identify:features="); + if (*option == '+') + { + (void) DeleteImageArtifact(_image,"identify:features"); + break; + } + (void) SetImageArtifact(_image,"identify:features",arg1); + (void) SetImageArtifact(_image,"verbose","true"); + break; + } if (LocaleCompare("flip",option+1) == 0) { new_image=FlipImage(_image,_exception); |