wassname/scikit-image
1
0
Fork 0
mirror of https://github.com/wassname/scikit-image.git synced 2026-08-04 13:14:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix dtype compatibility for functions in morphology.grey

Browse Source 
Cast input images using ``img_as_ubyte``. Note, tests don't currently pass for integer arrays (test skipped).
This commit is contained in:
Tony S Yu
2012-05-03 16:22:00 -04:00
parent 284753a7a4
commit 8fb597b141
2 changed files with 62 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skimage/morphology/grey.py
+27 -13
View File
@@ -9,6 +9,8 @@ import warnings
import numpy as np
import skimage
eps = np.finfo(float).eps
@@ -23,7 +25,7 @@ def erosion(image, selem, out=None, shift_x=False, shift_y=False):
Parameters
----------
image : ndarray
The image as a uint8 ndarray.
Image array.
selem : ndarray
The neighborhood expressed as a 2-D array of 1's and 0's.
@@ -38,7 +40,7 @@ def erosion(image, selem, out=None, shift_x=False, shift_y=False):
Returns
-------
eroded : ndarray
eroded : uint8 array
The result of the morphological erosion.
Examples
@@ -60,6 +62,8 @@ def erosion(image, selem, out=None, shift_x=False, shift_y=False):
"""
if image is out:
raise NotImplementedError("In-place erosion not supported!")
image = skimage.img_as_ubyte(image)
try:
import skimage.morphology.cmorph as cmorph
out = cmorph.erode(image, selem, out=out,
@@ -68,6 +72,7 @@ def erosion(image, selem, out=None, shift_x=False, shift_y=False):
except ImportError:
raise ImportError("cmorph extension not available.")
def dilation(image, selem, out=None, shift_x=False, shift_y=False):
"""Return greyscale morphological dilation of an image.
@@ -79,7 +84,7 @@ def dilation(image, selem, out=None, shift_x=False, shift_y=False):
----------
image : ndarray
The image as a uint8 ndarray.
Image array.
selem : ndarray
The neighborhood expressed as a 2-D array of 1's and 0's.
@@ -94,7 +99,7 @@ def dilation(image, selem, out=None, shift_x=False, shift_y=False):
Returns
-------
dilated : ndarray
dilated : uint8 array
The result of the morphological dilation.
Examples
@@ -116,6 +121,8 @@ def dilation(image, selem, out=None, shift_x=False, shift_y=False):
"""
if image is out:
raise NotImplementedError("In-place dilation not supported!")
image = skimage.img_as_ubyte(image)
try:
from . import cmorph
out = cmorph.dilate(image, selem, out=out,
@@ -124,6 +131,7 @@ def dilation(image, selem, out=None, shift_x=False, shift_y=False):
except ImportError:
raise ImportError("cmorph extension not available.")
def opening(image, selem, out=None):
"""Return greyscale morphological opening of an image.
@@ -135,7 +143,7 @@ def opening(image, selem, out=None):
Parameters
----------
image : ndarray
The image as a uint8 ndarray.
Image array.
selem : ndarray
The neighborhood expressed as a 2-D array of 1's and 0's.
@@ -146,7 +154,7 @@ def opening(image, selem, out=None):
Returns
-------
opening : ndarray
opening : uint8 array
The result of the morphological opening.
Examples
@@ -174,6 +182,7 @@ def opening(image, selem, out=None):
out = dilation(eroded, selem, out=out, shift_x=shift_x, shift_y=shift_y)
return out
def closing(image, selem, out=None):
"""Return greyscale morphological closing of an image.
@@ -185,7 +194,7 @@ def closing(image, selem, out=None):
Parameters
----------
image : ndarray
The image as a uint8 ndarray.
Image array.
selem : ndarray
The neighborhood expressed as a 2-D array of 1's and 0's.
@@ -196,8 +205,8 @@ def closing(image, selem, out=None):
Returns
-------
opening : ndarray
The result of the morphological opening.
closing : uint8 array
The result of the morphological closing.
Examples
--------
@@ -224,6 +233,7 @@ def closing(image, selem, out=None):
out = erosion(dilated, selem, out=out, shift_x=shift_x, shift_y=shift_y)
return out
def white_tophat(image, selem, out=None):
"""Return white top hat of an image.
@@ -234,7 +244,7 @@ def white_tophat(image, selem, out=None):
Parameters
----------
image : ndarray
The image as a uint8 ndarray.
Image array.
selem : ndarray
The neighborhood expressed as a 2-D array of 1's and 0's.
@@ -245,7 +255,7 @@ def white_tophat(image, selem, out=None):
Returns
-------
opening : ndarray
opening : uint8 array
The result of the morphological white top hat.
Examples
@@ -267,11 +277,13 @@ def white_tophat(image, selem, out=None):
"""
if image is out:
raise NotImplementedError("Cannot perform white top hat in place.")
image = skimage.img_as_ubyte(image)
out = opening(image, selem, out=out)
out = image - out
return out
def black_tophat(image, selem, out=None):
"""Return black top hat of an image.
@@ -283,7 +295,7 @@ def black_tophat(image, selem, out=None):
Parameters
----------
image : ndarray
The image as a uint8 ndarray.
Image array.
selem : ndarray
The neighborhood expressed as a 2-D array of 1's and 0's.
@@ -294,7 +306,7 @@ def black_tophat(image, selem, out=None):
Returns
-------
opening : ndarray
opening : uint8 array
The result of the black top filter.
Examples
@@ -316,6 +328,8 @@ def black_tophat(image, selem, out=None):
"""
if image is out:
raise NotImplementedError("Cannot perform white top hat in place.")
image = skimage.img_as_ubyte(image)
out = closing(image, selem, out=out)
out = out - image
return out
skimage/morphology/tests/test_morphology.py
+35
View File
@@ -117,6 +117,41 @@ class TestEccentricStructuringElements():
assert np.all(tophat == 0)
class TestDTypes():
def setUp(self):
k = 5
arrname = '%03i' % k
self.disk = selem.disk(k)
fname_opening = os.path.join(data_dir, "disk-open-matlab-output.npz")
self.expected_opening = np.load(fname_opening)[arrname]
fname_closing = os.path.join(data_dir, "disk-close-matlab-output.npz")
self.expected_closing = np.load(fname_closing)[arrname]
def _test_image(self, image):
result_opening = opening(image, self.disk)
testing.assert_equal(result_opening, self.expected_opening)
result_closing = closing(image, self.disk)
testing.assert_equal(result_closing, self.expected_closing)
def test_float(self):
image = skimage.img_as_float(lena)
self._test_image(image)
@testing.decorators.skipif(True)
def test_int(self):
image = skimage.img_as_int(lena)
self._test_image(image)
def test_uint(self):
image = skimage.img_as_uint(lena)
self._test_image(image)
if __name__ == '__main__':
testing.run_module_suite()