mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-01-18 14:13:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

core: fix issues from valgrind builder

Browse Source
This commit is contained in:
Alexander Alekhin 2018-11-17 07:32:06 +00:00
parent 954969dd74
commit c26dd5d7aa
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/core/src/utils/filesystem.cpp
View File

@ -87,15 +87,18 @@ cv::String join(const cv::String& base, const cv::String& path)
cv::String canonical(const cv::String& path)
{
cv::String result;
#ifdef _WIN32
const char* result = _fullpath(NULL, path.c_str(), 0);
const char* result_str = _fullpath(NULL, path.c_str(), 0);
#else
const char* result = realpath(path.c_str(), NULL);
const char* result_str = realpath(path.c_str(), NULL);
#endif
if (result)
return cv::String(result);
// no error handling, just return input
return path;
if (result_str)
{
result = cv::String(result_str);
free((void*)result_str);
}
return result.empty() ? path : result;
}

7
platforms/scripts/valgrind.supp
View File

@ -134,6 +134,13 @@
fun:_ZNK2cv7TLSDataINS_11CoreTLSDataEE18createDataInstanceEv
}
{
OpenCV-UMatDataAutoLockerTLS
Memcheck:Leak
...
fun:_ZN2cvL21getUMatDataAutoLockerEv
}
{
OpenCV-haveOpenCL
Memcheck:Leak