From 8ccebae1f96d66c2c0a50361e5db3733b8d81271 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Fri, 15 Mar 2024 10:53:25 -0600 Subject: [PATCH] [TupleVariations] Simplify encode API --- src/hb-ot-var-common.hh | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/hb-ot-var-common.hh b/src/hb-ot-var-common.hh index 483436ae0..b865d586e 100644 --- a/src/hb-ot-var-common.hh +++ b/src/hb-ot-var-common.hh @@ -754,8 +754,7 @@ struct tuple_delta_t if (unlikely (!compiled_deltas.resize (alloc_len))) return false; - unsigned i = 0; - unsigned encoded_len = encode_delta_run (i, compiled_deltas, rounded_deltas); + unsigned encoded_len = encode_delta_run (compiled_deltas, rounded_deltas); if (y_deltas) { @@ -772,19 +771,17 @@ struct tuple_delta_t } if (j != rounded_deltas.length) return false; - /* reset i because we reuse rounded_deltas for y_deltas */ - i = 0; - encoded_len += encode_delta_run (i, compiled_deltas.as_array ().sub_array (encoded_len), rounded_deltas); + encoded_len += encode_delta_run (compiled_deltas.as_array ().sub_array (encoded_len), rounded_deltas); } return compiled_deltas.resize (encoded_len); } - static unsigned encode_delta_run (unsigned& i, - hb_array_t encoded_bytes, + static unsigned encode_delta_run (hb_array_t encoded_bytes, hb_array_t deltas) { unsigned num_deltas = deltas.length; unsigned encoded_len = 0; + unsigned i = 0; while (i < num_deltas) { int val = deltas.arrayZ[i];