diff options
| author | Stefano Sinigardi <stesinigardi@hotmail.com> | 2019-09-24 21:58:38 +0200 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-09-24 12:58:38 -0700 |
| commit | 3532a7cf3cb81ad4c56775a2b02039ee77a96eb2 (patch) | |
| tree | 4b75fb74ca896434453d3bcd2f8420254ba1d15c /ports/opencv3/0009-fix-uwp.patch | |
| parent | e9047ef77133cde979dc9594d089e0109702675e (diff) | |
| download | vcpkg-3532a7cf3cb81ad4c56775a2b02039ee77a96eb2.tar.gz vcpkg-3532a7cf3cb81ad4c56775a2b02039ee77a96eb2.zip | |
[cudnn] add port and enable it in darknet (#7536)
* [cudnn] add port and enable it in darknet
* [OpenCV4] fix ffmpeg feature on uwp
* [darknet] enable integration with cuda/cudnn also with opencv3
* [darknet] update to latest revision
Diffstat (limited to 'ports/opencv3/0009-fix-uwp.patch')
| -rw-r--r-- | ports/opencv3/0009-fix-uwp.patch | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/ports/opencv3/0009-fix-uwp.patch b/ports/opencv3/0009-fix-uwp.patch index b57e49ea1..cba3963dc 100644 --- a/ports/opencv3/0009-fix-uwp.patch +++ b/ports/opencv3/0009-fix-uwp.patch @@ -11,6 +11,19 @@ index c2fda8f..3f7dfdc 100644 # removing APPCONTAINER from modules to run from console # in case of usual starting of WinRT test apps output is missing # so starting of console version w/o APPCONTAINER is required to get test results +diff --git a/modules/core/src/utils/datafile.cpp b/modules/core/src/utils/datafile.cpp +index f1107b0..c613ca2 100644 +--- a/modules/core/src/utils/datafile.cpp ++++ b/modules/core/src/utils/datafile.cpp +@@ -108,7 +108,7 @@ static cv::String getModuleLocation(const void* addr) + CV_UNUSED(addr); + #ifdef _WIN32 + HMODULE m = 0; +-#if _WIN32_WINNT >= 0x0501 ++#if (_WIN32_WINNT >= 0x0501) && (!WINRT_STORE) + ::GetModuleHandleEx(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS | GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT, + reinterpret_cast<LPCTSTR>(addr), + &m); diff --git a/modules/highgui/include/opencv2/highgui/highgui_winrt.hpp b/modules/highgui/include/opencv2/highgui/highgui_winrt.hpp index f4147f3..b92efdd 100644 --- a/modules/highgui/include/opencv2/highgui/highgui_winrt.hpp |