Commit 09a56ce4 authored by Kenichi Handa's avatar Kenichi Handa
Browse files

(ftfont_driver): Initialize ftfont_driver.type by 0.

(ftfont_font_format): Fix previous change.
parent 8bb2f20f
...@@ -278,7 +278,7 @@ static int ftfont_anchor_point P_ ((struct font *, unsigned, int, ...@@ -278,7 +278,7 @@ static int ftfont_anchor_point P_ ((struct font *, unsigned, int,
struct font_driver ftfont_driver = struct font_driver ftfont_driver =
{ {
(Lisp_Object) NULL, /* Qfreetype */ 0, /* Qfreetype */
ftfont_get_cache, ftfont_get_cache,
ftfont_list, ftfont_list,
ftfont_match, ftfont_match,
...@@ -966,7 +966,7 @@ ftfont_font_format (FcPattern *pattern) ...@@ -966,7 +966,7 @@ ftfont_font_format (FcPattern *pattern)
if (strcmp ((char *) str, "BDF") == 0) if (strcmp ((char *) str, "BDF") == 0)
return intern ("bdf"); return intern ("bdf");
#else /* not FC_FONTFORMAT */ #else /* not FC_FONTFORMAT */
if (FcPatternGetString (pattern, FC_FILE, 0, &file) != FcResultMatch) if (FcPatternGetString (pattern, FC_FILE, 0, &str) != FcResultMatch)
return Qnil; return Qnil;
if (strcasestr ((char *) str, ".ttf") == 0) if (strcasestr ((char *) str, ".ttf") == 0)
return intern ("truetype"); return intern ("truetype");
......
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