diff options
| -rw-r--r-- | cv/affine.hpp | 2 | ||||
| -rw-r--r-- | cv/numeric.hpp | 2 | ||||
| -rw-r--r-- | tracker-pt/ftnoir_tracker_pt.h | 2 | ||||
| -rw-r--r-- | tracker-pt/module/point_extractor.cpp | 2 | ||||
| -rw-r--r-- | tracker-pt/module/point_extractor.h | 2 | ||||
| -rw-r--r-- | tracker-pt/point_tracker.cpp | 2 | ||||
| -rw-r--r-- | tracker-pt/point_tracker.h | 2 | ||||
| -rw-r--r-- | tracker-pt/pt-api.cpp | 2 | ||||
| -rw-r--r-- | tracker-pt/pt-api.hpp | 10 | ||||
| -rw-r--r-- | tracker-wii/wii_point_extractor.cpp | 2 | ||||
| -rw-r--r-- | tracker-wii/wii_point_extractor.h | 2 |
11 files changed, 15 insertions, 15 deletions
diff --git a/cv/affine.hpp b/cv/affine.hpp index 5d344138..882a1145 100644 --- a/cv/affine.hpp +++ b/cv/affine.hpp @@ -12,7 +12,7 @@ namespace affine_impl { -using namespace types; +using namespace numeric_types; class Affine final { diff --git a/cv/numeric.hpp b/cv/numeric.hpp index ee24331f..87fe7a69 100644 --- a/cv/numeric.hpp +++ b/cv/numeric.hpp @@ -3,7 +3,7 @@ #include <type_traits> #include <opencv2/core.hpp> -namespace types { +namespace numeric_types { using f = float; static_assert(std::is_floating_point_v<f>); diff --git a/tracker-pt/ftnoir_tracker_pt.h b/tracker-pt/ftnoir_tracker_pt.h index 20cfaa8b..5e9ad9b3 100644 --- a/tracker-pt/ftnoir_tracker_pt.h +++ b/tracker-pt/ftnoir_tracker_pt.h @@ -28,7 +28,7 @@ class cv_video_widget; namespace pt_module { -using namespace types; +using namespace numeric_types; class Tracker_PT : public QThread, public ITracker { diff --git a/tracker-pt/module/point_extractor.cpp b/tracker-pt/module/point_extractor.cpp index 1d5d4a06..b30fa4cc 100644 --- a/tracker-pt/module/point_extractor.cpp +++ b/tracker-pt/module/point_extractor.cpp @@ -29,7 +29,7 @@ #include <QDebug> -using namespace types; +using namespace numeric_types; // meanshift code written by Michael Welter diff --git a/tracker-pt/module/point_extractor.h b/tracker-pt/module/point_extractor.h index bbe202fa..03b43489 100644 --- a/tracker-pt/module/point_extractor.h +++ b/tracker-pt/module/point_extractor.h @@ -17,7 +17,7 @@ namespace pt_module { -using namespace types; +using namespace numeric_types; struct blob final { diff --git a/tracker-pt/point_tracker.cpp b/tracker-pt/point_tracker.cpp index f1f968d0..bda412e2 100644 --- a/tracker-pt/point_tracker.cpp +++ b/tracker-pt/point_tracker.cpp @@ -16,7 +16,7 @@ namespace pt_module { -using namespace types; +using namespace numeric_types; static void get_row(const mat33& m, int i, vec3& v) { diff --git a/tracker-pt/point_tracker.h b/tracker-pt/point_tracker.h index 526c795b..c39774cd 100644 --- a/tracker-pt/point_tracker.h +++ b/tracker-pt/point_tracker.h @@ -28,7 +28,7 @@ namespace pt_module { // nomenclature as in // [Denis Oberkampf, Daniel F. DeMenthon, Larry S. Davis: "Iterative Pose Estimation Using Coplanar Feature Points"] -using namespace types; +using namespace numeric_types; struct PointModel final { diff --git a/tracker-pt/pt-api.cpp b/tracker-pt/pt-api.cpp index ba301276..f64d5c9a 100644 --- a/tracker-pt/pt-api.cpp +++ b/tracker-pt/pt-api.cpp @@ -1,7 +1,7 @@ #include "pt-api.hpp" #include "cv/numeric.hpp" -using namespace types; +using namespace numeric_types; pt_camera_info::pt_camera_info() = default; diff --git a/tracker-pt/pt-api.hpp b/tracker-pt/pt-api.hpp index 09c09a28..b44cfea2 100644 --- a/tracker-pt/pt-api.hpp +++ b/tracker-pt/pt-api.hpp @@ -20,7 +20,7 @@ struct pt_camera_info final { - using f = types::f; + using f = numeric_types::f; pt_camera_info(); static f get_focal_length(f fov, int res_x, int res_y); @@ -35,7 +35,7 @@ struct pt_camera_info final struct pt_pixel_pos_mixin { - using f = types::f; + using f = numeric_types::f; static std::tuple<f, f> to_pixel_pos(f x, f y, int w, int h); static std::tuple<f, f> to_screen_pos(f px, f py, int w, int h); @@ -69,7 +69,7 @@ struct pt_preview : pt_frame struct pt_camera { using result = std::tuple<bool, pt_camera_info>; - using f = types::f; + using f = numeric_types::f; pt_camera(); virtual ~pt_camera(); @@ -90,8 +90,8 @@ struct pt_camera struct pt_point_extractor : pt_pixel_pos_mixin { - using vec2 = types::vec2; - using f = types::f; + using vec2 = numeric_types::vec2; + using f = numeric_types::f; pt_point_extractor(); virtual ~pt_point_extractor(); diff --git a/tracker-wii/wii_point_extractor.cpp b/tracker-wii/wii_point_extractor.cpp index 11b48d8f..a16cf233 100644 --- a/tracker-wii/wii_point_extractor.cpp +++ b/tracker-wii/wii_point_extractor.cpp @@ -30,7 +30,7 @@ #include <QDebug> -using namespace types; +using namespace numeric_types; namespace pt_module { diff --git a/tracker-wii/wii_point_extractor.h b/tracker-wii/wii_point_extractor.h index a72ba861..661ce35f 100644 --- a/tracker-wii/wii_point_extractor.h +++ b/tracker-wii/wii_point_extractor.h @@ -16,7 +16,7 @@ namespace pt_module { -using namespace types; +using namespace numeric_types; class WIIPointExtractor final : public pt_point_extractor { |