Merge pull request #5551 from harfbuzz/instancer-micro-opts

Instancer micro opts
This commit is contained in:
Behdad Esfahbod authored and GitHub committed 2025-09-13 17:43:30 -06:00
commit 78e5920dcc
2 files changed
+29 -16

No files matched your search

+11 -8
View File
@@ -1509,9 +1509,9 @@ struct TupleValues
int val = values.arrayZ[i];
if (val == 0)
encoded_len += encode_value_run_as_zeroes (i, encoded_bytes.sub_array (encoded_len), values);
else if (val >= -128 && val <= 127)
else if ((int8_t) val == val)
encoded_len += encode_value_run_as_bytes (i, encoded_bytes.sub_array (encoded_len), values);
else if (val >= -32768 && val <= 32767)
else if ((int16_t) val == val)
encoded_len += encode_value_run_as_words (i, encoded_bytes.sub_array (encoded_len), values);
else
encoded_len += encode_value_run_as_longs (i, encoded_bytes.sub_array (encoded_len), values);
@@ -1557,7 +1557,7 @@ struct TupleValues
while (i < num_values)
{
int val = values.arrayZ[i];
if (val > 127 || val < -128)
if ((int8_t) val != val)
break;
/* from fonttools: if there're 2 or more zeros in a sequence,
@@ -1612,15 +1612,18 @@ struct TupleValues
{
int val = values.arrayZ[i];
/* start a new run for a single zero value*/
if ((int16_t) val != val)
break;
/* start a new run for a single zero value. */
if (val == 0) break;
/* from fonttools: continue word-encoded run if there's only one
/* From fonttools: continue word-encoded run if there's only one
* single value in the range [-128, 127] because it is more compact.
* Only start a new run when there're 2 continuous such values. */
if (val >= -128 && val <= 127 &&
if ((int8_t) val == val &&
i + 1 < num_values &&
values.arrayZ[i+1] >= -128 && values.arrayZ[i+1] <= 127)
(int8_t) values.arrayZ[i+1] == values.arrayZ[i+1])
break;
i++;
@@ -1673,7 +1676,7 @@ struct TupleValues
{
int val = values.arrayZ[i];
if (val >= -32768 && val <= 32767)
if ((int16_t) val == val)
break;
i++;
+18 -8
View File
@@ -247,6 +247,7 @@ struct tuple_delta_t
tuple_delta_t () = default;
tuple_delta_t (const tuple_delta_t& o) = default;
tuple_delta_t& operator = (const tuple_delta_t& o) = default;
friend void swap (tuple_delta_t& a, tuple_delta_t& b) noexcept
{
@@ -325,13 +326,15 @@ struct tuple_delta_t
void change_tuple_var_axis_limit (hb_tag_t axis_tag, Triple axis_limit,
TripleDistances axis_triple_distances,
hb_vector_t<tuple_delta_t>& out,
rebase_tent_result_scratch_t &scratch) const
rebase_tent_result_scratch_t &scratch)
{
// May move *this out.
out.reset ();
Triple *tent;
if (!axis_tuples.has (axis_tag, &tent))
{
out.push (*this);
out.push (std::move (*this));
return;
}
@@ -341,15 +344,22 @@ struct tuple_delta_t
if (tent->middle == 0.0)
{
out.push (*this);
out.push (std::move (*this));
return;
}
rebase_tent_result_t &solutions = scratch.first;
rebase_tent (*tent, axis_limit, axis_triple_distances, solutions, scratch.second);
for (auto &t : solutions)
for (unsigned i = 0; i < solutions.length; i++)
{
tuple_delta_t new_var = *this;
auto &t = solutions.arrayZ[i];
tuple_delta_t new_var;
if (i < solutions.length - 1)
new_var = *this;
else
new_var = std::move (*this);
if (t.second == Triple ())
new_var.remove_axis (axis_tag);
else
@@ -1070,8 +1080,9 @@ struct TupleVariationData
axis_triple_distances = axes_triple_distances.get (axis_tag);
hb_vector_t<tuple_delta_t> new_vars;
for (const tuple_delta_t& var : tuple_vars)
for (tuple_delta_t& var : tuple_vars)
{
// This may move var out.
var.change_tuple_var_axis_limit (axis_tag, *axis_limit, axis_triple_distances, out, scratch);
if (!out) continue;
@@ -1822,8 +1833,7 @@ struct item_variations_t
{
int rounded_delta = roundf (tuple.deltas_x[i]);
delta_rows[start_row + i][*col_idx] += rounded_delta;
if ((!has_long) && (rounded_delta < -65536 || rounded_delta > 65535))
has_long = true;
has_long |= rounded_delta < -65536 || rounded_delta > 65535;
}
}