Merge from trunk

(bzr r9508.1.73)

1 files changed, 7 insertions, 8 deletions

diff --git a/src/display/canvas-bpath.cpp b/src/display/canvas-bpath.cpp
index 082e6d44e..f86743744 100644
--- a/src/display/canvas-bpath.cpp
+++ b/src/display/canvas-bpath.cpp
@@ -1,5 +1,3 @@
-#define __SP_CANVAS_BPATH_C__
-
 /*
  * Simple bezier bpath CanvasItem for inkscape
  *
@@ -15,7 +13,12 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+#include <sstream>
+#include <string.h>
+#include "desktop.h"
+
 #include "color.h"
+#include "display/sp-canvas-group.h"
 #include "display/sp-canvas-util.h"
 #include "display/canvas-bpath.h"
 #include "display/display-forward.h"
@@ -23,17 +26,13 @@
 #include "display/cairo-utils.h"
 #include "helper/geom.h"
 
-#include <sstream>
-#include <string.h>
-#include <desktop.h>
-
 void nr_pixblock_render_bpath_rgba (Shape* theS,uint32_t color,NRRectL &area,char* destBuf,int stride);
 
 static void sp_canvas_bpath_class_init (SPCanvasBPathClass *klass);
 static void sp_canvas_bpath_init (SPCanvasBPath *path);
 static void sp_canvas_bpath_destroy (GtkObject *object);
 
-static void sp_canvas_bpath_update (SPCanvasItem *item, Geom::Matrix const &affine, unsigned int flags);
+static void sp_canvas_bpath_update (SPCanvasItem *item, Geom::Affine const &affine, unsigned int flags);
 static void sp_canvas_bpath_render (SPCanvasItem *item, SPCanvasBuf *buf);
 static double sp_canvas_bpath_point (SPCanvasItem *item, Geom::Point p, SPCanvasItem **actual_item);
 
@@ -102,7 +101,7 @@ sp_canvas_bpath_destroy (GtkObject *object)
 }
 
 static void
-sp_canvas_bpath_update (SPCanvasItem *item, Geom::Matrix const &affine, unsigned int flags)
+sp_canvas_bpath_update (SPCanvasItem *item, Geom::Affine const &affine, unsigned int flags)
 {
     SPCanvasBPath *cbp = SP_CANVAS_BPATH (item);