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

Merge branch 2.4

Browse Source 
Conflicts:
	android/service/engine/AndroidManifest.xml - use file from 2.4
	modules/contrib/src/detection_based_tracker.cpp - move #include <pthread.h> as in 2.4
	modules/java/android_test/src/org/opencv/test/OpenCVTestRunner.java - use file from 2.4
This commit is contained in:
Andrey Kamaev
2012-11-20 19:12:00 +04:00
parent 2e2d927273 d559c18ee5
commit 7f542e391a
39 changed files with 462 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -583,7 +583,7 @@ namespace cv
virtual ~StereoVar();
//! the stereo correspondence operator that computes disparity map for the specified rectified stereo pair
CV_WRAP_AS(compute) virtual void operator()(const Mat& left, const Mat& right, Mat& disp);
CV_WRAP_AS(compute) virtual void operator()(const Mat& left, const Mat& right, CV_OUT Mat& disp);
CV_PROP_RW int levels;
CV_PROP_RW double pyrScale;