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

Merge pull request #6445 from radarhere/set_variation_by_name

Browse Source
This commit is contained in:
Hugo van Kemenade 2022-10-28 13:21:30 +03:00 committed by GitHub
commit 31f66ea963
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Tests/images/variation_adobe_name.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
Tests/images/variation_adobe_older_harfbuzz_name.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

4
Tests/test_imagefont.py
View File

@ -746,12 +746,14 @@ def test_variation_set_by_name(font):
_check_text(font, "Tests/images/variation_adobe.png", 11) _check_text(font, "Tests/images/variation_adobe.png", 11)
for name in ["Bold", b"Bold"]: for name in ["Bold", b"Bold"]:
font.set_variation_by_name(name) font.set_variation_by_name(name)
_check_text(font, "Tests/images/variation_adobe_name.png", 11) assert font.getname()[1] == "Bold"
_check_text(font, "Tests/images/variation_adobe_name.png", 16)
font = ImageFont.truetype("Tests/fonts/TINY5x3GX.ttf", 36) font = ImageFont.truetype("Tests/fonts/TINY5x3GX.ttf", 36)
_check_text(font, "Tests/images/variation_tiny.png", 40) _check_text(font, "Tests/images/variation_tiny.png", 40)
for name in ["200", b"200"]: for name in ["200", b"200"]:
font.set_variation_by_name(name) font.set_variation_by_name(name)
assert font.getname()[1] == "200"
_check_text(font, "Tests/images/variation_tiny_name.png", 40) _check_text(font, "Tests/images/variation_tiny_name.png", 40)

2
src/PIL/ImageFont.py
View File

@ -803,7 +803,7 @@ class FreeTypeFont:
names = self.get_variation_names() names = self.get_variation_names()
if not isinstance(name, bytes): if not isinstance(name, bytes):
name = name.encode() name = name.encode()
index = names.index(name) index = names.index(name) + 1
if index == getattr(self, "_last_variation_index", None): if index == getattr(self, "_last_variation_index", None):
# When the same name is set twice in a row, # When the same name is set twice in a row,