opencv

History

Roman Donchenko db85c35e69 Merge remote-tracking branch 'origin/2.4' into merge-2.4

Conflicts:
	modules/contrib/src/basicretinafilter.hpp
	modules/contrib/src/magnoretinafilter.hpp
	modules/contrib/src/parvoretinafilter.hpp
	modules/contrib/src/retinacolor.hpp
	modules/gpu/include/opencv2/gpu/gpu.hpp
	modules/highgui/src/cap_tyzx.cpp
	modules/ocl/perf/perf_filters.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/opencl/haarobjectdetect.cl
	modules/ocl/test/test_filters.cpp
	modules/ocl/test/test_objdetect.cpp

2014-03-03 13:45:22 +04:00

doc

Merge pull request #2002 from abak:stereo_calibrate

2014-02-05 17:47:27 +04:00

include/opencv2

modify signature of stereoCalibrate for consistency

2013-12-17 14:53:44 +09:00

perf

Fixed some dubious uses of tbb::task_scheduler_init.

2013-09-05 19:03:00 +04:00

src

Merge pull request #2415 from vpisarev:fix_stereobm_sse