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

[GX] Fix build with older FreeType

This commit is contained in:
Behdad Esfahbod 2016-09-13 23:49:46 +02:00
parent 72873cf522
commit 42c8142531
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -346,6 +346,10 @@ if test "x$with_freetype" = "xyes" -a "x$have_freetype" != "xtrue"; then
fi fi
if $have_freetype; then if $have_freetype; then
AC_DEFINE(HAVE_FREETYPE, 1, [Have FreeType 2 library]) AC_DEFINE(HAVE_FREETYPE, 1, [Have FreeType 2 library])
save_libs=$LIBS
LIBS="$LIBS $FREETYPE_LIBS"
AC_CHECK_FUNCS(FT_Get_Var_Blend_Coordinates)
LIBS=$save_libs
fi fi
AM_CONDITIONAL(HAVE_FREETYPE, $have_freetype) AM_CONDITIONAL(HAVE_FREETYPE, $have_freetype)

12
src/hb-ft.cc
View File

@ -617,18 +617,22 @@ hb_ft_font_create (FT_Face ft_face,
ft_face->size->metrics.y_ppem); ft_face->size->metrics.y_ppem);
#endif #endif
#ifdef HAVE_FT_GET_VAR_BLEND_COORDINATES
FT_MM_Var *mm_var = NULL; FT_MM_Var *mm_var = NULL;
if (!FT_Get_MM_Var (ft_face, &mm_var)) { if (!FT_Get_MM_Var (ft_face, &mm_var))
{
FT_Fixed coords[mm_var->num_axis]; FT_Fixed coords[mm_var->num_axis];
int hbCoords[mm_var->num_axis]; int hbCoords[mm_var->num_axis];
if (!FT_Get_Var_Blend_Coordinates (ft_face, mm_var->num_axis, coords)) { if (!FT_Get_Var_Blend_Coordinates (ft_face, mm_var->num_axis, coords))
for (int i = 0; i < mm_var->num_axis; ++i) { {
for (int i = 0; i < mm_var->num_axis; ++i)
hbCoords[i] = coords[i] >> 2; hbCoords[i] = coords[i] >> 2;
}
hb_font_set_var_coords_normalized (font, hbCoords, mm_var->num_axis); hb_font_set_var_coords_normalized (font, hbCoords, mm_var->num_axis);
} }
} }
free (mm_var); free (mm_var);
#endif
return font; return font;
} }