summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorXavier Hallade <xavier.hallade@intel.com>2015-09-25 15:08:21 +0200
committerStanislaw Halik <sthalik@misaki.pl>2015-09-30 17:09:42 +0200
commitb9c8ff499d662667c2db30e2e896e083eedd5f2a (patch)
tree22c9c1c1621f087592dba521ab22713a896fe723
parent05865e2e756a42c397bbfe1a2c20ebc4a1a7fa45 (diff)
tracker_rs: reverted fix. need to build with Qt 5.5.1+ instead.
This reverts commit b942fcf2224a3e59ea3dabb3d5c9eca9ba68d16f. real bug fixed in Qt 5.5.1+: https://bugreports.qt.io/browse/QTBUG-46552
-rw-r--r--ftnoir_tracker_rs/ftnoir_tracker_rs.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/ftnoir_tracker_rs/ftnoir_tracker_rs.cpp b/ftnoir_tracker_rs/ftnoir_tracker_rs.cpp
index 12330fd2..f17d7fcb 100644
--- a/ftnoir_tracker_rs/ftnoir_tracker_rs.cpp
+++ b/ftnoir_tracker_rs/ftnoir_tracker_rs.cpp
@@ -50,10 +50,8 @@ void RSTracker::readPendingUdpPoseData(){
while(mSocket.hasPendingDatagrams()) {
mSocket.readDatagram((char*)pose, sizeof(pose));
- {
- QMutexLocker foo(&mMutex);
- memcpy(mPose, pose, sizeof(pose));
- }
+ QMutexLocker foo(&mMutex);
+ memcpy(mPose, pose, sizeof(pose));
}
}