Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix loading IPTC images and update test #7667

Merged
merged 4 commits into from Jan 1, 2024
Merged

Fix loading IPTC images and update test #7667

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
46a6ddf
fix loading IPTC images and add test
nulano Dec 31, 2023
b1e88ac
omit default color value
nulano Dec 31, 2023
17911d6
Removed import
radarhere Jan 1, 2024
3ef7b93
Merge branch 'main' into iptc
radarhere Jan 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 6 additions & 3 deletions Tests/test_file_iptc.py
View file
Open in desktop
Expand Up @@ -6,18 +6,21 @@

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))

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():
Expand Down
25 changes: 7 additions & 18 deletions src/PIL/IptcImagePlugin.py
View file
Open in desktop
Expand Up @@ -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
Expand Down Expand Up @@ -139,12 +138,11 @@ def load(self):
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):
Expand All @@ -155,17 +153,10 @@ def load(self):
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)
Expand All @@ -181,8 +172,6 @@ def getiptcinfo(im):
:returns: A dictionary containing IPTC information, or None if
no IPTC information block was found.
"""
import io

from . import JpegImagePlugin, TiffImagePlugin

data = None
Expand Down Expand Up @@ -217,7 +206,7 @@ class FakeImage:

# parse the IPTC information chunk
im.info = {}
im.fp = io.BytesIO(data)
im.fp = BytesIO(data)

try:
im._open()
Expand Down