Mercurial > emacs
changeset 97070:32466fc89674
(w32font_text_extents): Use w32_metric_cache consistently.
| author | Jason Rumney <jasonr@gnu.org> |
|---|---|
| date | Mon, 28 Jul 2008 21:37:31 +0000 |
| parents | d90a4395d858 |
| children | 9c2b921ae2a4 |
| files | src/ChangeLog src/w32font.c |
| diffstat | 2 files changed, 7 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Mon Jul 28 19:51:18 2008 +0000 +++ b/src/ChangeLog Mon Jul 28 21:37:31 2008 +0000 @@ -6,6 +6,8 @@ 2008-07-28 Jason Rumney <jasonr@gnu.org> + * w32font.c (w32font_text_extents): Use w32_metric_cache consistently. + * w32term.c: (w32_enable_unicode_output, cleartype_active): Remove obsolete display options. (x_draw_glyph_string_background): Don't use old cleartype_active
--- a/src/w32font.c Mon Jul 28 19:51:18 2008 +0000 +++ b/src/w32font.c Mon Jul 28 21:37:31 2008 +0000 @@ -432,24 +432,24 @@ if (!w32_font->cached_metrics) w32_font->cached_metrics = xmalloc ((block + 1) - * sizeof (struct w32_cached_metric *)); + * sizeof (struct w32_metric_cache *)); else w32_font->cached_metrics = xrealloc (w32_font->cached_metrics, (block + 1) - * sizeof (struct w32_cached_metric *)); + * sizeof (struct w32_metric_cache *)); bzero (w32_font->cached_metrics + w32_font->n_cache_blocks, ((block + 1 - w32_font->n_cache_blocks) - * sizeof (struct w32_cached_metric *))); + * sizeof (struct w32_metric_cache *))); w32_font->n_cache_blocks = block + 1; } if (!w32_font->cached_metrics[block]) { w32_font->cached_metrics[block] - = xmalloc (CACHE_BLOCKSIZE * sizeof (struct font_metrics)); + = xmalloc (CACHE_BLOCKSIZE * sizeof (struct w32_metric_cache)); bzero (w32_font->cached_metrics[block], - CACHE_BLOCKSIZE * sizeof (struct font_metrics)); + CACHE_BLOCKSIZE * sizeof (struct w32_metric_cache)); } char_metric = w32_font->cached_metrics[block] + pos_in_block;