[librsvg] rsvg-cairo-[draw|clip].c: Don't unconditionally use PangoFT2 items
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg] rsvg-cairo-[draw|clip].c: Don't unconditionally use PangoFT2 items
- Date: Fri, 19 Jan 2018 09:06:50 +0000 (UTC)
commit 88867e26ec795b0d60f1f0a83dc0413565af8ede
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Wed Jan 17 11:42:58 2018 +0800
rsvg-cairo-[draw|clip].c: Don't unconditionally use PangoFT2 items
Like the rest of the code, since we may not have PangoFT2 on Windows,
only include and use these headers and fields when we do indeed have
PangoFT2.
Fixes issue #184.
rsvg-cairo-clip.c | 2 ++
rsvg-cairo-draw.c | 2 ++
2 files changed, 4 insertions(+)
---
diff --git a/rsvg-cairo-clip.c b/rsvg-cairo-clip.c
index b1905a5..c4cf980 100644
--- a/rsvg-cairo-clip.c
+++ b/rsvg-cairo-clip.c
@@ -171,8 +171,10 @@ rsvg_cairo_clip_render_new (cairo_t *cr, RsvgCairoRender *parent)
cairo_render->bb_stack = NULL;
/* We don't copy or ref the following two; we just share them */
+#ifdef HAVE_PANGO_FT2
cairo_render->font_config_for_testing = parent->font_config_for_testing;
cairo_render->font_map_for_testing = parent->font_map_for_testing;
+#endif
clip_render->parent = parent;
diff --git a/rsvg-cairo-draw.c b/rsvg-cairo-draw.c
index f16a39a..1f07061 100644
--- a/rsvg-cairo-draw.c
+++ b/rsvg-cairo-draw.c
@@ -41,7 +41,9 @@
#include <string.h>
#include <pango/pangocairo.h>
+#ifdef HAVE_PANGO_FT2
#include <pango/pangofc-fontmap.h>
+#endif
static void
_set_source_rsvg_solid_color (RsvgDrawingCtx * ctx,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]