generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix build errors

Browse Source
This commit is contained in:
Andrey Kamaev
2013-04-08 15:09:48 +04:00
parent befd696720
commit dd74a851f3
9 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/stitching/include/opencv2/stitching/detail/motion_estimators.hpp
View File

@@ -93,8 +93,8 @@ public:
double confThresh() const { return conf_thresh_; }
void setConfThresh(double conf_thresh) { conf_thresh_ = conf_thresh; }
CvTermCriteria termCriteria() { return term_criteria_; }
void setTermCriteria(const CvTermCriteria& term_criteria) { term_criteria_ = term_criteria; }
TermCriteria termCriteria() { return term_criteria_; }
void setTermCriteria(const TermCriteria& term_criteria) { term_criteria_ = term_criteria; }
protected:
BundleAdjusterBase(int num_params_per_cam, int num_errs_per_measurement)
@@ -103,7 +103,7 @@ protected:
{
setRefinementMask(Mat::ones(3, 3, CV_8U));
setConfThresh(1.);
setTermCriteria(cvTermCriteria(CV_TERMCRIT_EPS + CV_TERMCRIT_ITER, 1000, DBL_EPSILON));
setTermCriteria(TermCriteria(TermCriteria::EPS + TermCriteria::COUNT, 1000, DBL_EPSILON));
}
// Runs bundle adjustment
@@ -132,7 +132,7 @@ protected:
double conf_thresh_;
//Levenberg–Marquardt algorithm termination criteria
CvTermCriteria term_criteria_;
TermCriteria term_criteria_;
// Camera parameters matrix (CV_64F)
Mat cam_params_;