From c09b799fcadd5adb7299810f48daa49e69a3d4cf Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Wed, 12 Aug 2026 18:58:26 -0600 Subject: [PATCH] [BASE] Saturate device adjustments Format-3 baseline coordinates add a device or variation delta to an already scaled coordinate. Saturate that addition at full-range font scales and deltas. Tested with: meson test -C build --print-errorlogs Assisted-by: OpenAI Codex --- src/hb-ot-layout-base-table.hh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/hb-ot-layout-base-table.hh b/src/hb-ot-layout-base-table.hh index 2470e7e2f..3c27eca58 100644 --- a/src/hb-ot-layout-base-table.hh +++ b/src/hb-ot-layout-base-table.hh @@ -109,8 +109,8 @@ struct BaseCoordFormat3 const Device &device = this+deviceTable; return HB_DIRECTION_IS_HORIZONTAL (direction) - ? font->em_scale_y (coordinate) + device.get_y_delta (font, var_store) - : font->em_scale_x (coordinate) + device.get_x_delta (font, var_store); + ? hb_saturate_add (font->em_scale_y (coordinate), device.get_y_delta (font, var_store)) + : hb_saturate_add (font->em_scale_x (coordinate), device.get_x_delta (font, var_store)); } void collect_variation_indices (hb_set_t& varidx_set /* OUT */) const