changeset 32722:6385ffa62dd5

(w32_load_bdf_font): Call w32_cache_char_metrics.
author Andrew Innes <andrewi@gnu.org>
date Sat, 21 Oct 2000 13:30:33 +0000
parents 0574ffc14f77
children 58dcefea99de
files src/w32bdf.c
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/w32bdf.c	Sat Oct 21 13:29:45 2000 +0000
+++ b/src/w32bdf.c	Sat Oct 21 13:30:33 2000 +0000
@@ -64,7 +64,7 @@
     {
       if ((*start != ' ') && (*start != '\t')) break;
     }
-  linelen = p - start + 1;
+  linelen = (char *) p - start + 1;
   *next = p + 1;
   if (strncmp(start, key, min(strlen(key), linelen)) == 0)
     {
@@ -717,6 +717,7 @@
   if (!bdf_font) return NULL;
 
   font = (XFontStruct *) xmalloc (sizeof (XFontStruct));
+  bzero (font, sizeof (*font));
 
   font->bdf = bdf_font;
   font->hfont = 0;
@@ -724,6 +725,8 @@
   /* NTEMACS_TODO: Recognize DBCS fonts. */
   font->double_byte_p = 0;
 
+  w32_cache_char_metrics (font);
+
   /* Do we need to create the table?  */
   if (dpyinfo->font_table_size == 0)
     {