Merge branch 'master' of https://github.com/opentrack/opentrack into dev/ewma2

Resolved conflicts manually in files:
	ftnoir_filter_ewma2/ftnoir_filter_ewma2.cpp
	ftnoir_filter_ewma2/ftnoir_filter_ewma2.h

1 files changed, 0 insertions, 39 deletions

diff --git a/ftnoir_tracker_aruco/video_widget.h b/ftnoir_tracker_aruco/video_widget.h
deleted file mode 100644
index 87b6278a..00000000
--- a/ftnoir_tracker_aruco/video_widget.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* 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 <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(unsigned char* frame, int width, int height);
-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