Merge pull request #870 from stefanv/bugs/windows-round

Replace Cython's round with a VC2010 compatible version
scikit-image · Jan 29, 2014 · 305ef0d · 305ef0d
2 parents e1d2dcd + 5d9115a
commit 305ef0d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/skimage/feature/orb_cy.pyx b/skimage/feature/orb_cy.pyx
@@ -9,7 +9,9 @@ import numpy as np
 from skimage import data_dir
 
 cimport numpy as cnp
-from libc.math cimport sin, cos, round
+from libc.math cimport sin, cos
+
+from skimage._shared.interpolation cimport round
 
 POS = np.loadtxt(os.path.join(data_dir, "orb_descriptor_positions.txt"),
                  dtype=np.int8)

diff --git a/skimage/transform/_hough_transform.pyx b/skimage/transform/_hough_transform.pyx
@@ -15,9 +15,7 @@ from skimage.draw import circle_perimeter
 cdef double PI_2 = 1.5707963267948966
 cdef double NEG_PI_2 = -PI_2
 
-
-cdef inline Py_ssize_t round(double r):
-    return <Py_ssize_t>((r + 0.5) if (r > 0.0) else (r - 0.5))
+from skimage._shared.interpolation cimport round
 
 
 def _hough_circle(cnp.ndarray img,