diff options
author | mrsanchos <orokhovatskiy@gmail.com> | 2018-02-16 21:05:36 +0300 |
---|---|---|
committer | mrsanchos <orokhovatskiy@gmail.com> | 2018-02-16 21:05:36 +0300 |
commit | b52fd95f1cc86e86ecb696eab07c8d6b6a2e9f5d (patch) | |
tree | a8d5a8c98d8ca3b60b0805504049275a3311f59b /tracker-pt/ftnoir_tracker_pt.h | |
parent | 82c43da829fdac974b3d6adb8742715382ddd051 (diff) | |
parent | 7a973ae2ad396c8413405e40bcb2eaab67c95d15 (diff) |
Merge branch 'unstable' of https://github.com/opentrack/opentrack into unstable
Diffstat (limited to 'tracker-pt/ftnoir_tracker_pt.h')
-rw-r--r-- | tracker-pt/ftnoir_tracker_pt.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tracker-pt/ftnoir_tracker_pt.h b/tracker-pt/ftnoir_tracker_pt.h index d1f7e1d7..03812092 100644 --- a/tracker-pt/ftnoir_tracker_pt.h +++ b/tracker-pt/ftnoir_tracker_pt.h @@ -53,7 +53,7 @@ public: int get_n_points(); bool get_cam_info(pt_camera_info* info); public slots: - void maybe_reopen_camera(); + bool maybe_reopen_camera(); void set_fov(int value); protected: void run() override; @@ -81,7 +81,7 @@ private: std::atomic<unsigned> point_count = 0; std::atomic<bool> ever_success = false; - static constexpr f rad2deg = f(180/M_PI); + static constexpr inline f rad2deg = f(180/M_PI); //static constexpr float deg2rad = float(M_PI/180); }; |