From 94f04e82a10992ff76e2aa8f7f02bb8983643b52 Mon Sep 17 00:00:00 2001 From: Stéphane Lenclud Date: Mon, 15 Apr 2019 12:22:05 +0200 Subject: Easy Tracker: Removing point extractor interface. Using cv::Point instead of vec2. --- tracker-easy/point-extractor.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'tracker-easy/point-extractor.cpp') diff --git a/tracker-easy/point-extractor.cpp b/tracker-easy/point-extractor.cpp index abaa0739..c1f525c9 100644 --- a/tracker-easy/point-extractor.cpp +++ b/tracker-easy/point-extractor.cpp @@ -31,7 +31,7 @@ namespace EasyTracker } - void PointExtractor::extract_points(const cv::Mat& aFrame, cv::Mat* aPreview, std::vector& aPoints) + void PointExtractor::ExtractPoints(const cv::Mat& aFrame, cv::Mat* aPreview, std::vector& aPoints) { //TODO: Assert if channel size is neither one nor two // Make sure our frame channel is 8 bit @@ -99,10 +99,10 @@ namespace EasyTracker && bBox.width <= s.max_point_size && bBox.height <= s.max_point_size) { - vec2 center; - center[0] = bBox.x + bBox.width / 2; - center[1] = bBox.y + bBox.height / 2; - aPoints.push_back(vec2(center)); + cv::Point center; + center.x = bBox.x + bBox.width / 2; + center.y = bBox.y + bBox.height / 2; + aPoints.push_back(center); if (aPreview) { @@ -124,9 +124,9 @@ namespace EasyTracker // Search for the point with highest Y coordinate for (size_t i = 0; i < aPoints.size(); i++) { - if (aPoints[i][1] > maxY) + if (aPoints[i].y > maxY) { - maxY = aPoints[i][1]; + maxY = aPoints[i].y; index = i; } } -- cgit v1.2.3