Changeset 6832

Timestamp:

02/12/12 08:08:34 (15 months ago)

Author:

anthony

Message:

 

File:

• ImageMagick/trunk/MagickWand/magick-cli.c (modified) (3 diffs)

ImageMagick/trunk/MagickWand/magick-cli.c

@@ -200 +200 @@
                    MagickCommandOptions,MagickFalse,argv[i]);
 
-#define MagickCommandDebug 0
+#define MagickCommandDebug 1
 
       if ( count == -1 || flags == UndefinedOptionFlag ||
            (flags & NonConvertOptionFlag) != 0 )
         {
-          count = 0;
 #if MagickCommandDebug
-      (void) FormatLocaleFile(stderr, "CLI Non-Option: \"%s\"\n", option);
+          (void) FormatLocaleFile(stderr, "CLI Non-Option: \"%s\"\n", option);
 #endif
           if (IsCommandOption(option) == MagickFalse)
@@ -213 +212 @@
               /* non-option -- treat as a image read */
               MagickSpecialOption(wand,"-read",option);
+              count = 0;
               continue;
             }
@@ -278 +278 @@
     }
 
+  assert(i==(ssize_t)(argc-1));
+  option=argv[i];  /* the last argument - output filename! */
+#if MagickCommandDebug
+  (void) FormatLocaleFile(stderr, "CLI Output: \"%s\"\n", option );
+#endif
+
+  // if stacks are not empty
+  //  ThrowConvertException(OptionError,"UnbalancedParenthesis",option,i);
+
   /* FUTURE: in the following produce a better error report
      -- Missing Output filename
   */
-
-  assert(i!=(ssize_t)(argc-1));
-  option=argv[i];  /* the last argument - output filename! */
-
-#if MagickCommandDebug
-  (void) FormatLocaleFile(stderr, "CLI Output: \"%s\"\n", option );
-#endif
-
-  // if stacks are not empty
-  //  ThrowConvertException(OptionError,"UnbalancedParenthesis",option,i);