Skip to content

Commit b7ee0e9

Browse files
authored
build(iron): add workaround for image common header (autowarefoundation#3681)
Signed-off-by: wep21 <daisuke.nishimatsu1021@gmail.com>
1 parent 5e5c4dd commit b7ee0e9

File tree

16 files changed

+64
-0
lines changed

16 files changed

+64
-0
lines changed

perception/bytetrack/include/bytetrack/bytetrack_node.hpp

+4
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,11 @@
2121
#include <tier4_perception_msgs/msg/detected_objects_with_feature.hpp>
2222
#include <tier4_perception_msgs/msg/dynamic_object_array.hpp>
2323

24+
#if __has_include(<cv_bridge/cv_bridge.hpp>)
25+
#include <cv_bridge/cv_bridge.hpp>
26+
#else
2427
#include <cv_bridge/cv_bridge.h>
28+
#endif
2529

2630
#include <chrono>
2731
#include <fstream>

perception/bytetrack/src/bytetrack_visualizer_node.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,11 @@
1717
#include <boost/lexical_cast.hpp>
1818
#include <boost/uuid/uuid_io.hpp>
1919

20+
#if __has_include(<cv_bridge/cv_bridge.hpp>)
21+
#include <cv_bridge/cv_bridge.hpp>
22+
#else
2023
#include <cv_bridge/cv_bridge.h>
24+
#endif
2125

2226
#include <chrono>
2327
#include <string>

perception/image_projection_based_fusion/src/debugger.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@
1414

1515
#include "image_projection_based_fusion/debugger.hpp"
1616

17+
#if __has_include(<cv_bridge/cv_bridge.hpp>)
18+
#include <cv_bridge/cv_bridge.hpp>
19+
#else
1720
#include <cv_bridge/cv_bridge.h>
21+
#endif
1822

1923
namespace
2024
{

perception/tensorrt_yolo/include/tensorrt_yolo/nodelet.hpp

+4
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,11 @@
2727
#include <std_msgs/msg/header.hpp>
2828
#include <tier4_perception_msgs/msg/detected_objects_with_feature.hpp>
2929

30+
#if __has_include(<cv_bridge/cv_bridge.hpp>)
31+
#include <cv_bridge/cv_bridge.hpp>
32+
#else
3033
#include <cv_bridge/cv_bridge.h>
34+
#endif
3135

3236
#include <chrono>
3337
#include <fstream>

perception/tensorrt_yolox/include/tensorrt_yolox/tensorrt_yolox_node.hpp

+4
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,11 @@
2424
#include <std_msgs/msg/header.hpp>
2525
#include <tier4_perception_msgs/msg/detected_objects_with_feature.hpp>
2626

27+
#if __has_include(<cv_bridge/cv_bridge.hpp>)
28+
#include <cv_bridge/cv_bridge.hpp>
29+
#else
2730
#include <cv_bridge/cv_bridge.h>
31+
#endif
2832

2933
#include <chrono>
3034
#include <fstream>

perception/traffic_light_classifier/include/traffic_light_classifier/cnn_classifier.hpp

+4
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@
2525

2626
#include <autoware_auto_perception_msgs/msg/traffic_light.hpp>
2727

28+
#if __has_include(<cv_bridge/cv_bridge.hpp>)
29+
#include <cv_bridge/cv_bridge.hpp>
30+
#else
2831
#include <cv_bridge/cv_bridge.h>
32+
#endif
2933

3034
#include <map>
3135
#include <memory>

perception/traffic_light_classifier/include/traffic_light_classifier/color_classifier.hpp

+4
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,11 @@
2424

2525
#include <autoware_auto_perception_msgs/msg/traffic_light.hpp>
2626

27+
#if __has_include(<cv_bridge/cv_bridge.hpp>)
28+
#include <cv_bridge/cv_bridge.hpp>
29+
#else
2730
#include <cv_bridge/cv_bridge.h>
31+
#endif
2832

2933
#include <vector>
3034

perception/traffic_light_classifier/include/traffic_light_classifier/nodelet.hpp

+4
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,11 @@
2929
#include <sensor_msgs/msg/image.hpp>
3030
#include <std_msgs/msg/header.hpp>
3131

32+
#if __has_include(<cv_bridge/cv_bridge.hpp>)
33+
#include <cv_bridge/cv_bridge.hpp>
34+
#else
3235
#include <cv_bridge/cv_bridge.h>
36+
#endif
3337
#include <message_filters/subscriber.h>
3438
#include <message_filters/sync_policies/approximate_time.h>
3539
#include <message_filters/synchronizer.h>

perception/traffic_light_map_based_detector/include/traffic_light_map_based_detector/node.hpp

+4
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,11 @@
4444
#include <sensor_msgs/msg/camera_info.hpp>
4545
#include <visualization_msgs/msg/marker_array.hpp>
4646

47+
#if __has_include(<image_geometry/pinhole_camera_model.hpp>)
48+
#include <image_geometry/pinhole_camera_model.hpp>
49+
#else
4750
#include <image_geometry/pinhole_camera_model.h>
51+
#endif
4852
#include <lanelet2_core/LaneletMap.h>
4953
#include <lanelet2_routing/RoutingGraph.h>
5054
#include <lanelet2_traffic_rules/TrafficRulesFactory.h>

perception/traffic_light_ssd_fine_detector/include/traffic_light_ssd_fine_detector/nodelet.hpp

+4
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,11 @@
2727
#include <sensor_msgs/msg/image.hpp>
2828
#include <tier4_debug_msgs/msg/float32_stamped.hpp>
2929

30+
#if __has_include(<cv_bridge/cv_bridge.hpp>)
31+
#include <cv_bridge/cv_bridge.hpp>
32+
#else
3033
#include <cv_bridge/cv_bridge.h>
34+
#endif
3135
#include <message_filters/subscriber.h>
3236
#include <message_filters/sync_policies/approximate_time.h>
3337
#include <message_filters/synchronizer.h>

perception/traffic_light_visualization/include/traffic_light_roi_visualizer/nodelet.hpp

+4
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,11 @@
2323
#include <autoware_auto_perception_msgs/msg/traffic_signal_array.hpp>
2424
#include <sensor_msgs/msg/image.hpp>
2525

26+
#if __has_include(<cv_bridge/cv_bridge.hpp>)
27+
#include <cv_bridge/cv_bridge.hpp>
28+
#else
2629
#include <cv_bridge/cv_bridge.h>
30+
#endif
2731
#include <message_filters/subscriber.h>
2832
#include <message_filters/sync_policies/approximate_time.h>
2933
#include <message_filters/synchronizer.h>

planning/behavior_velocity_planner/src/scene_module/intersection/scene_intersection.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,11 @@
1919
#include <lanelet2_extension/utility/query.hpp>
2020
#include <lanelet2_extension/utility/utilities.hpp>
2121

22+
#if __has_include(<cv_bridge/cv_bridge.hpp>)
23+
#include <cv_bridge/cv_bridge.hpp>
24+
#else
2225
#include <cv_bridge/cv_bridge.h>
26+
#endif
2327
// #include <sensor_msgs/image_encodings.h>
2428
// #include <opencv2/highgui/highgui.hpp>
2529
#include <magic_enum.hpp>

sensing/image_diagnostics/include/image_diagnostics/image_diagnostics_node.hpp

+4
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,11 @@
2626
#include <tier4_debug_msgs/msg/float32_stamped.hpp>
2727
#include <tier4_debug_msgs/msg/int32_stamped.hpp>
2828

29+
#if __has_include(<cv_bridge/cv_bridge.hpp>)
30+
#include <cv_bridge/cv_bridge.hpp>
31+
#else
2932
#include <cv_bridge/cv_bridge.h>
33+
#endif
3034

3135
#include <string>
3236
#include <unordered_map>

sensing/image_transport_decompressor/src/image_transport_decompressor.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,11 @@
5353

5454
#include <sensor_msgs/image_encodings.hpp>
5555

56+
#if __has_include(<cv_bridge/cv_bridge.hpp>)
57+
#include <cv_bridge/cv_bridge.hpp>
58+
#else
5659
#include <cv_bridge/cv_bridge.h>
60+
#endif
5761

5862
#include <limits>
5963
#include <memory>

sensing/pointcloud_preprocessor/include/pointcloud_preprocessor/blockage_diag/blockage_diag_nodelet.hpp

+4
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,11 @@
2727
#include <std_msgs/msg/header.hpp>
2828
#include <tier4_debug_msgs/msg/float32_stamped.hpp>
2929

30+
#if __has_include(<cv_bridge/cv_bridge.hpp>)
31+
#include <cv_bridge/cv_bridge.hpp>
32+
#else
3033
#include <cv_bridge/cv_bridge.h>
34+
#endif
3135

3236
#include <string>
3337
#include <vector>

sensing/pointcloud_preprocessor/include/pointcloud_preprocessor/outlier_filter/dual_return_outlier_filter_nodelet.hpp

+4
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,11 @@
2626
#include <sensor_msgs/msg/point_cloud2.hpp>
2727
#include <tier4_debug_msgs/msg/float32_stamped.hpp>
2828

29+
#if __has_include(<cv_bridge/cv_bridge.hpp>)
30+
#include <cv_bridge/cv_bridge.hpp>
31+
#else
2932
#include <cv_bridge/cv_bridge.h>
33+
#endif
3034
#include <pcl/filters/voxel_grid.h>
3135
#include <pcl/search/pcl_search.h>
3236

0 commit comments

Comments
 (0)