potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 15:53:03 +04:00
Code Packages Releases Wiki Activity

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

Browse Source
This commit is contained in:
Alexander Alekhin
2019-07-25 19:21:47 +00:00
parent 1f736a95a7 2693ed9b22
commit 0cf479dd5c
28 changed files with 2282 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/src/ocl.cpp
+1 -1
View File
@@ -1722,7 +1722,7 @@ static bool parseOpenCLDeviceConfiguration(const std::string& configurationStr,
return true;
}
#ifdef WINRT
#if defined WINRT || defined _WIN32_WCE
static cl_device_id selectOpenCLDevice()
{
return NULL;