diff options
-rw-r--r-- | tracker-easy/cv-point-extractor.cpp | 6 | ||||
-rw-r--r-- | tracker-easy/cv-point-extractor.h | 4 | ||||
-rw-r--r-- | tracker-easy/module.cpp | 2 | ||||
-rw-r--r-- | tracker-easy/preview.cpp (renamed from tracker-easy/frame.cpp) | 10 | ||||
-rw-r--r-- | tracker-easy/preview.h (renamed from tracker-easy/frame.hpp) | 11 | ||||
-rw-r--r-- | tracker-easy/tracker-easy.h | 2 |
6 files changed, 24 insertions, 11 deletions
diff --git a/tracker-easy/cv-point-extractor.cpp b/tracker-easy/cv-point-extractor.cpp index 7c0b00b5..56de4c0b 100644 --- a/tracker-easy/cv-point-extractor.cpp +++ b/tracker-easy/cv-point-extractor.cpp @@ -1,5 +1,5 @@ -/* Copyright (c) 2012 Patrick Ruoff - * Copyright (c) 2015-2017 Stanislaw Halik <sthalik@misaki.pl> +/* + * Copyright (c) 2019 Stephane Lenclud * * 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,7 +7,7 @@ */ #include "cv-point-extractor.h" -#include "frame.hpp" +#include "preview.h" #include "cv/numeric.hpp" #include "compat/math.hpp" diff --git a/tracker-easy/cv-point-extractor.h b/tracker-easy/cv-point-extractor.h index 8a8ed66b..405ca052 100644 --- a/tracker-easy/cv-point-extractor.h +++ b/tracker-easy/cv-point-extractor.h @@ -1,5 +1,5 @@ -/* Copyright (c) 2012 Patrick Ruoff - * Copyright (c) 2015-2016 Stanislaw Halik <sthalik@misaki.pl> +/* + * Copyright (c) 2019 Stephane Lenclud * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above diff --git a/tracker-easy/module.cpp b/tracker-easy/module.cpp index d24a1336..0c360e80 100644 --- a/tracker-easy/module.cpp +++ b/tracker-easy/module.cpp @@ -1,9 +1,7 @@ #include "tracker-easy.h" #include "tracker-easy-dialog.h" #include "tracker-easy-api.h" - #include "module.hpp" -#include "frame.hpp" #include "cv-point-extractor.h" diff --git a/tracker-easy/frame.cpp b/tracker-easy/preview.cpp index 12f70662..33758cfa 100644 --- a/tracker-easy/frame.cpp +++ b/tracker-easy/preview.cpp @@ -1,4 +1,12 @@ -#include "frame.hpp" +/* + * Copyright (c) 2019 Stephane Lenclud + * + * 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. + */ + +#include "preview.h" #include "compat/math.hpp" diff --git a/tracker-easy/frame.hpp b/tracker-easy/preview.h index 8493b4e9..fc7ec9c9 100644 --- a/tracker-easy/frame.hpp +++ b/tracker-easy/preview.h @@ -1,3 +1,12 @@ +/* + * Copyright (c) 2019 Stephane Lenclud + * + * 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 #include "tracker-easy-api.h" @@ -5,8 +14,6 @@ #include <opencv2/core.hpp> #include <QImage> - - struct Preview { Preview(int w, int h); diff --git a/tracker-easy/tracker-easy.h b/tracker-easy/tracker-easy.h index 23c9252a..3055299b 100644 --- a/tracker-easy/tracker-easy.h +++ b/tracker-easy/tracker-easy.h @@ -13,7 +13,7 @@ #include "cv/numeric.hpp" #include "video/video-widget.hpp" #include "video/camera.hpp" -#include "frame.hpp" +#include "preview.h" #include <atomic> #include <memory> |