summaryrefslogtreecommitdiff
path: root/src/w32bdf.c
diff options
context:
space:
mode:
authorAndrew Innes <andrewi@gnu.org>2000-10-21 13:30:33 +0000
committerAndrew Innes <andrewi@gnu.org>2000-10-21 13:30:33 +0000
commit0042231086aecd834b0828865e814b509f37dfcf (patch)
tree4c78c5bb084333c1942e18cc6a4a0eded546994b /src/w32bdf.c
parentc6be38602145fbc6a7813c3cb073723a8dd55968 (diff)
downloademacs-0042231086aecd834b0828865e814b509f37dfcf.tar.gz
(w32_load_bdf_font): Call w32_cache_char_metrics.
Diffstat (limited to 'src/w32bdf.c')
-rw-r--r--src/w32bdf.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/w32bdf.c b/src/w32bdf.c
index f9a717a26a8..8008e8b4b4e 100644
--- a/src/w32bdf.c
+++ b/src/w32bdf.c
@@ -64,7 +64,7 @@ search_file_line(char *key, char *start, int len, char **val, char **next)
{
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 @@ struct font_info *w32_load_bdf_font (struct frame *f, char *fontname,
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 @@ struct font_info *w32_load_bdf_font (struct frame *f, char *fontname,
/* 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)
{