Merge branch 'develop' of http://gitlab.mynt.com/mynteye/mynt-eye-s-sdk into develop
This commit is contained in:
commit
9cbd066550
|
@ -17,8 +17,9 @@
|
|||
|
||||
#include <opencv2/calib3d/calib3d.hpp>
|
||||
#include <opencv2/imgproc/imgproc.hpp>
|
||||
#ifndef WITH_OPENCV2
|
||||
#include <opencv2/core/persistence.hpp>
|
||||
|
||||
#endif
|
||||
#include "mynteye/logger.h"
|
||||
|
||||
MYNTEYE_BEGIN_NAMESPACE
|
||||
|
@ -105,6 +106,7 @@ void DisparityProcessor::SetDisparityComputingMethodType(
|
|||
}
|
||||
|
||||
bool DisparityProcessor::ConfigFromFile(const std::string& config_file) {
|
||||
#ifndef WITH_OPENCV2
|
||||
cv::FileStorage fsSettings(config_file, cv::FileStorage::READ);
|
||||
if (!fsSettings.isOpened()) {
|
||||
std::cerr << "ERROR: Wrong path to settings" << std::endl;
|
||||
|
@ -120,6 +122,9 @@ bool DisparityProcessor::ConfigFromFile(const std::string& config_file) {
|
|||
bm_matcher->read(node_bm);
|
||||
}
|
||||
return true;
|
||||
#else
|
||||
return false;
|
||||
#endif
|
||||
}
|
||||
|
||||
std::string DisparityProcessor::Name() {
|
||||
|
|
Loading…
Reference in New Issue
Block a user