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

fixed SparseMat Iterator compilation error (bug #2921)

Browse Source
This commit is contained in:
Vladislav Vinogradov 2013-04-03 12:39:03 +04:00
parent 656594ad4f
commit 9d7e51eb46
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3767,6 +3767,7 @@ public:
SparseMatConstIterator_(); SparseMatConstIterator_();
//! the full constructor setting the iterator to the first sparse matrix element //! the full constructor setting the iterator to the first sparse matrix element
SparseMatConstIterator_(const SparseMat_<_Tp>* _m); SparseMatConstIterator_(const SparseMat_<_Tp>* _m);
SparseMatConstIterator_(const SparseMat* _m);
//! the copy constructor //! the copy constructor
SparseMatConstIterator_(const SparseMatConstIterator_& it); SparseMatConstIterator_(const SparseMatConstIterator_& it);
@ -3796,6 +3797,7 @@ public:
SparseMatIterator_(); SparseMatIterator_();
//! the full constructor setting the iterator to the first sparse matrix element //! the full constructor setting the iterator to the first sparse matrix element
SparseMatIterator_(SparseMat_<_Tp>* _m); SparseMatIterator_(SparseMat_<_Tp>* _m);
SparseMatIterator_(SparseMat* _m);
//! the copy constructor //! the copy constructor
SparseMatIterator_(const SparseMatIterator_& it); SparseMatIterator_(const SparseMatIterator_& it);

12
modules/core/include/opencv2/core/mat.hpp
View File

@ -2530,6 +2530,13 @@ SparseMatConstIterator_<_Tp>::SparseMatConstIterator_(const SparseMat_<_Tp>* _m)
: SparseMatConstIterator(_m) : SparseMatConstIterator(_m)
{} {}
template<typename _Tp> inline
SparseMatConstIterator_<_Tp>::SparseMatConstIterator_(const SparseMat* _m)
: SparseMatConstIterator(_m)
{
CV_Assert( _m->type() == DataType<_Tp>::type );
}
template<typename _Tp> inline template<typename _Tp> inline
SparseMatConstIterator_<_Tp>::SparseMatConstIterator_(const SparseMatConstIterator_<_Tp>& it) SparseMatConstIterator_<_Tp>::SparseMatConstIterator_(const SparseMatConstIterator_<_Tp>& it)
: SparseMatConstIterator(it) : SparseMatConstIterator(it)
@ -2569,6 +2576,11 @@ SparseMatIterator_<_Tp>::SparseMatIterator_(SparseMat_<_Tp>* _m)
: SparseMatConstIterator_<_Tp>(_m) : SparseMatConstIterator_<_Tp>(_m)
{} {}
template<typename _Tp> inline
SparseMatIterator_<_Tp>::SparseMatIterator_(SparseMat* _m)
: SparseMatConstIterator_<_Tp>(_m)
{}
template<typename _Tp> inline template<typename _Tp> inline
SparseMatIterator_<_Tp>::SparseMatIterator_(const SparseMatIterator_<_Tp>& it) SparseMatIterator_<_Tp>::SparseMatIterator_(const SparseMatIterator_<_Tp>& it)
: SparseMatConstIterator_<_Tp>(it) : SparseMatConstIterator_<_Tp>(it)