[SCM] geos branch, master, updated. upstream/3.2.2-30-g04972d8

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit f2d1d8d2a7917c4108ee708e9ed4ba90ced86e3e
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Tue May 24 17:31:54 2011 +0200

    Fixed again FTBS for missing NULL decl.

diff --git a/debian/changelog b/debian/changelog
index 1b14516..5049b8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,9 +4,10 @@ geos (3.2.2-2) unstable; urgency=low
   * Fixed previous changelog entry.
   * Added CoordinateSequenceFactory.h patch to fix a missing declaration.
     (closes: #624949)
-  * Added Bintree.cpp patch to fix a missing header file inclusion.
+  * Added Bintree.cppi and Node.cpp patch to fix a missing header 
+    file inclusion in some files.
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 24 May 2011 17:07:20 +0200
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 24 May 2011 17:31:19 +0200
 
 geos (3.2.2-1) unstable; urgency=low
 
diff --git a/debian/patches/Node.cpp b/debian/patches/Node.cpp
new file mode 100644
index 0000000..f514140
--- /dev/null
+++ b/debian/patches/Node.cpp
@@ -0,0 +1,111 @@
+Index: geos/source/index/bintree/Node.cpp
+===================================================================
+--- geos.orig/source/index/bintree/Node.cpp	2011-05-24 17:26:38.000000000 +0200
++++ geos/source/index/bintree/Node.cpp	2011-05-24 17:27:28.000000000 +0200
+@@ -15,6 +15,7 @@
+  **********************************************************************/
+ 
+ #include <cassert>
++#include <cstddef>
+ 
+ #include <geos/index/bintree/Node.h>
+ #include <geos/index/bintree/Key.h>
+@@ -38,9 +39,9 @@
+ Node::createExpanded(Node *node,Interval *addInterval)
+ {
+ 	Interval *expandInt=new Interval(addInterval);
+-	if (node!=NULL) expandInt->expandToInclude(node->interval);
++	if (node!=std::NULL) expandInt->expandToInclude(node->interval);
+ 	Node *largerNode=createNode(expandInt);
+-	if (node!=NULL) largerNode->insert(node);
++	if (node!=std::NULL) largerNode->insert(node);
+ 	delete expandInt;
+ 	return largerNode;
+ }
+@@ -99,7 +100,7 @@
+ 	int subnodeIndex=getSubnodeIndex(searchInterval,centre);
+ 	if (subnodeIndex==-1)
+ 		return this;
+-	if (subnode[subnodeIndex]!=NULL) {
++	if (subnode[subnodeIndex]!=std::NULL) {
+ 		// query lies in subnode, so search it
+ 		Node *node=subnode[subnodeIndex];
+ 		return node->find(searchInterval);
+@@ -111,7 +112,7 @@
+ void
+ Node::insert(Node *node)
+ {
+-	assert(interval==NULL || interval->contains(node->interval));
++	assert(interval==std::NULL || interval->contains(node->interval));
+ 	int index=getSubnodeIndex(node->interval,centre);
+ 	if (node->level==level-1) {
+ 		subnode[index]=node;
+@@ -131,7 +132,7 @@
+ Node*
+ Node::getSubnode(int index)
+ {
+-	if (subnode[index]==NULL) {
++	if (subnode[index]==std::NULL) {
+ 		subnode[index]=createSubnode(index);
+ 	}
+ 	return subnode[index];
+Index: geos/source/geomgraph/Node.cpp
+===================================================================
+--- geos.orig/source/geomgraph/Node.cpp	2011-05-24 17:29:37.000000000 +0200
++++ geos/source/geomgraph/Node.cpp	2011-05-24 17:30:35.000000000 +0200
+@@ -30,6 +30,7 @@
+ #include <sstream>
+ #include <vector>
+ #include <algorithm>
++#include <cstddef>
+ 
+ #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;
+Index: geos/source/index/quadtree/Node.cpp
+===================================================================
+--- geos.orig/source/index/quadtree/Node.cpp	2011-05-24 17:28:56.000000000 +0200
++++ geos/source/index/quadtree/Node.cpp	2011-05-24 17:29:13.000000000 +0200
+@@ -25,6 +25,7 @@
+ #include <string>
+ #include <sstream>
+ #include <cassert>
++#include <cstddef>
+ 
+ #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();
+ 	}
diff --git a/debian/patches/series b/debian/patches/series
index a935e1b..87c61d4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 CoordinateSequenceFactory.h
 Bintree.cpp
+Node.cpp

-- 
Geometry engine for Geographic Information Systems