diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2015-11-15 08:31:53 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2015-11-15 08:31:53 +0000 |
| commit | ac8b388ada4e781b29570276ed9f95fd6f4dafff (patch) | |
| tree | 268308a8a304debb7cf2f84e1255d5633dee5eef /src/display | |
| parent | Extensions. Fix view center for Render extensions applied in transformed laye... (diff) | |
| parent | Translations. Italian translation update. (diff) | |
| download | inkscape-ac8b388ada4e781b29570276ed9f95fd6f4dafff.tar.gz inkscape-ac8b388ada4e781b29570276ed9f95fd6f4dafff.zip | |
merge from trunk (r14473)
(bzr r14425.1.3)
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, 4 insertions, 4 deletions
diff --git a/src/display/canvas-text.cpp b/src/display/canvas-text.cpp index 5ad87b4ef..7c019caf5 100644 --- a/src/display/canvas-text.cpp +++ b/src/display/canvas-text.cpp @@ -266,10 +266,10 @@ 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); - - g_return_if_fail (ct != NULL); + g_return_if_fail (ct && ct->desktop); g_return_if_fail (SP_IS_CANVASTEXT (ct)); + + Geom::Point 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 { |