From: Cristy <urban-warrior@imagemagick.org>
Date: Sat, 9 Dec 2017 12:58:53 +0000 (-0500)
Subject: https://github.com/ImageMagick/ImageMagick/issues/892
X-Git-Tag: 7.0.7-15~25
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cdd428f43cb404e7a3e385ee532c0a29120145d5;p=imagemagick

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

diff --git a/MagickCore/option.c b/MagickCore/option.c
index b183c67af..b082f0749 100644
--- a/MagickCore/option.c
+++ b/MagickCore/option.c
@@ -1394,9 +1394,9 @@ 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 },
+    { "Tool", MagickToolOptions, UndefinedOptionFlag, MagickFalse },
     { "Type", MagickTypeOptions, UndefinedOptionFlag, MagickFalse },
     { "Units", MagickResolutionOptions, UndefinedOptionFlag, MagickFalse },
     { "Undefined", MagickUndefinedOptions, UndefinedOptionFlag, MagickTrue },
@@ -1762,17 +1762,16 @@ 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 },
+  ToolOptions[] =
+  {
+    { "animate", 1, UndefinedOptionFlag, MagickFalse },
+    { "compare", 2, UndefinedOptionFlag, MagickFalse },
+    { "composite", 3, UndefinedOptionFlag, MagickFalse },
+    { "conjure", 4, UndefinedOptionFlag, MagickFalse },
+    { "convert", 5, UndefinedOptionFlag, MagickFalse },
+    { "display", 6, UndefinedOptionFlag, MagickFalse },
+    { "identify", 7, UndefinedOptionFlag, MagickFalse },
+    { "import", 8, UndefinedOptionFlag, MagickFalse },
     { "mogrify", 9, UndefinedOptionFlag, MagickFalse },
     { "montage", 10, UndefinedOptionFlag, MagickFalse },
     { "stream", 11, UndefinedOptionFlag, MagickFalse },
@@ -2162,7 +2161,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 MagickToolOptions: return(ToolOptions);
     case MagickStyleOptions: return(StyleOptions);
     case MagickTypeOptions: return(TypeOptions);
     case MagickValidateOptions: return(ValidateOptions);
diff --git a/MagickCore/option.h b/MagickCore/option.h
index 374e4fccd..190bd6694 100644
--- a/MagickCore/option.h
+++ b/MagickCore/option.h
@@ -103,7 +103,7 @@ typedef enum
   MagickVirtualPixelOptions,
   MagickWeightOptions,
   MagickAutoThresholdOptions,
-  MagickSubcommandOptions
+  MagickToolOptions
 } CommandOption;
 
 typedef enum
diff --git a/MagickWand/magick-cli.c b/MagickWand/magick-cli.c
index 155c79533..8bd7aa16c 100644
--- a/MagickWand/magick-cli.c
+++ b/MagickWand/magick-cli.c
@@ -595,6 +595,8 @@ static void MagickUsage(MagickBooleanType verbose)
   }
   else {
     /* magick usage */
+    (void) FormatLocaleFile(stdout,
+       "Usage: %s tool [ {option} | {image} ... ] {output_image}\n",name);
     (void) FormatLocaleFile(stdout,
        "Usage: %s [ {option} | {image} ... ] {output_image}\n",name);
     (void) FormatLocaleFile(stdout,