From a4f1704d6e859f4e830fe73169cea540c1a8d02c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Boulogne?= Date: Tue, 27 Aug 2013 16:39:55 +0200 Subject: [PATCH] MAINT: bezier_segment is private --- skimage/draw/__init__.py | 2 +- skimage/draw/_draw.pyx | 12 ++++++------ skimage/draw/tests/test_draw.py | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/skimage/draw/__init__.py b/skimage/draw/__init__.py index 5ca5afb1..8e455343 100644 --- a/skimage/draw/__init__.py +++ b/skimage/draw/__init__.py @@ -2,7 +2,7 @@ from .draw import circle, ellipse, set_color from .draw3d import ellipsoid, ellipsoid_stats from ._draw import (line, line_aa, polygon, ellipse_perimeter, circle_perimeter, circle_perimeter_aa, - bezier_segment) + _bezier_segment) __all__ = ['line', 'line_aa', diff --git a/skimage/draw/_draw.pyx b/skimage/draw/_draw.pyx index 3e835d93..dc56b2a7 100644 --- a/skimage/draw/_draw.pyx +++ b/skimage/draw/_draw.pyx @@ -533,23 +533,23 @@ def ellipse_perimeter(Py_ssize_t cy, Py_ssize_t cx, Py_ssize_t yradius, iyd = int(floor(ya * w + 0.5)) # Draw the 4 quadrants - rr, cc = bezier_segment(iy0 + iyd, ix0, iy0, ix0, iy0, ix0 + ixd, 1-w) + rr, cc = _bezier_segment(iy0 + iyd, ix0, iy0, ix0, iy0, ix0 + ixd, 1-w) py.extend(rr) px.extend(cc) - rr, cc = bezier_segment(iy0 + iyd, ix0, iy1, ix0, iy1, ix1 - ixd, w) + rr, cc = _bezier_segment(iy0 + iyd, ix0, iy1, ix0, iy1, ix1 - ixd, w) py.extend(rr) px.extend(cc) - rr, cc = bezier_segment(iy1 - iyd, ix1, iy1, ix1, iy1, ix1 - ixd, 1-w) + rr, cc = _bezier_segment(iy1 - iyd, ix1, iy1, ix1, iy1, ix1 - ixd, 1-w) py.extend(rr) px.extend(cc) - rr, cc = bezier_segment(iy1 - iyd, ix1, iy0, ix1, iy0, ix0 + ixd, w) + rr, cc = _bezier_segment(iy1 - iyd, ix1, iy0, ix1, iy0, ix0 + ixd, w) py.extend(rr) px.extend(cc) return np.array(py, dtype=np.intp), np.array(px, dtype=np.intp) -def bezier_segment(Py_ssize_t y0, Py_ssize_t x0, +def _bezier_segment(Py_ssize_t y0, Py_ssize_t x0, Py_ssize_t y1, Py_ssize_t x1, Py_ssize_t y2, Py_ssize_t x2, double weight): @@ -643,7 +643,7 @@ def bezier_segment(Py_ssize_t y0, Py_ssize_t x0, sy = floor((y0 + 2 * weight * y1 + y2) * xy * 0.5 + 0.5) dx = floor((weight * x1 + x0) * xy + 0.5) dy = floor((y1 * weight + y0) * xy + 0.5) - return bezier_segment(y0, x0, (dy), (dx), + return _bezier_segment(y0, x0, (dy), (dx), (sy), (sx), cur) err = dx + dy - xy diff --git a/skimage/draw/tests/test_draw.py b/skimage/draw/tests/test_draw.py index 23bbff4e..6b49e6a4 100644 --- a/skimage/draw/tests/test_draw.py +++ b/skimage/draw/tests/test_draw.py @@ -5,7 +5,7 @@ from skimage.draw import (line, line_aa, polygon, circle, circle_perimeter, circle_perimeter_aa, ellipse, - ellipse_perimeter, bezier_segment, + ellipse_perimeter, _bezier_segment, ) @@ -433,7 +433,7 @@ def test_bezier_segment_straight(): y1 = 50 x2 = 150 y2 = 150 - rr, cc = bezier_segment(x0, y0, x1, y1, x2, y2, 0) + rr, cc = _bezier_segment(x0, y0, x1, y1, x2, y2, 0) image [rr, cc] = 1 image2 = np.zeros((200, 200), dtype=int) @@ -444,7 +444,7 @@ def test_bezier_segment_straight(): def test_bezier_segment_curved(): img = np.zeros((25, 25), 'uint8') - rr, cc = bezier_segment(20, 20, 20, 2, 2, 2, 1) + rr, cc = _bezier_segment(20, 20, 20, 2, 2, 2, 1) img[rr, cc] = 1 img_ = np.array( [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],