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

Removed urequired functions

Browse Source
This commit is contained in:
LeonidBeynenson
2013-02-21 19:49:37 +04:00
parent 203849d5e4
commit e7b214b6d2
2 changed files with 1 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4340,8 +4340,6 @@ public:
CV_WRAP Mat getMat(const string& name) const; CV_WRAP Mat getMat(const string& name) const;
CV_WRAP vector<Mat> getMatVector(const string& name) const; CV_WRAP vector<Mat> getMatVector(const string& name) const;
CV_WRAP Ptr<Algorithm> getAlgorithm(const string& name) const; CV_WRAP Ptr<Algorithm> getAlgorithm(const string& name) const;
CV_WRAP float getFloat(const string& name) const;
CV_WRAP uint64 getUInt64(const string& name) const;
void set(const string& name, int value); void set(const string& name, int value);
void set(const string& name, double value); void set(const string& name, double value);
@@ -4378,8 +4376,6 @@ public:
void setMatVector(const char* name, const vector<Mat>& value); void setMatVector(const char* name, const vector<Mat>& value);
void setAlgorithm(const char* name, const Ptr<Algorithm>& value); void setAlgorithm(const char* name, const Ptr<Algorithm>& value);
template<typename _Tp> void setAlgorithm(const char* name, const Ptr<_Tp>& value); template<typename _Tp> void setAlgorithm(const char* name, const Ptr<_Tp>& value);
void setFloat(const char* name, float value);
void setUInt64(const char* name, uint64 value);
CV_WRAP string paramHelp(const string& name) const; CV_WRAP string paramHelp(const string& name) const;
int paramType(const char* name) const; int paramType(const char* name) const;

21
modules/core/src/algorithm.cpp
View File

@@ -322,16 +322,6 @@ void Algorithm::setAlgorithm(const char* parameter, const Ptr<Algorithm>& value)
info()->set(this, parameter, ParamType<Algorithm>::type, &value); info()->set(this, parameter, ParamType<Algorithm>::type, &value);
} }
void Algorithm::setFloat(const char* parameter, float value)
{
info()->set(this, parameter, ParamType<float>::type, &value);
}
void Algorithm::setUInt64(const char* parameter, uint64 value)
{
info()->set(this, parameter, ParamType<uint64>::type, &value);
}
@@ -370,15 +360,6 @@ Ptr<Algorithm> Algorithm::getAlgorithm(const string& parameter) const
return get<Algorithm>(parameter); return get<Algorithm>(parameter);
} }
float Algorithm::getFloat(const string& parameter) const
{
return get<float>(parameter);
}
uint64 Algorithm::getUInt64(const string& parameter) const
{
return get<uint64>(parameter);
}
string Algorithm::paramHelp(const string& parameter) const string Algorithm::paramHelp(const string& parameter) const
{ {
return info()->paramHelp(parameter.c_str()); return info()->paramHelp(parameter.c_str());
@@ -452,7 +433,7 @@ void AlgorithmInfo::write(const Algorithm* algo, FileStorage& fs) const
nestedAlgo->write(fs); nestedAlgo->write(fs);
} }
else if( p.type == Param::FLOAT) else if( p.type == Param::FLOAT)
cv::write(fs, pname, algo->getFloat(pname)); cv::write(fs, pname, algo->getDouble(pname));
else if( p.type == Param::UNSIGNED_INT) else if( p.type == Param::UNSIGNED_INT)
cv::write(fs, pname, algo->getInt(pname));//TODO: implement cv::write(, , unsigned int) cv::write(fs, pname, algo->getInt(pname));//TODO: implement cv::write(, , unsigned int)
else if( p.type == Param::UINT64) else if( p.type == Param::UINT64)