# HG changeset patch
# User Jason Rumney <jasonr@gnu.org>
# Date 1217281051 0
# Node ID 32466fc89674cf8e9fea82f07867c994af1834a9
# Parent  d90a4395d85860a99ee83fa6cb88d9db97bfa159
(w32font_text_extents): Use w32_metric_cache consistently.

diff -r d90a4395d858 -r 32466fc89674 src/ChangeLog
--- 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
diff -r d90a4395d858 -r 32466fc89674 src/w32font.c
--- 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;