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
00830d9d
Commit
00830d9d
authored
Jan 20, 2020
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #16385 from alalek:ts_update_optional_message
parents
4e577b8d
ac306203
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
ts.cpp
modules/ts/src/ts.cpp
+1
-1
No files found.
modules/ts/src/ts.cpp
View file @
00830d9d
...
@@ -1008,10 +1008,10 @@ static std::string findData(const std::string& relative_path, bool required, boo
...
@@ -1008,10 +1008,10 @@ static std::string findData(const std::string& relative_path, bool required, boo
CHECK_FILE_WITH_PREFIX
(
prefix
,
result_
);
CHECK_FILE_WITH_PREFIX
(
prefix
,
result_
);
if
(
!
required
&&
!
result_
.
empty
())
if
(
!
required
&&
!
result_
.
empty
())
{
{
std
::
cout
<<
"TEST ERROR: Don't use 'optional' findData() for "
<<
relative_path
<<
std
::
endl
;
static
bool
checkOptionalFlag
=
cv
::
utils
::
getConfigurationParameterBool
(
"OPENCV_TEST_CHECK_OPTIONAL_DATA"
,
false
);
static
bool
checkOptionalFlag
=
cv
::
utils
::
getConfigurationParameterBool
(
"OPENCV_TEST_CHECK_OPTIONAL_DATA"
,
false
);
if
(
checkOptionalFlag
)
if
(
checkOptionalFlag
)
{
{
std
::
cout
<<
"TEST ERROR: Don't use 'optional' findData() for "
<<
relative_path
<<
std
::
endl
;
CV_Assert
(
required
||
result_
.
empty
());
CV_Assert
(
required
||
result_
.
empty
());
}
}
}
}
...
...
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