The following commit has been merged in the upstream branch:
commit 4af268b2f7d2822a7084a3608758a20458d5dd4a
Author: Francesco Paolo Lovergine <fran...@debian.org>
Date: Wed May 25 12:35:50 2011 +0200
Changed a bit Node.cpp patch.
diff --git a/debian/patches/Node.cpp b/debian/patches/Node.cpp
index e858991..bec4a7d 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-24 17:31:02.000000000
+0200
-+++ geos/source/index/bintree/Node.cpp 2011-05-24 17:54:22.000000000 +0200
+--- geos.orig/source/index/bintree/Node.cpp 2011-05-24 18:16:35.000000000
+0200
++++ geos/source/index/bintree/Node.cpp 2011-05-25 12:17:04.000000000 +0200
@@ -15,6 +15,7 @@
**********************************************************************/
@@ -51,8 +51,8 @@ Index: geos/source/index/bintree/Node.cpp
return subnode[index];
Index: geos/source/geomgraph/Node.cpp
===================================================================
---- geos.orig/source/geomgraph/Node.cpp 2011-05-24 17:31:02.000000000
+0200
-+++ geos/source/geomgraph/Node.cpp 2011-05-24 17:54:22.000000000 +0200
+--- geos.orig/source/geomgraph/Node.cpp 2011-05-24 18:16:35.000000000
+0200
++++ geos/source/geomgraph/Node.cpp 2011-05-25 12:17:04.000000000 +0200
@@ -30,6 +30,7 @@
#include <sstream>
#include <vector>
@@ -81,8 +81,8 @@ Index: geos/source/geomgraph/Node.cpp
int newLoc;
Index: geos/source/index/quadtree/Node.cpp
===================================================================
---- geos.orig/source/index/quadtree/Node.cpp 2011-05-24 17:31:02.000000000
+0200
-+++ geos/source/index/quadtree/Node.cpp 2011-05-24 17:54:22.000000000
+0200
+--- geos.orig/source/index/quadtree/Node.cpp 2011-05-24 18:16:35.000000000
+0200
++++ geos/source/index/quadtree/Node.cpp 2011-05-25 12:17:04.000000000
+0200
@@ -25,6 +25,7 @@
#include <string>
#include <sstream>
@@ -109,3 +109,33 @@ Index: geos/source/index/quadtree/Node.cpp
{
subnode[index] = createSubnode(index).release();
}
+Index: geos/source/index/bintree/Bintree.cpp
+===================================================================
+--- geos.orig/source/index/bintree/Bintree.cpp 2011-05-25 12:34:58.000000000
+0200
++++ geos/source/index/bintree/Bintree.cpp 2011-05-25 12:35:09.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;
+ }
+
--
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
