Finalise -duplicate option

diff --git a/ChangeLog b/ChangeLog
index 9eab4dfac979c5f4945e870fdaa5f2bec1e982c1..e45cf0df092ebf8556ad625ed523456eb2d2d195 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-23 6.6.8-7 Anthony Thyssen <A.Thyssen@griffith...>
+  * Another fix for -sparse-color and unused color channels
+  * Finialize the -duplicate option created by Cristy
+
 2011-03-21  6.6.8-7 Glenn Randers-Pehrson <glennrp@image...>
   * Revised the PNG8 encoder to use 50% threshold instead of 0% when
     reducing transparency to binary.  Collapse all resulting fully transparent
@@ -5,9 +9,6 @@
   * First try the 4-4-4 and 3-3-3 palettes instead of 3-3-2, to preserve
     colors (especially gray) better, when reducing to PNG8.
 
-2011-03-18 6.6.8-7 Anthony Thyssen <A.Thyssen@griffith...>
-  * Another fix for -sparse-color and unused color channels
-
 2011-03-21  6.6.8-6 Cristy  <quetzlzacatenango@image...>
   * New version 6.6.8-6.
 

diff --git a/magick/option.c b/magick/option.c
index fe782314d2f4c8d3e14ad150580f82ce8cccc223..af1f284c71af77e5fe89e26cb54ad78cb5f7e3cf 100644 (file)
--- a/magick/option.c
+++ b/magick/option.c
@@ -305,8 +305,8 @@ static const OptionInfo
     { "-dither", 1L, MagickFalse },
     { "+draw", 0L, MagickFalse },
     { "-draw", 1L, MagickFalse },
-    { "+duplicate", 1L, MagickFalse },
-    { "-duplicate", 2L, MagickFalse },
+    { "+duplicate", 0L, MagickFalse },
+    { "-duplicate", 1L, MagickFalse },
     { "+duration", 1L, MagickFalse },
     { "-duration", 1L, MagickFalse },
     { "+edge", 0L, MagickFalse },

diff --git a/wand/convert.c b/wand/convert.c
index d6f14b5f06da4363257aa745a7d7fade26977470..2087b90e013b4643f8479bf1aee3d67c7e27e296 100644 (file)
--- a/wand/convert.c
+++ b/wand/convert.c
@@ -310,7 +310,6 @@ static MagickBooleanType ConvertUsage(void)
       "-mosaic              create a mosaic from an image sequence",
       "-print string        interpret string and print to console",
       "-process arguments   process the image with a custom image filter",
-      "-reverse             reverse image sequence",
       "-separate            separate an image channel into a grayscale image",
       "-smush geometry      smush an image sequence together",
       "-write filename      write images to this file",
@@ -417,6 +416,7 @@ static MagickBooleanType ConvertUsage(void)
       "-duplicate count[,index]",
       "                     duplicate an image one or more times",
       "-insert index        insert last image into the image sequence",
+      "-reverse             reverse image sequence",
       "-swap indexes        swap two images in the image sequence",
       (char *) NULL
     };
@@ -1286,11 +1286,6 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info,
           }
         if (LocaleCompare("duplicate",option+1) == 0)
           {
-            i++;
-            if (i == (ssize_t) (argc-1))
-              ThrowConvertException(OptionError,"MissingArgument",option);
-            if (IsGeometry(argv[i]) == MagickFalse)
-              ThrowConvertInvalidArgumentException(option,argv[i]);
             if (*option == '+')
               break;
             i++;

diff --git a/wand/mogrify.c b/wand/mogrify.c
index 405ec9bbcc74f048ca2611aa713ac2f4d3c675c1..fb5e8f949a67381cecce9a0ad5723f42b95b8f7b 100644 (file)
--- a/wand/mogrify.c
+++ b/wand/mogrify.c
@@ -3830,7 +3830,6 @@ static MagickBooleanType MogrifyUsage(void)
       "-mosaic              create a mosaic from an image sequence",
       "-print string        interpret string and print to console",
       "-process arguments   process the image with a custom image filter",
-      "-reverse             reverse image sequence",
       "-separate            separate an image channel into a grayscale image",
       "-smush geometry      smush an image sequence together",
       "-write filename      write images to this file",
@@ -3936,6 +3935,7 @@ static MagickBooleanType MogrifyUsage(void)
       "-duplicate count[,index]",
       "                     duplicate an image one or more times",
       "-insert index        insert last image into the image sequence",
+      "-reverse             reverse image sequence",
       "-swap indexes        swap two images in the image sequence",
       (char *) NULL
     };
@@ -4795,11 +4795,6 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
           }
         if (LocaleCompare("duplicate",option+1) == 0)
           {
-            i++;
-            if (i == (ssize_t) (argc-1))
-              ThrowMogrifyException(OptionError,"MissingArgument",option);
-            if (IsGeometry(argv[i]) == MagickFalse)
-              ThrowMogrifyInvalidArgumentException(option,argv[i]);
             if (*option == '+')
               break;
             i++;
@@ -7961,22 +7956,24 @@ WandExport MagickBooleanType MogrifyImageList(ImageInfo *image_info,
           }
         if (LocaleCompare("duplicate",option+1) == 0)
           {
-            Image
-              *duplicate_images;
-
             size_t
               number_duplicates;
 
-            number_duplicates=(ssize_t) StringToLong(argv[i+1]);
-            if (*option == '+')
-              duplicate_images=DuplicateImages(*images,number_duplicates,"-1",
-                exception);
+            char
+              *p;
+
+            if (*option == '+') {
+              AppendImageToList(images,DuplicateImages(*images,1,"-1",
+                     exception));
+              break;
+            }
+            number_duplicates=(size_t) StringToLong(argv[i+1]);
+            if ( (p=strchr(argv[i+1],',')) != (char *)NULL )
+              AppendImageToList(images,DuplicateImages(*images,
+                     number_duplicates,p,exception));
             else
-              duplicate_images=DuplicateImages(*images,number_duplicates,
-                argv[i+2],exception);
-            if (*images != (Image *) NULL)
-              *images=DestroyImage(*images);
-            *images=duplicate_images;
+              AppendImageToList(images,DuplicateImages(*images,
+                     number_duplicates,"-1",exception));
             break;
           }
         break;