diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2013-09-22 16:53:57 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2013-09-22 16:53:57 +0000 |
| commit | 8cf510753057485dcf07a5ad4587ffe8c7f7eaa2 (patch) | |
| tree | 26df259064bee700c6a44df885a990ada2a15612 /src/libnrtype | |
| parent | Update to trunk (diff) | |
| parent | Fix CMake build (follow-up to r12567) (diff) | |
| download | inkscape-8cf510753057485dcf07a5ad4587ffe8c7f7eaa2.tar.gz inkscape-8cf510753057485dcf07a5ad4587ffe8c7f7eaa2.zip | |
update to trunk
(bzr r11950.1.147)
Diffstat (limited to 'src/libnrtype')
| -rw-r--r-- | src/libnrtype/FontFactory.cpp | 2 | ||||
| -rw-r--r-- | src/libnrtype/Layout-TNG-Output.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/libnrtype/FontFactory.cpp b/src/libnrtype/FontFactory.cpp index 74c706a1b..c91e57065 100644 --- a/src/libnrtype/FontFactory.cpp +++ b/src/libnrtype/FontFactory.cpp @@ -962,7 +962,7 @@ font_instance *font_factory::Face(PangoFontDescription *descr, bool canFail) nFace = pango_font_map_load_font(fontServer,fontContext,descr); } else { - g_warning(_("Ignoring font without family that will crash Pango")); + g_warning("%s", _("Ignoring font without family that will crash Pango")); } if ( nFace ) { diff --git a/src/libnrtype/Layout-TNG-Output.cpp b/src/libnrtype/Layout-TNG-Output.cpp index f7f910c2f..060cecebf 100644 --- a/src/libnrtype/Layout-TNG-Output.cpp +++ b/src/libnrtype/Layout-TNG-Output.cpp @@ -181,8 +181,9 @@ void Layout::show(DrawingGroup *in_arena, Geom::OptRect const &paintbox) const glyph_index++; } nr_text->setStyle(text_source->style); - nr_text->setItemBounds(paintbox); in_arena->prependChild(nr_text); + // Set item bounds without filter enlargement + in_arena->setItemBounds(paintbox); } } |