diff options
Diffstat (limited to 'tracker-easy/frame.hpp')
| -rw-r--r-- | tracker-easy/frame.hpp | 25 | 
1 files changed, 4 insertions, 21 deletions
| diff --git a/tracker-easy/frame.hpp b/tracker-easy/frame.hpp index 678665fd..807f74d2 100644 --- a/tracker-easy/frame.hpp +++ b/tracker-easy/frame.hpp @@ -5,28 +5,15 @@  #include <opencv2/core.hpp>  #include <QImage> -#ifdef __clang__ -#   pragma clang diagnostic push -#   pragma clang diagnostic ignored "-Wweak-vtables" -#endif -namespace pt_module { -struct Frame final : pt_frame -{ -    cv::Mat mat; - -    operator const cv::Mat&() const& { return mat; } -    operator cv::Mat&() & { return mat; } -}; - -struct Preview final : pt_preview +struct Preview  {      Preview(int w, int h); -    Preview& operator=(const pt_frame& frame) override; -    QImage get_bitmap() override; -    void draw_head_center(f x, f y) override; +    Preview& operator=(const cv::Mat& frame); +    QImage get_bitmap(); +    void draw_head_center(pt_pixel_pos_mixin::f x, pt_pixel_pos_mixin::f y);      operator cv::Mat&() { return frame_copy; }      operator cv::Mat const&() const { return frame_copy; } @@ -37,8 +24,4 @@ private:      cv::Mat frame_copy, frame_out;  }; -} // ns pt_module -#ifdef __clang__ -#   pragma clang diagnostic pop -#endif | 
