summaryrefslogtreecommitdiffstats
path: root/src/live_effects
diff options
context:
space:
mode:
authorJohan B. C. Engelen <jbc.engelen@swissonline.ch>2008-07-17 22:00:40 +0000
committerjohanengelen <johanengelen@users.sourceforge.net>2008-07-17 22:00:40 +0000
commitb8d2a2d3b528d90cd88f96fd4a32b077c98776d5 (patch)
treeaa819f1acb877a25050e6dd559ba2b07daf69154 /src/live_effects
parentNR::Point : add cast operator to Geom::Point (diff)
downloadinkscape-b8d2a2d3b528d90cd88f96fd4a32b077c98776d5.tar.gz
inkscape-b8d2a2d3b528d90cd88f96fd4a32b077c98776d5.zip
convert all SPCurve's points and matrices arguments and return types to 2Geom
(bzr r6339)
Diffstat (limited to 'src/live_effects')
-rw-r--r--src/live_effects/lpe-copy_rotate.cpp4
-rw-r--r--src/live_effects/lpe-mirror_symmetry.cpp4
-rw-r--r--src/live_effects/lpe-offset.cpp2
-rw-r--r--src/live_effects/lpe-parallel.cpp4
4 files changed, 7 insertions, 7 deletions
diff --git a/src/live_effects/lpe-copy_rotate.cpp b/src/live_effects/lpe-copy_rotate.cpp
index 2f381d1d7..1eedfa3a7 100644
--- a/src/live_effects/lpe-copy_rotate.cpp
+++ b/src/live_effects/lpe-copy_rotate.cpp
@@ -69,8 +69,8 @@ LPECopyRotate::doOnApply(SPLPEItem *lpeitem)
{
SPCurve *curve = SP_SHAPE(lpeitem)->curve;
- A = curve->first_point().to_2geom();
- B = curve->last_point().to_2geom();
+ A = curve->first_point();
+ B = curve->last_point();
origin.param_setValue(A);
diff --git a/src/live_effects/lpe-mirror_symmetry.cpp b/src/live_effects/lpe-mirror_symmetry.cpp
index e41d4084d..8095e5360 100644
--- a/src/live_effects/lpe-mirror_symmetry.cpp
+++ b/src/live_effects/lpe-mirror_symmetry.cpp
@@ -46,8 +46,8 @@ LPEMirrorSymmetry::acceptParamPath (SPPath *param_path) {
using namespace Geom;
SPCurve* curve = sp_path_get_curve_for_edit (param_path);
- Geom::Point A(curve->first_point().to_2geom());
- Geom::Point B(curve->last_point().to_2geom());
+ Geom::Point A(curve->first_point());
+ Geom::Point B(curve->last_point());
Piecewise<D2<SBasis> > rline = Piecewise<D2<SBasis> >(D2<SBasis>(Linear(A[X], B[X]), Linear(A[Y], B[Y])));
reflection_line.param_set_and_write_new_value(rline);
diff --git a/src/live_effects/lpe-offset.cpp b/src/live_effects/lpe-offset.cpp
index 0d45fee2a..68d61603d 100644
--- a/src/live_effects/lpe-offset.cpp
+++ b/src/live_effects/lpe-offset.cpp
@@ -41,7 +41,7 @@ LPEOffset::~LPEOffset()
void
LPEOffset::doOnApply(SPLPEItem *lpeitem)
{
- offset_pt.param_set_and_write_new_value(SP_SHAPE(lpeitem)->curve->first_point().to_2geom());
+ offset_pt.param_set_and_write_new_value(SP_SHAPE(lpeitem)->curve->first_point());
}
static void append_half_circle(Geom::Piecewise<Geom::D2<Geom::SBasis> > &pwd2,
diff --git a/src/live_effects/lpe-parallel.cpp b/src/live_effects/lpe-parallel.cpp
index 2f3a6d0ce..dba0f3a8d 100644
--- a/src/live_effects/lpe-parallel.cpp
+++ b/src/live_effects/lpe-parallel.cpp
@@ -71,8 +71,8 @@ LPEParallel::doOnApply (SPLPEItem *lpeitem)
{
SPCurve *curve = SP_SHAPE(lpeitem)->curve;
- A = curve->first_point().to_2geom();
- B = curve->last_point().to_2geom();
+ A = curve->first_point();
+ B = curve->last_point();
dir = unit_vector(B - A);
offset_pt.param_set_and_write_new_value((A + B)/2 + dir.ccw() * 100);