summaryrefslogtreecommitdiffstats
path: root/src/sp-conn-end.cpp
diff options
context:
space:
mode:
authorJohan B. C. Engelen <jbc.engelen@swissonline.ch>2008-08-13 18:49:22 +0000
committerjohanengelen <johanengelen@users.sourceforge.net>2008-08-13 18:49:22 +0000
commitd70f7cc1bada9cd825ee742246f817ca4fdb14cd (patch)
treee2f0373f664e81c3f0df1dcffb689e140323d764 /src/sp-conn-end.cpp
parentGet rid of sp_nodepath_current() and a few instances of SP_ACTIVE_DESKTOP by ... (diff)
downloadinkscape-d70f7cc1bada9cd825ee742246f817ca4fdb14cd.tar.gz
inkscape-d70f7cc1bada9cd825ee742246f817ca4fdb14cd.zip
return boost::optional for second and penultimate points of SPCurve
(bzr r6616)
Diffstat (limited to 'src/sp-conn-end.cpp')
-rw-r--r--src/sp-conn-end.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/sp-conn-end.cpp b/src/sp-conn-end.cpp
index 40017912f..947a88d71 100644
--- a/src/sp-conn-end.cpp
+++ b/src/sp-conn-end.cpp
@@ -68,8 +68,8 @@ sp_conn_end_move_compensate(NR::Matrix const */*mp*/, SPItem */*moved_item*/,
NR::Matrix h2i2anc[2];
NR::Rect h2bbox_icoordsys[2];
NR::Point last_seg_endPt[2] = {
- path->curve->second_point(),
- path->curve->penultimate_point()
+ *(path->curve->second_point()),
+ *(path->curve->penultimate_point())
};
for (unsigned h = 0; h < 2; ++h) {
boost::optional<NR::Rect> bbox = h2attItem[h]->getBounds(NR::identity());
@@ -102,12 +102,12 @@ sp_conn_end_move_compensate(NR::Matrix const */*mp*/, SPItem */*moved_item*/,
NR::Point last_seg_pt;
if (h2attItem[0] != NULL) {
other_endpt = path->curve->last_point();
- last_seg_pt = path->curve->second_point();
+ last_seg_pt = *(path->curve->second_point());
ind = 0;
}
else {
other_endpt = path->curve->first_point();
- last_seg_pt = path->curve->penultimate_point();
+ last_seg_pt = *(path->curve->penultimate_point());
ind = 1;
}
NR::Point h2endPt_icoordsys[2];