(no commit message)

diff --git a/MagickCore/enhance.c b/MagickCore/enhance.c
index 383e8f5e7828f0a7d26cd0824564f4723ce9d30c..6927b05aab3d7eda3e7c3a6257edccffca267a14 100644 (file)
--- a/MagickCore/enhance.c
+++ b/MagickCore/enhance.c
@@ -2024,6 +2024,12 @@ MagickExport MagickBooleanType GrayscaleImage(Image *image,
           intensity=MagickMin(MagickMin(red,green),blue);
           break;
         }
+        case MSPixelIntensityMethod:
+        {
+          intensity=(MagickRealType) (((double) red*red+green*green+
+            blue*blue)/3.0);
+          break;
+        }
         case Rec601LumaPixelIntensityMethod:
         {
           intensity=0.298839f*red+0.586811f*green+0.114350f*blue;

diff --git a/MagickCore/option.c b/MagickCore/option.c
index fef29344a6f3f0233fbf7550ba3140d611733242..7c648afaeda82a80d21ccf6a8754d27350e5b132 100644 (file)
--- a/MagickCore/option.c
+++ b/MagickCore/option.c
@@ -1443,6 +1443,7 @@ static const OptionInfo
     { "Average", AveragePixelIntensityMethod, UndefinedOptionFlag, MagickTrue },
     { "Brightness", BrightnessPixelIntensityMethod, UndefinedOptionFlag, MagickTrue },
     { "Lightness", LightnessPixelIntensityMethod, UndefinedOptionFlag, MagickTrue },
+    { "MS", MSPixelIntensityMethod, UndefinedOptionFlag, MagickTrue },
     { "Rec601Luma", Rec601LumaPixelIntensityMethod, UndefinedOptionFlag, MagickTrue },
     { "Rec601Luminance", Rec601LuminancePixelIntensityMethod, UndefinedOptionFlag, MagickTrue },
     { "Rec709Luma", Rec709LumaPixelIntensityMethod, UndefinedOptionFlag, MagickTrue },

diff --git a/MagickCore/pixel.h b/MagickCore/pixel.h
index b935f4d44730fa03f6e63221a565fc92588e123f..5c6285af2d255d8066451be6ecf3cf32e99e863d 100644 (file)
--- a/MagickCore/pixel.h
+++ b/MagickCore/pixel.h
@@ -95,6 +95,7 @@ typedef enum
   AveragePixelIntensityMethod,
   BrightnessPixelIntensityMethod,
   LightnessPixelIntensityMethod,
+  MSPixelIntensityMethod,
   Rec601LumaPixelIntensityMethod,
   Rec601LuminancePixelIntensityMethod,
   Rec709LumaPixelIntensityMethod,