fix loading IPTC images and add test

This commit is contained in:
Nulano 2023-12-31 13:47:37 +01:00
parent 1d9c931626
commit 46a6ddf0c2
2 changed files with 12 additions and 18 deletions

View File

@ -6,18 +6,21 @@ import pytest
from PIL import Image, IptcImagePlugin
from .helper import hopper
from .helper import assert_image_equal, hopper
TEST_FILE = "Tests/images/iptc.jpg"
def test_open():
expected = Image.new("L", (1, 1), 0)
f = BytesIO(
b"\x1c\x03<\x00\x02\x01\x00\x1c\x03x\x00\x01\x01\x1c"
b"\x03\x14\x00\x01\x01\x1c\x03\x1e\x00\x01\x01\x1c\x08\n\x00\x00"
b"\x1c\x03<\x00\x02\x01\x00\x1c\x03x\x00\x01\x01\x1c\x03\x14\x00\x01\x01"
b"\x1c\x03\x1e\x00\x01\x01\x1c\x08\n\x00\x01\x00"
)
with Image.open(f) as im:
assert im.tile == [("iptc", (0, 0, 1, 1), 25, "raw")]
assert_image_equal(im, expected)
def test_getiptcinfo_jpg_none():

View File

@ -16,8 +16,7 @@
#
from __future__ import annotations
import os
import tempfile
from io import BytesIO
from . import Image, ImageFile
from ._binary import i8, o8
@ -139,12 +138,11 @@ class IptcImageFile(ImageFile.ImageFile):
self.fp.seek(offset)
# Copy image data to temporary file
o_fd, outfile = tempfile.mkstemp(text=False)
o = os.fdopen(o_fd)
o = BytesIO()
if compression == "raw":
# To simplify access to the extracted file,
# prepend a PPM header
o.write("P5\n%d %d\n255\n" % self.size)
o.write(b"P5\n%d %d\n255\n" % self.size)
while True:
type, size = self.field()
if type != (8, 10):
@ -155,17 +153,10 @@ class IptcImageFile(ImageFile.ImageFile):
break
o.write(s)
size -= len(s)
o.close()
try:
with Image.open(outfile) as _im:
_im.load()
self.im = _im.im
finally:
try:
os.unlink(outfile)
except OSError:
pass
with Image.open(o) as _im:
_im.load()
self.im = _im.im
Image.register_open(IptcImageFile.format, IptcImageFile)