From 4bc2315e9ee39791abb683a4ba4b27e7a69d862a Mon Sep 17 00:00:00 2001 From: Jason Rumney Date: Sun, 31 Aug 2003 22:15:15 +0000 Subject: [PATCH] (w32_per_char_metric): Allow cached metrics to be returned even when font_type is unknown. --- src/ChangeLog | 3 +++ src/w32term.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index 394a6b17dd..a3cfba0480 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2003-08-31 Jason Rumney + * w32term.c (w32_per_char_metric): Allow cached metrics to be + returned even when font_type is unknown. + * xdisp.c (init_iterator): Remove old WINDOWSNT conditional. 2003-08-30 Jan Dj,Ad(Brv diff --git a/src/w32term.c b/src/w32term.c index d98f93e439..16e0f4667c 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -895,7 +895,6 @@ w32_per_char_metric (font, char2b, font_type) BOOL retval; xassert (font && char2b); - xassert (font_type != UNKNOWN_FONT); /* Handle the common cases quickly. */ if (!font->bdf && font->per_char == NULL) @@ -904,6 +903,8 @@ w32_per_char_metric (font, char2b, font_type) else if (!font->bdf && *char2b < 128) return &font->per_char[*char2b]; + xassert (font_type != UNKNOWN_FONT); + pcm = &font->scratch; if (font_type == BDF_1D_FONT) -- 2.20.1