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

Use union for Coverage

This commit is contained in:
Behdad Esfahbod 2006-12-27 20:05:16 -05:00
parent 86f450243d
commit c46196d09c
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/harfbuzz-ng.cc
View File

@ -25,8 +25,6 @@ typedef uint32_t hb_tag_t;
*/ */
#define DEFINE_INT_TYPE1(NAME, TYPE, BIG_ENDIAN) \ #define DEFINE_INT_TYPE1(NAME, TYPE, BIG_ENDIAN) \
inline NAME (void) { v = 0; } \
explicit inline NAME (TYPE i) { v = BIG_ENDIAN(i); } \
inline NAME& operator = (TYPE i) { v = BIG_ENDIAN(i); return *this; } \ inline NAME& operator = (TYPE i) { v = BIG_ENDIAN(i); return *this; } \
inline operator TYPE(void) const { return BIG_ENDIAN(v); } \ inline operator TYPE(void) const { return BIG_ENDIAN(v); } \
inline bool operator== (NAME o) const { return v == o.v; } \ inline bool operator== (NAME o) const { return v == o.v; } \
@ -463,7 +461,8 @@ struct CoverageFormat1 {
DEFINE_ARRAY_TYPE (GlyphID, glyphArray, glyphCount); DEFINE_ARRAY_TYPE (GlyphID, glyphArray, glyphCount);
inline int get_coverage (uint16_t glyph_id) const { inline int get_coverage (uint16_t glyph_id) const {
GlyphID gid (glyph_id); GlyphID gid;
gid = glyph_id;
// TODO: bsearch // TODO: bsearch
for (int i = 0; i < glyphCount; i++) for (int i = 0; i < glyphCount; i++)
if (gid == glyphArray[i]) if (gid == glyphArray[i])
@ -511,27 +510,29 @@ struct CoverageFormat2 {
* long */ * long */
}; };
struct Coverage { union Coverage {
DEFINE_NON_INSTANTIABLE(Coverage); DEFINE_NON_INSTANTIABLE(Coverage);
inline unsigned int get_size (void) const { inline unsigned int get_size (void) const {
switch (coverageFormat) { switch (coverageFormat) {
case 1: return ((const CoverageFormat1&)*this).get_size (); case 1: return format1.get_size ();
case 2: return ((const CoverageFormat2&)*this).get_size (); case 2: return format2.get_size ();
default:return sizeof (Coverage); default:return sizeof (coverageFormat);
} }
} }
/* Returns -1 if not covered. */ /* Returns -1 if not covered. */
inline int get_coverage (uint16_t glyph_id) const { inline int get_coverage (uint16_t glyph_id) const {
switch (coverageFormat) { switch (coverageFormat) {
case 1: return ((const CoverageFormat1&)*this).get_coverage(glyph_id); case 1: return format1.get_coverage(glyph_id);
case 2: return ((const CoverageFormat2&)*this).get_coverage(glyph_id); case 2: return format2.get_coverage(glyph_id);
default:return -1; default:return -1;
} }
} }
USHORT coverageFormat; /* Format identifier */ USHORT coverageFormat; /* Format identifier */
CoverageFormat1 format1;
CoverageFormat2 format2;
}; };
/* /*