Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Opencv3 more fixes #6

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Opencv3 more fixes #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
16eca3d
Header is unnecessary and conflicts with opencv3
brunobg May 8, 2017
4133d1a
Header is unnecessary and conflicts with opencv3
brunobg May 8, 2017
e27a4d8
More opencv3 compatibility fixes
brunobg May 8, 2017
ca352bf
checks for opencv
brunobg Jun 5, 2017
52474d4
gcc compatibility
brunobg Jun 5, 2017
2e27298
gcc compatibility, looser throw specifier
brunobg Jun 5, 2017
5f20cf0
gcc compatibility
brunobg Jun 5, 2017
bb5f12e
Merge pull request #1 from brunobg/opencv3morefixes
brunobg Jun 5, 2017
0104296
Include glog
brunobg Sep 20, 2017
b423e8f
Merge pull request #2 from brunobg/master
brunobg Sep 26, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion src/rsba/VideoSfMClient.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ VideoSfMClient::VideoSfMClient(const SfmOptions& opt)



VideoSfMClient::~VideoSfMClient()
VideoSfMClient::~VideoSfMClient() throw ()
{
}

Expand Down
2 changes: 1 addition & 1 deletion src/rsba/VideoSfMClient.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/rsba/struct/VideoSfM.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <vector>
#include <stdexcept>
#include <opencv2/core/core.hpp>
#include <opencv2/nonfree/features2d.hpp>

#include "rsba/struct/VideoSfM.h"

Expand Down
2 changes: 0 additions & 2 deletions src/rsba/struct/VideoSfM.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@
#define _VideoSfM_h

#include <vector>
#include <glog/logging.h>
#include <opencv2/core/core.hpp>
#include <opencv2/nonfree/features2d.hpp>

#include "rsba/gen-cpp/VideoSfM.h"
#include "rsba/SfmOptions.h"
Expand Down
1 change: 0 additions & 1 deletion src/rsba/video_bundler_constV.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
#include <cstdio>
#include <iostream>
#include <thread>
#include <glog/logging.h>

#include "rsba/ceres/ceres.h"
#include "rsba/ceres/rotation.h"
Expand Down
1 change: 0 additions & 1 deletion src/rsba/video_bundler_life.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#include <iostream>
#include <thread>
#include <string.h>
#include <glog/logging.h>
#include <ceres/ceres.h>
#include <ceres/rotation.h>

Expand Down
1 change: 0 additions & 1 deletion src/rsba/video_bundler_structless.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#include <iostream>
#include <thread>
#include <string.h>
#include <glog/logging.h>
#include <ceres/ceres.h>
#include <ceres/rotation.h>

Expand Down