From: ishmal <ishmal@users.sourceforge.net>
Date: Sun, 8 Oct 2006 03:59:41 +0000 (+0000)
Subject: Comment out cairo-ft for font rendering.  We should not need to depend on freetype... 
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=86083bbde6144a4a90cd00e9813957a3af0360f2;p=inkscape.git

Comment out cairo-ft for font rendering.  We should not need to depend on freetype, but rather Pango, since we do that for gtk2.8+ anyway.
---

diff --git a/src/extension/internal/cairo-render-context.cpp b/src/extension/internal/cairo-render-context.cpp
index a6c24c6c6..4ade7fbae 100644
--- a/src/extension/internal/cairo-render-context.cpp
+++ b/src/extension/internal/cairo-render-context.cpp
@@ -71,7 +71,10 @@
 #include <cairo-ps.h>
 #endif
 
+
+#ifndef PANGO_ENABLE_BACKEND
 #include <cairo-ft.h>
+#endif
 
 #include <pango/pangofc-fontmap.h>
 
@@ -1259,6 +1262,8 @@ CairoRenderContext::renderGlyphtext(PangoFont *font, NRMatrix const *font_matrix
     
     cairo_save(_cr);
 
+#ifndef PANGO_ENABLE_BACKEND
+
     cairo_font_face_t *font_face = cairo_ft_font_face_create_for_pattern(fc_pattern);
     cairo_set_font_face(_cr, font_face);
     
@@ -1308,7 +1313,7 @@ CairoRenderContext::renderGlyphtext(PangoFont *font, NRMatrix const *font_matrix
     cairo_restore(_cr);
 
     cairo_font_face_destroy(font_face);
-    
+#endif    
     return true;
 }