Merge pull request #6445 from radarhere/set_variation_by_name

python-pillow · Oct 28, 2022 · 31f66ea · 31f66ea
2 parents fb0e7cd + 17b56b9
commit 31f66ea
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/Tests/images/variation_adobe_name.png b/Tests/images/variation_adobe_name.png
diff --git a/Tests/images/variation_adobe_older_harfbuzz_name.png b/Tests/images/variation_adobe_older_harfbuzz_name.png
diff --git a/Tests/test_imagefont.py b/Tests/test_imagefont.py
@@ -746,12 +746,14 @@ def test_variation_set_by_name(font):
     _check_text(font, "Tests/images/variation_adobe.png", 11)
     for name in ["Bold", b"Bold"]:
         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)
     _check_text(font, "Tests/images/variation_tiny.png", 40)
     for name in ["200", b"200"]:
         font.set_variation_by_name(name)
+        assert font.getname()[1] == "200"
     _check_text(font, "Tests/images/variation_tiny_name.png", 40)
 
 

diff --git a/src/PIL/ImageFont.py b/src/PIL/ImageFont.py
@@ -803,7 +803,7 @@ def set_variation_by_name(self, name):
         names = self.get_variation_names()
         if not isinstance(name, bytes):
             name = name.encode()
-        index = names.index(name)
+        index = names.index(name) + 1
 
         if index == getattr(self, "_last_variation_index", None):
             # When the same name is set twice in a row,