(no commit message)

diff --git a/MagickWand/convert.c b/MagickWand/convert.c
index c5cf6f4d4243070d7f694744125fb58ebf6e69f0..33f25203e66392246652dec387720869735a0eb3 100644 (file)
--- a/MagickWand/convert.c
+++ b/MagickWand/convert.c
@@ -233,9 +233,6 @@ static MagickBooleanType ConvertUsage(void)
       "                     improve contrast by 'stretching with saturation'",
       "-liquid-rescale geometry",
       "                     rescale image with seam-carving",
-      "-median geometry     apply a median filter to the image",
-      "-mode geometry       make each pixel the 'predominant color' of the",
-      "                     neighborhood",
       "-modulate value      vary the brightness, saturation, and hue",
       "-monochrome          transform image to black and white",
       "-morphology method kernel",
@@ -721,8 +718,6 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info,
           break;
         if (LocaleCompare("auto-orient",option+1) == 0)
           break;
-        if (LocaleCompare("average",option+1) == 0)
-          break;
         ThrowConvertException(OptionError,"UnrecognizedOption",option)
       }
       case 'b':
@@ -1972,32 +1967,6 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info,
               ThrowConvertException(OptionError,"MissingArgument",option);
             break;
           }
-        if (LocaleCompare("maximum",option+1) == 0)
-          break;
-        if (LocaleCompare("median",option+1) == 0)
-          {
-            if (*option == '+')
-              break;
-            i++;
-            if (i == (ssize_t) (argc-1))
-              ThrowConvertException(OptionError,"MissingArgument",option);
-            if (IsGeometry(argv[i]) == MagickFalse)
-              ThrowConvertInvalidArgumentException(option,argv[i]);
-            break;
-          }
-        if (LocaleCompare("minimum",option+1) == 0)
-          break;
-        if (LocaleCompare("mode",option+1) == 0)
-          {
-            if (*option == '+')
-              break;
-            i++;
-            if (i == (ssize_t) (argc-1))
-              ThrowConvertException(OptionError,"MissingArgument",option);
-            if (IsGeometry(argv[i]) == MagickFalse)
-              ThrowConvertInvalidArgumentException(option,argv[i]);
-            break;
-          }
         if (LocaleCompare("modulate",option+1) == 0)
           {
             if (*option == '+')
@@ -2746,11 +2715,6 @@ WandExport MagickBooleanType ConvertImageCommand(ImageInfo *image_info,
                 argv[i]);
             break;
           }
