diff options
| -rw-r--r-- | tracker-pt/ftnoir_tracker_pt.cpp | 6 | ||||
| -rw-r--r-- | tracker-pt/ftnoir_tracker_pt.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tracker-pt/ftnoir_tracker_pt.cpp b/tracker-pt/ftnoir_tracker_pt.cpp index 14813b62..950dde71 100644 --- a/tracker-pt/ftnoir_tracker_pt.cpp +++ b/tracker-pt/ftnoir_tracker_pt.cpp @@ -19,11 +19,11 @@ //#define PT_PERF_LOG //log performance //----------------------------------------------------------------------------- -Tracker_PT::Tracker_PT() - : commands(0), +Tracker_PT::Tracker_PT() : video_widget(NULL), video_frame(NULL), - ever_success(false) + ever_success(false), + commands(0) { connect(s.b.get(), SIGNAL(saving()), this, SLOT(apply_settings())); } diff --git a/tracker-pt/ftnoir_tracker_pt.h b/tracker-pt/ftnoir_tracker_pt.h index 6a889f13..b6815bd7 100644 --- a/tracker-pt/ftnoir_tracker_pt.h +++ b/tracker-pt/ftnoir_tracker_pt.h @@ -49,7 +49,8 @@ protected: void run() override; private: // thread commands - enum Command { + enum Command : unsigned char + { ABORT = 1<<0 }; void set_command(Command command); @@ -57,8 +58,6 @@ private: bool get_focal_length(float &ret); - volatile int commands; - QMutex camera_mtx; CVCamera camera; PointExtractor point_extractor; @@ -72,6 +71,7 @@ private: cv::Mat frame; volatile bool ever_success; + volatile unsigned char commands; static constexpr float rad2deg = float(180/3.14159265); //static constexpr float deg2rad = float(3.14159265/180); |