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

fixed several warnings from Xcode 4 LLVM compiler; fixed bug #920

Browse Source
This commit is contained in:
Vadim Pisarevsky
2011-04-30 19:29:26 +00:00
parent 92852ca06e
commit 23a9b7bb9c
18 changed files with 51 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/flann/include/opencv2/flann/general.h
View File

@@ -36,6 +36,7 @@
#include <stdexcept>
#include <cassert>
#include "opencv2/flann/object_factory.h"
#include "opencv2/flann/logger.h"
namespace cvflann {
@@ -58,13 +59,6 @@ enum flann_centers_init_t {
FLANN_CENTERS_KMEANSPP = 2
};
enum flann_log_level_t {
FLANN_LOG_NONE = 0,
FLANN_LOG_FATAL = 1,
FLANN_LOG_ERROR = 2,
FLANN_LOG_WARN = 3,
FLANN_LOG_INFO = 4
};
enum flann_distance_t {
FLANN_DIST_EUCLIDEAN = 1,

13
modules/flann/include/opencv2/flann/logger.h
View File

@@ -31,15 +31,20 @@
#ifndef _OPENCV_LOGGER_H_
#define _OPENCV_LOGGER_H_
#include <cstdio>
#include <stdarg.h>
#include "opencv2/flann/general.h"
namespace cvflann
{
enum flann_log_level_t {
FLANN_LOG_NONE = 0,
FLANN_LOG_FATAL = 1,
FLANN_LOG_ERROR = 2,
FLANN_LOG_WARN = 3,
FLANN_LOG_INFO = 4
};
class CV_EXPORTS Logger
{
FILE* stream;