Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions src/PIL/JpegImagePlugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -520,27 +520,22 @@ def _read_dpi_from_exif(self) -> None:
return
try:
exif = self.getexif()
x_resolution = exif[0x011A]
try:
dpi = float(x_resolution[0]) / x_resolution[1]
except TypeError:
dpi = x_resolution
dpi = exif[0x011A]
if math.isnan(dpi):
msg = "DPI is not a number"
raise ValueError(msg)
if exif.get(0x0128) == 3: # ResolutionUnit is cm
# 1 dpcm = 2.54 dpi
dpi *= 2.54
self.info["dpi"] = dpi, dpi
except (
struct.error, # truncated EXIF
KeyError, # dpi not included
SyntaxError, # invalid/unreadable EXIF
TypeError, # dpi is an invalid float
ValueError, # dpi is an invalid float
ZeroDivisionError, # invalid dpi rational value
):
self.info["dpi"] = 72, 72
dpi = 72
self.info["dpi"] = dpi, dpi

def _getmp(self) -> dict[int, Any] | None:
return _getmp(self)
Expand Down
Loading