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
diff --git a/CMakeLists.txt b/CMakeLists.txt | |
index 9660f55..ca01034 100644 | |
--- a/CMakeLists.txt | |
+++ b/CMakeLists.txt | |
@@ -31,12 +31,12 @@ IF(MSVC) | |
add_definitions(-D_USE_MATH_DEFINES) | |
ELSE() | |
IF (CMAKE_SYSTEM_PROCESSOR MATCHES "(arm64)|(ARM64)|(aarch64)|(AARCH64)") | |
- add_definitions (-march=armv8-a) | |
+ #add_definitions (-march=armv8-a) |
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
diff --git a/CMakeLists.txt b/CMakeLists.txt | |
index 9f2bfd83..65b03eef 100644 | |
--- a/CMakeLists.txt | |
+++ b/CMakeLists.txt | |
@@ -228,7 +228,7 @@ ENDIF() | |
set(RTABMAP_QT_VERSION AUTO CACHE STRING "Force a specific Qt version.") | |
set_property(CACHE RTABMAP_QT_VERSION PROPERTY STRINGS AUTO 4 5 6) | |
-FIND_PACKAGE(OpenCV REQUIRED QUIET COMPONENTS core calib3d imgproc highgui stitching photo video videoio OPTIONAL_COMPONENTS aruco xfeatures2d nonfree gpu cudafeatures2d) | |
+FIND_PACKAGE(OpenCV QUIET COMPONENTS core calib3d imgproc highgui stitching photo video videoio OPTIONAL_COMPONENTS aruco xfeatures2d nonfree gpu cudafeatures2d) |
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
diff --git a/.gitignore b/.gitignore | |
index 85152fb..da016a7 100644 | |
--- a/.gitignore | |
+++ b/.gitignore | |
@@ -5,3 +5,4 @@ | |
*.cur_trans | |
build | |
.ipynb_checkpoints/ | |
+pointmatcher/pm_export.h | |
\ No newline at end of file |
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
diff --git a/src/proc/syncer-processing-block.cpp b/src/proc/syncer-processing-block.cpp | |
index 34ebcb492..020b88eb7 100644 | |
--- a/src/proc/syncer-processing-block.cpp | |
+++ b/src/proc/syncer-processing-block.cpp | |
@@ -11,7 +11,7 @@ | |
namespace librealsense | |
{ | |
syncer_process_unit::syncer_process_unit(std::initializer_list< bool_option::ptr > enable_opts, bool log) | |
- : processing_block("syncer"), _matcher((new composite_identity_matcher({}))) | |
+ : processing_block("syncer"), _matcher((new timestamp_composite_matcher({}))) |
OlderNewer