walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[glyf] Move read_flags into a function

This commit is contained in:
Behdad Esfahbod 2022-06-27 20:22:09 -06:00
parent 7b0fc0be53
commit 20572f914c
1 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/OT/glyf/SimpleGlyph.hh
View File

@ -117,6 +117,28 @@ struct SimpleGlyph
first_flag = (uint8_t) first_flag | FLAG_OVERLAP_SIMPLE; first_flag = (uint8_t) first_flag | FLAG_OVERLAP_SIMPLE;
} }
static bool read_flags (const HBUINT8 *&p /* IN/OUT */,
contour_point_vector_t &points_ /* IN/OUT */,
const HBUINT8 *end)
{
unsigned count = points_.length;
for (unsigned int i = 0; i < count;)
{
if (unlikely (p + 1 > end)) return false;
uint8_t flag = *p++;
points_.arrayZ[i++].flag = flag;
if (flag & FLAG_REPEAT)
{
if (unlikely (p + 1 > end)) return false;
unsigned int repeat_count = *p++;
unsigned stop = hb_min (i + repeat_count, count);
for (; i < stop;)
points_.arrayZ[i++].flag = flag;
}
}
return true;
}
static bool read_points (const HBUINT8 *&p /* IN/OUT */, static bool read_points (const HBUINT8 *&p /* IN/OUT */,
contour_point_vector_t &points_ /* IN/OUT */, contour_point_vector_t &points_ /* IN/OUT */,
const HBUINT8 *end, const HBUINT8 *end,
@ -176,24 +198,9 @@ struct SimpleGlyph
const HBUINT8 *end = (const HBUINT8 *) (bytes.arrayZ + bytes.length); const HBUINT8 *end = (const HBUINT8 *) (bytes.arrayZ + bytes.length);
if (unlikely (p >= end)) return false; if (unlikely (p >= end)) return false;
/* Read flags */
for (unsigned int i = 0; i < num_points;)
{
if (unlikely (p + 1 > end)) return false;
uint8_t flag = *p++;
points_.arrayZ[i++].flag = flag;
if (flag & FLAG_REPEAT)
{
if (unlikely (p + 1 > end)) return false;
unsigned int repeat_count = *p++;
unsigned stop = hb_min (i + repeat_count, num_points);
for (; i < stop;)
points_.arrayZ[i++].flag = flag;
}
}
/* Read x & y coordinates */ /* Read x & y coordinates */
return read_points (p, points_, end, &contour_point_t::x, return read_flags (p, points_, end)
&& read_points (p, points_, end, &contour_point_t::x,
FLAG_X_SHORT, FLAG_X_SAME) FLAG_X_SHORT, FLAG_X_SAME)
&& read_points (p, points_, end, &contour_point_t::y, && read_points (p, points_, end, &contour_point_t::y,
FLAG_Y_SHORT, FLAG_Y_SAME); FLAG_Y_SHORT, FLAG_Y_SAME);