summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBob Jamison <ishmalius@gmail.com>2006-08-11 10:00:51 +0000
committerishmal <ishmal@users.sourceforge.net>2006-08-11 10:00:51 +0000
commit8950bba715c50b092790fb1c50599b893719b4c6 (patch)
treec4adc61d01451c449791ff4301d511d888cebd5d
parentPrefer pangocairo on win32 (diff)
downloadinkscape-8950bba715c50b092790fb1c50599b893719b4c6.tar.gz
inkscape-8950bba715c50b092790fb1c50599b893719b4c6.zip
Tweak switch so that pango-cairo can be used in situations where cairo is built without freetype. Including cairo-ft.h when cairo does not have freetype (such as cairo1.2.2 on win32) will cause an error.
(bzr r1581)
-rw-r--r--src/extension/internal/pdf-cairo.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/extension/internal/pdf-cairo.cpp b/src/extension/internal/pdf-cairo.cpp
index 28ce5384a..52ca35e33 100644
--- a/src/extension/internal/pdf-cairo.cpp
+++ b/src/extension/internal/pdf-cairo.cpp
@@ -63,15 +63,15 @@
#include <cairo.h>
#include <cairo-pdf.h>
-#include <cairo-ft.h>
#include <pango/pango.h>
#include <pango/pangofc-fontmap.h>
#ifdef RENDER_WITH_PANGO_CAIRO
#include <pango/pangocairo.h>
+#else
+#include <cairo-ft.h>
#endif
-
namespace Inkscape {
namespace Extension {
namespace Internal {