X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fextension%2Finternal%2Fcairo-render-context.cpp;h=47d38fa1d338e6ba39526feb1bdc14b3ad8a699d;hb=74cb47e95220bd0140b3d40fd56063c73c364a0e;hp=ec0df0cdccf87cbe5301a852d4378385c0f6aa2f;hpb=5234afc9c896969b81f1ffc18291699da7960dc7;p=inkscape.git

diff --git a/src/extension/internal/cairo-render-context.cpp b/src/extension/internal/cairo-render-context.cpp
index ec0df0cdc..47d38fa1d 100644
--- a/src/extension/internal/cairo-render-context.cpp
+++ b/src/extension/internal/cairo-render-context.cpp
@@ -71,14 +71,17 @@
 #include <cairo-ps.h>
 #endif
 
+
+#ifndef PANGO_ENABLE_BACKEND
 #include <cairo-ft.h>
+#endif
 
 #include <pango/pangofc-fontmap.h>
 
 //#define TRACE(_args) g_printf _args
-#define TRACE
+#define TRACE(_args)
 //#define TEST(_args) _args
-#define TEST
+#define TEST(_args)
 
 // FIXME: expose these from sp-clippath/mask.cpp
 struct SPClipPathView {
@@ -102,19 +105,19 @@ namespace Internal {
 static cairo_status_t _write_callback(void *closure, const unsigned char *data, unsigned int length);
 
 CairoRenderContext::CairoRenderContext(CairoRenderer *parent) :
-    _renderer(parent),
-    _is_valid(FALSE),
-    _vector_based_target(FALSE),
-    _target(CAIRO_SURFACE_TYPE_IMAGE),
-    _target_format(CAIRO_FORMAT_ARGB32),
-    _clip_mode(CLIP_MODE_MASK),
-    _render_mode(RENDER_MODE_NORMAL),
     _dpi(72),
     _stream(NULL),
+    _is_valid(FALSE),
+    _vector_based_target(FALSE),
     _cr(NULL),
     _surface(NULL),
+    _target(CAIRO_SURFACE_TYPE_IMAGE),
+    _target_format(CAIRO_FORMAT_ARGB32),
     _layout(NULL),
-    _state(NULL)
+    _state(NULL),
+    _renderer(parent),
+    _render_mode(RENDER_MODE_NORMAL),
+    _clip_mode(CLIP_MODE_MASK)
 {}
 
 CairoRenderContext::~CairoRenderContext(void)
@@ -405,8 +408,8 @@ CairoRenderContext::popLayer(void)
     SPMask *mask = _state->mask;
     if (clip_path || mask) {
 
-        CairoRenderContext *clip_ctx;
-        cairo_surface_t *clip_mask;
+        CairoRenderContext *clip_ctx = 0;
+        cairo_surface_t *clip_mask = 0;
 
         if (clip_path) {
             if (_render_mode == RENDER_MODE_CLIP)
@@ -1224,8 +1227,9 @@ CairoRenderContext::_showGlyphs(cairo_t *cr, PangoFont *font, std::vector<CairoG
     unsigned int num_invalid_glyphs = 0;
     unsigned int i = 0;
     for (std::vector<CairoGlyphInfo>::const_iterator it_info = glyphtext.begin() ; it_info != glyphtext.end() ; it_info++) {
-        // skip empty or unknown glyphs
-        if (it_info->index == PANGO_GLYPH_EMPTY || it_info->index & PANGO_GLYPH_UNKNOWN_FLAG) {
+        // skip glyphs which are PANGO_GLYPH_EMPTY (0x0FFFFFFF)
+        // or have the PANGO_GLYPH_UNKNOWN_FLAG (0x10000000) set
+        if (it_info->index == 0x0FFFFFFF || it_info->index & 0x10000000) {
             TRACE(("INVALID GLYPH found\n"));
             num_invalid_glyphs++;
             continue;
@@ -1258,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);
     
@@ -1307,7 +1313,11 @@ CairoRenderContext::renderGlyphtext(PangoFont *font, NRMatrix const *font_matrix
     cairo_restore(_cr);
 
     cairo_font_face_destroy(font_face);
-    
+#else
+    (void)size;
+    (void)fc_pattern;
+#endif
+
     return true;
 }