diff --git a/src/OT/Layout/GPOS/CursivePosFormat1.hh b/src/OT/Layout/GPOS/CursivePosFormat1.hh index 271511d3e..915f3a4b2 100644 --- a/src/OT/Layout/GPOS/CursivePosFormat1.hh +++ b/src/OT/Layout/GPOS/CursivePosFormat1.hh @@ -293,7 +293,7 @@ struct CursivePosFormat1_2 const struct CursivePosFormat1_2 *src_base) { if (unlikely (!c->serializer->extend_min ((*this)))) return; - this->format = 1; + this->format = src_base->format; this->entryExitRecord.len = it.len (); for (const EntryExitRecord& entry_record : + it @@ -316,13 +316,13 @@ struct CursivePosFormat1_2 auto *out = c->serializer->start_embed (*this); - auto it = - + hb_zip (this+coverage, entryExitRecord) - | hb_filter (glyphset, hb_first) - | hb_map_retains_sorting ([&] (hb_pair_t&> p) - -> hb_pair_t&> - { return hb_pair (glyph_map[p.first], p.second);}) - ; + auto it = + + hb_zip (this+coverage, entryExitRecord) + | hb_filter (glyphset, hb_first) + | hb_map_retains_sorting ([&] (hb_pair_t&> p) + -> hb_pair_t&> + { return hb_pair (glyph_map[p.first], p.second);}) + ; bool ret = bool (it); out->serialize (c, it, this); diff --git a/src/OT/Layout/types.hh b/src/OT/Layout/types.hh index 299c09457..0c31c7972 100644 --- a/src/OT/Layout/types.hh +++ b/src/OT/Layout/types.hh @@ -61,7 +61,7 @@ struct MediumTypes { using HBUINT = HBUINT24; using HBGlyphID = HBGlyphID24; using Offset = Offset24; - /* Long offsets for large tables. */ + /* Long offsets for large tables. */ using LOffset = Offset32; template using OffsetTo = OT::Offset24To;