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({}))) |
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/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/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/CMake/vtkAndroid.cmake b/CMake/vtkAndroid.cmake | |
index 3b8a66e491..f5745bc750 100644 | |
--- a/CMake/vtkAndroid.cmake | |
+++ b/CMake/vtkAndroid.cmake | |
@@ -96,7 +96,8 @@ set(android_cmake_flags | |
-DANT_EXECUTABLE:FILE=${ANT_EXECUTABLE} | |
-DBUILD_SHARED_LIBS:BOOL=OFF | |
-DBUILD_TESTING:BOOL=OFF | |
- -DBUILD_EXAMPLES:BOOL=${BUILD_EXAMPLES} | |
+ -DBUILD_EXAMPLES:BOOL=OFF |
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/3rdparty/libpng/CMakeLists.txt b/3rdparty/libpng/CMakeLists.txt | |
index da290292c5..e514079f8a 100644 | |
--- a/3rdparty/libpng/CMakeLists.txt | |
+++ b/3rdparty/libpng/CMakeLists.txt | |
@@ -2,7 +2,7 @@ | |
# CMake file for libpng. See root CMakeLists.txt | |
# | |
# ---------------------------------------------------------------------------- | |
- | |
+add_definitions(-DPNG_ARM_NEON_OPT=0) |
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 3279915..c1f930a 100644 | |
--- a/CMakeLists.txt | |
+++ b/CMakeLists.txt | |
@@ -155,9 +155,9 @@ endif(WIN32) | |
add_subdirectory( cmake ) | |
add_subdirectory( src ) | |
-add_subdirectory( examples ) | |
-add_subdirectory( test ) |
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/CMakeLists.txt b/src/CMakeLists.txt | |
index 3a5c91d30..015421d2f 100644 | |
--- a/src/CMakeLists.txt | |
+++ b/src/CMakeLists.txt | |
@@ -343,7 +343,7 @@ find_package(Eigen3 3.3 REQUIRED) | |
if(Eigen3_FOUND OR EIGEN3_FOUND) | |
# message(STATUS "EIGEN_INCLUDE_DIR: ${EIGEN_INCLUDE_DIR}") | |
# See https://eigen.tuxfamily.org/dox/group__TopicUnalignedArrayAssert.html | |
- set(AV_EIGEN_DEFINITIONS -DEIGEN_MAX_ALIGN_BYTES=0 -DEIGEN_MAX_STATIC_ALIGN_BYTES=0) | |
+ #set(AV_EIGEN_DEFINITIONS -DEIGEN_MAX_ALIGN_BYTES=0 -DEIGEN_MAX_STATIC_ALIGN_BYTES=0) |
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 95b92f1..cd07eef 100644 | |
--- a/CMakeLists.txt | |
+++ b/CMakeLists.txt | |
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8.3) | |
project(floam) | |
set(CMAKE_BUILD_TYPE "Release") | |
-set(CMAKE_CXX_FLAGS "-std=c++11") | |
+set(CMAKE_CXX_FLAGS "-std=c++14") |
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 3c731bb..e6d2c1c 100644 | |
--- a/CMakeLists.txt | |
+++ b/CMakeLists.txt | |
@@ -9,17 +9,20 @@ MESSAGE("Build type: " ${CMAKE_BUILD_TYPE}) | |
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -O3") | |
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -O3") | |
-set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -march=native") | |
-set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -march=native") |
NewerOlder