From 285c75682f1e93a8809876ec7b2f6cd2cc79931d Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sun, 26 Sep 2021 20:57:27 +0200 Subject: compat: remove crappy uround() --- compat/math.hpp | 6 ------ tracker-pt/module/point_extractor.cpp | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/compat/math.hpp b/compat/math.hpp index 1387324e..f05ebdc8 100644 --- a/compat/math.hpp +++ b/compat/math.hpp @@ -11,12 +11,6 @@ inline auto iround(t val) -> std::enable_if_t -inline auto uround(t val) -> std::enable_if_t>, unsigned> -{ - return (unsigned)std::fmax(0, std::round(val)); -} - template force_inline constexpr int signum(const t& x) diff --git a/tracker-pt/module/point_extractor.cpp b/tracker-pt/module/point_extractor.cpp index 2f84bf86..05af99a1 100644 --- a/tracker-pt/module/point_extractor.cpp +++ b/tracker-pt/module/point_extractor.cpp @@ -221,7 +221,7 @@ void PointExtractor::threshold_image(const cv::Mat& frame_gray, cv::Mat1b& outpu const f radius = threshold_radius_value(frame_gray.cols, frame_gray.rows, threshold_slider_value); float const* const __restrict ptr = hist.ptr(0); - const unsigned area = uround(3 * pi * radius*radius); + const unsigned area = unsigned(iround(3 * pi * radius*radius)); const unsigned sz = unsigned(hist.cols * hist.rows); constexpr unsigned min_thres = 64; unsigned thres = min_thres; -- cgit v1.2.3