Merge branch 'master' of github.com:opentrack/opentrack

Conflicts:
	facetracknoir/tracker.cpp
	ftnoir_filter_accela/ftnoir_filter_accela.cpp
	ftnoir_filter_accela/ftnoir_filter_accela.h
	ftnoir_filter_base/ftnoir_filter_base.h
	ftnoir_filter_ewma2/ftnoir_filter_ewma2.cpp
	ftnoir_filter_ewma2/ftnoir_filter_ewma2.h

1 files changed, 31 insertions, 31 deletions

diff --git a/ftnoir_tracker_pt/point_extractor.h b/ftnoir_tracker_pt/point_extractor.h
index b142d2bb..9a6f7f2c 100644
--- a/ftnoir_tracker_pt/point_extractor.h
+++ b/ftnoir_tracker_pt/point_extractor.h
@@ -1,31 +1,31 @@
-/* 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/opencv.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, float dt, bool draw_output);

-	const std::vector<cv::Vec2f>& get_points() { return points; }

-

-	int threshold_val;

-	int min_size, max_size;	

-

-protected:

-	std::vector<cv::Vec2f> points;

-};

-

-#endif //POINTEXTRACTOR_H

+/* 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/opencv.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, float dt, bool draw_output);
+	const std::vector<cv::Vec2f>& get_points() { return points; }
+
+	int threshold_val;
+	int min_size, max_size;	
+
+protected:
+	std::vector<cv::Vec2f> points;
+};
+
+#endif //POINTEXTRACTOR_H