diff --git a/src/hb-ot-var-common.hh b/src/hb-ot-var-common.hh index 9df798734..2081f1b9b 100644 --- a/src/hb-ot-var-common.hh +++ b/src/hb-ot-var-common.hh @@ -360,9 +360,12 @@ struct TupleVariationData { unsigned total_size = min_size; unsigned count = tupleVarCount; - const TupleVariationHeader& tuple_var_header = get_tuple_var_header(); + const TupleVariationHeader *tuple_var_header = &(get_tuple_var_header()); for (unsigned i = 0; i < count; i++) - total_size += tuple_var_header.get_size (axis_count) + tuple_var_header.get_data_size (); + { + total_size += tuple_var_header->get_size (axis_count) + tuple_var_header->get_data_size (); + tuple_var_header = &tuple_var_header->get_next (axis_count); + } return total_size; } diff --git a/test/subset/data/expected/apply_cvar_delta/Muli-ABC.default.retain-all-codepoint.wght=300.ttf b/test/subset/data/expected/apply_cvar_delta/Muli-ABC.default.retain-all-codepoint.wght=300.ttf new file mode 100644 index 000000000..d2680eb2d Binary files /dev/null and b/test/subset/data/expected/apply_cvar_delta/Muli-ABC.default.retain-all-codepoint.wght=300.ttf differ diff --git a/test/subset/data/expected/apply_cvar_delta/Muli-ABC.default.retain-all-codepoint.wght=700.ttf b/test/subset/data/expected/apply_cvar_delta/Muli-ABC.default.retain-all-codepoint.wght=700.ttf new file mode 100644 index 000000000..d590978aa Binary files /dev/null and b/test/subset/data/expected/apply_cvar_delta/Muli-ABC.default.retain-all-codepoint.wght=700.ttf differ diff --git a/test/subset/data/fonts/Muli-ABC.ttf b/test/subset/data/fonts/Muli-ABC.ttf new file mode 100644 index 000000000..60e652039 Binary files /dev/null and b/test/subset/data/fonts/Muli-ABC.ttf differ diff --git a/test/subset/data/tests/apply_cvar_delta.tests b/test/subset/data/tests/apply_cvar_delta.tests index 931cdf89b..d19d71a5b 100644 --- a/test/subset/data/tests/apply_cvar_delta.tests +++ b/test/subset/data/tests/apply_cvar_delta.tests @@ -1,5 +1,6 @@ FONTS: Comfortaa-Regular-new.ttf +Muli-ABC.ttf PROFILES: default.txt