From f2ad14abe7d5a1ac40cad533bb1744943c72655f Mon Sep 17 00:00:00 2001 From: cristy Date: Fri, 18 Mar 2011 18:57:25 +0000 Subject: [PATCH] --- magick/effect.c | 23 +++++++++++++++++++---- magick/effect.h | 2 +- magick/option.c | 1 + 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/magick/effect.c b/magick/effect.c index 7fbcd8c1c..9bc681d2e 100644 --- a/magick/effect.c +++ b/magick/effect.c @@ -2731,7 +2731,7 @@ static void AddNodePixelList(PixelList *pixel_list,const ssize_t channel, while (level-- > 0); } -static MagickPixelPacket GetPixelList(PixelList *pixel_list) +static MagickPixelPacket GetMedianPixelList(PixelList *pixel_list) { MagickPixelPacket pixel; @@ -2967,7 +2967,7 @@ MagickExport Image *MedianFilterImage(const Image *image,const double radius, r+=image->columns+width; s+=image->columns+width; } - pixel=GetPixelList(pixel_list[id]); + pixel=GetMedianPixelList(pixel_list[id]); SetPixelPacket(median_image,&pixel,q,median_indexes+x); p++; q++; @@ -5614,8 +5614,23 @@ MagickExport Image *StatisticImageChannel(const Image *image, } switch (type) { - case ModeStatistic: pixel=GetModePixelList(pixel_list[id]); - default: break; + case MedianStatistic: + { + pixel=GetMedianPixelList(pixel_list[id]); + break; + } + case ModeStatistic: + { + pixel=GetModePixelList(pixel_list[id]); + break; + } + case NonpeakStatistic: + { + pixel=GetNonpeakPixelList(pixel_list[id]); + break; + } + default: + break; } if ((channel & RedChannel) != 0) q->red=ClampToQuantum(pixel.red); diff --git a/magick/effect.h b/magick/effect.h index c2c15a474..4b7a586c2 100644 --- a/magick/effect.h +++ b/magick/effect.h @@ -66,7 +66,7 @@ typedef enum MedianStatistic, MinimumStatistic, ModeStatistic, - ReduceNoiseStatistic + NonpeakStatistic } StatisticType; extern MagickExport Image diff --git a/magick/option.c b/magick/option.c index d256930bb..dc80c03a9 100644 --- a/magick/option.c +++ b/magick/option.c @@ -1452,6 +1452,7 @@ static const OptionInfo { "Median", (ssize_t) MedianStatistic, MagickFalse }, { "Minimum", (ssize_t) MinimumStatistic, MagickFalse }, { "Mode", (ssize_t) ModeStatistic, MagickFalse }, + { "Nonpeak", (ssize_t) NonpeakStatistic, MagickFalse }, { (char *) NULL, (ssize_t) UndefinedMethod, MagickFalse } }, StorageOptions[] = -- 2.40.0