third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing include defines

Browse Source
This commit is contained in:
Marius Muja 2011-09-12 20:20:49 +00:00
parent d77cf38896
commit 281b953815
6 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/flann/include/opencv2/flann/flann_base.hpp
View File

@ -28,8 +28,8 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*************************************************************************/
#ifndef FLANN_BASE_HPP_
#define FLANN_BASE_HPP_
#ifndef OPENCV_FLANN_BASE_HPP_
#define OPENCV_FLANN_BASE_HPP_
#include <vector>
#include <string>
@ -288,4 +288,4 @@ int hierarchicalClustering(const Matrix<typename Distance::ElementType>& points,
}
}
#endif /* FLANN_BASE_HPP_ */
#endif /* OPENCV_FLANN_BASE_HPP_ */

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

@ -28,8 +28,8 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*************************************************************************/
#ifndef FLANN_LOGGER_H
#define FLANN_LOGGER_H
#ifndef OPENCV_FLANN_LOGGER_H
#define OPENCV_FLANN_LOGGER_H
#include <stdio.h>
#include <stdarg.h>
@ -127,4 +127,4 @@ private:
}
#endif //FLANN_LOGGER_H
#endif //OPENCV_FLANN_LOGGER_H

6
modules/flann/include/opencv2/flann/nn_index.h
View File

@ -28,8 +28,8 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*************************************************************************/
#ifndef FLANN_NNINDEX_H
#define FLANN_NNINDEX_H
#ifndef OPENCV_FLANN_NNINDEX_H
#define OPENCV_FLANN_NNINDEX_H
#include <string>
@ -176,4 +176,4 @@ public:
}
#endif //FLANN_NNINDEX_H
#endif //OPENCV_FLANN_NNINDEX_H

6
modules/flann/include/opencv2/flann/random.h
View File

@ -28,8 +28,8 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*************************************************************************/
#ifndef FLANN_RANDOM_H
#define FLANN_RANDOM_H
#ifndef OPENCV_FLANN_RANDOM_H
#define OPENCV_FLANN_RANDOM_H
#include <algorithm>
#include <cstdlib>
@ -130,6 +130,6 @@ public:
}
#endif //FLANN_RANDOM_H
#endif //OPENCV_FLANN_RANDOM_H

6
modules/flann/include/opencv2/flann/result_set.h
View File

@ -28,8 +28,8 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*************************************************************************/
#ifndef FLANN_RESULTSET_H
#define FLANN_RESULTSET_H
#ifndef OPENCV_FLANN_RESULTSET_H
#define OPENCV_FLANN_RESULTSET_H
#include <algorithm>
#include <cstring>
@ -539,5 +539,5 @@ private:
};
}
#endif //FLANN_RESULTSET_H
#endif //OPENCV_FLANN_RESULTSET_H

4
modules/flann/include/opencv2/flann/timer.h
View File

@ -28,8 +28,8 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*************************************************************************/
#ifndef FLANN_TIMER_H
#define FLANN_TIMER_H
#ifndef OPENCV_FLANN_TIMER_H
#define OPENCV_FLANN_TIMER_H
#include <time.h>