diff options
| author | miklosh <miklosh@users.sourceforge.net> | 2006-08-06 21:36:46 +0000 |
|---|---|---|
| committer | miklosh <miklosh@users.sourceforge.net> | 2006-08-06 21:36:46 +0000 |
| commit | 67553bebfbb213b1b68671d80f56893acdc287bb (patch) | |
| tree | cf33e6096e6a5282ab7644b49a13427879324f73 /src | |
| parent | Notify save failure by throwing "save_failed". (diff) | |
| download | inkscape-67553bebfbb213b1b68671d80f56893acdc287bb.tar.gz inkscape-67553bebfbb213b1b68671d80f56893acdc287bb.zip | |
Changed the PANGO_GLYPH_* defines to their actual values so skipping empty or unknown glyphs work with older pangoes also.
(bzr r1569)
Diffstat (limited to 'src')
| -rw-r--r-- | src/extension/internal/pdf-cairo.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/extension/internal/pdf-cairo.cpp b/src/extension/internal/pdf-cairo.cpp index 0b3148d85..d70b94148 100644 --- a/src/extension/internal/pdf-cairo.cpp +++ b/src/extension/internal/pdf-cairo.cpp @@ -771,13 +771,13 @@ PrintCairoPDF::draw_glyphs(cairo_t *cr, NR::Point p, PangoFont *font, PangoGlyph int num_invalid_glyphs = 0; for (gint i = 0; i < glyph_string->num_glyphs; i++) { info = &glyph_string->glyphs[i]; - // skip empty or unknown glyphs -#if defined(PANGO_GLYPH_EMPTY) && defined(PANGO_GLYPH_UNKNOWN_FLAG) - if (info->glyph == PANGO_GLYPH_EMPTY || info->glyph & PANGO_GLYPH_UNKNOWN_FLAG) { + // skip glyphs which are PANGO_GLYPH_EMPTY (0x0FFFFFFF) or have + // the PANGO_GLYPH_UNKNOWN_FLAG (0x10000000) set + if (info->glyph == 0x0FFFFFFF || info->glyph & 0x10000000) { num_invalid_glyphs++; continue; } -#endif + glyphs[i - num_invalid_glyphs].index = info->glyph; glyphs[i - num_invalid_glyphs].x = p[NR::X] + (x_offset + info->geometry.x_offset)/PANGO_SCALE; glyphs[i - num_invalid_glyphs].y = p[NR::Y] + (y_offset + info->geometry.y_offset)/PANGO_SCALE; |