mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-25 19:50:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
a3bde36c84
opencv/samples/android
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
..
15-puzzle Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-07-08 14:33:56 +04:00
camera-calibration android: allow to build & run examples without Android OpenCV Manager 2014-06-06 18:01:04 +04:00
color-blob-detection android: allow to build & run examples without Android OpenCV Manager 2014-06-06 18:01:04 +04:00
face-detection 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
hello-android Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
image-manipulations android: allow to build & run examples without Android OpenCV Manager 2014-06-06 18:01:04 +04:00
native-activity android: allow to build & run examples without Android OpenCV Manager 2014-06-06 18:01:04 +04:00
tutorial-1-camerapreview android: allow to build & run examples without Android OpenCV Manager 2014-06-06 18:01:04 +04:00
tutorial-2-mixedprocessing android: allow to build & run examples without Android OpenCV Manager 2014-06-06 18:01:04 +04:00
tutorial-3-cameracontrol android: allow to build & run examples without Android OpenCV Manager 2014-06-06 18:01:04 +04:00
.gitignore Normalized file endings. 2013-08-21 18:59:25 +04:00
CMakeLists.txt New sample for CUDA on Android added. 2013-12-26 14:52:41 +04:00