walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[ft] Pass design, not normalized, coords to freetype 

Needed for avar2 to work.
This commit is contained in:
Behdad Esfahbod 2022-07-23 13:25:54 -06:00
parent 473a5e5651
commit 61d0c54701
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/hb-ft.cc
View File

@ -177,15 +177,15 @@ static void _hb_ft_hb_font_changed (hb_font_t *font, FT_Face ft_face)
#if defined(HAVE_FT_GET_VAR_BLEND_COORDINATES) && !defined(HB_NO_VAR) #if defined(HAVE_FT_GET_VAR_BLEND_COORDINATES) && !defined(HB_NO_VAR)
unsigned int num_coords; unsigned int num_coords;
const int *coords = hb_font_get_var_coords_normalized (font, &num_coords); const float *coords = hb_font_get_var_coords_design (font, &num_coords);
if (num_coords) if (num_coords)
{ {
FT_Fixed *ft_coords = (FT_Fixed *) hb_calloc (num_coords, sizeof (FT_Fixed)); FT_Fixed *ft_coords = (FT_Fixed *) hb_calloc (num_coords, sizeof (FT_Fixed));
if (ft_coords) if (ft_coords)
{ {
for (unsigned int i = 0; i < num_coords; i++) for (unsigned int i = 0; i < num_coords; i++)
ft_coords[i] = coords[i] * 4; ft_coords[i] = coords[i] * 65536.f;
FT_Set_Var_Blend_Coordinates (ft_face, num_coords, ft_coords); FT_Set_Var_Design_Coordinates (ft_face, num_coords, ft_coords);
hb_free (ft_coords); hb_free (ft_coords);
} }
} }

6
util/helper-cairo-ft.hh
View File

@ -82,15 +82,15 @@ helper_cairo_create_ft_font_face (const font_options_t *font_opts)
{ {
#if !defined(HB_NO_VAR) && defined(HAVE_FT_SET_VAR_BLEND_COORDINATES) #if !defined(HB_NO_VAR) && defined(HAVE_FT_SET_VAR_BLEND_COORDINATES)
unsigned int num_coords; unsigned int num_coords;
const int *coords = hb_font_get_var_coords_normalized (font_opts->font, &num_coords); const float *coords = hb_font_get_var_coords_design (font_opts->font, &num_coords);
if (num_coords) if (num_coords)
{ {
FT_Fixed *ft_coords = (FT_Fixed *) calloc (num_coords, sizeof (FT_Fixed)); FT_Fixed *ft_coords = (FT_Fixed *) calloc (num_coords, sizeof (FT_Fixed));
if (ft_coords) if (ft_coords)
{ {
for (unsigned int i = 0; i < num_coords; i++) for (unsigned int i = 0; i < num_coords; i++)
ft_coords[i] = coords[i] << 2; ft_coords[i] = coords[i] * 65536.f;
FT_Set_Var_Blend_Coordinates (ft_face, num_coords, ft_coords); FT_Set_Var_Design_Coordinates (ft_face, num_coords, ft_coords);
free (ft_coords); free (ft_coords);
} }
} }