This commit is contained in:
Behdad Esfahbod 2018-12-13 16:40:01 -05:00
parent cc65901ca7
commit 6e33a3955d
3 changed files with 14 additions and 9 deletions

View File

@ -655,10 +655,16 @@ struct Supplier
len = len_;
stride = stride_;
}
inline Supplier (const hb_vector_t<Type> *v)
inline Supplier (hb_array_t<const Type> v)
{
head = (const Type *) *v;
len = v->len;
head = v.arrayZ;
len = v.len;
stride = sizeof (Type);
}
inline Supplier (const hb_vector_t<Type> &v)
{
head = (const Type *) v;
len = v.len;
stride = sizeof (Type);
}

View File

@ -495,8 +495,7 @@ struct CmapSubtableLongSegmented
{
TRACE_SERIALIZE (this);
if (unlikely (!c->extend_min (*this))) return_trace (false);
Supplier<CmapSubtableLongGroup> supplier ((const OT::CmapSubtableLongGroup*) group_data,
group_data.len);
Supplier<CmapSubtableLongGroup> supplier (group_data);
if (unlikely (!groups.serialize (c, supplier, group_data.len))) return_trace (false);
return true;
}

View File

@ -123,8 +123,8 @@ struct SingleSubstFormat1
}
c->serializer->err (from.in_error () || to.in_error ());
Supplier<GlyphID> from_supplier (&from);
Supplier<GlyphID> to_supplier (&to);
Supplier<GlyphID> from_supplier (from);
Supplier<GlyphID> to_supplier (to);
SingleSubst_serialize (c->serializer,
from_supplier,
to_supplier,
@ -229,8 +229,8 @@ struct SingleSubstFormat2
}
c->serializer->err (from.in_error () || to.in_error ());
Supplier<GlyphID> from_supplier (&from);
Supplier<GlyphID> to_supplier (&to);
Supplier<GlyphID> from_supplier (from);
Supplier<GlyphID> to_supplier (to);
SingleSubst_serialize (c->serializer,
from_supplier,
to_supplier,