From ccafc5f054733e883bb0ef8b0c698b4c9c86fff9 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sun, 31 Jul 2016 13:47:09 +0200 Subject: tracker/{pt,aruco}: don't include opencv highgui, videoio is enough --- tracker-pt/camera.cpp | 10 +++++----- tracker-pt/camera.h | 2 +- tracker-pt/point_extractor.cpp | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'tracker-pt') 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 -#include #include "opentrack-compat/sleep.hpp" #include "opentrack-compat/camera-names.hpp" +#include +#include 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 #include -#include +#include #include #include 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 +#include #include #include -- cgit v1.2.3