Merge pull request #4401 from radarhere/freetype

Fixed stroke on FreeType < 2.9
python-pillow · Mar 5, 2020 · da4667c · da4667c
2 parents 3b30b88 + 17c10b0
commit da4667c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/Tests/images/imagedraw_stroke_descender.png b/Tests/images/imagedraw_stroke_descender.png
diff --git a/Tests/test_imagedraw.py b/Tests/test_imagedraw.py
@@ -944,6 +944,22 @@ def test_stroke():
         )
 
 
+@skip_unless_feature("freetype2")
+def test_stroke_descender():
+    # Arrange
+    im = Image.new("RGB", (120, 130))
+    draw = ImageDraw.Draw(im)
+    font = ImageFont.truetype("Tests/fonts/FreeMono.ttf", 120)
+
+    # Act
+    draw.text((10, 0), "y", "#f00", font, stroke_width=2, stroke_fill="#0f0")
+
+    # Assert
+    assert_image_similar(
+        im, Image.open("Tests/images/imagedraw_stroke_descender.png"), 6.76
+    )
+
+
 @skip_unless_feature("freetype2")
 def test_stroke_multiline():
     # Arrange

diff --git a/src/_imagingft.c b/src/_imagingft.c
@@ -782,17 +782,14 @@ font_render(FontObject* self, PyObject* args)
     im = (Imaging) id;
     /* Note: bitmap fonts within ttf fonts do not work, see #891/pr#960 */
     load_flags = FT_LOAD_NO_BITMAP;
-    if (stroker == NULL) {
-        load_flags |= FT_LOAD_RENDER;
-    }
     if (mask) {
         load_flags |= FT_LOAD_TARGET_MONO;
     }
 
     ascender = 0;
     for (i = 0; i < count; i++) {
         index = glyph_info[i].index;
-        error = FT_Load_Glyph(self->face, index, load_flags);
+        error = FT_Load_Glyph(self->face, index, load_flags | FT_LOAD_RENDER);
         if (error) {
             return geterror(error);
         }
@@ -806,6 +803,10 @@ font_render(FontObject* self, PyObject* args)
             ascender = temp;
     }
 
+    if (stroker == NULL) {
+        load_flags |= FT_LOAD_RENDER;
+    }
+
     x = y = 0;
     horizontal_dir = dir && strcmp(dir, "ttb") == 0 ? 0 : 1;
     for (i = 0; i < count; i++) {