Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: royshil/SfM-Toy-Library
base: 57ac6d93bd
...
head fork: royshil/SfM-Toy-Library
compare: 3d93bfdce8
  • 2 commits
  • 2 files changed
  • 0 commit comments
  • 2 contributors
Showing with 8 additions and 4 deletions.
  1. +4 −2 SfMToyLib/CMakeLists.txt
  2. +4 −2 SfMToyLib/FindCameraMatrices.h
View
6 SfMToyLib/CMakeLists.txt
@@ -1,10 +1,12 @@
+cmake_minimum_required(VERSION 2.6)
+
if(EIGEN_INCLUDE_DIRS) # if compiling with PCL, it will bring Eigen with it
message(STATUS "SfMToyLib will use Eigen")
include_directories(${EIGEN_INCLUDE_DIRS})
add_definitions( -DUSE_EIGEN )
endif()
-set(SSBA_LIBRARY_DIR "${CMAKE_SOURCE_DIR}/3rdparty/SSBA-3.0/build" CACHE PATH "Directory to find SSBA libs")
+set(SSBA_LIBRARY_DIR "${CMAKE_SOURCE_DIR}/../3rdparty/SSBA-3.0/build" CACHE PATH "Directory to find SSBA libs")
link_directories(
${SSBA_LIBRARY_DIR}
@@ -49,4 +51,4 @@ if(APPLE)
set_target_properties(SfMToyLibrary PROPERTIES COMPILE_FLAGS "-fopenmp")
set_target_properties(SfMToyLibrary PROPERTIES LINK_FLAGS "-fopenmp")
-endif()
+endif()
View
6 SfMToyLib/FindCameraMatrices.h
@@ -22,8 +22,10 @@ cv::Mat GetFundamentalMat( const std::vector<cv::KeyPoint>& imgpts1,
const std::vector<cv::KeyPoint>& imgpts2,
std::vector<cv::KeyPoint>& imgpts1_good,
std::vector<cv::KeyPoint>& imgpts2_good,
- std::vector<cv::DMatch>& matches,
- const cv::Mat& = cv::Mat(), const cv::Mat& = cv::Mat()
+ std::vector<cv::DMatch>& matches
+#ifdef __SFM__DEBUG__
+ ,const Mat& img_1, const Mat& img_2
+#endif
);
bool FindCameraMatrices(const cv::Mat& K,

No commit comments for this range

Something went wrong with that request. Please try again.