diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2015-07-20 11:16:54 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2015-07-20 11:16:54 +0200 |
| commit | 1248e901aaf4fdb720b3fa201574aa24df4d4524 (patch) | |
| tree | 7173b34e1f68a5338b8c0c1ad8c5d33a805bbdbf /ftnoir_tracker_pt/camera.h | |
| parent | 65966c1497cbcf2c9556a754ab4e1ddef5957cfb (diff) | |
| parent | 9cc86cf3569ef6e68c4779ee0d96d1ae4ef77ca6 (diff) | |
Merge branch 'unstable' into trackhat-ui
Diffstat (limited to 'ftnoir_tracker_pt/camera.h')
| -rw-r--r-- | ftnoir_tracker_pt/camera.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ftnoir_tracker_pt/camera.h b/ftnoir_tracker_pt/camera.h index 63614ded..2c42652a 100644 --- a/ftnoir_tracker_pt/camera.h +++ b/ftnoir_tracker_pt/camera.h @@ -54,8 +54,8 @@ public: bool get_frame(float dt, cv::Mat* frame); // WARNING: returned references are valid as long as object - const CamInfo& get_info() const { return cam_info; } - const CamInfo& get_desired() const { return cam_desired; } + CamInfo get_info(); + CamInfo get_desired() const { return cam_desired; } protected: // get a frame from the camera |