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

Rename add_class to collect_class

This commit is contained in:
Behdad Esfahbod 2020-04-23 10:57:30 -07:00
parent 5cf53c06e6
commit 89ad3c6cc5
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/hb-ot-layout-common.hh
View File

@ -1719,7 +1719,7 @@ struct ClassDefFormat1
} }
template <typename set_t> template <typename set_t>
bool add_class (set_t *glyphs, unsigned int klass) const bool collect_class (set_t *glyphs, unsigned int klass) const
{ {
unsigned int count = classValue.len; unsigned int count = classValue.len;
for (unsigned int i = 0; i < count; i++) for (unsigned int i = 0; i < count; i++)
@ -1879,7 +1879,7 @@ struct ClassDefFormat2
} }
template <typename set_t> template <typename set_t>
bool add_class (set_t *glyphs, unsigned int klass) const bool collect_class (set_t *glyphs, unsigned int klass) const
{ {
unsigned int count = rangeRecord.len; unsigned int count = rangeRecord.len;
for (unsigned int i = 0; i < count; i++) for (unsigned int i = 0; i < count; i++)
@ -2036,11 +2036,11 @@ struct ClassDef
/* Might return false if array looks unsorted. /* Might return false if array looks unsorted.
* Used for faster rejection of corrupt data. */ * Used for faster rejection of corrupt data. */
template <typename set_t> template <typename set_t>
bool add_class (set_t *glyphs, unsigned int klass) const bool collect_class (set_t *glyphs, unsigned int klass) const
{ {
switch (u.format) { switch (u.format) {
case 1: return u.format1.add_class (glyphs, klass); case 1: return u.format1.collect_class (glyphs, klass);
case 2: return u.format2.add_class (glyphs, klass); case 2: return u.format2.collect_class (glyphs, klass);
default:return false; default:return false;
} }
} }

2
src/hb-ot-layout-gdef-table.hh
View File

@ -464,7 +464,7 @@ struct GDEF
unsigned int get_glyph_class (hb_codepoint_t glyph) const unsigned int get_glyph_class (hb_codepoint_t glyph) const
{ return (this+glyphClassDef).get_class (glyph); } { return (this+glyphClassDef).get_class (glyph); }
void get_glyphs_in_class (unsigned int klass, hb_set_t *glyphs) const void get_glyphs_in_class (unsigned int klass, hb_set_t *glyphs) const
{ (this+glyphClassDef).add_class (glyphs, klass); } { (this+glyphClassDef).collect_class (glyphs, klass); }
bool has_mark_attachment_types () const { return markAttachClassDef != 0; } bool has_mark_attachment_types () const { return markAttachClassDef != 0; }
unsigned int get_mark_attachment_type (hb_codepoint_t glyph) const unsigned int get_mark_attachment_type (hb_codepoint_t glyph) const

2
src/hb-ot-layout-gsubgpos.hh
View File

@ -810,7 +810,7 @@ static inline void collect_glyph (hb_set_t *glyphs, const HBUINT16 &value, const
static inline void collect_class (hb_set_t *glyphs, const HBUINT16 &value, const void *data) static inline void collect_class (hb_set_t *glyphs, const HBUINT16 &value, const void *data)
{ {
const ClassDef &class_def = *reinterpret_cast<const ClassDef *>(data); const ClassDef &class_def = *reinterpret_cast<const ClassDef *>(data);
class_def.add_class (glyphs, value); class_def.collect_class (glyphs, value);
} }
static inline void collect_coverage (hb_set_t *glyphs, const HBUINT16 &value, const void *data) static inline void collect_coverage (hb_set_t *glyphs, const HBUINT16 &value, const void *data)
{ {