From 30884b9e814d7baaa2299803e8cb76cf203ca084 Mon Sep 17 00:00:00 2001
From: Krzysztof Kosi??ski <tweenk.pl@gmail.com>
Date: Wed, 4 Aug 2010 05:45:58 +0200
Subject: Wholesale cruft removal part 1

(bzr r9508.1.44)
---
 src/livarot/PathSimplify.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/livarot/PathSimplify.cpp')

diff --git a/src/livarot/PathSimplify.cpp b/src/livarot/PathSimplify.cpp
index 0f440de24..917bcbe7c 100644
--- a/src/livarot/PathSimplify.cpp
+++ b/src/livarot/PathSimplify.cpp
@@ -7,7 +7,6 @@
  */
 
 #include <glib/gmem.h>
-#include <libnr/nr-point-matrix-ops.h>
 #include "livarot/Path.h"
 #include "livarot/path-description.h"
 
-- 
cgit v1.2.3


From 498629f82d9453cb7222ab642b867c183fdf1666 Mon Sep 17 00:00:00 2001
From: Krzysztof Kosi??ski <tweenk.pl@gmail.com>
Date: Thu, 5 Aug 2010 01:56:47 +0200
Subject: Wholesale cruft removal part 3

(bzr r9508.1.47)
---
 src/livarot/PathSimplify.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/livarot/PathSimplify.cpp')

diff --git a/src/livarot/PathSimplify.cpp b/src/livarot/PathSimplify.cpp
index 917bcbe7c..c53dfa029 100644
--- a/src/livarot/PathSimplify.cpp
+++ b/src/livarot/PathSimplify.cpp
@@ -126,7 +126,7 @@ double DistanceToCubic(Geom::Point const &start, PathDescrCubicTo res, Geom::Poi
     }
     
     Geom::Point seg = res.p - start;
-    nnle = NR::cross(seg, sp);
+    nnle = Geom::cross(seg, sp);
     nnle *= nnle;
     nnle /= Geom::dot(seg, seg);
     if ( nnle < nle ) {
-- 
cgit v1.2.3


From ab143333746e25648b253f13c0539adff089b1b6 Mon Sep 17 00:00:00 2001
From: Krzysztof Kosi??ski <tweenk.pl@gmail.com>
Date: Fri, 24 Jun 2011 00:22:07 +0200
Subject: Remove more of libnr

(bzr r10347.1.2)
---
 src/livarot/PathSimplify.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/livarot/PathSimplify.cpp')

diff --git a/src/livarot/PathSimplify.cpp b/src/livarot/PathSimplify.cpp
index fb2aa55e2..fe1981e4d 100644
--- a/src/livarot/PathSimplify.cpp
+++ b/src/livarot/PathSimplify.cpp
@@ -7,6 +7,7 @@
  */
 
 #include <glib/gmem.h>
+#include <2geom/affine.h>
 #include "livarot/Path.h"
 #include "livarot/path-description.h"
 
-- 
cgit v1.2.3


From 4e51446f417ad82d2cdac758d0c5ce908ff88038 Mon Sep 17 00:00:00 2001
From: Alex Valavanis <valavanisalex@gmail.com>
Date: Thu, 8 Dec 2011 11:53:54 +0000
Subject: Switch to top-level glib headers.  Thanks to DimStar for patch

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

(bzr r10762)
---
 src/livarot/PathSimplify.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/livarot/PathSimplify.cpp')

diff --git a/src/livarot/PathSimplify.cpp b/src/livarot/PathSimplify.cpp
index fe1981e4d..d6e916197 100644
--- a/src/livarot/PathSimplify.cpp
+++ b/src/livarot/PathSimplify.cpp
@@ -6,7 +6,7 @@
  *
  */
 
-#include <glib/gmem.h>
+#include <glib.h>
 #include <2geom/affine.h>
 #include "livarot/Path.h"
 #include "livarot/path-description.h"
-- 
cgit v1.2.3