This commit is contained in:
Behdad Esfahbod 2018-08-03 17:32:00 -07:00
parent 85ba4a190f
commit 30ff8ac865
2 changed files with 7 additions and 7 deletions

View File

@ -594,7 +594,7 @@ template <unsigned int WheresFace,
typename Subclass, typename Subclass,
typename Returned, typename Returned,
typename Stored = Returned> typename Stored = Returned>
struct hb_base_lazy_loader_t struct hb_lazy_loader_t
{ {
static_assert (WheresFace > 0, ""); static_assert (WheresFace > 0, "");
@ -657,7 +657,7 @@ struct hb_base_lazy_loader_t
/* Specializations. */ /* Specializations. */
template <unsigned int WheresFace, typename T> template <unsigned int WheresFace, typename T>
struct hb_lazy_loader_t : hb_base_lazy_loader_t<WheresFace, hb_lazy_loader_t<WheresFace, T>, T> struct hb_object_lazy_loader_t : hb_lazy_loader_t<WheresFace, hb_object_lazy_loader_t<WheresFace, T>, T>
{ {
static inline T *create (hb_face_t *face) static inline T *create (hb_face_t *face)
{ {
@ -681,7 +681,7 @@ struct hb_lazy_loader_t : hb_base_lazy_loader_t<WheresFace, hb_lazy_loader_t<Whe
}; };
template <unsigned int WheresFace, typename T> template <unsigned int WheresFace, typename T>
struct hb_table_lazy_loader_t : hb_base_lazy_loader_t<WheresFace, hb_table_lazy_loader_t<WheresFace, T>, T, hb_blob_t> struct hb_table_lazy_loader_t : hb_lazy_loader_t<WheresFace, hb_table_lazy_loader_t<WheresFace, T>, T, hb_blob_t>
{ {
static inline hb_blob_t *create (hb_face_t *face) static inline hb_blob_t *create (hb_face_t *face)
{ {

View File

@ -70,10 +70,10 @@ struct hb_ot_font_t
OT::vmtx::accelerator_t v_metrics; OT::vmtx::accelerator_t v_metrics;
hb_face_t *face; /* MUST be JUST before the lazy loaders. */ hb_face_t *face; /* MUST be JUST before the lazy loaders. */
hb_lazy_loader_t<1, OT::glyf::accelerator_t> glyf; hb_object_lazy_loader_t<1, OT::glyf::accelerator_t> glyf;
hb_lazy_loader_t<2, OT::CBDT::accelerator_t> cbdt; hb_object_lazy_loader_t<2, OT::CBDT::accelerator_t> cbdt;
hb_lazy_loader_t<3, OT::post::accelerator_t> post; hb_object_lazy_loader_t<3, OT::post::accelerator_t> post;
hb_lazy_loader_t<4, OT::kern::accelerator_t> kern; hb_object_lazy_loader_t<4, OT::kern::accelerator_t> kern;
}; };