소스 검색

rtree lib: fix RTreeNewNode(), make RTreeCopyNode() public

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@52250 15284696-431f-4ddb-bdfa-cd5b030d7da7
Markus Metz 13 년 전
부모
커밋
25a89a9a9e
3개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  1. 0 1
      lib/vector/rtree/index.h
  2. 1 1
      lib/vector/rtree/node.c
  3. 1 0
      lib/vector/rtree/rtree.h

+ 0 - 1
lib/vector/rtree/index.h

@@ -80,7 +80,6 @@ int RTreePickBranch(struct RTree_Rect *, struct RTree_Node *, struct RTree *);
 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 */

+ 1 - 1
lib/vector/rtree/node.c

@@ -80,7 +80,7 @@ struct RTree_Node *RTreeNewNode(struct RTree *t, int level)
     assert(n);
 
     n->count = 0;
-    n->level = -1;
+    n->level = level;
 
     for (i = 0; i < MAXCARD; i++) {
 	RTreeNewRect(&(n->branch[i].rect), t);

+ 1 - 0
lib/vector/rtree/rtree.h

@@ -204,6 +204,7 @@ int RTreeOverlap(struct RTree_Rect *, struct RTree_Rect *, struct RTree *);
 /* 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);