Merge branch 'master' of github.com:opentrack/opentrack

2 files changed, 2 insertions, 2 deletions

diff --git a/FTNoIR_Tracker_PT/pt_video_widget.cpp b/FTNoIR_Tracker_PT/pt_video_widget.cpp
index 122ab4fd..c73fa780 100644
--- a/FTNoIR_Tracker_PT/pt_video_widget.cpp
+++ b/FTNoIR_Tracker_PT/pt_video_widget.cpp
@@ -51,7 +51,7 @@ void PTVideoWidget::update_and_repaint()
         for (int x = 0; x < _frame.cols; x++)

         {

             const auto& elt = _frame.at<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];

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];