HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from trunk.
[bpt/emacs.git]
/
src
/
ftfont.c
diff --git
a/src/ftfont.c
b/src/ftfont.c
index
131465b
..
5545b4b
100644
(file)
--- a/
src/ftfont.c
+++ b/
src/ftfont.c
@@
-1033,13
+1033,13
@@
ftfont_list (Lisp_Object frame, Lisp_Object spec)
#endif /* HAVE_LIBOTF */
if (VECTORP (chars))
{
#endif /* HAVE_LIBOTF */
if (VECTORP (chars))
{
-
in
t j;
+
ptrdiff_
t j;
if (FcPatternGetCharSet (fontset->fonts[i], FC_CHARSET, 0, &charset)
!= FcResultMatch)
continue;
for (j = 0; j < ASIZE (chars); j++)
if (FcPatternGetCharSet (fontset->fonts[i], FC_CHARSET, 0, &charset)
!= FcResultMatch)
continue;
for (j = 0; j < ASIZE (chars); j++)
- if (
NATNUMP (
AREF (chars, j))
+ if (
TYPE_RANGED_INTEGERP (FcChar32,
AREF (chars, j))
&& FcCharSetHasChar (charset, XFASTINT (AREF (chars, j))))
break;
if (j == ASIZE (chars))
&& FcCharSetHasChar (charset, XFASTINT (AREF (chars, j))))
break;
if (j == ASIZE (chars))
@@
-2394,8
+2394,8
@@
static Lisp_Object
ftfont_shape_by_flt (Lisp_Object lgstring, struct font *font,
FT_Face ft_face, OTF *otf, FT_Matrix *matrix)
{
ftfont_shape_by_flt (Lisp_Object lgstring, struct font *font,
FT_Face ft_face, OTF *otf, FT_Matrix *matrix)
{
-
EMACS_INT
len = LGSTRING_GLYPH_LEN (lgstring);
-
EMACS_INT
i;
+
ptrdiff_t
len = LGSTRING_GLYPH_LEN (lgstring);
+
ptrdiff_t
i;
struct MFLTFontFT flt_font_ft;
MFLT *flt = NULL;
int with_variation_selector = 0;
struct MFLTFontFT flt_font_ft;
MFLT *flt = NULL;
int with_variation_selector = 0;
@@
-2423,7
+2423,7
@@
ftfont_shape_by_flt (Lisp_Object lgstring, struct font *font,
}
len = i;
}
len = i;
- lint_assume (len <=
TYPE_MAXIMUM (EMACS_INT) - 2
);
+ lint_assume (len <=
STRING_BYTES_BOUND
);
if (with_variation_selector)
{
if (with_variation_selector)
{