[cairo-commit] configure.ac src/cairo-ft-font.c

[Behdad Esfahbod]

 configure.ac        |    2 +-
 src/cairo-ft-font.c |    4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit c3659d7ef662b55949307ece7b1f613a7dc32620
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Jan 8 10:07:25 2018 +0000

    Use FT_Done_MM_Var() if available

diff --git a/configure.ac b/configure.ac
index 6b4ffa22d..cfda79aec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -574,7 +574,7 @@ if test "x$use_ft" = "xyes"; then
   LIBS="$LIBS $ft_LIBS"
   CFLAGS="$CFLAGS $ft_CFLAGS"
 
-  AC_CHECK_FUNCS(FT_Get_X11_Font_Format FT_GlyphSlot_Embolden FT_GlyphSlot_Oblique FT_Load_Sfnt_Table FT_Library_SetLcdFilter)
+  AC_CHECK_FUNCS(FT_Get_X11_Font_Format FT_GlyphSlot_Embolden FT_GlyphSlot_Oblique FT_Load_Sfnt_Table FT_Library_SetLcdFilter FT_Done_MM_Var)
 
   LIBS="$_save_libs"
   CFLAGS="$_save_cflags"
diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
index 36672e93b..69e12a0e5 100644
--- a/src/cairo-ft-font.c
+++ b/src/cairo-ft-font.c
@@ -2847,7 +2847,11 @@ _cairo_ft_is_synthetic (void	        *abstract_font,
 
       cleanup:
 	free (coords);
+#if HAVE_FT_DONE_MM_VAR
+	FT_Done_MM_Var (face->glyph->library, mm_var);
+#else
 	free (mm_var);
+#endif
     }
 
     _cairo_ft_unscaled_font_unlock_face (unscaled);