procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Port hbfont.c to GCC 9 with --enable-gcc-warnings

Browse source 
* src/hbfont.c (hbfont_shape): Use ptrdiff_t, not int,
for indexes that in theory might overflow int.
Add UNINIT to pacify GCC 9 and omit an unnecessary initialization.
This commit is contained in:
Paul Eggert 2019-06-01 12:07:48 -07:00
parent 7febfc5cdc
commit 0c22b52046
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/hbfont.c
View file

@ -393,8 +393,8 @@ hbfont_shape (Lisp_Object lgstring, Lisp_Object direction)
}
info = hb_buffer_get_glyph_infos (hb_buffer, NULL);
pos = hb_buffer_get_glyph_positions (hb_buffer, NULL);
int from = -1, to, cluster_offset = 0;
int char_idx, incr = buf_reversed ? -1 : 1;
ptrdiff_t from = -1, to UNINIT, cluster_offset UNINIT;
int incr = buf_reversed ? -1 : 1;
for (i = 0; i < glyph_len; i++)
{
Lisp_Object lglyph = LGSTRING_GLYPH (lgstring, i);
@ -442,7 +442,7 @@ hbfont_shape (Lisp_Object lgstring, Lisp_Object direction)
M could be smaller or greater than N. However, in many cases
there is a one-to-one correspondence, and it would be a pity
to lose that information, even if it's sometimes inaccurate. */
char_idx = from + cluster_offset;
ptrdiff_t char_idx = from + cluster_offset;
cluster_offset += incr;
if (char_idx > to)
char_idx = to;