From 9223141ae17fef459e79f98829b88ae26846ef09 Mon Sep 17 00:00:00 2001 From: "Johan B. C. Engelen" Date: Wed, 6 Aug 2008 22:32:41 +0000 Subject: add automatic conversion between Geom::Matrix and NR::Matrix. (added to NR::Matrix class). resolved some ambiguities caused by it. (bzr r6581) --- src/object-edit.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/object-edit.cpp') diff --git a/src/object-edit.cpp b/src/object-edit.cpp index 3b513fe88..400354d4a 100644 --- a/src/object-edit.cpp +++ b/src/object-edit.cpp @@ -452,7 +452,7 @@ Box3DKnotHolderEntity::knot_set_generic(SPItem *item, unsigned int knot_id, Geom g_assert(item != NULL); SPBox3D *box = SP_BOX3D(item); - NR::Matrix const i2d (from_2geom(sp_item_i2d_affine (item))); + Geom::Matrix const i2d (sp_item_i2d_affine (item)); Box3D::Axis movement; if ((knot_id < 4) != (state & GDK_SHIFT_MASK)) { @@ -628,7 +628,7 @@ Box3DKnotHolderEntityCenter::knot_set(Geom::Point const &new_pos, Geom::Point co Geom::Point const s = snap_knot_position(new_pos); SPBox3D *box = SP_BOX3D(item); - NR::Matrix const i2d (from_2geom(sp_item_i2d_affine (item))); + Geom::Matrix const i2d (sp_item_i2d_affine (item)); box3d_set_center (SP_BOX3D(item), s * i2d, origin * i2d, !(state & GDK_SHIFT_MASK) ? Box3D::XY : Box3D::Z, state & GDK_CONTROL_MASK); -- cgit v1.2.3