Merge branch 'v1.5-fixes' for release

OctoMap · Feb 27, 2013 · a37f359 · a37f359
2 parents 409ce68 + 4a117df
commit a37f359
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 437 deletions.
diff --git a/octomap/CHANGELOG.txt b/octomap/CHANGELOG.txt
@@ -1,5 +1,10 @@
+v1.5.4: 2013-02-27
+==================
+- Removed binvox binaries from sources for improved packaging compatibility
+  (ticket #18). Download from www.cs.princeton.edu/~min/binvox/ instead.
+
 v1.5.3: 2012-12-18
-=================
+==================
 - CMakeConfig now installs into share/octomap instead of lib/cmake/octomap for
 	better compatibility with ROS
 - ROS package.xml removed, will be added in the release process

diff --git a/octomap/CMakeLists.txt b/octomap/CMakeLists.txt
@@ -39,12 +39,6 @@ set(INSTALL_TARGETS_DEFAULT_ARGS
 ADD_SUBDIRECTORY( src/math )
 ADD_SUBDIRECTORY( src )
 
-# installation for external targets:
-install(PROGRAMS "extern/binvox/binvox" DESTINATION bin)
-install(PROGRAMS "extern/binvox/binvox64" DESTINATION bin)
-install(PROGRAMS "extern/binvox/viewvox" DESTINATION bin)
-install(PROGRAMS "extern/binvox/viewvox64" DESTINATION bin)
-
 file(GLOB octomap_HDRS ${PROJECT_SOURCE_DIR}/include/octomap/*.h ${PROJECT_SOURCE_DIR}/include/octomap/*.hxx)
 install(FILES ${octomap_HDRS}	DESTINATION include/octomap)
 file(GLOB octomap_math_HDRS ${PROJECT_SOURCE_DIR}/include/octomap/math/*.h)

diff --git a/octomap/extern/README_BINVOX b/octomap/extern/README_BINVOX
@@ -0,0 +1,5 @@
+binvox (and viewvox) binaries are no longer provided in the
+OctoMap source. Please obtain the latest versions from:
+
+http://www.cs.princeton.edu/~min/binvox
+
diff --git a/octomap/extern/binvox/LICENSE b/octomap/extern/binvox/LICENSE
diff --git a/octomap/extern/binvox/README b/octomap/extern/binvox/README
diff --git a/octomap/extern/binvox/binvox b/octomap/extern/binvox/binvox
diff --git a/octomap/extern/binvox/binvox64 b/octomap/extern/binvox/binvox64
diff --git a/octomap/extern/binvox/viewvox b/octomap/extern/binvox/viewvox
diff --git a/octomap/extern/binvox/viewvox64 b/octomap/extern/binvox/viewvox64
diff --git a/octomap/include/octomap/OccupancyOcTreeBase.hxx b/octomap/include/octomap/OccupancyOcTreeBase.hxx
@@ -200,6 +200,7 @@ namespace octomap {
     OcTreeKey key;
     if (!this->coordToKeyChecked(value, key))
       return NULL;
+
     return updateNode(key, log_odds_update, lazy_eval);
   }
 
@@ -208,6 +209,7 @@ namespace octomap {
     OcTreeKey key;
     if (!this->coordToKeyChecked(x, y, z, key))
       return NULL;
+
     return updateNode(key, log_odds_update, lazy_eval);
   }