The following commit has been merged in the upstream branch: commit d5bd9aa0d7ec5f1c4935e5f28666ce431fab2775 Author: Francesco Paolo Lovergine <fran...@debian.org> Date: Wed May 25 13:04:07 2011 +0200
Revised patchset. diff --git a/debian/patches/Bintree.cpp b/debian/patches/Bintree.cpp index 2dc9748..801eb4d 100644 --- a/debian/patches/Bintree.cpp +++ b/debian/patches/Bintree.cpp @@ -1,7 +1,7 @@ Index: geos/source/index/bintree/Bintree.cpp =================================================================== ---- geos.orig/source/index/bintree/Bintree.cpp 2011-05-24 18:10:41.000000000 +0200 -+++ geos/source/index/bintree/Bintree.cpp 2011-05-24 18:11:29.000000000 +0200 +--- geos.orig/source/index/bintree/Bintree.cpp 2011-05-25 12:56:17.000000000 +0200 ++++ geos/source/index/bintree/Bintree.cpp 2011-05-25 12:58:36.000000000 +0200 @@ -18,6 +18,7 @@ #include <geos/index/bintree/Root.h> #include <geos/index/bintree/Interval.h> @@ -10,29 +10,3 @@ Index: geos/source/index/bintree/Bintree.cpp namespace geos { namespace index { // geos.index -@@ -66,14 +67,14 @@ - int - Bintree::depth() - { -- if (root!=NULL) return root->depth(); -+ if (root!=std::NULL) return root->depth(); - return 0; - } - - int - Bintree::size() - { -- if (root!=NULL) return root->size(); -+ if (root!=std::NULL) return root->size(); - return 0; - } - -@@ -85,7 +86,7 @@ - int - Bintree::nodeSize() - { -- if (root!=NULL) return root->nodeSize(); -+ if (root!=std::NULL) return root->nodeSize(); - return 0; - } - diff --git a/debian/patches/Node.cpp b/debian/patches/Node.cpp index 506bb11..5d1b30c 100644 --- a/debian/patches/Node.cpp +++ b/debian/patches/Node.cpp @@ -1,7 +1,7 @@ Index: geos/source/index/bintree/Node.cpp =================================================================== ---- geos.orig/source/index/bintree/Node.cpp 2011-05-25 12:45:36.000000000 +0200 -+++ geos/source/index/bintree/Node.cpp 2011-05-25 12:46:20.000000000 +0200 +--- geos.orig/source/index/bintree/Node.cpp 2011-05-25 12:56:17.000000000 +0200 ++++ geos/source/index/bintree/Node.cpp 2011-05-25 12:58:49.000000000 +0200 @@ -15,6 +15,7 @@ **********************************************************************/ @@ -21,8 +21,8 @@ Index: geos/source/index/bintree/Node.cpp { Index: geos/source/geomgraph/Node.cpp =================================================================== ---- geos.orig/source/geomgraph/Node.cpp 2011-05-25 12:45:36.000000000 +0200 -+++ geos/source/geomgraph/Node.cpp 2011-05-25 12:45:40.000000000 +0200 +--- geos.orig/source/geomgraph/Node.cpp 2011-05-25 12:56:17.000000000 +0200 ++++ geos/source/geomgraph/Node.cpp 2011-05-25 13:00:59.000000000 +0200 @@ -30,6 +30,7 @@ #include <sstream> #include <vector> @@ -31,28 +31,25 @@ Index: geos/source/geomgraph/Node.cpp #ifndef GEOS_DEBUG #define GEOS_DEBUG 0 -@@ -178,7 +179,7 @@ - void - Node::setLabel(int argIndex, int onLocation) - { -- if (label==NULL) { -+ if (label==std::NULL) { - label=new Label(argIndex, onLocation); - } else - label->setLocation(argIndex, onLocation); -@@ -191,7 +192,7 @@ - Node::setLabelBoundary(int argIndex) - { - int loc=Location::UNDEF; -- if (label!=NULL) -+ if (label!=std::NULL) - loc=label->getLocation(argIndex); - // flip the loc - int newLoc; +@@ -38,12 +39,13 @@ + #define COMPUTE_Z 1 + #endif + +-using namespace std; + using namespace geos::geom; + + namespace geos { + namespace geomgraph { // geos.geomgraph + ++using namespace std; ++ + /*public*/ + Node::Node(const Coordinate& newCoord, EdgeEndStar* newEdges) + : Index: geos/source/index/quadtree/Node.cpp =================================================================== ---- geos.orig/source/index/quadtree/Node.cpp 2011-05-25 12:45:36.000000000 +0200 -+++ geos/source/index/quadtree/Node.cpp 2011-05-25 12:45:40.000000000 +0200 +--- geos.orig/source/index/quadtree/Node.cpp 2011-05-25 12:56:17.000000000 +0200 ++++ geos/source/index/quadtree/Node.cpp 2011-05-25 13:02:00.000000000 +0200 @@ -25,6 +25,7 @@ #include <string> #include <sstream> @@ -61,51 +58,12 @@ Index: geos/source/index/quadtree/Node.cpp #ifndef GEOS_DEBUG #define GEOS_DEBUG 0 -@@ -103,7 +104,7 @@ - int subnodeIndex=getSubnodeIndex(searchEnv, centre); - if (subnodeIndex==-1) - return this; -- if (subnode[subnodeIndex]!=NULL) { -+ if (subnode[subnodeIndex]!=std::NULL) { - // query lies in subquad, so search it - Node *node=subnode[subnodeIndex]; - return node->find(searchEnv); -@@ -146,7 +147,7 @@ - Node::getSubnode(int index) - { - assert(index >=0 && index < 4); -- if (subnode[index] == NULL) -+ if (subnode[index] == std::NULL) - { - subnode[index] = createSubnode(index).release(); - } -Index: geos/source/index/bintree/Bintree.cpp -=================================================================== ---- geos.orig/source/index/bintree/Bintree.cpp 2011-05-25 12:45:40.000000000 +0200 -+++ geos/source/index/bintree/Bintree.cpp 2011-05-25 12:45:40.000000000 +0200 -@@ -67,14 +67,14 @@ - int - Bintree::depth() - { -- if (root!=std::NULL) return root->depth(); -+ if (root!=NULL) return root->depth(); - return 0; - } - - int - Bintree::size() - { -- if (root!=std::NULL) return root->size(); -+ if (root!=NULL) return root->size(); - return 0; - } - -@@ -86,7 +86,7 @@ - int - Bintree::nodeSize() - { -- if (root!=std::NULL) return root->nodeSize(); -+ if (root!=NULL) return root->nodeSize(); - return 0; - } +@@ -41,6 +42,8 @@ + namespace index { // geos.index + namespace quadtree { // geos.index.quadtree ++using namespace std; ++ + /* public static */ + std::auto_ptr<Node> + Node::createNode(const Envelope& env) diff --git a/debian/patches/Root.cpp b/debian/patches/Root.cpp new file mode 100644 index 0000000..17e4642 --- /dev/null +++ b/debian/patches/Root.cpp @@ -0,0 +1,40 @@ +Index: geos/source/index/bintree/Root.cpp +=================================================================== +--- geos.orig/source/index/bintree/Root.cpp 2011-05-25 13:02:47.000000000 +0200 ++++ geos/source/index/bintree/Root.cpp 2011-05-25 13:03:44.000000000 +0200 +@@ -20,11 +20,14 @@ + #include <geos/index/quadtree/IntervalSize.h> + + #include <cassert> ++#include <cstddef> + + namespace geos { + namespace index { // geos.index + namespace bintree { // geos.index.bintree + ++using namespace std; ++ + double Root::origin=0.0; + + void +Index: geos/source/index/quadtree/Root.cpp +=================================================================== +--- geos.orig/source/index/quadtree/Root.cpp 2011-05-25 13:02:47.000000000 +0200 ++++ geos/source/index/quadtree/Root.cpp 2011-05-25 13:03:17.000000000 +0200 +@@ -25,6 +25,7 @@ + #include <geos/geom/Envelope.h> + + #include <cassert> ++#include <cstddef> + + #ifndef GEOS_DEBUG + #define GEOS_DEBUG 0 +@@ -40,6 +41,8 @@ + namespace index { // geos.index + namespace quadtree { // geos.index.quadtree + ++using namespace std; ++ + // the singleton root quad is centred at the origin. + //Coordinate* Root::origin=new Coordinate(0.0, 0.0); + const Coordinate Root::origin(0.0, 0.0); diff --git a/debian/patches/series b/debian/patches/series index 87c61d4..49fdacb 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ CoordinateSequenceFactory.h Bintree.cpp Node.cpp +Root.cpp -- Geometry engine for Geographic Information Systems _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel