From d0ba1bbee37abe613ff04b87efce2426db43271e Mon Sep 17 00:00:00 2001
From: Xavier Hallade <xavier.hallade@intel.com>
Date: Fri, 25 Sep 2015 15:08:21 +0200
Subject: 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
---
 ftnoir_tracker_rs/ftnoir_tracker_rs.cpp | 6 ++----
 1 file 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));
     }
 }
 
-- 
cgit v1.2.3


From 2cd7e178e433149597a82a37f06e908a53860043 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Wed, 30 Sep 2015 16:22:51 +0200
Subject: accela: higher gain at small deltas

---
 ftnoir_filter_accela/ftnoir_filter_accela.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ftnoir_filter_accela/ftnoir_filter_accela.cpp b/ftnoir_filter_accela/ftnoir_filter_accela.cpp
index b9f7434f..b246a925 100644
--- a/ftnoir_filter_accela/ftnoir_filter_accela.cpp
+++ b/ftnoir_filter_accela/ftnoir_filter_accela.cpp
@@ -15,9 +15,9 @@ static constexpr double rot_gains[][2] = {
     { 2.66, 105 },
     { 2.0, 47 },
     { 1.66, 25 },
-    { 1.33, 12 },
+    { 1.33, 11 },
     { 1, 3.5 },
-    { .66, 1 },
+    { .66, 1.4 },
     { .33, .4 },
     { 0, 0 },
     { -1, 0 }
-- 
cgit v1.2.3


From 236c63fe4bc507d226c424559c5f65b5679eefa3 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Wed, 30 Sep 2015 17:07:58 +0200
Subject: camera: fix build

Sponsored-by: TrackHat
---
 opentrack/camera-names.hpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/opentrack/camera-names.hpp b/opentrack/camera-names.hpp
index 4ae07a9f..f6ab736e 100644
--- a/opentrack/camera-names.hpp
+++ b/opentrack/camera-names.hpp
@@ -10,6 +10,7 @@
 
 #include <QList>
 #include <QString>
+#include <QDebug>
 
 #if defined(OPENTRACK_API) && defined(_WIN32)
 #   define NO_DSHOW_STRSAFE
-- 
cgit v1.2.3


From d626a60eca7a511786435ec796d7864c59463939 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Thu, 1 Oct 2015 07:48:53 +0200
Subject: accela: guard against negative value overflow properly

Accela attempted to guard against both negative and positive value
overstepping the last value due to gain, but the check for negative
values was incorrect.

Issue: #231
Reported-by: @nanospork, @alterscape, @SgtGrumbles
---
 ftnoir_filter_accela/ftnoir_filter_accela.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ftnoir_filter_accela/ftnoir_filter_accela.cpp b/ftnoir_filter_accela/ftnoir_filter_accela.cpp
index b246a925..7f1d9d0a 100644
--- a/ftnoir_filter_accela/ftnoir_filter_accela.cpp
+++ b/ftnoir_filter_accela/ftnoir_filter_accela.cpp
@@ -97,7 +97,7 @@ void FTNoIR_Filter::filter(const double* input, double *output)
         const double thres = i >= 3 ? rot_t : trans_t;
         const double val = m.getValue(vec_ / thres);
         const double result = last_output[i] + (vec < 0 ? -1 : 1) * dt * val;
-        const bool negp = vec < 0.;
+        const bool negp = in < 0.;
         const bool done = negp
             ? result <= in
             : result >= in;
-- 
cgit v1.2.3