potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 15:23:05 +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
2018-09-15 00:52:21 +03:00
committed by Alexander Alekhin
parent a024593fa6 14b438317e
commit 808ba552c5
235 changed files with 18422 additions and 3526 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/src/utils/filesystem.cpp
+3 -3
View File
@@ -87,7 +87,7 @@ cv::String join(const cv::String& base, const cv::String& path)
bool exists(const cv::String& path)
{
CV_INSTRUMENT_REGION()
CV_INSTRUMENT_REGION();
#if defined _WIN32 || defined WINCE
BOOL status = TRUE;
@@ -150,7 +150,7 @@ CV_EXPORTS void remove_all(const cv::String& path)
cv::String getcwd()
{
CV_INSTRUMENT_REGION()
CV_INSTRUMENT_REGION();
cv::AutoBuffer<char, 4096> buf;
#if defined WIN32 || defined _WIN32 || defined WINCE
#ifdef WINRT
@@ -185,7 +185,7 @@ cv::String getcwd()
bool createDirectory(const cv::String& path)
{
CV_INSTRUMENT_REGION()
CV_INSTRUMENT_REGION();
#if defined WIN32 || defined _WIN32 || defined WINCE
#ifdef WINRT
wchar_t wpath[MAX_PATH];