From 16eca3d6ed90e0965ded123c86062d08ce0f7cf9 Mon Sep 17 00:00:00 2001 From: Bruno Date: Mon, 8 May 2017 17:15:55 -0300 Subject: [PATCH 1/8] Header is unnecessary and conflicts with opencv3 --- src/rsba/struct/VideoSfM.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/rsba/struct/VideoSfM.h b/src/rsba/struct/VideoSfM.h index 6943a1f..af88bbe 100644 --- a/src/rsba/struct/VideoSfM.h +++ b/src/rsba/struct/VideoSfM.h @@ -4,7 +4,6 @@ #include #include #include -#include #include "rsba/gen-cpp/VideoSfM.h" #include "rsba/SfmOptions.h" From 4133d1af54db8b7392d9beea6860aa636e593705 Mon Sep 17 00:00:00 2001 From: Bruno Date: Mon, 8 May 2017 17:16:28 -0300 Subject: [PATCH 2/8] Header is unnecessary and conflicts with opencv3 From e27a4d8441e3424fc3a3e6482106cbdebbbc9780 Mon Sep 17 00:00:00 2001 From: Bruno Date: Mon, 8 May 2017 17:42:58 -0300 Subject: [PATCH 3/8] More opencv3 compatibility fixes --- src/rsba/struct/VideoSfM.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/src/rsba/struct/VideoSfM.cc b/src/rsba/struct/VideoSfM.cc index e245541..f76048d 100644 --- a/src/rsba/struct/VideoSfM.cc +++ b/src/rsba/struct/VideoSfM.cc @@ -1,6 +1,5 @@ #include #include -#include #include "rsba/struct/VideoSfM.h" From ca352bf9468281865a460a2140a1e73eacfccf2a Mon Sep 17 00:00:00 2001 From: Bruno Date: Mon, 5 Jun 2017 15:19:05 -0300 Subject: [PATCH 4/8] checks for opencv --- CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2c19a56..6a44fff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,8 +3,9 @@ project(RSBA) enable_testing() +OPTION(FORCE_STATIC "Force static buid" OFF) -set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror -std=c++11") +set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++11") set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG") FIND_PACKAGE(OpenMP) @@ -14,6 +15,8 @@ if (OPENMP_FOUND) set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}") endif (OPENMP_FOUND) +find_package( OpenCV REQUIRED ) + #FIND_PACKAGE(Eigen REQUIRED) #include_directories(EIGEN3_INCLUDE_DIR) From 52474d4f3e1aab2b79b54c5c5cea2cee797d203d Mon Sep 17 00:00:00 2001 From: Bruno Date: Mon, 5 Jun 2017 15:46:53 -0300 Subject: [PATCH 5/8] gcc compatibility --- src/rsba/struct/VideoSfM.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/rsba/struct/VideoSfM.cc b/src/rsba/struct/VideoSfM.cc index f76048d..ea0b89f 100644 --- a/src/rsba/struct/VideoSfM.cc +++ b/src/rsba/struct/VideoSfM.cc @@ -1,4 +1,5 @@ #include +#include #include #include "rsba/struct/VideoSfM.h" From 2e27298741137b272ead60d292cbbea16ff544a0 Mon Sep 17 00:00:00 2001 From: Bruno Date: Mon, 5 Jun 2017 15:48:22 -0300 Subject: [PATCH 6/8] gcc compatibility, looser throw specifier --- src/rsba/VideoSfMClient.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rsba/VideoSfMClient.h b/src/rsba/VideoSfMClient.h index c11f353..09d9e37 100644 --- a/src/rsba/VideoSfMClient.h +++ b/src/rsba/VideoSfMClient.h @@ -34,7 +34,7 @@ class VideoSfMClient: public sfm::Session { public: VideoSfMClient(const SfmOptions& opt); - virtual ~VideoSfMClient(); + virtual ~VideoSfMClient() throw(); virtual void start(); virtual size_t addFrame(const cv::Mat& inFrame, cv::Mat& outFrame); From 5f20cf0d16c8558b40ec597001bd7949e617b866 Mon Sep 17 00:00:00 2001 From: Bruno Date: Mon, 5 Jun 2017 15:51:02 -0300 Subject: [PATCH 7/8] gcc compatibility --- src/rsba/VideoSfMClient.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rsba/VideoSfMClient.cc b/src/rsba/VideoSfMClient.cc index d6665e7..c95478d 100644 --- a/src/rsba/VideoSfMClient.cc +++ b/src/rsba/VideoSfMClient.cc @@ -49,7 +49,7 @@ VideoSfMClient::VideoSfMClient(const SfmOptions& opt) -VideoSfMClient::~VideoSfMClient() +VideoSfMClient::~VideoSfMClient() throw () { } From 010429620c613dff39627fd2f10524b6cb60075e Mon Sep 17 00:00:00 2001 From: Bruno Barberi Gnecco Date: Wed, 20 Sep 2017 11:20:31 -0300 Subject: [PATCH 8/8] Include glog --- src/rsba/struct/VideoSfM.h | 1 - src/rsba/video_bundler_constV.h | 1 - src/rsba/video_bundler_life.h | 1 - src/rsba/video_bundler_structless.h | 1 - 4 files changed, 4 deletions(-) diff --git a/src/rsba/struct/VideoSfM.h b/src/rsba/struct/VideoSfM.h index af88bbe..e7567df 100644 --- a/src/rsba/struct/VideoSfM.h +++ b/src/rsba/struct/VideoSfM.h @@ -2,7 +2,6 @@ #define _VideoSfM_h #include -#include #include #include "rsba/gen-cpp/VideoSfM.h" diff --git a/src/rsba/video_bundler_constV.h b/src/rsba/video_bundler_constV.h index 73608d2..cb6b416 100644 --- a/src/rsba/video_bundler_constV.h +++ b/src/rsba/video_bundler_constV.h @@ -5,7 +5,6 @@ #include #include #include -#include #include "rsba/ceres/ceres.h" #include "rsba/ceres/rotation.h" diff --git a/src/rsba/video_bundler_life.h b/src/rsba/video_bundler_life.h index 98d43aa..3efc213 100644 --- a/src/rsba/video_bundler_life.h +++ b/src/rsba/video_bundler_life.h @@ -6,7 +6,6 @@ #include #include #include -#include #include #include diff --git a/src/rsba/video_bundler_structless.h b/src/rsba/video_bundler_structless.h index f548250..de24f81 100644 --- a/src/rsba/video_bundler_structless.h +++ b/src/rsba/video_bundler_structless.h @@ -6,7 +6,6 @@ #include #include #include -#include #include #include