diff options
| author | Kenichi Handa <handa@m17n.org> | 2011-12-05 16:48:29 +0900 |
|---|---|---|
| committer | Kenichi Handa <handa@m17n.org> | 2011-12-05 16:48:29 +0900 |
| commit | c3c9e25e5d2c222d9f79a503c714b48c06078c08 (patch) | |
| tree | 7ca4793321c2a2d67c235e7cf6cfb67a7e7cb2a0 /src/ftfont.c | |
| parent | 2ab04b956544fc24132cee405f93c1a757ebca56 (diff) | |
| download | emacs-c3c9e25e5d2c222d9f79a503c714b48c06078c08.tar.gz | |
ftfont.c (get_adstyle_property): If the font is not BDF nor PCF, return Qnil (Bug#8046, Bug#10193).
Diffstat (limited to 'src/ftfont.c')
| -rw-r--r-- | src/ftfont.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/ftfont.c b/src/ftfont.c index c48346b0147..ec1a4ca6a78 100644 --- a/src/ftfont.c +++ b/src/ftfont.c @@ -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; |