Merge pull request #1694 from ahojnnes/regionprops-dtype

Enforce integral type for label images
This commit is contained in:
Steven Silvester
2015-09-03 20:24:18 -05:00
2 changed files with 6 additions and 1 deletions
+3
View File
@@ -491,6 +491,9 @@ def regionprops(label_image, intensity_image=None, cache=True):
if label_image.ndim != 2:
raise TypeError('Only 2-D images supported.')
if not np.issubdtype(label_image.dtype, np.integer):
raise TypeError('Label image must be of integral type.')
regions = []
objects = ndi.find_objects(label_image)
+3 -1
View File
@@ -32,7 +32,9 @@ def test_all_props():
def test_dtype():
regionprops(np.zeros((10, 10), dtype=np.int))
regionprops(np.zeros((10, 10), dtype=np.uint))
assert_raises((TypeError, RuntimeError), regionprops,
assert_raises((TypeError), regionprops,
np.zeros((10, 10), dtype=np.float))
assert_raises((TypeError), regionprops,
np.zeros((10, 10), dtype=np.double))