summaryrefslogtreecommitdiffhomepage
path: root/cv
diff options
context:
space:
mode:
authorDaMichel <mw.pub@welter-4d.de>2016-08-07 09:59:32 +0200
committerDaMichel <mw.pub@welter-4d.de>2016-08-07 09:59:32 +0200
commit9c34be2427a483d3bf5f115eac28dec2716461f2 (patch)
tree59310c4477840345b53c671b5b5194f7f8c131bb /cv
parent16d7bb4d8c051d3196456ec89550c637e4d84677 (diff)
Fix trivial build errors on linux. Also support Qt 5.5.
Diffstat (limited to 'cv')
-rw-r--r--cv/camera-dialog.cpp2
-rw-r--r--cv/camera-dialog.hpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/cv/camera-dialog.cpp b/cv/camera-dialog.cpp
index 05161cb1..f2cdf9db 100644
--- a/cv/camera-dialog.cpp
+++ b/cv/camera-dialog.cpp
@@ -20,12 +20,14 @@ void camera_dialog::maybe_grab_frame(cv::VideoCapture& cap)
}
}
+#ifdef _WIN32
void camera_dialog::init_com_threading()
{
HRESULT hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
if (FAILED(hr))
qDebug() << "failed CoInitializeEx" << hr << "code" << GetLastError();
}
+#endif
camera_dialog::~camera_dialog() {}
diff --git a/cv/camera-dialog.hpp b/cv/camera-dialog.hpp
index 08462e92..15ae2bc9 100644
--- a/cv/camera-dialog.hpp
+++ b/cv/camera-dialog.hpp
@@ -16,13 +16,13 @@
#endif
#ifdef _WIN32
-# include <opencv2/videoio.hpp>
# include <QTimer>
# include <objbase.h>
# include <winerror.h>
# include <windows.h>
#endif
+#include <opencv2/videoio.hpp>
#include <QMutex>
class camera_dialog