-
-
Notifications
You must be signed in to change notification settings - Fork 74
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* realsense2_camera * Update vinca_win.yaml * Add patch/ros-noetic-librealsense2.patch * Try fix * Add patch/ros-noetic-realsense2-camera.patch * Build only librealsense2 for now to save time
- Loading branch information
1 parent
203b58a
commit 1db212c
Showing
4 changed files
with
44 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index 1ddedfb..2b97c7e 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -2,6 +2,10 @@ | ||
cmake_minimum_required(VERSION 3.1.0) | ||
project(librealsense2 LANGUAGES CXX C) | ||
|
||
+if (WIN32) | ||
+ file(COPY ${CMAKE_SOURCE_DIR}/src/win7/drivers/IntelRealSense_D400_series_win7.inf DESTINATION ${CMAKE_SOURCE_DIR}) | ||
+endif() | ||
+ | ||
include(CMake/lrs_options.cmake) | ||
include(CMake/connectivity_check.cmake) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
diff --git a/src/base_realsense_node.cpp b/src/base_realsense_node.cpp | ||
index f918500..531a2e9 100644 | ||
--- a/src/base_realsense_node.cpp | ||
+++ b/src/base_realsense_node.cpp | ||
@@ -2153,7 +2153,7 @@ void BaseRealSenseNode::publishPointCloud(rs2::points pc, const ros::Time& t, co | ||
return; | ||
ROS_INFO_STREAM_ONCE("publishing " << (_ordered_pc ? "" : "un") << "ordered pointcloud."); | ||
|
||
- rs2_stream texture_source_id = static_cast<rs2_stream>(_pointcloud_filter->get_option(rs2_option::RS2_OPTION_STREAM_FILTER)); | ||
+ rs2_stream texture_source_id = static_cast<rs2_stream>((int)_pointcloud_filter->get_option(rs2_option::RS2_OPTION_STREAM_FILTER)); | ||
bool use_texture = texture_source_id != RS2_STREAM_ANY; | ||
static int warn_count(0); | ||
static const int DISPLAY_WARN_NUMBER(5); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters