GraphicsMagick: 5 new changesets
GraphicsMagick Commits <[email protected]> Wed, 10 Apr 2024 10:43:21 -0500
| Newsgroups | gmane.comp.video.graphicsmagick.cvs |
|---|---|
| Message-ID | <mailman.10362.1712764693.1550.graphicsmagick-commit@lists.sourceforge.net> |
changeset eff5b40bc770 in /hg/GraphicsMagick details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=eff5b40bc770 summary: Copyright year is 2024! changeset bc40ee58165d in /hg/GraphicsMagick details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=bc40ee58165d summary: Added tag GraphicsMagick-1_3_43 for changeset eff5b40bc770 changeset 5fc7ca3ec68b in /hg/GraphicsMagick details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=5fc7ca3ec68b summary: Add support for a --version option, which produces GNU style summary version output changeset 0d8663511045 in /hg/GraphicsMagick details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=0d8663511045 summary: TGA: Fix Coverity issues 424688 and 424689, which are due to inconsistent use of LogMagickEvent() changeset df3d76d21d7e in /hg/GraphicsMagick details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=df3d76d21d7e summary: Only include module alias when there is a module to support it diffstat: .hgtags | 34 - ChangeLog | 32 +- ChangeLog.2010 | 22 - Makefile.in | 3 +- PerlMagick/Magick.pm | 2 +- VisualMagick/installer/inc/version.isx | 6 +- coders/tga.c | 5 +- magick/command.c | 223 ++++++--- magick/deprecate.c | 4 + magick/module_aliases.h | 37 +- magick/version.h | 10 +- magick/version.h.in | 4 +- utilities/Makefile.am | 3 +- utilities/tests/help.tap | 9 +- utilities/tests/version.tap | 33 + version.sh | 4 +- www/ChangeLog-2001.html | 5 +- www/ChangeLog-2002.html | 5 +- www/ChangeLog-2003.html | 13 +- www/ChangeLog-2004.html | 5 +- www/ChangeLog-2005.html | 5 +- www/ChangeLog-2006.html | 5 +- www/ChangeLog-2007.html | 21 +- www/ChangeLog-2008.html | 5 +- www/ChangeLog-2009.html | 5 +- www/ChangeLog-2010.html | 46 +- www/ChangeLog-2011.html | 5 +- www/ChangeLog-2012.html | 5 +- www/ChangeLog-2013.html | 11 +- www/ChangeLog-2014.html | 9 +- www/ChangeLog-2015.html | 23 +- www/ChangeLog-2016.html | 13 +- www/ChangeLog-2017.html | 13 +- www/ChangeLog-2018.html | 38 +- www/ChangeLog-2019.html | 5 +- www/ChangeLog-2020.html | 5 +- www/ChangeLog-2021.html | 733 ++++++++++++++++++++------------ www/ChangeLog.html | 35 +- www/Magick++/ChangeLog.html | 5 +- www/magick.css | 176 ------- 40 files changed, 852 insertions(+), 770 deletions(-) diffs (truncated from 3098 to 500 lines): diff -r 22c2ba42b57d -r df3d76d21d7e .hgtags --- a/.hgtags Fri Mar 22 07:55:14 2024 -0500 +++ b/.hgtags Wed Apr 10 10:42:08 2024 -0500 @@ -74,37 +74,3 @@ 24d85185b7a3b5a5e9cc74ebf7d0e94ca60d7157 ImageMagick-5_2_6 bc8483ab69f9a2752475e122fa60dc024040b865 ImageMagick-5_2_7 c4404631fa1c5235083ddff0653ad93c10e4829b ImageMagick-5_2_5 -95b917a97d849ead1a005c15c644ab5c33dbc902 GraphicsMagick-1_3_13 -8341c19a4d23a467956a24d2d85741b5482d5bb2 GraphicsMagick-1_3_14 -89620e363b11fd030cbd66b19366fd0c12919b92 GraphicsMagick-1_3_15 -a7209a4396eeaf27ef754d1bf054200e312ef5ed GraphicsMagick-1_3_16 -2099ded8eac12576eec58e3a87e9274c92b3bf05 GraphicsMagick-1_3_17 -2099ded8eac12576eec58e3a87e9274c92b3bf05 GraphicsMagick-1_3_17 -ed420f446589977e3c25959fc58f6653261ebe48 GraphicsMagick-1_3_17 -3efefce99e25f53e76514dcee2e4676beb3ff61e GraphicsMagick-1_3_18 -09cca6cd862b128440135c9e7adcff6a9a52704b GraphicsMagick-1_3_19 -47587edd7953c81c1c85f09eafc060c983c18188 GraphicsMagick-1_3_20 -fc472f96dae726f21cb1c7699a535cb55fdfb290 GraphicsMagick-1_3_21 -0c27524abb7dc39af605c21970914df676e43ec5 GraphicsMagick-1_3_22 -4e0a7a93d9a4fae31226a706fadc12a6c275e484 GraphicsMagick-1_3_23 -8711e07cdebed0d29123d1b4c6cd68412db62188 GraphicsMagick-1_3_24 -8711e07cdebed0d29123d1b4c6cd68412db62188 GraphicsMagick-1_3_24 -41876934e7621618882f9c83e223e3252af85504 GraphicsMagick-1_3_24 -1c07f70e5dd9ade830b37d1257316cb3d47ace49 GraphicsMagick-1_3_25 -db4eb7f97eebe929d6706499049b47e32471c988 GraphicsMagick-1_3_26 -0a95925f9cd030fdf222187a1725dd825c9939dc GraphicsMagick-1_3_27 -5dc2a95b4191ab98d230ac2585cbf4810dfec45e GraphicsMagick-1_3_27a -8a9c2b403451c7a1f00e63c3003d757802465cbc GraphicsMagick-1_3_28 -249c764b62f17881876fd1d98da9271842e5ce57 GraphicsMagick-1_3_29 -40a77e57e1b83e1285fa686437304ff852163e77 GraphicsMagick-1_3_30 -233618f8fe82415451e9c40b2fb42595736f0474 GraphicsMagick-1_3_31 -3465dd1a89a5423e3f9e3f1c8f749dd30b12e403 GraphicsMagick-1_3_32 -c7e811e43123fd0feedbd459dec59b5d8df19dec GraphicsMagick-1_3_33 -6d650073850f08c2b3a99cad588407ece87b9aa4 GraphicsMagick-1_3_34 -560875f67e82edb5e8484c769167203e009befce GraphicsMagick-1_3_35 -4f73af743b85017bffcc3c760302753cdb30c17d GraphicsMagick-1_3_36 -9c83dfc1ba6daf44a104e70ad56ba2492e7a8147 GraphicsMagick-1_3_37 -828ffc28c1c62cc0a1c9544fa3601c0a7243b92d GraphicsMagick-1_3_38 -78aa636779351eded47c82bde220059c59778922 GraphicsMagick-1_3_39 -c41d8933edef6b94bc99e7d886eaef60dea1e33f GraphicsMagick-1_3_40 -56057d1925048ba92bd5c1b05b96667fe1ad83f7 GraphicsMagick-1_3_41 diff -r 22c2ba42b57d -r df3d76d21d7e ChangeLog --- a/ChangeLog Fri Mar 22 07:55:14 2024 -0500 +++ b/ChangeLog Wed Apr 10 10:42:08 2024 -0500 @@ -1,9 +1,37 @@ +2024-04-10 Bob Friesenhahn <[email protected]> + + * magick/module_aliases.h: Only include module alias when there + is a module to support it. + + * magick/deprecate.c: Add a comment about magick monitor constant + string specification deprecations. + + * magick/command.c: Reduce relocations. + +2024-04-01 Bob Friesenhahn <[email protected]> + + * coders/tga.c: Fix Coverity issues 424688 and 424689, which are + due to inconsistent use of LogMagickEvent(). + +2024-03-31 Bob Friesenhahn <[email protected]> + + * utilities/tests/version.tap: New test script to exercise version + output. + + * utilities/tests/help.tap: Skip 'batch' help since its help + output contains TAP syntax, which confuses the test. + + * magick/command.c: Add support for a --version option, which + produces GNU style summary version output. + +2024-03-23 Bob Friesenhahn <[email protected]> + + * magick/version.h.in: Copyright year is 2024! + 2024-03-22 Bob Friesenhahn <[email protected]> * PerlMagick/t/{read.t, write.t}: Update expected TGA signatures. - * version.sh (PACKAGE_VERSION): Update for the 1.3.43 release. - 2024-03-21 Bob Friesenhahn <[email protected]> * NEWS.txt: Update the news. diff -r 22c2ba42b57d -r df3d76d21d7e ChangeLog.2010 --- a/ChangeLog.2010 Fri Mar 22 07:55:14 2024 -0500 +++ b/ChangeLog.2010 Wed Apr 10 10:42:08 2024 -0500 @@ -391,10 +391,6 @@ proceed to the next file name rather than quitting. Problem was reported by Patrick Welche. -2010-03-08 Bob Friesenhahn <[email protected]> - - * version.sh: Released GraphicsMagick 1.3.12. - 2010-03-03 Bob Friesenhahn <[email protected]> * PerlMagick/Makefile.am: Update PerlMagick/Magick.pm in the @@ -438,10 +434,6 @@ "graphicsmagick: "convert" command is broken", reported by Vladimir Stavrinov. -2010-02-21 Bob Friesenhahn <[email protected]> - - * version.sh: Released GraphicsMagick 1.3.11. - 2010-02-19 Bob Friesenhahn <[email protected]> * magick/composite.c (GetCompositionPixelIteratorCallback): @@ -471,10 +463,6 @@ character value is in the extended range. Problem reported by Arseny Solokha. Resolves SourceForge patch #2953314. -2010-02-10 Bob Friesenhahn <[email protected]> - - * version.sh: Released GraphicsMagick 1.3.10. - 2010-02-09 Bob Friesenhahn <[email protected]> * Magick++/demo/demo.cpp (main): Split demo output frames into @@ -500,10 +488,6 @@ "foo%d.jpg" rather than "foo0.jpg". Problem reported by Frans Coetzee. -2010-02-04 Bob Friesenhahn <[email protected]> - - * version.sh: Released GraphicsMagick 1.3.9. - 2010-02-03 Bob Friesenhahn <[email protected]> * doc/imdoc2man: Bare single quotes at the beginning of a line @@ -592,12 +576,6 @@ omp_get_max_threads(). Otherwise there is a crash if the number of threads is reduced from the original value. -2010-01-21 Bob Friesenhahn <[email protected]> - - * version.sh: Released GraphicsMagick 1.3.8. - - * NEWS.txt: Update for the 1.3.8 release. - 2010-01-20 Bob Friesenhahn <[email protected]> * www/benchmarks.rst: Update benchmark report to compare diff -r 22c2ba42b57d -r df3d76d21d7e Makefile.in --- a/Makefile.in Fri Mar 22 07:55:14 2024 -0500 +++ b/Makefile.in Wed Apr 10 10:42:08 2024 -0500 @@ -4840,7 +4840,8 @@ utilities/tests/montage.tap \ utilities/tests/msl_composite.tap \ utilities/tests/preview.tap \ - utilities/tests/resize.tap + utilities/tests/resize.tap \ + utilities/tests/version.tap UTILITIES_MANS = \ utilities/gm.1 \ diff -r 22c2ba42b57d -r df3d76d21d7e PerlMagick/Magick.pm --- a/PerlMagick/Magick.pm Fri Mar 22 07:55:14 2024 -0500 +++ b/PerlMagick/Magick.pm Wed Apr 10 10:42:08 2024 -0500 @@ -40,7 +40,7 @@ ); # This version identifier must match the package version. -($VERSION) = '1.3.43' =~ /^([\d.]+)/g; +($VERSION) = '1.4' =~ /^([\d.]+)/g; sub AUTOLOAD { # This AUTOLOAD is used to 'autoload' constants from the constant() diff -r 22c2ba42b57d -r df3d76d21d7e VisualMagick/installer/inc/version.isx --- a/VisualMagick/installer/inc/version.isx Fri Mar 22 07:55:14 2024 -0500 +++ b/VisualMagick/installer/inc/version.isx Wed Apr 10 10:42:08 2024 -0500 @@ -9,6 +9,6 @@ #endif #define public MagickPackageName "GraphicsMagick" -#define public MagickPackageVersion "1.3.43" -#define public MagickPackageVersionAddendum "" -#define public MagickPackageReleaseDate "2024-03-23" +#define public MagickPackageVersion "1.4" +#define public MagickPackageVersionAddendum ".020240410" +#define public MagickPackageReleaseDate "snapshot-20240410" diff -r 22c2ba42b57d -r df3d76d21d7e coders/tga.c --- a/coders/tga.c Fri Mar 22 07:55:14 2024 -0500 +++ b/coders/tga.c Wed Apr 10 10:42:08 2024 -0500 @@ -376,7 +376,7 @@ assert(image_info->signature == MagickSignature); assert(exception != (ExceptionInfo *) NULL); assert(exception->signature == MagickSignature); - LogMagickEvent(CoderEvent,GetMagickModule(),"enter"); + (void) LogMagickEvent(CoderEvent,GetMagickModule(),"enter"); image = AllocateImage(image_info); status = OpenBlob(image_info,image,ReadBinaryBlobMode,exception); if (status == MagickFalse) @@ -1068,7 +1068,8 @@ assert(image != (Image *) NULL); assert(image->signature == MagickSignature); image_list_length=GetImageListLength(image); - LogMagickEvent(CoderEvent,GetMagickModule(),"enter"); + if(image->logging) + (void) LogMagickEvent(CoderEvent,GetMagickModule(),"enter"); if(image->logging) (void)LogMagickEvent(CoderEvent,GetMagickModule(), "%" MAGICK_SIZE_T_F "u image frames in list", diff -r 22c2ba42b57d -r df3d76d21d7e magick/command.c --- a/magick/command.c Fri Mar 22 07:55:14 2024 -0500 +++ b/magick/command.c Wed Apr 10 10:42:08 2024 -0500 @@ -1,5 +1,5 @@ /* -% Copyright (C) 2003 - 2023 GraphicsMagick Group +% Copyright (C) 2003 - 2024 GraphicsMagick Group % Copyright (C) 2002 ImageMagick Studio % % This program is covered by multiple licenses, which are described in @@ -188,63 +188,62 @@ #endif SetCommand(ImageInfo *image_info,int argc,char **argv, char **metadata,ExceptionInfo *exception), - VersionCommand(ImageInfo *image_info,int argc,char **argv, - char **metadata,ExceptionInfo *exception); + VersionCommand(ImageInfo *image_info_ignored,int argc,char **argv, + char **metadata_ignored,ExceptionInfo *exception_ignored); static const struct { const char command[10]; - const char * const description; + const char description[58]; CommandVectorHandler command_vector; UsageVectorHandler usage_vector; int pass_metadata; RunMode support_mode; -} - commands[] = - { +} commands[] = + { #if defined(HasX11) - { "animate", "animate a sequence of images", - AnimateImageCommand, AnimateUsage, 0, SingleMode | BatchMode }, + { "animate", "animate a sequence of images", + AnimateImageCommand, AnimateUsage, 0, SingleMode | BatchMode }, #endif - { "batch", "issue multiple commands in interactive or batch mode", - 0, BatchUsage, 1, SingleMode }, - { "benchmark", "benchmark one of the other commands", - BenchmarkImageCommand, BenchmarkUsage, 1, SingleMode | BatchMode }, - { "compare", "compare two images", - CompareImageCommand, CompareUsage, 0, SingleMode | BatchMode }, - { "composite", "composite images together", - CompositeImageCommand, CompositeUsage, 0, SingleMode | BatchMode }, - { "conjure", "execute a Magick Scripting Language (MSL) XML script", - ConjureImageCommand, ConjureUsage, 0, SingleMode | BatchMode }, - { "convert", "convert an image or sequence of images", - ConvertImageCommand, ConvertUsage, 0, SingleMode | BatchMode }, + { "batch", "issue multiple commands in interactive or batch mode", + 0, BatchUsage, 1, SingleMode }, + { "benchmark", "benchmark one of the other commands", + BenchmarkImageCommand, BenchmarkUsage, 1, SingleMode | BatchMode }, + { "compare", "compare two images", + CompareImageCommand, CompareUsage, 0, SingleMode | BatchMode }, + { "composite", "composite images together", + CompositeImageCommand, CompositeUsage, 0, SingleMode | BatchMode }, + { "conjure", "execute a Magick Scripting Language (MSL) XML script", + ConjureImageCommand, ConjureUsage, 0, SingleMode | BatchMode }, + { "convert", "convert an image or sequence of images", + ConvertImageCommand, ConvertUsage, 0, SingleMode | BatchMode }, #if defined(HasX11) - { "display", "display an image on a workstation running X", - DisplayImageCommand, DisplayUsage, 0, SingleMode | BatchMode }, + { "display", "display an image on a workstation running X", + DisplayImageCommand, DisplayUsage, 0, SingleMode | BatchMode }, #endif - { "help", "obtain usage message for named command", - HelpCommand, GMUsage, 0, SingleMode | BatchMode }, - { "identify", "describe an image or image sequence", - IdentifyImageCommand, IdentifyUsage, 1, SingleMode | BatchMode }, + { "help", "obtain usage message for named command", + HelpCommand, GMUsage, 0, SingleMode | BatchMode }, + { "identify", "describe an image or image sequence", + IdentifyImageCommand, IdentifyUsage, 1, SingleMode | BatchMode }, #if defined(HasX11) - { "import", "capture an application or X server screen", - ImportImageCommand, ImportUsage, 0, SingleMode | BatchMode }, + { "import", "capture an application or X server screen", + ImportImageCommand, ImportUsage, 0, SingleMode | BatchMode }, #endif - { "mogrify", "transform an image or sequence of images", - MogrifyImageCommand, MogrifyUsage, 0, SingleMode | BatchMode }, - { "montage", "create a composite image (in a grid) from separate images", - MontageImageCommand, MontageUsage, 0, SingleMode | BatchMode }, - { "set", "change batch mode option", - SetCommand, SetUsage, 1, BatchMode }, - { "time", "time one of the other commands", - TimeImageCommand, TimeUsage, 1, SingleMode | BatchMode }, - { "version", "obtain release version", - VersionCommand, 0, 0, SingleMode | BatchMode } + { "mogrify", "transform an image or sequence of images", + MogrifyImageCommand, MogrifyUsage, 0, SingleMode | BatchMode }, + { "montage", "create a composite image (in a grid) from separate images", + MontageImageCommand, MontageUsage, 0, SingleMode | BatchMode }, + { "set", "change batch mode option", + SetCommand, SetUsage, 1, BatchMode }, + { "time", "time one of the other commands", + TimeImageCommand, TimeUsage, 1, SingleMode | BatchMode }, + { "version", "obtain release version", + VersionCommand, 0, 0, SingleMode | BatchMode } #if defined(MSWINDOWS) - ,{ "register", "register this application as the source of messages", - RegisterCommand, 0, 0, SingleMode | BatchMode } + ,{ "register", "register this application as the source of messages", + RegisterCommand, 0, 0, SingleMode | BatchMode } #endif - }; + }; static SemaphoreInfo *command_semaphore = (SemaphoreInfo *) NULL; @@ -688,7 +687,7 @@ AnimateUsage(); return MagickPass; } - if (LocaleCompare("version",option+1) == 0) + if ((LocaleCompare("version",option+1) == 0) || (LocaleCompare("-version",option+1) == 0)) { (void) VersionCommand(image_info,argc,argv,metadata,exception); return MagickPass; @@ -1399,7 +1398,7 @@ image_info->verbose+=(*option == '-'); break; } - if (LocaleCompare("version",option+1) == 0) + if ((LocaleCompare("version",option+1) == 0) || (LocaleCompare("-version",option+1) == 0)) break; if (LocaleCompare("virtual-pixel",option+1) == 0) { @@ -1549,11 +1548,29 @@ */ static MagickPassFail BatchCommand(int argc, char **argv) { - int result; - MagickBool hasInputFile; - int ac; - char *av[MAX_PARAM+1]; - unsigned int line_no = 0; + char + *av[MAX_PARAM+1]; + + unsigned int + line_no = 0; + + int + ac, + result; + + MagickBool + hasInputFile; + + /* + Initialize locale from environment variables (LANG, LC_CTYPE, + LC_NUMERIC, LC_TIME, LC_COLLATE, LC_MONETARY, LC_MESSAGES, + LC_ALL), but require that LC_NUMERIC use common conventions. The + LC_NUMERIC variable affects the decimal point character and + thousands separator character for the formatted input/output + functions and string conversion functions. + */ + (void) setlocale(LC_ALL,""); + (void) setlocale(LC_NUMERIC,"C"); #if defined(MSWINDOWS) InitializeMagick((char *) NULL); @@ -1565,6 +1582,23 @@ FormatString(client_name,"%.1024s %s", argv[0], argv[1]); (void) SetClientName(client_name); } +#if 1 + if (argc > 2) + { + if ((LocaleCompare("-help",argv[2]) == 0 || + LocaleCompare("-?",argv[2]) == 0)) + { + BatchUsage(); + return MagickFail; + } + if ((LocaleCompare("-version",argv[2]) == 0) || (LocaleCompare("--version",argv[2]) == 0)) + { + (void) VersionCommand(0/* image_info */,argc-1,argv+1,0/* metadata */,0/*exception*/); + return MagickPass; + } + } + +#endif { BatchOptions dummy; @@ -1914,7 +1948,7 @@ } return MagickPass; } - if (LocaleCompare("-version",argv[1]) == 0) + if ((LocaleCompare("-version",argv[1]) == 0) || (LocaleCompare("--version",argv[1]) == 0)) { (void) VersionCommand(image_info,argc,argv,metadata,exception); return MagickPass; @@ -2364,7 +2398,7 @@ } return MagickPass; } - if (LocaleCompare("-version",argv[1]) == 0) + if ((LocaleCompare("-version",argv[1]) == 0) || (LocaleCompare("--version",argv[1]) == 0)) { (void) VersionCommand(image_info,argc,argv,metadata,exception); return MagickPass; @@ -2787,7 +2821,7 @@ image_info->verbose+=(*option == '-'); break; } - if (LocaleCompare("version",option+1) == 0) + if ((LocaleCompare("version",option+1) == 0) || (LocaleCompare("-version",option+1) == 0)) break; ThrowCompareException(OptionError,UnrecognizedOption,option) } @@ -3268,7 +3302,7 @@ } return MagickPass; } - if (LocaleCompare("-version",argv[1]) == 0) + if ((LocaleCompare("-version",argv[1]) == 0) || (LocaleCompare("--version",argv[1]) == 0)) { (void) VersionCommand(image_info,argc,argv,metadata,exception); return MagickPass; @@ -4124,7 +4158,7 @@ image_info->verbose+=(*option == '-'); break; } - if (LocaleCompare("version",option+1) == 0) + if ((LocaleCompare("version",option+1) == 0) || (LocaleCompare("-version",option+1) == 0)) break; if (LocaleCompare("virtual-pixel",option+1) == 0) { @@ -4457,7 +4491,7 @@ } return MagickPass; } - if (LocaleCompare("-version",argv[1]) == 0) + if ((LocaleCompare("-version",argv[1]) == 0) || (LocaleCompare("--version",argv[1]) == 0)) { (void) VersionCommand(image_info,argc,argv,metadata,exception); return MagickPass; @@ -6157,7 +6191,7 @@ image_info->verbose+=(*option == '-'); break; } - if (LocaleCompare("version",option+1) == 0) + if ((LocaleCompare("version",option+1) == 0) || (LocaleCompare("-version",option+1) == 0)) break; if (LocaleCompare("view",option+1) == 0) { @@ -6555,7 +6589,7 @@ } return MagickPass; } - if (LocaleCompare("-version",argv[1]) == 0) + if ((LocaleCompare("-version",argv[1]) == 0) || (LocaleCompare("--version",argv[1]) == 0)) { (void) VersionCommand(image_info,argc,argv,metadata,exception); return MagickPass; @@ -6835,7 +6869,7 @@ DisplayUsage(); return MagickPass; } - else if (LocaleCompare("-version",argv[1]) == 0) + else if ((LocaleCompare("-version",argv[1]) == 0) || (LocaleCompare("--version",argv[1]) == 0)) { (void) VersionCommand(image_info,argc,argv,metadata,exception); return MagickPass; @@ -7989,7 +8023,7 @@ image_info->verbose+=(*option == '-'); break; } - if (LocaleCompare("version",option+1) == 0) + if ((LocaleCompare("version",option+1) == 0) || (LocaleCompare("-version",option+1) == 0)) break; if (LocaleCompare("visual",option+1) == 0) { @@ -8459,7 +8493,7 @@ } return MagickPass; } - if (LocaleCompare("-version",argv[1]) == 0) + if ((LocaleCompare("-version",argv[1]) == 0) || (LocaleCompare("--version",argv[1]) == 0)) { (void) VersionCommand(image_info,argc,argv,metadata,exception); return MagickPass; @@ -8765,7 +8799,7 @@ image_info->verbose+=(*option == '-'); break; } - if (LocaleCompare("version",option+1) == 0) + if ((LocaleCompare("version",option+1) == 0) || (LocaleCompare("-version",option+1) == 0))