Merge pull request opencv#9039 from arrybn:disable_caffe_parser_logs

alalek · alalek · commit 0c08094536ce · 2017-06-29T15:50:05.000Z
diff --git a/modules/dnn/src/caffe/glog_emulator.hpp b/modules/dnn/src/caffe/glog_emulator.hpp
@@ -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 @@ class GLogWrapper
           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 @@ class GLogWrapper
     {
         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
         }
     }
 };

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ class GLogWrapper`
`59`	`59`	`{`
`60`	`60`	`const char file, func, type, cond_str;`
`61`	`61`	`int line;`
`62`		`- bool cond_staus, exit_loop;`
	`62`	`+ bool cond_status, exit_loop;`
`63`	`63`	`std::stringstream sstream;`
`64`	`64`
`65`	`65`	`public:`
`@@ -69,7 +69,7 @@ class GLogWrapper`
`69`	`69`	`const char *_cond_str = NULL, bool _cond_status = true`
`70`	`70`	`) :`
`71`	`71`	`file(_file), func(_func), type(_type), cond_str(_cond_str),`
`72`		`- line(_line), cond_staus(_cond_status), exit_loop(true) {}`
	`72`	`+ line(_line), cond_status(_cond_status), exit_loop(true) {}`
`73`	`73`
`74`	`74`	`std::iostream &stream()`
`75`	`75`	`{`
`@@ -85,16 +85,18 @@ class GLogWrapper`
`85`	`85`	`{`
`86`	`86`	`exit_loop = false;`
`87`	`87`
`88`		`- if (cond_str && !cond_staus)`
	`88`	`+ if (cond_str && !cond_status)`
`89`	`89`	`{`
`90`	`90`	`cv::error(cv::Error::StsError, "FAILED: " + String(cond_str) + ". " + sstream.str(), func, file, line);`
`91`	`91`	`}`
`92`	`92`	`else if (!cond_str && strcmp(type, "CHECK"))`
`93`	`93`	`{`
	`94`	`+ #ifndef NDEBUG`
`94`	`95`	`if (!std::strcmp(type, "INFO"))`
`95`	`96`	`std::cout << sstream.str() << std::endl;`
`96`	`97`	`else`
`97`	`98`	`std::cerr << sstream.str() << std::endl;`
	`99`	`+ #endif`
`98`	`100`	`}`
`99`	`101`	`}`
`100`	`102`	`};`