mirror of
https://github.com/python-pillow/Pillow.git
synced 2024-12-25 17:36:18 +03:00
Removed TIFF DPI rounding
This commit is contained in:
parent
ef9a8e5f7f
commit
537cd7a82e
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -137,29 +137,24 @@ class TestFileTiff:
|
|||
im._setup()
|
||||
assert im.info["dpi"] == (71.0, 71.0)
|
||||
|
||||
def test_load_dpi_rounding(self):
|
||||
for resolutionUnit, dpi in ((None, (72, 73)), (2, (72, 73)), (3, (183, 185))):
|
||||
with Image.open(
|
||||
"Tests/images/hopper_roundDown_" + str(resolutionUnit) + ".tif"
|
||||
) as im:
|
||||
assert im.tag_v2.get(RESOLUTION_UNIT) == resolutionUnit
|
||||
assert im.info["dpi"] == (dpi[0], dpi[0])
|
||||
@pytest.mark.parametrize(
|
||||
"resolutionUnit, dpi",
|
||||
[(None, 72.8), (2, 72.8), (3, 184.912)],
|
||||
)
|
||||
def test_load_float_dpi(self, resolutionUnit, dpi):
|
||||
with Image.open(
|
||||
"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(
|
||||
"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):
|
||||
def test_save_float_dpi(self, tmp_path):
|
||||
outfile = str(tmp_path / "temp.tif")
|
||||
with Image.open("Tests/images/hopper.tif") as im:
|
||||
for dpi in (72.2, 72.8):
|
||||
im.save(outfile, dpi=(dpi, dpi))
|
||||
im.save(outfile, dpi=(72.2, 72.2))
|
||||
|
||||
with Image.open(outfile) as reloaded:
|
||||
reloaded.load()
|
||||
assert (round(dpi), round(dpi)) == reloaded.info["dpi"]
|
||||
with Image.open(outfile) as reloaded:
|
||||
assert reloaded.info["dpi"] == (72.2, 72.2)
|
||||
|
||||
def test_save_setting_missing_resolution(self):
|
||||
b = BytesIO()
|
||||
|
|
|
@ -1281,11 +1281,11 @@ class TiffImageFile(ImageFile.ImageFile):
|
|||
if xres and yres:
|
||||
resunit = self.tag_v2.get(RESOLUTION_UNIT)
|
||||
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
|
||||
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)
|
||||
self.info["dpi"] = int(xres + 0.5), int(yres + 0.5)
|
||||
self.info["dpi"] = xres, yres
|
||||
# For backward compatibility,
|
||||
# we also preserve the old behavior
|
||||
self.info["resolution"] = xres, yres
|
||||
|
@ -1518,8 +1518,8 @@ def _save(im, fp, filename):
|
|||
dpi = im.encoderinfo.get("dpi")
|
||||
if dpi:
|
||||
ifd[RESOLUTION_UNIT] = 2
|
||||
ifd[X_RESOLUTION] = int(dpi[0] + 0.5)
|
||||
ifd[Y_RESOLUTION] = int(dpi[1] + 0.5)
|
||||
ifd[X_RESOLUTION] = dpi[0]
|
||||
ifd[Y_RESOLUTION] = dpi[1]
|
||||
|
||||
if bits != (1,):
|
||||
ifd[BITSPERSAMPLE] = bits
|
||||
|
|
Loading…
Reference in New Issue
Block a user