diff --git a/src/hb-ot-layout-base-table.hh b/src/hb-ot-layout-base-table.hh index 691b9db1c..059c8f718 100644 --- a/src/hb-ot-layout-base-table.hh +++ b/src/hb-ot-layout-base-table.hh @@ -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 baseTagList; - OffsetTo baseScriptList; - - public: - DEFINE_SIZE_STATIC (4); -}; - - struct BASEFormat1_1 { @@ -348,8 +327,8 @@ struct BASEFormat1_1 protected: FixedVersion<>version; - OffsetTo horizAxis; - OffsetTo vertAxis; + OffsetTo horizAxis; + OffsetTo vertAxis; LOffsetTo itemVarStore; public: @@ -369,8 +348,8 @@ struct BASEFormat1_0 protected: FixedVersion<>version; - OffsetTo horizAxis; - OffsetTo vertAxis; + OffsetTo horizAxis; + OffsetTo vertAxis; public: DEFINE_SIZE_STATIC (8);