wassname/scikit-image
1
0
Fork 0
mirror of https://github.com/wassname/scikit-image.git synced 2026-07-09 03:45:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1 from ahojnnes/thouis-master

Browse Source 
Add test case for rank filter fix
This commit is contained in:
Thouis (Ray) Jones
2013-03-28 10:27:40 -07:00
parent a784e28012 8299f471f2
commit 5e44a2b82c
4 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skimage/filter/rank/bilateral_rank.pyx
+1 -1
View File
@@ -36,7 +36,7 @@ __all__ = ['bilateral_mean', 'bilateral_pop']
def _apply(func8, func16, image, selem, out, mask, shift_x, shift_y, s0, s1):
selem = img_as_ubyte(selem)
selem = img_as_ubyte(selem > 0)
image = np.ascontiguousarray(image)
if mask is None:
skimage/filter/rank/percentile_rank.pyx
+1 -1
View File
@@ -35,7 +35,7 @@ __all__ = ['percentile_autolevel', 'percentile_gradient',
def _apply(func8, func16, image, selem, out, mask, shift_x, shift_y, p0, p1):
selem = img_as_ubyte(selem)
selem = img_as_ubyte(selem > 0)
image = np.ascontiguousarray(image)
if mask is None:
skimage/filter/rank/rank.pyx
+1 -1
View File
@@ -28,7 +28,7 @@ __all__ = ['autolevel', 'bottomhat', 'equalize', 'gradient', 'maximum', 'mean',
def _apply(func8, func16, image, selem, out, mask, shift_x, shift_y):
selem = img_as_ubyte(selem)
selem = img_as_ubyte(selem > 0)
image = np.ascontiguousarray(image)
if mask is None:
skimage/filter/rank/tests/test_rank.py
+20
View File
@@ -376,5 +376,25 @@ def test_entropy():
assert(np.max(rank.entropy(data, selem)) == 12000)
def test_selem_dtypes():
image = np.zeros((5, 5), dtype=np.uint8)
out = np.zeros_like(image)
mask = np.ones_like(image, dtype=np.uint8)
image[2, 2] = 255
image[2, 3] = 128
image[1, 2] = 16
for dtype in (np.uint8, np.uint16, np.int32, np.int64,
np.float32, np.float64):
elem = np.array([[0, 0, 0], [0, 1, 0], [0, 0, 0]], dtype=dtype)
rank.mean(image=image, selem=elem, out=out, mask=mask,
shift_x=0, shift_y=0)
assert_array_equal(image, out)
rank.percentile_mean(image=image, selem=elem, out=out, mask=mask,
shift_x=0, shift_y=0)
assert_array_equal(image, out)
if __name__ == "__main__":
run_module_suite()