From 1c7c3e50cc0b83f37af2b997d5eaba43be45556d Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Mon, 22 Sep 2025 14:36:02 -0400 Subject: [PATCH 1/3] [iup] Micro-optimize Doesn't matter. --- src/hb-subset-instancer-iup.cc | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/hb-subset-instancer-iup.cc b/src/hb-subset-instancer-iup.cc index a7cbde589..75b62651c 100644 --- a/src/hb-subset-instancer-iup.cc +++ b/src/hb-subset-instancer-iup.cc @@ -258,7 +258,7 @@ static bool _can_iup_in_between (const hb_array_t contour const contour_point_t& p1, const contour_point_t& p2, int p1_dx, int p2_dx, int p1_dy, int p2_dy, - double tolerance, + double tolerance_sq, hb_vector_t &interp_x_deltas, /* scratch */ hb_vector_t &interp_y_deltas /* scratch */) { @@ -269,7 +269,6 @@ static bool _can_iup_in_between (const hb_array_t contour unsigned num = contour_points.length; - double tolerance_sq = tolerance * tolerance; for (unsigned i = 0; i < num; i++) { double dx = static_cast (x_deltas.arrayZ[i]) - interp_x_deltas.arrayZ[i]; @@ -285,7 +284,7 @@ static bool _iup_contour_optimize_dp (const contour_point_vector_t& contour_poin const hb_vector_t& x_deltas, const hb_vector_t& y_deltas, const hb_iup_set_t& forced_set, - double tolerance, + double tolerance_sq, unsigned lookback, hb_vector_t& costs, /* OUT */ hb_vector_t& chain, /* OUT */ @@ -323,7 +322,7 @@ static bool _iup_contour_optimize_dp (const contour_point_vector_t& contour_poin contour_points.arrayZ[p1], contour_points.arrayZ[i], x_deltas.arrayZ[p1], x_deltas.arrayZ[i], y_deltas.arrayZ[p1], y_deltas.arrayZ[i], - tolerance, + tolerance_sq, interp_x_deltas_scratch, interp_y_deltas_scratch)) { best_cost = cost; @@ -420,7 +419,7 @@ static bool _iup_contour_optimize (const hb_array_t conto return false; if (!_iup_contour_optimize_dp (rot_points, rot_x_deltas, rot_y_deltas, - rot_forced_set, tolerance, n, + rot_forced_set, tolerance_sq, n, costs, chain, scratch.interp_x_deltas, scratch.interp_y_deltas)) return false; @@ -471,7 +470,7 @@ static bool _iup_contour_optimize (const hb_array_t conto } if (!_iup_contour_optimize_dp (repeat_points, repeat_x_deltas, repeat_y_deltas, - forced_set, tolerance, n, + forced_set, tolerance_sq, n, costs, chain, scratch.interp_x_deltas, scratch.interp_y_deltas)) return false; From 347716204381bd51cfcd20fcc0b8a2ed54fdacb2 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Mon, 22 Sep 2025 14:45:42 -0400 Subject: [PATCH 2/3] [iup] Add an early exit --- src/hb-subset-instancer-iup.cc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/hb-subset-instancer-iup.cc b/src/hb-subset-instancer-iup.cc index 75b62651c..784194fe4 100644 --- a/src/hb-subset-instancer-iup.cc +++ b/src/hb-subset-instancer-iup.cc @@ -184,6 +184,7 @@ static bool _iup_segment (const hb_array_t contour_points const contour_point_t& p1, const contour_point_t& p2, int p1_dx, int p2_dx, int p1_dy, int p2_dy, + double tolerance_sq, hb_vector_t& interp_x_deltas, /* OUT */ hb_vector_t& interp_y_deltas /* OUT */) { @@ -195,6 +196,7 @@ static bool _iup_segment (const hb_array_t contour_points for (unsigned j = 0; j < 2; j++) { double x1, x2, d1, d2; + const int *in; double *out; if (j == 0) { @@ -202,6 +204,7 @@ static bool _iup_segment (const hb_array_t contour_points x2 = static_cast (p2.x); d1 = p1_dx; d2 = p2_dx; + in = x_deltas.arrayZ; out = interp_x_deltas.arrayZ; } else @@ -210,6 +213,7 @@ static bool _iup_segment (const hb_array_t contour_points x2 = static_cast (p2.y); d1 = p1_dy; d2 = p2_dy; + in = y_deltas.arrayZ; out = interp_y_deltas.arrayZ; } @@ -247,6 +251,9 @@ static bool _iup_segment (const hb_array_t contour_points d = d1 + (x - x1) * scale; out[i] = d; + double err = d - in[i]; + if (err * err > tolerance_sq) + return false; } } return true; @@ -264,6 +271,7 @@ static bool _can_iup_in_between (const hb_array_t contour { if (!_iup_segment (contour_points, x_deltas, y_deltas, p1, p2, p1_dx, p2_dx, p1_dy, p2_dy, + tolerance_sq, interp_x_deltas, interp_y_deltas)) return false; From 19b026b3193a078d4fb5f0dab699b9a27d6e9c43 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Mon, 22 Sep 2025 14:48:42 -0400 Subject: [PATCH 3/3] [iup] Use a member pointer --- src/hb-subset-instancer-iup.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/hb-subset-instancer-iup.cc b/src/hb-subset-instancer-iup.cc index 784194fe4..f81ecfba8 100644 --- a/src/hb-subset-instancer-iup.cc +++ b/src/hb-subset-instancer-iup.cc @@ -195,11 +195,13 @@ static bool _iup_segment (const hb_array_t contour_points for (unsigned j = 0; j < 2; j++) { + float contour_point_t::* xp; double x1, x2, d1, d2; const int *in; double *out; if (j == 0) { + xp = &contour_point_t::x; x1 = static_cast (p1.x); x2 = static_cast (p2.x); d1 = p1_dx; @@ -209,6 +211,7 @@ static bool _iup_segment (const hb_array_t contour_points } else { + xp = &contour_point_t::y; x1 = static_cast (p1.y); x2 = static_cast (p2.y); d1 = p1_dy; @@ -241,7 +244,7 @@ static bool _iup_segment (const hb_array_t contour_points double scale = (d2 - d1) / (x2 - x1); for (unsigned i = 0; i < n; i++) { - double x = (j == 0 ? static_cast (contour_points.arrayZ[i].x) : static_cast (contour_points.arrayZ[i].y)); + double x = (double) (contour_points.arrayZ[i].*xp); double d; if (x <= x1) d = d1;