From: Cristy <urban-warrior@imagemagick.org>
Date: Tue, 7 Mar 2017 00:44:28 +0000 (-0500)
Subject: https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=31377
X-Git-Tag: 7.0.5-2~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=75f57a50c3f0f50bd338baf08e3463b9ae8e32ba;p=imagemagick

https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=31377
---

diff --git a/MagickCore/statistic.c b/MagickCore/statistic.c
index 5452f2690..2c8b15edd 100644
--- a/MagickCore/statistic.c
+++ b/MagickCore/statistic.c
@@ -551,7 +551,7 @@ MagickExport Image *EvaluateImages(const Image *images,
               if ((traits == UndefinedPixelTrait) ||
                   (evaluate_traits == UndefinedPixelTrait))
                 continue;
-              if ((evaluate_traits & UpdatePixelTrait) == 0)
+              if ((traits & UpdatePixelTrait) == 0)
                 continue;
               evaluate_pixel[j].channel[i]=ApplyEvaluateOperator(
                 random_info[id],GetPixelChannel(image,channel,p),op,
@@ -829,6 +829,8 @@ MagickExport MagickBooleanType EvaluateImage(Image *image,
         if (((traits & CopyPixelTrait) != 0) ||
             (GetPixelWriteMask(image,q) == 0))
           continue;
+        if ((traits & UpdatePixelTrait) == 0)
+          continue;
         result=ApplyEvaluateOperator(random_info[id],q[i],op,value);
         if (op == MeanEvaluateOperator)
           result/=2.0;
@@ -1411,6 +1413,8 @@ 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];
@@ -1467,6 +1471,8 @@ 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)*
@@ -1836,7 +1842,9 @@ MagickExport MagickBooleanType GetImageRange(const Image *image,double *minima,
         PixelTrait traits=GetPixelChannelTraits(image,channel);
         if (traits == UndefinedPixelTrait)
           continue;
-        if (row_initialize != MagickFalse)
+        if ((traits & UpdatePixelTrait) == 0)
+          continue;
+				if (row_initialize != MagickFalse)
           {
             row_minima=(double) p[i];
             row_maxima=(double) p[i];
@@ -2946,6 +2954,8 @@ MagickExport Image *StatisticImage(const Image *image,const StatisticType type,
             SetPixelChannel(statistic_image,channel,p[center+i],q);
             continue;
           }
+        if ((statistic_traits & UpdatePixelTrait) == 0)
+          continue;
         pixels=p;
         ResetPixelList(pixel_list[id]);
         for (v=0; v < (ssize_t) MagickMax(height,1); v++)