Merge branch 'unstable' of https://github.com/opentrack/opentrack into dev/kalman

Conflicts:
	ftnoir_filter_kalman/ftnoir_filter_kalman.h

1 files changed, 35 insertions, 0 deletions

diff --git a/ftnoir_tracker_pt/point_extractor.h b/ftnoir_tracker_pt/point_extractor.h
new file mode 100644
index 00000000..5252b68d
--- /dev/null
+++ b/ftnoir_tracker_pt/point_extractor.h
@@ -0,0 +1,35 @@
+/* Copyright (c) 2012 Patrick Ruoff
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ */
+
+#ifndef POINTEXTRACTOR_H
+#define POINTEXTRACTOR_H
+
+#include <opencv2/core/core.hpp>
+#include <opencv2/imgproc/imgproc.hpp>
+
+// ----------------------------------------------------------------------------
+// Extracts points from an opencv image
+class PointExtractor
+{
+public:
+    // extracts points from frame and draws some processing info into frame, if draw_output is set
+    // dt: time since last call in seconds
+    // WARNING: returned reference is valid as long as object
+    const std::vector<cv::Vec2f>& extract_points(cv::Mat &frame);
+    const std::vector<cv::Vec2f>& get_points() { return points; }
+    PointExtractor();
+
+    int threshold_val;
+    int threshold_secondary_val;
+    int min_size, max_size;
+
+private:
+    std::vector<cv::Vec2f> points;
+    cv::Mat frame_last;
+};
+
+#endif //POINTEXTRACTOR_H