Skip to content
Browse files

Hotfix minor bug in openCV. Closes #1697.

Already fixed in OpenCV 2.4.0 http://code.opencv.org/issues/1643
  • Loading branch information...
1 parent 8d9abe6 commit 45cc997aef7ffebdd9b542f92589e5d2d46bab5d @bilderbuchi bilderbuchi committed
Showing with 3 additions and 3 deletions.
  1. +3 −3 addons/ofxOpenCv/libs/opencv/include/opencv2/core/mat.hpp
View
6 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 45cc997

Please sign in to comment.
Something went wrong with that request. Please try again.