summaryrefslogtreecommitdiffhomepage
path: root/tracker-aruco
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2018-06-26 22:25:22 +0200
committerStanislaw Halik <sthalik@misaki.pl>2018-06-26 23:05:21 +0200
commitd65936200a2756e6619a109fa6fa673b91df802e (patch)
tree80b6b6fc7ba9023cbe47290b8ae1bc5468a19bb1 /tracker-aruco
parent4046773c41ee3c0f65840828ab983cfd13451c85 (diff)
modernize C++ syntax
No visible changes (hopefully).
Diffstat (limited to 'tracker-aruco')
-rw-r--r--tracker-aruco/ftnoir_tracker_aruco.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/tracker-aruco/ftnoir_tracker_aruco.cpp b/tracker-aruco/ftnoir_tracker_aruco.cpp
index a3d58c88..a63edb8b 100644
--- a/tracker-aruco/ftnoir_tracker_aruco.cpp
+++ b/tracker-aruco/ftnoir_tracker_aruco.cpp
@@ -193,9 +193,9 @@ void aruco_tracker::set_intrinsics()
const double focal_length_h = .5 * h / tan(.5 * fov_h);
intrinsics(0, 0) = focal_length_w;
- intrinsics(0, 2) = grayscale.cols/2;
+ intrinsics(0, 2) = grayscale.cols/2.;
intrinsics(1, 1) = focal_length_h;
- intrinsics(1, 2) = grayscale.rows/2;
+ intrinsics(1, 2) = grayscale.rows/2.;
}
void aruco_tracker::update_fps()
@@ -257,7 +257,7 @@ void aruco_tracker::draw_centroid()
cv::projectPoints(centroid, rvec, tvec, intrinsics, cv::noArray(), repr2);
- cv::circle(frame, repr2[0], 4, cv::Scalar(255, 0, 255), -1);
+ cv::circle(frame, repr2[0], 4, {255, 0, 255}, -1);
}
void aruco_tracker::set_last_roi()
@@ -542,6 +542,7 @@ void aruco_dialog::camera_settings()
void aruco_dialog::update_camera_settings_state(const QString& name)
{
+ (void)name;
ui.camera_settings->setEnabled(true);
}