summaryrefslogtreecommitdiff
path: root/canvas
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-03-18 15:56:57 +0000
committerCaolán McNamara <caolanm@redhat.com>2015-03-18 16:43:26 +0000
commit27e8b3e0b02e107bdf6d84bf0db10770645045e1 (patch)
tree96b40d2b14facb488d1fc348fe2c081118a288dc /canvas
parenta5712722e78733705e6e0679ee0895085b871f18 (diff)
we don't need any xlib things here, but we do need freetype support
Change-Id: I4b3055b7a3582e8dd64599ad33b767302b101dad
Diffstat (limited to 'canvas')
-rw-r--r--canvas/source/cairo/cairo_textlayout.cxx5
1 files changed, 2 insertions, 3 deletions
diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx
index 5eef3e22f517..9b1fa47ff0d0 100644
--- a/canvas/source/cairo/cairo_textlayout.cxx
+++ b/canvas/source/cairo/cairo_textlayout.cxx
@@ -50,8 +50,7 @@
#elif defined CAIRO_HAS_WIN32_SURFACE
# include "cairo_win32_cairo.hxx"
# include <cairo-win32.h>
-#elif defined CAIRO_HAS_XLIB_SURFACE
-# include "cairo_xlib_cairo.hxx"
+#elif defined CAIRO_HAS_FT_FONT
# include <cairo-ft.h>
#else
# error Native API needed.
@@ -479,7 +478,7 @@ namespace cairocanvas
// VCL always has non-zero value for lfWidth
font_face = cairo_win32_font_face_create_for_hfont(rSysFontData.hFont);
-#elif defined CAIRO_HAS_XLIB_SURFACE
+#elif defined CAIRO_HAS_FT_FONT
font_face = cairo_ft_font_face_create_for_ft_face((FT_Face)rSysFontData.nFontId,
rSysFontData.nFontFlags);
#else