diff --git a/src/hb-aat-var-hvgl-table.hh b/src/hb-aat-var-hvgl-table.hh index f542858ab..7bbf1f4cc 100644 --- a/src/hb-aat-var-hvgl-table.hh +++ b/src/hb-aat-var-hvgl-table.hh @@ -16,7 +16,7 @@ namespace AAT { using namespace OT; -namespace hvgl { +namespace hvgl_impl { struct coordinates_t { @@ -415,6 +415,8 @@ struct IndexOf : Index using PartsIndex = IndexOf; +} // namespace hvgl_impl + struct hvgl { public: @@ -425,7 +427,7 @@ struct hvgl if (unlikely (!c->check_struct (this))) return_trace (false); hb_barrier (); - const auto &parts = StructAtOffset (this, partsOff); + const auto &parts = StructAtOffset (this, partsOff); if (unlikely (!parts.sanitize (c, (unsigned) partCount))) return_trace (false); return_trace (true); @@ -443,7 +445,6 @@ struct hvgl DEFINE_SIZE_STATIC (24); }; -} // namespace hvgl } // namespace AAT #endif // HB_NO_VAR_HVF diff --git a/src/hb-ot-face-table-list.hh b/src/hb-ot-face-table-list.hh index 97825f4d1..03e7d2d2a 100644 --- a/src/hb-ot-face-table-list.hh +++ b/src/hb-ot-face-table-list.hh @@ -132,6 +132,9 @@ HB_OT_TABLE (AAT, trak) HB_OT_TABLE (AAT, ltag) HB_OT_TABLE (AAT, feat) // HB_OT_TABLE (AAT, opbd) +#ifndef HB_NO_VAR_HVF +HB_OT_CORE_TABLE (AAT, hvgl) +#endif #endif /* OpenType color fonts. */