Merge branch 'devel' for 1.9.1 release

OctoMap · Nov 23, 2019 · 0b7eb0e · 0b7eb0e
2 parents bf3b394 + 046920a
commit 0b7eb0e
Show file tree

Hide file tree

Showing 24 changed files with 306 additions and 299 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,6 +2,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)
 PROJECT( octomap-distribution )
 
 ENABLE_TESTING()  # enable CTest environment of subprojects
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)  # enables -fPIC in applicable compilers (required to avoid link errors in some cases)
 
 option(BUILD_OCTOVIS_SUBPROJECT "Build targets from subproject octovis" ON)
 option(BUILD_DYNAMICETD3D_SUBPROJECT  "Build targets from subproject dynamicEDT3D" ON)

diff --git a/dynamicEDT3D/CMakeLists.txt b/dynamicEDT3D/CMakeLists.txt
@@ -6,7 +6,7 @@ include(CTest)
 # version (e.g. for packaging)
 set(DYNAMICEDT3D_MAJOR_VERSION 1)
 set(DYNAMICEDT3D_MINOR_VERSION 9)
-set(DYNAMICEDT3D_PATCH_VERSION 0)
+set(DYNAMICEDT3D_PATCH_VERSION 1)
 set(DYNAMICEDT3D_VERSION ${DYNAMICEDT3D_MAJOR_VERSION}.${DYNAMICEDT3D_MINOR_VERSION}.${DYNAMICEDT3D_PATCH_VERSION})
 set(DYNAMICEDT3D_SOVERSION ${DYNAMICEDT3D_MAJOR_VERSION}.${DYNAMICEDT3D_MINOR_VERSION})
 

diff --git a/dynamicEDT3D/package.xml b/dynamicEDT3D/package.xml
@@ -1,25 +1,20 @@
-<package>
+<package format="2">
   <name>dynamic_edt_3d</name>
-  <version>1.9.0</version>
+  <version>1.9.1</version>
   <description> The dynamicEDT3D library implements an inrementally updatable Euclidean distance transform (EDT) in 3D. It comes with a wrapper to use the OctoMap 3D representation and hooks into the change detection of the OctoMap library to propagate changes to the EDT.</description>
 
   <author email="sprunkc@informatik.uni-freiburg.de">Christoph Sprunk</author>
   <maintainer email="sprunkc@informatik.uni-freiburg.de">Christoph Sprunk</maintainer>
+  <maintainer email="w.merkt+oss@gmail.com">Wolfgang Merkt</maintainer>
   <license>BSD</license>
 
   <url type="website">http://octomap.github.io</url>
   <url type="bugtracker">https://github.com/OctoMap/octomap/issues</url>
 
-  <build_depend>octomap</build_depend>
-
-  <run_depend>octomap</run_depend>  
-  <run_depend>catkin</run_depend>
-
+  <depend>octomap</depend>
   <buildtool_depend>cmake</buildtool_depend>
 
-
   <export>
     <build_type>cmake</build_type>
   </export>
-
 </package>
diff --git a/octomap/CHANGELOG.txt b/octomap/CHANGELOG.txt
@@ -1,3 +1,7 @@
+v1.9.1: 2019-11-23
+==================
+- Improved compatibility with modern compilers and ROS2
+
 v1.9.0: 2017-04-28
 ==================
 - Fixed getUnknownLeafCenters to return true leaf centers (thx to A. Ecins)

diff --git a/octomap/CMakeLists.txt b/octomap/CMakeLists.txt
@@ -6,7 +6,7 @@ include(CTest)
 # version (e.g. for packaging)
 set(OCTOMAP_MAJOR_VERSION 1)
 set(OCTOMAP_MINOR_VERSION 9)
-set(OCTOMAP_PATCH_VERSION 0)
+set(OCTOMAP_PATCH_VERSION 1)
 set(OCTOMAP_VERSION ${OCTOMAP_MAJOR_VERSION}.${OCTOMAP_MINOR_VERSION}.${OCTOMAP_PATCH_VERSION})
 set(OCTOMAP_SOVERSION ${OCTOMAP_MAJOR_VERSION}.${OCTOMAP_MINOR_VERSION})
 if(COMMAND cmake_policy)

diff --git a/octomap/README.md b/octomap/README.md
@@ -19,9 +19,9 @@ REQUIREMENTS
 
 Skip to WINDOWS for tips on compilation under Windows. You can install all dependencies on Ubuntu by running:
 
-    sudo apt-get install cmake doxygen libqt4-dev libqt4-opengl-dev libqglviewer-qt4-dev
+    sudo apt-get install cmake doxygen libqt4-dev libqt4-opengl-dev libqglviewer-dev-qt4
        
-
+(Note: for older releases of Ubuntu you need to exchange the last package name with `libqglviewer-qt4-dev`)
 
 INSTALLATION
 ------------

diff --git a/octomap/include/octomap/MapNode.hxx b/octomap/include/octomap/MapNode.hxx
@@ -38,27 +38,27 @@ namespace octomap {
   }
 
   template <class TREETYPE>
-  MapNode<TREETYPE>::MapNode(TREETYPE* node_map, pose6d origin) {
-  	this->node_map = node_map;
-  	this->origin = origin;
+  MapNode<TREETYPE>::MapNode(TREETYPE* in_node_map, pose6d in_origin) {
+  	this->node_map = in_node_map;
+  	this->origin = in_origin;
   }
 
   template <class TREETYPE>
-  MapNode<TREETYPE>::MapNode(const Pointcloud& cloud, pose6d origin): node_map(0) {
+  MapNode<TREETYPE>::MapNode(const Pointcloud& in_cloud, pose6d in_origin): node_map(0) {
   }
 
   template <class TREETYPE>
-  MapNode<TREETYPE>::MapNode(std::string filename, pose6d origin): node_map(0){
+  MapNode<TREETYPE>::MapNode(std::string filename, pose6d in_origin): node_map(0){
   	readMap(filename);
-  	this->origin = origin;
+  	this->origin = in_origin;
   	id = filename;
   }
 
   template <class TREETYPE>
   MapNode<TREETYPE>::~MapNode() {
   	clear();
   }
-    
+
   template <class TREETYPE>
   void MapNode<TREETYPE>::updateMap(const Pointcloud& cloud, point3d sensor_origin) {
   }