[GRASS-SVN] r52250 - grass/trunk/lib/vector/rtree

[svn_grass at osgeo.org]

Author: mmetz
Date: 2012-06-28 09:07:54 -0700 (Thu, 28 Jun 2012)
New Revision: 52250

Modified:
   grass/trunk/lib/vector/rtree/index.h
   grass/trunk/lib/vector/rtree/node.c
   grass/trunk/lib/vector/rtree/rtree.h
Log:
rtree lib: fix RTreeNewNode(), make RTreeCopyNode() public

Modified: grass/trunk/lib/vector/rtree/index.h
===================================================================
--- grass/trunk/lib/vector/rtree/index.h	2012-06-28 11:41:37 UTC (rev 52249)
+++ grass/trunk/lib/vector/rtree/index.h	2012-06-28 16:07:54 UTC (rev 52250)
@@ -80,7 +80,6 @@
 void RTreeDisconnectBranch(struct RTree_Node *, int, struct RTree *);
 void RTreePrintNode(struct RTree_Node *, int, struct RTree *);
 void RTreeTabIn(int);
-void RTreeCopyNode(struct RTree_Node *, struct RTree_Node *, struct RTree *);
 void RTreeCopyBranch(struct RTree_Branch *, struct RTree_Branch *, struct RTree *);
 
 /* rect.c */

Modified: grass/trunk/lib/vector/rtree/node.c
===================================================================
--- grass/trunk/lib/vector/rtree/node.c	2012-06-28 11:41:37 UTC (rev 52249)
+++ grass/trunk/lib/vector/rtree/node.c	2012-06-28 16:07:54 UTC (rev 52250)
@@ -80,7 +80,7 @@
     assert(n);
 
     n->count = 0;
-    n->level = -1;
+    n->level = level;
 
     for (i = 0; i < MAXCARD; i++) {
 	RTreeNewRect(&(n->branch[i].rect), t);

Modified: grass/trunk/lib/vector/rtree/rtree.h
===================================================================
--- grass/trunk/lib/vector/rtree/rtree.h	2012-06-28 11:41:37 UTC (rev 52249)
+++ grass/trunk/lib/vector/rtree/rtree.h	2012-06-28 16:07:54 UTC (rev 52250)
@@ -204,6 +204,7 @@
 /* RTree node management */
 struct RTree_Node *RTreeNewNode(struct RTree *, int);
 void RTreeInitNode(struct RTree *, struct RTree_Node *, int);
+void RTreeCopyNode(struct RTree_Node *, struct RTree_Node *, struct RTree *);
 void RTreeFreeNode(struct RTree_Node *);
 void RTreeDestroyNode(struct RTree_Node *, int);