python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-07-15 10:42:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

better fix for #15 (with a test case now)

Browse Source
This commit is contained in:
Mikhail Korobov 2013-02-26 17:12:11 +06:00
parent ee794e1501
commit a71183dab5
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PIL/JpegImagePlugin.py
View File

@ -378,7 +378,7 @@ class JpegImageFile(ImageFile.ImageFile):
# process dictionary # process dictionary
info = TiffImagePlugin.ImageFileDirectory(head) info = TiffImagePlugin.ImageFileDirectory(head)
info.load(file) info.load(file)
for key, value in list(info.items()): for key, value in info.items():
exif[key] = fixup(value) exif[key] = fixup(value)
# get exif extension # get exif extension
try: try:
@ -388,7 +388,7 @@ class JpegImageFile(ImageFile.ImageFile):
else: else:
info = TiffImagePlugin.ImageFileDirectory(head) info = TiffImagePlugin.ImageFileDirectory(head)
info.load(file) info.load(file)
for key, value in list(info.items()): for key, value in info.items():
exif[key] = fixup(value) exif[key] = fixup(value)
# get gpsinfo extension # get gpsinfo extension
try: try:
@ -399,7 +399,7 @@ class JpegImageFile(ImageFile.ImageFile):
info = TiffImagePlugin.ImageFileDirectory(head) info = TiffImagePlugin.ImageFileDirectory(head)
info.load(file) info.load(file)
exif[0x8825] = gps = {} exif[0x8825] = gps = {}
for key, value in list(info.items()): for key, value in info.items():
gps[key] = fixup(value) gps[key] = fixup(value)
return exif return exif

5
PIL/TiffImagePlugin.py
View File

@ -269,6 +269,11 @@ class ImageFileDirectory(collections.MutableMapping):
def __iter__(self): def __iter__(self):
return itertools.chain(self.tags.__iter__(), self.tagdata.__iter__()) return itertools.chain(self.tags.__iter__(), self.tagdata.__iter__())
def items(self):
keys = list(self.__iter__())
values = [self[key] for key in keys]
return zip(keys, values)
# load primitives # load primitives
load_dispatch = {} load_dispatch = {}

5
Tests/test_file_jpeg.py
View File

@ -177,3 +177,8 @@ def test_truncated_jpeg():
assert_no_exception(lambda: test(4)) assert_no_exception(lambda: test(4))
assert_no_exception(lambda: test(8)) assert_no_exception(lambda: test(8))
assert_exception(IOError, lambda: test(10)) assert_exception(IOError, lambda: test(10))
def test_exif():
im = Image.open("Tests/images/pil_sample_rgb.jpg")
info = im._getexif()
assert_equal(info[305], 'Adobe Photoshop CS Macintosh')