From 6c8985724e257b1525da6698bf7ce054a3dad9a5 Mon Sep 17 00:00:00 2001 From: Qunxin Liu Date: Thu, 2 May 2024 10:11:06 -0700 Subject: [PATCH] fix bots --- src/OT/Color/COLR/COLR.hh | 2 +- test/subset/data/Makefile.am | 1 - test/subset/data/Makefile.sources | 1 - test/subset/meson.build | 2 +- 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/OT/Color/COLR/COLR.hh b/src/OT/Color/COLR/COLR.hh index ecbf12b67..835d87f8c 100644 --- a/src/OT/Color/COLR/COLR.hh +++ b/src/OT/Color/COLR/COLR.hh @@ -2051,7 +2051,7 @@ struct delta_set_index_map_subset_plan_t for (unsigned idx = 0; idx < map_count; idx++) { - unsigned *var_idx; + uint32_t *var_idx; if (!new_deltaset_idx_varidx_map.has (idx, &var_idx)) return false; output_map.arrayZ[idx] = *var_idx; diff --git a/test/subset/data/Makefile.am b/test/subset/data/Makefile.am index c060ac9f0..7e02aa5c2 100644 --- a/test/subset/data/Makefile.am +++ b/test/subset/data/Makefile.am @@ -72,7 +72,6 @@ EXTRA_DIST += \ expected/post_apply_mvar_delta \ expected/apply_cvar_delta \ expected/collect_name_ids \ - expected/instantiate_colrv1 \ expected/instantiate_cff2_update_metrics \ expected/layout.empty_ligature_offset \ fonts \ diff --git a/test/subset/data/Makefile.sources b/test/subset/data/Makefile.sources index a2c3e0625..188422f18 100644 --- a/test/subset/data/Makefile.sources +++ b/test/subset/data/Makefile.sources @@ -63,7 +63,6 @@ TESTS = \ tests/post_apply_mvar_delta.tests \ tests/apply_cvar_delta.tests \ tests/collect_name_ids.tests \ - tests/instantiate_colrv1.tests \ tests/instantiate_cff2_update_metrics.tests \ tests/layout.empty_ligature_offset.tests \ $(NULL) diff --git a/test/subset/meson.build b/test/subset/meson.build index c644af159..67ae0923e 100644 --- a/test/subset/meson.build +++ b/test/subset/meson.build @@ -56,6 +56,7 @@ tests = [ '32bit_var_store', 'pin_all_at_default', 'instantiate_base', + 'instantiate_colrv1', 'instantiate_glyf', 'instantiate_cff2', 'full_instance', @@ -66,7 +67,6 @@ tests = [ 'post_apply_mvar_delta', 'apply_cvar_delta', 'collect_name_ids', - 'instantiate_colrv1', 'instantiate_cff2_update_metrics', 'layout.empty_ligature_offset', 'glyf_partial_instancing',