Skip to content

Commit c322a2f

Browse files
committed
Use maximum frame size in IHDR chunk when saving
1 parent b9d3c21 commit c322a2f

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

Tests/test_file_apng.py

+10
Original file line numberDiff line numberDiff line change
@@ -668,6 +668,16 @@ def test_apng_save_blend(tmp_path: Path) -> None:
668668
assert im.getpixel((0, 0)) == (0, 255, 0, 255)
669669

670670

671+
def test_apng_save_size(tmp_path: Path) -> None:
672+
test_file = str(tmp_path / "temp.png")
673+
674+
im = Image.new("L", (100, 100))
675+
im.save(test_file, save_all=True, append_images=[Image.new("L", (200, 200))])
676+
677+
with Image.open(test_file) as reloaded:
678+
assert reloaded.size == (200, 200)
679+
680+
671681
def test_seek_after_close() -> None:
672682
im = Image.open("Tests/images/apng/delay.png")
673683
im.seek(1)

src/PIL/PngImagePlugin.py

+6-2
Original file line numberDiff line numberDiff line change
@@ -1232,16 +1232,20 @@ def _save(im, fp, filename, chunk=putchunk, save_all=False):
12321232
"default_image", im.info.get("default_image")
12331233
)
12341234
modes = set()
1235+
sizes = set()
12351236
append_images = im.encoderinfo.get("append_images", [])
12361237
for im_seq in itertools.chain([im], append_images):
12371238
for im_frame in ImageSequence.Iterator(im_seq):
12381239
modes.add(im_frame.mode)
1240+
sizes.add(im_frame.size)
12391241
for mode in ("RGBA", "RGB", "P"):
12401242
if mode in modes:
12411243
break
12421244
else:
12431245
mode = modes.pop()
1246+
size = tuple(max(frame_size[i] for frame_size in sizes) for i in range(2))
12441247
else:
1248+
size = im.size
12451249
mode = im.mode
12461250

12471251
if mode == "P":
@@ -1289,8 +1293,8 @@ def _save(im, fp, filename, chunk=putchunk, save_all=False):
12891293
chunk(
12901294
fp,
12911295
b"IHDR",
1292-
o32(im.size[0]), # 0: size
1293-
o32(im.size[1]),
1296+
o32(size[0]), # 0: size
1297+
o32(size[1]),
12941298
mode, # 8: depth/type
12951299
b"\0", # 10: compression
12961300
b"\0", # 11: filter category

0 commit comments

Comments
 (0)