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

Merge pull request #7870 from radarhere/j2k_pclr

Browse Source
This commit is contained in:
Hugo van Kemenade 2024-03-21 18:24:45 +02:00 committed by GitHub
commit 9d3c8d54b4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Tests/test_file_jpeg2k.py
View File

@ -364,6 +364,16 @@ def test_subsampling_decode(name: str) -> None:
assert_image_similar(im, expected, epsilon) assert_image_similar(im, expected, epsilon)
@pytest.mark.skipif(
not os.path.exists(EXTRA_DIR), reason="Extra image files not installed"
)
def test_pclr() -> None:
with Image.open(f"{EXTRA_DIR}/issue104_jpxstream.jp2") as im:
assert im.mode == "P"
assert len(im.palette.colors) == 256
assert im.palette.colors[(255, 255, 255)] == 0
def test_comment() -> None: def test_comment() -> None:
with Image.open("Tests/images/comment.jp2") as im: with Image.open("Tests/images/comment.jp2") as im:
assert im.info["comment"] == b"Created by OpenJPEG version 2.5.0" assert im.info["comment"] == b"Created by OpenJPEG version 2.5.0"

15
src/PIL/Jpeg2KImagePlugin.py
View File

@ -19,7 +19,7 @@ import io
import os import os
import struct import struct
from . import Image, ImageFile, _binary from . import Image, ImageFile, ImagePalette, _binary
class BoxReader: class BoxReader:
@ -162,6 +162,7 @@ def _parse_jp2_header(fp):
bpc = None bpc = None
nc = None nc = None
dpi = None # 2-tuple of DPI info, or None dpi = None # 2-tuple of DPI info, or None
palette = None
while header.has_next_box(): while header.has_next_box():
tbox = header.next_box_type() tbox = header.next_box_type()
@ -179,6 +180,14 @@ def _parse_jp2_header(fp):
mode = "RGB" mode = "RGB"
elif nc == 4: elif nc == 4:
mode = "RGBA" mode = "RGBA"
elif tbox == b"pclr" and mode in ("L", "LA"):
ne, npc = header.read_fields(">HB")
bitdepths = header.read_fields(">" + ("B" * npc))
if max(bitdepths) <= 8:
palette = ImagePalette.ImagePalette()
for i in range(ne):
palette.getcolor(header.read_fields(">" + ("B" * npc)))
mode = "P" if mode == "L" else "PA"
elif tbox == b"res ": elif tbox == b"res ":
res = header.read_boxes() res = header.read_boxes()
while res.has_next_box(): while res.has_next_box():
@ -195,7 +204,7 @@ def _parse_jp2_header(fp):
msg = "Malformed JP2 header" msg = "Malformed JP2 header"
raise SyntaxError(msg) raise SyntaxError(msg)
return size, mode, mimetype, dpi return size, mode, mimetype, dpi, palette
## ##
@ -217,7 +226,7 @@ class Jpeg2KImageFile(ImageFile.ImageFile):
if sig == b"\x00\x00\x00\x0cjP \x0d\x0a\x87\x0a": if sig == b"\x00\x00\x00\x0cjP \x0d\x0a\x87\x0a":
self.codec = "jp2" self.codec = "jp2"
header = _parse_jp2_header(self.fp) header = _parse_jp2_header(self.fp)
self._size, self._mode, self.custom_mimetype, dpi = header self._size, self._mode, self.custom_mimetype, dpi, self.palette = header
if dpi is not None: if dpi is not None:
self.info["dpi"] = dpi self.info["dpi"] = dpi
if self.fp.read(12).endswith(b"jp2c\xff\x4f\xff\x51"): if self.fp.read(12).endswith(b"jp2c\xff\x4f\xff\x51"):

2
src/libImaging/Jpeg2KDecode.c
View File

@ -615,6 +615,8 @@ j2ku_sycca_rgba(
static const struct j2k_decode_unpacker j2k_unpackers[] = { static const struct j2k_decode_unpacker j2k_unpackers[] = {
{"L", OPJ_CLRSPC_GRAY, 1, 0, j2ku_gray_l}, {"L", OPJ_CLRSPC_GRAY, 1, 0, j2ku_gray_l},
{"P", OPJ_CLRSPC_SRGB, 1, 0, j2ku_gray_l},
{"PA", OPJ_CLRSPC_SRGB, 2, 0, j2ku_graya_la},
{"I;16", OPJ_CLRSPC_GRAY, 1, 0, j2ku_gray_i}, {"I;16", OPJ_CLRSPC_GRAY, 1, 0, j2ku_gray_i},
{"I;16B", OPJ_CLRSPC_GRAY, 1, 0, j2ku_gray_i}, {"I;16B", OPJ_CLRSPC_GRAY, 1, 0, j2ku_gray_i},
{"LA", OPJ_CLRSPC_GRAY, 2, 0, j2ku_graya_la}, {"LA", OPJ_CLRSPC_GRAY, 2, 0, j2ku_graya_la},