diff options
author | Stanislaw Halik <sthalik@misaki.pl> | 2014-10-05 19:55:05 +0200 |
---|---|---|
committer | Stanislaw Halik <sthalik@misaki.pl> | 2014-10-05 19:55:05 +0200 |
commit | f4754d23984126de847279f4abad4ae713d9e386 (patch) | |
tree | 78757d55b07887da427058853d88718ce27c2028 /ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp | |
parent | cfffa29e29db6b2234c7f534b1ebcd612b7f4914 (diff) |
flush and push
Diffstat (limited to 'ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp')
-rw-r--r-- | ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp b/ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp index a1e15721..1787ef2b 100644 --- a/ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp +++ b/ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp @@ -5,16 +5,15 @@ * copyright notice and this permission notice appear in all copies. */ +#include <vector> +#include <cstdio> +#include <cmath> +#include <QMutexLocker> +#include "./include/markerdetector.h" #include "ftnoir_tracker_aruco.h" -#include "ui_aruco-trackercontrols.h" #include "facetracknoir/plugin-api.hpp" -#include <QMutexLocker> -#include "include/markerdetector.h" #include <opencv2/core/core.hpp> #include <opencv2/highgui/highgui.hpp> -#include <vector> -#include <cstdio> -#include <cmath> #if defined(_WIN32) # undef NOMINMAX |