This file contains hidden or 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 1b89b6c8..0202a4b7 100644 | |
--- a/CMakeLists.txt | |
+++ b/CMakeLists.txt | |
@@ -224,11 +224,6 @@ macro(DEFINE_SSE_VAR _setname) | |
endmacro(DEFINE_SSE_VAR) | |
# SSE optimizations: | |
-DEFINE_SSE_VAR(SSE2) | |
-DEFINE_SSE_VAR(SSE3) |
This file contains hidden or 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
cmake_minimum_required(VERSION 3.5) | |
project(lz4) | |
IF(${CMAKE_GENERATOR} MATCHES ".*Makefiles") | |
IF("${CMAKE_BUILD_TYPE}" STREQUAL "") | |
set(CMAKE_BUILD_TYPE Release) | |
ENDIF("${CMAKE_BUILD_TYPE}" STREQUAL "") | |
ENDIF(${CMAKE_GENERATOR} MATCHES ".*Makefiles") |
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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..24890beab 100644 | |
--- a/src/CMakeLists.txt | |
+++ b/src/CMakeLists.txt | |
@@ -125,6 +125,8 @@ if(WIN32) | |
endif() | |
endif() | |
+add_definitions( -DVL_DISABLE_SSE2 ) # https://github.com/introlab/rtabmap/issues/1536 | |
+ |
NewerOlder