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

added color canny; improved Algorithm class implementation

Browse Source
This commit is contained in:
Vadim Pisarevsky
2012-02-15 21:10:11 +00:00
parent 716a5d04ab
commit bb93e3ab8a
4 changed files with 191 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4288,12 +4288,31 @@ public:
void read(Algorithm* algo, const FileNode& fn) const;
string name() const;
template<typename _Tp> void addParam(const Algorithm* algo, const char* name,
const typename ParamType<_Tp>::member_type& value,
bool readOnly=false,
typename ParamType<_Tp>::member_type (Algorithm::*getter)()=0,
void (Algorithm::*setter)(typename ParamType<_Tp>::const_param_type)=0,
const string& help=string());
void addParam(const Algorithm* algo, const char* name,
const int& value, bool readOnly=false,
int (Algorithm::*getter)()=0,
void (Algorithm::*setter)(int)=0,
const string& help=string());
void addParam(const Algorithm* algo, const char* name,
const double& value, bool readOnly=false,
double (Algorithm::*getter)()=0,
void (Algorithm::*setter)(double)=0,
const string& help=string());
void addParam(const Algorithm* algo, const char* name,
const string& value, bool readOnly=false,
string (Algorithm::*getter)()=0,
void (Algorithm::*setter)(const string&)=0,
const string& help=string());
void addParam(const Algorithm* algo, const char* name,
const Mat& value, bool readOnly=false,
Mat (Algorithm::*getter)()=0,
void (Algorithm::*setter)(const Mat&)=0,
const string& help=string());
void addParam(const Algorithm* algo, const char* name,
const Ptr<Algorithm>& value, bool readOnly=false,
Ptr<Algorithm> (Algorithm::*getter)()=0,
void (Algorithm::*setter)(const Ptr<Algorithm>&)=0,
const string& help=string());
protected:
AlgorithmInfoData* data;
};

11
modules/core/include/opencv2/core/operations.hpp
View File

@@ -3833,17 +3833,6 @@ template<typename _Tp> inline void Algorithm::set(const char* name,
info()->set(this, name, ParamType<_Tp>::type, &value);
}
template<typename _Tp> inline void AlgorithmInfo::addParam(const Algorithm* algo, const char* name,
const typename ParamType<_Tp>::member_type& value,
bool readOnly,
typename ParamType<_Tp>::member_type (Algorithm::*getter)(),
void (Algorithm::*setter)(typename ParamType<_Tp>::const_param_type),
const string& help)
{
addParam_(algo, name, ParamType<_Tp>::type, &value, readOnly,
(Algorithm::Getter)getter, (Algorithm::Setter)setter, help);
}
}
#endif // __cplusplus