mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-15 18:09:11 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
47d4f8cd61
opencv/samples/android
History
Roman Donchenko 029ffb7c2d Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/core/src/gl_core_3_1.cpp
	modules/core/src/opencl/convert.cl
	modules/cudaimgproc/src/cuda/canny.cu
	modules/cudastereo/perf/perf_stereo.cpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/gpu/test/test_denoising.cpp
	modules/ocl/src/opencl/imgproc_resize.cl
	samples/cpp/Qt_sample/main.cpp
2014-02-17 15:24:05 +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 remote-tracking branch 'upstream/2.4' into merge-2.4 2013-10-15 20:08:52 +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 Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-02-17 15:24:05 +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 New sample for CUDA on Android added. 2013-12-26 14:52:41 +04:00