From b911b85574aad82776e5bed0ba38801f8a33bbb4 Mon Sep 17 00:00:00 2001 From: Erwin Bonsma Date: Mon, 4 Oct 2021 12:40:10 +0000 Subject: [PATCH 1/2] Fix include warnings --- include/laser_filters/angular_bounds_filter.h | 2 +- include/laser_filters/angular_bounds_filter_in_place.h | 2 +- include/laser_filters/array_filter.h | 6 +++--- include/laser_filters/box_filter.h | 2 +- include/laser_filters/footprint_filter.h | 2 +- include/laser_filters/intensity_filter.h | 2 +- include/laser_filters/interpolation_filter.h | 2 +- include/laser_filters/median_filter.h | 6 +++--- include/laser_filters/point_cloud_footprint_filter.h | 2 +- include/laser_filters/polygon_filter.h | 2 +- include/laser_filters/range_filter.h | 2 +- include/laser_filters/scan_blob_filter.h | 2 +- include/laser_filters/scan_mask_filter.h | 2 +- include/laser_filters/scan_shadows_filter.h | 2 +- include/laser_filters/sector_filter.h | 2 +- include/laser_filters/speckle_filter.h | 2 +- src/generic_laser_filter_node.cpp | 2 +- src/laser_scan_filters.cpp | 2 +- src/scan_to_cloud_filter_chain.cpp | 2 +- src/scan_to_scan_filter_chain.cpp | 2 +- test/test_scan_filter_chain.cpp | 2 +- 21 files changed, 25 insertions(+), 25 deletions(-) diff --git a/include/laser_filters/angular_bounds_filter.h b/include/laser_filters/angular_bounds_filter.h index 903d653a..a8f29093 100644 --- a/include/laser_filters/angular_bounds_filter.h +++ b/include/laser_filters/angular_bounds_filter.h @@ -37,7 +37,7 @@ #ifndef LASER_SCAN_ANGULAR_BOUNDS_FILTER_H #define LASER_SCAN_ANGULAR_BOUNDS_FILTER_H -#include +#include #include namespace laser_filters diff --git a/include/laser_filters/angular_bounds_filter_in_place.h b/include/laser_filters/angular_bounds_filter_in_place.h index 467fa9ca..94da20f2 100644 --- a/include/laser_filters/angular_bounds_filter_in_place.h +++ b/include/laser_filters/angular_bounds_filter_in_place.h @@ -37,7 +37,7 @@ #ifndef LASER_SCAN_ANGULAR_BOUNDS_FILTER_IN_PLACE_H #define LASER_SCAN_ANGULAR_BOUNDS_FILTER_IN_PLACE_H -#include +#include #include namespace laser_filters diff --git a/include/laser_filters/array_filter.h b/include/laser_filters/array_filter.h index 6214e025..506a5d31 100644 --- a/include/laser_filters/array_filter.h +++ b/include/laser_filters/array_filter.h @@ -38,9 +38,9 @@ #include "boost/scoped_ptr.hpp" #include "sensor_msgs/LaserScan.h" -#include "filters/median.h" -#include "filters/mean.h" -#include "filters/filter_chain.h" +#include +#include +#include #include "boost/thread/mutex.hpp" namespace laser_filters{ diff --git a/include/laser_filters/box_filter.h b/include/laser_filters/box_filter.h index 82cd74e3..7e2c5d17 100644 --- a/include/laser_filters/box_filter.h +++ b/include/laser_filters/box_filter.h @@ -47,7 +47,7 @@ #ifndef BOXFILTER_H #define BOXFILTER_H -#include +#include #include #include diff --git a/include/laser_filters/footprint_filter.h b/include/laser_filters/footprint_filter.h index ad72c936..03d491ac 100644 --- a/include/laser_filters/footprint_filter.h +++ b/include/laser_filters/footprint_filter.h @@ -42,7 +42,7 @@ This is useful for ground plane extraction **/ -#include "filters/filter_base.h" +#include #include "sensor_msgs/LaserScan.h" #include "tf/transform_listener.h" #include "sensor_msgs/PointCloud.h" diff --git a/include/laser_filters/intensity_filter.h b/include/laser_filters/intensity_filter.h index 93189ab6..ebfa185e 100644 --- a/include/laser_filters/intensity_filter.h +++ b/include/laser_filters/intensity_filter.h @@ -39,7 +39,7 @@ #pragma once #include -#include +#include #include #include diff --git a/include/laser_filters/interpolation_filter.h b/include/laser_filters/interpolation_filter.h index 69e55346..b94b3b0e 100644 --- a/include/laser_filters/interpolation_filter.h +++ b/include/laser_filters/interpolation_filter.h @@ -41,7 +41,7 @@ **/ -#include "filters/filter_base.h" +#include #include "sensor_msgs/LaserScan.h" namespace laser_filters diff --git a/include/laser_filters/median_filter.h b/include/laser_filters/median_filter.h index aaaaed05..d4dafd59 100644 --- a/include/laser_filters/median_filter.h +++ b/include/laser_filters/median_filter.h @@ -38,9 +38,9 @@ #include "boost/scoped_ptr.hpp" #include "sensor_msgs/LaserScan.h" -#include "filters/median.h" -#include "filters/mean.h" -#include "filters/filter_chain.h" +#include +#include +#include #include "boost/thread/mutex.hpp" namespace laser_filters{ diff --git a/include/laser_filters/point_cloud_footprint_filter.h b/include/laser_filters/point_cloud_footprint_filter.h index b5715c98..62904c36 100644 --- a/include/laser_filters/point_cloud_footprint_filter.h +++ b/include/laser_filters/point_cloud_footprint_filter.h @@ -42,7 +42,7 @@ This is useful for ground plane extraction **/ #include "laser_geometry/laser_geometry.h" -#include "filters/filter_base.h" +#include #include "tf/transform_listener.h" #include "sensor_msgs/PointCloud.h" #include "ros/ros.h" diff --git a/include/laser_filters/polygon_filter.h b/include/laser_filters/polygon_filter.h index bc53cef1..5f05ea0f 100644 --- a/include/laser_filters/polygon_filter.h +++ b/include/laser_filters/polygon_filter.h @@ -43,7 +43,7 @@ #ifndef POLYGON_FILTER_H #define POLYGON_FILTER_H -#include +#include #include #include diff --git a/include/laser_filters/range_filter.h b/include/laser_filters/range_filter.h index e5b1b5ec..f4306938 100644 --- a/include/laser_filters/range_filter.h +++ b/include/laser_filters/range_filter.h @@ -42,7 +42,7 @@ #include #include -#include "filters/filter_base.h" +#include #include "sensor_msgs/LaserScan.h" namespace laser_filters diff --git a/include/laser_filters/scan_blob_filter.h b/include/laser_filters/scan_blob_filter.h index 7acd5c0d..dff95e6e 100644 --- a/include/laser_filters/scan_blob_filter.h +++ b/include/laser_filters/scan_blob_filter.h @@ -39,7 +39,7 @@ #include -#include "filters/filter_base.h" +#include #include #include "angles/angles.h" diff --git a/include/laser_filters/scan_mask_filter.h b/include/laser_filters/scan_mask_filter.h index 28ce5769..0792e182 100644 --- a/include/laser_filters/scan_mask_filter.h +++ b/include/laser_filters/scan_mask_filter.h @@ -40,7 +40,7 @@ **/ -#include "filters/filter_base.h" +#include #include "sensor_msgs/LaserScan.h" #include diff --git a/include/laser_filters/scan_shadows_filter.h b/include/laser_filters/scan_shadows_filter.h index c821f016..20a8b0f6 100644 --- a/include/laser_filters/scan_shadows_filter.h +++ b/include/laser_filters/scan_shadows_filter.h @@ -39,7 +39,7 @@ #include -#include "filters/filter_base.h" +#include #include "laser_filters/scan_shadow_detector.h" #include #include diff --git a/include/laser_filters/sector_filter.h b/include/laser_filters/sector_filter.h index 808a049b..373b3b61 100644 --- a/include/laser_filters/sector_filter.h +++ b/include/laser_filters/sector_filter.h @@ -35,7 +35,7 @@ #include #include -#include +#include #include namespace laser_filters diff --git a/include/laser_filters/speckle_filter.h b/include/laser_filters/speckle_filter.h index 30876049..5f7047c5 100644 --- a/include/laser_filters/speckle_filter.h +++ b/include/laser_filters/speckle_filter.h @@ -41,7 +41,7 @@ #define SPECKLE_FILTER_H #include -#include +#include #include #include diff --git a/src/generic_laser_filter_node.cpp b/src/generic_laser_filter_node.cpp index 86d01ab2..4e31d924 100644 --- a/src/generic_laser_filter_node.cpp +++ b/src/generic_laser_filter_node.cpp @@ -33,7 +33,7 @@ #include "message_filters/subscriber.h" #include "tf/message_filter.h" #include "tf/transform_listener.h" -#include "filters/filter_chain.h" +#include class GenericLaserScanFilterNode { diff --git a/src/laser_scan_filters.cpp b/src/laser_scan_filters.cpp index 0c5a8c71..a704fa7e 100644 --- a/src/laser_scan_filters.cpp +++ b/src/laser_scan_filters.cpp @@ -43,7 +43,7 @@ #include "laser_filters/scan_blob_filter.h" #include "laser_filters/sector_filter.h" #include "sensor_msgs/LaserScan.h" -#include "filters/filter_base.h" +#include #include "pluginlib/class_list_macros.h" diff --git a/src/scan_to_cloud_filter_chain.cpp b/src/scan_to_cloud_filter_chain.cpp index 6aeac38e..6f5426a9 100644 --- a/src/scan_to_cloud_filter_chain.cpp +++ b/src/scan_to_cloud_filter_chain.cpp @@ -49,7 +49,7 @@ #include "message_filters/subscriber.h" //Filters -#include "filters/filter_chain.h" +#include #if BUILDING_NODELET #include diff --git a/src/scan_to_scan_filter_chain.cpp b/src/scan_to_scan_filter_chain.cpp index 9fa4e215..2d7cdbce 100644 --- a/src/scan_to_scan_filter_chain.cpp +++ b/src/scan_to_scan_filter_chain.cpp @@ -33,7 +33,7 @@ #include "message_filters/subscriber.h" #include "tf/message_filter.h" #include "tf/transform_listener.h" -#include "filters/filter_chain.h" +#include class ScanToScanFilterChain { diff --git a/test/test_scan_filter_chain.cpp b/test/test_scan_filter_chain.cpp index c4b4c554..0ea463f4 100644 --- a/test/test_scan_filter_chain.cpp +++ b/test/test_scan_filter_chain.cpp @@ -28,7 +28,7 @@ */ #include -#include +#include #include #include "sensor_msgs/LaserScan.h" #include From d56248c628e0f2bc83a73e2671f01b57784c0672 Mon Sep 17 00:00:00 2001 From: Erwin Bonsma Date: Mon, 4 Oct 2021 12:40:22 +0000 Subject: [PATCH 2/2] Fix format warning --- src/speckle_filter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/speckle_filter.cpp b/src/speckle_filter.cpp index 2c9c3970..f524d63d 100644 --- a/src/speckle_filter.cpp +++ b/src/speckle_filter.cpp @@ -79,7 +79,7 @@ bool LaserScanSpeckleFilter::update(const sensor_msgs::LaserScan& input_scan, se /*Check if range size is big enough to use the filter window */ if (output_scan.ranges.size() <= config_.filter_window + 1) { - ROS_ERROR("Scan ranges size is too small: size = %i", output_scan.ranges.size()); + ROS_ERROR("Scan ranges size is too small: size = %ld", output_scan.ranges.size()); return false; }