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

BASE: align member's names

This commit is contained in:
Elie Roux 2017-02-25 17:08:01 +01:00
parent 499b4bef2a
commit bd15567ed6
1 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/hb-ot-layout-base-table.hh
View File

@ -57,7 +57,7 @@ struct BaseCoordFormat1 {
protected: protected:
USHORT baseCoordFormat; USHORT baseCoordFormat;
SHORT coordinate; SHORT coordinate;
public: public:
DEFINE_SIZE_STATIC (4); DEFINE_SIZE_STATIC (4);
@ -73,7 +73,7 @@ struct BaseCoordFormat2 {
protected: protected:
USHORT baseCoordFormat; USHORT baseCoordFormat;
SHORT coordinate; SHORT coordinate;
USHORT referenceGlyph; USHORT referenceGlyph;
USHORT baseCoordPoint; USHORT baseCoordPoint;
@ -90,9 +90,9 @@ struct BaseCoordFormat3 {
} }
protected: protected:
USHORT baseCoordFormat; USHORT baseCoordFormat;
SHORT coordinate; SHORT coordinate;
OffsetTo<Device> deviceTable; OffsetTo<Device> deviceTable;
public: public:
DEFINE_SIZE_STATIC (6); DEFINE_SIZE_STATIC (6);
@ -114,7 +114,7 @@ struct BaseCoord {
protected: protected:
union { union {
USHORT baseCoordFormat; USHORT baseCoordFormat;
BaseCoordFormat1 format1; BaseCoordFormat1 format1;
BaseCoordFormat2 format2; BaseCoordFormat2 format2;
BaseCoordFormat3 format3; BaseCoordFormat3 format3;
@ -135,7 +135,7 @@ struct FeatMinMaxRecord {
} }
protected: protected:
Tag featureTableTag; Tag featureTableTag;
OffsetTo<BaseCoord> minCoord; OffsetTo<BaseCoord> minCoord;
OffsetTo<BaseCoord> maxCoord; OffsetTo<BaseCoord> maxCoord;
@ -156,9 +156,9 @@ struct MinMax {
} }
protected: protected:
OffsetTo<BaseCoord> minCoord; OffsetTo<BaseCoord> minCoord;
OffsetTo<BaseCoord> maxCoord; OffsetTo<BaseCoord> maxCoord;
USHORT featMinMaxCount; USHORT featMinMaxCount;
ArrayOf<FeatMinMaxRecord> featMinMaxRecords; ArrayOf<FeatMinMaxRecord> featMinMaxRecords;
public: public:
@ -176,8 +176,8 @@ struct BaseLangSysRecord {
} }
protected: protected:
Tag baseLangSysTag; Tag baseLangSysTag;
OffsetTo<MinMax> minMax; OffsetTo<MinMax> minMax;
public: public:
DEFINE_SIZE_STATIC (6); DEFINE_SIZE_STATIC (6);
@ -194,9 +194,9 @@ struct BaseValues {
} }
protected: protected:
USHORT defaultIndex; USHORT defaultIndex;
USHORT baseCoordCount; USHORT baseCoordCount;
OffsetArrayOf<BaseCoord> baseCoords; OffsetArrayOf<BaseCoord> baseCoords;
public: public:
DEFINE_SIZE_ARRAY (6, baseCoords); DEFINE_SIZE_ARRAY (6, baseCoords);
@ -215,10 +215,10 @@ struct BaseScript {
} }
protected: protected:
OffsetTo<BaseValues> baseValues; OffsetTo<BaseValues> baseValues;
OffsetTo<MinMax> defaultMinMax; OffsetTo<MinMax> defaultMinMax;
USHORT baseLangSysCount; USHORT baseLangSysCount;
ArrayOf<BaseLangSysRecord> baseLangSysRecords; ArrayOf<BaseLangSysRecord> baseLangSysRecords;
public: public:
DEFINE_SIZE_ARRAY (8, baseLangSysRecords); DEFINE_SIZE_ARRAY (8, baseLangSysRecords);
@ -235,8 +235,8 @@ struct BaseScriptRecord {
} }
protected: protected:
Tag baseScriptTag; Tag baseScriptTag;
OffsetTo<BaseScript> baseScript; OffsetTo<BaseScript> baseScript;
public: public:
DEFINE_SIZE_STATIC (6); DEFINE_SIZE_STATIC (6);
@ -252,7 +252,7 @@ struct BaseScriptList {
} }
protected: protected:
USHORT baseScriptCount; USHORT baseScriptCount;
ArrayOf<BaseScriptRecord> baseScriptRecords; ArrayOf<BaseScriptRecord> baseScriptRecords;
public: public:
@ -287,8 +287,8 @@ struct BaseTagList
} }
protected: protected:
USHORT baseTagCount; USHORT baseTagCount;
ArrayOf<BaselineTag> baselineTags; ArrayOf<BaselineTag> baselineTags;
public: public:
DEFINE_SIZE_ARRAY (4, baselineTags); DEFINE_SIZE_ARRAY (4, baselineTags);
@ -306,8 +306,8 @@ struct Axis
} }
protected: protected:
OffsetTo<BaseTagList> baseTagList; OffsetTo<BaseTagList> baseTagList;
OffsetTo<BaseScriptList> baseScriptList; OffsetTo<BaseScriptList> baseScriptList;
public: public:
DEFINE_SIZE_STATIC (4); DEFINE_SIZE_STATIC (4);
@ -326,9 +326,9 @@ struct BASEFormat1_1
} }
protected: protected:
FixedVersion<>version; FixedVersion<> version;
OffsetTo<Axis> horizAxis; OffsetTo<Axis> horizAxis;
OffsetTo<Axis> vertAxis; OffsetTo<Axis> vertAxis;
LOffsetTo<VariationStore> itemVarStore; LOffsetTo<VariationStore> itemVarStore;
public: public:
@ -347,9 +347,9 @@ struct BASEFormat1_0
} }
protected: protected:
FixedVersion<>version; FixedVersion<> version;
OffsetTo<Axis> horizAxis; OffsetTo<Axis> horizAxis;
OffsetTo<Axis> vertAxis; OffsetTo<Axis> vertAxis;
public: public:
DEFINE_SIZE_STATIC (8); DEFINE_SIZE_STATIC (8);
@ -373,9 +373,9 @@ struct BASE
protected: protected:
union { union {
FixedVersion<>version; /* Version of the BASE table: 1.0 or 1.1 */ FixedVersion<> version; /* Version of the BASE table: 1.0 or 1.1 */
BASEFormat1_0 format1_0; BASEFormat1_0 format1_0;
BASEFormat1_1 format1_1; BASEFormat1_1 format1_1;
} u; } u;
public: public: