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.cpp | |
| parent | 65966c1497cbcf2c9556a754ab4e1ddef5957cfb (diff) | |
| parent | 9cc86cf3569ef6e68c4779ee0d96d1ae4ef77ca6 (diff) | |
Merge branch 'unstable' into trackhat-ui
Diffstat (limited to 'ftnoir_tracker_aruco/ar_video_widget.cpp')
| -rw-r--r-- | ftnoir_tracker_aruco/ar_video_widget.cpp | 4 |
1 files changed, 1 insertions, 3 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 <QDebug> - using namespace std; void ArucoVideoWidget::update_image(const cv::Mat& frame) |