commit ce2716be51121ad0615c52a9ab0b20ffccf50a6c
author anthony <anthony@git.imagemagick.org> Fri Apr 22 09:51:34 2011 +0000
committer anthony <anthony@git.imagemagick.org> Fri Apr 22 09:51:34 2011 +0000
tree 1a0e751451f1f80b4cca3a7ca9333c7467f37065
parent df354f924fb0f7863b52503e46d42b14201f3a75

Addition of Flags to CommandOption parse table
which replaces the ImageListOption parse table

wand/mogrify.c

diff --git a/wand/mogrify.c b/wand/mogrify.c
index 723740e..33100c1 100644
--- a/wand/mogrify.c
+++ b/wand/mogrify.c
@@ -682,8 +682,9 @@
     option=argv[i];
     if (IsMagickOption(option) == MagickFalse)
       continue;
-    count=MagickMax(ParseMagickOption(MagickCommandOptions,MagickFalse,option),
-      0L);
+    count=ParseMagickOption(MagickCommandOptions,MagickFalse,option);
+    count=MagickMax(count,0L);
+    count&=NumArgsOption;
     if ((i+count) >= (ssize_t) argc)
       break;
     status=MogrifyImageInfo(mogrify_info,(int) count+1,argv+i,exception);
@@ -6060,8 +6061,8 @@
       default:
         ThrowMogrifyException(OptionError,"UnrecognizedOption",option)
     }
-    fire=ParseMagickOption(MagickImageListOptions,MagickFalse,option+1) < 0 ?
-      MagickFalse : MagickTrue;
+    fire=(ParseMagickOption(MagickCommandOptions,MagickFalse,option)
+            &FireOption) == 0 ?  MagickFalse : MagickTrue;
     if (fire != MagickFalse)
       FireImageStack(MagickFalse,MagickTrue,MagickTrue);
   }
@@ -6138,8 +6139,9 @@
     option=argv[i];
     if (IsMagickOption(option) == MagickFalse)
       continue;
-    count=MagickMax(ParseMagickOption(MagickCommandOptions,MagickFalse,option),
-      0L);
+    count=ParseMagickOption(MagickCommandOptions,MagickFalse,option);
+    count=MagickMax(count,0L);
+    count&=NumArgsOption;
     if ((i+count) >= (ssize_t) argc)
       break;
     switch (*(option+1))
@@ -7309,8 +7311,9 @@
     option=argv[i];
     if (IsMagickOption(option) == MagickFalse)
       continue;
-    count=MagickMax(ParseMagickOption(MagickCommandOptions,MagickFalse,option),
-      0L);
+    count=ParseMagickOption(MagickCommandOptions,MagickFalse,option);
+    count=MagickMax(count,0L);
+    count&=NumArgsOption;
     if ((i+count) >= (ssize_t) argc)
       break;
     status=MogrifyImageInfo(mogrify_info,(int) count+1,argv+i,exception);
@@ -8286,6 +8289,10 @@
     (void *) NULL);
   status=0;
 
+#if 0
+fprintf(stderr, "mogrify start %s %d (%s)\n",argv[0],argc,post?"post":"pre");
+#endif
+
   /*
     Pre-process multi-image sequence operators
   */
@@ -8299,6 +8306,10 @@
   n=GetImageListLength(*images);
   for (;;)
   {
+#if 0
+fprintf(stderr, "mogrify %ld of %ld\n",
+  (long)GetImageIndexInList(*images),(long)GetImageListLength(*images));
+#endif
     status&=MogrifyImage(image_info,argc,argv,images,exception);
     proceed=SetImageProgress(*images,MogrifyImageTag,(MagickOffsetType) i, n);
     if (proceed == MagickFalse)
@@ -8309,6 +8320,10 @@
     i++;
   }
   assert( *images != (Image *) NULL );
+#if 0
+fprintf(stderr, "mogrify end %ld of %ld\n",
+  (long)GetImageIndexInList(*images),(long)GetImageListLength(*images));
+#endif
 
   /*
     Post-process, multi-image sequence operators