From 745e5b927163a3a89907080499772e4fa0a0c158 Mon Sep 17 00:00:00 2001 From: cristy Date: Wed, 8 Jan 2014 23:38:32 +0000 Subject: [PATCH] --- MagickCore/statistic.c | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/MagickCore/statistic.c b/MagickCore/statistic.c index 68abeba05..fd09d8f5b 100644 --- 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]+=QuantumScale*p[i]; - M10[channel]+=x*QuantumScale*p[i]; - M01[channel]+=y*QuantumScale*p[i]; + M00[channel]+=p[i]; + M10[channel]+=x*p[i]; + M01[channel]+=y*p[i]; } p+=GetPixelChannels(image); } @@ -1497,22 +1497,19 @@ MagickExport ChannelMoments *GetImageMoments(const Image *image, continue; if ((traits & UpdatePixelTrait) == 0) continue; - 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]; + 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]; M21[channel]+=(x-centroid[channel].x)*(x-centroid[channel].x)* - (y-centroid[channel].y)*QuantumScale*p[i]; + (y-centroid[channel].y)*p[i]; M12[channel]+=(x-centroid[channel].x)*(y-centroid[channel].y)* - (y-centroid[channel].y)*QuantumScale*p[i]; + (y-centroid[channel].y)*p[i]; M22[channel]+=(x-centroid[channel].x)*(x-centroid[channel].x)* - (y-centroid[channel].y)*(y-centroid[channel].y)*QuantumScale*p[i]; + (y-centroid[channel].y)*(y-centroid[channel].y)*p[i]; M30[channel]+=(x-centroid[channel].x)*(x-centroid[channel].x)* - (x-centroid[channel].x)*QuantumScale*p[i]; + (x-centroid[channel].x)*p[i]; M03[channel]+=(y-centroid[channel].y)*(y-centroid[channel].y)* - (y-centroid[channel].y)*QuantumScale*p[i]; + (y-centroid[channel].y)*p[i]; } p+=GetPixelChannels(image); } -- 2.40.0