diff options
author | Stanislaw Halik <sthalik@misaki.pl> | 2015-07-24 14:08:44 +0200 |
---|---|---|
committer | Stanislaw Halik <sthalik@misaki.pl> | 2015-07-24 14:11:07 +0200 |
commit | 7d0c58540103e9182ba584b440b91068df03a49c (patch) | |
tree | 21ab00a85b0c74d3dcb9064aa838136473b4c7ac /ftnoir_tracker_pt/camera.cpp | |
parent | 948fb5ef0ffd6a83675763d80053a433e09aea06 (diff) |
standardize on not using "using namespace {cv,std}"
Diffstat (limited to 'ftnoir_tracker_pt/camera.cpp')
-rw-r--r-- | ftnoir_tracker_pt/camera.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/ftnoir_tracker_pt/camera.cpp b/ftnoir_tracker_pt/camera.cpp index 2989c1fe..4619f695 100644 --- a/ftnoir_tracker_pt/camera.cpp +++ b/ftnoir_tracker_pt/camera.cpp @@ -10,8 +10,6 @@ #include <QDebug> #include "opentrack/sleep.hpp" -using namespace cv; - void Camera::set_device_index(int index) { if (desired_index != index) @@ -74,7 +72,7 @@ void CVCamera::start() { if (cap) delete cap; - cap = new VideoCapture(desired_index); + cap = new cv::VideoCapture(desired_index); _set_res(); _set_fps(); // extract camera info @@ -103,11 +101,11 @@ void CVCamera::stop() active = false; } -bool CVCamera::_get_frame(Mat* frame) +bool CVCamera::_get_frame(cv::Mat* frame) { if (cap && cap->isOpened()) { - Mat img; + cv::Mat img; for (int i = 0; i < 100 && !cap->read(img); i++) ;; @@ -142,5 +140,5 @@ void CVCamera::_set_device_index() cap->release(); delete cap; } - cap = new VideoCapture(desired_index); + cap = new cv::VideoCapture(desired_index); } |