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

[ot] Factor out code between cmap sutable format 12 and 13

This commit is contained in:
Behdad Esfahbod 2014-05-13 21:26:34 -04:00
parent 94759e8219
commit ca7b77431d
1 changed files with 13 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/hb-ot-cmap-table.hh
View File

@ -196,7 +196,8 @@ struct CmapSubtableTrimmed
struct CmapSubtableFormat6 : CmapSubtableTrimmed<USHORT> {}; struct CmapSubtableFormat6 : CmapSubtableTrimmed<USHORT> {};
struct CmapSubtableFormat10 : CmapSubtableTrimmed<ULONG > {}; struct CmapSubtableFormat10 : CmapSubtableTrimmed<ULONG > {};
struct CmapSubtableFormat12 template <typename T>
struct CmapSubtableLongSegmented
{ {
friend struct CmapSubtable; friend struct CmapSubtable;
@ -206,8 +207,7 @@ struct CmapSubtableFormat12
int i = groups.search (codepoint); int i = groups.search (codepoint);
if (i == -1) if (i == -1)
return false; return false;
const CmapSubtableLongGroup &group = groups[i]; *glyph = T::group_get_glyph (groups[i], codepoint);
*glyph = group.glyphID + (codepoint - group.startCharCode);
return true; return true;
} }
@ -227,35 +227,18 @@ struct CmapSubtableFormat12
DEFINE_SIZE_ARRAY (16, groups); DEFINE_SIZE_ARRAY (16, groups);
}; };
struct CmapSubtableFormat13 struct CmapSubtableFormat12 : CmapSubtableLongSegmented<CmapSubtableFormat12>
{ {
friend struct CmapSubtable; static inline hb_codepoint_t group_get_glyph (const CmapSubtableLongGroup &group,
hb_codepoint_t u)
{ return group.glyphID + (u - group.startCharCode); }
};
private: struct CmapSubtableFormat13 : CmapSubtableLongSegmented<CmapSubtableFormat13>
inline bool get_glyph (hb_codepoint_t codepoint, hb_codepoint_t *glyph) const
{ {
int i = groups.search (codepoint); static inline hb_codepoint_t group_get_glyph (const CmapSubtableLongGroup &group,
if (i == -1) hb_codepoint_t u HB_UNUSED)
return false; { return group.glyphID; }
const CmapSubtableLongGroup &group = groups[i];
*glyph = group.glyphID;
return true;
}
inline bool sanitize (hb_sanitize_context_t *c) {
TRACE_SANITIZE (this);
return TRACE_RETURN (c->check_struct (this) && groups.sanitize (c));
}
protected:
USHORT format; /* Subtable format; set to 13. */
USHORT reserved; /* Reserved; set to 0. */
ULONG length; /* Byte length of this subtable. */
ULONG language; /* Ignore. */
LongArrayOf<CmapSubtableLongGroup>
groups; /* Groupings. */
public:
DEFINE_SIZE_ARRAY (16, groups);
}; };
struct CmapSubtable struct CmapSubtable