opencv

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

.settings

Improving compatibility with the latest Android SDK (r21) and NDK (r8c).

2012-11-20 18:40:22 +04:00

jni

Merge branch 'master' into gpu-cuda-rename

2013-09-06 15:44:44 +04:00

res

Code review coments fixed. Lint wornings fixed.

2012-10-23 20:06:58 +04:00

src/org/opencv/samples/facedetect

fix a bug(DetectorType never change)