diff options
| author | Bob Jamison <ishmalius@gmail.com> | 2006-10-08 03:59:41 +0000 |
|---|---|---|
| committer | ishmal <ishmal@users.sourceforge.net> | 2006-10-08 03:59:41 +0000 |
| commit | b1679c129eddb2624b33f4798828fc415c9f8366 (patch) | |
| tree | 055e77f5ad051f6de7231098659698db9a93f8a7 /src/extension/internal/cairo-render-context.cpp | |
| parent | use the new APIs (diff) | |
| download | inkscape-b1679c129eddb2624b33f4798828fc415c9f8366.tar.gz inkscape-b1679c129eddb2624b33f4798828fc415c9f8366.zip | |
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.
(bzr r1778)
Diffstat (limited to 'src/extension/internal/cairo-render-context.cpp')
| -rw-r--r-- | src/extension/internal/cairo-render-context.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
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; } |