From: cristy <urban-warrior@git.imagemagick.org>
Date: Tue, 19 Mar 2013 23:14:40 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~4054
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a933607bd9aba71608aa30d9145e54323975b8f0;p=imagemagick

---

diff --git a/MagickCore/identify.c b/MagickCore/identify.c
index 3737a4926..ce1c7b561 100644
--- a/MagickCore/identify.c
+++ b/MagickCore/identify.c
@@ -487,6 +487,8 @@ MagickExport MagickBooleanType IdentifyImage(Image *image,FILE *file,
   if (channel_statistics != (ChannelStatistics *) NULL)
     {
       (void) FormatLocaleFile(file,"  Channel statistics:\n");
+      (void) FormatLocaleFile(file,"    Pixels: %.20g\n",
+        channel_statistics[CompositePixelChannel].area);
       switch (colorspace)
       {
         case RGBColorspace:
diff --git a/MagickCore/statistic.c b/MagickCore/statistic.c
index 83b43d586..45325542c 100644
--- a/MagickCore/statistic.c
+++ b/MagickCore/statistic.c
@@ -1615,9 +1615,7 @@ MagickExport ChannelStatistics *GetImageStatistics(const Image *image,
   }
   for (i=0; i < (ssize_t) MaxPixelChannels; i++)
   {
-    channel_statistics[CompositePixelChannel].depth=(size_t) EvaluateMax(
-      (double) channel_statistics[CompositePixelChannel].depth,(double)
-      channel_statistics[i].depth);
+    channel_statistics[CompositePixelChannel].area+=channel_statistics[i].area;
     channel_statistics[CompositePixelChannel].minima=MagickMin(
       channel_statistics[CompositePixelChannel].minima,
       channel_statistics[i].minima);
@@ -1640,6 +1638,7 @@ MagickExport ChannelStatistics *GetImageStatistics(const Image *image,
       channel_statistics[i].mean;
   }
   channels=GetImageChannels(image);
+  channel_statistics[CompositePixelChannel].area/=channels;
   channel_statistics[CompositePixelChannel].sum/=channels;
   channel_statistics[CompositePixelChannel].sum_squared/=channels;
   channel_statistics[CompositePixelChannel].sum_cubed/=channels;