From: anthony <anthony@git.imagemagick.org>
Date: Thu, 12 Apr 2012 11:54:26 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~5826
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bcdb020323212d6dca127fb105a92e8a47ac0e77;p=imagemagick

---

diff --git a/MagickCore/option.h b/MagickCore/option.h
index 35dd2e8f0..f7c541cbf 100644
--- a/MagickCore/option.h
+++ b/MagickCore/option.h
@@ -143,7 +143,7 @@ typedef enum
   SimpleOperatorOptionFlag  = 0x0010,  /* Simple Image processing operator */
   ListOperatorOptionFlag    = 0x0020,  /* Multi-Image processing operator */
   SpecialOptionFlag         = 0x0040,  /* Special handled Option */
-  GenesisOptionFlag         = 0x0080,  /* Genesis Command Wrapper Option  */
+  GenesisOptionFlag         = 0x0080,  /* MagickCommandGenesis() Only Option */
 
   ImageRequiredFlags        = 0x0030,  /* Flags also means Images Required */
 
diff --git a/MagickWand/magick-cli.c b/MagickWand/magick-cli.c
index 27d3c3a01..8cf81845c 100644
--- a/MagickWand/magick-cli.c
+++ b/MagickWand/magick-cli.c
@@ -516,13 +516,15 @@ WandExport int ProcessCommandOptions(MagickCLI *cli_wand, int argc,
 #endif
 
     if ( (option_type & DeprecateOptionFlag) != 0 ) {
-      CLIWandException(OptionWarning,"DeprecatedOption",option);
-      if ( CLICatchException(cli_wand, MagickFalse) != MagickFalse )
-        return(end);
-      /* fall through - do the depreciated option */
+      if ( (cli_wand->process_flags & ProcessReportDepreciated) != 0 ) {
+        CLIWandException(OptionWarning,"DeprecatedOption",option);
+        if ( CLICatchException(cli_wand, MagickFalse) != MagickFalse )
+          return(end);
+        /* fall through - do the depreciated option */
+      }
     }
     if ( (option_type & GenesisOptionFlag) != 0 ) {
-      goto next_argument;  /* ignore genesis options */
+      goto next_argument;  /* ignore MagickCommandGenesis() Only Option */
     }
     if (((option_type & ImageRequiredFlags) != 0 ) &&
         ( cli_wand->wand.images == (Image *)NULL ) ) {
diff --git a/MagickWand/wandcli-private.h b/MagickWand/wandcli-private.h
index 9c17b249b..46bdeb73b 100644
--- a/MagickWand/wandcli-private.h
+++ b/MagickWand/wandcli-private.h
@@ -63,6 +63,7 @@ typedef enum
   ProcessExitOption           = 0x0100,  /* allow '-exit' use */
   ProcessScriptOption         = 0x0200,  /* allow '-script' use */
   ProcessReadOption           = 0x0400,  /* allow '-read' use */
+  ProcessReportDepreciated    = 0x0800,  /* report depreciated options */
 
   /* Option Processing Flags */
   ProcessOneOptionOnly        = 0x4000,  /* Process one option only */