Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

FIx in CMakeLists.txt & FindCameraMatrices.h #4

Merged
merged 1 commit into from over 1 year ago

2 participants

Stjepan Udovičić royshil
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

royshil royshil merged commit 3d93bfd into from
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Showing 1 unique commit by 1 author.

Feb 01, 2013
Stjepan Udovičić udovicic Fix cmake include dir & GetFundamentalMat declaration 0156977
This page is out of date. Refresh to see the latest.
6 SfMToyLib/CMakeLists.txt
... ... @@ -1,10 +1,12 @@
  1 +cmake_minimum_required(VERSION 2.6)
  2 +
1 3 if(EIGEN_INCLUDE_DIRS) # if compiling with PCL, it will bring Eigen with it
2 4 message(STATUS "SfMToyLib will use Eigen")
3 5 include_directories(${EIGEN_INCLUDE_DIRS})
4 6 add_definitions( -DUSE_EIGEN )
5 7 endif()
6 8
7   -set(SSBA_LIBRARY_DIR "${CMAKE_SOURCE_DIR}/3rdparty/SSBA-3.0/build" CACHE PATH "Directory to find SSBA libs")
  9 +set(SSBA_LIBRARY_DIR "${CMAKE_SOURCE_DIR}/../3rdparty/SSBA-3.0/build" CACHE PATH "Directory to find SSBA libs")
8 10
9 11 link_directories(
10 12 ${SSBA_LIBRARY_DIR}
@@ -49,4 +51,4 @@ if(APPLE)
49 51
50 52 set_target_properties(SfMToyLibrary PROPERTIES COMPILE_FLAGS "-fopenmp")
51 53 set_target_properties(SfMToyLibrary PROPERTIES LINK_FLAGS "-fopenmp")
52   -endif()
  54 +endif()
6 SfMToyLib/FindCameraMatrices.h
@@ -22,8 +22,10 @@ cv::Mat GetFundamentalMat( const std::vector<cv::KeyPoint>& imgpts1,
22 22 const std::vector<cv::KeyPoint>& imgpts2,
23 23 std::vector<cv::KeyPoint>& imgpts1_good,
24 24 std::vector<cv::KeyPoint>& imgpts2_good,
25   - std::vector<cv::DMatch>& matches,
26   - const cv::Mat& = cv::Mat(), const cv::Mat& = cv::Mat()
  25 + std::vector<cv::DMatch>& matches
  26 +#ifdef __SFM__DEBUG__
  27 + ,const Mat& img_1, const Mat& img_2
  28 +#endif
27 29 );
28 30
29 31 bool FindCameraMatrices(const cv::Mat& K,

Tip: You can add notes to lines in a file. Hover to the left of a line to make a note

Something went wrong with that request. Please try again.