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

Merge pull request #3556 from rokm:semicolon-warnings

Browse Source
This commit is contained in:
Vadim Pisarevsky 2014-12-31 06:08:11 +00:00
commit 2b30759af0
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1005,13 +1005,13 @@ MatIterator_<_Tp> Mat::end()
template<typename _Tp, typename Functor> inline
void Mat::forEach(const Functor& operation) {
this->forEach_impl<_Tp>(operation);
};
}
template<typename _Tp, typename Functor> inline
void Mat::forEach(const Functor& operation) const {
// call as not const
(const_cast<Mat*>(this))->forEach<const _Tp>(operation);
};
}
template<typename _Tp> inline
Mat::operator std::vector<_Tp>() const

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

@ -465,7 +465,7 @@ void Mat::forEach_impl(const Functor& operation) {
};
parallel_for_(cv::Range(0, LINES), PixelOperationWrapper(reinterpret_cast<Mat_<_Tp>*>(this), operation));
};
}
/////////////////////////// Synchronization Primitives ///////////////////////////////