From 4ff28908d8b5336623809fda29c0ba4eeabab86a Mon Sep 17 00:00:00 2001 From: Chintak Sheth Date: Wed, 22 May 2013 00:07:12 +0530 Subject: [PATCH] Resolve fast forward --- skimage/morphology/convex_hull.py | 1 - skimage/morphology/tests/test_convex_hull.py | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/skimage/morphology/convex_hull.py b/skimage/morphology/convex_hull.py index 8c2c6113..3594def8 100644 --- a/skimage/morphology/convex_hull.py +++ b/skimage/morphology/convex_hull.py @@ -106,4 +106,3 @@ def convex_hull_object(image): convex_img = np.logical_or(convex_img, convex_obj) return convex_img - diff --git a/skimage/morphology/tests/test_convex_hull.py b/skimage/morphology/tests/test_convex_hull.py index 9b948237..8b499709 100644 --- a/skimage/morphology/tests/test_convex_hull.py +++ b/skimage/morphology/tests/test_convex_hull.py @@ -65,6 +65,7 @@ def test_possible_hull(): ph = possible_hull(image) assert_array_equal(ph, expected) + @skipif(not scipy_spatial) def test_object(): image = np.array(