From edd8680615e842375d8c9af25427784ed01f4fab Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Tue, 19 Oct 2021 08:33:37 +0200
Subject: cv, tracker/pt: cleanup opencv includes

---
 tracker-pt/ftnoir_tracker_pt.h        | 2 --
 tracker-pt/module/camera.cpp          | 7 ++-----
 tracker-pt/module/camera.h            | 2 --
 tracker-pt/module/frame.cpp           | 2 --
 tracker-pt/module/frame.hpp           | 2 +-
 tracker-pt/module/point_extractor.cpp | 3 ++-
 tracker-pt/module/point_extractor.h   | 6 ++----
 tracker-pt/point_tracker.h            | 4 ----
 tracker-pt/pt-api.hpp                 | 4 +---
 9 files changed, 8 insertions(+), 24 deletions(-)

(limited to 'tracker-pt')

diff --git a/tracker-pt/ftnoir_tracker_pt.h b/tracker-pt/ftnoir_tracker_pt.h
index 416b0ebe..a793f94b 100644
--- a/tracker-pt/ftnoir_tracker_pt.h
+++ b/tracker-pt/ftnoir_tracker_pt.h
@@ -19,8 +19,6 @@
 #include <memory>
 #include <vector>
 
-#include <opencv2/core.hpp>
-
 #include <QThread>
 #include <QMutex>
 #include <QLayout>
diff --git a/tracker-pt/module/camera.cpp b/tracker-pt/module/camera.cpp
index 19c0c222..73c57f37 100644
--- a/tracker-pt/module/camera.cpp
+++ b/tracker-pt/module/camera.cpp
@@ -7,10 +7,7 @@
 
 #include "camera.h"
 #include "frame.hpp"
-
-#include "compat/math-imports.hpp"
-
-#include <opencv2/core.hpp>
+#include <opencv2/core/mat.hpp>
 
 namespace pt_module {
 
@@ -158,7 +155,7 @@ bool Camera::get_frame_(cv::Mat& img)
             int stride = frame.stride;
             if (stride == 0)
                 stride = cv::Mat::AUTO_STEP;
-            img = cv::Mat(frame.height, frame.width, CV_8UC(frame.channels), (void*)frame.data, stride);
+            img = cv::Mat(frame.height, frame.width, CV_8UC(frame.channels), (void*)frame.data, (size_t)stride);
             return true;
         }
     }
diff --git a/tracker-pt/module/camera.h b/tracker-pt/module/camera.h
index f9b62282..e4772178 100644
--- a/tracker-pt/module/camera.h
+++ b/tracker-pt/module/camera.h
@@ -13,8 +13,6 @@
 
 #include <memory>
 
-#include <opencv2/core.hpp>
-
 #include <QString>
 
 namespace pt_module {
diff --git a/tracker-pt/module/frame.cpp b/tracker-pt/module/frame.cpp
index 8549e5fd..1a276f16 100644
--- a/tracker-pt/module/frame.cpp
+++ b/tracker-pt/module/frame.cpp
@@ -1,7 +1,5 @@
 #include "frame.hpp"
-
 #include "compat/math.hpp"
-
 #include <opencv2/imgproc.hpp>
 
 namespace pt_module {
diff --git a/tracker-pt/module/frame.hpp b/tracker-pt/module/frame.hpp
index 239a3474..0569a323 100644
--- a/tracker-pt/module/frame.hpp
+++ b/tracker-pt/module/frame.hpp
@@ -2,7 +2,7 @@
 
 #include "pt-api.hpp"
 
-#include <opencv2/core.hpp>
+#include <opencv2/core/mat.hpp>
 #include <QImage>
 
 #ifdef __clang__
diff --git a/tracker-pt/module/point_extractor.cpp b/tracker-pt/module/point_extractor.cpp
index be4823ad..42aafba6 100644
--- a/tracker-pt/module/point_extractor.cpp
+++ b/tracker-pt/module/point_extractor.cpp
@@ -9,10 +9,11 @@
 #include "point_extractor.h"
 #include "point_tracker.h"
 #include "frame.hpp"
-
 #include "cv/numeric.hpp"
 #include "compat/math.hpp"
 
+#include <opencv2/imgproc.hpp>
+
 #undef PREVIEW
 //#define PREVIEW
 
diff --git a/tracker-pt/module/point_extractor.h b/tracker-pt/module/point_extractor.h
index 124cb110..b1cc86d5 100644
--- a/tracker-pt/module/point_extractor.h
+++ b/tracker-pt/module/point_extractor.h
@@ -9,12 +9,10 @@
 #pragma once
 
 #include "pt-api.hpp"
-
+#include <opencv2/core/mat.hpp>
+#include <opencv2/core/types.hpp>
 #include <vector>
 
-#include <opencv2/core.hpp>
-#include <opencv2/imgproc.hpp>
-
 namespace pt_module {
 
 using namespace numeric_types;
diff --git a/tracker-pt/point_tracker.h b/tracker-pt/point_tracker.h
index 05ff04bf..06388f49 100644
--- a/tracker-pt/point_tracker.h
+++ b/tracker-pt/point_tracker.h
@@ -13,13 +13,9 @@
 #include "pt-api.hpp"
 #include "point-filter.hpp"
 
-#include <cstddef>
-#include <memory>
 #include <vector>
 #include <array>
 
-#include <opencv2/core.hpp>
-
 #include <QObject>
 
 namespace pt_impl {
diff --git a/tracker-pt/pt-api.hpp b/tracker-pt/pt-api.hpp
index a0d3cd5d..1a6444e5 100644
--- a/tracker-pt/pt-api.hpp
+++ b/tracker-pt/pt-api.hpp
@@ -6,11 +6,9 @@
 #include "options/options.hpp"
 
 #include <tuple>
-#include <type_traits>
+#include <vector>
 #include <memory>
 
-#include <opencv2/core.hpp>
-
 #include <QImage>
 #include <QString>
 
-- 
cgit v1.2.3