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

Merge pull request #9039 from arrybn:disable_caffe_parser_logs

Browse Source
This commit is contained in:
Alexander Alekhin 2017-06-29 15:50:05 +00:00
commit 0c08094536
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/dnn/src/caffe/glog_emulator.hpp
View File

@ -59,7 +59,7 @@ class GLogWrapper
{
const char *file, *func, *type, *cond_str;
int line;
bool cond_staus, exit_loop;
bool cond_status, exit_loop;
std::stringstream sstream;
public:
@ -69,7 +69,7 @@ public:
const char *_cond_str = NULL, bool _cond_status = true
) :
file(_file), func(_func), type(_type), cond_str(_cond_str),
line(_line), cond_staus(_cond_status), exit_loop(true) {}
line(_line), cond_status(_cond_status), exit_loop(true) {}
std::iostream &stream()
{
@ -85,16 +85,18 @@ public:
{
exit_loop = false;
if (cond_str && !cond_staus)
if (cond_str && !cond_status)
{
cv::error(cv::Error::StsError, "FAILED: " + String(cond_str) + ". " + sstream.str(), func, file, line);
}
else if (!cond_str && strcmp(type, "CHECK"))
{
#ifndef NDEBUG
if (!std::strcmp(type, "INFO"))
std::cout << sstream.str() << std::endl;
else
std::cerr << sstream.str() << std::endl;
#endif
}
}
};