From: anthony <anthony@git.imagemagick.org>
Date: Sun, 12 Feb 2012 13:08:34 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~6194
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9724dd382fe39fef56d36d2c3b592bcb9a7ef8ec;p=imagemagick

---

diff --git a/MagickWand/magick-cli.c b/MagickWand/magick-cli.c
index 8b84e7a6d..176ca09ad 100644
--- a/MagickWand/magick-cli.c
+++ b/MagickWand/magick-cli.c
@@ -199,19 +199,19 @@ WandExport void MagickCommandProcessOptions(MagickWand *wand,int argc,
       flags=(CommandOptionFlags) GetCommandOptionFlags(
                    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)
             {
               /* non-option -- treat as a image read */
               MagickSpecialOption(wand,"-read",option);
+              count = 0;
               continue;
             }
           else
@@ -277,13 +277,8 @@ WandExport void MagickCommandProcessOptions(MagickWand *wand,int argc,
         }
     }
 
-  /* FUTURE: in the following produce a better error report
-     -- Missing Output filename
-  */
-
-  assert(i!=(ssize_t)(argc-1));
+  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
@@ -291,6 +286,10 @@ WandExport void MagickCommandProcessOptions(MagickWand *wand,int argc,
   // if stacks are not empty
   //  ThrowConvertException(OptionError,"UnbalancedParenthesis",option,i);
 
+  /* FUTURE: in the following produce a better error report
+     -- Missing Output filename
+  */
+
 
   /* This is the only value 'do no write' option for a CLI */
   if (LocaleCompare(option,"-exit") == 0 )