(w32font_text_extents): Use w32_metric_cache consistently.

diff --git a/src/ChangeLog b/src/ChangeLog
index 5400f89a3e3d2ae415dce31dc638126c9e9a6d2c..f152056f5e6ace65cb7681ee7c90ad5c5fb40e40 100644 (file)
--- 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 9fdda5d7a5edcf2f11aea40e8b1295a85aa21988..ef8410915f270151b29f01494ef6c2cd68714705 100644 (file)
--- 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;