[geos-commits] r2524 - in branches/3.0/source: headers/geos index/quadtree

[svn_geos at osgeo.org]

Author: pramsey
Date: 2009-05-27 14:47:18 -0400 (Wed, 27 May 2009)
New Revision: 2524

Modified:
   branches/3.0/source/headers/geos/Makefile.am
   branches/3.0/source/index/quadtree/NodeBase.cpp
Log:
Backport r2414 from trunk.


Modified: branches/3.0/source/headers/geos/Makefile.am
===================================================================
--- branches/3.0/source/headers/geos/Makefile.am	2009-05-27 18:39:59 UTC (rev 2523)
+++ branches/3.0/source/headers/geos/Makefile.am	2009-05-27 18:47:18 UTC (rev 2524)
@@ -11,7 +11,7 @@
 	simplify \
 	util 
 
-EXTRA_DIST = platform.h.vc version.h
+EXTRA_DIST = platform.h.vc version.h version.h.vc
 
 
 geosdir = $(includedir)/geos

Modified: branches/3.0/source/index/quadtree/NodeBase.cpp
===================================================================
--- branches/3.0/source/index/quadtree/NodeBase.cpp	2009-05-27 18:39:59 UTC (rev 2523)
+++ branches/3.0/source/index/quadtree/NodeBase.cpp	2009-05-27 18:47:18 UTC (rev 2524)
@@ -215,7 +215,10 @@
 			if (found) {
 				// trim subtree if empty
 				if (subnode[i]->isPrunable())
-				subnode[i] = NULL;
+				{
+					delete subnode[i];
+					subnode[i] = NULL;
+				}
 				break;
 			}
 		}