index 0870692938f770455344c3089afd37548cb82b6c..6ef3746845d650d96ee1a9da9103f6e4a06a1c6b 100644 (file)
--- a/src/sp-conn-end-pair.cpp
+++ b/src/sp-conn-end-pair.cpp
for (unsigned h = 0; h < 2; ++h) {
if ( h2attItem[h] ) {
- NR::Maybe<NR::Rect> bbox = h2attItem[h]->getBounds(sp_item_i2doc_affine(h2attItem[h]));
+ boost::optional<NR::Rect> bbox = h2attItem[h]->getBounds(from_2geom(sp_item_i2doc_affine(h2attItem[h])));
if (bbox) {
endPts[h] = bbox->midpoint();
} else {
else
{
if (h == 0) {
- endPts[h] = sp_curve_first_point(curve);
+ endPts[h] = curve->first_point();
}
else {
- endPts[h] = sp_curve_last_point(curve);
+ endPts[h] = curve->last_point();
}
}
}
Avoid::PolyLine route = _connRef->route();
_connRef->calcRouteDist();
- sp_curve_reset(curve);
- sp_curve_moveto(curve, endPt[0]);
+ curve->reset();
+ curve->moveto(endPt[0]);
for (int i = 1; i < route.pn; ++i) {
NR::Point p(route.ps[i].x, route.ps[i].y);
- sp_curve_lineto(curve, p);
+ curve->lineto(p);
}
}