diff options
| author | DaMichel <mw.pub@welter-4d.de> | 2016-08-07 09:59:32 +0200 |
|---|---|---|
| committer | DaMichel <mw.pub@welter-4d.de> | 2016-08-07 09:59:32 +0200 |
| commit | 9c34be2427a483d3bf5f115eac28dec2716461f2 (patch) | |
| tree | 59310c4477840345b53c671b5b5194f7f8c131bb /cv/camera-dialog.cpp | |
| parent | 16d7bb4d8c051d3196456ec89550c637e4d84677 (diff) | |
Fix trivial build errors on linux. Also support Qt 5.5.
Diffstat (limited to 'cv/camera-dialog.cpp')
| -rw-r--r-- | cv/camera-dialog.cpp | 2 |
1 files changed, 2 insertions, 0 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() {} |