opencv

Open Source Computer Vision Library https://opencv.org/

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		11 years ago
..
.settings	Native activity install fixed.	12 years ago
jni	Updated the native activity sample to master's API.	12 years ago
res	…
src/org/opencv/samples/NativeActivity	Application pause/resume fix for Android sample NativeActivity.	11 years ago
.classpath	Native activity install fixed.	12 years ago
.cproject	Various fixes in android sample NativeActivity.	12 years ago
.project	NativeActivity sample build with Eclipse CDT fixed.	12 years ago
AndroidManifest.xml	Various fixes in android sample NativeActivity.	12 years ago
CMakeLists.txt	…