Merge branch 'unstable' into trackhat

* unstable: (140 commits)
  tracker/pt: increase auto threshold bucket size again
  tracker/pt: limit max amount of extracted blobs
  gui: don't update main window if we're minimized
  tracker/pt: only show widget if the frame is visible
  tracker/pt: don't resize twice in widget
  freetrack/games: regen
  contrib/make-csv: perl sort isn't stable, don't ignore case
  tracker/pt: avoid widget temp QImage allocation
  spline-widget: oops, pass by reference
  tracker/pt: don't allocate temporary dynamic size arrays
  tracker/pt: don't copy points array needlessly
  tracker/pt: don't allocate temporary frame
  tracker/pt: cv::Mat::at<T> is slow, use cv::Mat::ptr
  tracker/pt: avoid widget malloc when able
  tracker/pt: optimize widget
  tracker/pt: update video widget at 40 -> 50 ms
  cmake/mingw-w64: update
  tracker/pt: reduce mutex contention
  gui: fix left margin
  tracker/pt: remove krap
  tracker/pt: move ctor out of the loop
  tracker/pt: nix unused
  tracker/pt: don't fill mask on frame
  pose-widget: also bilinear interpolation of alpha value
  ui: adjust margin
  ui: make more compact
  glwidget: use transparent octopus background
  api/mat: fix typos/breakage
  api/joy: refresh only manually on certain events
  pt: histogram more granular 6 -> 8
  cmake/api: link with strmiids.lib on win32
  tracker/pt: reduce auto thresholding histogram bucket size
  api/keys: prevent idempotent keys
  api/joy: move from header
  api/joy: prevent idempotent keypressed passed to receiver
  compat/options: get rid of std::string usage
  compat/options: move from header
  gui/settings: set parent, otherwise not modal
  gui/settings: don't forget to show a modal dialog before executing
  gui/main: don't raise a new window, it's enough to set visible
  api/joy: speed up poll_axis path
  api/joy: nix static, now that we're not a singleton
  tracker/joy: adapt to non-singleton joy worker
  joystick: no longer singleton, use fake window handle
  api/keys: use a fake window for DirectInput handle
  gui/keys: allow for pausing global keystrokes for options dialog
  api/keys: nix tautological #ifdef
  contrib/aruco: oops, right extension
  contrib/aruco: use @frost555's marker image
  api/camera-names: move to compat/
  ...

1 files changed, 9 insertions, 21 deletions

diff --git a/opentrack/simple-mat.hpp b/opentrack/simple-mat.hpp
index e462812b..4f885f4f 100644
--- a/opentrack/simple-mat.hpp
+++ b/opentrack/simple-mat.hpp
@@ -157,7 +157,7 @@ public:
         return ret;
     }
     
-    Mat<num, h_, w_> operator*(const num& other) const
+    Mat<num, h_, w_> operator*(const num other) const
     {
         Mat<num, h_, w_> ret;
         for (int j = 0; j < h_; j++)
@@ -167,20 +167,16 @@ public:
     }
     
     template<int p>
-    Mat<num, w_, p> operator*(const Mat<num, w_, p>& other) const
+    Mat<num, h_, p> operator*(const Mat<num, w_, p>& other) const
     {
-        Mat<num, w_, p> ret;
-        for (int j = 0; j < w_; j++)
+        Mat<num, h_, p> ret;
+        for (int k = 0; k < h_; k++)
             for (int i = 0; i < p; i++)
             {
-                num sum = num(0);
-
-                for (int k = 0; k < h_; k++)
-                    sum += data[j][k]*other(k, i);
-
-                ret(j, i) = sum;
+                ret(k, i) = 0;
+                for (int j = 0; j < w_; j++)
+                    ret(k, i) += data[k][j] * other(j, i);
             }
-
         return ret;
     }
 
@@ -189,7 +185,7 @@ public:
 
     template<typename... ts, int h__ = h_, int w__ = w_,
              typename = typename std::enable_if<is_arglist_correct<num, h__, w__, ts...>::value>::type>
-    Mat(ts const&... xs)
+    Mat(const ts... xs)
     {
         const std::initializer_list<num> init = { static_cast<num>(xs)... };
         auto iter = init.begin();
@@ -198,14 +194,6 @@ public:
                 data[j][i] = *iter++;
     }
 
-    template<typename t>
-    Mat(const t* xs)
-    {
-        for (int j = 0; j < h_; j++)
-            for (int i = 0; i < w_; i++)
-                data[j][i] = num(*xs++);
-    }
-
     Mat()
     {
         for (int j = 0; j < h_; j++)
@@ -244,7 +232,7 @@ public:
 
         for (int j = 0; j < h_; j++)
             for (int i = 0; i < w_; i++)
-                ret.data[i][j] = data[j][i];
+                ret(i, j) = data[j][i];
 
         return ret;
     }