summaryrefslogtreecommitdiffhomepage
path: root/tracker-pt
diff options
context:
space:
mode:
Diffstat (limited to 'tracker-pt')
-rw-r--r--tracker-pt/camera.cpp10
-rw-r--r--tracker-pt/camera.h2
-rw-r--r--tracker-pt/point_extractor.cpp2
3 files changed, 7 insertions, 7 deletions
diff --git a/tracker-pt/camera.cpp b/tracker-pt/camera.cpp
index beac9d24..1c393c12 100644
--- a/tracker-pt/camera.cpp
+++ b/tracker-pt/camera.cpp
@@ -6,10 +6,10 @@
*/
#include "camera.h"
-#include <string>
-#include <QDebug>
#include "opentrack-compat/sleep.hpp"
#include "opentrack-compat/camera-names.hpp"
+#include <string>
+#include <QDebug>
void Camera::set_device(const QString& name)
{
@@ -135,15 +135,15 @@ bool CVCamera::_get_frame(cv::Mat* frame)
void CVCamera::_set_fps()
{
- if (cap) cap->set(CV_CAP_PROP_FPS, cam_desired.fps);
+ if (cap) cap->set(cv::CAP_PROP_FPS, cam_desired.fps);
}
void CVCamera::_set_res()
{
if (cap)
{
- cap->set(CV_CAP_PROP_FRAME_WIDTH, cam_desired.res_x);
- cap->set(CV_CAP_PROP_FRAME_HEIGHT, cam_desired.res_y);
+ cap->set(cv::CAP_PROP_FRAME_WIDTH, cam_desired.res_x);
+ cap->set(cv::CAP_PROP_FRAME_HEIGHT, cam_desired.res_y);
}
}
void CVCamera::_set_device_index()
diff --git a/tracker-pt/camera.h b/tracker-pt/camera.h
index 615f7142..e9993855 100644
--- a/tracker-pt/camera.h
+++ b/tracker-pt/camera.h
@@ -9,7 +9,7 @@
#include <opencv2/core/core.hpp>
#include <memory>
-#include <opencv2/highgui.hpp>
+#include <opencv2/videoio.hpp>
#include <string>
#include <QString>
diff --git a/tracker-pt/point_extractor.cpp b/tracker-pt/point_extractor.cpp
index afd9c0eb..e749934e 100644
--- a/tracker-pt/point_extractor.cpp
+++ b/tracker-pt/point_extractor.cpp
@@ -13,7 +13,7 @@
# include "opentrack-compat/timer.hpp"
#endif
-#include <opencv2/highgui.hpp>
+#include <opencv2/videoio.hpp>
#include <cmath>
#include <algorithm>