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

Fix priority when selecting j2k kind

Browse Source
This commit is contained in:
scaramallion 2021-05-11 20:45:48 +10:00 committed by Hugo van Kemenade
parent de26f78eb1
commit f8a74cbed1
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Tests/test_file_jpeg2k.py
View File

@ -215,6 +215,18 @@ def test_use_jp2():
out.seek(0) out.seek(0)
assert out.read(2) == b"\xff\x4f" assert out.read(2) == b"\xff\x4f"
out = BytesIO()
out.name = "foo.j2k"
test_card.save(out, "JPEG2000", use_jp2=False)
out.seek(0)
assert out.read(2) == b"\xff\x4f"
out = BytesIO()
out.name = "foo.jp2"
test_card.save(out, "JPEG2000", use_jp2=False)
out.seek(4)
assert out.read(2) != b"jP"
def test_mct(): def test_mct():
# Three component # Three component

11
src/PIL/Jpeg2KImagePlugin.py
View File

@ -290,13 +290,13 @@ def _accept(prefix):
def _save(im, fp, filename): def _save(im, fp, filename):
# Get the keyword arguments
info = im.encoderinfo
if filename.endswith(".j2k"): if filename.endswith(".j2k"):
kind = "j2k" kind = "j2k"
else: else:
kind = "jp2" kind = "jp2" if info.get("use_jp2", True) else "j2k"
# Get the keyword arguments
info = im.encoderinfo
offset = info.get("offset", None) offset = info.get("offset", None)
tile_offset = info.get("tile_offset", None) tile_offset = info.get("tile_offset", None)
@ -321,9 +321,6 @@ def _save(im, fp, filename):
progression = info.get("progression", "LRCP") progression = info.get("progression", "LRCP")
cinema_mode = info.get("cinema_mode", "no") cinema_mode = info.get("cinema_mode", "no")
mct = info.get("mct", 0) mct = info.get("mct", 0)
kind = "jp2" if info.get("use_jp2", True) else "j2k"
fd = -1 fd = -1
if hasattr(fp, "fileno"): if hasattr(fp, "fileno"):