mirror of
https://github.com/python-pillow/Pillow.git
synced 2025-07-01 02:13:11 +03:00
Merge pull request #8000 from radarhere/libtiff
This commit is contained in:
commit
1c21cd41bd
|
@ -242,7 +242,24 @@ class TestFileLibTiff(LibTiffTestCase):
|
||||||
|
|
||||||
im.save(out, tiffinfo=new_ifd)
|
im.save(out, tiffinfo=new_ifd)
|
||||||
|
|
||||||
def test_custom_metadata(self, tmp_path: Path) -> None:
|
@pytest.mark.parametrize(
|
||||||
|
"libtiff",
|
||||||
|
(
|
||||||
|
pytest.param(
|
||||||
|
True,
|
||||||
|
marks=pytest.mark.skipif(
|
||||||
|
not getattr(Image.core, "libtiff_support_custom_tags", False),
|
||||||
|
reason="Custom tags not supported by older libtiff",
|
||||||
|
),
|
||||||
|
),
|
||||||
|
False,
|
||||||
|
),
|
||||||
|
)
|
||||||
|
def test_custom_metadata(
|
||||||
|
self, monkeypatch: pytest.MonkeyPatch, tmp_path: Path, libtiff: bool
|
||||||
|
) -> None:
|
||||||
|
monkeypatch.setattr(TiffImagePlugin, "WRITE_LIBTIFF", libtiff)
|
||||||
|
|
||||||
class Tc(NamedTuple):
|
class Tc(NamedTuple):
|
||||||
value: Any
|
value: Any
|
||||||
type: int
|
type: int
|
||||||
|
@ -281,13 +298,6 @@ class TestFileLibTiff(LibTiffTestCase):
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
libtiffs = [False]
|
|
||||||
if Image.core.libtiff_support_custom_tags:
|
|
||||||
libtiffs.append(True)
|
|
||||||
|
|
||||||
for libtiff in libtiffs:
|
|
||||||
TiffImagePlugin.WRITE_LIBTIFF = libtiff
|
|
||||||
|
|
||||||
def check_tags(
|
def check_tags(
|
||||||
tiffinfo: TiffImagePlugin.ImageFileDirectory_v2 | dict[int, str]
|
tiffinfo: TiffImagePlugin.ImageFileDirectory_v2 | dict[int, str]
|
||||||
) -> None:
|
) -> None:
|
||||||
|
@ -304,9 +314,7 @@ class TestFileLibTiff(LibTiffTestCase):
|
||||||
and libtiff
|
and libtiff
|
||||||
):
|
):
|
||||||
# libtiff does not support real RATIONALS
|
# libtiff does not support real RATIONALS
|
||||||
assert (
|
assert round(abs(float(reloaded_value) - float(value)), 7) == 0
|
||||||
round(abs(float(reloaded_value) - float(value)), 7) == 0
|
|
||||||
)
|
|
||||||
continue
|
continue
|
||||||
|
|
||||||
assert reloaded_value == value
|
assert reloaded_value == value
|
||||||
|
@ -327,7 +335,6 @@ class TestFileLibTiff(LibTiffTestCase):
|
||||||
if tagdata.supported_by_default
|
if tagdata.supported_by_default
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
TiffImagePlugin.WRITE_LIBTIFF = False
|
|
||||||
|
|
||||||
def test_osubfiletype(self, tmp_path: Path) -> None:
|
def test_osubfiletype(self, tmp_path: Path) -> None:
|
||||||
outfile = str(tmp_path / "temp.tif")
|
outfile = str(tmp_path / "temp.tif")
|
||||||
|
@ -741,7 +748,7 @@ class TestFileLibTiff(LibTiffTestCase):
|
||||||
pytest.param(
|
pytest.param(
|
||||||
True,
|
True,
|
||||||
marks=pytest.mark.skipif(
|
marks=pytest.mark.skipif(
|
||||||
not Image.core.libtiff_support_custom_tags,
|
not getattr(Image.core, "libtiff_support_custom_tags", False),
|
||||||
reason="Custom tags not supported by older libtiff",
|
reason="Custom tags not supported by older libtiff",
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|
Loading…
Reference in New Issue
Block a user