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, 42 insertions, 42 deletions

diff --git a/ftnoir_tracker_pt/video_widget.h b/ftnoir_tracker_pt/video_widget.h
index 66959fde..3051919b 100644
--- a/ftnoir_tracker_pt/video_widget.h
+++ b/ftnoir_tracker_pt/video_widget.h
@@ -1,42 +1,42 @@
-/* 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 VIDEOWIDGET_H

-#define VIDEOWIDGET_H

-

-#include <QTime>

-#include <opencv2/opencv.hpp>

-#include <memory>

-#include <QWidget>

-#include <QMutex>

-#include <QMutexLocker>

-#include <QLabel>

-#include <QPainter>

-#include <QPaintEvent>

-

-// ----------------------------------------------------------------------------

-class VideoWidget : public QWidget

-{

-	Q_OBJECT

-

-public:

-    VideoWidget(QWidget *parent) : QWidget(parent), mtx() {

-	}

-    void update_image(cv::Mat frame, std::auto_ptr< std::vector<cv::Vec2f> >);

-protected slots:

-    void paintEvent( QPaintEvent* e ) {

-        QMutexLocker foo(&mtx);

-        QPainter painter(this);

-        painter.drawPixmap(e->rect(), pixmap, e->rect());

-    }

-

-private:

-    QMutex mtx;

-    QPixmap pixmap;

-};

-

-#endif // VIDEOWIDGET_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 VIDEOWIDGET_H
+#define VIDEOWIDGET_H
+
+#include <QTime>
+#include <opencv2/opencv.hpp>
+#include <memory>
+#include <QWidget>
+#include <QMutex>
+#include <QMutexLocker>
+#include <QLabel>
+#include <QPainter>
+#include <QPaintEvent>
+
+// ----------------------------------------------------------------------------
+class VideoWidget : public QWidget
+{
+	Q_OBJECT
+
+public:
+    VideoWidget(QWidget *parent) : QWidget(parent), mtx() {
+	}
+    void update_image(cv::Mat frame, std::auto_ptr< std::vector<cv::Vec2f> >);
+protected slots:
+    void paintEvent( QPaintEvent* e ) {
+        QMutexLocker foo(&mtx);
+        QPainter painter(this);
+        painter.drawPixmap(e->rect(), pixmap, e->rect());
+    }
+
+private:
+    QMutex mtx;
+    QPixmap pixmap;
+};
+
+#endif // VIDEOWIDGET_H