(no commit message)

diff --git a/MagickCore/statistic.c b/MagickCore/statistic.c
index 0de8fc5b61c9f11eb39e0763fcc03a6244203455..d5dc91163203994ab159b88bca74a39f5d487712 100644 (file)
--- a/MagickCore/statistic.c
+++ b/MagickCore/statistic.c
@@ -1448,9 +1448,9 @@ MagickExport ChannelMoments *GetImageMoments(const Image *image,
           continue;
         if ((traits & UpdatePixelTrait) == 0)
           continue;
-        M00[channel]+=p[i];
-        M10[channel]+=x*p[i];
-        M01[channel]+=y*p[i];
+        M00[channel]+=QuantumScale*p[i];
+        M10[channel]+=x*QuantumScale*p[i];
+        M01[channel]+=y*QuantumScale*p[i];
       }
       p+=GetPixelChannels(image);
     }
@@ -1497,19 +1497,22 @@ MagickExport ChannelMoments *GetImageMoments(const Image *image,
           continue;
         if ((traits & UpdatePixelTrait) == 0)
           continue;
-        M11[channel]+=(x-centroid[channel].x)*(y-centroid[channel].y)*p[i];
-        M20[channel]+=(x-centroid[channel].x)*(x-centroid[channel].x)*p[i];
-        M02[channel]+=(y-centroid[channel].y)*(y-centroid[channel].y)*p[i];
+        M11[channel]+=(x-centroid[channel].x)*(y-centroid[channel].y)*
+          QuantumScale*p[i];
+        M20[channel]+=(x-centroid[channel].x)*(x-centroid[channel].x)*
+          QuantumScale*p[i];
+        M02[channel]+=(y-centroid[channel].y)*(y-centroid[channel].y)*
+          QuantumScale*p[i];
         M21[channel]+=(x-centroid[channel].x)*(x-centroid[channel].x)*
-          (y-centroid[channel].y)*p[i];
+          (y-centroid[channel].y)*QuantumScale*p[i];
         M12[channel]+=(x-centroid[channel].x)*(y-centroid[channel].y)*
-          (y-centroid[channel].y)*p[i];
+          (y-centroid[channel].y)*QuantumScale*p[i];
         M22[channel]+=(x-centroid[channel].x)*(x-centroid[channel].x)*
-          (y-centroid[channel].y)*(y-centroid[channel].y)*p[i];
+          (y-centroid[channel].y)*(y-centroid[channel].y)*QuantumScale*p[i];
         M30[channel]+=(x-centroid[channel].x)*(x-centroid[channel].x)*
-          (x-centroid[channel].x)*p[i];
+          (x-centroid[channel].x)*QuantumScale*p[i];
         M03[channel]+=(y-centroid[channel].y)*(y-centroid[channel].y)*
-          (y-centroid[channel].y)*p[i];
+          (y-centroid[channel].y)*QuantumScale*p[i];
       }
       p+=GetPixelChannels(image);
     }