diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2015-10-29 01:39:57 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2015-10-29 01:39:57 +0000 |
| commit | dc2bb9cef19401592553dd8166b13fa6c4c0c3af (patch) | |
| tree | 2823464a9e928f4aae2e189fa47fb1997d727270 /src/display | |
| parent | Removed recursion from code because no speed improvements (diff) | |
| parent | Dutch translation update (diff) | |
| download | inkscape-dc2bb9cef19401592553dd8166b13fa6c4c0c3af.tar.gz inkscape-dc2bb9cef19401592553dd8166b13fa6c4c0c3af.zip | |
update to trunk
(bzr r14422.1.26)
Diffstat (limited to 'src/display')
| -rw-r--r-- | src/display/canvas-text.cpp | 6 | ||||
| -rw-r--r-- | src/display/curve.cpp | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/display/canvas-text.cpp b/src/display/canvas-text.cpp index 5ad87b4ef..2c29fc207 100644 --- a/src/display/canvas-text.cpp +++ b/src/display/canvas-text.cpp @@ -266,10 +266,14 @@ sp_canvastext_set_coords (SPCanvasText *ct, gdouble x0, gdouble y0) void sp_canvastext_set_coords (SPCanvasText *ct, const Geom::Point start) { - Geom::Point pos = ct->desktop->doc2dt(start); + Geom::Point pos; g_return_if_fail (ct != NULL); g_return_if_fail (SP_IS_CANVASTEXT (ct)); + + if (ct && ct->desktop) { + pos = ct->desktop->doc2dt(start); + } if (DIFFER (pos[0], ct->s[Geom::X]) || DIFFER (pos[1], ct->s[Geom::Y])) { ct->s[Geom::X] = pos[0]; diff --git a/src/display/curve.cpp b/src/display/curve.cpp index 3024d1276..b6c387034 100644 --- a/src/display/curve.cpp +++ b/src/display/curve.cpp @@ -496,7 +496,7 @@ SPCurve::append(SPCurve const *curve2, _pathv.push_back( (*it) ); } - for (it++; it != curve2->_pathv.end(); ++it) { + for (++it; it != curve2->_pathv.end(); ++it) { _pathv.push_back( (*it) ); } } else { |