wassname/scikit-image
1
0
Fork 0
mirror of https://github.com/wassname/scikit-image.git synced 2026-07-11 05:49:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

FIX: New versions of FreeImage report software as "I", not "ImageMagick ..."

Browse Source
This commit is contained in:
JDWarner
2013-11-20 12:05:46 -06:00
parent 6239ab23b1
commit 54d7031f42
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skimage/io/tests/test_freeimage.py
+6 -4
View File
@@ -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__":