Avoid assertion violations when rendering some fonts

* src/dispextern.h (FONT_TOO_HIGH): Don't consider a font "too
high" if its pixel_size value is zero.  This avoids assertion
violations at the end of x_produce_glyphs.
This commit is contained in:
Eli Zaretskii 2016-06-29 19:14:58 +03:00
parent 6192b6c3a4
commit 21110afa2c

View file

@ -1541,7 +1541,8 @@ struct glyph_string
large vertical space. The heuristics is in the factor of 3. We
ignore the ascent and descent values reported by such fonts, and
instead go by the values reported for individual glyphs. */
#define FONT_TOO_HIGH(ft) ((ft)->ascent + (ft)->descent > 3*(ft)->pixel_size)
#define FONT_TOO_HIGH(ft) \
((ft)->pixel_size > 0 && (ft)->ascent + (ft)->descent > 3*(ft)->pixel_size)
/***********************************************************************