Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

FIx in CMakeLists.txt & FindCameraMatrices.h #4

Merged
merged 1 commit into from

2 participants

Stjepan Udovičić Roy Shilkrot
Stjepan Udovičić

In CMakeLists.txt, SSBA_LIBRARY_DIR wasn't correct.
In FindCameraMatrices.h declaration of "GetFundamentalMat" was different than definition in FindCameraMatrices.cpp

Roy Shilkrot royshil merged commit 3d93bfd into from
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
Showing with 8 additions and 4 deletions.
  1. +4 −2 SfMToyLib/CMakeLists.txt
  2. +4 −2 SfMToyLib/FindCameraMatrices.h
6 SfMToyLib/CMakeLists.txt
View
@@ -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()
6 SfMToyLib/FindCameraMatrices.h
View
@@ -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,
Something went wrong with that request. Please try again.