potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 00:03:03 +04:00
Code Packages 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
modules/flann/doc/flann_fast_approximate_nearest_neighbor_search.rst
+2 -2
View File
@@ -138,7 +138,7 @@ The method constructs a fast search structure from a set of features using the s
struct SavedIndexParams : public IndexParams
{
SavedIndexParams( cv::String filename );
SavedIndexParams( String filename );
};
@@ -199,7 +199,7 @@ flann::Index_<T>::save
------------------------------
Saves the index to a file.
.. ocv:function:: void flann::Index_<T>::save(cv::String filename)
.. ocv:function:: void flann::Index_<T>::save(String filename)
:param filename: The file to save the index to
modules/flann/include/opencv2/flann.hpp
+2 -2
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);
modules/flann/include/opencv2/flann/hdf5.h
+3 -3
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;
modules/flann/include/opencv2/flann/miniflann.hpp
+13 -13
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;
modules/flann/src/miniflann.cpp
+18 -18
View File
@@ -26,7 +26,7 @@ IndexParams::IndexParams()
}
template<typename T>
T getParam(const IndexParams& _p, const cv::String& key, const T& defaultVal=T())
T getParam(const IndexParams& _p, const String& key, const T& defaultVal=T())
{
::cvflann::IndexParams& p = get_params(_p);
::cvflann::IndexParams::const_iterator it = p.find(key);
@@ -36,49 +36,49 @@ T getParam(const IndexParams& _p, const cv::String& key, const T& defaultVal=T()
}
template<typename T>
void setParam(IndexParams& _p, const cv::String& key, const T& value)
void setParam(IndexParams& _p, const String& key, const T& value)
{
::cvflann::IndexParams& p = get_params(_p);
p[key] = value;
}
cv::String IndexParams::getString(const cv::String& key, const cv::String& defaultVal) const
String IndexParams::getString(const String& key, const String& defaultVal) const
{
return getParam(*this, key, defaultVal);
}
int IndexParams::getInt(const cv::String& key, int defaultVal) const
int IndexParams::getInt(const String& key, int defaultVal) const
{
return getParam(*this, key, defaultVal);
}
double IndexParams::getDouble(const cv::String& key, double defaultVal) const
double IndexParams::getDouble(const String& key, double defaultVal) const
{
return getParam(*this, key, defaultVal);
}
void IndexParams::setString(const cv::String& key, const cv::String& value)
void IndexParams::setString(const String& key, const String& value)
{
setParam(*this, key, value);
}
void IndexParams::setInt(const cv::String& key, int value)
void IndexParams::setInt(const String& key, int value)
{
setParam(*this, key, value);
}
void IndexParams::setDouble(const cv::String& key, double value)
void IndexParams::setDouble(const String& key, double value)
{
setParam(*this, key, value);
}
void IndexParams::setFloat(const cv::String& key, float value)
void IndexParams::setFloat(const String& key, float value)
{
setParam(*this, key, value);
}
void IndexParams::setBool(const cv::String& key, bool value)
void IndexParams::setBool(const String& key, bool value)
{
setParam(*this, key, value);
}
@@ -88,9 +88,9 @@ void IndexParams::setAlgorithm(int value)
setParam(*this, "algorithm", (cvflann::flann_algorithm_t)value);
}
void IndexParams::getAll(std::vector<cv::String>& names,
void IndexParams::getAll(std::vector<String>& names,
std::vector<int>& types,
std::vector<cv::String>& strValues,
std::vector<String>& strValues,
std::vector<double>& numValues) const
{
names.clear();
@@ -106,7 +106,7 @@ void IndexParams::getAll(std::vector<cv::String>& names,
names.push_back(it->first);
try
{
cv::String val = it->second.cast<cv::String>();
String val = it->second.cast<String>();
types.push_back(CV_USRTYPE1);
strValues.push_back(val);
numValues.push_back(-1);
@@ -285,9 +285,9 @@ LshIndexParams::LshIndexParams(int table_number, int key_size, int multi_probe_l
p["multi_probe_level"] = multi_probe_level;
}
SavedIndexParams::SavedIndexParams(const cv::String& _filename)
SavedIndexParams::SavedIndexParams(const String& _filename)
{
cv::String filename = _filename;
String filename = _filename;
::cvflann::IndexParams& p = get_params(*this);
p["algorithm"] = FLANN_INDEX_SAVED;
@@ -357,7 +357,7 @@ void Index::build(InputArray _data, const IndexParams& params, flann_distance_t
algo = getParam<flann_algorithm_t>(params, "algorithm", FLANN_INDEX_LINEAR);
if( algo == FLANN_INDEX_SAVED )
{
load(_data, getParam<cv::String>(params, "filename", cv::String()));
load(_data, getParam<String>(params, "filename", String()));
return;
}
@@ -654,7 +654,7 @@ template<typename Distance> void saveIndex(const Index* index0, const void* inde
saveIndex_< ::cvflann::Index<Distance> >(index0, index, fout);
}
void Index::save(const cv::String& filename) const
void Index::save(const String& filename) const
{
FILE* fout = fopen(filename.c_str(), "wb");
if (fout == NULL)
@@ -720,7 +720,7 @@ bool loadIndex(Index* index0, void*& index, const Mat& data, FILE* fin, const Di
return loadIndex_<Distance, ::cvflann::Index<Distance> >(index0, index, data, fin, dist);
}
bool Index::load(InputArray _data, const cv::String& filename)
bool Index::load(InputArray _data, const String& filename)
{
Mat data = _data.getMat();
bool ok = true;