diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2019-02-11 18:55:42 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2019-02-11 20:21:35 +0100 |
| commit | 21632b1143623ed75216a486ad851d865b3ac8a4 (patch) | |
| tree | 7c2076aeda03c9aff421811ef993dedea6103341 | |
| parent | 4f06a788b13d16ccee332f63c707c476e4b33b7e (diff) | |
video: less namespace pollution
| -rw-r--r-- | video/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | video/video-widget.cpp | 4 | ||||
| -rw-r--r-- | video/video-widget.hpp | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/video/CMakeLists.txt b/video/CMakeLists.txt index 5720bf60..3bf04d75 100644 --- a/video/CMakeLists.txt +++ b/video/CMakeLists.txt @@ -1,7 +1,7 @@ find_package(OpenCV QUIET) otr_module(video STATIC) if(OpenCV_FOUND) - target_compile_definitions(${self} PUBLIC -DOTR_HAS_OPENCV) + target_compile_definitions(${self} PUBLIC -DOTR_VIDEO_HAS_OPENCV) target_link_libraries(${self} opencv_videoio opencv_core) endif() diff --git a/video/video-widget.cpp b/video/video-widget.cpp index cbb77755..995795fd 100644 --- a/video/video-widget.cpp +++ b/video/video-widget.cpp @@ -5,7 +5,7 @@ * copyright notice and this permission notice appear in all copies. */ -#ifdef OTR_HAS_OPENCV +#ifdef OTR_VIDEO_HAS_OPENCV # include <opencv2/imgproc.hpp> #endif @@ -37,7 +37,7 @@ cv_video_widget::cv_video_widget(QWidget* parent) : QWidget(parent) timer.start(65); } -#ifdef OTR_HAS_OPENCV +#ifdef OTR_VIDEO_HAS_OPENCV void cv_video_widget::update_image(const cv::Mat& frame) { QMutexLocker l(&mtx); diff --git a/video/video-widget.hpp b/video/video-widget.hpp index 2393db2e..3e39dd93 100644 --- a/video/video-widget.hpp +++ b/video/video-widget.hpp @@ -12,7 +12,7 @@ #include <vector> -#ifdef OTR_HAS_OPENCV +#ifdef OTR_VIDEO_HAS_OPENCV # include <opencv2/core.hpp> #endif @@ -27,7 +27,7 @@ class cv_video_widget final : public QWidget public: cv_video_widget(QWidget *parent); -#ifdef OTR_HAS_OPENCV +#ifdef OTR_VIDEO_HAS_OPENCV void update_image(const cv::Mat& frame); #endif void update_image(const QImage& image); @@ -42,7 +42,7 @@ private: std::vector<unsigned char> vec; QTimer timer; -#ifdef OTR_HAS_OPENCV +#ifdef OTR_VIDEO_HAS_OPENCV cv::Mat frame2, frame3; #endif bool freshp = false; |