Merge pull request #3787 from radarhere/raqm

Fixed raqm layout bug
python-pillow · May 4, 2019 · 9077a80 · 9077a80
2 parents e20228a + b742d15
commit 9077a80
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/Tests/fonts/KhmerOSBattambang-Regular.ttf b/Tests/fonts/KhmerOSBattambang-Regular.ttf
diff --git a/Tests/images/test_complex_unicode_text2.png b/Tests/images/test_complex_unicode_text2.png
diff --git a/Tests/test_imagefontctl.py b/Tests/test_imagefontctl.py
@@ -54,6 +54,18 @@ def test_complex_unicode_text(self):
 
         self.assert_image_similar(im, target_img, .5)
 
+        ttf = ImageFont.truetype("Tests/fonts/KhmerOSBattambang-Regular.ttf",
+                                 FONT_SIZE)
+
+        im = Image.new(mode='RGB', size=(300, 100))
+        draw = ImageDraw.Draw(im)
+        draw.text((0, 0), 'លោកុប្បត្តិ', font=ttf, fill=500)
+
+        target = 'Tests/images/test_complex_unicode_text2.png'
+        target_img = Image.open(target)
+
+        self.assert_image_similar(im, target_img, 2.3)
+
     def test_text_direction_rtl(self):
         ttf = ImageFont.truetype(FONT_PATH, FONT_SIZE)
 

diff --git a/src/_imagingft.c b/src/_imagingft.c
@@ -755,9 +755,6 @@ font_render(FontObject* self, PyObject* args)
     }
 
     for (x = i = 0; i < count; i++) {
-        if (i == 0 && self->face->glyph->metrics.horiBearingX < 0)
-            x = -self->face->glyph->metrics.horiBearingX;
-
         index = glyph_info[i].index;
         error = FT_Load_Glyph(self->face, index, load_flags);
         if (error)