Merge branch 'fix-deleteNodeRecurs' of https://github.com/xinyiz/octomap into fix-deleteNodeRecurs

xinyiz · xinyiz · commit 76cb6ec747a0 · 2020-03-23T11:51:36.000-07:00
diff --git a/octomap/include/octomap/OcTreeBaseImpl.hxx b/octomap/include/octomap/OcTreeBaseImpl.hxx
@@ -705,13 +705,13 @@ namespace octomap {
       // TODO delete check depth, what happens to inner nodes with children?
       this->deleteNodeChild(node, pos);
 
-      if (!nodeHasChildren(node))
-        if(node->children != NULL){
+      if (!nodeHasChildren(node)){
+        if (node->children != NULL){
           delete[] node->children;
           node->children = NULL;
         }
         return true;
-      else{
+      } else {
         node->updateOccupancyChildren(); // TODO: occupancy?
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -705,13 +705,13 @@ namespace octomap {`
`705`	`705`	`// TODO delete check depth, what happens to inner nodes with children?`
`706`	`706`	`this->deleteNodeChild(node, pos);`
`707`	`707`
`708`		`- if (!nodeHasChildren(node))`
`709`		`- if(node->children != NULL){`
	`708`	`+ if (!nodeHasChildren(node)){`
	`709`	`+ if (node->children != NULL){`
`710`	`710`	`delete[] node->children;`
`711`	`711`	`node->children = NULL;`
`712`	`712`	`}`
`713`	`713`	`return true;`
`714`		`- else{`
	`714`	`+ } else {`
`715`	`715`	`node->updateOccupancyChildren(); // TODO: occupancy?`
`716`	`716`	`}`
`717`	`717`	`}`