Merge pull request #2987 from anishp:master

2014-07-28 21:15:39 +00:00
parent e9bed17d98 d2493393db
commit 277802483f
1 changed files with 2 additions and 0 deletions
--- a/modules/stitching/include/opencv2/stitching/detail/util.hpp
+++ b/modules/stitching/include/opencv2/stitching/detail/util.hpp
@@ -46,7 +46,9 @@
 #include <list>
 #include "opencv2/core.hpp"

+#ifndef ENABLE_LOG
 #define ENABLE_LOG 0
+#endif

 // TODO remove LOG macros, add logging class
 #if ENABLE_LOG