Permalink
Browse files

Merge pull request #1698 from bilderbuchi/fix-1697

Hotfix minor bug in openCV.
  • Loading branch information...
2 parents 8d9abe6 + 45cc997 commit a112899c29f0e33e92b6793a4f6c932817ad22b3 @ofTheo ofTheo committed Nov 14, 2012
Showing with 3 additions and 3 deletions.
  1. +3 −3 addons/ofxOpenCv/libs/opencv/include/opencv2/core/mat.hpp
@@ -1330,17 +1330,17 @@ template<typename _Tp> static inline void min(double s, const Mat_<_Tp>& a, Mat_
template<typename _Tp> static inline void max(const Mat_<_Tp>& a, const Mat_<_Tp>& b, Mat_<_Tp>& c)
{
- cv::min((const Mat&)a, (const Mat&)b, (Mat&)c);
+ cv::max((const Mat&)a, (const Mat&)b, (Mat&)c);
}
template<typename _Tp> static inline void max(const Mat_<_Tp>& a, double s, Mat_<_Tp>& c)
{
- cv::min((const Mat&)a, s, (Mat&)c);
+ cv::max((const Mat&)a, s, (Mat&)c);
}
template<typename _Tp> static inline void max(double s, const Mat_<_Tp>& a, Mat_<_Tp>& c)
{
- cv::min((const Mat&)a, s, (Mat&)c);
+ cv::max((const Mat&)a, s, (Mat&)c);
}

0 comments on commit a112899

Please sign in to comment.