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

[color/cbdt] Clean up

This commit is contained in:
Behdad Esfahbod 2018-03-14 15:52:53 +01:00
parent 86a0ac284f
commit 9e337341d5
1 changed files with 54 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/hb-ot-color-cbdt-table.hh
View File

@ -52,7 +52,7 @@ struct SmallGlyphMetrics
HBINT8 bearingX;
HBINT8 bearingY;
HBUINT8 advance;
public:
DEFINE_SIZE_STATIC(5);
};
@ -61,7 +61,7 @@ struct BigGlyphMetrics : SmallGlyphMetrics
HBINT8 vertBearingX;
HBINT8 vertBearingY;
HBUINT8 vertAdvance;
public:
DEFINE_SIZE_STATIC(8);
};
@ -85,7 +85,7 @@ struct SBitLineMetrics
HBINT8 minAfterBL;
HBINT8 padding1;
HBINT8 padding2;
public:
DEFINE_SIZE_STATIC(12);
};
@ -105,7 +105,7 @@ struct IndexSubtableHeader
HBUINT16 indexFormat;
HBUINT16 imageFormat;
HBUINT32 imageDataOffset;
public:
DEFINE_SIZE_STATIC(8);
};
@ -133,7 +133,7 @@ struct IndexSubtableFormat1Or3
IndexSubtableHeader header;
Offset<OffsetType> offsetArrayZ[VAR];
public:
DEFINE_SIZE_ARRAY(8, offsetArrayZ);
};
@ -214,10 +214,10 @@ struct IndexSubtableRecord
offset, length, format);
}
HBUINT16 firstGlyphIndex;
HBUINT16 lastGlyphIndex;
GlyphID firstGlyphIndex;
GlyphID lastGlyphIndex;
LOffsetTo<IndexSubtable> offsetToSubtable;
public:
DEFINE_SIZE_STATIC(8);
};
@ -250,7 +250,6 @@ struct IndexSubtableArray
protected:
IndexSubtableRecord indexSubtablesZ[VAR];
public:
DEFINE_SIZE_ARRAY(0, indexSubtablesZ);
};
@ -275,19 +274,19 @@ struct BitmapSizeTable
}
protected:
LOffsetTo<IndexSubtableArray> indexSubtableArrayOffset;
LOffsetTo<IndexSubtableArray>
indexSubtableArrayOffset;
HBUINT32 indexTablesSize;
HBUINT32 numberOfIndexSubtables;
HBUINT32 colorRef;
SBitLineMetrics horizontal;
SBitLineMetrics vertical;
HBUINT16 startGlyphIndex;
HBUINT16 endGlyphIndex;
GlyphID startGlyphIndex;
GlyphID endGlyphIndex;
HBUINT8 ppemX;
HBUINT8 ppemY;
HBUINT8 bitDepth;
HBINT8 flags;
public:
DEFINE_SIZE_STATIC(48);
};
@ -300,10 +299,9 @@ struct BitmapSizeTable
struct GlyphBitmapDataFormat17
{
SmallGlyphMetrics glyphMetrics;
HBUINT32 dataLen;
HBUINT8 dataZ[VAR];
DEFINE_SIZE_ARRAY(9, dataZ);
ArrayOf<HBUINT8, HBUINT32> data;
public:
DEFINE_SIZE_ARRAY(9, data);
};
@ -352,7 +350,6 @@ struct CBLC
protected:
FixedVersion<> version;
LArrayOf<BitmapSizeTable> sizeTables;
public:
DEFINE_SIZE_ARRAY(8, sizeTables);
};
@ -459,9 +456,8 @@ struct CBDT
protected:
FixedVersion<>version;
FixedVersion<> version;
HBUINT8 dataZ[VAR];
public:
DEFINE_SIZE_ARRAY(4, dataZ);
};