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

[ot] Factor out code between cmap subtable format 6 and 10

This commit is contained in:
Behdad Esfahbod 2014-05-13 21:17:28 -04:00
parent 1a8ffc5129
commit 94759e8219
1 changed files with 10 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -160,7 +160,8 @@ struct CmapSubtableLongGroup
DEFINE_SIZE_STATIC (12); DEFINE_SIZE_STATIC (12);
}; };
struct CmapSubtableFormat6 template <typename UINT>
struct CmapSubtableTrimmed
{ {
friend struct CmapSubtable; friend struct CmapSubtable;
@ -181,49 +182,19 @@ struct CmapSubtableFormat6
} }
protected: protected:
USHORT format; /* Subtable format; set to 6. */ UINT formatReserved; /* Subtable format and (maybe) padding. */
USHORT length; /* Byte length of this subtable. */ UINT length; /* Byte length of this subtable. */
USHORT language; /* Ignore. */ UINT language; /* Ignore. */
USHORT startCharCode; /* First character code covered. */ UINT startCharCode; /* First character code covered. */
ArrayOf<GlyphID> GenericArrayOf<UINT, GlyphID>
glyphIdArray; /* Array of glyph index values for character glyphIdArray; /* Array of glyph index values for character
* codes in the range. */ * codes in the range. */
public: public:
DEFINE_SIZE_ARRAY (10, glyphIdArray); DEFINE_SIZE_ARRAY (5 * sizeof (UINT), glyphIdArray);
}; };
struct CmapSubtableFormat10 struct CmapSubtableFormat6 : CmapSubtableTrimmed<USHORT> {};
{ struct CmapSubtableFormat10 : CmapSubtableTrimmed<ULONG > {};
friend struct CmapSubtable;
private:
inline bool get_glyph (hb_codepoint_t codepoint, hb_codepoint_t *glyph) const
{
/* Rely on our implicit array bound-checking. */
hb_codepoint_t gid = glyphIdArray[codepoint - startCharCode];
if (!gid)
return false;
*glyph = gid;
return true;
}
inline bool sanitize (hb_sanitize_context_t *c) {
TRACE_SANITIZE (this);
return TRACE_RETURN (c->check_struct (this) && glyphIdArray.sanitize (c));
}
protected:
USHORT format; /* Subtable format; set to 10. */
USHORT reserved; /* Reserved; set to 0. */
ULONG length; /* Byte length of this subtable. */
ULONG language; /* Ignore. */
ULONG startCharCode; /* First character code covered. */
LongArrayOf<GlyphID>
glyphIdArray; /* Array of glyph index values for character
* codes in the range. */
public:
DEFINE_SIZE_ARRAY (20, glyphIdArray);
};
struct CmapSubtableFormat12 struct CmapSubtableFormat12
{ {