(no commit message)

diff --git a/wand/animate.c b/wand/animate.c
index eb327f29c3d8dbf990fd28661f8f73d2d29fedb6..cbcb2de0bc0a23cf18afde6c39bc7132f23f377f 100644 (file)
--- a/wand/animate.c
+++ b/wand/animate.c
@@ -634,6 +634,8 @@ WandExport MagickBooleanType AnimateImageCommand(ImageInfo *image_info,
                 argv[i]);
             break;
           }
+        if (LocaleCompare("concurrent",option+1) == 0)
+          break;
         if (LocaleCompare("crop",option+1) == 0)
           {
             if (*option == '+')
@@ -769,6 +771,17 @@ WandExport MagickBooleanType AnimateImageCommand(ImageInfo *image_info,
             quantize_info->dither_method=(DitherMethod) method;
             break;
           }
+        if (LocaleCompare("duration",option+1) == 0)
+          {
+            if (*option == '+')
+              break;
+            i++;
+            if (i == (long) (argc-1))
+              ThrowAnimateException(OptionError,"MissingArgument",option);
+            if (IsGeometry(argv[i]) == MagickFalse)
+              ThrowAnimateInvalidArgumentException(option,argv[i]);
+            break;
+          }
         ThrowAnimateException(OptionError,"UnrecognizedOption",option);
       }
       case 'e':

diff --git a/wand/compare.c b/wand/compare.c
index 3396d4a4a282e3f90e537e1791b3792eef7ff103..e5299488b8441da0659794fee83fd870bb577fa2 100644 (file)
--- a/wand/compare.c
+++ b/wand/compare.c
@@ -446,6 +446,8 @@ WandExport MagickBooleanType CompareImageCommand(ImageInfo *image_info,
                 argv[i]);
             break;
           }
+        if (LocaleCompare("concurrent",option+1) == 0)
+          break;
         ThrowCompareException(OptionError,"UnrecognizedOption",option)
       }
       case 'd':
@@ -529,6 +531,17 @@ WandExport MagickBooleanType CompareImageCommand(ImageInfo *image_info,
               dissimilarity_threshold=atof(argv[i]);
             break;
           }
+        if (LocaleCompare("duration",option+1) == 0)
+          {
+            if (*option == '+')
+              break;
+            i++;
+            if (i == (long) (argc-1))
+              ThrowCompareException(OptionError,"MissingArgument",option);
+            if (IsGeometry(argv[i]) == MagickFalse)
+              ThrowCompareInvalidArgumentException(option,argv[i]);
+            break;
+          }
         ThrowCompareException(OptionError,"UnrecognizedOption",option)
       }
       case 'e':

diff --git a/wand/composite.c b/wand/composite.c
index 0e8e01ee49cdec7339af2785110c9faa4c84236e..efd1098873af3f4ee3fba85d3e23936a381d8030 100644 (file)
--- a/wand/composite.c
+++ b/wand/composite.c
@@ -744,6 +744,8 @@ WandExport MagickBooleanType CompositeImageCommand(ImageInfo *image_info,
                 "UnrecognizedImageCompression",argv[i]);
             break;
           }
+        if (LocaleCompare("concurrent",option+1) == 0)
+          break;
         ThrowCompositeException(OptionError,"UnrecognizedOption",option)
       }
       case 'd':
@@ -880,7 +882,7 @@ WandExport MagickBooleanType CompositeImageCommand(ImageInfo *image_info,
             composite_options.compose=DistortCompositeOp;
             break;
           }
-        if (LocaleCompare("method",option+1) == 0)
+        if (LocaleCompare("dither",option+1) == 0)
           {
             long
               method;
@@ -896,6 +898,17 @@ WandExport MagickBooleanType CompositeImageCommand(ImageInfo *image_info,
                 argv[i]);
             break;
           }
+        if (LocaleCompare("duration",option+1) == 0)
+          {
+            if (*option == '+')
+              break;
+            i++;
+            if (i == (long) (argc-1))
+              ThrowCompositeException(OptionError,"MissingArgument",option);
+            if (IsGeometry(argv[i]) == MagickFalse)
+              ThrowCompositeInvalidArgumentException(option,argv[i]);
+            break;
+          }
         ThrowCompositeException(OptionError,"UnrecognizedOption",option)
       }
       case 'e':

