From 1dffb553613d8bcaa5440d27b411ae1ff22bf68b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20R=C3=B6ttsches?= Date: Tue, 18 May 2021 12:31:14 +0300 Subject: [PATCH] Chromium build fixes for C++ 17 warning and missing _remap_indexes Use class instead of typename, move _remap_indexes out of #ifndef. Fixes #2979 --- src/hb-ot-color-colrv1-closure.hh | 8 ++++---- src/hb-subset-plan.cc | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/hb-ot-color-colrv1-closure.hh b/src/hb-ot-color-colrv1-closure.hh index f2920accf..4124efe0b 100644 --- a/src/hb-ot-color-colrv1-closure.hh +++ b/src/hb-ot-color-colrv1-closure.hh @@ -65,25 +65,25 @@ HB_INTERNAL void PaintColrGlyph::closurev1 (hb_colrv1_closure_context_t* c) cons (&baseglyphV1_list+baseglyphV1_record->paint).dispatch (c); } -template typename Var> +template class Var> HB_INTERNAL void PaintTransform::closurev1 (hb_colrv1_closure_context_t* c) const { (this+src).dispatch (c); } -template typename Var> +template class Var> HB_INTERNAL void PaintTranslate::closurev1 (hb_colrv1_closure_context_t* c) const { (this+src).dispatch (c); } -template typename Var> +template class Var> HB_INTERNAL void PaintRotate::closurev1 (hb_colrv1_closure_context_t* c) const { (this+src).dispatch (c); } -template typename Var> +template class Var> HB_INTERNAL void PaintSkew::closurev1 (hb_colrv1_closure_context_t* c) const { (this+src).dispatch (c); diff --git a/src/hb-subset-plan.cc b/src/hb-subset-plan.cc index be395479b..04505cb0c 100644 --- a/src/hb-subset-plan.cc +++ b/src/hb-subset-plan.cc @@ -56,7 +56,6 @@ _add_cff_seac_components (const OT::cff1::accelerator_t &cff, } #endif -#ifndef HB_NO_SUBSET_LAYOUT static void _remap_indexes (const hb_set_t *indexes, hb_map_t *mapping /* OUT */) @@ -68,6 +67,7 @@ _remap_indexes (const hb_set_t *indexes, } +#ifndef HB_NO_SUBSET_LAYOUT static inline void _gsub_closure_glyphs_lookups_features (hb_face_t *face, hb_set_t *gids_to_retain,