diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2008-08-06 22:43:13 +0000 |
|---|---|---|
| committer | johanengelen <johanengelen@users.sourceforge.net> | 2008-08-06 22:43:13 +0000 |
| commit | 6a0fe482d0ad28e2660aa0a5e5d07e4d113c7786 (patch) | |
| tree | 4c090c4e2cb4b95d5cbc37d7c8e5df42d63f17ec /src/connector-context.cpp | |
| parent | add automatic conversion between Geom::Matrix and NR::Matrix. (added to NR::M... (diff) | |
| download | inkscape-6a0fe482d0ad28e2660aa0a5e5d07e4d113c7786.tar.gz inkscape-6a0fe482d0ad28e2660aa0a5e5d07e4d113c7786.zip | |
fix ambiguities by implicit NR::Matrix/Geom::Matrix cast.
(bzr r6582)
Diffstat (limited to 'src/connector-context.cpp')
| -rw-r--r-- | src/connector-context.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/connector-context.cpp b/src/connector-context.cpp index 5e2cdc2b8..871110275 100644 --- a/src/connector-context.cpp +++ b/src/connector-context.cpp @@ -1165,15 +1165,15 @@ cc_set_active_conn(SPConnectorContext *cc, SPItem *item) g_assert( SP_IS_PATH(item) ); SPCurve *curve = SP_SHAPE(SP_PATH(item))->curve; - NR::Matrix i2d = from_2geom(sp_item_i2d_affine(item)); + Geom::Matrix i2d = sp_item_i2d_affine(item); if (cc->active_conn == item) { // Just adjust handle positions. - NR::Point startpt = curve->first_point() * i2d; + Geom::Point startpt = curve->first_point() * i2d; sp_knot_set_position(cc->endpt_handle[0], startpt, 0); - NR::Point endpt = curve->last_point() * i2d; + Geom::Point endpt = curve->last_point() * i2d; sp_knot_set_position(cc->endpt_handle[1], endpt, 0); return; @@ -1237,10 +1237,10 @@ cc_set_active_conn(SPConnectorContext *cc, SPItem *item) G_CALLBACK(endpt_handler), cc); } - NR::Point startpt = curve->first_point() * i2d; + Geom::Point startpt = curve->first_point() * i2d; sp_knot_set_position(cc->endpt_handle[0], startpt, 0); - NR::Point endpt = curve->last_point() * i2d; + Geom::Point endpt = curve->last_point() * i2d; sp_knot_set_position(cc->endpt_handle[1], endpt, 0); sp_knot_show(cc->endpt_handle[0]); |