commit 36dcc9a4327f824ccaa5751412707731504e1023
author Behdad Esfahbod <behdad@behdad.org> Wed Feb 01 17:06:15 2023 -0700
committer Behdad Esfahbod <behdad@behdad.org> Thu Feb 02 15:51:22 2023 -0700
tree 3e83194bf6548455436a0d422a1bf03e8a05590c
parent 6b3fe8ac1beeb97194e5171b5fe3873236879fdd

[ot-font] Fix emboldening CFF

src/hb-ot-font.cc

diff --git a/src/hb-ot-font.cc b/src/hb-ot-font.cc
index 6b188ee..341b4fb 100644
--- a/src/hb-ot-font.cc
+++ b/src/hb-ot-font.cc
@@ -467,13 +467,15 @@
   hb_outline_t outline;
   auto *pen = hb_outline_recording_pen_get_funcs ();
 
-  hb_draw_session_t draw_session (pen, &outline, font->slant_xy);
-  if (!font->face->table.glyf->get_path (font, glyph, draw_session))
+  { // Need draw_session to be destructed before emboldening.
+    hb_draw_session_t draw_session (pen, &outline, font->slant_xy);
+    if (!font->face->table.glyf->get_path (font, glyph, draw_session))
 #ifndef HB_NO_CFF
-  if (!font->face->table.cff1->get_path (font, glyph, draw_session))
-  if (!font->face->table.cff2->get_path (font, glyph, draw_session))
+    if (!font->face->table.cff1->get_path (font, glyph, draw_session))
+    if (!font->face->table.cff2->get_path (font, glyph, draw_session))
 #endif
-  {}
+    {}
+  }
 
   outline.embolden (font->x_shift, font->y_shift);
   outline.replay (draw_funcs, draw_data);