(no commit message)

[imagemagick] / MagickCore / option.h

diff --git a/MagickCore/option.h b/MagickCore/option.h
index 53059d903cc8d63e903085be7be93da5ed2b215a..cfd65961de630f29bdc02fd34ff70a8f6d3a158a 100644 (file)
--- a/MagickCore/option.h
+++ b/MagickCore/option.h
@@ -1,5 +1,5 @@
 /*
-  Copyright 1999-2013 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.
@@ -28,6 +28,7 @@ typedef enum
   MagickAlignOptions = 0,
   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,22 +105,24 @@ 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;
 
 /*
   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
 {
@@ -138,7 +145,7 @@ typedef enum
   AlwaysInterpretArgsFlag   = 0x0400,  /* Always Interpret escapes in Args */
                                        /* CF: "convert" compatibility mode */
   NeverInterpretArgsFlag    = 0x0800,  /* Never Interpret escapes in Args */
-                                       /* Typical because it's a filename */
+                                       /* EG: filename, or delayed escapes */
 
   NonMagickOptionFlag       = 0x1000,  /* Option not used by Magick Command */
   FireOptionFlag            = 0x2000,  /* Convert operation seq firing point */