From e88c7b29ea9ec9fcd6ac6b15c965085152100d2e Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sun, 18 Jun 2017 18:19:17 +0200 Subject: get rid of "volatile" abuse We heavily used "volatile bool" to check if the thread loop should stop. But this functionality is already provided by Qt5's QThread::requestInterruption. In other cases, "volatile" is wonderfully underspecified so it's better to ditch its usage in favor of std::atomic. At the time we don't appear to be using the "volatile" keyword except when calling win32's Interlocked*() family of functions as necessary. In freetrackclient's header the "volatile" qualifier was used as part of a typedef. This doesn't work. Use it as part of data declaration. --- tracker-pt/point_tracker.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tracker-pt/point_tracker.cpp') diff --git a/tracker-pt/point_tracker.cpp b/tracker-pt/point_tracker.cpp index 8e0c28de..4022cbb2 100644 --- a/tracker-pt/point_tracker.cpp +++ b/tracker-pt/point_tracker.cpp @@ -37,7 +37,7 @@ PointModel::PointModel(settings_pt& s) set_model(s); // calculate u u = M01.cross(M02); - u /= norm(u); + u = cv::normalize(u); // calculate projection matrix on M01,M02 plane f s11 = M01.dot(M01); -- cgit v1.2.3