python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-03-03 11:35:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

Limit rationals for expected values in round trip

Browse Source
This commit is contained in:
wiredfool 2015-12-27 20:47:13 +00:00
parent 8ed2d1ed02
commit 5e7a5bf237
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Tests/test_file_tiff_metadata.py
View File

@ -6,6 +6,7 @@ import struct
from helper import unittest, PillowTestCase, hopper from helper import unittest, PillowTestCase, hopper
from PIL import Image, TiffImagePlugin, TiffTags from PIL import Image, TiffImagePlugin, TiffTags
from TiffImagePlugin import _limit_rational, IFDRational
tag_ids = dict((info.name, info.value) for info in TiffTags.TAGS_V2.values()) tag_ids = dict((info.name, info.value) for info in TiffTags.TAGS_V2.values())
@ -73,7 +74,7 @@ class TestFileTiffMetadata(PillowTestCase):
def test_read_metadata(self): def test_read_metadata(self):
img = Image.open('Tests/images/hopper_g4.tif') img = Image.open('Tests/images/hopper_g4.tif')
self.assertEqual({'YResolution': TiffImagePlugin.IFDRational(4294967295, 113653537), self.assertEqual({'YResolution': IFDRational(4294967295, 113653537),
'PlanarConfiguration': 1, 'PlanarConfiguration': 1,
'BitsPerSample': (1,), 'BitsPerSample': (1,),
'ImageLength': 128, 'ImageLength': 128,
@ -83,7 +84,7 @@ class TestFileTiffMetadata(PillowTestCase):
'ResolutionUnit': 3, 'ResolutionUnit': 3,
'PhotometricInterpretation': 0, 'PhotometricInterpretation': 0,
'PageNumber': (0, 1), 'PageNumber': (0, 1),
'XResolution': TiffImagePlugin.IFDRational(4294967295, 113653537), 'XResolution': IFDRational(4294967295, 113653537),
'ImageWidth': 128, 'ImageWidth': 128,
'Orientation': 1, 'Orientation': 1,
'StripByteCounts': (1968,), 'StripByteCounts': (1968,),
@ -121,13 +122,21 @@ class TestFileTiffMetadata(PillowTestCase):
original = img.tag_v2.named() original = img.tag_v2.named()
reloaded = loaded.tag_v2.named() reloaded = loaded.tag_v2.named()
ignored = [ for k,v in original.items():
'StripByteCounts', 'RowsPerStrip', 'PageNumber', 'StripOffsets'] if type(v) == IFDRational:
original[k] = IFDRational(*_limit_rational(v,2**31))
if type(v) == tuple and \
type(v[0]) == IFDRational:
original[k] = tuple([IFDRational(
*_limit_rational(elt, 2**31)) for elt in v])
ignored = ['StripByteCounts', 'RowsPerStrip',
'PageNumber', 'StripOffsets']
for tag, value in reloaded.items(): for tag, value in reloaded.items():
if tag in ignored: continue if tag in ignored: continue
if (type(original[tag]) == tuple if (type(original[tag]) == tuple
and type(original[tag][0]) == TiffImagePlugin.IFDRational): and type(original[tag][0]) == IFDRational):
# Need to compare element by element in the tuple, # Need to compare element by element in the tuple,
# not comparing tuples of object references # not comparing tuples of object references
self.assert_deep_equal(original[tag], self.assert_deep_equal(original[tag],