(w32font_text_extents): Use w32_metric_cache consistently.

2 files changed, 7 insertions, 5 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 5400f89a3e3..f152056f5e6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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 --git a/src/w32font.c b/src/w32font.c
index 9fdda5d7a5e..ef8410915f2 100644
--- a/src/w32font.c
+++ b/src/w32font.c
@@ -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;