[cairo-commit] test/font-variations.c

Bryce Harrington bryce at kemper.freedesktop.org
Fri Jun 1 01:40:23 UTC 2018


 test/font-variations.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit ccdb8e23073ac1e27bd5fd7ea94a6c200a3e9c72
Author: Alexandre Bique <bique.alexandre at gmail.com>
Date:   Fri May 18 11:39:33 2018 +0200

    Fix test compilation when font-config is disabled
    
    Building cairo without font-config fails because test/font-variations.c
    was getting compiled without freetype2.
    
    Reviewed-by: Bryce Harrington <bryce at osg.samsung.com>

diff --git a/test/font-variations.c b/test/font-variations.c
index 7913701b5..796da743c 100644
--- a/test/font-variations.c
+++ b/test/font-variations.c
@@ -27,14 +27,17 @@
 
 #include <assert.h>
 
-#if CAIRO_HAS_FC_FONT
+// This test requires freetype2
 #include <ft2build.h>
 #include FT_FREETYPE_H
 #include FT_MULTIPLE_MASTERS_H
+
+#if CAIRO_HAS_FC_FONT
 #include <fontconfig/fontconfig.h>
-#include "cairo-ft.h"
 #endif
 
+#include "cairo-ft.h"
+
 #define FloatToFixed(f) ((FT_Fixed)((f)*65536))
 
 static cairo_test_status_t


More information about the cairo-commit mailing list