From 4c14b40a4936fc2f03150630dd6f03c12ddd5526 Mon Sep 17 00:00:00 2001 From: Cristy Date: Fri, 8 Dec 2017 20:29:23 -0500 Subject: [PATCH] https://github.com/ImageMagick/ImageMagick/issues/892 --- MagickCore/option.c | 18 ++++++++++++++++++ MagickCore/option.h | 3 ++- configure | 2 +- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/MagickCore/option.c b/MagickCore/option.c index e1cfe418e..b183c67af 100644 --- a/MagickCore/option.c +++ b/MagickCore/option.c @@ -1394,6 +1394,7 @@ static const OptionInfo { "Statistic", MagickStatisticOptions, UndefinedOptionFlag, MagickFalse }, { "Storage", MagickStorageOptions, UndefinedOptionFlag, MagickFalse }, { "Stretch", MagickStretchOptions, UndefinedOptionFlag, MagickFalse }, + { "Subcommand", MagickSubcommandOptions, UndefinedOptionFlag, MagickFalse }, { "Style", MagickStyleOptions, UndefinedOptionFlag, MagickFalse }, { "Threshold", MagickThresholdOptions, UndefinedOptionFlag, MagickFalse }, { "Type", MagickTypeOptions, UndefinedOptionFlag, MagickFalse }, @@ -1761,6 +1762,22 @@ static const OptionInfo { "Oblique", ObliqueStyle, UndefinedOptionFlag, MagickFalse }, { (char *) NULL, UndefinedStyle, UndefinedOptionFlag, MagickFalse } }, + SubcommandOptions[] = + { + { "animate", 0, UndefinedOptionFlag, MagickFalse }, + { "compare", 1, UndefinedOptionFlag, MagickFalse }, + { "composite", 2, UndefinedOptionFlag, MagickFalse }, + { "conjure", 3, UndefinedOptionFlag, MagickFalse }, + { "convert", 4, UndefinedOptionFlag, MagickFalse }, + { "display", 5, UndefinedOptionFlag, MagickFalse }, + { "identify", 6, UndefinedOptionFlag, MagickFalse }, + { "import", 7, UndefinedOptionFlag, MagickFalse }, + { "magick-script", 8, UndefinedOptionFlag, MagickFalse }, + { "mogrify", 9, UndefinedOptionFlag, MagickFalse }, + { "montage", 10, UndefinedOptionFlag, MagickFalse }, + { "stream", 11, UndefinedOptionFlag, MagickFalse }, + { (char *) NULL, 0, UndefinedOptionFlag, MagickFalse } + }, TypeOptions[] = { { "Undefined", UndefinedType, UndefinedOptionFlag, MagickTrue }, @@ -2145,6 +2162,7 @@ static const OptionInfo *GetOptionInfo(const CommandOption option) case MagickStatisticOptions: return(StatisticOptions); case MagickStorageOptions: return(StorageOptions); case MagickStretchOptions: return(StretchOptions); + case MagickSubcommandOptions: return(SubcommandOptions); case MagickStyleOptions: return(StyleOptions); case MagickTypeOptions: return(TypeOptions); case MagickValidateOptions: return(ValidateOptions); diff --git a/MagickCore/option.h b/MagickCore/option.h index fc475370c..374e4fccd 100644 --- a/MagickCore/option.h +++ b/MagickCore/option.h @@ -102,7 +102,8 @@ typedef enum MagickValidateOptions, MagickVirtualPixelOptions, MagickWeightOptions, - MagickAutoThresholdOptions + MagickAutoThresholdOptions, + MagickSubcommandOptions } CommandOption; typedef enum diff --git a/configure b/configure index 041d291ce..a5cd91ec2 100755 --- a/configure +++ b/configure @@ -4559,7 +4559,7 @@ MAGICK_PATCHLEVEL_VERSION=15 MAGICK_VERSION=7.0.7-15 -MAGICK_GIT_REVISION=21859:4fec3c6b3:20171206 +MAGICK_GIT_REVISION=21875:23d0d206f:20171208 # Substitute library versioning -- 2.40.0