From e72d2694f613344022b1e548e5d5564d11833173 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Thu, 7 Nov 2013 22:57:11 +0100 Subject: fix build error on ocv 2.4 branch --- ftnoir_tracker_aruco/ar_video_widget.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ftnoir_tracker_aruco') 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(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]; -- cgit v1.2.3