(font_fill_lglyph_metrics): Use EMACS_INT in LGLYPH_SET_CODE to avoid

compiler warnings.

(font_fill_lglyph_metrics): Use EMACS_INT in LGLYPH_SET_CODE to avoid
compiler warnings.
f62ab7c5 · Eli Zaretskii · 39824137 · f62ab7c5
Commit f62ab7c5 authored Aug 29, 2008 by Eli Zaretskii
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

src/font.c src/font.c +5 -2

No files found.
--- a/src/font.c
+++ b/src/font.c
@@ -4195,10 +4195,13 @@ font_fill_lglyph_metrics (glyph, font_object)
     Lisp_Object glyph, font_object;
 {
  struct font *font = XFONT_OBJECT (font_object);
-  unsigned code = font->driver->encode_char (font, LGLYPH_CHAR (glyph));
+  unsigned code;
+  /* ecode used in LGLYPH_SET_CODE to avoid compiler warnings.  */
+  EMACS_INT ecode = font->driver->encode_char (font, LGLYPH_CHAR (glyph));
  struct font_metrics metrics;

-  LGLYPH_SET_CODE (glyph, code);
+  LGLYPH_SET_CODE (glyph, ecode);
+  code = ecode;
  font->driver->text_extents (font, &code, 1, &metrics);
  LGLYPH_SET_LBEARING (glyph, metrics.lbearing);
  LGLYPH_SET_RBEARING (glyph, metrics.rbearing);