From: anthony <anthony@git.imagemagick.org>
Date: Mon, 16 Apr 2012 01:17:38 +0000 (+0000)
Subject: -depth is also a Setting and a Operator :-(
X-Git-Tag: 7.0.1-0~5799
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=df3237234d15553baae333a9613b7d2593691a0c;p=imagemagick

-depth is also a Setting and a Operator :-(
---

diff --git a/MagickCore/option.c b/MagickCore/option.c
index 5a66da5ae..d6c162b01 100644
--- a/MagickCore/option.c
+++ b/MagickCore/option.c
@@ -319,8 +319,8 @@ static const OptionInfo
     { "-delete", 1L, ListOperatorOptionFlag | FireOptionFlag, MagickFalse },
     { "+density", 0L, ImageInfoOptionFlag | DrawInfoOptionFlag, MagickFalse },
     { "-density", 1L, ImageInfoOptionFlag | DrawInfoOptionFlag, MagickFalse },
-    { "+depth", 0L, ImageInfoOptionFlag, MagickFalse },
-    { "-depth", 1L, ImageInfoOptionFlag, MagickFalse },
+    { "+depth", 0L, ImageInfoOptionFlag | SimpleOperatorOptionFlag, MagickFalse },
+    { "-depth", 1L, ImageInfoOptionFlag | SimpleOperatorOptionFlag, MagickFalse },
     { "+descend", 0L, NonMagickOptionFlag, MagickFalse },
     { "-descend", 1L, NonMagickOptionFlag, MagickFalse },
     { "+deskew", 0L, SimpleOperatorOptionFlag, MagickFalse },
diff --git a/MagickWand/magick-cli.c b/MagickWand/magick-cli.c
index f9a97811f..1d29d9aab 100644
--- a/MagickWand/magick-cli.c
+++ b/MagickWand/magick-cli.c
@@ -312,7 +312,7 @@ WandExport void ProcessScriptOptions(MagickCLI *cli_wand,int argc,char **argv,
 
     /* FUTURE: The not a setting part below is a temporary hack to stop gap
      * measure for options that are BOTH settings and optional 'Simple/List'
-     * operators.  Specifically -monitor  and  -colorspace */
+     * operators.  Specifically -monitor, -depth, and  -colorspace */
     if ( cli_wand->wand.images == (Image *)NULL ) {
       if (((option_type & ImageRequiredFlags) != 0 ) &&
           ((option_type & SettingOptionFlags) == 0 ))  /* temp hack */
@@ -546,7 +546,7 @@ WandExport int ProcessCommandOptions(MagickCLI *cli_wand, int argc,
 
     /* FUTURE: The not a setting part below is a temporary hack to stop gap
      * measure for options that are BOTH settings and optional 'Simple/List'
-     * operators.  Specifically -monitor  and  -colorspace */
+     * operators.  Specifically -monitor, -depth, and  -colorspace */
     if ( cli_wand->wand.images == (Image *)NULL ) {
       if (((option_type & ImageRequiredFlags) != 0 ) &&
           ((option_type & SettingOptionFlags) == 0 )  )  /* temp hack */