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

factorize horiz+vertAxis

This commit is contained in:
Elie Roux 2017-02-25 16:34:58 +01:00
parent 1d30c6d935
commit a0bdd546c5
1 changed files with 5 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -100,7 +100,6 @@ struct BaseCoordFormat3 {
struct BaseCoord {
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
@ -295,7 +294,7 @@ struct BaseTagList
DEFINE_SIZE_ARRAY (4, baseTagListTable);
};
struct VertAxis
struct Axis
{
inline bool sanitize (hb_sanitize_context_t *c) const
@ -314,26 +313,6 @@ struct VertAxis
DEFINE_SIZE_STATIC (4);
};
struct HorizAxis
{
inline bool sanitize (hb_sanitize_context_t *c) const
{
TRACE_SANITIZE (this);
return_trace (c->check_struct (this) &&
baseTagList.sanitize (c, this) &&
baseScriptList.sanitize (c, this));
}
protected:
OffsetTo<HorizAxis> baseTagList;
OffsetTo<VertAxis> baseScriptList;
public:
DEFINE_SIZE_STATIC (4);
};
struct BASEFormat1_1
{
@ -348,8 +327,8 @@ struct BASEFormat1_1
protected:
FixedVersion<>version;
OffsetTo<HorizAxis> horizAxis;
OffsetTo<VertAxis> vertAxis;
OffsetTo<Axis> horizAxis;
OffsetTo<Axis> vertAxis;
LOffsetTo<VariationStore> itemVarStore;
public:
@ -369,8 +348,8 @@ struct BASEFormat1_0
protected:
FixedVersion<>version;
OffsetTo<HorizAxis> horizAxis;
OffsetTo<VertAxis> vertAxis;
OffsetTo<Axis> horizAxis;
OffsetTo<Axis> vertAxis;
public:
DEFINE_SIZE_STATIC (8);