Commit 21110afa authored by Eli Zaretskii's avatar Eli Zaretskii
Browse files

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.
parent 6192b6c3
...@@ -1541,7 +1541,8 @@ struct glyph_string ...@@ -1541,7 +1541,8 @@ struct glyph_string
large vertical space. The heuristics is in the factor of 3. We large vertical space. The heuristics is in the factor of 3. We
ignore the ascent and descent values reported by such fonts, and ignore the ascent and descent values reported by such fonts, and
instead go by the values reported for individual glyphs. */ 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)
/*********************************************************************** /***********************************************************************
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment