summaryrefslogtreecommitdiffhomepage
path: root/ftnoir_tracker_aruco
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2013-11-10 16:18:59 +0100
committerStanislaw Halik <sthalik@misaki.pl>2013-11-10 16:18:59 +0100
commit0f27debd9940e03f7126195b28b95b54cd073fbe (patch)
treec81373c09f4df50d579ca0a9d427646156c26915 /ftnoir_tracker_aruco
parent095f910986d787b2732b093c862bc24502704198 (diff)
parente72d2694f613344022b1e548e5d5564d11833173 (diff)
Merge branch 'master' of github.com:opentrack/opentrack
Diffstat (limited to 'ftnoir_tracker_aruco')
-rw-r--r--ftnoir_tracker_aruco/ar_video_widget.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/ftnoir_tracker_aruco/ar_video_widget.cpp b/ftnoir_tracker_aruco/ar_video_widget.cpp
index 149a19ee..b0d78fe2 100644
--- a/ftnoir_tracker_aruco/ar_video_widget.cpp
+++ b/ftnoir_tracker_aruco/ar_video_widget.cpp
@@ -30,7 +30,7 @@ void ArucoVideoWidget::update_and_repaint()
for (int x = 0; x < _frame.cols; x++)
{
const auto& elt = _frame.at<cv::Vec3b>(y, x);
- const CvScalar elt2 = elt;
+ const cv::Scalar elt2 = elt;
data[y * pitch + x * 3 + 0] = elt2.val[2];
data[y * pitch + x * 3 + 1] = elt2.val[1];
data[y * pitch + x * 3 + 2] = elt2.val[0];