generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Renaming log constants, fixes bug

Browse Source
This commit is contained in:
Marius Muja 2011-01-05 22:06:03 +00:00
parent 90e191211e
commit 9bf80fb209
4 changed files with 11 additions and 10 deletions
modules/flann
include/opencv2/flann
general.hlogger.h
src
flann.cpp
tests/python
test.py

10
modules/flann/include/opencv2/flann/general.h

@ -59,11 +59,11 @@ enum flann_centers_init_t {
}; };
enum flann_log_level_t { enum flann_log_level_t {
LOG_NONE = 0, FLANN_LOG_NONE = 0,
LOG_FATAL = 1, FLANN_LOG_FATAL = 1,
LOG_ERROR = 2, FLANN_LOG_ERROR = 2,
LOG_WARN = 3, FLANN_LOG_WARN = 3,
LOG_INFO = 4 FLANN_LOG_INFO = 4
}; };
enum flann_distance_t { enum flann_distance_t {

2
modules/flann/include/opencv2/flann/logger.h

@ -48,7 +48,7 @@ class CV_EXPORTS Logger
public: public:
Logger() : stream(stdout), logLevel(LOG_WARN) {}; Logger() : stream(stdout), logLevel(FLANN_LOG_WARN) {};
~Logger() ~Logger()
{ {

8
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(fatal, FLANN_LOG_FATAL)
LOG_METHOD(error, LOG_ERROR) LOG_METHOD(error, FLANN_LOG_ERROR)
LOG_METHOD(warn, LOG_WARN) LOG_METHOD(warn, FLANN_LOG_WARN)
LOG_METHOD(info, LOG_INFO) LOG_METHOD(info, FLANN_LOG_INFO)
// ----------------------- random.cpp --------------------------- // ----------------------- random.cpp ---------------------------

1
tests/python/test.py

@ -1,3 +1,4 @@
import roslib; roslib.load_manifest('opencv2')
import unittest import unittest
import random import random
import time import time