Merge pull request #2987 from anishp:master

27780248 · Vadim Pisarevsky · e9bed17d · d2493393 · 27780248
Commit 27780248 authored Jul 28, 2014 by Vadim Pisarevsky
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

util.hpp modules/stitching/include/opencv2/stitching/detail/util.hpp +2 -0

No files found.
--- 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