From ccafc5f054733e883bb0ef8b0c698b4c9c86fff9 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Sun, 31 Jul 2016 13:47:09 +0200
Subject: tracker/{pt,aruco}: don't include opencv highgui, videoio is enough

---
 tracker-aruco/ftnoir_tracker_aruco.cpp |  1 -
 tracker-aruco/ftnoir_tracker_aruco.h   |  3 +--
 tracker-pt/camera.cpp                  | 10 +++++-----
 tracker-pt/camera.h                    |  2 +-
 tracker-pt/point_extractor.cpp         |  2 +-
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/tracker-aruco/ftnoir_tracker_aruco.cpp b/tracker-aruco/ftnoir_tracker_aruco.cpp
index 7e635a85..a3fa9941 100644
--- a/tracker-aruco/ftnoir_tracker_aruco.cpp
+++ b/tracker-aruco/ftnoir_tracker_aruco.cpp
@@ -8,7 +8,6 @@
 #include "ftnoir_tracker_aruco.h"
 #include "opentrack/plugin-api.hpp"
 #include <opencv2/core.hpp>
-#include <opencv2/highgui.hpp>
 #include <opencv2/videoio.hpp>
 #include <opencv2/imgproc.hpp>
 #include <opencv2/calib3d.hpp>
diff --git a/tracker-aruco/ftnoir_tracker_aruco.h b/tracker-aruco/ftnoir_tracker_aruco.h
index a8032067..f89f3fdc 100644
--- a/tracker-aruco/ftnoir_tracker_aruco.h
+++ b/tracker-aruco/ftnoir_tracker_aruco.h
@@ -12,7 +12,7 @@
 #include "opentrack-compat/options.hpp"
 #include "trans_calib.h"
 #include "opentrack/plugin-api.hpp"
-#include "opentrack/opencv-camera-dialog.hpp"
+#include "cv/camera-dialog.hpp"
 #include "include/markerdetector.h"
 
 #include <QObject>
@@ -25,7 +25,6 @@
 #include <cinttypes>
 
 #include <opencv2/core/core.hpp>
-#include <opencv2/highgui/highgui.hpp>
 
 using namespace options;
 
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>
-- 
cgit v1.2.3