diff options
author | Stanislaw Halik <sthalik@misaki.pl> | 2019-03-14 13:40:09 +0100 |
---|---|---|
committer | Stanislaw Halik <sthalik@misaki.pl> | 2019-03-14 13:44:32 +0100 |
commit | 599afab6c9991df3d87d538ef65fe54533d25a11 (patch) | |
tree | 55bba99136ab4da1c71ee4a75eccb5006f1da0da /tracker-wii/wii_frame.hpp | |
parent | c90f8fbd1a83ffeed6b0bb9d55e91f4a4a9b8641 (diff) |
tracker/wii: revert to 2.3.10
Issue: #876
Diffstat (limited to 'tracker-wii/wii_frame.hpp')
-rw-r--r-- | tracker-wii/wii_frame.hpp | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/tracker-wii/wii_frame.hpp b/tracker-wii/wii_frame.hpp index 8c4508b2..31967d10 100644 --- a/tracker-wii/wii_frame.hpp +++ b/tracker-wii/wii_frame.hpp @@ -12,10 +12,7 @@ #include <opencv2/core.hpp> #include <QImage> -#ifdef __clang__ -# pragma clang diagnostic push -# pragma clang diagnostic ignored "-Wweak-vtables" -#endif + namespace pt_module { @@ -52,7 +49,7 @@ struct WIIPreview final : pt_preview WIIPreview& operator=(const pt_frame& frame) override; QImage get_bitmap() override; - void draw_head_center(f x, f y) override; + void draw_head_center(double x, double y) override; operator cv::Mat&() { return frame_copy; } operator cv::Mat const&() const { return frame_copy; } @@ -60,12 +57,9 @@ struct WIIPreview final : pt_preview private: static void ensure_size(cv::Mat& frame, int w, int h, int type); - cv::Mat frame_copy, frame_out; - wii_camera_status status = wii_cam_wait_for_dongle; + bool fresh = true; + cv::Mat frame_copy, frame_color, frame_resize, frame_out; + wii_camera_status status; }; } // ns pt_module - -#ifdef __clang__ -# pragma clang diagnostic pop -#endif |