diff options
author | attila-csipa <attila.csipa@hp.com> | 2017-07-07 13:16:16 +0100 |
---|---|---|
committer | attila-csipa <attila.csipa@hp.com> | 2017-07-07 13:16:16 +0100 |
commit | 5ded46a80ec82137869ebd234189b1fd9ffff680 (patch) | |
tree | feac22663567716e51133734d7592da64adfd239 /cv/translation-calibrator.hpp | |
parent | 816c857c513e42a0b2583c2ab7bd89610f968f93 (diff) | |
parent | f013741288cbbd9a2e70aea727cbb80cf72d10cc (diff) |
Merge remote-tracking branch 'upstream/unstable' into unstable
Diffstat (limited to 'cv/translation-calibrator.hpp')
-rw-r--r-- | cv/translation-calibrator.hpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cv/translation-calibrator.hpp b/cv/translation-calibrator.hpp index ae2ed844..d908496a 100644 --- a/cv/translation-calibrator.hpp +++ b/cv/translation-calibrator.hpp @@ -29,7 +29,7 @@ public: void update(const cv::Matx33d& R_CM_k, const cv::Vec3d& t_CM_k); // get the current estimate for t_MH - std::tuple<cv::Vec3f, unsigned> get_estimate(); + std::tuple<cv::Vec3f, cv::Vec3i> get_estimate(); private: bool check_bucket(const cv::Matx33d& R_CM_k); |