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

diff --git a/src/ChangeLog b/src/ChangeLog
index 69e3eda2630dd631cb533c4f35b8ca0dc95ddb89..d897fadd29240ae5a5c0d96b146042f0f8ec2360 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+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

diff --git a/src/ftfont.c b/src/ftfont.c
index c48346b0147d4f64083b5332d2034d8983d63a47..ec1a4ca6a78a5498f4df9aaf790310b82ec90036 100644 (file)
--- 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;