Merge from trunk

(bzr r9508.1.73)

1 files changed, 6 insertions, 6 deletions

diff --git a/src/display/sp-canvas-util.cpp b/src/display/sp-canvas-util.cpp
index 23b92c35d..186609e49 100644
--- a/src/display/sp-canvas-util.cpp
+++ b/src/display/sp-canvas-util.cpp
@@ -13,10 +13,10 @@
  */
 
 
-#include <2geom/matrix.h>
+#include <2geom/affine.h>
 #include "sp-canvas-util.h"
-#include <string.h>  /* for memset */
-
+#include "sp-canvas-item.h"
+#include "sp-canvas.h"
 
 void
 sp_canvas_update_bbox (SPCanvasItem *item, int x1, int y1, int x2, int y2)
@@ -50,7 +50,7 @@ sp_canvas_prepare_buffer (SPCanvasBuf *buf)
     }*/
 }
 
-Geom::Matrix sp_canvas_item_i2p_affine (SPCanvasItem * item)
+Geom::Affine sp_canvas_item_i2p_affine (SPCanvasItem * item)
 {
     g_assert (item != NULL); /* this may be overly zealous - it is
                               * plausible that this gets called
@@ -59,7 +59,7 @@ Geom::Matrix sp_canvas_item_i2p_affine (SPCanvasItem * item)
     return item->xform;
 }
 
-Geom::Matrix  sp_canvas_item_i2i_affine (SPCanvasItem * from, SPCanvasItem * to)
+Geom::Affine  sp_canvas_item_i2i_affine (SPCanvasItem * from, SPCanvasItem * to)
 {
     g_assert (from != NULL);
     g_assert (to != NULL);
@@ -67,7 +67,7 @@ Geom::Matrix  sp_canvas_item_i2i_affine (SPCanvasItem * from, SPCanvasItem * to)
     return sp_canvas_item_i2w_affine(from) * sp_canvas_item_i2w_affine(to).inverse();
 }
 
-void sp_canvas_item_set_i2w_affine (SPCanvasItem * item,  Geom::Matrix const &i2w)
+void sp_canvas_item_set_i2w_affine (SPCanvasItem * item,  Geom::Affine const &i2w)
 {
     g_assert (item != NULL);