From c1ea012c9b6fddd60093db194fd6f3979970a82b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Wed, 2 Oct 2013 13:56:32 +0200 Subject: [PATCH] Add support for unsigned integer label images --- skimage/measure/_regionprops.py | 2 -- skimage/measure/tests/test_regionprops.py | 4 +++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/skimage/measure/_regionprops.py b/skimage/measure/_regionprops.py index e89d33e0..93abc816 100644 --- a/skimage/measure/_regionprops.py +++ b/skimage/measure/_regionprops.py @@ -470,8 +470,6 @@ def regionprops(label_image, properties=None, >>> props[0].centroid # centroid of first labelled object >>> props[0]['centroid'] # centroid of first labelled object """ - if not np.issubdtype(label_image.dtype, 'int'): - raise TypeError('Labelled image must be of integer dtype.') if properties is not None: warnings.warn('The ``properties`` argument is deprecated and is ' diff --git a/skimage/measure/tests/test_regionprops.py b/skimage/measure/tests/test_regionprops.py index da6bb421..c21418ab 100644 --- a/skimage/measure/tests/test_regionprops.py +++ b/skimage/measure/tests/test_regionprops.py @@ -28,7 +28,9 @@ def test_all_props(): regions[prop] -def test_unsupported_dtype(): +def test_dtype(): + regionprops(np.zeros((10, 10), dtype=np.int)) + regionprops(np.zeros((10, 10), dtype=np.uint)) assert_raises(TypeError, regionprops, np.zeros((10, 10), dtype=np.double))