[cairo] [PATCH] Fix test compilation when font-config is disabled

[Alexandre Bique]

Hi,

Building cairo without font-config fails because test/font-variations.c
does not build.

Here is the fix.

Regards,
Alex.

--- test/font-variations.c 2018-05-18 11:24:02.727369293 +0200
+++ test/font-variations.c 2018-05-18 11:32:53.597510618 +0200
@@ -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

[Bryce Harrington]

Post by Alexandre Bique
Hi,
Building cairo without font-config fails because test/font-variations.c
does not build.
Here is the fix.
Regards,
Alex.

Note Cairo uses C-style comments rather than C++, but I fixed that
locally. Thanks for the patch, applied:

To ssh://git.freedesktop.org/git/cairo
c6e12d3..ccdb8e2 master -> master

Post by Alexandre Bique
--- test/font-variations.c 2018-05-18 11:24:02.727369293 +0200
+++ test/font-variations.c 2018-05-18 11:32:53.597510618 +0200
@@ -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
--
Alexandre Bique
--
cairo mailing list
https://lists.cairographics.org/mailman/listinfo/cairo