Renaming log constants, fixes bug #792

diff --git a/modules/flann/include/opencv2/flann/general.h b/modules/flann/include/opencv2/flann/general.h
index 045cdb3..be879a9 100644 (file)
--- a/modules/flann/include/opencv2/flann/general.h
+++ b/modules/flann/include/opencv2/flann/general.h
@@ -59,11 +59,11 @@ enum flann_centers_init_t {
 };
 
 enum flann_log_level_t {
-       LOG_NONE = 0,
-       LOG_FATAL = 1,
-       LOG_ERROR = 2,
-       LOG_WARN = 3,
-       LOG_INFO = 4
+       FLANN_LOG_NONE = 0,
+       FLANN_LOG_FATAL = 1,
+       FLANN_LOG_ERROR = 2,
+       FLANN_LOG_WARN = 3,
+       FLANN_LOG_INFO = 4
 };
 
 enum flann_distance_t {

diff --git a/modules/flann/include/opencv2/flann/logger.h b/modules/flann/include/opencv2/flann/logger.h
index fa11026..1a90134 100644 (file)
--- a/modules/flann/include/opencv2/flann/logger.h
+++ b/modules/flann/include/opencv2/flann/logger.h
@@ -48,7 +48,7 @@ class CV_EXPORTS Logger
 
 public:
 
-    Logger() : stream(stdout), logLevel(LOG_WARN) {};
+    Logger() : stream(stdout), logLevel(FLANN_LOG_WARN) {};
 
     ~Logger()
     {

diff --git a/modules/flann/src/flann.cpp b/modules/flann/src/flann.cpp
index 29ec99c..b60cb31 100644 (file)
--- a/modules/flann/src/flann.cpp
+++ b/modules/flann/src/flann.cpp
@@ -131,10 +131,10 @@ int Logger::log(int level, const char* fmt, va_list arglist)
     }
 
 
-LOG_METHOD(fatal, LOG_FATAL)
-LOG_METHOD(error, LOG_ERROR)
-LOG_METHOD(warn, LOG_WARN)
-LOG_METHOD(info, LOG_INFO)
+LOG_METHOD(fatal, FLANN_LOG_FATAL)
+LOG_METHOD(error, FLANN_LOG_ERROR)
+LOG_METHOD(warn, FLANN_LOG_WARN)
+LOG_METHOD(info, FLANN_LOG_INFO)
 
 // ----------------------- random.cpp ---------------------------
 

diff --git a/tests/python/test.py b/tests/python/test.py
index d072520..c8a36dc 100644 (file)
--- a/tests/python/test.py
+++ b/tests/python/test.py
@@ -1,3 +1,4 @@
+import roslib; roslib.load_manifest('opencv2')
 import unittest
 import random
 import time