diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2015-07-20 13:38:02 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2015-07-20 13:38:02 +0200 |
| commit | b864a6932fbb1f35b0d6fb8e4835307b1d5a2299 (patch) | |
| tree | 3f4a19e62ac30bdf4c8cefae4a72cd567af06a24 /ftnoir_tracker_pt/point_tracker.cpp | |
| parent | 931541b7d58f747e09c59450f666fb34985d0536 (diff) | |
| parent | 0c1b4510b3f7a744cc4cad94e0d4dde45925269d (diff) | |
Merge branch 'unstable' into trackhat-ui
Diffstat (limited to 'ftnoir_tracker_pt/point_tracker.cpp')
| -rw-r--r-- | ftnoir_tracker_pt/point_tracker.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/ftnoir_tracker_pt/point_tracker.cpp b/ftnoir_tracker_pt/point_tracker.cpp index bae89dbe..f141fe36 100644 --- a/ftnoir_tracker_pt/point_tracker.cpp +++ b/ftnoir_tracker_pt/point_tracker.cpp @@ -33,12 +33,10 @@ static void set_row(Matx33f& m, int i, const Vec3f& v) m(i,2) = v[2]; } -#ifdef OPENTRACK_API static bool d_vals_sort(const pair<float,int> a, const pair<float,int> b) { return a.first < b.first; } -#endif void PointModel::get_d_order(const std::vector<cv::Vec2f>& points, int d_order[], cv::Vec2f d) const { @@ -50,11 +48,7 @@ void PointModel::get_d_order(const std::vector<cv::Vec2f>& points, int d_order[] std::sort(d_vals.begin(), d_vals.end(), -#ifdef OPENTRACK_API d_vals_sort -#else - comp -#endif ); for (unsigned i = 0; i<points.size(); ++i) |