Merge branch 'unstable' into trackhat-ui

1 files changed, 10 insertions, 0 deletions

diff --git a/ftnoir_tracker_pt/camera.cpp b/ftnoir_tracker_pt/camera.cpp
index 9168a3e4..2e745f2a 100644
--- a/ftnoir_tracker_pt/camera.cpp
+++ b/ftnoir_tracker_pt/camera.cpp
@@ -61,6 +61,16 @@ void Camera::set_res(int x_res, int y_res)
     }
 }
 
+CamInfo Camera::get_info()
+{
+    if (cam_info.res_x == 0 || cam_info.res_y == 0)
+    {
+        cv::Mat tmp;
+        _get_frame(&tmp);
+    }
+    return cam_info;
+}
+
 bool Camera::get_frame(float dt, cv::Mat* frame)
 {
     bool new_frame = _get_frame(frame);