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

---
 compat/correlation-calibrator.cpp | 1 +
 compat/math.hpp                   | 5 +----
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'compat')

diff --git a/compat/correlation-calibrator.cpp b/compat/correlation-calibrator.cpp
index 08fbcaa7..4f08ecd5 100644
--- a/compat/correlation-calibrator.cpp
+++ b/compat/correlation-calibrator.cpp
@@ -2,6 +2,7 @@
 #include "variance.hpp"
 #include "compat/math.hpp"
 #include "compat/meta.hpp"
+#include "compat/macros1.h"
 
 #include <cmath>
 #include <iterator>
diff --git a/compat/math.hpp b/compat/math.hpp
index f05ebdc8..c5981cc2 100644
--- a/compat/math.hpp
+++ b/compat/math.hpp
@@ -1,18 +1,15 @@
 #pragma once
 
-#include "macros.hpp"
-
 #include <cmath>
 #include <type_traits>
 
 template<typename t>
-inline auto iround(t val) -> std::enable_if_t<std::is_floating_point_v<remove_cvref_t<t>>, int>
+inline auto iround(t val) -> std::enable_if_t<std::is_floating_point_v<std::decay_t<t>>, int>
 {
     return (int)std::round(val);
 }
 
 template <typename t>
-force_inline
 constexpr int signum(const t& x)
 {
     return x < t{0} ? -1 : 1;
-- 
cgit v1.2.3