Changeset 4078

Timestamp:

03/28/11 20:51:23 (2 years ago)

Author:

cristy

Message:

 

Location:

ImageMagick/trunk

Files:

• ChangeLog (modified) (1 diff)
• magick/effect.c (modified) (4 diffs)
• magick/effect.h (modified) (1 diff)
• magick/option.c (modified) (1 diff)

ImageMagick/trunk/ChangeLog

@@ +1 @@
+2011-03-29  6.6.9-1 Cristy  <quetzlzacatenango@image...>
+  * Support -statistic standard-deviation option.
+
 2011-03-28  6.6.9-0 Cristy  <quetzlzacatenango@image...>
   * New version 6.6.9-0.

ImageMagick/trunk/magick/effect.c

@@ -4786 +4786 @@
   size_t
     color,
-    mean;
+    sum;
 
   ssize_t
@@ -4802 +4802 @@
     color=65536L;
     count=0;
-    mean=0;
+    sum=0;
     do
     {
       color=list->nodes[color].next[0];
-      mean+=list->nodes[color].count*color;
+      sum+=list->nodes[color].count*color;
       count+=list->nodes[color].count;
     } while (count < (ssize_t) pixel_list->length);
-    channels[channel]=(unsigned short) (mean/pixel_list->length);
+    channels[channel]=(unsigned short) (sum/pixel_list->length);
   }
   GetMagickPixelPacket((const Image *) NULL,&pixel);
@@ -5009 +5009 @@
         color=previous;
     channels[channel]=(unsigned short) color;
+  }
+  GetMagickPixelPacket((const Image *) NULL,&pixel);
+  pixel.red=(MagickRealType) ScaleShortToQuantum(channels[0]);
+  pixel.green=(MagickRealType) ScaleShortToQuantum(channels[1]);
+  pixel.blue=(MagickRealType) ScaleShortToQuantum(channels[2]);
+  pixel.opacity=(MagickRealType) ScaleShortToQuantum(channels[3]);
+  pixel.index=(MagickRealType) ScaleShortToQuantum(channels[4]);
+  return(pixel);
+}
+
+static MagickPixelPacket GetStandardDeviationPixelList(PixelList *pixel_list)
+{
+  MagickPixelPacket
+    pixel;
+
+  register SkipList
+    *list;
+
+  register ssize_t
+    channel;
+
+  size_t
+    color,
+    sum,
+    sum_squared;
+
+  ssize_t
+    count;
+
+  unsigned short
+    channels[ListChannels];
+
+  /*
+    Find the mean value for each of the color.
+  */
+  for (channel=0; channel < 5; channel++)
+  {
+    list=pixel_list->lists+channel;
+    color=65536L;
+    count=0;
+    sum=0;
+    do
+    {
+      color=list->nodes[color].next[0];
+      sum+=list->nodes[color].count*color;
+      sum_squared+=(list->nodes[color].count*color)*
+        (list->nodes[color].count*color);
+      count+=list->nodes[color].count;
+    } while (count < (ssize_t) pixel_list->length);
+    channels[channel]=(unsigned short) sqrt((sum_squared/pixel_list->length)-
+      ((sum/pixel_list->length)*(sum/pixel_list->length)));
   }
   GetMagickPixelPacket((const Image *) NULL,&pixel);
@@ -5253 +5304 @@
         {
           pixel=GetNonpeakPixelList(pixel_list[id]);
+          break;
+        }
+        case StandardDeviationStatistic:
+        {
+          pixel=GetStandardDeviationPixelList(pixel_list[id]);
           break;
         }

ImageMagick/trunk/magick/effect.h

@@ -67 +67 @@
   MinimumStatistic,
   ModeStatistic,
-  NonpeakStatistic
+  NonpeakStatistic,
+  StandardDeviationStatistic
 } StatisticType;
 

ImageMagick/trunk/magick/option.c

@@ -1457 +1457 @@
     { "Mode", (ssize_t) ModeStatistic, MagickFalse },
     { "Nonpeak", (ssize_t) NonpeakStatistic, MagickFalse },
+    { "StandardDeviation", (ssize_t) StandardDeviationStatistic, MagickFalse },
     { (char *) NULL, (ssize_t) UndefinedMethod, MagickFalse }
   },