diff --git a/wand/conjure.c b/wand/conjure.c
index f8bcaabe6a5a84261bdd62f5eef9db4467f57cb1..c47e6c97587632c0a3c59c9603f109283830700e 100644 (file)
--- a/wand/conjure.c
+++ b/wand/conjure.c
@@ -199,6 +199,8 @@ WandExport MagickBooleanType ConjureImageCommand(ImageInfo *image_info,
     option=argv[i];
     if (IsMagickOption(option) != MagickFalse)
       {
+        if (LocaleCompare("concurrent",option+1) == 0)
+          break;
         if (LocaleCompare("debug",option+1) == 0)
           {
             long
@@ -216,6 +218,17 @@ WandExport MagickBooleanType ConjureImageCommand(ImageInfo *image_info,
             (void) SetLogEventMask(argv[i]);
             continue;
           }
+        if (LocaleCompare("duration",option+1) == 0)
+          {
+            if (*option == '+')
+              break;
+            i++;
+            if (i == (long) (argc-1))
+              ThrowConjureException(OptionError,"MissingArgument",option);
+            if (IsGeometry(argv[i]) == MagickFalse)
+              ThrowConjureInvalidArgumentException(option,argv[i]);
+            continue;
+          }
         if ((LocaleCompare("help",option+1) == 0) ||
             (LocaleCompare("-help",option+1) == 0))
           {

diff --git a/wand/convert.c b/wand/convert.c
index 1f9337e4304b523c4cf2961722fea891e15fd908..50c6d8af13be7b4cd3f56f75f8eeb455c8888d69 100644 (file)
--- a/wand/convert.c
+++ b/wand/convert.c
@@ -1006,6 +1006,8 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info,
                 argv[i]);
             break;
           }
+        if (LocaleCompare("concurrent",option+1) == 0)
+          break;
         if (LocaleCompare("contrast",option+1) == 0)
           break;
         if (LocaleCompare("contrast-stretch",option+1) == 0)
@@ -1223,6 +1225,17 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info,
               ThrowConvertException(OptionError,"MissingArgument",option);
             break;
           }
+        if (LocaleCompare("duration",option+1) == 0)
+          {
+            if (*option == '+')
+              break;
+            i++;
+            if (i == (long) (argc-1))
+              ThrowConvertException(OptionError,"MissingArgument",option);
+            if (IsGeometry(argv[i]) == MagickFalse)
+              ThrowConvertInvalidArgumentException(option,argv[i]);
+            break;
+          }
         ThrowConvertException(OptionError,"UnrecognizedOption",option)
       }
       case 'e':

diff --git a/wand/display.c b/wand/display.c
index 036457bc77b19c9b16f8aa485f00a2e674de06e6..31f0ac261f8054736faab023971d6f62cbc9fd8d 100644 (file)
--- a/wand/display.c
+++ b/wand/display.c
@@ -859,6 +859,8 @@ WandExport MagickBooleanType DisplayImageCommand(ImageInfo *image_info,
                 argv[i]);
             break;
           }
+        if (LocaleCompare("concurrent",option+1) == 0)
+          break;
         if (LocaleCompare("contrast",option+1) == 0)
           break;
         if (LocaleCompare("crop",option+1) == 0)
@@ -1009,6 +1011,17 @@ WandExport MagickBooleanType DisplayImageCommand(ImageInfo *image_info,
             quantize_info->dither_method=(DitherMethod) method;
             break;
           }
+        if (LocaleCompare("duration",option+1) == 0)
+          {
+            if (*option == '+')
+              break;
+            i++;
+            if (i == (long) (argc-1))
+              ThrowDisplayException(OptionError,"MissingArgument",option);
+            if (IsGeometry(argv[i]) == MagickFalse)
+              ThrowDisplayInvalidArgumentException(option,argv[i]);
+            break;
+          }
         ThrowDisplayException(OptionError,"UnrecognizedOption",option);
       }
       case 'e':

diff --git a/wand/identify.c b/wand/identify.c
index 5024a2dd1cc8da9e14bec0c584c5c99c8826b3f2..04a949faa73a802cf9f5ff6d984606ebbcaf7862 100644 (file)
--- a/wand/identify.c
+++ b/wand/identify.c
@@ -432,6 +432,8 @@ WandExport MagickBooleanType IdentifyImageCommand(ImageInfo *image_info,
             image_info->ping=MagickFalse;
             break;
           }
+        if (LocaleCompare("concurrent",option+1) == 0)
+          break;
         ThrowIdentifyException(OptionError,"UnrecognizedOption",option)
       }
       case 'd':
@@ -492,6 +494,17 @@ WandExport MagickBooleanType IdentifyImageCommand(ImageInfo *image_info,
               ThrowIdentifyInvalidArgumentException(option,argv[i]);
             break;
           }
+        if (LocaleCompare("duration",option+1) == 0)
+          {
+            if (*option == '+')
+              break;
+            i++;
+            if (i == (long) (argc-1))
+              ThrowIdentifyException(OptionError,"MissingArgument",option);
+            if (IsGeometry(argv[i]) == MagickFalse)
+              ThrowIdentifyInvalidArgumentException(option,argv[i]);
+            break;
+          }
         ThrowIdentifyException(OptionError,"UnrecognizedOption",option)
       }
       case 'f':

diff --git a/wand/import.c b/wand/import.c
index 942874d5db2c820671fcd33af383e73f4f638752..b033217438b236a53a4fe6ca86cc56b9bd644401 100644 (file)
--- a/wand/import.c
+++ b/wand/import.c
@@ -600,6 +600,8 @@ WandExport MagickBooleanType ImportImageCommand(ImageInfo *image_info,
                 argv[i]);
             break;
           }
