Skip to content

Corrected check for libtiff feature #7975

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
radarhere merged 4 commits into from
Apr 21, 2024
Merged

Corrected check for libtiff feature #7975

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7102980
Corrected check for libtiff feature
radarhere Apr 14, 2024
28f436c
Use monkeypatch to set READ_LIBTIFF and WRITE_LIBTIFF
radarhere Apr 18, 2024
533f78e
Parametrize test
radarhere Apr 18, 2024
11ac0c1
Combine tests through parametrization
radarhere Apr 19, 2024
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
31 changes: 16 additions & 15 deletions Tests/test_tiff_ifdrational.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@
from fractions import Fraction
from pathlib import Path

from PIL import Image, TiffImagePlugin, features
import pytest

from PIL import Image, TiffImagePlugin
from PIL.TiffImagePlugin import IFDRational

from .helper import hopper
from .helper import hopper, skip_unless_feature


def _test_equal(num, denom, target) -> None:
Expand Down Expand Up @@ -52,18 +54,17 @@ def test_nonetype() -> None:
assert xres and yres


def test_ifd_rational_save(tmp_path: Path) -> None:
methods = [True]
if features.check("libtiff"):
methods.append(False)

for libtiff in methods:
TiffImagePlugin.WRITE_LIBTIFF = libtiff
@pytest.mark.parametrize(
"libtiff", (pytest.param(True, marks=skip_unless_feature("libtiff")), False)
)
def test_ifd_rational_save(tmp_path: Path, libtiff: bool) -> None:
Copy link
Contributor

@nulano nulano Apr 15, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
def test_ifd_rational_save(tmp_path: Path, libtiff: bool) -> None:
def test_ifd_rational_save(monkeypatch: pytest.MonkeyPatch, tmp_path: Path, libtiff: bool) -> None:

im = hopper()
out = str(tmp_path / "temp.tiff")
res = IFDRational(301, 1)

im = hopper()
out = str(tmp_path / "temp.tiff")
res = IFDRational(301, 1)
im.save(out, dpi=(res, res), compression="raw")
TiffImagePlugin.WRITE_LIBTIFF = libtiff
Copy link
Contributor

@nulano nulano Apr 15, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
TiffImagePlugin.WRITE_LIBTIFF = libtiff
monkeypatch.setattr(TiffImagePlugin, "WRITE_LIBTIFF", libtiff)

im.save(out, dpi=(res, res), compression="raw")
TiffImagePlugin.WRITE_LIBTIFF = False
Copy link
Contributor

@nulano nulano Apr 15, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
TiffImagePlugin.WRITE_LIBTIFF = False


with Image.open(out) as reloaded:
assert float(IFDRational(301, 1)) == float(reloaded.tag_v2[282])
with Image.open(out) as reloaded:
assert float(IFDRational(301, 1)) == float(reloaded.tag_v2[282])