# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1164802647 0
# Node ID 444b40002533a51b136d1de5f8c7a0aa88788350
# Parent  46ca345eec0b024bf256a0560b66e16499798a55
(ftfont_driver): Initialize ftfont_driver.type by 0.
(ftfont_font_format): Fix previous change.

diff -r 46ca345eec0b -r 444b40002533 src/ftfont.c
--- a/src/ftfont.c	Wed Nov 29 12:10:30 2006 +0000
+++ b/src/ftfont.c	Wed Nov 29 12:17:27 2006 +0000
@@ -278,7 +278,7 @@
 
 struct font_driver ftfont_driver =
   {
-    (Lisp_Object) NULL,		/* Qfreetype */
+    0,				/* Qfreetype */
     ftfont_get_cache,
     ftfont_list,
     ftfont_match,
@@ -966,7 +966,7 @@
   if (strcmp ((char *) str, "BDF") == 0)  
     return intern ("bdf");
 #else  /* not FC_FONTFORMAT */
-  if (FcPatternGetString (pattern, FC_FILE, 0, &file) != FcResultMatch)
+  if (FcPatternGetString (pattern, FC_FILE, 0, &str) != FcResultMatch)
     return Qnil;
   if (strcasestr ((char *) str, ".ttf") == 0)
     return intern ("truetype");