mirror of
https://github.com/wassname/scikit-image.git
synced 2026-07-03 15:10:30 +08:00
Merge pull request #1694 from ahojnnes/regionprops-dtype
Enforce integral type for label images
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -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))
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user