(no commit message)

diff --git a/magick/option.c b/magick/option.c
index b8fbbe0e436722ef9f9ef963256dbce3d8739564..ba02f8b0de14c6f693da484fc50c8d3ae7684f92 100644 (file)
--- a/magick/option.c
+++ b/magick/option.c
@@ -585,7 +585,7 @@ static const OptionInfo
     { "-size", 1L, MagickFalse },
     { "+sketch", 0L, MagickFalse },
     { "-sketch", 1L, MagickFalse },
-    { "+smush", 0L, MagickFalse },
+    { "+smush", 1L, MagickFalse },
     { "-smush", 1L, MagickFalse },
     { "+snaps", 0L, MagickFalse },
     { "-snaps", 1L, MagickFalse },

diff --git a/wand/convert.c b/wand/convert.c
index 876a8ecac2c2e20791f035490d9376705142aeb8..5ab1dcef1b310d4404758dd4949bc0866b70bd15 100644 (file)
--- a/wand/convert.c
+++ b/wand/convert.c
@@ -2541,9 +2541,6 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info,
               ThrowConvertException(OptionError,"MissingArgument",option);
             if (IsGeometry(argv[i]) == MagickFalse)
               ThrowConvertInvalidArgumentException(option,argv[i]);
-            i++;
-            if (i == (ssize_t) (argc-1))
-              ThrowConvertException(OptionError,"MissingArgument",option);
             break;
           }
         if (LocaleCompare("solarize",option+1) == 0)

diff --git a/wand/mogrify.c b/wand/mogrify.c
index 2afefb8432dc60df94154db604216fa90521aac6..12a5cee8a6e7b4570df2b0b32c43abf9479e16d9 100644 (file)
--- a/wand/mogrify.c
+++ b/wand/mogrify.c
@@ -5974,8 +5974,6 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
               ThrowMogrifyException(OptionError,"MissingArgument",option);
             if (IsGeometry(argv[i]) == MagickFalse)
               ThrowMogrifyInvalidArgumentException(option,argv[i]);
-            if (i == (ssize_t) argc)
-              ThrowMogrifyException(OptionError,"MissingArgument",option);
             i++;
             break;
           }