diff options
Diffstat (limited to 'tracker-pt')
| -rw-r--r-- | tracker-pt/ftnoir_tracker_pt.h | 8 | ||||
| -rw-r--r-- | tracker-pt/point_tracker.cpp | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/tracker-pt/ftnoir_tracker_pt.h b/tracker-pt/ftnoir_tracker_pt.h index b7b0019a..65e367f5 100644 --- a/tracker-pt/ftnoir_tracker_pt.h +++ b/tracker-pt/ftnoir_tracker_pt.h @@ -11,6 +11,8 @@ #include "api/plugin-api.hpp" #include "ftnoir_tracker_pt_settings.h" +#include <atomic> + #include "numeric.hpp" #include "camera.h" @@ -79,9 +81,9 @@ private: QSize preview_size; - volatile unsigned point_count; - volatile unsigned char commands; - volatile bool ever_success; + std::atomic<unsigned> point_count; + std::atomic<unsigned char> commands; + std::atomic<bool> ever_success; static constexpr f rad2deg = f(180/M_PI); //static constexpr float deg2rad = float(M_PI/180); diff --git a/tracker-pt/point_tracker.cpp b/tracker-pt/point_tracker.cpp index 8e0c28de..4022cbb2 100644 --- a/tracker-pt/point_tracker.cpp +++ b/tracker-pt/point_tracker.cpp @@ -37,7 +37,7 @@ PointModel::PointModel(settings_pt& s) set_model(s); // calculate u u = M01.cross(M02); - u /= norm(u); + u = cv::normalize(u); // calculate projection matrix on M01,M02 plane f s11 = M01.dot(M01); |