From 009833c1d6be271d611c183aae781e41b71ca927 Mon Sep 17 00:00:00 2001 From: Krzysztof Kosi??ski Date: Sun, 5 Jul 2015 03:47:36 +0200 Subject: Fix compilation failure in make check (bzr r14228) --- src/2geom/!PLEASE DON'T MAKE CHANGES IN THESE FILES.README | 4 ++-- src/2geom/forward.h | 2 -- src/2geom/path.h | 1 + 3 files changed, 3 insertions(+), 4 deletions(-) (limited to 'src/2geom') diff --git a/src/2geom/!PLEASE DON'T MAKE CHANGES IN THESE FILES.README b/src/2geom/!PLEASE DON'T MAKE CHANGES IN THESE FILES.README index 074921de2..e94a549f6 100644 --- a/src/2geom/!PLEASE DON'T MAKE CHANGES IN THESE FILES.README +++ b/src/2geom/!PLEASE DON'T MAKE CHANGES IN THESE FILES.README @@ -2,11 +2,11 @@ This is an in-tree copy of lib2geom, a 2D geometry library started by Inkscape developers. If you want to change code in 2Geom, you should commit it first to upstream repository and then execute this command: -rsync -r --existing /path/to/lib2geom/src/2geom /path/to/inkscape/src/2geom +rsync -r --existing --exclude CMakeLists.txt /path/to/lib2geom/src/2geom/ /path/to/inkscape/src/2geom/ The command above will only update existing files. If you add new files to 2Geom, you'll need to copy the new files manually. Same if you remove -some files. +some files. Note that the trailing slashes are required! 2geom's BZR repo = lp:lib2geom http://lib2geom.sourceforge.net diff --git a/src/2geom/forward.h b/src/2geom/forward.h index cf9c75988..27909242c 100644 --- a/src/2geom/forward.h +++ b/src/2geom/forward.h @@ -72,8 +72,6 @@ class ConvexHull; class Curve; class SBasisCurve; class BezierCurve; -class HLineSegment; -class VLineSegment; template class BezierCurveN; typedef BezierCurveN<1> LineSegment; typedef BezierCurveN<2> QuadraticBezier; diff --git a/src/2geom/path.h b/src/2geom/path.h index a2d1e751e..3ca43e0e5 100644 --- a/src/2geom/path.h +++ b/src/2geom/path.h @@ -389,6 +389,7 @@ public: swap(other._curves, _curves); swap(other._closing_seg, _closing_seg); swap(other._closed, _closed); + swap(other._exception_on_stitch, _exception_on_stitch); } /** @brief Swap contents of two paths. * @relates Path */ -- cgit v1.2.3