From 9f3a7617d53f142ae9057791c3192d2d75e3acf3 Mon Sep 17 00:00:00 2001 From: Varun Agrawal Date: Wed, 5 Feb 2020 00:44:50 -0500 Subject: [PATCH 1/2] replace Cal3_S2 deprecated matrix() with K(), add Cal3DS2 support to triangulation --- gtsam.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gtsam.h b/gtsam.h index ae6ed4ac8..60a529541 100644 --- a/gtsam.h +++ b/gtsam.h @@ -874,7 +874,7 @@ class Cal3_S2 { double py() const; gtsam::Point2 principalPoint() const; Vector vector() const; - Matrix matrix() const; + Matrix K() const; Matrix matrix_inverse() const; // enabling serialization functionality @@ -1163,6 +1163,9 @@ class StereoCamera { gtsam::Point3 triangulatePoint3(const gtsam::Pose3Vector& poses, gtsam::Cal3_S2* sharedCal, const gtsam::Point2Vector& measurements, double rank_tol, bool optimize); +gtsam::Point3 triangulatePoint3(const gtsam::Pose3Vector& poses, + gtsam::Cal3DS2* sharedCal, const gtsam::Point2Vector& measurements, + double rank_tol, bool optimize); gtsam::Point3 triangulatePoint3(const gtsam::Pose3Vector& poses, gtsam::Cal3Bundler* sharedCal, const gtsam::Point2Vector& measurements, double rank_tol, bool optimize); From 80ff5334ce52ee194d4c9f93a3bc665d52ac653c Mon Sep 17 00:00:00 2001 From: Varun Agrawal Date: Wed, 5 Feb 2020 11:27:57 -0500 Subject: [PATCH 2/2] support K() and matrix() for Cal3_S2 --- gtsam.h | 1 + 1 file changed, 1 insertion(+) diff --git a/gtsam.h b/gtsam.h index 60a529541..5a8fcd509 100644 --- a/gtsam.h +++ b/gtsam.h @@ -875,6 +875,7 @@ class Cal3_S2 { gtsam::Point2 principalPoint() const; Vector vector() const; Matrix K() const; + Matrix matrix() const; Matrix matrix_inverse() const; // enabling serialization functionality