walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Chromium build fixes for C++ 17 warning and missing _remap_indexes 

Use class instead of typename, move _remap_indexes out of #ifndef.

Fixes #2979
This commit is contained in:
Dominik Röttsches 2021-05-18 12:31:14 +03:00 committed by Behdad Esfahbod
parent 89df353996
commit 1dffb55361
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/hb-ot-color-colrv1-closure.hh
View File

@ -65,25 +65,25 @@ HB_INTERNAL void PaintColrGlyph::closurev1 (hb_colrv1_closure_context_t* c) cons
(&baseglyphV1_list+baseglyphV1_record->paint).dispatch (c); (&baseglyphV1_list+baseglyphV1_record->paint).dispatch (c);
} }
template <template<typename> typename Var> template <template<typename> class Var>
HB_INTERNAL void PaintTransform<Var>::closurev1 (hb_colrv1_closure_context_t* c) const HB_INTERNAL void PaintTransform<Var>::closurev1 (hb_colrv1_closure_context_t* c) const
{ {
(this+src).dispatch (c); (this+src).dispatch (c);
} }
template <template<typename> typename Var> template <template<typename> class Var>
HB_INTERNAL void PaintTranslate<Var>::closurev1 (hb_colrv1_closure_context_t* c) const HB_INTERNAL void PaintTranslate<Var>::closurev1 (hb_colrv1_closure_context_t* c) const
{ {
(this+src).dispatch (c); (this+src).dispatch (c);
} }
template <template<typename> typename Var> template <template<typename> class Var>
HB_INTERNAL void PaintRotate<Var>::closurev1 (hb_colrv1_closure_context_t* c) const HB_INTERNAL void PaintRotate<Var>::closurev1 (hb_colrv1_closure_context_t* c) const
{ {
(this+src).dispatch (c); (this+src).dispatch (c);
} }
template <template<typename> typename Var> template <template<typename> class Var>
HB_INTERNAL void PaintSkew<Var>::closurev1 (hb_colrv1_closure_context_t* c) const HB_INTERNAL void PaintSkew<Var>::closurev1 (hb_colrv1_closure_context_t* c) const
{ {
(this+src).dispatch (c); (this+src).dispatch (c);

2
src/hb-subset-plan.cc
View File

@ -56,7 +56,6 @@ _add_cff_seac_components (const OT::cff1::accelerator_t &cff,
} }
#endif #endif
#ifndef HB_NO_SUBSET_LAYOUT
static void static void
_remap_indexes (const hb_set_t *indexes, _remap_indexes (const hb_set_t *indexes,
hb_map_t *mapping /* OUT */) hb_map_t *mapping /* OUT */)
@ -68,6 +67,7 @@ _remap_indexes (const hb_set_t *indexes,
} }
#ifndef HB_NO_SUBSET_LAYOUT
static inline void static inline void
_gsub_closure_glyphs_lookups_features (hb_face_t *face, _gsub_closure_glyphs_lookups_features (hb_face_t *face,
hb_set_t *gids_to_retain, hb_set_t *gids_to_retain,