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

Use _binary

Browse Source
This commit is contained in:
Andrew Murray 2023-01-31 22:31:52 +11:00
parent 18ad4c867f
commit ca97e2a3a5
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Tests/test_file_jpeg2k.py
View File

@ -1,11 +1,17 @@
import os import os
import re import re
import struct
from io import BytesIO from io import BytesIO
import pytest import pytest
from PIL import Image, ImageFile, Jpeg2KImagePlugin, UnidentifiedImageError, features from PIL import (
Image,
ImageFile,
Jpeg2KImagePlugin,
UnidentifiedImageError,
_binary,
features,
)
from .helper import ( from .helper import (
assert_image_equal, assert_image_equal,
@ -393,11 +399,11 @@ def test_plt_marker():
out.seek(0) out.seek(0)
while True: while True:
box_bytes = out.read(2) box_bytes = out.read(2)
if len(box_bytes) == 0: if not box_bytes:
# End of steam encountered and no PLT or SOD # End of steam encountered and no PLT or SOD
break break
jp2_boxid = struct.unpack(">H", box_bytes)[0]
jp2_boxid = _binary.i16be(box_bytes)
if jp2_boxid == 0xFF4F: if jp2_boxid == 0xFF4F:
# No length specifier for main header # No length specifier for main header
continue continue
@ -405,10 +411,10 @@ def test_plt_marker():
# This is the PLT box we're looking for # This is the PLT box we're looking for
return return
elif jp2_boxid == 0xFF93: elif jp2_boxid == 0xFF93:
break
# SOD box encountered and no PLT, so it wasn't found # SOD box encountered and no PLT, so it wasn't found
break
jp2_boxlength = struct.unpack(">H", out.read(2))[0] jp2_boxlength = _binary.i16be(out.read(2))
out.seek(jp2_boxlength - 2, os.SEEK_CUR) out.seek(jp2_boxlength - 2, os.SEEK_CUR)
# The PLT box wasn't found # The PLT box wasn't found