Merge pull request #2947 from oleksandr-pavlyk/cython-warnings

Fix Cython compilation warnings in NL Means and Watershed The watershed code is sped up by 5-15% in some cases.
scikit-image · Mar 8, 2018 · b862868 · b862868
2 parents 2c0f0b2 + 9d39748
commit b862868
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/skimage/morphology/_watershed.pyx b/skimage/morphology/_watershed.pyx
@@ -126,6 +126,7 @@ def watershed_raveled(cnp.float64_t[::1] image,
     cdef Py_ssize_t i = 0
     cdef Py_ssize_t age = 1
     cdef Py_ssize_t index = 0
+    cdef Py_ssize_t neighbor_index = 0
     cdef DTYPE_BOOL_t compact = (compactness > 0)
 
     cdef Heap *hp = <Heap *> heap_from_numpy2()

diff --git a/skimage/restoration/_nl_means_denoising.pyx b/skimage/restoration/_nl_means_denoising.pyx
@@ -12,7 +12,7 @@ ctypedef np.float64_t IMGDTYPE
 cdef double DISTANCE_CUTOFF = 5.0
 
 cdef extern from "fast_exp.h":
-    inline double fast_exp(double y) nogil
+    double fast_exp(double y) nogil
 
 
 cdef inline double patch_distance_2d(IMGDTYPE [:, :] p1,