(no commit message)

[imagemagick] / MagickWand / wandcli-private.h

diff --git a/MagickWand/wandcli-private.h b/MagickWand/wandcli-private.h
index b0d350b44ab68ee2e86a0cf865af239b00130afd..409d658d7d7782243327ee75652a128986ba1e55 100644 (file)
--- a/MagickWand/wandcli-private.h
+++ b/MagickWand/wandcli-private.h
@@ -1,5 +1,5 @@
 /*
-  Copyright 1999-2012 ImageMagick Studio LLC, a non-profit organization
+  Copyright 1999-2014 ImageMagick Studio LLC, a non-profit organization
   dedicated to making software imaging solutions freely available.
 
   You may not use this file except in compliance with the License.
@@ -24,16 +24,16 @@ extern "C" {
 
 #define CLIWandException(severity,tag,option) \
   (void) CLIThrowException(cli_wand,GetMagickModule(),severity,tag, \
-       "'%s'",option)
+       "`%s'",option)
 
 #define CLIWandExceptionArg(severity,tag,option,arg) \
   (void) CLIThrowException(cli_wand,GetMagickModule(),severity,tag, \
        "'%s' '%s'",option, arg)
 
-#define CLIWandWarnDepreciated(message) \
+#define CLIWandWarnReplaced(message) \
   if ( (cli_wand->process_flags & ProcessWarnDepreciated) != 0 ) \
     (void) CLIThrowException(cli_wand,GetMagickModule(),OptionWarning, \
-       "DeprecatedOption", "'%s', use \"%s\"",option,message)
+       "ReplacedOption", "'%s', use \"%s\"",option,message)
 
 #define CLIWandExceptionFile(severity,tag,context) \
 { char *message=GetExceptionMessage(errno); \
@@ -59,11 +59,12 @@ extern "C" {
 /* Define how options should be processed */
 typedef enum
 {
-  /* NonOption Handling */
-  ProcessNonOptionImageRead   = 0x0001,  /* A non-option is a image read
+  /* General Option Handling */
+  ProcessImplictRead          = 0x0001,  /* Non-options are image reads.
                                             If not set then skip implied read
                                             without producing an error.
                                             For use with "mogrify" handling */
+  ProcessInterpretProperities = 0x0010,  /* allow general escapes in args */
 
   /* Special Option Handling */
   ProcessExitOption           = 0x0100,  /* allow '-exit' use */
@@ -73,10 +74,10 @@ typedef enum
 
   /* Option Processing Flags */
   ProcessOneOptionOnly        = 0x4000,  /* Process one option only */
-  ProcessImpliedWrite         = 0x8000,  /* Last arg is an implied write */
+  ProcessImplictWrite         = 0x8000,  /* Last arg is an implict write */
 
   /* Flag Groups for specific Situations */
-  MagickCommandOptionFlags    = 0x8F0F,  /* Magick Command Flags */
+  MagickCommandOptionFlags    = 0x8FFF,  /* Magick Command Flags */
   ConvertCommandOptionFlags   = 0x800F,  /* Convert Command Flags */
   MagickScriptArgsFlags       = 0x000F,  /* Script CLI Process Args Flags */
 } ProcessOptionFlags;
@@ -99,8 +100,8 @@ typedef struct _Stack
 */
 struct _MagickCLI       /* CLI interface version of MagickWand */
 {
-  struct _MagickWand    /* this must be the first structure */
-     wand;
+  struct _MagickWand    /* This must be the first structure */
+     wand;              /* The Image List and Global Option Settings */
 
   QuantizeInfo
     *quantize_info;     /* for CLI API usage, not used by MagickWand API */
@@ -108,16 +109,19 @@ struct _MagickCLI       /* CLI interface version of MagickWand */
   DrawInfo
     *draw_info;         /* for CLI API usage, not used by MagickWand API */
 
+  ProcessOptionFlags
+    process_flags;      /* When handling CLI, what options do we process? */
+
+  const OptionInfo
+    *command;           /* The option entry that is being processed */
+
   Stack
     *image_list_stack,  /* Stacks of Image Lists and Image Info settings */
     *image_info_stack;
 
-  ProcessOptionFlags
-    process_flags;      /* when handling CLI, what options do we process? */
-
   const char            /* Location of option being processed for exception */
     *location,          /* location format string for exception reports */
-    *filename;          /* "CLI", "unknown", or script filename */
+    *filename;          /* "CLI", "unknown", or the script filename */
 
   size_t
     line,               /* location of current option from source */