From 3cc158ecff4f2420590ab102d7f3a84d7ca2a711 Mon Sep 17 00:00:00 2001
From: "Jon A. Cruz" <jon@joncruz.org>
Date: Thu, 23 Dec 2010 00:10:28 -0800
Subject: Split SPCanvasItem and SPCanvasGroup to individual .h files. Removed
 forward header.

(bzr r9978.1.1)
---
 src/display/canvas-bpath.cpp | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

(limited to 'src/display/canvas-bpath.cpp')

diff --git a/src/display/canvas-bpath.cpp b/src/display/canvas-bpath.cpp
index 063bdab66..f8a8ef22c 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,28 +13,20 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+#include <sstream>
+#include <string.h>
+#include <desktop.h>
+
 #include "color.h"
 #include "sp-canvas-util.h"
 #include "inkscape-cairo.h"
 #include "canvas-bpath.h"
-#include "display/display-forward.h"
+#include "display/sp-canvas-group.h"
 #include "display/curve.h"
 #include "display/inkscape-cairo.h"
-#include <libnr/nr-pixops.h>
+#include "libnr/nr-pixops.h"
 #include "helper/geom.h"
 
-#include <sstream>
-#include <string.h>
-#include <desktop.h>
-
-/**
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-#include <color.h>
-
-#include <libnr/nr-pixops.h>
-**/
 
 void nr_pixblock_render_bpath_rgba (Shape* theS,uint32_t color,NRRectL &area,char* destBuf,int stride);
 
-- 
cgit v1.2.3


From 53933f5fea9d07d1ba6304b88439fba257ee8c34 Mon Sep 17 00:00:00 2001
From: "Johan B. C. Engelen" <jbc.engelen@swissonline.ch>
Date: Wed, 2 Feb 2011 22:24:36 +0100
Subject: update to latest 2geom !

(bzr r10025)
---
 src/display/canvas-bpath.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/display/canvas-bpath.cpp')

diff --git a/src/display/canvas-bpath.cpp b/src/display/canvas-bpath.cpp
index f8a8ef22c..725a1d0ff 100644
--- a/src/display/canvas-bpath.cpp
+++ b/src/display/canvas-bpath.cpp
@@ -34,7 +34,7 @@ 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);
 
@@ -103,7 +103,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);
 
-- 
cgit v1.2.3