diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2008-06-12 20:20:51 +0000 |
|---|---|---|
| committer | johanengelen <johanengelen@users.sourceforge.net> | 2008-06-12 20:20:51 +0000 |
| commit | 21f04a292dafc2cfd1374609720c458124c5b9a4 (patch) | |
| tree | 1a38adb5df88eb36bafb6d055b55faf6b0d69cba /src/object-edit.cpp | |
| parent | update 2geom (diff) | |
| download | inkscape-21f04a292dafc2cfd1374609720c458124c5b9a4.tar.gz inkscape-21f04a292dafc2cfd1374609720c458124c5b9a4.zip | |
change NR::Matrix to Geom:: for many sp_item_xxx_affine functions
(bzr r5915)
Diffstat (limited to 'src/object-edit.cpp')
| -rw-r--r-- | src/object-edit.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/object-edit.cpp b/src/object-edit.cpp index de7fbccec..94c3c5daf 100644 --- a/src/object-edit.cpp +++ b/src/object-edit.cpp @@ -129,7 +129,7 @@ public: static NR::Point snap_knot_position(SPItem *item, NR::Point const &p) { SPDesktop const *desktop = inkscape_active_desktop(); - NR::Matrix const i2d (sp_item_i2d_affine (item)); + NR::Matrix const i2d (from_2geom(sp_item_i2d_affine (item))); NR::Point s = p * i2d; SnapManager &m = desktop->namedview->snap_manager; m.setup(desktop, item); @@ -464,7 +464,7 @@ Box3DKnotHolderEntity::knot_set_generic(SPItem *item, unsigned int knot_id, NR:: g_assert(item != NULL); SPBox3D *box = SP_BOX3D(item); - NR::Matrix const i2d (sp_item_i2d_affine (item)); + NR::Matrix const i2d (from_2geom(sp_item_i2d_affine (item))); Box3D::Axis movement; if ((knot_id < 4) != (state & GDK_SHIFT_MASK)) { @@ -640,7 +640,7 @@ Box3DKnotHolderEntityCenter::knot_set(NR::Point const &new_pos, NR::Point const NR::Point const s = snap_knot_position(item, new_pos); SPBox3D *box = SP_BOX3D(item); - NR::Matrix const i2d (sp_item_i2d_affine (item)); + NR::Matrix const i2d (from_2geom(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); |