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

Rename TableDirectory to TableRecord as per OpenType 1.6

This commit is contained in:
Behdad Esfahbod 2010-12-14 23:51:29 -05:00
parent 33e8b86197
commit 22c537657c
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/hb-open-file-private.hh
View File

@ -48,7 +48,7 @@ struct OffsetTable;
struct TTCHeader; struct TTCHeader;
typedef struct TableDirectory typedef struct TableRecord
{ {
inline bool sanitize (hb_sanitize_context_t *c) { inline bool sanitize (hb_sanitize_context_t *c) {
TRACE_SANITIZE (); TRACE_SANITIZE ();
@ -70,10 +70,10 @@ typedef struct OffsetTable
inline unsigned int get_table_count (void) const inline unsigned int get_table_count (void) const
{ return numTables; } { return numTables; }
inline const TableDirectory& get_table (unsigned int i) const inline const TableRecord& get_table (unsigned int i) const
{ {
if (unlikely (i >= numTables)) return Null(TableDirectory); if (unlikely (i >= numTables)) return Null(TableRecord);
return tableDir[i]; return tables[i];
} }
inline bool find_table_index (hb_tag_t tag, unsigned int *table_index) const inline bool find_table_index (hb_tag_t tag, unsigned int *table_index) const
{ {
@ -82,7 +82,7 @@ typedef struct OffsetTable
unsigned int count = numTables; unsigned int count = numTables;
for (unsigned int i = 0; i < count; i++) for (unsigned int i = 0; i < count; i++)
{ {
if (t == tableDir[i].tag) if (t == tables[i].tag)
{ {
if (table_index) *table_index = i; if (table_index) *table_index = i;
return true; return true;
@ -91,7 +91,7 @@ typedef struct OffsetTable
if (table_index) *table_index = Index::NOT_FOUND_INDEX; if (table_index) *table_index = Index::NOT_FOUND_INDEX;
return false; return false;
} }
inline const TableDirectory& get_table_by_tag (hb_tag_t tag) const inline const TableRecord& get_table_by_tag (hb_tag_t tag) const
{ {
unsigned int table_index; unsigned int table_index;
find_table_index (tag, &table_index); find_table_index (tag, &table_index);
@ -102,7 +102,7 @@ typedef struct OffsetTable
inline bool sanitize (hb_sanitize_context_t *c) { inline bool sanitize (hb_sanitize_context_t *c) {
TRACE_SANITIZE (); TRACE_SANITIZE ();
return c->check_struct (this) return c->check_struct (this)
&& c->check_array (tableDir, TableDirectory::static_size, numTables); && c->check_array (tables, TableRecord::static_size, numTables);
} }
private: private:
@ -111,9 +111,9 @@ typedef struct OffsetTable
USHORT searchRange; /* (Maximum power of 2 <= numTables) x 16 */ USHORT searchRange; /* (Maximum power of 2 <= numTables) x 16 */
USHORT entrySelector; /* Log2(maximum power of 2 <= numTables). */ USHORT entrySelector; /* Log2(maximum power of 2 <= numTables). */
USHORT rangeShift; /* NumTables x 16-searchRange. */ USHORT rangeShift; /* NumTables x 16-searchRange. */
TableDirectory tableDir[VAR]; /* TableDirectory entries. numTables items */ TableRecord tables[VAR]; /* TableRecord entries. numTables items */
public: public:
DEFINE_SIZE_ARRAY (12, tableDir); DEFINE_SIZE_ARRAY (12, tables);
} OpenTypeFontFace; } OpenTypeFontFace;