diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2015-07-20 11:16:54 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2015-07-20 11:16:54 +0200 |
| commit | 1248e901aaf4fdb720b3fa201574aa24df4d4524 (patch) | |
| tree | 7173b34e1f68a5338b8c0c1ad8c5d33a805bbdbf /ftnoir_tracker_aruco/ar_video_widget.h | |
| parent | 65966c1497cbcf2c9556a754ab4e1ddef5957cfb (diff) | |
| parent | 9cc86cf3569ef6e68c4779ee0d96d1ae4ef77ca6 (diff) | |
Merge branch 'unstable' into trackhat-ui
Diffstat (limited to 'ftnoir_tracker_aruco/ar_video_widget.h')
| -rw-r--r-- | ftnoir_tracker_aruco/ar_video_widget.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/ftnoir_tracker_aruco/ar_video_widget.h b/ftnoir_tracker_aruco/ar_video_widget.h index 638b0ab4..6df2d626 100644 --- a/ftnoir_tracker_aruco/ar_video_widget.h +++ b/ftnoir_tracker_aruco/ar_video_widget.h @@ -1,24 +1,20 @@ -/* Copyright (c) 2012 Patrick Ruoff +/* Copyright (c) 2014 Stanislaw Halik * * 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 +#pragma once #include <QTimer> #include <QWidget> #include <QMutex> #include <QMutexLocker> -#include <QLabel> #include <QPainter> #include <QPaintEvent> -#include <QTimer> #include <opencv/cv.hpp> -// ---------------------------------------------------------------------------- class ArucoVideoWidget : public QWidget { Q_OBJECT @@ -35,5 +31,3 @@ public: void update_image(const cv::Mat& frame); void paintEvent( QPaintEvent*) override; }; - -#endif // VIDEOWIDGET_H |