Merge branch 'unstable' into trackhat-ui

* unstable:
  accela: guard against negative value overflow properly
  camera: fix build
  accela: higher gain at small deltas
  tracker_rs: reverted fix. need to build with Qt 5.5.1+ instead.

1 files changed, 1 insertions, 1 deletions

diff --git a/ftnoir_filter_accela/ftnoir_filter_accela.cpp b/ftnoir_filter_accela/ftnoir_filter_accela.cpp
index ac166447..3fd7c421 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;