Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Hotfix minor bug in openCV. #1698

Merged
merged 1 commit into from
Nov 14, 2012
Merged

Hotfix minor bug in openCV. #1698

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions addons/ofxOpenCv/libs/opencv/include/opencv2/core/mat.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}


Expand Down