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

Drop cv:: prefix from cv::String used inside the cv namespace

Browse Source
This commit is contained in:
Andrey Kamaev
2013-03-22 20:37:49 +04:00
parent 75513a46dc
commit be7bbe3aa9
122 changed files with 1077 additions and 1077 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/flann/include/opencv2/flann.hpp
View File

@@ -112,7 +112,7 @@ public:
int radiusSearch(const Mat& query, Mat& indices, Mat& dists,
DistanceType radius, const ::cvflann::SearchParams& params);
void save(cv::String filename) { nnIndex->save(filename); }
void save(String filename) { nnIndex->save(filename); }
int veclen() const { return nnIndex->veclen(); }
@@ -244,7 +244,7 @@ public:
int radiusSearch(const std::vector<ElementType>& query, std::vector<int>& indices, std::vector<DistanceType>& dists, DistanceType radius, const ::cvflann::SearchParams& params);
int radiusSearch(const Mat& query, Mat& indices, Mat& dists, DistanceType radius, const ::cvflann::SearchParams& params);
void save(cv::String filename)
void save(String filename)
{
if (nnIndex_L1) nnIndex_L1->save(filename);
if (nnIndex_L2) nnIndex_L2->save(filename);

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

@@ -73,7 +73,7 @@ hid_t get_hdf5_type<double>() { return H5T_NATIVE_DOUBLE; }
#define CHECK_ERROR(x,y) if ((x)<0) throw FLANNException((y));
template<typename T>
void save_to_file(const cvflann::Matrix<T>& dataset, const cv::String& filename, const cv::String& name)
void save_to_file(const cvflann::Matrix<T>& dataset, const String& filename, const String& name)
{
#if H5Eset_auto_vers == 2
@@ -125,7 +125,7 @@ void save_to_file(const cvflann::Matrix<T>& dataset, const cv::String& filename,
template<typename T>
void load_from_file(cvflann::Matrix<T>& dataset, const cv::String& filename, const cv::String& name)
void load_from_file(cvflann::Matrix<T>& dataset, const String& filename, const String& name)
{
herr_t status;
hid_t file_id = H5Fopen(filename.c_str(), H5F_ACC_RDWR, H5P_DEFAULT);
@@ -166,7 +166,7 @@ namespace mpi
* @param name Name of dataset inside file
*/
template<typename T>
void load_from_file(cvflann::Matrix<T>& dataset, const cv::String& filename, const cv::String& name)
void load_from_file(cvflann::Matrix<T>& dataset, const String& filename, const String& name)
{
MPI_Comm comm = MPI_COMM_WORLD;
MPI_Info info = MPI_INFO_NULL;

26
modules/flann/include/opencv2/flann/miniflann.hpp
View File

@@ -59,20 +59,20 @@ struct CV_EXPORTS IndexParams
IndexParams();
~IndexParams();
cv::String getString(const cv::String& key, const cv::String& defaultVal=cv::String()) const;
int getInt(const cv::String& key, int defaultVal=-1) const;
double getDouble(const cv::String& key, double defaultVal=-1) const;
String getString(const String& key, const String& defaultVal=String()) const;
int getInt(const String& key, int defaultVal=-1) const;
double getDouble(const String& key, double defaultVal=-1) const;
void setString(const cv::String& key, const cv::String& value);
void setInt(const cv::String& key, int value);
void setDouble(const cv::String& key, double value);
void setFloat(const cv::String& key, float value);
void setBool(const cv::String& key, bool value);
void setString(const String& key, const String& value);
void setInt(const String& key, int value);
void setDouble(const String& key, double value);
void setFloat(const String& key, float value);
void setBool(const String& key, bool value);
void setAlgorithm(int value);
void getAll(std::vector<cv::String>& names,
void getAll(std::vector<String>& names,
std::vector<int>& types,
std::vector<cv::String>& strValues,
std::vector<String>& strValues,
std::vector<double>& numValues) const;
void* params;
@@ -119,7 +119,7 @@ struct CV_EXPORTS LshIndexParams : public IndexParams
struct CV_EXPORTS SavedIndexParams : public IndexParams
{
SavedIndexParams(const cv::String& filename);
SavedIndexParams(const String& filename);
};
struct CV_EXPORTS SearchParams : public IndexParams
@@ -142,8 +142,8 @@ public:
OutputArray dists, double radius, int maxResults,
const SearchParams& params=SearchParams());
CV_WRAP virtual void save(const cv::String& filename) const;
CV_WRAP virtual bool load(InputArray features, const cv::String& filename);
CV_WRAP virtual void save(const String& filename) const;
CV_WRAP virtual bool load(InputArray features, const String& filename);
CV_WRAP virtual void release();
CV_WRAP cvflann::flann_distance_t getDistance() const;
CV_WRAP cvflann::flann_algorithm_t getAlgorithm() const;