Commit 9cac6313 authored by Jason Rumney's avatar Jason Rumney
Browse files

(w32font_text_extents): Use w32_metric_cache consistently.

parent 639eebe2
......@@ -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
......
......@@ -432,24 +432,24 @@ w32font_text_extents (font, code, nglyphs, metrics)
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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment