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

Removed TIFF DPI rounding

Browse Source
This commit is contained in:
Andrew Murray 2021-04-17 15:42:06 +10:00
parent ef9a8e5f7f
commit 537cd7a82e
8 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
Tests/images/hopper_roundUp_2.tif → Tests/images/hopper_float_dpi_2.tif
View File

0
Tests/images/hopper_roundUp_3.tif → Tests/images/hopper_float_dpi_3.tif
View File

0
Tests/images/hopper_roundUp_None.tif → Tests/images/hopper_float_dpi_None.tif
View File

BIN
Tests/images/hopper_roundDown_2.tif
View File

Binary file not shown.

BIN
Tests/images/hopper_roundDown_3.tif
View File

Binary file not shown.

BIN
Tests/images/hopper_roundDown_None.tif
View File

Binary file not shown.

33
Tests/test_file_tiff.py
View File

@ -137,29 +137,24 @@ class TestFileTiff:
im._setup() im._setup()
assert im.info["dpi"] == (71.0, 71.0) assert im.info["dpi"] == (71.0, 71.0)
def test_load_dpi_rounding(self): @pytest.mark.parametrize(
for resolutionUnit, dpi in ((None, (72, 73)), (2, (72, 73)), (3, (183, 185))): "resolutionUnit, dpi",
with Image.open( [(None, 72.8), (2, 72.8), (3, 184.912)],
"Tests/images/hopper_roundDown_" + str(resolutionUnit) + ".tif" )
) as im: def test_load_float_dpi(self, resolutionUnit, dpi):
assert im.tag_v2.get(RESOLUTION_UNIT) == resolutionUnit with Image.open(
assert im.info["dpi"] == (dpi[0], dpi[0]) "Tests/images/hopper_float_dpi_" + str(resolutionUnit) + ".tif"
) as im:
assert im.tag_v2.get(RESOLUTION_UNIT) == resolutionUnit
assert im.info["dpi"] == (dpi, dpi)
with Image.open( def test_save_float_dpi(self, tmp_path):
"Tests/images/hopper_roundUp_" + str(resolutionUnit) + ".tif"
) as im:
assert im.tag_v2.get(RESOLUTION_UNIT) == resolutionUnit
assert im.info["dpi"] == (dpi[1], dpi[1])
def test_save_dpi_rounding(self, tmp_path):
outfile = str(tmp_path / "temp.tif") outfile = str(tmp_path / "temp.tif")
with Image.open("Tests/images/hopper.tif") as im: with Image.open("Tests/images/hopper.tif") as im:
for dpi in (72.2, 72.8): im.save(outfile, dpi=(72.2, 72.2))
im.save(outfile, dpi=(dpi, dpi))
with Image.open(outfile) as reloaded: with Image.open(outfile) as reloaded:
reloaded.load() assert reloaded.info["dpi"] == (72.2, 72.2)
assert (round(dpi), round(dpi)) == reloaded.info["dpi"]
def test_save_setting_missing_resolution(self): def test_save_setting_missing_resolution(self):
b = BytesIO() b = BytesIO()

10
src/PIL/TiffImagePlugin.py
View File

@ -1281,11 +1281,11 @@ class TiffImageFile(ImageFile.ImageFile):
if xres and yres: if xres and yres:
resunit = self.tag_v2.get(RESOLUTION_UNIT) resunit = self.tag_v2.get(RESOLUTION_UNIT)
if resunit == 2: # dots per inch if resunit == 2: # dots per inch
self.info["dpi"] = int(xres + 0.5), int(yres + 0.5) self.info["dpi"] = xres, yres
elif resunit == 3: # dots per centimeter. convert to dpi elif resunit == 3: # dots per centimeter. convert to dpi
self.info["dpi"] = int(xres * 2.54 + 0.5), int(yres * 2.54 + 0.5) self.info["dpi"] = xres * 2.54, yres * 2.54
elif resunit is None: # used to default to 1, but now 2) elif resunit is None: # used to default to 1, but now 2)
self.info["dpi"] = int(xres + 0.5), int(yres + 0.5) self.info["dpi"] = xres, yres
# For backward compatibility, # For backward compatibility,
# we also preserve the old behavior # we also preserve the old behavior
self.info["resolution"] = xres, yres self.info["resolution"] = xres, yres
@ -1518,8 +1518,8 @@ def _save(im, fp, filename):
dpi = im.encoderinfo.get("dpi") dpi = im.encoderinfo.get("dpi")
if dpi: if dpi:
ifd[RESOLUTION_UNIT] = 2 ifd[RESOLUTION_UNIT] = 2
ifd[X_RESOLUTION] = int(dpi[0] + 0.5) ifd[X_RESOLUTION] = dpi[0]
ifd[Y_RESOLUTION] = int(dpi[1] + 0.5) ifd[Y_RESOLUTION] = dpi[1]
if bits != (1,): if bits != (1,):
ifd[BITSPERSAMPLE] = bits ifd[BITSPERSAMPLE] = bits