summaryrefslogtreecommitdiffstats
path: root/src/object-edit.cpp
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2013-10-12 21:25:39 +0000
committerJabiertxof <jtx@jtx.marker.es>2013-10-12 21:25:39 +0000
commiteab1eef70ec00e5048b522b6c7f4189615caac87 (patch)
tree4d8d574ad9741174e0d99077f234fd41231b08e7 /src/object-edit.cpp
parentfix bsplines (diff)
parentFix crash with experimental lpe tool. (diff)
downloadinkscape-eab1eef70ec00e5048b522b6c7f4189615caac87.tar.gz
inkscape-eab1eef70ec00e5048b522b6c7f4189615caac87.zip
Update to trunk
(bzr r11950.1.180)
Diffstat (limited to 'src/object-edit.cpp')
-rw-r--r--src/object-edit.cpp12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/object-edit.cpp b/src/object-edit.cpp
index 2021b91f5..e9b183eca 100644
--- a/src/object-edit.cpp
+++ b/src/object-edit.cpp
@@ -69,7 +69,7 @@ KnotHolder *createKnotHolder(SPItem *item, SPDesktop *desktop)
knotholder = new RectKnotHolder(desktop, item, NULL);
} else if (SP_IS_BOX3D(item)) {
knotholder = new Box3DKnotHolder(desktop, item, NULL);
- } else if (SP_IS_ARC(item)) {
+ } else if (SP_IS_GENERICELLIPSE(item)) {
knotholder = new ArcKnotHolder(desktop, item, NULL);
} else if (SP_IS_STAR(item)) {
knotholder = new StarKnotHolder(desktop, item, NULL);
@@ -787,7 +787,7 @@ ArcKnotHolderEntityStart::knot_set(Geom::Point const &p, Geom::Point const &/*or
{
int snaps = Inkscape::Preferences::get()->getInt("/options/rotationsnapsperpi/value", 12);
- SPArc *arc = SP_ARC(item);
+ SPGenericEllipse *arc = SP_GENERICELLIPSE(item);
arc->setClosed(sp_genericellipse_side(arc, p) == -1);
@@ -808,9 +808,8 @@ Geom::Point
ArcKnotHolderEntityStart::knot_get() const
{
SPGenericEllipse const *ge = SP_GENERICELLIPSE(item);
- SPArc *arc = SP_ARC(item);
- return arc->getPointAtAngle(ge->start);
+ return ge->getPointAtAngle(ge->start);
}
void
@@ -829,7 +828,7 @@ ArcKnotHolderEntityEnd::knot_set(Geom::Point const &p, Geom::Point const &/*orig
{
int snaps = Inkscape::Preferences::get()->getInt("/options/rotationsnapsperpi/value", 12);
- SPArc *arc = SP_ARC(item);
+ SPGenericEllipse *arc = SP_GENERICELLIPSE(item);
arc->setClosed(sp_genericellipse_side(arc, p) == -1);
@@ -850,9 +849,8 @@ Geom::Point
ArcKnotHolderEntityEnd::knot_get() const
{
SPGenericEllipse const *ge = SP_GENERICELLIPSE(item);
- SPArc *arc = SP_ARC(item);
- return arc->getPointAtAngle(ge->end);
+ return ge->getPointAtAngle(ge->end);
}