opencv

History

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

Conflicts:
	modules/calib3d/include/opencv2/calib3d/calib3d.hpp
	modules/contrib/doc/facerec/facerec_api.rst
	modules/contrib/include/opencv2/contrib/contrib.hpp
	modules/contrib/src/facerec.cpp
	modules/core/include/opencv2/core/mat.hpp
	modules/features2d/include/opencv2/features2d/features2d.hpp
	modules/highgui/src/loadsave.cpp
	modules/imgproc/src/pyramids.cpp
	modules/ocl/include/opencv2/ocl/cl_runtime/cl_runtime.hpp
	modules/python/src2/gen.py
	modules/python/test/test.py
	modules/superres/test/test_superres.cpp
	samples/cpp/facerec_demo.cpp

2014-07-08 14:33:56 +04:00

doc

put the detection-based tracker back (to objdetect module), so that the Android face detection sample builds fine. The patch by Konstantin Matskevich that adds C++11 threads support has been merged in too. Also, fixed compile error in the doc builder.

2014-06-24 21:16:09 +04:00

include/opencv2

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2014-07-08 14:33:56 +04:00

perf

added perf test for transpose inplace

2014-06-30 18:33:26 +04:00

src

Merge pull request #2932 from ilya-lavrenov:tapi_other_vendors