summaryrefslogtreecommitdiffstats
path: root/src/object-edit.cpp
diff options
context:
space:
mode:
authorKrzysztof Kosi??ski <tweenk.pl@gmail.com>2011-07-14 19:42:57 +0000
committerKrzysztof KosiƄski <tweenk.pl@gmail.com>2011-07-14 19:42:57 +0000
commitefbf9755460d4c4b7a3d9d43dd753afcc8a28865 (patch)
tree41a259211da187e29f9983821b4cdfea221b6ad6 /src/object-edit.cpp
parentFix crashes in print preview (diff)
parentMake cms_key in SPDesktopWidget a regular ustring rather than a pointer (diff)
downloadinkscape-efbf9755460d4c4b7a3d9d43dd753afcc8a28865.tar.gz
inkscape-efbf9755460d4c4b7a3d9d43dd753afcc8a28865.zip
Merge SPCanvasArena caching layer work
(bzr r10451)
Diffstat (limited to 'src/object-edit.cpp')
-rw-r--r--src/object-edit.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/object-edit.cpp b/src/object-edit.cpp
index 553c125a3..28c8d44db 100644
--- a/src/object-edit.cpp
+++ b/src/object-edit.cpp
@@ -35,7 +35,7 @@
#include <glibmm/i18n.h>
#include "object-edit.h"
#include "xml/repr.h"
-#include "2geom/isnan.h"
+#include <2geom/math-utils.h>
#define sp_round(v,m) (((v) < 0.0) ? ((ceil((v) / (m) - 0.5)) * (m)) : ((floor((v) / (m) + 0.5)) * (m)))
@@ -959,7 +959,7 @@ StarKnotHolderEntity1::knot_set(Geom::Point const &p, Geom::Point const &/*origi
Geom::Point const s = snap_knot_position(p);
- Geom::Point d = s - to_2geom(star->center);
+ Geom::Point d = s - star->center;
double arg1 = atan2(d);
double darg1 = arg1 - star->arg[0];
@@ -986,7 +986,7 @@ StarKnotHolderEntity2::knot_set(Geom::Point const &p, Geom::Point const &/*origi
Geom::Point const s = snap_knot_position(p);
if (star->flatsided == false) {
- Geom::Point d = s - to_2geom(star->center);
+ Geom::Point d = s - star->center;
double arg1 = atan2(d);
double darg1 = arg1 - star->arg[1];