summaryrefslogtreecommitdiffstats
path: root/src/display/canvas-text.cpp
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2015-11-08 22:51:43 +0000
committerJabiertxof <jtx@jtx.marker.es>2015-11-08 22:51:43 +0000
commit16617cc3f8e4692b2f76e99347a82eb7572bdefa (patch)
tree9c97fa99dc5eb5a0255ea03721f413d55d4bfcf4 /src/display/canvas-text.cpp
parentworking on roughen (diff)
parentmerge of branch lp:~inkscape.dev/inkscape/spraytool-no-overlap (diff)
downloadinkscape-16617cc3f8e4692b2f76e99347a82eb7572bdefa.tar.gz
inkscape-16617cc3f8e4692b2f76e99347a82eb7572bdefa.zip
update to trunk
(bzr r14422.3.3)
Diffstat (limited to 'src/display/canvas-text.cpp')
-rw-r--r--src/display/canvas-text.cpp6
1 files changed, 3 insertions, 3 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];