Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
c26dd5d7
Commit
c26dd5d7
authored
Nov 17, 2018
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
core: fix issues from valgrind builder
parent
954969dd
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
6 deletions
+16
-6
filesystem.cpp
modules/core/src/utils/filesystem.cpp
+9
-6
valgrind.supp
platforms/scripts/valgrind.supp
+7
-0
No files found.
modules/core/src/utils/filesystem.cpp
View file @
c26dd5d7
...
@@ -87,15 +87,18 @@ cv::String join(const cv::String& base, const cv::String& path)
...
@@ -87,15 +87,18 @@ cv::String join(const cv::String& base, const cv::String& path)
cv
::
String
canonical
(
const
cv
::
String
&
path
)
cv
::
String
canonical
(
const
cv
::
String
&
path
)
{
{
cv
::
String
result
;
#ifdef _WIN32
#ifdef _WIN32
const
char
*
result
=
_fullpath
(
NULL
,
path
.
c_str
(),
0
);
const
char
*
result
_str
=
_fullpath
(
NULL
,
path
.
c_str
(),
0
);
#else
#else
const
char
*
result
=
realpath
(
path
.
c_str
(),
NULL
);
const
char
*
result
_str
=
realpath
(
path
.
c_str
(),
NULL
);
#endif
#endif
if
(
result
)
if
(
result_str
)
return
cv
::
String
(
result
);
{
// no error handling, just return input
result
=
cv
::
String
(
result_str
);
return
path
;
free
((
void
*
)
result_str
);
}
return
result
.
empty
()
?
path
:
result
;
}
}
...
...
platforms/scripts/valgrind.supp
View file @
c26dd5d7
...
@@ -134,6 +134,13 @@
...
@@ -134,6 +134,13 @@
fun:_ZNK2cv7TLSDataINS_11CoreTLSDataEE18createDataInstanceEv
fun:_ZNK2cv7TLSDataINS_11CoreTLSDataEE18createDataInstanceEv
}
}
{
OpenCV-UMatDataAutoLockerTLS
Memcheck:Leak
...
fun:_ZN2cvL21getUMatDataAutoLockerEv
}
{
{
OpenCV-haveOpenCL
OpenCV-haveOpenCL
Memcheck:Leak
Memcheck:Leak
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment