From b02c740e9d1d9669b34cac8ff093005404da41ef Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 18 Jun 2011 09:19:18 -0700 Subject: [PATCH] * ftfont.c (ftfont_shape_by_flt): Use signed integers for lengths. --- src/ChangeLog | 2 ++ src/ftfont.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 360027cfa4d..fdf145d7d95 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2011-06-18 Paul Eggert + * 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 5037d54bc2f..d1effaa88a9 100644 --- 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; -- 2.39.2