From 796e15e7bd832522ec8e783d8546c1e3b2eecf3b Mon Sep 17 00:00:00 2001 From: Chris Beall Date: Tue, 15 Oct 2013 20:12:36 +0000 Subject: [PATCH] make calibration interface uniform, matrix --> K --- gtsam/geometry/Cal3_S2.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gtsam/geometry/Cal3_S2.h b/gtsam/geometry/Cal3_S2.h index 237fe0ab6..54ca03ef0 100644 --- a/gtsam/geometry/Cal3_S2.h +++ b/gtsam/geometry/Cal3_S2.h @@ -125,10 +125,15 @@ public: } /// return calibration matrix K - Matrix matrix() const { + Matrix K() const { return Matrix_(3, 3, fx_, s_, u0_, 0.0, fy_, v0_, 0.0, 0.0, 1.0); } + /** @deprecated The following function has been deprecated, use K above */ + Matrix matrix() const { + return K(); + } + /// return inverted calibration matrix inv(K) Matrix matrix_inverse() const { const double fxy = fx_ * fy_, sv0 = s_ * v0_, fyu0 = fy_ * u0_;