Commit c3c9e25e authored by Kenichi Handa's avatar Kenichi Handa

ftfont.c (get_adstyle_property): If the font is not BDF nor PCF, return Qnil (Bug#8046, Bug#10193).

parent 2ab04b95
2011-12-05 Kenichi Handa <handa@m17n.org>
* ftfont.c (get_adstyle_property): If the font is not BDF nor PCF,
return Qnil (Bug#8046, Bug#10193).
2011-12-05 Kenichi Handa <handa@m17n.org>
* coding.c (encode_designation_at_bol): New args charbuf_end and
......
......@@ -164,6 +164,13 @@ get_adstyle_property (FcPattern *p)
char *str, *end;
Lisp_Object adstyle;
#ifdef FC_FONTFORMAT
if ((FcPatternGetString (p, FC_FONTFORMAT, 0, &fcstr) == FcResultMatch)
&& (xstrcasecmp ((char *) fcstr, "bdf") != 0
|| xstrcasecmp ((char *) fcstr, "pcf") != 0))
/* Not a BDF nor PCF font. */
return Qnil;
#endif
if (FcPatternGetString (p, FC_STYLE, 0, &fcstr) != FcResultMatch)
return Qnil;
str = (char *) fcstr;
......
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