wassname/scikit-image
1
0
Fork 0
mirror of https://github.com/wassname/scikit-image.git synced 2026-06-30 10:15:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix overflow in NumPy 1.7 as suggested by Julian Taylor.

Browse Source
This commit is contained in:
Stefan van der Walt
2013-10-12 19:23:54 +02:00
parent b022dd6dfb
commit 9ff4316cbb
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skimage/morphology/binary.py
+13 -2
View File
@@ -31,7 +31,13 @@ def binary_erosion(image, selem, out=None):
"""
selem = (selem != 0)
selem_sum = np.sum(selem)
out = ndimage.convolve(image > 0, selem, mode='constant', cval=1)
if selem_sum > 255:
binary = (image != 0).view(np.uint8)
else:
binary = (image != 0).astype(np.intp)
out = ndimage.convolve(binary, selem, mode='constant', cval=1)
return np.equal(out, selem_sum, out=out)
@@ -63,7 +69,12 @@ def binary_dilation(image, selem, out=None):
"""
selem = (selem != 0)
out = ndimage.convolve(image > 0, selem, mode='constant', cval=0)
if np.sum(selem) > 255:
binary = (image != 0).view(np.uint8)
else:
binary = (image != 0).astype(np.intp)
out = ndimage.convolve(binary, selem, mode='constant', cval=0)
return np.not_equal(out, 0, out=out)