diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2018-01-08 09:55:41 +0000 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2018-01-08 09:55:41 +0000 |
| commit | 94683a1255c065a7f8e7fadee9de605f3eaf9ac7 (patch) | |
| tree | cf7afd7ec80e3039e63ff3933080dabae7457788 | |
| parent | 97488fd72577a86ffd52bbb42d781bad0dd723cf (diff) | |
Use FT_Done_MM_Var if available
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/fcfreetype.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index e80479e5..391071cc 100644 --- a/configure.ac +++ b/configure.ac @@ -320,7 +320,7 @@ fontconfig_save_libs="$LIBS" fontconfig_save_cflags="$CFLAGS" LIBS="$LIBS $FREETYPE_LIBS" CFLAGS="$CFLAGS $FREETYPE_CFLAGS" -AC_CHECK_FUNCS(FT_Get_BDF_Property FT_Get_PS_Font_Info FT_Has_PS_Glyph_Names FT_Get_X11_Font_Format) +AC_CHECK_FUNCS(FT_Get_BDF_Property FT_Get_PS_Font_Info FT_Has_PS_Glyph_Names FT_Get_X11_Font_Format FT_Done_MM_Var) AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ #include <ft2build.h> diff --git a/src/fcfreetype.c b/src/fcfreetype.c index 22d651d1..4d076b77 100644 --- a/src/fcfreetype.c +++ b/src/fcfreetype.c @@ -2170,7 +2170,11 @@ skip: } while (!err && (!index_set || face_num == set_face_num) && face_num < num_faces); bail: +#ifdef HAVE_FT_DONE_MM_VAR + FT_Done_MM_Var (ftLibrary, mm_var); +#else free (mm_var); +#endif FcLangSetDestroy (ls); FcCharSetDestroy (cs); if (face) |