From 98047f5ce87939daf39c6c0e692829e1a04167a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20T=C3=BD=C4=8D?= Date: Sun, 26 Oct 2014 23:38:12 +0100 Subject: [PATCH] Cython minor fixes --- skimage/measure/_ccomp.pyx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/skimage/measure/_ccomp.pyx b/skimage/measure/_ccomp.pyx index e537b598..03be39d7 100644 --- a/skimage/measure/_ccomp.pyx +++ b/skimage/measure/_ccomp.pyx @@ -63,7 +63,7 @@ cdef struct s_shpinfo: cdef shpinfo get_triple(inarr_shape): - cdef shpinfo res = shpinfo() + cdef shpinfo res res.y = 1 res.z = 1 @@ -389,7 +389,7 @@ cdef DTYPE_t resolve_labels(DTYPE_t * data_p, DTYPE_t * forest_p, # The 1D indices are "raveled" or "linear", that's where "rindex" comes from. -cdef scan1D(DTYPE_t * data_p, DTYPE_t * forest_p, shpinfo * shapeinfo, +cdef void scan1D(DTYPE_t * data_p, DTYPE_t * forest_p, shpinfo * shapeinfo, bginfo * bg, DTYPE_t neighbors, DTYPE_t y, DTYPE_t z): """ Perform forward scan on a 1D object, usually the first row of an image @@ -412,7 +412,7 @@ cdef scan1D(DTYPE_t * data_p, DTYPE_t * forest_p, shpinfo * shapeinfo, join_trees_wrapper(data_p, forest_p, rindex, DEX[D_ed]) -cdef scan2D(DTYPE_t * data_p, DTYPE_t * forest_p, shpinfo * shapeinfo, +cdef void scan2D(DTYPE_t * data_p, DTYPE_t * forest_p, shpinfo * shapeinfo, bginfo * bg, DTYPE_t neighbors, DTYPE_t z): """ Perform forward scan on a 2D array. @@ -452,7 +452,7 @@ cdef scan2D(DTYPE_t * data_p, DTYPE_t * forest_p, shpinfo * shapeinfo, join_trees_wrapper(data_p, forest_p, rindex, DEX[D_ed]) -cdef scan3D(DTYPE_t * data_p, DTYPE_t * forest_p, shpinfo * shapeinfo, +cdef void scan3D(DTYPE_t * data_p, DTYPE_t * forest_p, shpinfo * shapeinfo, bginfo * bg, DTYPE_t neighbors): """ Perform forward scan on a 2D array.