(no commit message)

diff --git a/magick/effect.c b/magick/effect.c
index 7fbcd8c1c7a8a6b7e7f3d4ebf348aee7f74d595b..9bc681d2e3ce59be0bd9ca057b305b468f58a440 100644 (file)
--- 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 c2c15a474d74149a3fa283b0d4c75e61b1a3dfcc..4b7a586c2471394db3f29f3b25ca4e5e36705e96 100644 (file)
--- 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 d256930bbd1225ac2f2a0170e011348de4549290..dc80c03a97d8743dc352071428750142c526457b 100644 (file)
--- 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[] =