mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-12 12:22:51 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
1036ce807c
opencv/samples/android
History
Vladislav Vinogradov 0c7663eb3b Merge branch 'master' into gpu-cuda-rename 
Conflicts:
	modules/core/include/opencv2/core/cuda.hpp
	modules/cudacodec/src/thread.cpp
	modules/cudacodec/src/thread.hpp
	modules/superres/perf/perf_superres.cpp
	modules/superres/src/btv_l1_cuda.cpp
	modules/superres/src/optical_flow.cpp
	modules/videostab/src/global_motion.cpp
	modules/videostab/src/inpainting.cpp
	samples/cpp/stitching_detailed.cpp
	samples/cpp/videostab.cpp
	samples/gpu/stereo_multi.cpp
2013-09-06 15:44:44 +04:00
..
15-puzzle Feature #2893 Create Java sample without layout.xml implemented. 2013-04-10 13:38:59 +04:00
camera-calibration Adjusted the camera calibration sample to master API. 2013-08-13 14:55:27 +04:00
color-blob-detection Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
face-detection Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
hello-android Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
image-manipulations Bug #3238 Android sample image manipulations blinks in non-preview modes fixed. 2013-08-28 15:08:13 +04:00
native-activity Normalized file endings. 2013-08-21 18:59:25 +04:00
tutorial-1-camerapreview Normalized file endings. 2013-08-21 18:59:25 +04:00
tutorial-2-mixedprocessing Waning fixes for Android samples 2013-04-05 12:17:45 +04:00
tutorial-3-cameracontrol Normalized file endings. 2013-08-21 18:59:25 +04:00
.gitignore Normalized file endings. 2013-08-21 18:59:25 +04:00
CMakeLists.txt Fixed build of camera calibration android sample 2013-08-08 09:31:25 +04:00