summaryrefslogtreecommitdiffhomepage
path: root/cv
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2019-01-03 00:09:09 +0100
committerStanislaw Halik <sthalik@misaki.pl>2019-01-16 07:48:20 +0100
commit545071e998806235442edda5f575ee61e836abe9 (patch)
tree45579d717361f24c6f4a06354f5836447e691771 /cv
parent4766be01022d6de50f7b42647299860c2d9909b8 (diff)
cruft
Diffstat (limited to 'cv')
-rw-r--r--cv/CMakeLists.txt2
-rw-r--r--cv/numeric.hpp5
-rw-r--r--cv/video-property-page.cpp3
-rw-r--r--cv/video-property-page.hpp6
4 files changed, 4 insertions, 12 deletions
diff --git a/cv/CMakeLists.txt b/cv/CMakeLists.txt
index 1007344c..60350a99 100644
--- a/cv/CMakeLists.txt
+++ b/cv/CMakeLists.txt
@@ -1,6 +1,6 @@
find_package(OpenCV QUIET)
if(OpenCV_FOUND)
otr_module(cv STATIC)
- target_link_libraries(${self} opencv_core opencv_videoio)
+ target_link_libraries(${self} opencv_videoio opencv_core)
target_include_directories(${self} SYSTEM PRIVATE ${OpenCV_INCLUDE_DIRS})
endif()
diff --git a/cv/numeric.hpp b/cv/numeric.hpp
index 0edb7f58..7d850cbe 100644
--- a/cv/numeric.hpp
+++ b/cv/numeric.hpp
@@ -5,9 +5,8 @@
namespace types {
using f = double;
- namespace constants {
- static constexpr inline f eps = f(1e-8);
- }
+ static constexpr inline f eps = f(1e-8);
+ static constexpr inline f pi = f(M_PI);
template<int n> using vec = cv::Vec<f, n>;
using vec2 = vec<2>;
diff --git a/cv/video-property-page.cpp b/cv/video-property-page.cpp
index 1b8b94cf..bae5e8b3 100644
--- a/cv/video-property-page.cpp
+++ b/cv/video-property-page.cpp
@@ -25,8 +25,6 @@
#include <QDebug>
-#include <dshow.h>
-
bool video_property_page::show_from_capture(cv::VideoCapture& cap, int /*index */)
{
return cap.set(cv::CAP_PROP_SETTINGS, 0);
@@ -165,4 +163,3 @@ bool video_property_page::show_from_capture(cv::VideoCapture&, int idx)
bool video_property_page::show(int) { return false; }
bool video_property_page::show_from_capture(cv::VideoCapture&, int) { return false; }
#endif
-
diff --git a/cv/video-property-page.hpp b/cv/video-property-page.hpp
index 9e6b596f..c2b9525d 100644
--- a/cv/video-property-page.hpp
+++ b/cv/video-property-page.hpp
@@ -1,11 +1,6 @@
#pragma once
#include <QString>
-
-#ifdef _WIN32
-# include <windows.h>
-#endif
-
#include <opencv2/videoio.hpp>
struct video_property_page final
@@ -15,3 +10,4 @@ struct video_property_page final
static bool show_from_capture(cv::VideoCapture& cap, int index);
private:
};
+