diff options
Diffstat (limited to 'MagickWand/identify.c')
| -rw-r--r-- | MagickWand/identify.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/MagickWand/identify.c b/MagickWand/identify.c index bc2f1fc0f..c770b43d7 100644 --- a/MagickWand/identify.c +++ b/MagickWand/identify.c @@ -17,7 +17,7 @@ % September 1994 % % % % % -% 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 % @@ -212,7 +212,7 @@ WandExport MagickBooleanType IdentifyImageCommand(ImageInfo *image_info, MagickStatusType status; - register ssize_t + ssize_t i; size_t @@ -338,6 +338,7 @@ WandExport MagickBooleanType IdentifyImageCommand(ImageInfo *image_info, continue; } pend=image != (Image *) NULL ? MagickTrue : MagickFalse; + image_info->ping=MagickFalse; switch (*(option+1)) { case 'a': @@ -445,7 +446,6 @@ WandExport MagickBooleanType IdentifyImageCommand(ImageInfo *image_info, ThrowIdentifyException(OptionError,"MissingArgument",option); if (IsGeometry(argv[i]) == MagickFalse) ThrowIdentifyInvalidArgumentException(option,argv[i]); - image_info->ping=MagickFalse; break; } if (LocaleCompare("concurrent",option+1) == 0) @@ -486,8 +486,6 @@ WandExport MagickBooleanType IdentifyImageCommand(ImageInfo *image_info, ThrowIdentifyException(OptionError,"NoSuchOption",argv[i]); break; } - if (LocaleNCompare("identify:locate",argv[i],15) == 0) - image_info->ping=MagickFalse; break; } if (LocaleCompare("density",option+1) == 0) @@ -649,8 +647,8 @@ WandExport MagickBooleanType IdentifyImageCommand(ImageInfo *image_info, interlace=ParseCommandOption(MagickInterlaceOptions,MagickFalse, argv[i]); if (interlace < 0) - ThrowIdentifyException(OptionError, - "UnrecognizedInterlaceType",argv[i]); + ThrowIdentifyException(OptionError,"UnrecognizedInterlaceType", + argv[i]); break; } if (LocaleCompare("interpolate",option+1) == 0) @@ -763,7 +761,10 @@ WandExport MagickBooleanType IdentifyImageCommand(ImageInfo *image_info, case 'p': { if (LocaleCompare("ping",option+1) == 0) - break; + { + image_info->ping=MagickTrue; + break; + } if (LocaleCompare("precision",option+1) == 0) { if (*option == '+') |