(no commit message)

[imagemagick] / MagickCore / option.h

diff --git a/MagickCore/option.h b/MagickCore/option.h
index 35dd2e8f02e47624ecf5dcf32f7d669bb6ee0ca1..cfd65961de630f29bdc02fd34ff70a8f6d3a158a 100644 (file)
--- a/MagickCore/option.h
+++ b/MagickCore/option.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.
@@ -26,8 +26,9 @@ typedef enum
 {
   MagickUndefinedOptions = -1,
   MagickAlignOptions = 0,
-  MagickAlphaOptions,
+  MagickAlphaChannelOptions,
   MagickBooleanOptions,
+  MagickCacheOptions,
   MagickChannelOptions,
   MagickClassOptions,
   MagickClipPathOptions,
@@ -35,6 +36,7 @@ typedef enum
   MagickColorOptions,
   MagickColorspaceOptions,
   MagickCommandOptions,
+  MagickComplexOptions,
   MagickComposeOptions,
   MagickCompressOptions,
   MagickConfigureOptions,
@@ -55,6 +57,7 @@ typedef enum
   MagickFormatOptions,
   MagickFunctionOptions,
   MagickGravityOptions,
+  MagickIntensityOptions,
   MagickIntentOptions,
   MagickInterlaceOptions,
   MagickInterpolateOptions,
@@ -76,6 +79,8 @@ typedef enum
   MagickNoiseOptions,
   MagickOrientationOptions,
   MagickPixelChannelOptions,
+  MagickPixelIntensityOptions,
+  MagickPixelMaskOptions,
   MagickPixelTraitOptions,
   MagickPolicyOptions,
   MagickPolicyDomainOptions,
@@ -100,59 +105,68 @@ typedef enum
 {
   UndefinedValidate,
   NoValidate = 0x00000,
-  CompareValidate = 0x00001,
-  CompositeValidate = 0x00002,
-  ConvertValidate = 0x00004,
-  FormatsInMemoryValidate = 0x00008,
-  FormatsOnDiskValidate = 0x00010,
-  IdentifyValidate = 0x00020,
-  ImportExportValidate = 0x00040,
-  MontageValidate = 0x00080,
-  StreamValidate = 0x00100,
+  ColorspaceValidate = 0x00001,
+  CompareValidate = 0x00002,
+  CompositeValidate = 0x00004,
+  ConvertValidate = 0x00008,
+  FormatsDiskValidate = 0x00010,
+  FormatsMapValidate = 0x00020,
+  FormatsMemoryValidate = 0x00040,
+  IdentifyValidate = 0x00080,
+  ImportExportValidate = 0x00100,
+  MontageValidate = 0x00200,
+  StreamValidate = 0x00400,
   AllValidate = 0x7fffffff
 } ValidateType;
 
-typedef struct _OptionInfo
-{
-  const char
-    *mnemonic;
-
-  ssize_t
-    type,
-    flags;
-
-  MagickBooleanType
-    stealth;
-} OptionInfo;
-
 /*
   Flags to describe classes of image processing options.
   These are used to determine how a option should be processed, and
-  allow use to avoid attempting to process each option in every way posible.
+  avoid attempting to process all options in every way posible.
 */
 typedef enum
 {
   UndefinedOptionFlag       = 0x0000,  /* option flag is not in use */
 
-  ImageInfoOptionFlag       = 0x0001,  /* Setting for ImageInfo */
-  DrawInfoOptionFlag        = 0x0002,  /* Setting for DrawInfo */
-  QuantizeInfoOptionFlag    = 0x0004,  /* Setting for QuantizeInfo */
-  GlobalOptionFlag          = 0x0008,  /* Setting for Global Option */
-  SettingOptionFlags        = 0x000F,  /* mask for all setting options */
+  ImageInfoOptionFlag       = 0x0001,  /* Setting stored in ImageInfo */
+  DrawInfoOptionFlag        = 0x0002,  /* Setting stored in DrawInfo */
+  QuantizeInfoOptionFlag    = 0x0004,  /* Setting stored in QuantizeInfo */
+  GlobalOptionFlag          = 0x0008,  /* Global Setting or Control */
+  SettingOptionFlags        = 0x000F,  /* mask any setting option */
+
+  NoImageOperatorFlag       = 0x0010,  /* Images not required operator */
+  SimpleOperatorFlag        = 0x0020,  /* Simple Image processing operator */
+  ListOperatorFlag          = 0x0040,  /* Multi-Image processing operator */
+  GenesisOptionFlag         = 0x0080,  /* MagickCommandGenesis() Only Option */
 
-  SimpleOperatorOptionFlag  = 0x0010,  /* Simple Image processing operator */
-  ListOperatorOptionFlag    = 0x0020,  /* Multi-Image processing operator */
-  SpecialOptionFlag         = 0x0040,  /* Special handled Option */
-  GenesisOptionFlag         = 0x0080,  /* Genesis Command Wrapper Option  */
+  SpecialOptionFlag         = 0x0100,  /* Operator with Special Requirements */
+                                       /* EG: for specific CLI commands */
 
-  ImageRequiredFlags        = 0x0030,  /* Flags also means Images Required */
+  AlwaysInterpretArgsFlag   = 0x0400,  /* Always Interpret escapes in Args */
+                                       /* CF: "convert" compatibility mode */
+  NeverInterpretArgsFlag    = 0x0800,  /* Never Interpret escapes in Args */
+                                       /* EG: filename, or delayed escapes */
 
   NonMagickOptionFlag       = 0x1000,  /* Option not used by Magick Command */
-  FireOptionFlag            = 0x4000,  /* Convert operation seq firing point */
-  DeprecateOptionFlag       = 0x8000   /* Deprecate option, give warning */
+  FireOptionFlag            = 0x2000,  /* Convert operation seq firing point */
+  DeprecateOptionFlag       = 0x4000,  /* Deprecate option (no code) */
+  ReplacedOptionFlag        = 0x8800   /* Replaced Option (but still works) */
 
 } CommandOptionFlags;
 
+typedef struct _OptionInfo
+{
+  const char
+    *mnemonic;
+
+  ssize_t
+    type,
+    flags;
+
+  MagickBooleanType
+    stealth;
+} OptionInfo;
+
 
 extern MagickExport char
   **GetCommandOptions(const CommandOption),