From d32ba5032b9506e89590d15f82b6d4a484f2bd04 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Mon, 20 Jul 2015 05:06:44 +0200 Subject: add my copyright to some more code --- ftnoir_tracker_aruco/ar_video_widget.cpp | 4 +--- ftnoir_tracker_aruco/ar_video_widget.h | 10 ++-------- ftnoir_tracker_ht/ht_video_widget.cpp | 4 +--- ftnoir_tracker_ht/ht_video_widget.h | 15 +++------------ ftnoir_tracker_pt/pt_video_widget.cpp | 3 --- ftnoir_tracker_pt/pt_video_widget.h | 11 +++-------- 6 files changed, 10 insertions(+), 37 deletions(-) diff --git a/ftnoir_tracker_aruco/ar_video_widget.cpp b/ftnoir_tracker_aruco/ar_video_widget.cpp index 2d9e3052..70c26e55 100644 --- a/ftnoir_tracker_aruco/ar_video_widget.cpp +++ b/ftnoir_tracker_aruco/ar_video_widget.cpp @@ -1,4 +1,4 @@ -/* 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 @@ -7,8 +7,6 @@ #include "ar_video_widget.h" -#include - using namespace std; void ArucoVideoWidget::update_image(const cv::Mat& frame) 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 #include #include #include -#include #include #include -#include #include -// ---------------------------------------------------------------------------- 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 diff --git a/ftnoir_tracker_ht/ht_video_widget.cpp b/ftnoir_tracker_ht/ht_video_widget.cpp index 1c5f565c..ef58c98f 100644 --- a/ftnoir_tracker_ht/ht_video_widget.cpp +++ b/ftnoir_tracker_ht/ht_video_widget.cpp @@ -1,4 +1,4 @@ -/* 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 @@ -7,8 +7,6 @@ #include "ht_video_widget.h" -#include - using namespace std; void HTVideoWidget::update_image(unsigned char *frame, int width, int height) diff --git a/ftnoir_tracker_ht/ht_video_widget.h b/ftnoir_tracker_ht/ht_video_widget.h index be4aee44..054b2cf4 100644 --- a/ftnoir_tracker_ht/ht_video_widget.h +++ b/ftnoir_tracker_ht/ht_video_widget.h @@ -1,27 +1,21 @@ -/* 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. */ +#pragma once -#ifndef VIDEOWIDGET_H -#define VIDEOWIDGET_H - -#include +#include #include #include #include -#include #include #include -#include -// ---------------------------------------------------------------------------- class HTVideoWidget : public QWidget { Q_OBJECT - public: HTVideoWidget(QWidget *parent) : QWidget(parent), fb(), width(0), height(0), fresh(false) { connect(&timer, SIGNAL(timeout()), this, SLOT(update_and_repaint())); @@ -35,7 +29,6 @@ protected slots: painter.drawImage(e->rect(), texture); } void update_and_repaint(); - private: QMutex mtx; QImage texture; @@ -44,5 +37,3 @@ private: int width,height; bool fresh; }; - -#endif // VIDEOWIDGET_H diff --git a/ftnoir_tracker_pt/pt_video_widget.cpp b/ftnoir_tracker_pt/pt_video_widget.cpp index 12f01413..15fc5a86 100644 --- a/ftnoir_tracker_pt/pt_video_widget.cpp +++ b/ftnoir_tracker_pt/pt_video_widget.cpp @@ -9,9 +9,6 @@ #include "pt_video_widget.h" -#include -#include - using namespace cv; using namespace std; diff --git a/ftnoir_tracker_pt/pt_video_widget.h b/ftnoir_tracker_pt/pt_video_widget.h index 09818254..af1d60fd 100644 --- a/ftnoir_tracker_pt/pt_video_widget.h +++ b/ftnoir_tracker_pt/pt_video_widget.h @@ -1,4 +1,5 @@ /* 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 @@ -8,15 +9,9 @@ #pragma once #include -#include -#include +#include #include -#ifndef OPENTRACK_API -# include -# include -#else -# include -#endif +#include #include #include #include -- cgit v1.2.3