Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Convert to float for comparison with float in IFDRational __eq__ #5412

Merged
merged 2 commits into from Jun 28, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 6 additions & 7 deletions Tests/test_file_tiff.py
Expand Up @@ -146,25 +146,24 @@ def test_load_float_dpi(self, resolutionUnit, dpi):
"Tests/images/hopper_float_dpi_" + str(resolutionUnit) + ".tif"
) as im:
assert im.tag_v2.get(RESOLUTION_UNIT) == resolutionUnit
for reloaded_dpi in im.info["dpi"]:
assert float(reloaded_dpi) == dpi
assert im.info["dpi"] == (dpi, dpi)

def test_save_float_dpi(self, tmp_path):
outfile = str(tmp_path / "temp.tif")
with Image.open("Tests/images/hopper.tif") as im:
im.save(outfile, dpi=(72.2, 72.2))
dpi = (72.2, 72.2)
im.save(outfile, dpi=dpi)

with Image.open(outfile) as reloaded:
for dpi in reloaded.info["dpi"]:
assert float(dpi) == 72.2
assert reloaded.info["dpi"] == dpi

def test_save_setting_missing_resolution(self):
b = BytesIO()
with Image.open("Tests/images/10ct_32bit_128.tiff") as im:
im.save(b, format="tiff", resolution=123.45)
with Image.open(b) as im:
assert float(im.tag_v2[X_RESOLUTION]) == 123.45
assert float(im.tag_v2[Y_RESOLUTION]) == 123.45
assert im.tag_v2[X_RESOLUTION] == 123.45
assert im.tag_v2[Y_RESOLUTION] == 123.45

def test_invalid_file(self):
invalid_file = "Tests/images/flower.jpg"
Expand Down
2 changes: 2 additions & 0 deletions Tests/test_tiff_ifdrational.py
Expand Up @@ -28,6 +28,8 @@ def test_sanity():
_test_equal(1, 2, Fraction(1, 2))
_test_equal(1, 2, IFDRational(1, 2))

_test_equal(7, 5, 1.4)


def test_ranges():
for num in range(1, 10):
Expand Down
5 changes: 4 additions & 1 deletion src/PIL/TiffImagePlugin.py
Expand Up @@ -354,9 +354,12 @@ def __hash__(self):
return self._val.__hash__()

def __eq__(self, other):
val = self._val
if isinstance(other, IFDRational):
other = other._val
return self._val == other
if isinstance(other, float):
val = float(val)
return val == other

def __getstate__(self):
return [self._val, self._numerator, self._denominator]
Expand Down