From 008720d42a0fe0ba4aef8931a49cfbecf018b721 Mon Sep 17 00:00:00 2001 From: h-ohta Date: Mon, 15 May 2023 15:30:11 +0900 Subject: [PATCH 1/4] fix(ground_segmentation): fix build error in Humble --- .../ground_segmentation/ransac_ground_filter_nodelet.hpp | 2 +- .../include/ground_segmentation/ray_ground_filter_nodelet.hpp | 2 +- .../ground_segmentation/scan_ground_filter_nodelet.hpp | 2 +- .../ground_segmentation/src/ransac_ground_filter_nodelet.cpp | 4 ++-- .../ground_segmentation/src/ray_ground_filter_nodelet.cpp | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/perception/ground_segmentation/include/ground_segmentation/ransac_ground_filter_nodelet.hpp b/perception/ground_segmentation/include/ground_segmentation/ransac_ground_filter_nodelet.hpp index 6e46f2a376bf5..e56924ed22cdb 100644 --- a/perception/ground_segmentation/include/ground_segmentation/ransac_ground_filter_nodelet.hpp +++ b/perception/ground_segmentation/include/ground_segmentation/ransac_ground_filter_nodelet.hpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include diff --git a/perception/ground_segmentation/include/ground_segmentation/ray_ground_filter_nodelet.hpp b/perception/ground_segmentation/include/ground_segmentation/ray_ground_filter_nodelet.hpp index cbef2564920ac..e721c3127d0c8 100644 --- a/perception/ground_segmentation/include/ground_segmentation/ray_ground_filter_nodelet.hpp +++ b/perception/ground_segmentation/include/ground_segmentation/ray_ground_filter_nodelet.hpp @@ -51,7 +51,7 @@ #include #include #include -#include +#include #include #include diff --git a/perception/ground_segmentation/include/ground_segmentation/scan_ground_filter_nodelet.hpp b/perception/ground_segmentation/include/ground_segmentation/scan_ground_filter_nodelet.hpp index 8ec423cd9be98..a7bb7154ce858 100644 --- a/perception/ground_segmentation/include/ground_segmentation/scan_ground_filter_nodelet.hpp +++ b/perception/ground_segmentation/include/ground_segmentation/scan_ground_filter_nodelet.hpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include diff --git a/perception/ground_segmentation/src/ransac_ground_filter_nodelet.cpp b/perception/ground_segmentation/src/ransac_ground_filter_nodelet.cpp index a59d8b8b8bbb5..448a38a8915ed 100644 --- a/perception/ground_segmentation/src/ransac_ground_filter_nodelet.cpp +++ b/perception/ground_segmentation/src/ransac_ground_filter_nodelet.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include @@ -187,7 +187,7 @@ void RANSACGroundFilterComponent::extractPointsIndices( { pcl::ExtractIndices extract_ground; extract_ground.setInputCloud(in_cloud_ptr); - extract_ground.setIndices(boost::make_shared(in_indices)); + extract_ground.setIndices(pcl::make_shared(in_indices)); extract_ground.setNegative(false); // true removes the indices, false leaves only the indices extract_ground.filter(*out_only_indices_cloud_ptr); diff --git a/perception/ground_segmentation/src/ray_ground_filter_nodelet.cpp b/perception/ground_segmentation/src/ray_ground_filter_nodelet.cpp index a452512e36bdf..51410771edb9f 100644 --- a/perception/ground_segmentation/src/ray_ground_filter_nodelet.cpp +++ b/perception/ground_segmentation/src/ray_ground_filter_nodelet.cpp @@ -297,7 +297,7 @@ void RayGroundFilterComponent::ExtractPointsIndices( { pcl::ExtractIndices extract_ground; extract_ground.setInputCloud(in_cloud_ptr); - extract_ground.setIndices(boost::make_shared(in_indices)); + extract_ground.setIndices(pcl::make_shared(in_indices)); extract_ground.setNegative(false); // true removes the indices, false leaves only the indices extract_ground.filter(*out_only_indices_cloud_ptr); From c8b2cedec048adc83e29ebb3adf4841f919f3a2c Mon Sep 17 00:00:00 2001 From: h-ohta Date: Mon, 15 May 2023 15:31:20 +0900 Subject: [PATCH 2/4] fix: CMakeLists --- perception/ground_segmentation/CMakeLists.txt | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/perception/ground_segmentation/CMakeLists.txt b/perception/ground_segmentation/CMakeLists.txt index 076f9cbc01cb4..1db192cb4bc39 100644 --- a/perception/ground_segmentation/CMakeLists.txt +++ b/perception/ground_segmentation/CMakeLists.txt @@ -32,11 +32,12 @@ ament_auto_find_build_dependencies() include_directories( include - ${Boost_INCLUDE_DIRS} - ${PCL_INCLUDE_DIRS} - ${EIGEN3_INCLUDE_DIRS} - ${OpenCV_INCLUDE_DIRS} - ${GRID_MAP_INCLUDE_DIR} + SYSTEM + ${Boost_INCLUDE_DIRS} + ${PCL_INCLUDE_DIRS} + ${EIGEN3_INCLUDE_DIRS} + ${OpenCV_INCLUDE_DIRS} + ${GRID_MAP_INCLUDE_DIR} ) ament_auto_add_library(ground_segmentation SHARED From 41c4a2368cd08a0fd37b53dd97a42d1a588a5db3 Mon Sep 17 00:00:00 2001 From: h-ohta Date: Mon, 15 May 2023 15:32:59 +0900 Subject: [PATCH 3/4] delete unused --- .../ground_segmentation/src/ransac_ground_filter_nodelet.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/perception/ground_segmentation/src/ransac_ground_filter_nodelet.cpp b/perception/ground_segmentation/src/ransac_ground_filter_nodelet.cpp index 448a38a8915ed..45aeedabe01cb 100644 --- a/perception/ground_segmentation/src/ransac_ground_filter_nodelet.cpp +++ b/perception/ground_segmentation/src/ransac_ground_filter_nodelet.cpp @@ -17,7 +17,6 @@ #include #include -#include #include #include From 5c67e0ae5234901c32441e99939994ba74079c9c Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 15 May 2023 06:33:57 +0000 Subject: [PATCH 4/4] ci(pre-commit): autofix --- .../ground_segmentation/ransac_ground_filter_nodelet.hpp | 3 ++- .../include/ground_segmentation/ray_ground_filter_nodelet.hpp | 3 ++- .../include/ground_segmentation/scan_ground_filter_nodelet.hpp | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/perception/ground_segmentation/include/ground_segmentation/ransac_ground_filter_nodelet.hpp b/perception/ground_segmentation/include/ground_segmentation/ransac_ground_filter_nodelet.hpp index e56924ed22cdb..498fcca6a302a 100644 --- a/perception/ground_segmentation/include/ground_segmentation/ransac_ground_filter_nodelet.hpp +++ b/perception/ground_segmentation/include/ground_segmentation/ransac_ground_filter_nodelet.hpp @@ -17,6 +17,8 @@ #include "pointcloud_preprocessor/filter.hpp" +#include + #include #include @@ -25,7 +27,6 @@ #include #include #include -#include #include #include diff --git a/perception/ground_segmentation/include/ground_segmentation/ray_ground_filter_nodelet.hpp b/perception/ground_segmentation/include/ground_segmentation/ray_ground_filter_nodelet.hpp index e721c3127d0c8..44af8b766df62 100644 --- a/perception/ground_segmentation/include/ground_segmentation/ray_ground_filter_nodelet.hpp +++ b/perception/ground_segmentation/include/ground_segmentation/ray_ground_filter_nodelet.hpp @@ -45,13 +45,14 @@ #ifndef GROUND_SEGMENTATION__RAY_GROUND_FILTER_NODELET_HPP_ #define GROUND_SEGMENTATION__RAY_GROUND_FILTER_NODELET_HPP_ +#include + #include #include #include #include #include -#include #include #include diff --git a/perception/ground_segmentation/include/ground_segmentation/scan_ground_filter_nodelet.hpp b/perception/ground_segmentation/include/ground_segmentation/scan_ground_filter_nodelet.hpp index a7bb7154ce858..6680891bfe0cf 100644 --- a/perception/ground_segmentation/include/ground_segmentation/scan_ground_filter_nodelet.hpp +++ b/perception/ground_segmentation/include/ground_segmentation/scan_ground_filter_nodelet.hpp @@ -17,6 +17,7 @@ #include "pointcloud_preprocessor/filter.hpp" +#include #include #include @@ -25,7 +26,6 @@ #include #include #include -#include #include #include