From ea9d7073b9707958d0db28bebd78dc8c69c6e27a Mon Sep 17 00:00:00 2001 From: Bjar Ne Date: Fri, 17 Apr 2020 13:42:32 +0200 Subject: [PATCH 1/7] fix ifstream >> byte with c++17 std::byte can't be read from a file (no overload of operator >> available), fall back to typedef'fing it to unsigned char again. Related: #240 --- octomap/src/binvox2bt.cpp | 8 ++++---- octomap/src/edit_octree.cpp | 3 --- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/octomap/src/binvox2bt.cpp b/octomap/src/binvox2bt.cpp index 1e6358f8..74ad151a 100644 --- a/octomap/src/binvox2bt.cpp +++ b/octomap/src/binvox2bt.cpp @@ -56,9 +56,9 @@ using namespace std; using namespace octomap; -#if __cplusplus < 201500L +namespace octomap { typedef unsigned char byte; -#endif +} int main(int argc, char **argv) { @@ -229,8 +229,8 @@ int main(int argc, char **argv) cout.flush(); // read voxel data - byte value; - byte count; + octomap::byte value; + octomap::byte count; int index = 0; int end_index = 0; unsigned nr_voxels = 0; diff --git a/octomap/src/edit_octree.cpp b/octomap/src/edit_octree.cpp index cedadd64..77cc3b23 100644 --- a/octomap/src/edit_octree.cpp +++ b/octomap/src/edit_octree.cpp @@ -41,9 +41,6 @@ using namespace std; using namespace octomap; -#if __cplusplus < 201500L - typedef unsigned char byte; -#endif int main(int argc, char **argv) { From 845e79fe1bfd3ee8e4ad1817f89c9ee3075dd31f Mon Sep 17 00:00:00 2001 From: Timon Engelke Date: Thu, 21 May 2020 12:41:29 +0200 Subject: [PATCH 2/7] octovis: use -fPIC with all compilers --- octovis/CMakeModules/CompilerSettings.cmake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/octovis/CMakeModules/CompilerSettings.cmake b/octovis/CMakeModules/CompilerSettings.cmake index be432cf7..759902f9 100644 --- a/octovis/CMakeModules/CompilerSettings.cmake +++ b/octovis/CMakeModules/CompilerSettings.cmake @@ -21,8 +21,6 @@ IF (CMAKE_COMPILER_IS_GNUCC) SET (CMAKE_CXX_FLAGS_RELEASE "-O3 -funroll-loops -DNDEBUG") #sse3 disabled for compatibility # SET (CMAKE_CXX_FLAGS_RELEASE "-O3 -funroll-loops -DNDEBUG -msse3 -mssse3") SET (CMAKE_CXX_FLAGS_DEBUG "-O0 -g") - # Shared object compilation under 64bit (vtable) - ADD_DEFINITIONS(-fPIC) # IF(OCTOMAP_OMP) # SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp") # SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} -fopenmp") @@ -36,5 +34,8 @@ set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) +# enables -fPIC in applicable compilers +set(CMAKE_POSITION_INDEPENDENT_CODE ON) + # no prefix needed for python modules set(CMAKE_SHARED_MODULE_PREFIX "") From 43bcc2c5f4649280f5af1992e9fc63eefeae9a83 Mon Sep 17 00:00:00 2001 From: Dennis Lamm Date: Tue, 9 Jun 2020 06:32:53 +0200 Subject: [PATCH 3/7] adapted code to be compatible with libQGLViewer >= 2.7.0 --- octovis/src/ViewerGui.cpp | 21 +++++++++------------ octovis/src/ViewerWidget.cpp | 28 +++++++++++++--------------- 2 files changed, 22 insertions(+), 27 deletions(-) diff --git a/octovis/src/ViewerGui.cpp b/octovis/src/ViewerGui.cpp index dfa65c3c..53a581e8 100644 --- a/octovis/src/ViewerGui.cpp +++ b/octovis/src/ViewerGui.cpp @@ -286,7 +286,7 @@ void ViewerGui::showOcTree() { m_mapSizeStatus->setText(size); //} - m_glwidget->updateGL(); + m_glwidget->update(); // generate cubes -> display // timeval start; @@ -299,7 +299,7 @@ void ViewerGui::showOcTree() { // gettimeofday(&stop, NULL); // stop timer // double time_to_generate = (stop.tv_sec - start.tv_sec) + 1.0e-6 *(stop.tv_usec - start.tv_usec); // fprintf(stderr, "setOcTree took %f sec\n", time_to_generate); - m_glwidget->updateGL(); + m_glwidget->update(); } @@ -983,7 +983,7 @@ void ViewerGui::on_actionSelection_box_toggled(bool checked){ m_glwidget->enableSelectionBox(checked); - m_glwidget->updateGL(); + m_glwidget->update(); } void ViewerGui::on_actionHeight_map_toggled(bool checked){ @@ -1040,7 +1040,7 @@ void ViewerGui::on_actionAxes_toggled(bool checked){ it != m_octrees.end(); ++it) { it->second.octree_drawer->enableAxes(checked); } - m_glwidget->updateGL(); + m_glwidget->update(); } void ViewerGui::on_actionHideBackground_toggled(bool checked) { @@ -1048,7 +1048,7 @@ void ViewerGui::on_actionHideBackground_toggled(bool checked) { if (getOctreeRecord(DEFAULT_OCTREE_ID, r)) { if (checked) m_glwidget->removeSceneObject(r->octree_drawer); else m_glwidget->addSceneObject(r->octree_drawer); - m_glwidget->updateGL(); + m_glwidget->update(); } } @@ -1142,7 +1142,7 @@ void ViewerGui::on_actionOctree_cells_toggled(bool enabled) { it != m_octrees.end(); ++it) { it->second.octree_drawer->enableOcTreeCells(enabled); } - m_glwidget->updateGL(); + m_glwidget->update(); } void ViewerGui::on_actionOctree_structure_toggled(bool enabled) { @@ -1150,7 +1150,7 @@ void ViewerGui::on_actionOctree_structure_toggled(bool enabled) { it != m_octrees.end(); ++it) { it->second.octree_drawer->enableOcTree(enabled); } - m_glwidget->updateGL(); + m_glwidget->update(); } void ViewerGui::on_actionFree_toggled(bool enabled) { @@ -1158,7 +1158,7 @@ void ViewerGui::on_actionFree_toggled(bool enabled) { it != m_octrees.end(); ++it) { it->second.octree_drawer->enableFreespace(enabled); } - m_glwidget->updateGL(); + m_glwidget->update(); } @@ -1176,24 +1176,21 @@ void ViewerGui::on_actionSelected_toggled(bool enabled) { // } else{ // m_octreeDrawer->clearOcTreeSelection(); // } - // m_glwidget->updateGL(); + // m_glwidget->update(); // } } void ViewerGui::on_action_bg_black_triggered() { m_glwidget->setBackgroundColor( QColor(0,0,0) ); - m_glwidget->qglClearColor( m_glwidget->backgroundColor() ); } void ViewerGui::on_action_bg_white_triggered() { m_glwidget->setBackgroundColor( QColor(255,255,255) ); - m_glwidget->qglClearColor( m_glwidget->backgroundColor() ); } void ViewerGui::on_action_bg_gray_triggered() { m_glwidget->setBackgroundColor( QColor(117,117,117) ); - m_glwidget->qglClearColor( m_glwidget->backgroundColor() ); } void ViewerGui::on_savecampose_triggered() { diff --git a/octovis/src/ViewerWidget.cpp b/octovis/src/ViewerWidget.cpp index 2e79fabc..8bfe7867 100644 --- a/octovis/src/ViewerWidget.cpp +++ b/octovis/src/ViewerWidget.cpp @@ -67,13 +67,12 @@ void ViewerWidget::init() { // background color defaults to white this->setBackgroundColor( QColor(255,255,255) ); - this->qglClearColor( this->backgroundColor() ); } void ViewerWidget::resetView(){ this->camera()->setOrientation((float) -M_PI_2, (float) M_PI_2); this->showEntireScene(); - updateGL(); + update(); } @@ -98,7 +97,7 @@ void ViewerWidget::enableHeightColorMode (bool enabled) { for(std::vector::iterator it = m_sceneObjects.begin(); it != m_sceneObjects.end(); it++) { (*it)->enableHeightColorMode(enabled); } - updateGL(); + update(); } void ViewerWidget::enablePrintoutMode(bool enabled) { @@ -106,7 +105,7 @@ void ViewerWidget::enablePrintoutMode(bool enabled) { for(std::vector::iterator it = m_sceneObjects.begin(); it != m_sceneObjects.end(); it++) { (*it)->enablePrintoutMode(enabled); } - updateGL(); + update(); } void ViewerWidget::enableSemanticColoring (bool enabled) { @@ -114,12 +113,12 @@ void ViewerWidget::enableSemanticColoring (bool enabled) { for(std::vector::iterator it = m_sceneObjects.begin(); it != m_sceneObjects.end(); it++) { (*it)->enableSemanticColoring(enabled); } - updateGL(); + update(); } void ViewerWidget::enableSelectionBox(bool enabled) { m_drawSelectionBox = enabled; - updateGL(); + update(); } @@ -145,7 +144,7 @@ void ViewerWidget::setCamPosition(double x, double y, double z, double lookX, do camera()->setPosition(qglviewer::Vec(x, y, z)); camera()->lookAt(qglviewer::Vec(lookX, lookY, lookZ)); camera()->setUpVector(qglviewer::Vec(0.0, 0.0, 1.0)); - updateGL(); + update(); } void ViewerWidget::setCamPose(const octomath::Pose6D& pose){ @@ -161,12 +160,12 @@ void ViewerWidget::jumpToCamFrame(int id, int frame) { } else { std::cerr << "Error: Could not jump to frame " << frame << " of " << kfi->numberOfKeyFrames() << std::endl; } - updateGL(); + update(); } void ViewerWidget::deleteCameraPath(int id) { if(camera()->keyFrameInterpolator(id)) { - disconnect(camera()->keyFrameInterpolator(id), SIGNAL(interpolated()), this, SLOT(updateGL())); + disconnect(camera()->keyFrameInterpolator(id), SIGNAL(interpolated()), this, SLOT(update())); disconnect(camera()->keyFrameInterpolator(id), SIGNAL(interpolated()), this, SLOT(cameraPathInterpolated())); disconnect(camera()->keyFrameInterpolator(id), SIGNAL(endReached()), this, SLOT(cameraPathFinished())); camera()->deletePath(id); @@ -243,7 +242,7 @@ void ViewerWidget::playCameraPath(int id, int start_frame) { m_current_camera_frame = start_frame; kfi->setInterpolationTime(kfi->keyFrameTime(start_frame)); std::cout << "Playing path of length " << kfi->numberOfKeyFrames() << ", start time " << kfi->keyFrameTime(start_frame) << std::endl; - connect(kfi, SIGNAL(interpolated()), this, SLOT(updateGL())); + connect(kfi, SIGNAL(interpolated()), this, SLOT(update())); connect(kfi, SIGNAL(interpolated()), this, SLOT(cameraPathInterpolated())); connect(kfi, SIGNAL(endReached()), this, SLOT(cameraPathFinished())); kfi->startInterpolation(); @@ -252,7 +251,7 @@ void ViewerWidget::playCameraPath(int id, int start_frame) { void ViewerWidget::stopCameraPath(int id) { if(camera()->keyFrameInterpolator(id) && camera()->keyFrameInterpolator(id)->interpolationIsStarted()) { - disconnect(camera()->keyFrameInterpolator(id), SIGNAL(interpolated()), this, SLOT(updateGL())); + disconnect(camera()->keyFrameInterpolator(id), SIGNAL(interpolated()), this, SLOT(update())); disconnect(camera()->keyFrameInterpolator(id), SIGNAL(interpolated()), this, SLOT(cameraPathInterpolated())); disconnect(camera()->keyFrameInterpolator(id), SIGNAL(endReached()), this, SLOT(cameraPathFinished())); camera()->keyFrameInterpolator(id)->stopInterpolation(); @@ -261,7 +260,7 @@ void ViewerWidget::stopCameraPath(int id) { void ViewerWidget::cameraPathFinished() { if(camera()->keyFrameInterpolator(m_current_camera_path)) { - disconnect(camera()->keyFrameInterpolator(m_current_camera_path), SIGNAL(interpolated()), this, SLOT(updateGL())); + disconnect(camera()->keyFrameInterpolator(m_current_camera_path), SIGNAL(interpolated()), this, SLOT(update())); disconnect(camera()->keyFrameInterpolator(m_current_camera_path), SIGNAL(interpolated()), this, SLOT(cameraPathInterpolated())); disconnect(camera()->keyFrameInterpolator(m_current_camera_path), SIGNAL(endReached()), this, SLOT(cameraPathFinished())); emit cameraPathStopped(m_current_camera_path); @@ -292,7 +291,7 @@ void ViewerWidget::setSceneBoundingBox(const qglviewer::Vec& min, const qglviewe void ViewerWidget::addSceneObject(SceneObject* obj){ assert (obj); m_sceneObjects.push_back(obj); - updateGL(); + update(); } void ViewerWidget::removeSceneObject(SceneObject* obj){ @@ -304,7 +303,7 @@ void ViewerWidget::removeSceneObject(SceneObject* obj){ else ++it; } - updateGL(); + update(); } void ViewerWidget::clearAll(){ @@ -364,7 +363,6 @@ void ViewerWidget::postDraw(){ glPushAttrib(GL_ALL_ATTRIB_BITS); glDisable(GL_COLOR_MATERIAL); - qglColor(foregroundColor()); if (gridIsDrawn()){ glLineWidth(1.0); From f053e03f33eaaca5734ee399cc8c4e9216368443 Mon Sep 17 00:00:00 2001 From: Holger Finger Date: Thu, 18 Jun 2020 12:47:25 +0200 Subject: [PATCH 4/7] fix qmake command to build libQGLViewer with Qt5. --- octovis/CMakeModules/FindQGLViewer.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/octovis/CMakeModules/FindQGLViewer.cmake b/octovis/CMakeModules/FindQGLViewer.cmake index 9b64430b..982d294c 100644 --- a/octovis/CMakeModules/FindQGLViewer.cmake +++ b/octovis/CMakeModules/FindQGLViewer.cmake @@ -83,7 +83,7 @@ IF(BUILD_LIB_FROM_SOURCE) MESSAGE(STATUS "\t generating Makefile using qmake") EXECUTE_PROCESS( WORKING_DIRECTORY ${QGLVIEWER_BASE_DIR} - COMMAND qmake-qt4 + COMMAND qmake OUTPUT_QUIET ) ENDIF(QMAKE-QT4) From 85bbd66360290461a9a80927761bf197f6511f6a Mon Sep 17 00:00:00 2001 From: Alexander Date: Sun, 13 Dec 2020 22:18:47 +0300 Subject: [PATCH 5/7] Warnings as errors fixes (#312) strict warnings_as_errors compiler options and corresponding fixes --- octomap/CMakeModules/CompilerSettings.cmake | 2 +- octomap/include/octomap/MapCollection.hxx | 2 +- octomap/include/octomap/OcTreeBase.h | 2 +- octomap/include/octomap/math/Pose6D.h | 2 ++ octomap/src/ColorOcTree.cpp | 2 +- octomap/src/OcTree.cpp | 2 +- octomap/src/intersection_example.cpp | 2 +- octomap/src/math/Pose6D.cpp | 7 ++++++- octomap/src/normals_example.cpp | 2 +- octomap/src/simple_example.cpp | 2 +- octomap/src/testing/color_tree_histogram.cpp | 2 +- octomap/src/testing/test_changedkeys.cpp | 2 +- octomap/src/testing/test_color_tree.cpp | 2 +- octomap/src/testing/test_mapcollection.cpp | 2 +- octomap/src/testing/test_pruning.cpp | 2 +- octomap/src/testing/test_raycasting.cpp | 2 +- 16 files changed, 22 insertions(+), 15 deletions(-) diff --git a/octomap/CMakeModules/CompilerSettings.cmake b/octomap/CMakeModules/CompilerSettings.cmake index 7c986e57..f4bab3e9 100644 --- a/octomap/CMakeModules/CompilerSettings.cmake +++ b/octomap/CMakeModules/CompilerSettings.cmake @@ -10,7 +10,7 @@ MESSAGE (STATUS "${PROJECT_NAME} building as ${CMAKE_BUILD_TYPE}") # COMPILER FLAGS IF (CMAKE_COMPILER_IS_GNUCC) SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wno-error ") - SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-error ") + SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror -Wextra -Wpedantic") SET (CMAKE_CXX_FLAGS_RELEASE "-O3 -funroll-loops -DNDEBUG") SET (CMAKE_CXX_FLAGS_DEBUG "-O0 -g") # Shared object compilation under 64bit (vtable) diff --git a/octomap/include/octomap/MapCollection.hxx b/octomap/include/octomap/MapCollection.hxx index 403745e3..63dbf2db 100644 --- a/octomap/include/octomap/MapCollection.hxx +++ b/octomap/include/octomap/MapCollection.hxx @@ -312,7 +312,7 @@ namespace octomap { } template - bool MapCollection::readTagValue(std::string tag, std::ifstream& infile, std::string* value) { + bool MapCollection::readTagValue(std::string /*tag*/, std::ifstream& infile, std::string* value) { std::string line; while( getline(infile, line) ){ if(line.length() != 0 && line[0] != '#') diff --git a/octomap/include/octomap/OcTreeBase.h b/octomap/include/octomap/OcTreeBase.h index 470a6d6d..2679baa0 100644 --- a/octomap/include/octomap/OcTreeBase.h +++ b/octomap/include/octomap/OcTreeBase.h @@ -51,7 +51,7 @@ namespace octomap { std::string getTreeType() const {return "OcTreeBase";} }; - }; +} #endif diff --git a/octomap/include/octomap/math/Pose6D.h b/octomap/include/octomap/math/Pose6D.h index 31c7e9b9..b9cf393f 100644 --- a/octomap/include/octomap/math/Pose6D.h +++ b/octomap/include/octomap/math/Pose6D.h @@ -68,7 +68,9 @@ namespace octomath { */ Pose6D(float x, float y, float z, double roll, double pitch, double yaw); + Pose6D(const Pose6D& other); Pose6D& operator= (const Pose6D& other); + bool operator==(const Pose6D& other) const; bool operator!=(const Pose6D& other) const; diff --git a/octomap/src/ColorOcTree.cpp b/octomap/src/ColorOcTree.cpp index ba2d605f..5760218f 100644 --- a/octomap/src/ColorOcTree.cpp +++ b/octomap/src/ColorOcTree.cpp @@ -91,7 +91,7 @@ namespace octomap { ColorOcTree::ColorOcTree(double in_resolution) : OccupancyOcTreeBase(in_resolution) { colorOcTreeMemberInit.ensureLinking(); - }; + } ColorOcTreeNode* ColorOcTree::setNodeColor(const OcTreeKey& key, uint8_t r, diff --git a/octomap/src/OcTree.cpp b/octomap/src/OcTree.cpp index fc295f59..69e34c25 100644 --- a/octomap/src/OcTree.cpp +++ b/octomap/src/OcTree.cpp @@ -39,7 +39,7 @@ namespace octomap { OcTree::OcTree(double in_resolution) : OccupancyOcTreeBase(in_resolution) { ocTreeMemberInit.ensureLinking(); - }; + } OcTree::OcTree(std::string _filename) : OccupancyOcTreeBase (0.1) { // resolution will be set according to tree file diff --git a/octomap/src/intersection_example.cpp b/octomap/src/intersection_example.cpp index fb453cad..033915e8 100644 --- a/octomap/src/intersection_example.cpp +++ b/octomap/src/intersection_example.cpp @@ -40,7 +40,7 @@ using namespace std; using namespace octomap; -int main(int argc, char** argv) { +int main(int /*argc*/, char** /*argv*/) { cout << "generating example map" << endl; diff --git a/octomap/src/math/Pose6D.cpp b/octomap/src/math/Pose6D.cpp index 2a031848..8d6a7aeb 100644 --- a/octomap/src/math/Pose6D.cpp +++ b/octomap/src/math/Pose6D.cpp @@ -55,13 +55,18 @@ namespace octomath { Pose6D::~Pose6D() { } + Pose6D::Pose6D(const Pose6D& other) : + translation(other.trans()), + rotation(other.rot()) + { } + Pose6D& Pose6D::operator= (const Pose6D& other) { translation = other.trans(); rotation = other.rot(); return *this; } - + Pose6D Pose6D::inv() const { Pose6D result(*this); result.rot() = rot().inv().normalized(); diff --git a/octomap/src/normals_example.cpp b/octomap/src/normals_example.cpp index e7484830..6a3abab0 100644 --- a/octomap/src/normals_example.cpp +++ b/octomap/src/normals_example.cpp @@ -49,7 +49,7 @@ void print_query_info(point3d query, OcTreeNode* node) { cout << "occupancy probability at " << query << ":\t is unknown" << endl; } -int main(int argc, char** argv) { +int main(int /*argc*/, char** /*argv*/) { cout << endl; cout << "generating example map" << endl; diff --git a/octomap/src/simple_example.cpp b/octomap/src/simple_example.cpp index b59c032d..783f7b1a 100644 --- a/octomap/src/simple_example.cpp +++ b/octomap/src/simple_example.cpp @@ -46,7 +46,7 @@ void print_query_info(point3d query, OcTreeNode* node) { cout << "occupancy probability at " << query << ":\t is unknown" << endl; } -int main(int argc, char** argv) { +int main(int /*argc*/, char** /*argv*/) { cout << endl; cout << "generating example map" << endl; diff --git a/octomap/src/testing/color_tree_histogram.cpp b/octomap/src/testing/color_tree_histogram.cpp index 18c5d9ca..a5f19905 100644 --- a/octomap/src/testing/color_tree_histogram.cpp +++ b/octomap/src/testing/color_tree_histogram.cpp @@ -5,7 +5,7 @@ using namespace std; using namespace octomap; -int main(int argc, char** argv) { +int main(int /*argc*/, char** argv) { std::string filename(argv[1]); diff --git a/octomap/src/testing/test_changedkeys.cpp b/octomap/src/testing/test_changedkeys.cpp index c3d51b3f..46576e32 100644 --- a/octomap/src/testing/test_changedkeys.cpp +++ b/octomap/src/testing/test_changedkeys.cpp @@ -53,7 +53,7 @@ void printChanges(OcTree& tree){ -int main(int argc, char** argv) { +int main(int /*argc*/, char** /*argv*/) { //############################################################## diff --git a/octomap/src/testing/test_color_tree.cpp b/octomap/src/testing/test_color_tree.cpp index 0d76a8a3..fda6d1fa 100644 --- a/octomap/src/testing/test_color_tree.cpp +++ b/octomap/src/testing/test_color_tree.cpp @@ -17,7 +17,7 @@ void print_query_info(point3d query, ColorOcTreeNode* node) { } -int main(int argc, char** argv) { +int main(int /*argc*/, char** /*argv*/) { double res = 0.05; // create empty tree with resolution 0.05 (different from default 0.1 for test) ColorOcTree tree (res); diff --git a/octomap/src/testing/test_mapcollection.cpp b/octomap/src/testing/test_mapcollection.cpp index f88227b0..b05cd768 100644 --- a/octomap/src/testing/test_mapcollection.cpp +++ b/octomap/src/testing/test_mapcollection.cpp @@ -25,7 +25,7 @@ OcTree* generateSphereTree(point3d origin, float radius){ return tree; } -int main(int argc, char** argv) { +int main(int /*argc*/, char** argv) { // //Generate a MapCollection // MapCollection > coll; diff --git a/octomap/src/testing/test_pruning.cpp b/octomap/src/testing/test_pruning.cpp index 4c3a15ae..0e026064 100644 --- a/octomap/src/testing/test_pruning.cpp +++ b/octomap/src/testing/test_pruning.cpp @@ -6,7 +6,7 @@ using namespace std; using namespace octomap; using namespace octomath; -int main(int argc, char** argv) { +int main(int /*argc*/, char** /*argv*/) { float res = 0.01f; OcTree tree(res); diff --git a/octomap/src/testing/test_raycasting.cpp b/octomap/src/testing/test_raycasting.cpp index 3ce1bd7a..a8bd2d91 100644 --- a/octomap/src/testing/test_raycasting.cpp +++ b/octomap/src/testing/test_raycasting.cpp @@ -10,7 +10,7 @@ using namespace octomath; -int main(int argc, char** argv) { +int main(int /*argc*/, char** /*argv*/) { From 51472eb4f6bf2f86ac3e594dfc96d11a792b3a30 Mon Sep 17 00:00:00 2001 From: Wolfgang Merkt Date: Sat, 23 Jan 2021 21:52:42 +0000 Subject: [PATCH 6/7] Add GitHub Actions CI based on ROS-Industrial CI (#316) * Add GitHub Actions CI based on ROS-Industrial CI --- .github/workflows/industrial_ci_action.yml | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 .github/workflows/industrial_ci_action.yml diff --git a/.github/workflows/industrial_ci_action.yml b/.github/workflows/industrial_ci_action.yml new file mode 100644 index 00000000..1d7b62dd --- /dev/null +++ b/.github/workflows/industrial_ci_action.yml @@ -0,0 +1,33 @@ +# This config uses industrial_ci (https://github.com/ros-industrial/industrial_ci.git). +# For troubleshooting, see readme (https://github.com/ros-industrial/industrial_ci/blob/master/README.rst) + +name: CI + +# This determines when this workflow is run +on: [push, pull_request] # on all pushes and PRs + +jobs: + CI: + strategy: + matrix: + env: + - {ROS_DISTRO: melodic} + - {ROS_DISTRO: noetic} + - {ROS_DISTRO: foxy} + - {ROS_DISTRO: rolling} + env: + CCACHE_DIR: /github/home/.ccache # Enable ccache + PRERELEASE: true # always run the prerelease tests + BUILDER: colcon + # CMAKE_ARGS: '-DCMAKE_BUILD_TYPE=Debug' + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + # This step will fetch/store the directory used by ccache before/after the ci run + - uses: actions/cache@v2 + with: + path: ${{ env.CCACHE_DIR }} + key: ccache-${{ matrix.env.ROS_DISTRO }}-${{ matrix.env.ROS_REPO }} + # Run industrial_ci + - uses: 'ros-industrial/industrial_ci@master' + env: ${{ matrix.env }} From daeef25648e2548244971e65b4fa59ae39ef7a8b Mon Sep 17 00:00:00 2001 From: Armin Hornung Date: Sat, 23 Jan 2021 23:10:01 +0100 Subject: [PATCH 7/7] Version 1.9.6 release --- dynamicEDT3D/CMakeLists.txt | 2 +- dynamicEDT3D/package.xml | 2 +- octomap/CHANGELOG.txt | 8 ++++++++ octomap/CMakeLists.txt | 2 +- octomap/package.xml | 2 +- octovis/CMakeLists.txt | 2 +- octovis/package.xml | 2 +- 7 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dynamicEDT3D/CMakeLists.txt b/dynamicEDT3D/CMakeLists.txt index 10ee2241..10b1d6d1 100644 --- a/dynamicEDT3D/CMakeLists.txt +++ b/dynamicEDT3D/CMakeLists.txt @@ -7,7 +7,7 @@ include(GNUInstallDirs) # version (e.g. for packaging) set(DYNAMICEDT3D_MAJOR_VERSION 1) set(DYNAMICEDT3D_MINOR_VERSION 9) -set(DYNAMICEDT3D_PATCH_VERSION 5) +set(DYNAMICEDT3D_PATCH_VERSION 6) 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 index 4d01b241..7f70c921 100644 --- a/dynamicEDT3D/package.xml +++ b/dynamicEDT3D/package.xml @@ -1,6 +1,6 @@ dynamic_edt_3d - 1.9.5 + 1.9.6 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. Christoph Sprunk diff --git a/octomap/CHANGELOG.txt b/octomap/CHANGELOG.txt index e0065cb9..1c58e345 100644 --- a/octomap/CHANGELOG.txt +++ b/octomap/CHANGELOG.txt @@ -1,3 +1,11 @@ +v1.9.6: 2021-01-23 +================== +- Fixed ifstream >> byte with c++17 +- strict warnings_as_errors compiler options and corresponding fixes +- octovis: Fixed qmake command to build libQGLViewer with Qt5. +- octovis: adapted to be compatible with libQGLViewer >= 2.7.0 +- octovis: use -fPIC with all compilers + v1.9.5: 2020-03-25 ================== - octovis: Update ROS dependencies to Qt5 diff --git a/octomap/CMakeLists.txt b/octomap/CMakeLists.txt index 350d6263..e192fcb3 100644 --- a/octomap/CMakeLists.txt +++ b/octomap/CMakeLists.txt @@ -7,7 +7,7 @@ include(GNUInstallDirs) # version (e.g. for packaging) set(OCTOMAP_MAJOR_VERSION 1) set(OCTOMAP_MINOR_VERSION 9) -set(OCTOMAP_PATCH_VERSION 5) +set(OCTOMAP_PATCH_VERSION 6) 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/package.xml b/octomap/package.xml index 5c65fd1d..ebdf7639 100644 --- a/octomap/package.xml +++ b/octomap/package.xml @@ -1,6 +1,6 @@ octomap - 1.9.5 + 1.9.6 The OctoMap library implements a 3D occupancy grid mapping approach, providing data structures and mapping algorithms in C++. The map implementation is based on an octree. See http://octomap.github.io for details. diff --git a/octovis/CMakeLists.txt b/octovis/CMakeLists.txt index 974fbab9..0dd4ef54 100644 --- a/octovis/CMakeLists.txt +++ b/octovis/CMakeLists.txt @@ -7,7 +7,7 @@ include(GNUInstallDirs) # # version (e.g. for packaging) set(OCTOVIS_MAJOR_VERSION 1) set(OCTOVIS_MINOR_VERSION 9) -set(OCTOVIS_PATCH_VERSION 5) +set(OCTOVIS_PATCH_VERSION 6) set(OCTOVIS_VERSION ${OCTOVIS_MAJOR_VERSION}.${OCTOVIS_MINOR_VERSION}.${OCTOVIS_PATCH_VERSION}) set(OCTOVIS_SOVERSION ${OCTOVIS_MAJOR_VERSION}.${OCTOVIS_MINOR_VERSION}) # get rid of a useless warning: diff --git a/octovis/package.xml b/octovis/package.xml index c4157f31..125c42d3 100644 --- a/octovis/package.xml +++ b/octovis/package.xml @@ -1,6 +1,6 @@ octovis - 1.9.5 + 1.9.6 octovis is visualization tool for the OctoMap library based on Qt and libQGLViewer. See http://octomap.github.io for details.