wassname/scikit-image
1
0
Fork 0
mirror of https://github.com/wassname/scikit-image.git synced 2026-08-02 13:03:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

FIX build problem and cython problem resolved.

Browse Source
This commit is contained in:
Andreas Mueller
2012-08-03 11:37:11 +01:00
parent ce26467ad4
commit 8fa5427afc
2 changed files with 1 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skimage/morphology/ccomp.pyx
-1
View File
@@ -24,7 +24,6 @@ See also:
# The term "forest" is used to indicate an array that stores one or more trees
DTYPE = np.int
ctypedef np.int_t DTYPE_t
cdef DTYPE_t find_root(np.int_t *forest, np.int_t n):
"""Find the root of node n.
skimage/segmentation/_felzenszwalb.pyx
+1 -46
View File
@@ -3,52 +3,7 @@ cimport numpy as np
from collections import defaultdict
import scipy
#from ..util import img_as_float
#from ..color import rgb2grey
#from skimage.morphology.ccomp cimport find_root, join_trees
DTYPE = np.int
ctypedef np.int_t DTYPE_t
cdef DTYPE_t find_root(np.int_t *forest, np.int_t n):
"""Find the root of node n.
"""
cdef np.int_t root = n
while (forest[root] < root):
root = forest[root]
return root
cdef set_root(np.int_t *forest, np.int_t n, np.int_t root):
"""
Set all nodes on a path to point to new_root.
"""
cdef np.int_t j
while (forest[n] < n):
j = forest[n]
forest[n] = root
n = j
forest[n] = root
cdef join_trees(np.int_t *forest, np.int_t n, np.int_t m):
"""Join two trees containing nodes n and m.
"""
cdef np.int_t root = find_root(forest, n)
cdef np.int_t root_m
if (n != m):
root_m = find_root(forest, m)
if (root > root_m):
root = root_m
set_root(forest, n, root)
set_root(forest, m, root)
from skimage.morphology.ccomp cimport find_root, join_trees
def felzenszwalb_segmentation_grey(image, scale=200, sigma=0.8):