summaryrefslogtreecommitdiffhomepage
path: root/tracker-pt
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2018-10-25 17:55:27 +0200
committerStanislaw Halik <sthalik@misaki.pl>2018-10-25 17:55:27 +0200
commit83867b413c449101bbe14615ff857a7785432ede (patch)
tree3b7a7fd68da8158a97fd67db9806fa6d984ebf80 /tracker-pt
parent00cceaffca6063b963d0848480acaa99f5fecaad (diff)
cleanup only
- replace warn_unused_result with [[nodiscard]] - remove some redundant w_a_r - replace std::decay with remove_cvref_t - simplify compat/math.hpp
Diffstat (limited to 'tracker-pt')
-rw-r--r--tracker-pt/module/camera.h4
-rw-r--r--tracker-pt/pt-api.hpp8
2 files changed, 6 insertions, 6 deletions
diff --git a/tracker-pt/module/camera.h b/tracker-pt/module/camera.h
index f3f88cc5..f8f140de 100644
--- a/tracker-pt/module/camera.h
+++ b/tracker-pt/module/camera.h
@@ -37,7 +37,7 @@ struct Camera final : pt_camera
void show_camera_settings() override;
private:
- cc_warn_unused_result bool _get_frame(cv::Mat& Frame);
+ [[nodiscard]] bool _get_frame(cv::Mat& Frame);
double dt_mean = 0, fov = 30;
Timer t;
@@ -56,7 +56,7 @@ private:
pt_settings s;
- static constexpr inline double dt_eps = 1./384;
+ static constexpr inline double dt_eps = 1./256;
};
} // ns pt_module
diff --git a/tracker-pt/pt-api.hpp b/tracker-pt/pt-api.hpp
index 19fab03e..12085560 100644
--- a/tracker-pt/pt-api.hpp
+++ b/tracker-pt/pt-api.hpp
@@ -42,7 +42,7 @@ struct pt_frame : pt_pixel_pos_mixin
template<typename t>
t* as() &
{
- using u = std::decay_t<t>;
+ using u = remove_cvref_t<t>;
static_assert(std::is_convertible_v<u*, pt_frame*>, "must be derived from pt_frame");
return static_cast<t*>(this);
@@ -69,11 +69,11 @@ struct pt_camera
pt_camera();
virtual ~pt_camera();
- virtual cc_warn_unused_result bool start(int idx, int fps, int res_x, int res_y) = 0;
+ [[nodiscard]] virtual bool start(int idx, int fps, int res_x, int res_y) = 0;
virtual void stop() = 0;
- virtual cc_warn_unused_result result get_frame(pt_frame& frame) = 0;
- virtual cc_warn_unused_result result get_info() const = 0;
+ virtual result get_frame(pt_frame& frame) = 0;
+ virtual result get_info() const = 0;
virtual pt_camera_info get_desired() const = 0;
virtual QString get_desired_name() const = 0;