From 72873cf522a6e3bec1b6508d8d20d3d2ce233cd6 Mon Sep 17 00:00:00 2001 From: Sascha Brawer Date: Tue, 13 Sep 2016 18:40:07 +0200 Subject: [PATCH] Call hb_font_set_var_coords_normalized() from FT_Face coords --- src/hb-ft.cc | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/hb-ft.cc b/src/hb-ft.cc index 2b06c59be..30d28c09e 100644 --- a/src/hb-ft.cc +++ b/src/hb-ft.cc @@ -36,6 +36,7 @@ #include "hb-cache-private.hh" // Maybe use in the future? #include FT_ADVANCES_H +#include FT_MULTIPLE_MASTERS_H #include FT_TRUETYPE_TABLES_H @@ -616,6 +617,19 @@ hb_ft_font_create (FT_Face ft_face, ft_face->size->metrics.y_ppem); #endif + FT_MM_Var *mm_var = NULL; + if (!FT_Get_MM_Var (ft_face, &mm_var)) { + FT_Fixed coords[mm_var->num_axis]; + int hbCoords[mm_var->num_axis]; + if (!FT_Get_Var_Blend_Coordinates (ft_face, mm_var->num_axis, coords)) { + for (int i = 0; i < mm_var->num_axis; ++i) { + hbCoords[i] = coords[i] >> 2; + } + hb_font_set_var_coords_normalized (font, hbCoords, mm_var->num_axis); + } + } + free (mm_var); + return font; }