Build Corrections and Optimisation and Spelling Corrections

CMakeLists.txt

@@ -12,20 +12,15 @@ 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")
 
-# Check C++11 or C++0x support
+# Check C++14 support
 include(CheckCXXCompilerFlag)
-CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
-CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
-if(COMPILER_SUPPORTS_CXX11)
-   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-   add_definitions(-DCOMPILEDWITHC11)
-   message(STATUS "Using flag -std=c++11.")
-elseif(COMPILER_SUPPORTS_CXX0X)
-   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
-   add_definitions(-DCOMPILEDWITHC0X)
-   message(STATUS "Using flag -std=c++0x.")
+CHECK_CXX_COMPILER_FLAG("-std=c++14" COMPILER_SUPPORTS_CXX14)
+if(COMPILER_SUPPORTS_CXX14)
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
+   add_definitions(-DCOMPILEDWITHC14)
+   message(STATUS "Using flag -std=c++14.")
 else()
-   message(FATAL_ERROR "The compiler ${CMAKE_CXX_COMPILER} has no C++11 support. Please use a different C++ compiler.")
+   message(FATAL_ERROR "The compiler ${CMAKE_CXX_COMPILER} has no C++14 support. Please use a different C++ compiler.")
 endif()
 
 LIST(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake_modules)
@@ -388,3 +383,23 @@ if(realsense2_FOUND)
             Examples_old/Stereo-Inertial/stereo_inertial_realsense_D435i.cc)
     target_link_libraries(stereo_inertial_realsense_D435i_old ${PROJECT_NAME})
 endif()
+
+#Install Rule
+install(TARGETS ORB_SLAM3
+    RUNTIME DESTINATION bin
+    LIBRARY DESTINATION lib
+    ARCHIVE DESTINATION lib
+)
+install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/ DESTINATION include/${PROJECT_NAME}) #include/ORB_SLAM3
+
+#Uninstall Rule
+if(EXISTS "${CMAKE_BINARY_DIR}/install_manifest.txt")
+  configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
+                 "${CMAKE_BINARY_DIR}/cmake_uninstall.cmake" @ONLY)
+endif()
+
+#for find_package
+configure_file(${CMAKE_SOURCE_DIR}/cmake/ORB_SLAM3Config.cmake.in
+               ${CMAKE_BINARY_DIR}/ORB_SLAM3Config.cmake @ONLY)
+install(FILES ${CMAKE_BINARY_DIR}/ORB_SLAM3Config.cmake
+        DESTINATION lib/cmake/ORB_SLAM3)

Dependencies.md

@@ -1,10 +1,10 @@
-##List of Known Dependencies
-###ORB-SLAM3 v1.0
+## List of Known Dependencies
+### ORB-SLAM3 v1.0
 
 In this document we list all the pieces of code included  by ORB-SLAM3 and linked libraries which are not property of the authors of ORB-SLAM3.
 
 
-#####Code in **src** and **include** folders
+##### Code in **src** and **include** folders
 
 * *ORBextractor.cc*.
 This is a modified version of orb.cpp of OpenCV library. The original code is BSD licensed.
@@ -21,7 +21,7 @@ The original code is BSD licensed.
 The code is from: http://graphics.stanford.edu/~seander/bithacks.html#CountBitsSetParallel.
 The code is in the public domain.
 
