1 From ddb052609d182745cfad5abc22cc50230f83e47b Mon Sep 17 00:00:00 2001
2 From: Arjan Spieard <arjan.spieard@gmail.com>
3 Date: Tue, 8 Jan 2019 18:02:23 +0100
4 Subject: [PATCH] Use correct namespace for opencv constants
7 game/webcam.cc | 18 +++++++++---------
8 1 file changed, 9 insertions(+), 9 deletions(-)
10 diff --git a/game/webcam.cc b/game/webcam.cc
11 index b01c169d3..b224b70d2 100644
14 @@ -33,21 +33,21 @@ Webcam::Webcam(int cam_id):
15 throw std::runtime_error("Could not initialize webcam capturing!");
17 // Try to get at least VGA resolution
18 - if (m_capture->get(CV_CAP_PROP_FRAME_WIDTH) < 640
19 - || m_capture->get(CV_CAP_PROP_FRAME_HEIGHT) < 480) {
20 - m_capture->set(CV_CAP_PROP_FRAME_WIDTH, 640);
21 - m_capture->set(CV_CAP_PROP_FRAME_HEIGHT, 480);
22 + if (m_capture->get(cv::CAP_PROP_FRAME_WIDTH) < 640
23 + || m_capture->get(cv::CAP_PROP_FRAME_HEIGHT) < 480) {
24 + m_capture->set(cv::CAP_PROP_FRAME_WIDTH, 640);
25 + m_capture->set(cv::CAP_PROP_FRAME_HEIGHT, 480);
27 // Print actual values
28 std::cout << "Webcam frame properties: "
29 - << m_capture->get(CV_CAP_PROP_FRAME_WIDTH) << "x"
30 - << m_capture->get(CV_CAP_PROP_FRAME_HEIGHT) << std::endl;
31 + << m_capture->get(cv::CAP_PROP_FRAME_WIDTH) << "x"
32 + << m_capture->get(cv::CAP_PROP_FRAME_HEIGHT) << std::endl;
34 // Initialize the video writer
35 #ifdef SAVE_WEBCAM_VIDEO
36 - float fps = m_capture->get(CV_CAP_PROP_FPS);
37 - int framew = m_capture->get(CV_CAP_PROP_FRAME_WIDTH);
38 - int frameh = m_capture->get(CV_CAP_PROP_FRAME_HEIGHT);
39 + float fps = m_capture->get(cv::CAP_PROP_FPS);
40 + int framew = m_capture->get(cv::CAP_PROP_FRAME_WIDTH);
41 + int frameh = m_capture->get(cv::CAP_PROP_FRAME_HEIGHT);
42 int codec = CV_FOURCC('P','I','M','1'); // MPEG-1
43 std::string out_file = (getHomeDir() / "performous-webcam_out.mpg").string();
44 m_writer.reset(new cv::VideoWriter(out_file.c_str(), codec, fps > 0 ? fps : 30.0f, cvSize(framew,frameh)));