[SCM] geos branch, upstream, updated. upstream/3.3.2-56-g722309c

Francesco Paolo Lovergine frankie at debian.org
Thu May 17 18:32:16 UTC 2012


The following commit has been merged in the upstream branch:
commit 04972d8aedaf23df082f31d152f1ea4778dbdde6
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Wed May 25 18:04:20 2011 +0200

    Patch for TaggedLineStringSimplifier.h

diff --git a/debian/patches/TaggedLineStringSimplifier.h b/debian/patches/TaggedLineStringSimplifier.h
new file mode 100644
index 0000000..61cbb03
--- /dev/null
+++ b/debian/patches/TaggedLineStringSimplifier.h
@@ -0,0 +1,20 @@
+Index: geos/source/headers/geos/simplify/TaggedLineStringSimplifier.h
+===================================================================
+--- geos.orig/source/headers/geos/simplify/TaggedLineStringSimplifier.h	2011-05-25 17:59:12.000000000 +0200
++++ geos/source/headers/geos/simplify/TaggedLineStringSimplifier.h	2011-05-25 17:59:30.000000000 +0200
+@@ -28,6 +28,7 @@
+ #include <geos/export.h>
+ #include <vector>
+ #include <memory>
++#include <cstddef>
+ 
+ // Forward declarations
+ namespace geos {
+@@ -48,6 +49,7 @@
+ namespace geos {
+ namespace simplify { // geos::simplify
+ 
++using namespace std;
+ 
+ /** \brief
+  * Simplifies a TaggedLineString, preserving topology
diff --git a/debian/patches/series b/debian/patches/series
index 3860547..c778044 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ DirectedEdgeStar.h
 DouglasPeuckerLineSimplifier.h
 TaggedLineString.cpp
 TaggedLineString.h
+TaggedLineStringSimplifier.h

-- 
Geometry engine for Geographic Information Systems



More information about the Pkg-grass-devel mailing list