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

Removing 'using namespace std' from header files, closes bugs #730 and #846

Browse Source
This commit is contained in:
Marius Muja
2011-02-16 06:36:15 +00:00
parent 6b34532901
commit 7d42dbdd71
22 changed files with 110 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -109,7 +109,7 @@ public:
template<typename T>
NNIndex<T>* load_saved_index(const Matrix<T>& dataset, const string& filename)
NNIndex<T>* load_saved_index(const Matrix<T>& dataset, const std::string& filename)
{
FILE* fin = fopen(filename.c_str(), "rb");
if (fin==NULL) {
@@ -208,7 +208,7 @@ int Index<T>::radiusSearch(const Matrix<T>& query, Matrix<int>& indices, Matrix<
// TODO: optimise here
int* neighbors = resultSet.getNeighbors();
float* distances = resultSet.getDistances();
size_t count_nn = min(resultSet.size(), indices.cols);
size_t count_nn = std::min(resultSet.size(), indices.cols);
assert (dists.cols>=count_nn);
@@ -222,7 +222,7 @@ int Index<T>::radiusSearch(const Matrix<T>& query, Matrix<int>& indices, Matrix<
template<typename T>
void Index<T>::save(string filename)
void Index<T>::save(std::string filename)
{
FILE* fout = fopen(filename.c_str(), "wb");
if (fout==NULL) {