summaryrefslogtreecommitdiffhomepage
path: root/ftnoir_tracker_pt/point_tracker.h
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2015-06-16 09:20:06 +0200
committerStanislaw Halik <sthalik@misaki.pl>2015-06-16 09:20:06 +0200
commite4e564d4b8c43986e925996aca8cf10c6b30136e (patch)
tree54d414e8a54d6af444dbfb10d15a66a07a9d97da /ftnoir_tracker_pt/point_tracker.h
parentd4a35684220c9e06b64ce3d39df06616f0147bdc (diff)
parent4c5c3904a55a748f3453f5b067e2d6d0f0a11848 (diff)
Merge branch 'unstable' of github.com:opentrack/opentrack into trackhat-ui
Diffstat (limited to 'ftnoir_tracker_pt/point_tracker.h')
-rw-r--r--ftnoir_tracker_pt/point_tracker.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/ftnoir_tracker_pt/point_tracker.h b/ftnoir_tracker_pt/point_tracker.h
index 10bd2cef..3b9573ff 100644
--- a/ftnoir_tracker_pt/point_tracker.h
+++ b/ftnoir_tracker_pt/point_tracker.h
@@ -72,7 +72,7 @@ public:
enum Model { Clip = 0, Cap = 1, Custom = 2 };
- PointModel(settings& s)
+ PointModel(settings_pt& s)
{
set_model(s);
// calculate u
@@ -86,7 +86,7 @@ public:
P = 1.0/(s11*s22-s12*s12) * cv::Matx22f(s22, -s12, -s12, s11);
}
- void set_model(settings& s)
+ void set_model(settings_pt& s)
{
switch (s.active_model_panel)
{