python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-07-10 08:12:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use IcoFile sizes method

Browse Source
This commit is contained in:
Andrew Murray 2025-04-26 15:56:15 +10:00
parent 8eba937d99
commit 15307955f7
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Tests/test_file_cur.py
View File

@ -21,7 +21,7 @@ def test_deerstalker() -> None:
def test_posy_link(): def test_posy_link():
with Image.open("Tests/images/cur/posy_link.cur") as im: with Image.open("Tests/images/cur/posy_link.cur") as im:
assert im.size == (128, 128) assert im.size == (128, 128)
assert im.info["sizes"] == [(128, 128), (96, 96), (64, 64), (48, 48), (32, 32)] assert im.info["sizes"] == {(128, 128), (96, 96), (64, 64), (48, 48), (32, 32)}
assert im.info["hotspots"] == [(25, 7), (18, 5), (12, 3), (9, 2), (5, 1)] assert im.info["hotspots"] == [(25, 7), (18, 5), (12, 3), (9, 2), (5, 1)]
# check some pixel colors # check some pixel colors
assert im.getpixel((0, 0)) == (0, 0, 0, 0) assert im.getpixel((0, 0)) == (0, 0, 0, 0)
@ -89,7 +89,7 @@ def test_save_win98_arrow():
# check default save params # check default save params
with Image.open(output) as im2: with Image.open(output) as im2:
assert im2.size == (32, 32) assert im2.size == (32, 32)
assert im2.info["sizes"] == [(32, 32), (24, 24), (16, 16)] assert im2.info["sizes"] == {(32, 32), (24, 24), (16, 16)}
assert im2.info["hotspots"] == [(0, 0), (0, 0), (0, 0)] assert im2.info["hotspots"] == [(0, 0), (0, 0), (0, 0)]
@ -112,7 +112,7 @@ def test_save_posy_link():
# and sizes/hotspots are correct # and sizes/hotspots are correct
with Image.open(output, formats=["CUR"]) as im2: with Image.open(output, formats=["CUR"]) as im2:
assert (128, 128) == im2.size assert (128, 128) == im2.size
assert sizes == im2.info["sizes"] assert set(sizes) == im2.info["sizes"]
with BytesIO() as output: with BytesIO() as output:
im.save(output, sizes=sizes[3:], hotspots=hotspots[3:], format="CUR") im.save(output, sizes=sizes[3:], hotspots=hotspots[3:], format="CUR")
@ -121,7 +121,7 @@ def test_save_posy_link():
# and sizes/hotspots are correct # and sizes/hotspots are correct
with Image.open(output, formats=["CUR"]) as im2: with Image.open(output, formats=["CUR"]) as im2:
assert (48, 48) == im2.size assert (48, 48) == im2.size
assert sizes[3:] == im2.info["sizes"] assert set(sizes[3:]) == im2.info["sizes"]
# make sure error is thrown when size and hotspot len's # make sure error is thrown when size and hotspot len's
# don't match # don't match

3
src/PIL/CurImagePlugin.py
View File

@ -187,9 +187,6 @@ class CurFile(IcoImagePlugin.IcoFile):
self.entry = sorted(self.entry, key=lambda x: x.square, reverse=True) self.entry = sorted(self.entry, key=lambda x: x.square, reverse=True)
def sizes(self) -> list[tuple[int, int]]:
return [(h.width, h.height) for h in self.entry]
def hotspots(self) -> list[tuple[int, int]]: def hotspots(self) -> list[tuple[int, int]]:
return [(h.x_hotspot, h.y_hotspot) for h in self.entry] return [(h.x_hotspot, h.y_hotspot) for h in self.entry]