Skip to content

Commit b3dbed6

Browse files
author
jj
committed
Fix foxy build error
1 parent a508cf6 commit b3dbed6

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

orbbec_camera/include/orbbec_camera/ob_camera_node.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@
6464
#include "jpeg_decoder.h"
6565
#include <std_msgs/msg/string.hpp>
6666
#include <fcntl.h>
67+
#include <unistd.h>
6768

6869
#if defined(ROS_JAZZY) || defined(ROS_IRON)
6970
#include <cv_bridge/cv_bridge.hpp>
@@ -133,8 +134,8 @@ const std::map<OBStreamType, OBFrameType> STREAM_TYPE_TO_FRAME_TYPE = {
133134
};
134135

135136
typedef struct {
136-
uint8_t mode;
137-
uint16_t fps;
137+
uint8_t mode;
138+
uint16_t fps;
138139
} cs_param_t;
139140

140141
class OBCameraNode {

orbbec_camera/tools/metadata_export_files.hpp

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,9 @@ class MetadataExportFiles : public rclcpp::Node {
6767
}
6868

6969
void load_parameters() {
70-
std::ifstream file("install/orbbec_camera/share/orbbec_camera/config/metadataexport/metadata_export_params.json");
70+
std::ifstream file(
71+
"install/orbbec_camera/share/orbbec_camera/config/metadataexport/"
72+
"metadata_export_params.json");
7173
if (!file.is_open()) {
7274
RCLCPP_ERROR(this->get_logger(), "Failed to open JSON file.");
7375
return;
@@ -106,8 +108,7 @@ class MetadataExportFiles : public rclcpp::Node {
106108

107109
left_ir_sync_ = std::make_shared<message_filters::Synchronizer<MySyncPolicy>>(
108110
MySyncPolicy(10), *left_ir_image_sub_, *left_ir_metadata_sub_);
109-
left_ir_sync_->setMaxIntervalDuration(
110-
rclcpp::Duration::from_nanoseconds(100000000LL)); // 100 ms
111+
left_ir_sync_->setMaxIntervalDuration(rclcpp::Duration(0, 100 * 1000000)); // 100 ms
111112

112113
left_ir_sync_->registerCallback(
113114
std::bind(&MetadataExportFiles::left_ir_metadata_sync_callback, this, _1, _2));
@@ -120,8 +121,7 @@ class MetadataExportFiles : public rclcpp::Node {
120121

121122
right_ir_sync_ = std::make_shared<message_filters::Synchronizer<MySyncPolicy>>(
122123
MySyncPolicy(10), *right_ir_image_sub_, *right_ir_metadata_sub_);
123-
right_ir_sync_->setMaxIntervalDuration(
124-
rclcpp::Duration::from_nanoseconds(100000000LL)); // 100 ms
124+
right_ir_sync_->setMaxIntervalDuration(rclcpp::Duration(0, 100 * 1000000)); // 100 ms
125125

126126
right_ir_sync_->registerCallback(
127127
std::bind(&MetadataExportFiles::right_ir_metadata_sync_callback, this, _1, _2));
@@ -134,7 +134,7 @@ class MetadataExportFiles : public rclcpp::Node {
134134

135135
depth_sync_ = std::make_shared<message_filters::Synchronizer<MySyncPolicy>>(
136136
MySyncPolicy(10), *depth_image_sub_, *depth_metadata_sub_);
137-
depth_sync_->setMaxIntervalDuration(rclcpp::Duration::from_nanoseconds(100000000LL)); // 100 ms
137+
depth_sync_->setMaxIntervalDuration(rclcpp::Duration(0, 100 * 1000000)); // 100 ms
138138

139139
depth_sync_->registerCallback(
140140
std::bind(&MetadataExportFiles::depth_metadata_sync_callback, this, _1, _2));
@@ -147,7 +147,7 @@ class MetadataExportFiles : public rclcpp::Node {
147147

148148
color_sync_ = std::make_shared<message_filters::Synchronizer<MySyncPolicy>>(
149149
MySyncPolicy(10), *color_image_sub_, *color_metadata_sub_);
150-
color_sync_->setMaxIntervalDuration(rclcpp::Duration::from_nanoseconds(100000000LL)); // 100 ms
150+
color_sync_->setMaxIntervalDuration(rclcpp::Duration(0, 100 * 1000000)); // 100 ms
151151

152152
color_sync_->registerCallback(
153153
std::bind(&MetadataExportFiles::color_metadata_sync_callback, this, _1, _2));
@@ -380,9 +380,10 @@ class MetadataExportFiles : public rclcpp::Node {
380380
}
381381

382382
std::ostringstream ss;
383-
ss << serial_path << "/" << std::to_string(frame_index) << "_" << "0000" << "_"
384-
<< camera_timestamp_us << "_" << timestamp_us.str() << "_" << prefix << "_" << resolution
385-
<< ".png";
383+
ss << serial_path << "/" << std::to_string(frame_index) << "_"
384+
<< "0000"
385+
<< "_" << camera_timestamp_us << "_" << timestamp_us.str() << "_" << prefix << "_"
386+
<< resolution << ".png";
386387
cv::imwrite(ss.str(), cv_ptr->image);
387388
}
388389
void save_metadata_to_file(const ImageMetadata &metadata, const std::string &prefix) {

orbbec_camera/tools/metadata_save_files.hpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,7 @@ class MetadataSaveFiles : public rclcpp::Node {
133133

134134
left_ir_sync_ = std::make_shared<message_filters::Synchronizer<MySyncPolicy>>(
135135
MySyncPolicy(10), *left_ir_image_sub_, *left_ir_metadata_sub_);
136-
left_ir_sync_->setMaxIntervalDuration(
137-
rclcpp::Duration::from_nanoseconds(100000000LL)); // 100 ms
136+
left_ir_sync_->setMaxIntervalDuration(rclcpp::Duration(0, 100 * 1000000)); // 100 ms
138137

139138
left_ir_sync_->registerCallback(
140139
std::bind(&MetadataSaveFiles::left_ir_metadata_sync_callback, this, _1, _2));
@@ -147,8 +146,7 @@ class MetadataSaveFiles : public rclcpp::Node {
147146

148147
right_ir_sync_ = std::make_shared<message_filters::Synchronizer<MySyncPolicy>>(
149148
MySyncPolicy(10), *right_ir_image_sub_, *right_ir_metadata_sub_);
150-
right_ir_sync_->setMaxIntervalDuration(
151-
rclcpp::Duration::from_nanoseconds(100000000LL)); // 100 ms
149+
right_ir_sync_->setMaxIntervalDuration(rclcpp::Duration(0, 100 * 1000000)); // 100 ms
152150

153151
right_ir_sync_->registerCallback(
154152
std::bind(&MetadataSaveFiles::right_ir_metadata_sync_callback, this, _1, _2));
@@ -161,7 +159,7 @@ class MetadataSaveFiles : public rclcpp::Node {
161159

162160
depth_sync_ = std::make_shared<message_filters::Synchronizer<MySyncPolicy>>(
163161
MySyncPolicy(10), *depth_image_sub_, *depth_metadata_sub_);
164-
depth_sync_->setMaxIntervalDuration(rclcpp::Duration::from_nanoseconds(100000000LL)); // 100 ms
162+
depth_sync_->setMaxIntervalDuration(rclcpp::Duration(0, 100 * 1000000)); // 100 ms
165163

166164
depth_sync_->registerCallback(
167165
std::bind(&MetadataSaveFiles::depth_metadata_sync_callback, this, _1, _2));

0 commit comments

Comments
 (0)