diff --git a/skimage/data/__init__.py b/skimage/data/__init__.py index b1784f6a..3468f263 100644 --- a/skimage/data/__init__.py +++ b/skimage/data/__init__.py @@ -16,21 +16,22 @@ from ._binary_blobs import binary_blobs from .. import img_as_bool __all__ = ['load', + 'astronaut', 'camera', - 'lena', - 'text', 'checkerboard', + 'chelsea', + 'clock', + 'coffee', 'coins', + 'horse', + 'hubble_deep_field', + 'immunohistochemistry', + 'lena', + 'logo', 'moon', 'page', - 'horse', - 'clock', - 'immunohistochemistry', - 'chelsea', - 'coffee', - 'hubble_deep_field', - 'rocket', - 'astronaut'] + 'text', + 'rocket'] def load(f, as_grey=False): @@ -142,6 +143,13 @@ def coins(): return load("coins.png") +def logo(): + """Scikit-image logo, a RGBA image. + + """ + return load("logo.png") + + def moon(): """Surface of the moon. diff --git a/skimage/data/logo.png b/skimage/data/logo.png new file mode 100644 index 00000000..4912fb3e Binary files /dev/null and b/skimage/data/logo.png differ diff --git a/skimage/data/tests/test_data.py b/skimage/data/tests/test_data.py index c1f5c4e4..8c48e1cc 100644 --- a/skimage/data/tests/test_data.py +++ b/skimage/data/tests/test_data.py @@ -57,6 +57,13 @@ def test_immunohistochemistry(): data.immunohistochemistry() +def test_logo(): + """ Test that "logo" image can be loaded. """ + logo = data.logo() + assert_equal(logo.ndim, 3) + assert_equal(logo.shape[2], 4) + + def test_moon(): """ Test that "moon" image can be loaded. """ data.moon()