+        if (LocaleCompare("concurrent",option+1) == 0)
+          break;
         if (LocaleCompare("crop",option+1) == 0)
           {
             if (*option == '+')
@@ -733,6 +735,17 @@ WandExport MagickBooleanType ImportImageCommand(ImageInfo *image_info,
             quantize_info->dither_method=(DitherMethod) method;
             break;
           }
+        if (LocaleCompare("duration",option+1) == 0)
+          {
+            if (*option == '+')
+              break;
+            i++;
+            if (i == (long) (argc-1))
+              ThrowImportException(OptionError,"MissingArgument",option);
+            if (IsGeometry(argv[i]) == MagickFalse)
+              ThrowImportInvalidArgumentException(option,argv[i]);
+            break;
+          }
         ThrowImportException(OptionError,"UnrecognizedOption",option);
       }
       case 'e':

diff --git a/wand/mogrify.c b/wand/mogrify.c
index c73dbbaa4d71d42f173877adacf24590f899e02a..ba536fb0276e1f4dd2ad756536f8d7b7a62d7510 100644 (file)
--- a/wand/mogrify.c
+++ b/wand/mogrify.c
@@ -1335,11 +1335,6 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
             (void) CloneString(&draw_info->server_name,argv[i+1]);
             break;
           }
-        if (LocaleCompare("display",option+1) == 0)
-          {
-            (void) CloneString(&draw_info->server_name,argv[i+1]);
-            break;
-          }
         if (LocaleCompare("distort",option+1) == 0)
           {
             char
@@ -4415,6 +4410,8 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
                 argv[i]);
             break;
           }
+        if (LocaleCompare("concurrent",option+1) == 0)
+          break;
         if (LocaleCompare("contrast",option+1) == 0)
           break;
         if (LocaleCompare("contrast-stretch",option+1) == 0)
@@ -4623,6 +4620,17 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
               ThrowMogrifyException(OptionError,"MissingArgument",option);
             break;
           }
+        if (LocaleCompare("duration",option+1) == 0)
+          {
+            if (*option == '+')
+              break;
+            i++;
+            if (i == (long) (argc-1))
+              ThrowMogrifyException(OptionError,"MissingArgument",option);
+            if (IsGeometry(argv[i]) == MagickFalse)
+              ThrowMogrifyInvalidArgumentException(option,argv[i]);
+            break;
+          }
         ThrowMogrifyException(OptionError,"UnrecognizedOption",option)
       }
       case 'e':

diff --git a/wand/montage.c b/wand/montage.c
index 5c6b975a7251ad91db8a1bfb46015b1706e64f82..82a750ebeead7e4b73fce7fd8dbc27c8dc4cbf74 100644 (file)
--- a/wand/montage.c
+++ b/wand/montage.c
@@ -706,6 +706,8 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info,
                 argv[i]);
             break;
           }
+        if (LocaleCompare("concurrent",option+1) == 0)
+          break;
         if (LocaleCompare("crop",option+1) == 0)
           {
             if (*option == '+')
@@ -827,6 +829,17 @@ WandExport MagickBooleanType MontageImageCommand(ImageInfo *image_info,
               ThrowMontageException(OptionError,"MissingArgument",option);
             break;
           }
+        if (LocaleCompare("duration",option+1) == 0)
+          {
+            if (*option == '+')
+              break;
+            i++;
+            if (i == (long) (argc-1))
+              ThrowMontageException(OptionError,"MissingArgument",option);
+            if (IsGeometry(argv[i]) == MagickFalse)
+              ThrowMontageInvalidArgumentException(option,argv[i]);
+            break;
+          }
         ThrowMontageException(OptionError,"UnrecognizedOption",option)
       }
       case 'e':

diff --git a/wand/stream.c b/wand/stream.c
index 959a6951ad74acbd509a77f192afb7cc3ab85b59..7c8d3e2b7972537a136742657926de1fb4c642c3 100644 (file)
--- a/wand/stream.c
+++ b/wand/stream.c
@@ -382,6 +382,8 @@ WandExport MagickBooleanType StreamImageCommand(ImageInfo *image_info,
                 argv[i]);
             break;
           }
+        if (LocaleCompare("concurrent",option+1) == 0)
+          break;
         ThrowStreamException(OptionError,"UnrecognizedOption",option)
       }
       case 'd':
@@ -401,7 +403,6 @@ WandExport MagickBooleanType StreamImageCommand(ImageInfo *image_info,
               ThrowStreamException(OptionError,"UnrecognizedEventType",argv[i]);
             (void) SetLogEventMask(argv[i]);
             break;
-            break;
           }
         if (LocaleCompare("define",option+1) == 0)
           {
@@ -442,6 +443,17 @@ WandExport MagickBooleanType StreamImageCommand(ImageInfo *image_info,
               ThrowStreamInvalidArgumentException(option,argv[i]);
             break;
           }
+        if (LocaleCompare("duration",option+1) == 0)
+          {
+            if (*option == '+')
+              break;
+            i++;
+            if (i == (long) (argc-1))
+              ThrowStreamException(OptionError,"MissingArgument",option);
+            if (IsGeometry(argv[i]) == MagickFalse)
+              ThrowStreamInvalidArgumentException(option,argv[i]);
+            break;
+          }
         ThrowStreamException(OptionError,"UnrecognizedOption",option)
       }
       case 'e':