Skip to content

Commit

Permalink
Allow FotoStation tags
Browse files Browse the repository at this point in the history
  • Loading branch information
radarhere committed Aug 22, 2023
1 parent 6bd3ed4 commit b37ca35
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 2 deletions.
19 changes: 18 additions & 1 deletion Tests/test_file_iptc.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import sys
from io import StringIO
from io import BytesIO, StringIO

from PIL import Image, IptcImagePlugin

Expand Down Expand Up @@ -30,6 +30,23 @@ def test_getiptcinfo_jpg_found():
assert iptc[(2, 101)] == b"Hungary"


def test_getiptcinfo_fotostation():
# Arrange
with open(TEST_FILE, "rb") as fp:
data = bytearray(fp.read())
data[86] = 240
f = BytesIO(data)
with Image.open(f) as im:
# Act
iptc = IptcImagePlugin.getiptcinfo(im)

# Assert
for tag in iptc.keys():
if tag[0] == 240:
return
assert False, "FotoStation tag not found"


def test_getiptcinfo_zero_padding():
# Arrange
with Image.open(TEST_FILE) as im:
Expand Down
2 changes: 1 addition & 1 deletion src/PIL/IptcImagePlugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def field(self):
tag = s[1], s[2]

# syntax
if s[0] != 0x1C or tag[0] < 1 or tag[0] > 9:
if s[0] != 0x1C or tag[0] not in [1, 2, 3, 4, 5, 6, 7, 8, 9, 240]:
msg = "invalid IPTC/NAA file"
raise SyntaxError(msg)

Expand Down

0 comments on commit b37ca35

Please sign in to comment.