Merge pull request #4910 from nulano/anchor-part1

python-pillow · Sep 19, 2020 · 93d011e · 93d011e
2 parents b0fa0fd + a501ba9
commit 93d011e
Show file tree

Hide file tree

Showing 24 changed files with 166 additions and 170 deletions.
diff --git a/Tests/images/test_arabictext_features.png b/Tests/images/test_arabictext_features.png
diff --git a/Tests/images/test_complex_unicode_text.png b/Tests/images/test_complex_unicode_text.png
diff --git a/Tests/images/test_complex_unicode_text2.png b/Tests/images/test_complex_unicode_text2.png
diff --git a/Tests/images/test_direction_ltr.png b/Tests/images/test_direction_ltr.png
diff --git a/Tests/images/test_direction_rtl.png b/Tests/images/test_direction_rtl.png
diff --git a/Tests/images/test_direction_ttb.png b/Tests/images/test_direction_ttb.png
diff --git a/Tests/images/test_direction_ttb_stroke.png b/Tests/images/test_direction_ttb_stroke.png
diff --git a/Tests/images/test_kerning_features.png b/Tests/images/test_kerning_features.png
diff --git a/Tests/images/test_language.png b/Tests/images/test_language.png
diff --git a/Tests/images/test_ligature_features.png b/Tests/images/test_ligature_features.png
diff --git a/Tests/images/test_text.png b/Tests/images/test_text.png
diff --git a/Tests/images/test_x_max_and_y_offset.png b/Tests/images/test_x_max_and_y_offset.png
diff --git a/Tests/images/test_y_offset.png b/Tests/images/test_y_offset.png
diff --git a/Tests/images/variation_adobe.png b/Tests/images/variation_adobe.png
diff --git a/Tests/images/variation_adobe_axes.png b/Tests/images/variation_adobe_axes.png
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.png b/Tests/images/variation_adobe_older_harfbuzz.png
diff --git a/Tests/images/variation_adobe_older_harfbuzz_axes.png b/Tests/images/variation_adobe_older_harfbuzz_axes.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/images/variation_tiny_axes.png b/Tests/images/variation_tiny_axes.png
diff --git a/Tests/images/variation_tiny_name.png b/Tests/images/variation_tiny_name.png
diff --git a/Tests/test_imagefont.py b/Tests/test_imagefont.py
@@ -35,9 +35,24 @@ class TestImageFont:
     # Freetype has different metrics depending on the version.
     # (and, other things, but first things first)
     METRICS = {
-        (">=2.3", "<2.4"): {"multiline": 30, "textsize": 12, "getters": (13, 16)},
-        (">=2.7",): {"multiline": 6.2, "textsize": 2.5, "getters": (12, 16)},
-        "Default": {"multiline": 0.5, "textsize": 0.5, "getters": (12, 16)},
+        (">=2.3", "<2.4"): {
+            "multiline": 30,
+            "textsize": 12,
+            "getters": (13, 16),
+            "mask": (107, 13),
+        },
+        (">=2.7",): {
+            "multiline": 6.2,
+            "textsize": 2.5,
+            "getters": (12, 16),
+            "mask": (108, 13),
+        },
+        "Default": {
+            "multiline": 0.5,
+            "textsize": 0.5,
+            "getters": (12, 16),
+            "mask": (108, 13),
+        },
     }
 
     @classmethod
@@ -343,7 +358,7 @@ def test_rotated_transposed_font_get_mask(self):
         mask = transposed_font.getmask(text)
 
         # Assert
-        assert mask.size == (13, 108)
+        assert mask.size == self.metrics["mask"][::-1]
 
     def test_unrotated_transposed_font_get_mask(self):
         # Arrange
@@ -356,7 +371,7 @@ def test_unrotated_transposed_font_get_mask(self):
         mask = transposed_font.getmask(text)
 
         # Assert
-        assert mask.size == (108, 13)
+        assert mask.size == self.metrics["mask"]
 
     def test_free_type_font_get_name(self):
         # Arrange
@@ -400,7 +415,7 @@ def test_free_type_font_get_mask(self):
         mask = font.getmask(text)
 
         # Assert
-        assert mask.size == (108, 13)
+        assert mask.size == self.metrics["mask"]
 
     def test_load_path_not_found(self):
         # Arrange
@@ -471,7 +486,8 @@ def test_unicode_extended(self):
         d = ImageDraw.Draw(img)
         d.text((10, 10), text, font=ttf)
 
-        assert_image_similar_tofile(img, target, self.metrics["multiline"])
+        # fails with 14.7
+        assert_image_similar_tofile(img, target, 6.2)
 
     def _test_fake_loading_font(self, monkeypatch, path_to_fake, fontname):
         # Make a copy of FreeTypeFont so we can patch the original
@@ -728,7 +744,7 @@ def test_variation_set_by_axes(self):
 
         font = ImageFont.truetype("Tests/fonts/AdobeVFPrototype.ttf", 36)
         font.set_variation_by_axes([500, 50])
-        self._check_text(font, "Tests/images/variation_adobe_axes.png", 5.1)
+        self._check_text(font, "Tests/images/variation_adobe_axes.png", 11.05)
 
         font = ImageFont.truetype("Tests/fonts/TINY5x3GX.ttf", 36)
         font.set_variation_by_axes([100])

diff --git a/src/PIL/ImageFont.py b/src/PIL/ImageFont.py
@@ -259,9 +259,11 @@ def getsize(
 
         :return: (width, height)
         """
+        # vertical offset is added for historical reasons
+        # see https://github.com/python-pillow/Pillow/pull/4910#discussion_r486682929
         size, offset = self.font.getsize(text, False, direction, features, language)
         return (
-            size[0] + stroke_width * 2 + offset[0],
+            size[0] + stroke_width * 2,
             size[1] + stroke_width * 2 + offset[1],
         )