wassname/scikit-image
1
0
Fork 0
mirror of https://github.com/wassname/scikit-image.git synced 2026-06-30 18:51:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

moments and central moments no longer use separate functions

Browse Source
This commit is contained in:
Johannes Schönberger
2012-05-02 22:49:14 +02:00
parent cb673ba516
commit e845dc7746
1 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skimage/measure/regionprops.pyx
+1 -12
View File
@@ -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]