From: ishmal <ishmal@users.sourceforge.net>
Date: Fri, 11 Aug 2006 10:00:51 +0000 (+0000)
Subject: Tweak switch so that pango-cairo can be used in situations where cairo is built witho... 
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=aa0c29fa58914dd744e5940d649de4dd61d6c695;p=inkscape.git

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.
---

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 {