Renaming log constants, fixes bug #792

2011-01-05 22:06:03 +00:00
parent 90e191211e
commit 9bf80fb209
4 changed files with 11 additions and 10 deletions
--- 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 {
--- 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()
    {