https://github.com/ImageMagick/ImageMagick/issues/892

diff --git a/MagickCore/option.c b/MagickCore/option.c
index e1cfe418ef634b1bfb02b95c76e635ed185dd029..b183c67af47515e8bc0c1e2f76b778def2ec09ce 100644 (file)
--- 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 fc475370cc5d4c720e84bd2fb596578969758131..374e4fccdcb50bb2a7367ef4af4817bed2c66f7c 100644 (file)
--- 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 041d291ce6ad206e2867d51a84fb46cb52028ddf..a5cd91ec29822d186256d02e472d78fb79e58078 100755 (executable)
--- 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