summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2016-09-12 15:43:46 +0200
committerStanislaw Halik <sthalik@misaki.pl>2016-09-12 18:58:23 +0200
commit88be2bef045b8bb0d08034401b38ae0829d6f54c (patch)
treeb35c6113791b7424c14e3833f73cc0e733cd7ad4
parent50c927c1cf0e85df8b76c00feea116a4642ed00f (diff)
tracker/pt: fix build
-rw-r--r--tracker-pt/camera.cpp6
-rw-r--r--tracker-pt/camera.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/tracker-pt/camera.cpp b/tracker-pt/camera.cpp
index 600ab26a..ee021d4c 100644
--- a/tracker-pt/camera.cpp
+++ b/tracker-pt/camera.cpp
@@ -125,15 +125,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 e73d9dff..d0dfdd84 100644
--- a/tracker-pt/camera.h
+++ b/tracker-pt/camera.h
@@ -7,9 +7,9 @@
#pragma once
-#include <opencv2/core/core.hpp>
+#include <opencv2/core.hpp>
#include <memory>
-#include <opencv2/highgui.hpp>
+#include <opencv2/videoio.hpp>
#include <string>
struct CamInfo