* ftfont.c (ftfont_shape_by_flt): Use signed integers for lengths.

diff --git a/src/ChangeLog b/src/ChangeLog
index 360027c..fdf145d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2011-06-18  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * ftfont.c (ftfont_shape_by_flt): Use signed integers for lengths.
+
        * font.c (Ffont_shape_gstring): Don't assume glyph len fits in 'int'.
 
        * fns.c (Ffillarray): Don't assume bool vector size fits in 'int'.

diff --git a/src/ftfont.c b/src/ftfont.c
index 5037d54..d1effaa 100644 (file)
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -2385,8 +2385,8 @@ static Lisp_Object
 ftfont_shape_by_flt (Lisp_Object lgstring, struct font *font,
                     FT_Face ft_face, OTF *otf, FT_Matrix *matrix)
 {
-  EMACS_UINT len = LGSTRING_GLYPH_LEN (lgstring);
-  EMACS_UINT i;
+  EMACS_INT len = LGSTRING_GLYPH_LEN (lgstring);
+  EMACS_INT i;
   struct MFLTFontFT flt_font_ft;
   MFLT *flt = NULL;
   int with_variation_selector = 0;