(no commit message)

[imagemagick] / MagickWand / magick-cli.h

diff --git a/MagickWand/magick-cli.h b/MagickWand/magick-cli.h
index b72154099fd2037507fb2247a995a24b66b7bb5b..be4d84a37dd6c055c17981a38ba75e7f602cdf01 100644 (file)
--- a/MagickWand/magick-cli.h
+++ b/MagickWand/magick-cli.h
@@ -1,5 +1,5 @@
 /*
-  Copyright 1999-2012 ImageMagick Studio LLC, a non-profit organization
+  Copyright 1999-2013 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.
@@ -22,36 +22,11 @@
 extern "C" {
 #endif
 
-typedef struct _MagickCLI
-  MagickCLI;
-
-typedef enum
-{
-  /* What options should be processed */
-  /* NonOption Handling */
-  ProcessNonOptionImageRead   = 0x0001,  /* non-option is a image read */
-  ProcessUnknownOptionError   = 0x0002,  /* unknown option produces error */
-
-  /* Special Option Handling */
-  ProcessExitOption           = 0x0100,  /* allow '-exit' use */
-  ProcessScriptOption         = 0x0200,  /* allow '-script' use */
-  ProcessReadOption           = 0x0400,  /* allow '-read' use */
-
-  /* Option Processing Flags */
-  ProcessOneOptionOnly        = 0x4000,  /* Process One Option Only */
-  ProcessOutputFile           = 0x8000,  /* Process the output file */
-
-  /* Flag Groups for specific Situations */
-  CommandCommandOptionFlags   = 0x80FF,  /* Convert Command Flags */
-  MagickCommandOptionFlags    = 0x8FFF,  /* Magick Command Flags */
-  MagickScriptArgsFlags       = 0x00FF,  /* Script Args Flags */
-  MagickScriptReadFlags       = 0x01FF   /* Script Read Flags */
-
-} ProcessOptionFlags;
-
 extern WandExport void
-  ProcessScriptOptions(MagickCLI *,int,char **),
-  ProcessCommandOptions(MagickCLI *,int,char **,ProcessOptionFlags);
+  ProcessScriptOptions(MagickCLI *,int,char **,int);
+
+extern WandExport int
+  ProcessCommandOptions(MagickCLI *,int,char **,int);
 
 extern WandExport MagickBooleanType
   MagickImageCommand(ImageInfo *,int,char **,char **,ExceptionInfo *);