From: cristy Date: Sun, 25 Oct 2009 23:55:40 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~10455 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2287975e02162155f1500d91ccce6e0fde5de7c8;p=imagemagick --- diff --git a/wand/animate.c b/wand/animate.c index eb327f29c..cbcb2de0b 100644 --- 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 3396d4a4a..e5299488b 100644 --- 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 0e8e01ee4..efd109887 100644 --- 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 f8bcaabe6..c47e6c975 100644 --- 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 1f9337e43..50c6d8af1 100644 --- 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 036457bc7..31f0ac261 100644 --- 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 5024a2dd1..04a949faa 100644 --- 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 942874d5d..b03321743 100644 --- 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 c73dbbaa4..ba536fb02 100644 --- 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 5c6b975a7..82a750ebe 100644 --- 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 959a6951a..7c8d3e2b7 100644 --- 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':