summaryrefslogtreecommitdiffstats
path: root/src/display/canvas-text.cpp
diff options
context:
space:
mode:
authorKris De Gussem <kris.degussem@gmail.com>2015-10-29 22:24:26 +0000
committerKris De Gussem <Kris.De.Gussem@hotmail.com>2015-10-29 22:24:26 +0000
commitfd5fce801e86b3e9ab0d56a702e89b11dbf7484e (patch)
treeeede96d54a785014bbd15af59fea2980704fa891 /src/display/canvas-text.cpp
parentpatch for bug 1511508 (diff)
downloadinkscape-fd5fce801e86b3e9ab0d56a702e89b11dbf7484e.tar.gz
inkscape-fd5fce801e86b3e9ab0d56a702e89b11dbf7484e.zip
static code analysis
(bzr r14436)
Diffstat (limited to 'src/display/canvas-text.cpp')
-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];