diff --git a/perf/benchmark-font.cc b/perf/benchmark-font.cc index 82a68028d..292f9cafb 100644 --- a/perf/benchmark-font.cc +++ b/perf/benchmark-font.cc @@ -159,9 +159,9 @@ static void test_backend (backend_t backend, char name[1024] = "BM_Font/"; strcat (name, op_name); strcat (name, strrchr (test_input.font_path, '/')); + strcat (name, variable ? "/var" : ""); strcat (name, "/"); strcat (name, backend_name); - strcat (name, variable ? "/var" : ""); benchmark::RegisterBenchmark (name, BM_Font, variable, backend, op, test_input) ->Unit(time_unit); diff --git a/src/hb-ot-cmap-table.hh b/src/hb-ot-cmap-table.hh index a287c2139..208c9f852 100644 --- a/src/hb-ot-cmap-table.hh +++ b/src/hb-ot-cmap-table.hh @@ -691,7 +691,7 @@ struct CmapSubtableTrimmed }; struct CmapSubtableFormat6 : CmapSubtableTrimmed {}; -struct CmapSubtableFormat10 : CmapSubtableTrimmed {}; +struct CmapSubtableFormat10 : CmapSubtableTrimmed {}; template struct CmapSubtableLongSegmented