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-aruco/ftnoir_tracker_aruco.h | 1 - 1 file changed, 1 deletion(-) (limited to 'tracker-aruco/ftnoir_tracker_aruco.h') diff --git a/tracker-aruco/ftnoir_tracker_aruco.h b/tracker-aruco/ftnoir_tracker_aruco.h index 02b7e0a7..8531bef9 100644 --- a/tracker-aruco/ftnoir_tracker_aruco.h +++ b/tracker-aruco/ftnoir_tracker_aruco.h @@ -117,7 +117,6 @@ private: cv::Rect last_roi; Timer fps_timer, last_detection_timer; unsigned adaptive_size_pos; - volatile bool stop; bool use_otsu; struct resolution_tuple -- cgit v1.2.3