From 54d7031f4264dd0d2b44ce20340ee31d18a65cf2 Mon Sep 17 00:00:00 2001 From: JDWarner Date: Wed, 20 Nov 2013 12:05:46 -0600 Subject: [PATCH] FIX: New versions of FreeImage report software as "I", not "ImageMagick ..." --- skimage/io/tests/test_freeimage.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/skimage/io/tests/test_freeimage.py b/skimage/io/tests/test_freeimage.py index 550b39a2..32e01bd7 100644 --- a/skimage/io/tests/test_freeimage.py +++ b/skimage/io/tests/test_freeimage.py @@ -53,9 +53,10 @@ def test_imread_uint16_big_endian(): assert img.dtype == np.uint16 assert_array_almost_equal(img, expected) + @skipif(not FI_available) def test_write_multipage(): - shape = (64,64,64) + shape = (64, 64, 64) x = np.ones(shape, dtype=np.uint8) * np.random.random(shape) * 255 x = x.astype(np.uint8) f = NamedTemporaryFile(suffix='.tif') @@ -64,7 +65,8 @@ def test_write_multipage(): fi.write_multipage(x, fname) y = fi.read_multipage(fname) assert_array_equal(x, y) - + + class TestSave: def roundtrip(self, dtype, x, suffix): f = NamedTemporaryFile(suffix='.' + suffix) @@ -94,13 +96,13 @@ class TestSave: def test_metadata(): meta = fi.read_metadata(os.path.join(si.data_dir, 'multipage.tif')) assert meta[('EXIF_MAIN', 'Orientation')] == 1 - assert meta[('EXIF_MAIN', 'Software')].startswith('ImageMagick') + assert meta[('EXIF_MAIN', 'Software')].startswith('I') meta = fi.read_multipage_metadata(os.path.join(si.data_dir, 'multipage.tif')) assert len(meta) == 2 assert meta[0][('EXIF_MAIN', 'Orientation')] == 1 - assert meta[1][('EXIF_MAIN', 'Software')].startswith('ImageMagick') + assert meta[1][('EXIF_MAIN', 'Software')].startswith('I') if __name__ == "__main__":