python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-08-16 02:04:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge 0ac4903cb9 into 72766b8f4e

Browse Source
This commit is contained in:
Andrew Murray 2016-04-24 07:36:13 +00:00
commit b68e4a9452
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
PIL/TiffImagePlugin.py
View File

@ -1010,7 +1010,10 @@ class TiffImageFile(ImageFile.ImageFile):
self.decoderconfig = (self.tag_v2[PREDICTOR],) self.decoderconfig = (self.tag_v2[PREDICTOR],)
if ICCPROFILE in self.tag_v2: if ICCPROFILE in self.tag_v2:
self.info['icc_profile'] = self.tag_v2[ICCPROFILE] iccprofile = self.tag_v2[ICCPROFILE]
if len(iccprofile) == 1:
iccprofile = iccprofile[0]
self.info['icc_profile'] = iccprofile
return args return args

2
Tests/test_file_tiff_metadata.py
View File

@ -175,7 +175,7 @@ class TestFileTiffMetadata(PillowTestCase):
im.save(out) im.save(out)
reloaded = Image.open(out) reloaded = Image.open(out)
self.assert_(type(im.info['icc_profile']) is not type(tuple)) self.assertNotIsInstance(im.info['icc_profile'], tuple)
self.assertEqual(im.info['icc_profile'], reloaded.info['icc_profile']) self.assertEqual(im.info['icc_profile'], reloaded.info['icc_profile'])
def test_iccprofile_binary(self): def test_iccprofile_binary(self):