python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-01-27 09:44:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix for https://github.com/python-pillow/Pillow/issues/2628#issuecomment-315962612

Browse Source
This commit is contained in:
wiredfool 2017-07-18 00:54:11 -07:00
parent b1d0965c75
commit 7a8161162f
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PIL/JpegImagePlugin.py
View File

@ -119,8 +119,8 @@ def APP(self, marker):
# If DPI isn't in JPEG header, fetch from EXIF # If DPI isn't in JPEG header, fetch from EXIF
if "dpi" not in self.info and "exif" in self.info: if "dpi" not in self.info and "exif" in self.info:
exif = self._getexif()
try: try:
exif = self._getexif()
resolution_unit = exif[0x0128] resolution_unit = exif[0x0128]
x_resolution = exif[0x011A] x_resolution = exif[0x011A]
try: try:
@ -131,7 +131,9 @@ def APP(self, marker):
# 1 dpcm = 2.54 dpi # 1 dpcm = 2.54 dpi
dpi *= 2.54 dpi *= 2.54
self.info["dpi"] = dpi, dpi self.info["dpi"] = dpi, dpi
except KeyError: except (KeyError, SyntaxError):
# SyntaxError for invalid/unreadable exif
# KeyError for dpi not included
self.info["dpi"] = 72, 72 self.info["dpi"] = 72, 72