summaryrefslogtreecommitdiffstats
path: root/src/display
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2015-10-30 00:40:00 +0000
committerJabiertxof <jtx@jtx.marker.es>2015-10-30 00:40:00 +0000
commit8b7000a2836508dad19b7d71a9262e9a24f35454 (patch)
tree581951a22708db041497a41a46dbfb937a7625e0 /src/display
parentAdd optional presure to width and to size (diff)
parentstatic code analysis (diff)
downloadinkscape-8b7000a2836508dad19b7d71a9262e9a24f35454.tar.gz
inkscape-8b7000a2836508dad19b7d71a9262e9a24f35454.zip
update to trunk
(bzr r14422.1.28)
Diffstat (limited to 'src/display')
-rw-r--r--src/display/canvas-text.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/display/canvas-text.cpp b/src/display/canvas-text.cpp
index 2c29fc207..7c019caf5 100644
--- a/src/display/canvas-text.cpp
+++ b/src/display/canvas-text.cpp
@@ -266,14 +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;
-
- g_return_if_fail (ct != NULL);
+ g_return_if_fail (ct && ct->desktop);
g_return_if_fail (SP_IS_CANVASTEXT (ct));
- if (ct && ct->desktop) {
- pos = ct->desktop->doc2dt(start);
- }
+ 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];