gdi32: Retry with hinting disabled if glyph load failed in hinted mode.

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

gdi32: Retry with hinting disabled if glyph load failed in hinted mode.
dc9267dc · Nikolay Sivov · Alexandre Julliard · daff3be7 · dc9267dc
Commit dc9267dc authored Feb 05, 2020 by Nikolay Sivov Committed by Alexandre Julliard Feb 05, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

freetype.c dlls/gdi32/freetype.c +7 -1

No files found.
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -7620,9 +7620,15 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format,
    if (vertical_metrics) load_flags |= FT_LOAD_VERTICAL_LAYOUT;

    err = pFT_Load_Glyph(ft_face, glyph_index, load_flags);
+    if (err && !(load_flags & FT_LOAD_NO_HINTING))
+    {
+        WARN("Failed to load glyph %#x, retrying without hinting. Error %#x.\n", glyph_index, err);
+        load_flags |= FT_LOAD_NO_HINTING;
+        err = pFT_Load_Glyph(ft_face, glyph_index, load_flags);
+    }

    if(err) {
-        WARN("FT_Load_Glyph on index %x returns %d\n", glyph_index, err);
+        WARN("Failed to load glyph %#x, error %#x.\n", glyph_index, err);
        return GDI_ERROR;
    }