-        if (LocaleCompare("support",option+1) == 0)
-          {
-            i++;  /* deprecated */
-            break;
-          }
         if (LocaleCompare("swap",option+1) == 0)
           {
             if (*option == '+')

diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c
index 081dec9679cb389807d6c5afad6f1a71c4cf3b37..cf921c9bf433cb7575e9381efcc9c4e59b1bb9d2 100644 (file)
--- a/MagickWand/mogrify.c
+++ b/MagickWand/mogrify.c
@@ -2035,38 +2035,6 @@ WandExport MagickBooleanType MogrifyImage(ImageInfo *image_info,const int argc,
             mask=DestroyImage(mask);
             break;
           }
-        if (LocaleCompare("matte",option+1) == 0)
-          {
-            (void) SetImageAlphaChannel(*image,(*option == '-') ?
-              SetAlphaChannel : DeactivateAlphaChannel,exception);
-            break;
-          }
-        if (LocaleCompare("median",option+1) == 0)
-          {
-            /*
-              Median filter image.
-            */
-            (void) SyncImageSettings(mogrify_info,*image,exception);
-            flags=ParseGeometry(argv[i+1],&geometry_info);
-            if ((flags & SigmaValue) == 0)
-              geometry_info.sigma=geometry_info.rho;
-            mogrify_image=StatisticImage(*image,MedianStatistic,(size_t)
-              geometry_info.rho,(size_t) geometry_info.sigma,exception);
-            break;
-          }
-        if (LocaleCompare("mode",option+1) == 0)
-          {
-            /*
-              Mode image.
-            */
-            (void) SyncImageSettings(mogrify_info,*image,exception);
-            flags=ParseGeometry(argv[i+1],&geometry_info);
-            if ((flags & SigmaValue) == 0)
-              geometry_info.sigma=geometry_info.rho;
-            mogrify_image=StatisticImage(*image,ModeStatistic,(size_t)
-              geometry_info.rho,(size_t) geometry_info.sigma,exception);
-            break;
-          }
         if (LocaleCompare("modulate",option+1) == 0)
           {
             (void) SyncImageSettings(mogrify_info,*image,exception);
@@ -3307,7 +3275,6 @@ static MagickBooleanType MogrifyUsage(void)
       "                     improve contrast by 'stretching with saturation'",
       "-liquid-rescale geometry",
       "                     rescale image with seam-carving",
-      "-median geometry     apply a median filter to the image",
       "-mode geometry       make each pixel the 'predominant color' of the",
       "                     neighborhood",
       "-modulate value      vary the brightness, saturation, and hue",
@@ -3844,8 +3811,6 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
           break;
         if (LocaleCompare("auto-orient",option+1) == 0)
           break;
-        if (LocaleCompare("average",option+1) == 0)
-          break;
         ThrowMogrifyException(OptionError,"UnrecognizedOption",option)
       }
       case 'b':
@@ -5019,8 +4984,6 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
               ThrowMogrifyException(OptionError,"MissingArgument",option);
             break;
           }
-        if (LocaleCompare("matte",option+1) == 0)
-          break;
         if (LocaleCompare("mattecolor",option+1) == 0)
           {
             if (*option == '+')
@@ -5030,10 +4993,6 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
               ThrowMogrifyException(OptionError,"MissingArgument",option);
             break;
           }
