summaryrefslogtreecommitdiffhomepage
path: root/tracker-wii
diff options
context:
space:
mode:
Diffstat (limited to 'tracker-wii')
-rw-r--r--tracker-wii/CMakeLists.txt2
-rw-r--r--tracker-wii/wii_camera.h2
-rw-r--r--tracker-wii/wii_frame.cpp6
-rw-r--r--tracker-wii/wii_frame.hpp2
-rw-r--r--tracker-wii/wii_module.cpp4
-rw-r--r--tracker-wii/wii_point_extractor.cpp2
-rw-r--r--tracker-wii/wii_point_extractor.h2
-rw-r--r--tracker-wii/wiiyourself/CMakeLists.txt2
8 files changed, 12 insertions, 10 deletions
diff --git a/tracker-wii/CMakeLists.txt b/tracker-wii/CMakeLists.txt
index 76a43a77..e40692ba 100644
--- a/tracker-wii/CMakeLists.txt
+++ b/tracker-wii/CMakeLists.txt
@@ -1,5 +1,5 @@
if(WIN32)
- find_package(OpenCV 3.0 QUIET)
+ find_package(OpenCV QUIET)
if(OpenCV_FOUND)
add_subdirectory(wiiyourself)
otr_module(tracker-wii)
diff --git a/tracker-wii/wii_camera.h b/tracker-wii/wii_camera.h
index 55def206..05f5436c 100644
--- a/tracker-wii/wii_camera.h
+++ b/tracker-wii/wii_camera.h
@@ -41,7 +41,7 @@ struct WIICamera final : pt_camera
QString get_desired_name() const override;
QString get_active_name() const override;
- void set_fov(double value) override {}
+ void set_fov(f x) override { (void) x; }
void show_camera_settings() override;
private:
diff --git a/tracker-wii/wii_frame.cpp b/tracker-wii/wii_frame.cpp
index 9332a704..691e6b57 100644
--- a/tracker-wii/wii_frame.cpp
+++ b/tracker-wii/wii_frame.cpp
@@ -27,7 +27,7 @@ WIIPreview& WIIPreview::operator=(const pt_frame& frame_)
if (frame.channels() != 3)
{
- once_only(qDebug() << "tracker/pt: camera frame depth: 3 !=" << frame.channels());
+ eval_once(qDebug() << "tracker/pt: camera frame depth: 3 !=" << frame.channels());
return *this;
}
@@ -61,7 +61,7 @@ QImage WIIPreview::get_bitmap()
if (stride < 64 || stride < frame_out.cols * 4)
{
- once_only(qDebug() << "bad stride" << stride
+ eval_once(qDebug() << "bad stride" << stride
<< "for bitmap size" << frame_copy.cols << frame_copy.rows);
return QImage();
}
@@ -74,7 +74,7 @@ QImage WIIPreview::get_bitmap()
QImage::Format_ARGB32);
}
-void WIIPreview::draw_head_center(double x, double y)
+void WIIPreview::draw_head_center(f x, f y)
{
double px_, py_;
diff --git a/tracker-wii/wii_frame.hpp b/tracker-wii/wii_frame.hpp
index 31967d10..336e811d 100644
--- a/tracker-wii/wii_frame.hpp
+++ b/tracker-wii/wii_frame.hpp
@@ -49,7 +49,7 @@ struct WIIPreview final : pt_preview
WIIPreview& operator=(const pt_frame& frame) override;
QImage get_bitmap() override;
- void draw_head_center(double x, double y) override;
+ void draw_head_center(f x, f y) override;
operator cv::Mat&() { return frame_copy; }
operator cv::Mat const&() const { return frame_copy; }
diff --git a/tracker-wii/wii_module.cpp b/tracker-wii/wii_module.cpp
index 40131f69..9acfee49 100644
--- a/tracker-wii/wii_module.cpp
+++ b/tracker-wii/wii_module.cpp
@@ -64,7 +64,9 @@ struct wii_dialog_pt : TrackerDialog_PT
class wii_metadata_pt : public Metadata
{
- QString name() { return _("WiiPointTracker 1.1"); }
+ Q_OBJECT
+
+ QString name() { return tr("WiiPointTracker 1.1"); }
QIcon icon() { return QIcon(":/Resources/wii.png"); }
};
diff --git a/tracker-wii/wii_point_extractor.cpp b/tracker-wii/wii_point_extractor.cpp
index 215d50b8..a23e0e5b 100644
--- a/tracker-wii/wii_point_extractor.cpp
+++ b/tracker-wii/wii_point_extractor.cpp
@@ -30,7 +30,7 @@
#include <QDebug>
-using namespace types;
+using namespace numeric_types;
using namespace pt_module;
diff --git a/tracker-wii/wii_point_extractor.h b/tracker-wii/wii_point_extractor.h
index be0e5f45..452d8e92 100644
--- a/tracker-wii/wii_point_extractor.h
+++ b/tracker-wii/wii_point_extractor.h
@@ -16,7 +16,7 @@
namespace pt_module {
-using namespace types;
+using namespace numeric_types;
class WIIPointExtractor final : public pt_point_extractor
{
diff --git a/tracker-wii/wiiyourself/CMakeLists.txt b/tracker-wii/wiiyourself/CMakeLists.txt
index 6a32fde4..1df52dbd 100644
--- a/tracker-wii/wiiyourself/CMakeLists.txt
+++ b/tracker-wii/wiiyourself/CMakeLists.txt
@@ -1 +1 @@
-otr_module(wiiyourself STATIC)
+otr_module(wiiyourself STATIC NO-QT NO-COMPAT)