potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 23:33:05 +04:00
Code Packages Releases Wiki Activity

Merge pull request #400 from ilysenkov:bugfix_2560

Browse Source
This commit is contained in:
Andrey Kamaev
2013-02-01 12:05:48 +04:00
committed by OpenCV Buildbot
parent 5ef58a474a b24e4bddb1
commit 992d47e9dc
2 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/include/opencv2/core/core.hpp
+2 -2
View File
@@ -2037,10 +2037,10 @@ public:
//! default constructor
TermCriteria();
//! full constructor
TermCriteria(int _type, int _maxCount, double _epsilon);
TermCriteria(int type, int maxCount, double epsilon);
//! conversion from CvTermCriteria
TermCriteria(const CvTermCriteria& criteria);
//! conversion from CvTermCriteria
//! conversion to CvTermCriteria
operator CvTermCriteria() const;
int type; //!< the type of termination criteria: COUNT, EPS or COUNT + EPS