aboutsummaryrefslogtreecommitdiff
path: root/ports/opencv/filesystem-uwp.patch
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2018-02-21 16:47:42 -0800
committerRobert Schumacher <roschuma@microsoft.com>2018-02-23 17:06:37 -0800
commit471f7dc9700f7618aa16274fb9961e4e068f7656 (patch)
tree87e418ecbd19bfd6a54cf1c8fd9a003bd9a4722d /ports/opencv/filesystem-uwp.patch
parent5609d34b39009a2b511ae85ee5d8484d1db514c5 (diff)
downloadvcpkg-471f7dc9700f7618aa16274fb9961e4e068f7656.tar.gz
vcpkg-471f7dc9700f7618aa16274fb9961e4e068f7656.zip
[opencv] Rework
Split off contrib, ipp, webp, openexr, tiff, png, tiff, jpeg, jasper, eigen into features. Prevent downloads during the build
Diffstat (limited to 'ports/opencv/filesystem-uwp.patch')
-rw-r--r--ports/opencv/filesystem-uwp.patch41
1 files changed, 0 insertions, 41 deletions
diff --git a/ports/opencv/filesystem-uwp.patch b/ports/opencv/filesystem-uwp.patch
deleted file mode 100644
index c4ddb6b78..000000000
--- a/ports/opencv/filesystem-uwp.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/modules/core/src/utils/filesystem.cpp b/modules/core/src/utils/filesystem.cpp
-index 266a92f..1d5a302 100644
---- a/modules/core/src/utils/filesystem.cpp
-+++ b/modules/core/src/utils/filesystem.cpp
-@@ -186,7 +186,7 @@ bool createDirectory(const cv::String& path)
- wchar_t wpath[MAX_PATH];
- size_t copied = mbstowcs(wpath, path.c_str(), MAX_PATH);
- CV_Assert((copied != MAX_PATH) && (copied != (size_t)-1));
-- int result = CreateDirectoryA(wpath, NULL) ? 0 : -1;
-+ int result = CreateDirectoryW(wpath, NULL) ? 0 : -1;
- #else
- int result = _mkdir(path.c_str());
- #endif
-@@ -248,8 +248,16 @@ struct FileLock::Impl
- int numRetries = 5;
- do
- {
-+#ifdef WINRT
-+ wchar_t wpath[MAX_PATH];
-+ size_t copied = mbstowcs(wpath, fname, MAX_PATH);
-+ CV_Assert((copied != MAX_PATH) && (copied != (size_t)-1));
-+ handle = ::CreateFile2(wpath, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE,
-+ OPEN_EXISTING, NULL);
-+#else
- handle = ::CreateFileA(fname, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL,
- OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
-+#endif
- if (INVALID_HANDLE_VALUE == handle)
- {
- if (ERROR_SHARING_VIOLATION == GetLastError())
-@@ -399,7 +407,9 @@ cv::String getCacheDirectory(const char* sub_directory_name, const char* configu
- if (cache_path.empty())
- {
- cv::String default_cache_path;
--#ifdef _WIN32
-+#if WINRT
-+ // no defaults
-+#elif defined _WIN32
- char tmp_path_buf[MAX_PATH+1] = {0};
- DWORD res = GetTempPath(MAX_PATH, tmp_path_buf);
- if (res > 0 && res <= MAX_PATH)