From: Cristy <urban-warrior@imagemagick.org>
Date: Sun, 12 Feb 2017 17:30:03 +0000 (-0500)
Subject: ...
X-Git-Tag: 7.0.4-8~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=90d726e11565873fd9a72a483cb220b04e37eacd;p=imagemagick

...
---

diff --git a/MagickCore/statistic.c b/MagickCore/statistic.c
index 1ff30f373..41cc52088 100644
--- a/MagickCore/statistic.c
+++ b/MagickCore/statistic.c
@@ -1320,8 +1320,9 @@ static size_t GetImageChannels(const Image *image)
   {
     PixelChannel channel=GetPixelChannelChannel(image,i);
     PixelTrait traits=GetPixelChannelTraits(image,channel);
-    if ((traits & UpdatePixelTrait) != 0)
-      channels++;
+    if (traits == UndefinedPixelTrait)
+      continue;
+    channels++;
   }
   return((size_t) (channels == 0 ? 1 : channels));
 }
@@ -1410,8 +1411,6 @@ MagickExport ChannelMoments *GetImageMoments(const Image *image,
         PixelTrait traits=GetPixelChannelTraits(image,channel);
         if (traits == UndefinedPixelTrait)
           continue;
-        if ((traits & UpdatePixelTrait) == 0)
-          continue;
         M00[channel]+=QuantumScale*p[i];
         M00[MaxPixelChannels]+=QuantumScale*p[i];
         M10[channel]+=x*QuantumScale*p[i];
@@ -1468,8 +1467,6 @@ MagickExport ChannelMoments *GetImageMoments(const Image *image,
         PixelTrait traits=GetPixelChannelTraits(image,channel);
         if (traits == UndefinedPixelTrait)
           continue;
-        if ((traits & UpdatePixelTrait) == 0)
-          continue;
         M11[channel]+=(x-centroid[channel].x)*(y-centroid[channel].y)*
           QuantumScale*p[i];
         M11[MaxPixelChannels]+=(x-centroid[channel].x)*(y-centroid[channel].y)*
@@ -1808,8 +1805,6 @@ MagickExport MagickBooleanType GetImageRange(const Image *image,double *minima,
         PixelTrait traits=GetPixelChannelTraits(image,channel);
         if (traits == UndefinedPixelTrait)
           continue;
-        if ((traits & UpdatePixelTrait) == 0)
-          continue;
         if (row_initialize != MagickFalse)
           {
             row_minima=(double) p[i];
@@ -1964,7 +1959,7 @@ MagickExport ChannelStatistics *GetImageStatistics(const Image *image,
       {
         PixelChannel channel=GetPixelChannelChannel(image,i);
         PixelTrait traits=GetPixelChannelTraits(image,channel);
-        if (traits  == UndefinedPixelTrait)
+        if (traits == UndefinedPixelTrait)
           continue;
         if (channel_statistics[channel].depth != MAGICKCORE_QUANTUM_DEPTH)
           {