Next try :). Separate font and face because for initializing the face we

need a font (sounds strange, but font for use is just the callback)

1 files changed, 4 insertions, 3 deletions

diff --git a/tests/shaping/main.cpp b/tests/shaping/main.cpp
index 5823d2f..bfdbb1a 100644
--- a/tests/shaping/main.cpp
+++ b/tests/shaping/main.cpp
@@ -169,8 +169,8 @@ static bool shaping(FT_Face face, const ShapeTable *s, HB_Script script)
     hbFont.klass = &hb_fontClass;
     hbFont.userData = 0;
     hbFont.freetypeFace = face;
-    hbFont.face = 0;
-    hbFont.face = HB_NewFace(&hbFont);
+
+    HB_Face hbFace = HB_NewFace(&hbFont);
 
     HB_ShaperItem shaper_item;
     shaper_item.kerning_applied = false;
@@ -182,6 +182,7 @@ static bool shaping(FT_Face face, const ShapeTable *s, HB_Script script)
     shaper_item.item.bidiLevel = 0; // ###
     shaper_item.shaperFlags = 0;
     shaper_item.font = &hbFont;
+    shaper_item.face = hbFace;
     shaper_item.num_glyphs = shaper_item.item.length;
 
     QVarLengthArray<HB_Glyph> hb_glyphs(shaper_item.num_glyphs);
@@ -213,7 +214,7 @@ static bool shaping(FT_Face face, const ShapeTable *s, HB_Script script)
 
     }
 
-    HB_FreeFace(hbFont.face);
+    HB_FreeFace(hbFace);
 
     uint32_t nglyphs = 0;
     const unsigned short *g = s->glyphs;