Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 18 additions & 34 deletions Tests/test_file_tiff_metadata.py
Original file line number Diff line number Diff line change
Expand Up @@ -385,50 +385,34 @@ def test_ifd_unsigned_rational(tmp_path: Path) -> None:
assert 1 == reloaded.tag_v2[41493].denominator


def test_ifd_signed_rational(tmp_path: Path) -> None:
@pytest.mark.parametrize(
"numerator, denominator, expected",
(
(2**31 - 1, -(2**31), None), # pair of 4 byte signed longs
(-(2**31), 2**31 - 1, None),
(-(2**31) - 1, 1, (2**31 - 1, -1)), # out of bounds of 4 byte signed long
(-1, 0, None), # IFDRational nan
),
)
def test_ifd_signed_rational(
numerator: int, denominator: int, expected: tuple[int, int] | None, tmp_path: Path
) -> None:
im = hopper()
info = TiffImagePlugin.ImageFileDirectory_v2()

# pair of 4 byte signed longs
numerator = 2**31 - 1
denominator = -(2**31)

info[37380] = TiffImagePlugin.IFDRational(numerator, denominator)

out = tmp_path / "temp.tiff"
im.save(out, tiffinfo=info, compression="raw")

with Image.open(out) as reloaded:
assert isinstance(reloaded, TiffImagePlugin.TiffImageFile)
assert numerator == reloaded.tag_v2[37380].numerator
assert denominator == reloaded.tag_v2[37380].denominator

numerator = -(2**31)
denominator = 2**31 - 1

info[37380] = TiffImagePlugin.IFDRational(numerator, denominator)

out = tmp_path / "temp.tiff"
im.save(out, tiffinfo=info, compression="raw")

with Image.open(out) as reloaded:
assert isinstance(reloaded, TiffImagePlugin.TiffImageFile)
assert numerator == reloaded.tag_v2[37380].numerator
assert denominator == reloaded.tag_v2[37380].denominator

# out of bounds of 4 byte signed long
numerator = -(2**31) - 1
denominator = 1

info[37380] = TiffImagePlugin.IFDRational(numerator, denominator)

out = tmp_path / "temp.tiff"
im.save(out, tiffinfo=info, compression="raw")

with Image.open(out) as reloaded:
assert isinstance(reloaded, TiffImagePlugin.TiffImageFile)
assert 2**31 - 1 == reloaded.tag_v2[37380].numerator
assert -1 == reloaded.tag_v2[37380].denominator
if expected is None:
expected = (numerator, denominator)
assert (
reloaded.tag_v2[37380].numerator,
reloaded.tag_v2[37380].denominator,
) == expected


def test_ifd_signed_long(tmp_path: Path) -> None:
Expand Down
3 changes: 1 addition & 2 deletions src/PIL/TiffImagePlugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -687,8 +687,7 @@ def _setitem(self, tag: int, value: Any, legacy_api: bool) -> None:
self.tagtype[tag] = TiffTags.UNDEFINED
if all(isinstance(v, IFDRational) for v in values):
for v in values:
assert isinstance(v, IFDRational)
if v < 0:
if v < IFDRational(0):
self.tagtype[tag] = TiffTags.SIGNED_RATIONAL
break
else:
Expand Down
Loading