Permalink
Browse files

fix clang build errors

  • Loading branch information...
jlblancoc committed Dec 4, 2017
1 parent dc37960 commit 0474a5ebfb98d48951d5108907d99f6215ad3438
@@ -2434,10 +2434,6 @@ void MainWindow::on_generateVisualOdometry_clicked()
/// following creates an object of the visual odometry class and performs
/// the VO task on the monocular images dataset
string file_paths[3];
file_paths[0] = single_dataset_path;
file_paths[1] = file_path3;
file_paths[2] = calibration_file;
// Start the computation.
// QFuture<void> future = QtConcurrent::run(&this->visual_odom,
@@ -2457,7 +2453,9 @@ void MainWindow::on_generateVisualOdometry_clicked()
std::this_thread::sleep_for(4s);
QFuture<Mat> future = QtConcurrent::run(
&this->visual_odom, &VisualOdometry::generateVO, fext, numFeats,
file_paths, feat_type);
std::array<std::string, 3>{
{single_dataset_path, file_path3, calibration_file}},
feat_type);
Mat display_VO = future.result();
this->FutureWatcher.setFuture(future);
@@ -242,7 +242,8 @@ VisualOdometry::VisualOdometry()
* Generate VO main funciton *
************************************************************************************************/
Mat VisualOdometry::generateVO(
CFeatureExtraction fext, int numFeats, string file_paths[3], int feat_type)
CFeatureExtraction fext, int numFeats,
std::array<std::string, 3> file_paths, int feat_type)
{
string dataset = file_paths[0];
string groundtruth = file_paths[1];
@@ -58,6 +58,7 @@ THE SOFTWARE.
#include <sstream>
#include <fstream>
#include <string>
#include <array>
/// MRPT includes
#include <mrpt/vision/CFeatureExtraction.h>
@@ -186,8 +187,8 @@ class VisualOdometry //: public QDialog
// Mat generateVO(CFeatureExtraction fext, int numFeats, string dataset,
// string groundtruth, string calibration_file, int feat_type );
Mat generateVO(
CFeatureExtraction fext, int numFeats, string file_paths[3],
int feat_type);
CFeatureExtraction fext, int numFeats,
std::array<std::string, 3> file_paths, int feat_type);
/**
* this function stores the ground truth in an appropriate arrat
View
@@ -30,6 +30,11 @@ if(MRPT_NUMPY_INCLUDE_DIRECTORY)
include_directories(${MRPT_NUMPY_INCLUDE_DIRECTORY})
endif()
# gcc and clang
if (NOT MSVC)
add_compile_options(-Wno-unused-local-typedef)
endif()
add_library(pymrpt
SHARED # Python lib must be shared
src/system_bindings.cpp
@@ -335,7 +335,7 @@ void TestMatchingComparative()
copyjoinimage.line(
0, (*it1)->y, imW + imW, (*it1)->y, TColor::green()); // Epipolar
copyjoinimage.drawCircle(
(*it1)->x, (*it1)->y, 4, TColor::green, 2); // Keypoint
(*it1)->x, (*it1)->y, 4, TColor::green(), 2); // Keypoint
copyInfoImage.update_patch((*it1)->patch, 0, 0);
bool firstMatch = true;
@@ -338,7 +338,7 @@ void TestMatchingComparative()
copyjoinimage.line(
0, (*it1)->y, imW + imW, (*it1)->y, TColor::green()); // Epipolar
copyjoinimage.drawCircle(
(*it1)->x, (*it1)->y, 4, TColor::green, 2); // Keypoint
(*it1)->x, (*it1)->y, 4, TColor::green(), 2); // Keypoint
copyInfoImage.update_patch((*it1)->patch, 0, 0);
bool firstMatch = true;

0 comments on commit 0474a5e

Please sign in to comment.