From e845dc77462d142b8e8d4918bb4ceb112092dec1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Scho=CC=88nberger?= Date: Wed, 2 May 2012 22:49:14 +0200 Subject: [PATCH] moments and central moments no longer use separate functions --- skimage/measure/regionprops.pyx | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/skimage/measure/regionprops.pyx b/skimage/measure/regionprops.pyx index 189cb877..0da3b7c3 100644 --- a/skimage/measure/regionprops.pyx +++ b/skimage/measure/regionprops.pyx @@ -45,17 +45,6 @@ cdef tuple PROPS = ( ) -def _moments(np.ndarray[np.uint8_t, ndim=2] array, int order): - cdef int p, q, r, c - cdef np.ndarray[np.double_t, ndim=2] m - m = np.zeros((order + 1, order + 1), 'double') - for p in range(order + 1): - for q in range(order + 1): - for r in range(array.shape[0]): - for c in range(array.shape[1]): - m[p,q] += array[r,c] * r ** q * c ** p - return m - def _central_moments(np.ndarray[np.uint8_t, ndim=2] array, double cr, double cc, int order): cdef int p, q, r, c @@ -221,7 +210,7 @@ def regionprops(image, properties='all'): r0 = sl[0].start c0 = sl[1].start - m = _moments(array, 3) + m = _central_moments(array, 0, 0, 3) # centroid cr = m[0,1] / m[0,0] cc = m[1,0] / m[0,0]