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

[aat] Towards adding two ClassTable's

This commit is contained in:
Behdad Esfahbod 2018-11-28 14:46:26 -05:00
parent 987f418772
commit 5b4a789ca8
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/hb-aat-layout-common.hh
View File

@ -363,6 +363,14 @@ struct Lookup
} }
} }
inline typename T::type get_class (hb_codepoint_t glyph_id,
unsigned int num_glyphs,
unsigned int outOfRange) const
{
const T *v = get_value (glyph_id, num_glyphs);
return v ? *v : outOfRange;
}
inline bool sanitize (hb_sanitize_context_t *c) const inline bool sanitize (hb_sanitize_context_t *c) const
{ {
TRACE_SANITIZE (this); TRACE_SANITIZE (this);
@ -638,6 +646,7 @@ struct StateTable
DEFINE_SIZE_STATIC (4 * sizeof (HBUINT)); DEFINE_SIZE_STATIC (4 * sizeof (HBUINT));
}; };
template <typename HBUCHAR>
struct ClassTable struct ClassTable
{ {
inline unsigned int get_class (hb_codepoint_t glyph_id, unsigned int outOfRange) const inline unsigned int get_class (hb_codepoint_t glyph_id, unsigned int outOfRange) const
@ -645,6 +654,12 @@ struct ClassTable
unsigned int i = glyph_id - firstGlyph; unsigned int i = glyph_id - firstGlyph;
return i >= classArray.len ? outOfRange : classArray.arrayZ[i]; return i >= classArray.len ? outOfRange : classArray.arrayZ[i];
} }
inline unsigned int get_class (hb_codepoint_t glyph_id,
unsigned int num_glyphs HB_UNUSED,
unsigned int outOfRange) const
{
return get_class (glyph_id, outOfRange);
}
inline bool sanitize (hb_sanitize_context_t *c) const inline bool sanitize (hb_sanitize_context_t *c) const
{ {
TRACE_SANITIZE (this); TRACE_SANITIZE (this);
@ -652,7 +667,7 @@ struct ClassTable
} }
protected: protected:
GlyphID firstGlyph; /* First glyph index included in the trimmed array. */ GlyphID firstGlyph; /* First glyph index included in the trimmed array. */
ArrayOf<HBUINT8> classArray; /* The class codes (indexed by glyph index minus ArrayOf<HBUCHAR> classArray; /* The class codes (indexed by glyph index minus
* firstGlyph). */ * firstGlyph). */
public: public:
DEFINE_SIZE_ARRAY (4, classArray); DEFINE_SIZE_ARRAY (4, classArray);
@ -663,15 +678,8 @@ struct ObsoleteTypes
static const bool extended = false; static const bool extended = false;
typedef HBUINT16 HBUINT; typedef HBUINT16 HBUINT;
typedef HBUINT8 HBUSHORT; typedef HBUINT8 HBUSHORT;
struct ClassType : ClassTable typedef ClassTable<HBUINT8> ClassType;
{
inline unsigned int get_class (hb_codepoint_t glyph_id,
unsigned int num_glyphs HB_UNUSED,
unsigned int outOfRange) const
{
return ClassTable::get_class (glyph_id, outOfRange);
}
};
template <typename T> template <typename T>
static inline unsigned int offsetToIndex (unsigned int offset, static inline unsigned int offsetToIndex (unsigned int offset,
const void *base, const void *base,
@ -692,16 +700,8 @@ struct ExtendedTypes
static const bool extended = true; static const bool extended = true;
typedef HBUINT32 HBUINT; typedef HBUINT32 HBUINT;
typedef HBUINT16 HBUSHORT; typedef HBUINT16 HBUSHORT;
struct ClassType : Lookup<HBUINT16> typedef Lookup<HBUINT16> ClassType;
{
inline unsigned int get_class (hb_codepoint_t glyph_id,
unsigned int num_glyphs,
unsigned int outOfRange) const
{
const HBUINT16 *v = get_value (glyph_id, num_glyphs);
return v ? *v : outOfRange;
}
};
template <typename T> template <typename T>
static inline unsigned int offsetToIndex (unsigned int offset, static inline unsigned int offsetToIndex (unsigned int offset,
const void *base, const void *base,