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

---
 cv/affine.hpp                 | 1 -
 cv/init.cpp                   | 3 ++-
 cv/numeric.hpp                | 2 +-
 cv/translation-calibrator.cpp | 2 ++
 cv/translation-calibrator.hpp | 2 +-
 cv/video-widget.cpp           | 2 +-
 cv/video-widget.hpp           | 2 +-
 7 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'cv')

diff --git a/cv/affine.hpp b/cv/affine.hpp
index 882a1145..4640e24e 100644
--- a/cv/affine.hpp
+++ b/cv/affine.hpp
@@ -7,7 +7,6 @@
 
 #pragma once
 
-#include <opencv2/core.hpp>
 #include "numeric.hpp"
 
 namespace affine_impl {
diff --git a/cv/init.cpp b/cv/init.cpp
index c9c4650f..d883365b 100644
--- a/cv/init.cpp
+++ b/cv/init.cpp
@@ -1,6 +1,7 @@
 #include "init.hpp"
 #include <type_traits>
-#include <opencv2/core.hpp>
+#include <opencv2/core/base.hpp>
+#include <opencv2/core/utility.hpp>
 
 [[noreturn]]
 static
diff --git a/cv/numeric.hpp b/cv/numeric.hpp
index ce8f7e82..2050e8e4 100644
--- a/cv/numeric.hpp
+++ b/cv/numeric.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <type_traits>
-#include <opencv2/core.hpp>
+#include <opencv2/core/matx.hpp>
 
 namespace numeric_types {
     using f = float;
diff --git a/cv/translation-calibrator.cpp b/cv/translation-calibrator.cpp
index dd520ce6..8fe9a1b8 100644
--- a/cv/translation-calibrator.cpp
+++ b/cv/translation-calibrator.cpp
@@ -8,6 +8,8 @@
 #include "translation-calibrator.hpp"
 #include "compat/euler.hpp"
 #include "compat/math.hpp"
+#include "compat/macros1.h"
+#include <opencv2/core.hpp>
 
 #include <tuple>
 
diff --git a/cv/translation-calibrator.hpp b/cv/translation-calibrator.hpp
index 406edb72..3912c938 100644
--- a/cv/translation-calibrator.hpp
+++ b/cv/translation-calibrator.hpp
@@ -7,7 +7,7 @@
 
 #pragma once
 
-#include <opencv2/core.hpp>
+#include <opencv2/core/matx.hpp>
 #include <vector>
 
 //-----------------------------------------------------------------------------
diff --git a/cv/video-widget.cpp b/cv/video-widget.cpp
index ea5e13ac..6d8c0be3 100644
--- a/cv/video-widget.cpp
+++ b/cv/video-widget.cpp
@@ -1,5 +1,5 @@
 #include "video-widget.hpp"
-
+#include "compat/macros1.h"
 #include <opencv2/imgproc.hpp>
 
 void cv_video_widget::update_image(const cv::Mat& frame)
diff --git a/cv/video-widget.hpp b/cv/video-widget.hpp
index 54316d32..24f8d7f3 100644
--- a/cv/video-widget.hpp
+++ b/cv/video-widget.hpp
@@ -8,7 +8,7 @@
 #pragma once
 
 #include "video/video-widget.hpp"
-#include <opencv2/core.hpp>
+#include <opencv2/core/mat.hpp>
 
 struct cv_video_widget final : video_widget
 {
-- 
cgit v1.2.3