-#####Code in Thirdparty folder
+##### Code in Thirdparty folder
 
 * All code in **DBoW2** folder.
 This is a modified version of [DBoW2](https://github.com/dorian3d/DBoW2) and [DLib](https://github.com/dorian3d/DLib) library. All files included are BSD licensed.
@@ -32,7 +32,7 @@ This is a modified version of [g2o](https://github.com/RainerKuemmerle/g2o). All
 * All code in **Sophus** folder.
 This is a modified version of [Sophus](https://github.com/strasdat/Sophus). [MIT license](https://en.wikipedia.org/wiki/MIT_License).
 
-#####Library dependencies 
+##### Library dependencies 
 
 * **Pangolin (visualization and user interface)**.
 [MIT license](https://en.wikipedia.org/wiki/MIT_License).

Examples/Monocular-Inertial/mono_inertial_euroc.cc

@@ -148,7 +148,7 @@ int main(int argc, char *argv[])
             if(imageScale != 1.f)
             {
 #ifdef REGISTER_TIMES
-    #ifdef COMPILEDWITHC11
+    #ifdef COMPILEDWITHC14
                 std::chrono::steady_clock::time_point t_Start_Resize = std::chrono::steady_clock::now();
     #else
                 std::chrono::monotonic_clock::time_point t_Start_Resize = std::chrono::monotonic_clock::now();
@@ -158,7 +158,7 @@ int main(int argc, char *argv[])
                 int height = im.rows * imageScale;
                 cv::resize(im, im, cv::Size(width, height));
 #ifdef REGISTER_TIMES
-    #ifdef COMPILEDWITHC11
+    #ifdef COMPILEDWITHC14
                 std::chrono::steady_clock::time_point t_End_Resize = std::chrono::steady_clock::now();
     #else
                 std::chrono::monotonic_clock::time_point t_End_Resize = std::chrono::monotonic_clock::now();
@@ -184,7 +184,7 @@ int main(int argc, char *argv[])
                 }
             }
 
-    #ifdef COMPILEDWITHC11
+    #ifdef COMPILEDWITHC14
             std::chrono::steady_clock::time_point t1 = std::chrono::steady_clock::now();
     #else
             std::chrono::monotonic_clock::time_point t1 = std::chrono::monotonic_clock::now();
@@ -194,7 +194,7 @@ int main(int argc, char *argv[])
             // cout << "tframe = " << tframe << endl;
             SLAM.TrackMonocular(im,tframe,vImuMeas); // TODO change to monocular_inertial
 
-    #ifdef COMPILEDWITHC11
+    #ifdef COMPILEDWITHC14
             std::chrono::steady_clock::time_point t2 = std::chrono::steady_clock::now();
     #else
             std::chrono::monotonic_clock::time_point t2 = std::chrono::monotonic_clock::now();

Examples/Monocular-Inertial/mono_inertial_realsense_D435i.cc

@@ -314,7 +314,7 @@ int main(int argc, char **argv) {
             if(!image_ready)
                 cond_image_rec.wait(lk);
 
-#ifdef COMPILEDWITHC11
+#ifdef COMPILEDWITHC14
             std::chrono::steady_clock::time_point time_Start_Process = std::chrono::steady_clock::now();
 #else
             std::chrono::monotonic_clock::time_point time_Start_Process = std::chrono::monotonic_clock::now();
@@ -365,7 +365,7 @@ int main(int argc, char **argv) {
         if(imageScale != 1.f)
         {
 #ifdef REGISTER_TIMES
-    #ifdef COMPILEDWITHC11
+    #ifdef COMPILEDWITHC14
             std::chrono::steady_clock::time_point t_Start_Resize = std::chrono::steady_clock::now();
     #else
             std::chrono::monotonic_clock::time_point t_Start_Resize = std::chrono::monotonic_clock::now();
@@ -375,7 +375,7 @@ int main(int argc, char **argv) {
             int height = im.rows * imageScale;
             cv::resize(im, im, cv::Size(width, height));
 #ifdef REGISTER_TIMES
-    #ifdef COMPILEDWITHC11
+    #ifdef COMPILEDWITHC14
             std::chrono::steady_clock::time_point t_End_Resize = std::chrono::steady_clock::now();
     #else
             std::chrono::monotonic_clock::time_point t_End_Resize = std::chrono::monotonic_clock::now();
@@ -386,7 +386,7 @@ int main(int argc, char **argv) {
         }
 
 #ifdef REGISTER_TIMES
-    #ifdef COMPILEDWITHC11
+    #ifdef COMPILEDWITHC14
         std::chrono::steady_clock::time_point t_Start_Track = std::chrono::steady_clock::now();
     #else
         std::chrono::monotonic_clock::time_point t_Start_Track = std::chrono::monotonic_clock::now();
@@ -395,7 +395,7 @@ int main(int argc, char **argv) {
         // Pass the image to the SLAM system
         SLAM.TrackMonocular(im, timestamp, vImuMeas);
 #ifdef REGISTER_TIMES
-    #ifdef COMPILEDWITHC11
+    #ifdef COMPILEDWITHC14
         std::chrono::steady_clock::time_point t_End_Track = std::chrono::steady_clock::now();
     #else
         std::chrono::monotonic_clock::time_point t_End_Track = std::chrono::monotonic_clock::now();

Examples/Monocular-Inertial/mono_inertial_realsense_t265.cc

@@ -230,7 +230,7 @@ int main(int argc, char **argv)
             while(!image_ready)
                 cond_image_rec.wait(lk);
 
-#ifdef COMPILEDWITHC11
+#ifdef COMPILEDWITHC14
         std::chrono::steady_clock::time_point time_Start_Process = std::chrono::steady_clock::now();
 #else
         std::chrono::monotonic_clock::time_point time_Start_Process = std::chrono::monotonic_clock::now();
@@ -257,7 +257,7 @@ int main(int argc, char **argv)
             else
             {
     #ifdef REGISTER_TIMES
-        #ifdef COMPILEDWITHC11
+        #ifdef COMPILEDWITHC14
                 std::chrono::steady_clock::time_point t_Start_Resize = std::chrono::steady_clock::now();
         #else
                 std::chrono::monotonic_clock::time_point t_Start_Resize = std::chrono::monotonic_clock::now();
@@ -267,7 +267,7 @@ int main(int argc, char **argv)
                 int height = imCV.rows * imageScale;
                 cv::resize(imCV, im, cv::Size(width, height));
     #ifdef REGISTER_TIMES
-        #ifdef COMPILEDWITHC11
+        #ifdef COMPILEDWITHC14
                 std::chrono::steady_clock::time_point t_End_Resize = std::chrono::steady_clock::now();
         #else
                 std::chrono::monotonic_clock::time_point t_End_Resize = std::chrono::monotonic_clock::now();
@@ -308,15 +308,15 @@ int main(int argc, char **argv)
             }
         }
 
-#ifdef COMPILEDWITHC11
+#ifdef COMPILEDWITHC14
         std::chrono::steady_clock::time_point t_Start_Track = std::chrono::steady_clock::now();
 #else
         std::chrono::monotonic_clock::time_point t_Start_Track = std::chrono::monotonic_clock::now();
 #endif
         // Pass the image to the SLAM system
         SLAM.TrackMonocular(im, timestamp, vImuMeas);
 
-#ifdef COMPILEDWITHC11
+#ifdef COMPILEDWITHC14
         std::chrono::steady_clock::time_point t_End_Track = std::chrono::steady_clock::now();
 #else
         std::chrono::monotonic_clock::time_point t_End_Track = std::chrono::monotonic_clock::now();

Examples/Monocular-Inertial/mono_inertial_tum_vi.cc

@@ -172,7 +172,7 @@ int main(int argc, char **argv)
             if(imageScale != 1.f)
             {
 #ifdef REGISTER_TIMES
-    #ifdef COMPILEDWITHC11
+    #ifdef COMPILEDWITHC14
                 std::chrono::steady_clock::time_point t_Start_Resize = std::chrono::steady_clock::now();
     #else
                 std::chrono::monotonic_clock::time_point t_Start_Resize = std::chrono::monotonic_clock::now();
@@ -182,7 +182,7 @@ int main(int argc, char **argv)
                 int height = im.rows * imageScale;
                 cv::resize(im, im, cv::Size(width, height));
 #ifdef REGISTER_TIMES
-    #ifdef COMPILEDWITHC11
+    #ifdef COMPILEDWITHC14
                 std::chrono::steady_clock::time_point t_End_Resize = std::chrono::steady_clock::now();
     #else
                 std::chrono::monotonic_clock::time_point t_End_Resize = std::chrono::monotonic_clock::now();
@@ -195,7 +195,7 @@ int main(int argc, char **argv)
             // cout << "first imu: " << first_imu[seq] << endl;
             /*cout << "first imu time: " << fixed << vTimestampsImu[first_imu] << endl;
             cout << "size vImu: " << vImuMeas.size() << endl;*/
-    #ifdef COMPILEDWITHC11
+    #ifdef COMPILEDWITHC14
             std::chrono::steady_clock::time_point t1 = std::chrono::steady_clock::now();
     #else
             std::chrono::monotonic_clock::time_point t1 = std::chrono::monotonic_clock::now();
@@ -205,7 +205,7 @@ int main(int argc, char **argv)
             // cout << "tframe = " << tframe << endl;
             SLAM.TrackMonocular(im,tframe,vImuMeas); // TODO change to monocular_inertial
 
-    #ifdef COMPILEDWITHC11
+    #ifdef COMPILEDWITHC14
             std::chrono::steady_clock::time_point t2 = std::chrono::steady_clock::now();
     #else
             std::chrono::monotonic_clock::time_point t2 = std::chrono::monotonic_clock::now();

Examples/Monocular/mono_euroc.cc

@@ -109,7 +109,7 @@ int main(int argc, char **argv)
             if(imageScale != 1.f)
             {
 #ifdef REGISTER_TIMES
-    #ifdef COMPILEDWITHC11
+    #ifdef COMPILEDWITHC14
                 std::chrono::steady_clock::time_point t_Start_Resize = std::chrono::steady_clock::now();
     #else
                 std::chrono::monotonic_clock::time_point t_Start_Resize = std::chrono::monotonic_clock::now();
@@ -119,7 +119,7 @@ int main(int argc, char **argv)
                 int height = im.rows * imageScale;
                 cv::resize(im, im, cv::Size(width, height));
 #ifdef REGISTER_TIMES
-    #ifdef COMPILEDWITHC11
+    #ifdef COMPILEDWITHC14
                 std::chrono::steady_clock::time_point t_End_Resize = std::chrono::steady_clock::now();
     #else
                 std::chrono::monotonic_clock::time_point t_End_Resize = std::chrono::monotonic_clock::now();
@@ -129,7 +129,7 @@ int main(int argc, char **argv)
 #endif
             }
 
-    #ifdef COMPILEDWITHC11
+    #ifdef COMPILEDWITHC14
             std::chrono::steady_clock::time_point t1 = std::chrono::steady_clock::now();
     #else
             std::chrono::monotonic_clock::time_point t1 = std::chrono::monotonic_clock::now();
@@ -139,7 +139,7 @@ int main(int argc, char **argv)
             // cout << "tframe = " << tframe << endl;
             SLAM.TrackMonocular(im,tframe); // TODO change to monocular_inertial
 
-    #ifdef COMPILEDWITHC11
+    #ifdef COMPILEDWITHC14
             std::chrono::steady_clock::time_point t2 = std::chrono::steady_clock::now();
     #else
             std::chrono::monotonic_clock::time_point t2 = std::chrono::monotonic_clock::now();

Examples/Monocular/mono_kitti.cc

@@ -78,7 +78,7 @@ int main(int argc, char **argv)
         if(imageScale != 1.f)
         {
 #ifdef REGISTER_TIMES
-    #ifdef COMPILEDWITHC11
+    #ifdef COMPILEDWITHC14
             std::chrono::steady_clock::time_point t_Start_Resize = std::chrono::steady_clock::now();
     #else
             std::chrono::monotonic_clock::time_point t_Start_Resize = std::chrono::monotonic_clock::now();
@@ -88,7 +88,7 @@ int main(int argc, char **argv)
             int height = im.rows * imageScale;
             cv::resize(im, im, cv::Size(width, height));
 #ifdef REGISTER_TIMES
-    #ifdef COMPILEDWITHC11
+    #ifdef COMPILEDWITHC14
             std::chrono::steady_clock::time_point t_End_Resize = std::chrono::steady_clock::now();
     #else
             std::chrono::monotonic_clock::time_point t_End_Resize = std::chrono::monotonic_clock::now();
@@ -98,7 +98,7 @@ int main(int argc, char **argv)
 #endif
         }
 
-#ifdef COMPILEDWITHC11
+#ifdef COMPILEDWITHC14
         std::chrono::steady_clock::time_point t1 = std::chrono::steady_clock::now();
 #else
         std::chrono::monotonic_clock::time_point t1 = std::chrono::monotonic_clock::now();
@@ -107,7 +107,7 @@ int main(int argc, char **argv)
         // Pass the image to the SLAM system
         SLAM.TrackMonocular(im,tframe,vector<ORB_SLAM3::IMU::Point>(), vstrImageFilenames[ni]);
 
-#ifdef COMPILEDWITHC11
+#ifdef COMPILEDWITHC14
         std::chrono::steady_clock::time_point t2 = std::chrono::steady_clock::now();
 #else
         std::chrono::monotonic_clock::time_point t2 = std::chrono::monotonic_clock::now();

Examples/Monocular/mono_realsense_D435i.cc

@@ -228,7 +228,7 @@ int main(int argc, char **argv) {
             if(!image_ready)
                 cond_image_rec.wait(lk);
 
-#ifdef COMPILEDWITHC11
+#ifdef COMPILEDWITHC14
             std::chrono::steady_clock::time_point time_Start_Process = std::chrono::steady_clock::now();
 #else
             std::chrono::monotonic_clock::time_point time_Start_Process = std::chrono::monotonic_clock::now();
@@ -247,7 +247,7 @@ int main(int argc, char **argv) {
         if(imageScale != 1.f)
         {
 #ifdef REGISTER_TIMES
-    #ifdef COMPILEDWITHC11
+    #ifdef COMPILEDWITHC14
             std::chrono::steady_clock::time_point t_Start_Resize = std::chrono::steady_clock::now();
     #else
             std::chrono::monotonic_clock::time_point t_Start_Resize = std::chrono::monotonic_clock::now();
@@ -258,7 +258,7 @@ int main(int argc, char **argv) {
             cv::resize(im, im, cv::Size(width, height));
 
 #ifdef REGISTER_TIMES
-    #ifdef COMPILEDWITHC11
+    #ifdef COMPILEDWITHC14
             std::chrono::steady_clock::time_point t_End_Resize = std::chrono::steady_clock::now();
     #else
             std::chrono::monotonic_clock::time_point t_End_Resize = std::chrono::monotonic_clock::now();
@@ -269,7 +269,7 @@ int main(int argc, char **argv) {
         }
 
 #ifdef REGISTER_TIMES
-    #ifdef COMPILEDWITHC11
+    #ifdef COMPILEDWITHC14
         std::chrono::steady_clock::time_point t_Start_Track = std::chrono::steady_clock::now();
     #else
         std::chrono::monotonic_clock::time_point t_Start_Track = std::chrono::monotonic_clock::now();
@@ -278,7 +278,7 @@ int main(int argc, char **argv) {
         // Stereo images are already rectified.
         SLAM.TrackMonocular(im, timestamp);
 #ifdef REGISTER_TIMES
-    #ifdef COMPILEDWITHC11
+    #ifdef COMPILEDWITHC14
         std::chrono::steady_clock::time_point t_End_Track = std::chrono::steady_clock::now();
     #else
         std::chrono::monotonic_clock::time_point t_End_Track = std::chrono::monotonic_clock::now();

Examples/Monocular/mono_realsense_t265.cc

@@ -116,7 +116,7 @@ int main(int argc, char **argv)
             if(imageScale != 1.f)
             {
 #ifdef REGISTER_TIMES
-    #ifdef COMPILEDWITHC11
+    #ifdef COMPILEDWITHC14
                 std::chrono::steady_clock::time_point t_Start_Resize = std::chrono::steady_clock::now();
     #else
                 std::chrono::monotonic_clock::time_point t_Start_Resize = std::chrono::monotonic_clock::now();
@@ -126,7 +126,7 @@ int main(int argc, char **argv)
                 int height = imCV.rows * imageScale;
                 cv::resize(imCV, imCV, cv::Size(width, height));
 #ifdef REGISTER_TIMES
-    #ifdef COMPILEDWITHC11
+    #ifdef COMPILEDWITHC14
                 std::chrono::steady_clock::time_point t_End_Resize = std::chrono::steady_clock::now();
     #else
                 std::chrono::monotonic_clock::time_point t_End_Resize = std::chrono::monotonic_clock::now();
@@ -141,7 +141,7 @@ int main(int argc, char **argv)
             //clahe->apply(imRight,imRight);
 
 #ifdef REGISTER_TIMES
-  #ifdef COMPILEDWITHC11
+  #ifdef COMPILEDWITHC14
             std::chrono::steady_clock::time_point t1 = std::chrono::steady_clock::now();
   #else
             std::chrono::monotonic_clock::time_point t1 = std::chrono::monotonic_clock::now();
@@ -152,7 +152,7 @@ int main(int argc, char **argv)
             SLAM.TrackMonocular(imCV, timestamp_ms);
 
 #ifdef REGISTER_TIMES
-  #ifdef COMPILEDWITHC11
+  #ifdef COMPILEDWITHC14
             std::chrono::steady_clock::time_point t2 = std::chrono::steady_clock::now();
   #else
             std::chrono::monotonic_clock::time_point t2 = std::chrono::monotonic_clock::now();