python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2024-12-25 17:36:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

Changed to ImageFileDirectory_v2

Browse Source
This commit is contained in:
Andrew Murray 2020-05-22 21:12:09 +10:00
parent ba58ae752c
commit ccac9e1a3a
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Tests/test_file_jpeg.py
View File

@ -219,7 +219,7 @@ class TestFileJpeg:
gps_index = 34853 gps_index = 34853
expected_exif_gps = { expected_exif_gps = {
0: b"\x00\x00\x00\x01", 0: b"\x00\x00\x00\x01",
2: (4294967295, 1), 2: 4294967295,
5: b"\x01", 5: b"\x01",
30: 65535, 30: 65535,
29: "1999:99:99 99:99:99", 29: "1999:99:99 99:99:99",
@ -241,7 +241,7 @@ class TestFileJpeg:
36867: "2099:09:29 10:10:10", 36867: "2099:09:29 10:10:10",
34853: { 34853: {
0: b"\x00\x00\x00\x01", 0: b"\x00\x00\x00\x01",
2: (4294967295, 1), 2: 4294967295,
5: b"\x01", 5: b"\x01",
30: 65535, 30: 65535,
29: "1999:99:99 99:99:99", 29: "1999:99:99 99:99:99",
@ -253,11 +253,11 @@ class TestFileJpeg:
271: "Make", 271: "Make",
272: "XXX-XXX", 272: "XXX-XXX",
305: "PIL", 305: "PIL",
42034: ((1, 1), (1, 1), (1, 1), (1, 1)), 42034: (1, 1, 1, 1),
42035: "LensMake", 42035: "LensMake",
34856: b"\xaa\xaa\xaa\xaa\xaa\xaa", 34856: b"\xaa\xaa\xaa\xaa\xaa\xaa",
282: (4294967295, 1), 282: 4294967295,
33434: (4294967295, 1), 33434: 4294967295,
} }
with Image.open("Tests/images/exif_gps.jpg") as im: with Image.open("Tests/images/exif_gps.jpg") as im:
@ -647,6 +647,19 @@ class TestFileJpeg:
# OSError for unidentified image. # OSError for unidentified image.
assert im.info.get("dpi") == (72, 72) assert im.info.get("dpi") == (72, 72)
def test_exif_x_resolution(self, tmp_path):
with Image.open("Tests/images/flower.jpg") as im:
exif = im.getexif()
assert exif[282] == 180
out = str(tmp_path / "out.jpg")
with pytest.warns(None) as record:
im.save(out, exif=exif)
assert len(record) == 0
with Image.open(out) as reloaded:
assert reloaded.getexif()[282] == 180
def test_invalid_exif_x_resolution(self): def test_invalid_exif_x_resolution(self):
# When no x or y resolution is defined in EXIF # When no x or y resolution is defined in EXIF
with Image.open("Tests/images/invalid-exif-without-x-resolution.jpg") as im: with Image.open("Tests/images/invalid-exif-without-x-resolution.jpg") as im:

6
src/PIL/Image.py
View File

@ -3248,7 +3248,7 @@ class Exif(MutableMapping):
def _fixup(self, value): def _fixup(self, value):
try: try:
if len(value) == 1 and not isinstance(value, dict): if len(value) == 1 and isinstance(value, tuple):
return value[0] return value[0]
except Exception: except Exception:
pass pass
@ -3269,7 +3269,7 @@ class Exif(MutableMapping):
else: else:
from . import TiffImagePlugin from . import TiffImagePlugin
info = TiffImagePlugin.ImageFileDirectory_v1(self.head) info = TiffImagePlugin.ImageFileDirectory_v2(self.head)
info.load(self.fp) info.load(self.fp)
return self._fixup_dict(info) return self._fixup_dict(info)
@ -3294,7 +3294,7 @@ class Exif(MutableMapping):
# process dictionary # process dictionary
from . import TiffImagePlugin from . import TiffImagePlugin
self._info = TiffImagePlugin.ImageFileDirectory_v1(self.head) self._info = TiffImagePlugin.ImageFileDirectory_v2(self.head)
self.endian = self._info._endian self.endian = self._info._endian
self.fp.seek(self._info.next) self.fp.seek(self._info.next)
self._info.load(self.fp) self._info.load(self.fp)