diff options
author | Stanislaw Halik <sthalik@misaki.pl> | 2013-11-07 22:57:11 +0100 |
---|---|---|
committer | Stanislaw Halik <sthalik@misaki.pl> | 2013-11-07 22:58:48 +0100 |
commit | e72d2694f613344022b1e548e5d5564d11833173 (patch) | |
tree | 4dc492f4062754771aa72a2b488ae1f29cfda8be | |
parent | 4b3064c63cd9fa112c3700d9e97d6571ff5ad044 (diff) |
fix build error on ocv 2.4 branch
-rw-r--r-- | FTNoIR_Tracker_PT/pt_video_widget.cpp | 2 | ||||
-rw-r--r-- | ftnoir_tracker_aruco/ar_video_widget.cpp | 2 |
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]; |