-        if (LocaleCompare("maximum",option+1) == 0)
-          break;
-        if (LocaleCompare("minimum",option+1) == 0)
-          break;
         if (LocaleCompare("modulate",option+1) == 0)
           {
             if (*option == '+')
@@ -5045,28 +5004,6 @@ WandExport MagickBooleanType MogrifyImageCommand(ImageInfo *image_info,
               ThrowMogrifyInvalidArgumentException(option,argv[i]);
             break;
           }
-        if (LocaleCompare("median",option+1) == 0)
-          {
-            if (*option == '+')
-              break;
-            i++;
-            if (i == (ssize_t) argc)
-              ThrowMogrifyException(OptionError,"MissingArgument",option);
-            if (IsGeometry(argv[i]) == MagickFalse)
-              ThrowMogrifyInvalidArgumentException(option,argv[i]);
-            break;
-          }
-        if (LocaleCompare("mode",option+1) == 0)
-          {
-            if (*option == '+')
-              break;
-            i++;
-            if (i == (ssize_t) argc)
-              ThrowMogrifyException(OptionError,"MissingArgument",option);
-            if (IsGeometry(argv[i]) == MagickFalse)
-              ThrowMogrifyInvalidArgumentException(option,argv[i]);
-            break;
-          }
         if (LocaleCompare("monitor",option+1) == 0)
           break;
         if (LocaleCompare("monochrome",option+1) == 0)
@@ -6791,16 +6728,6 @@ WandExport MagickBooleanType MogrifyImageInfo(ImageInfo *image_info,
       }
       case 'm':
       {
-        if (LocaleCompare("matte",option+1) == 0)
-          {
-            if (*option == '+')
-              {
-                (void) SetImageOption(image_info,option+1,"false");
-                break;
-              }
-            (void) SetImageOption(image_info,option+1,"true");
-            break;
-          }
         if (LocaleCompare("mattecolor",option+1) == 0)
           {
             if (*option == '+')
@@ -7321,26 +7248,6 @@ WandExport MagickBooleanType MogrifyImageList(ImageInfo *image_info,
             *images=append_image;
             break;
           }
-        if (LocaleCompare("average",option+1) == 0)
-          {
-            Image
-              *average_image;
-
-            /*
-              Average an image sequence (deprecated).
-            */
-            (void) SyncImagesSettings(mogrify_info,*images,exception);
-            average_image=EvaluateImages(*images,MeanEvaluateOperator,
-              exception);
-            if (average_image == (Image *) NULL)
-              {
-                status=MagickFalse;
-                break;
-              }
-            *images=DestroyImageList(*images);
-            *images=average_image;
-            break;
-          }
         break;
       }
       case 'c':
@@ -7916,44 +7823,6 @@ WandExport MagickBooleanType MogrifyImageList(ImageInfo *image_info,
             i++;
             break;
           }
-        if (LocaleCompare("maximum",option+1) == 0)
-          {
-            Image
-              *maximum_image;
-
-            /*
-              Maximum image sequence (deprecated).
-            */
-            (void) SyncImagesSettings(mogrify_info,*images,exception);
-            maximum_image=EvaluateImages(*images,MaxEvaluateOperator,exception);
-            if (maximum_image == (Image *) NULL)
-              {
-                status=MagickFalse;
-                break;
-              }
-            *images=DestroyImageList(*images);
-            *images=maximum_image;
-            break;
-          }
-        if (LocaleCompare("minimum",option+1) == 0)
-          {
-            Image
-              *minimum_image;
-
-            /*
-              Minimum image sequence (deprecated).
-            */
-            (void) SyncImagesSettings(mogrify_info,*images,exception);
-            minimum_image=EvaluateImages(*images,MinEvaluateOperator,exception);
-            if (minimum_image == (Image *) NULL)
-              {
-                status=MagickFalse;
-                break;
-              }
-            *images=DestroyImageList(*images);
-            *images=minimum_image;
-            break;
-          }
         if (LocaleCompare("morph",option+1) == 0)
           {
             Image

diff --git a/MagickWand/operation.c b/MagickWand/operation.c
index 17db95c12128cb7d682d4ca1e99d7f9c3cdf97f6..c6b7d99972ed4067896d70e6b786f64163f19ac7 100644 (file)
--- a/MagickWand/operation.c
+++ b/MagickWand/operation.c
@@ -2643,26 +2643,6 @@ static void CLISimpleOperatorImage(MagickCLI *cli_wand,
           mask=DestroyImage(mask);
           break;
         }
-      if (LocaleCompare("matte",option+1) == 0)
-        {
-          CLIWandWarnReplaced(IfNormalOp?"-alpha Set":"-alpha Off");
-          (void) SetImageAlphaChannel(_image,IfNormalOp ? SetAlphaChannel :
-                         DeactivateAlphaChannel, _exception);
-          break;
-        }
-      if (LocaleCompare("median",option+1) == 0)
-        {
-          CLIWandWarnReplaced("-statistic Median");
-          CLISimpleOperatorImage(cli_wand,"-statistic","Median",arg1);
-          break;
-        }
-      if (LocaleCompare("mode",option+1) == 0)
-        {
-          /* FUTURE: note this is also a special "montage" option */
-          CLIWandWarnReplaced("-statistic Mode");
-          CLISimpleOperatorImage(cli_wand,"-statistic","Mode",arg1);
-          break;
-        }
       if (LocaleCompare("modulate",option+1) == 0)
         {
           if (IfMagickFalse(IsGeometry(arg1)))
@@ -3556,12 +3536,6 @@ WandExport void CLIListOperatorImages(MagickCLI *cli_wand,
           new_images=AppendImages(_images,normal_op,_exception);
           break;
         }
-      if (LocaleCompare("average",option+1) == 0)
-        {
-          CLIWandWarnReplaced("-evaluate-sequence Mean");
-          CLIListOperatorImages(cli_wand,"-evaluate-sequence","Mean",NULL);
-          break;
-        }
       CLIWandExceptionBreak(OptionError,"UnrecognizedOption",option);
     }
     case 'c':