From 40c62107849b6eb5e66dd0b1f7fe2a7d29cc83a6 Mon Sep 17 00:00:00 2001
From: "Johan B. C. Engelen" <jbc.engelen@swissonline.ch>
Date: Sat, 5 Apr 2014 00:24:46 +0200
Subject: fix cmake build errors for changes in 2geom

Fixed bugs:
  - https://launchpad.net/bugs/1283174

(bzr r13267)
---
 src/2geom/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/2geom')

diff --git a/src/2geom/CMakeLists.txt b/src/2geom/CMakeLists.txt
index b1c30f678..3d516dc18 100644
--- a/src/2geom/CMakeLists.txt
+++ b/src/2geom/CMakeLists.txt
@@ -21,6 +21,7 @@ set(2geom_SRC
 	nearest-point.cpp
 	numeric/matrix.cpp
 	path-intersection.cpp
+	path-sink.cpp
 	path.cpp
 	pathvector.cpp
 	piecewise.cpp
@@ -43,7 +44,6 @@ set(2geom_SRC
 	solve-bezier-parametric.cpp
 	svg-elliptical-arc.cpp
 	svg-path-parser.cpp
-	svg-path.cpp
 	sweep.cpp
 	toposweep.cpp
 	transforms.cpp
-- 
cgit v1.2.3


From aa5ee7d5a885df6cb4a31b1edaf1a35cf32b686e Mon Sep 17 00:00:00 2001
From: "Johan B. C. Engelen" <jbc.engelen@swissonline.ch>
Date: Sun, 6 Apr 2014 23:54:56 +0200
Subject: temporary fix for bug in 2geom, the bug manifests itself in LPE
 Construct grid

(bzr r13273)
---
 src/2geom/path.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/2geom')

diff --git a/src/2geom/path.cpp b/src/2geom/path.cpp
index 5797f475c..fc4d72028 100644
--- a/src/2geom/path.cpp
+++ b/src/2geom/path.cpp
@@ -104,12 +104,14 @@ Path &Path::operator*=(Affine const &m) {
 }
 
 Path &Path::operator*=(Translate const &m) {
+/* Somehow there is something wrong here, LPE Construct grid fails with this code
   unshare();
   Sequence::iterator last = get_curves().end() - 1;
   Sequence::iterator it;
   Point prev;
   for (it = get_curves().begin() ; it != last ; ++it) {
-    *(const_cast<Curve*>(&**it)) *= m;
+    //*(const_cast<Curve*>(&**it)) *= m;
+    const_cast<Curve*>(it->get())->operator*=(m);
     if ( it != get_curves().begin() && (*it)->initialPoint() != prev ) {
       THROW_CONTINUITYERROR();
     }
@@ -124,6 +126,8 @@ Path &Path::operator*=(Translate const &m) {
     }
   }
   return *this;
+*/
+  return this->operator*=(static_cast<Affine>(m));
 }
 
 std::vector<double>
-- 
cgit v1.2.3