[Emacs-diffs] master 0eef8e9: Avoid abort in ftfont.c due to faulty fonts

[Eli Zaretskii]

branch: master
commit 0eef8e9af7707b7bd01243033b9a48cb74fb8672
Author: Werner LEMBERG <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Avoid abort in ftfont.c due to faulty fonts
    
    * src/ftfont.c (ftfont_get_metrics): Try loading the font without
    hinting, before aborting.  (Bug#25945)
---
 src/ftfont.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/ftfont.c b/src/ftfont.c
index 6cabddd..5600bde 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -1546,7 +1546,8 @@ ftfont_get_metrics (MFLTFont *font, MFLTGlyphString 
*gstring,
          {
            FT_Glyph_Metrics *m;
 
-           if (FT_Load_Glyph (ft_face, g->g.code, FT_LOAD_DEFAULT) != 0)
+           if (FT_Load_Glyph (ft_face, g->g.code, FT_LOAD_DEFAULT) != 0
+               && FT_Load_Glyph (ft_face, g->g.code, FT_LOAD_NO_HINTING) != 0)
              emacs_abort ();
            m = &ft_face->glyph->metrics;
            if (flt_font_ft->matrix)