diff options
| -rw-r--r-- | tracker-neuralnet/ftnoir_tracker_neuralnet.cpp | 9 | ||||
| -rw-r--r-- | tracker-neuralnet/ftnoir_tracker_neuralnet.h | 1 |
2 files changed, 6 insertions, 4 deletions
diff --git a/tracker-neuralnet/ftnoir_tracker_neuralnet.cpp b/tracker-neuralnet/ftnoir_tracker_neuralnet.cpp index c55ddf0c..1fd50a94 100644 --- a/tracker-neuralnet/ftnoir_tracker_neuralnet.cpp +++ b/tracker-neuralnet/ftnoir_tracker_neuralnet.cpp @@ -47,9 +47,12 @@ namespace neuralnet_tracker_ns using namespace cvcontrib; -using numeric_types::vec3; -using numeric_types::vec2; -using numeric_types::mat33; +using f = float; +template<int n> using vec = cv::Vec<f, n>; +template<int y, int x> using mat = cv::Matx<f, y, x>; +using vec2 = vec<2>; +using vec3 = vec<3>; +using mat33 = mat<3, 3>; #if _MSC_VER std::wstring convert(const QString &s) { return s.toStdWString(); } diff --git a/tracker-neuralnet/ftnoir_tracker_neuralnet.h b/tracker-neuralnet/ftnoir_tracker_neuralnet.h index e6919224..ce85dcd5 100644 --- a/tracker-neuralnet/ftnoir_tracker_neuralnet.h +++ b/tracker-neuralnet/ftnoir_tracker_neuralnet.h @@ -16,7 +16,6 @@ #include "api/plugin-api.hpp" #include "cv/video-widget.hpp" #include "cv/translation-calibrator.hpp" -#include "cv/numeric.hpp" #include "compat/timer.hpp" #include "video/camera.hpp" #include "cv/affine.hpp" |