Layer co-ordinates may be negative

This commit is contained in:
Andrew Murray 2024-01-10 23:53:45 +11:00
parent df99d48a0c
commit c2907dc049
4 changed files with 20 additions and 4 deletions

Binary file not shown.

View File

@ -112,6 +112,11 @@ def test_rgba():
assert_image_equal_tofile(im, "Tests/images/imagedraw_square.png")
def test_negative_top_left_layer() -> None:
with Image.open("Tests/images/negative_top_left_layer.psd") as im:
assert im.layers[0][2] == (-50, -50, 50, 50)
def test_layer_skip():
with Image.open("Tests/images/five_channels.psd") as im:
assert im.n_frames == 1

View File

@ -24,6 +24,7 @@ from ._binary import i8
from ._binary import i16be as i16
from ._binary import i32be as i32
from ._binary import si16be as si16
from ._binary import si32be as si32
MODES = {
# (photoshop mode, bits) -> (pil mode, required channels)
@ -177,10 +178,10 @@ def _layerinfo(fp, ct_bytes):
for _ in range(abs(ct)):
# bounding box
y0 = i32(read(4))
x0 = i32(read(4))
y1 = i32(read(4))
x1 = i32(read(4))
y0 = si32(read(4))
x0 = si32(read(4))
y1 = si32(read(4))
x1 = si32(read(4))
# image info
mode = []

View File

@ -77,6 +77,16 @@ def si32le(c: bytes, o: int = 0) -> int:
return unpack_from("<i", c, o)[0]
def si32be(c: bytes, o: int = 0) -> int:
"""
Converts a 4-bytes (32 bits) string to a signed integer, big endian.
:param c: string containing bytes to convert
:param o: offset of bytes to convert in string
"""
return unpack_from(">i", c, o)[0]
def i16be(c: bytes, o: int = 0) -> int:
return unpack_from(">H", c, o)[0]