summaryrefslogtreecommitdiffhomepage
path: root/ftnoir_tracker_aruco
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2015-07-20 08:10:27 +0200
committerStanislaw Halik <sthalik@misaki.pl>2015-07-20 08:10:39 +0200
commit20827ce134033e2370c6858905d2faca5c240602 (patch)
tree84eb48325f4bf0dd70bc2c5822348147ab495b02 /ftnoir_tracker_aruco
parenteca75bfc0f1b6b990076232f7d27e4d1d2f55dd3 (diff)
aruco: follow api change
Diffstat (limited to 'ftnoir_tracker_aruco')
-rw-r--r--ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp b/ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp
index b44896e5..786be62d 100644
--- a/ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp
+++ b/ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp
@@ -132,7 +132,7 @@ void Tracker::run()
double failed = 0;
const double max_failed = 1.25;
cv::Vec3d rvec, tvec;
- double last_fov = -1;
+ int last_fov = -1;
cv::Mat intrinsics = cv::Mat::eye(3, 3, CV_32FC1);
cv::Mat dist_coeffs = cv::Mat::zeros(5, 1, CV_32FC1);
@@ -161,7 +161,7 @@ void Tracker::run()
if (last_fov != s.fov)
{
last_fov = s.fov;
- if (!get_camera_calibration(static_cast<QString>(s.camera_name), intrinsics, dist_coeffs, grayscale.cols, grayscale.rows))
+ if (!get_camera_calibration(s.camera_name, intrinsics, dist_coeffs, grayscale.cols, grayscale.rows, s.fov))
{
intrinsics.at<float> (0, 0) = focal_length_w;
intrinsics.at<float> (1, 1) = focal_length_h;