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

Mark unsed members with a "Z" suffix 

There may be more.  There are members that are by definition
redundant or reserved and not needed, NOT what we *currently*
don't use.

I'm sure there's more...
This commit is contained in:
Behdad Esfahbod 2014-06-27 17:30:59 -04:00
parent 23afcff1d1
commit 7d4ada66c9
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -110,9 +110,9 @@ typedef struct OffsetTable
protected: protected:
Tag sfnt_version; /* '\0\001\0\00' if TrueType / 'OTTO' if CFF */ Tag sfnt_version; /* '\0\001\0\00' if TrueType / 'OTTO' if CFF */
USHORT numTables; /* Number of tables. */ USHORT numTables; /* Number of tables. */
USHORT searchRange; /* (Maximum power of 2 <= numTables) x 16 */ USHORT searchRangeZ; /* (Maximum power of 2 <= numTables) x 16 */
USHORT entrySelector; /* Log2(maximum power of 2 <= numTables). */ USHORT entrySelectorZ; /* Log2(maximum power of 2 <= numTables). */
USHORT rangeShift; /* NumTables x 16-searchRange. */ USHORT rangeShiftZ; /* NumTables x 16-searchRange. */
TableRecord tables[VAR]; /* TableRecord entries. numTables items */ TableRecord tables[VAR]; /* TableRecord entries. numTables items */
public: public:
DEFINE_SIZE_ARRAY (12, tables); DEFINE_SIZE_ARRAY (12, tables);

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

@ -58,8 +58,8 @@ struct CmapSubtableFormat0
protected: protected:
USHORT format; /* Format number is set to 0. */ USHORT format; /* Format number is set to 0. */
USHORT length; /* Byte length of this subtable. */ USHORT lengthZ; /* Byte length of this subtable. */
USHORT language; /* Ignore. */ USHORT languageZ; /* Ignore. */
BYTE glyphIdArray[256];/* An array that maps character BYTE glyphIdArray[256];/* An array that maps character
* code to glyph index values. */ * code to glyph index values. */
public: public:
@ -150,11 +150,11 @@ struct CmapSubtableFormat4
USHORT format; /* Format number is set to 4. */ USHORT format; /* Format number is set to 4. */
USHORT length; /* This is the length in bytes of the USHORT length; /* This is the length in bytes of the
* subtable. */ * subtable. */
USHORT language; /* Ignore. */ USHORT languageZ; /* Ignore. */
USHORT segCountX2; /* 2 x segCount. */ USHORT segCountX2; /* 2 x segCount. */
USHORT searchRange; /* 2 * (2**floor(log2(segCount))) */ USHORT searchRangeZ; /* 2 * (2**floor(log2(segCount))) */
USHORT entrySelector; /* log2(searchRange/2) */ USHORT entrySelectorZ; /* log2(searchRange/2) */
USHORT rangeShift; /* 2 x segCount - searchRange */ USHORT rangeShiftZ; /* 2 x segCount - searchRange */
USHORT values[VAR]; USHORT values[VAR];
#if 0 #if 0
@ -217,8 +217,8 @@ struct CmapSubtableTrimmed
protected: protected:
UINT formatReserved; /* Subtable format and (maybe) padding. */ UINT formatReserved; /* Subtable format and (maybe) padding. */
UINT length; /* Byte length of this subtable. */ UINT lengthZ; /* Byte length of this subtable. */
UINT language; /* Ignore. */ UINT languageZ; /* Ignore. */
UINT startCharCode; /* First character code covered. */ UINT startCharCode; /* First character code covered. */
ArrayOf<GlyphID, UINT> ArrayOf<GlyphID, UINT>
glyphIdArray; /* Array of glyph index values for character glyphIdArray; /* Array of glyph index values for character
@ -249,9 +249,9 @@ struct CmapSubtableLongSegmented
protected: protected:
USHORT format; /* Subtable format; set to 12. */ USHORT format; /* Subtable format; set to 12. */
USHORT reserved; /* Reserved; set to 0. */ USHORT reservedZ; /* Reserved; set to 0. */
ULONG length; /* Byte length of this subtable. */ ULONG lengthZ; /* Byte length of this subtable. */
ULONG language; /* Ignore. */ ULONG languageZ; /* Ignore. */
SortedArrayOf<CmapSubtableLongGroup, ULONG> SortedArrayOf<CmapSubtableLongGroup, ULONG>
groups; /* Groupings. */ groups; /* Groupings. */
public: public:
@ -381,7 +381,7 @@ struct CmapSubtableFormat14
protected: protected:
USHORT format; /* Format number is set to 0. */ USHORT format; /* Format number is set to 0. */
ULONG length; /* Byte length of this subtable. */ ULONG lengthZ; /* Byte length of this subtable. */
SortedArrayOf<VariationSelectorRecord, ULONG> SortedArrayOf<VariationSelectorRecord, ULONG>
record; /* Variation selector records; sorted record; /* Variation selector records; sorted
* in increasing order of `varSelector'. */ * in increasing order of `varSelector'. */

2
src/hb-ot-layout-common-private.hh
View File

@ -204,7 +204,7 @@ struct LangSys
return TRACE_RETURN (c->check_struct (this) && featureIndex.sanitize (c)); return TRACE_RETURN (c->check_struct (this) && featureIndex.sanitize (c));
} }
Offset<> lookupOrder; /* = Null (reserved for an offset to a Offset<> lookupOrderZ; /* = Null (reserved for an offset to a
* reordering table) */ * reordering table) */
USHORT reqFeatureIndex;/* Index of a feature required for this USHORT reqFeatureIndex;/* Index of a feature required for this
* language system--if no required features * language system--if no required features