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

Extract glyf offset calculation into it's own method.

This commit is contained in:
Garret Rieger 2018-02-07 10:55:30 -08:00 committed by Behdad Esfahbod
parent 6d7c6e19dc
commit 05d65baa1b
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/hb-ot-glyf-table.hh
View File

@ -122,27 +122,37 @@ struct glyf
hb_blob_destroy (glyf_blob); hb_blob_destroy (glyf_blob);
} }
inline bool get_extents (hb_codepoint_t glyph, inline bool get_offsets (hb_codepoint_t glyph,
hb_glyph_extents_t *extents) const unsigned int *start_offset /* OUT */,
unsigned int *end_offset /* OUT */) const
{ {
if (unlikely (glyph >= num_glyphs)) if (unlikely (glyph >= num_glyphs))
return false; return false;
unsigned int start_offset, end_offset;
if (short_offset) if (short_offset)
{ {
const HBUINT16 *offsets = (const HBUINT16 *) loca_table->dataX; const HBUINT16 *offsets = (const HBUINT16 *) loca_table->dataX;
start_offset = 2 * offsets[glyph]; *start_offset = 2 * offsets[glyph];
end_offset = 2 * offsets[glyph + 1]; *end_offset = 2 * offsets[glyph + 1];
} }
else else
{ {
const HBUINT32 *offsets = (const HBUINT32 *) loca_table->dataX; const HBUINT32 *offsets = (const HBUINT32 *) loca_table->dataX;
start_offset = offsets[glyph]; *start_offset = offsets[glyph];
end_offset = offsets[glyph + 1]; *end_offset = offsets[glyph + 1];
} }
if (start_offset > end_offset || end_offset > glyf_len) if (*start_offset > *end_offset || *end_offset > glyf_len)
return false;
return true;
}
inline bool get_extents (hb_codepoint_t glyph,
hb_glyph_extents_t *extents) const
{
unsigned int start_offset, end_offset;
if (!get_offsets (glyph, &start_offset, &end_offset))
return false; return false;
if (end_offset - start_offset < GlyphHeader::static_size) if (end_offset - start_offset < GlyphHeader::static_size)