diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2021-09-26 10:00:53 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2021-09-26 11:22:51 +0200 |
| commit | d0a3b0a85c50c7c746b8ef17af19f4e88dfdf895 (patch) | |
| tree | 429cd3f90a4666487f1897e38677f80a89dc01f5 /tracker-pt | |
| parent | 5ba58e31d177a9cfa6d2c48a674ce295fdcd248a (diff) | |
tracker/{pt,wii}: fix awkward pt_preview::operator=
Diffstat (limited to 'tracker-pt')
| -rw-r--r-- | tracker-pt/ftnoir_tracker_pt.cpp | 2 | ||||
| -rw-r--r-- | tracker-pt/module/frame.cpp | 2 | ||||
| -rw-r--r-- | tracker-pt/module/frame.hpp | 2 | ||||
| -rw-r--r-- | tracker-pt/pt-api.hpp | 6 |
4 files changed, 8 insertions, 4 deletions
diff --git a/tracker-pt/ftnoir_tracker_pt.cpp b/tracker-pt/ftnoir_tracker_pt.cpp index 570d76c4..64fd6fd5 100644 --- a/tracker-pt/ftnoir_tracker_pt.cpp +++ b/tracker-pt/ftnoir_tracker_pt.cpp @@ -72,7 +72,7 @@ void Tracker_PT::run() const bool preview_visible = check_is_visible(); if (preview_visible) - *preview_frame = *frame; + preview_frame->set_last_frame(*frame); point_extractor->extract_points(*frame, *preview_frame, preview_visible, points); point_count.store(points.size(), std::memory_order_relaxed); diff --git a/tracker-pt/module/frame.cpp b/tracker-pt/module/frame.cpp index b8f2b7cb..798706b8 100644 --- a/tracker-pt/module/frame.cpp +++ b/tracker-pt/module/frame.cpp @@ -6,7 +6,7 @@ namespace pt_module { -Preview& Preview::operator=(const pt_frame& frame_) +void Preview::set_last_frame(const pt_frame& frame_) { const cv::Mat& frame2 = frame_.as_const<const Frame>()->mat; const cv::Mat* frame; diff --git a/tracker-pt/module/frame.hpp b/tracker-pt/module/frame.hpp index ae0a0cbc..1e7c82b6 100644 --- a/tracker-pt/module/frame.hpp +++ b/tracker-pt/module/frame.hpp @@ -24,7 +24,7 @@ struct Preview final : pt_preview { Preview(int w, int h); - Preview& operator=(const pt_frame& frame) override; + void set_last_frame(const pt_frame& frame) override; QImage get_bitmap() override; void draw_head_center(f x, f y) override; diff --git a/tracker-pt/pt-api.hpp b/tracker-pt/pt-api.hpp index b87e7d65..75e880d4 100644 --- a/tracker-pt/pt-api.hpp +++ b/tracker-pt/pt-api.hpp @@ -69,7 +69,11 @@ protected: struct pt_preview : pt_frame { - virtual pt_preview& operator=(const pt_frame&) = 0; + pt_preview() = default; + + OTR_DISABLE_MOVE_COPY(pt_preview); + + virtual void set_last_frame(const pt_frame&) = 0; virtual QImage get_bitmap() = 0; virtual void draw_head_center(f x, f y) = 0; }; |