From b04db129b80de7d6e0aa59e944dfdae5022077a7 Mon Sep 17 00:00:00 2001 From: cristy Date: Thu, 11 Apr 2013 10:26:01 +0000 Subject: [PATCH] --- MagickCore/enhance.c | 6 ++++++ MagickCore/option.c | 1 + MagickCore/pixel.h | 1 + 3 files changed, 8 insertions(+) diff --git a/MagickCore/enhance.c b/MagickCore/enhance.c index 383e8f5e7..6927b05aa 100644 --- 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 fef29344a..7c648afae 100644 --- 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 b935f4d44..5c6285af2 100644 --- a/MagickCore/pixel.h +++ b/MagickCore/pixel.h @@ -95,6 +95,7 @@ typedef enum AveragePixelIntensityMethod, BrightnessPixelIntensityMethod, LightnessPixelIntensityMethod, + MSPixelIntensityMethod, Rec601LumaPixelIntensityMethod, Rec601LuminancePixelIntensityMethod, Rec709LumaPixelIntensityMethod, -- 2.50.1