i/OrbbecSDK_ROS2
1
0
Fork 0
mirror of https://github.com/orbbec/OrbbecSDK_ROS2.git synced 2026-10-07 13:37:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'github/v2-main' into v2-main

Browse Source
This commit is contained in:
obyalian
2025-10-22 13:57:56 +08:00
parent 880c70e0b3 bd5c225338
commit 4df01f7d0d
5 changed files with 9 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
orbbec_camera/src/d2c_viewer.cpp
+2 -2
View File
@@ -14,9 +14,9 @@
* limitations under the License.
*******************************************************************************/
#if defined(ROS_JAZZY) || defined(ROS_IRON)
#if __has_include(<cv_bridge/cv_bridge.hpp>)
#include <cv_bridge/cv_bridge.hpp>
#else
#elif __has_include(<cv_bridge/cv_bridge.h>)
#include <cv_bridge/cv_bridge.h>
#endif
#include <sensor_msgs/image_encodings.hpp>
orbbec_camera/src/ros_param_backend.cpp
-11
View File
@@ -26,16 +26,5 @@ ParametersBackend::~ParametersBackend() {
ros_callback_.reset();
}
}
#if defined(ROS_JAZZY) || defined(ROS_IRON)
void ParametersBackend::addOnSetParametersCallback(
rclcpp::node_interfaces::NodeParametersInterface::OnSetParametersCallbackType callback) {
ros_callback_ = node_->add_on_set_parameters_callback(callback);
}
#else
void ParametersBackend::addOnSetParametersCallback(
rclcpp::node_interfaces::NodeParametersInterface::OnParametersSetCallbackType callback) {
ros_callback_ = node_->add_on_set_parameters_callback(callback);
}
#endif
} // namespace orbbec_camera