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

BASE: more consistent naming (with spec and Harfbuzz code base)

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

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

@ -144,7 +144,7 @@ struct FeatMinMaxRecord {
}; };
struct MinMaxTable { struct MinMax {
inline bool sanitize (hb_sanitize_context_t *c) const inline bool sanitize (hb_sanitize_context_t *c) const
{ {
@ -152,17 +152,17 @@ struct MinMaxTable {
return_trace (c->check_struct (this) && return_trace (c->check_struct (this) &&
minCoord.sanitize (c, this) && minCoord.sanitize (c, this) &&
maxCoord.sanitize (c, this) && maxCoord.sanitize (c, this) &&
featMinMaxRecordTable.sanitize (c, this)); featMinMaxRecords.sanitize (c, this));
} }
protected: protected:
OffsetTo<BaseCoord> minCoord; OffsetTo<BaseCoord> minCoord;
OffsetTo<BaseCoord> maxCoord; OffsetTo<BaseCoord> maxCoord;
USHORT featMinMaxCount; USHORT featMinMaxCount;
ArrayOf<FeatMinMaxRecord> featMinMaxRecordTable; ArrayOf<FeatMinMaxRecord> featMinMaxRecords;
public: public:
DEFINE_SIZE_ARRAY (8, featMinMaxRecordTable); DEFINE_SIZE_ARRAY (8, featMinMaxRecords);
}; };
@ -177,33 +177,33 @@ struct BaseLangSysRecord {
protected: protected:
Tag baseLangSysTag; Tag baseLangSysTag;
OffsetTo<MinMaxTable> minMax; OffsetTo<MinMax> minMax;
public: public:
DEFINE_SIZE_STATIC (6); DEFINE_SIZE_STATIC (6);
}; };
struct BaseValuesTable { struct BaseValues {
inline bool sanitize (hb_sanitize_context_t *c) const inline bool sanitize (hb_sanitize_context_t *c) const
{ {
TRACE_SANITIZE (this); TRACE_SANITIZE (this);
return_trace (c->check_struct (this) && return_trace (c->check_struct (this) &&
baseCoordTable.sanitize (c, this)); baseCoords.sanitize (c, this));
} }
protected: protected:
USHORT defaultIndex; USHORT defaultIndex;
USHORT baseCoordCount; USHORT baseCoordCount;
OffsetArrayOf<BaseCoord> baseCoordTable; OffsetArrayOf<BaseCoord> baseCoords;
public: public:
DEFINE_SIZE_ARRAY (6, baseCoordTable); DEFINE_SIZE_ARRAY (6, baseCoords);
}; };
struct BaseScriptTable { struct BaseScript {
inline bool sanitize (hb_sanitize_context_t *c) const inline bool sanitize (hb_sanitize_context_t *c) const
{ {
@ -211,17 +211,17 @@ struct BaseScriptTable {
return_trace (c->check_struct (this) && return_trace (c->check_struct (this) &&
baseValues.sanitize (c, this) && baseValues.sanitize (c, this) &&
defaultMinMax.sanitize (c, this) && defaultMinMax.sanitize (c, this) &&
baseLangSysRecordTable.sanitize (c, this)); baseLangSysRecords.sanitize (c, this));
} }
protected: protected:
OffsetTo<BaseValuesTable> baseValues; OffsetTo<BaseValues> baseValues;
OffsetTo<MinMaxTable> defaultMinMax; OffsetTo<MinMax> defaultMinMax;
USHORT baseLangSysCount; USHORT baseLangSysCount;
ArrayOf<BaseLangSysRecord> baseLangSysRecordTable; ArrayOf<BaseLangSysRecord> baseLangSysRecords;
public: public:
DEFINE_SIZE_ARRAY (8, baseLangSysRecordTable); DEFINE_SIZE_ARRAY (8, baseLangSysRecords);
}; };
@ -236,7 +236,7 @@ struct BaseScriptRecord {
protected: protected:
Tag baseScriptTag; Tag baseScriptTag;
OffsetTo<BaseScriptTable> baseScript; OffsetTo<BaseScript> baseScript;
public: public:
DEFINE_SIZE_STATIC (6); DEFINE_SIZE_STATIC (6);
@ -248,15 +248,15 @@ struct BaseScriptList {
{ {
TRACE_SANITIZE (this); TRACE_SANITIZE (this);
return_trace (c->check_struct (this) && return_trace (c->check_struct (this) &&
baseScriptRecordTable.sanitize (c, this)); baseScriptRecords.sanitize (c, this));
} }
protected: protected:
USHORT baseScriptCount; USHORT baseScriptCount;
ArrayOf<BaseScriptRecord> baseScriptRecordTable; ArrayOf<BaseScriptRecord> baseScriptRecords;
public: public:
DEFINE_SIZE_ARRAY (4, baseScriptRecordTable); DEFINE_SIZE_ARRAY (4, baseScriptRecords);
}; };
@ -283,15 +283,15 @@ struct BaseTagList
{ {
TRACE_SANITIZE (this); TRACE_SANITIZE (this);
return_trace (c->check_struct (this) && return_trace (c->check_struct (this) &&
baseTagListTable.sanitize (c, this)); baselineTags.sanitize (c, this));
} }
protected: protected:
USHORT baseTagCount; USHORT baseTagCount;
ArrayOf<BaselineTag> baseTagListTable; ArrayOf<BaselineTag> baselineTags;
public: public:
DEFINE_SIZE_ARRAY (4, baseTagListTable); DEFINE_SIZE_ARRAY (4, baselineTags);
}; };
struct Axis struct Axis