change NR::Matrix to Geom:: for many sp_item_xxx_affine functions

(bzr r5915)

3 files changed, 5 insertions, 5 deletions

diff --git a/src/live_effects/lpe-perp_bisector.cpp b/src/live_effects/lpe-perp_bisector.cpp
index ada321ef3..7c08bdb08 100644
--- a/src/live_effects/lpe-perp_bisector.cpp
+++ b/src/live_effects/lpe-perp_bisector.cpp
@@ -122,7 +122,7 @@ NR::Point path_end_get(SPItem *item) {
 void
 path_set_start_end(SPItem *item, NR::Point const &p, bool start) {
     SPCurve* curve = sp_path_get_curve_for_edit (SP_PATH(item)); // TODO: Should we use sp_shape_get_curve()?
-    NR::Matrix const i2d (sp_item_i2d_affine (SP_ITEM(item)));
+    Geom::Matrix const i2d (sp_item_i2d_affine (SP_ITEM(item)));
 
     Geom::Point A, B;
     if (start) {
diff --git a/src/live_effects/lpegroupbbox.cpp b/src/live_effects/lpegroupbbox.cpp
index f797d0358..1ec443a5f 100644
--- a/src/live_effects/lpegroupbbox.cpp
+++ b/src/live_effects/lpegroupbbox.cpp
@@ -23,7 +23,7 @@ GroupBBoxEffect::original_bbox(SPLPEItem *lpeitem, bool absolute)
     
     NR::Matrix transform;
     if (absolute) {
-        transform = sp_item_i2doc_affine(item);
+        transform = from_2geom(sp_item_i2doc_affine(item));
     }
     else {
         transform = NR::identity();
diff --git a/src/live_effects/parameter/pointparam-knotholder.cpp b/src/live_effects/parameter/pointparam-knotholder.cpp
index f59b2f7eb..651054120 100644
--- a/src/live_effects/parameter/pointparam-knotholder.cpp
+++ b/src/live_effects/parameter/pointparam-knotholder.cpp
@@ -91,7 +91,7 @@ PointParamKnotHolder::add_knot (
     entity.push_back(e);
 
     // Move to current point.
-    NR::Point dp = p * sp_item_i2d_affine(item);
+    NR::Point dp = p * from_2geom(sp_item_i2d_affine(item));
     sp_knot_set_position(e->knot, &dp, SP_KNOT_STATE_NORMAL);
 
     e->handler_id = g_signal_connect(e->knot, "moved", G_CALLBACK(pointparam_knot_moved_handler), this);
@@ -112,7 +112,7 @@ static void pointparam_knot_clicked_handler(SPKnot */*knot*/, guint /*state*/, P
  */
 static void pointparam_knot_moved_handler(SPKnot */*knot*/, NR::Point const *p, guint /*state*/, PointParamKnotHolder *kh)
 {
-    NR::Matrix const i2d(sp_item_i2d_affine(kh->item));
+    NR::Matrix const i2d(from_2geom(sp_item_i2d_affine(kh->item)));
     NR::Point pos = (*p) / i2d;
 
     Inkscape::SVGOStringStream os;
@@ -123,7 +123,7 @@ static void pointparam_knot_moved_handler(SPKnot */*knot*/, NR::Point const *p,
 
 static void pointparam_knot_ungrabbed_handler(SPKnot *knot, unsigned int /*state*/, PointParamKnotHolder *kh)
 {
-    NR::Matrix const i2d(sp_item_i2d_affine(kh->item));
+    NR::Matrix const i2d(from_2geom(sp_item_i2d_affine(kh->item)));
     NR::Point pos = sp_knot_position(knot) / i2d;
 
     Inkscape::SVGOStringStream os;