opencv/modules/ocl/test
Roman Donchenko 13cd0a0502 Merge remote-tracking branch 'origin/2.4'
Original pull requests:
	#996 from jet47:gpu-nvcuvid-libraries
	#995 from jet47:fix-bug-2985
	#999 from snosov1:unreliable-results-fix
	#1005 from alekcac:doc_fix
	#1004 from jet47:fix-bug-3068
	#987 from jet47:bug-3085-fix
	#969 from pengx17:2.4_binary_cache
	#929 from dominikrose:mingw-libdc1394-2-windows
	#1000 from ivan-korolev:fix_sift_bug_2892
	#1001 from ivan-korolev:fix_stitching_bug_2405
	#998 from asmorkalov:android_cmake_mips_fix
	#993 from ivan-korolev:fix_videostab_bug_3023
	#988 from snosov1:3071-fix
	#986 from pengx17:2.4_initiated_context
	#982 from pengx17:2.4_fix_two_bugs
	#981 from SeninAndrew:ximea_camera_support_fix
	#991 from asmorkalov:android_javadoc_fix
	#972 from jet47:mog2-params-bug-2168
	#980 from SpecLad:include-config
	#973 from pengx17:2.4_oclclahe
	#903 from aks2:2.4
	#968 from asmorkalov:android_na_cproj_fix
	#971 from SpecLad:matchers-ctor
	#970 from asmorkalov:dshow_valid_check_fix
	#965 from apavlenko:fix_java_empty_mats

Conflicts:
	cmake/OpenCVModule.cmake
	modules/core/src/matmul.cpp
	modules/gpu/CMakeLists.txt
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_imgproc.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/initialization.cpp
	modules/stitching/src/matchers.cpp
	modules/video/src/video_init.cpp
	modules/videostab/src/global_motion.cpp
2013-06-19 15:25:37 +04:00
..
main.cpp Add ocl::PlatformName to ocl::Info. 2013-04-25 15:00:50 +08:00
precomp.cpp merged ocl module from ocl branch (it's not quite usable yet; at least on Mac) 2012-07-16 17:08:14 +00:00
precomp.hpp Merge remote-tracking branch 'origin/2.4' 2013-05-21 17:19:23 +04:00
test_arithm.cpp fix warnings, unify test names 2013-05-09 17:57:13 +08:00
test_blend.cpp fix warnings, unify test names 2013-05-09 17:57:13 +08:00
test_brute_force_matcher.cpp Merge remote-tracking branch 'origin/2.4' 2013-05-21 17:19:23 +04:00
test_calib3d.cpp Merge pull request #839 from pengx17:2.4_ocl_csbp 2013-05-14 15:56:07 +04:00
test_canny.cpp Fix 2.4 ocl Canny. 2013-05-29 14:15:26 +08:00
test_color.cpp Merge remote-tracking branch 'origin/2.4' 2013-05-21 17:19:23 +04:00
test_columnsum.cpp fix warnings, unify test names 2013-05-09 17:57:13 +08:00
test_fft.cpp Merge remote-tracking branch 'origin/2.4' 2013-05-21 17:19:23 +04:00
test_filters.cpp fix warnings, unify test names 2013-05-09 17:57:13 +08:00
test_gemm.cpp fix the waring in gemm test 2013-05-17 13:19:09 +08:00
test_haar.cpp Merge remote-tracking branch 'origin/2.4' 2013-06-05 15:42:07 +04:00
test_hog.cpp Merge remote-tracking branch 'origin/2.4' 2013-05-21 17:19:23 +04:00
test_hough.cpp Move C API of opencv_calib3d to separate file 2013-04-11 21:00:17 +04:00
test_imgproc.cpp Merge remote-tracking branch 'origin/2.4' 2013-06-19 15:25:37 +04:00
test_match_template.cpp fix warnings, unify test names 2013-05-09 17:57:13 +08:00
test_matrix_operation.cpp fix warnings, unify test names 2013-05-09 17:57:13 +08:00
test_moments.cpp Merge remote-tracking branch 'origin/2.4' 2013-05-21 17:19:23 +04:00
test_optflow.cpp Fix a bug of cornerHarris and cornerMinEigenVal. 2013-06-06 11:44:35 +08:00
test_pyrdown.cpp fix warnings, unify test names 2013-05-09 17:57:13 +08:00
test_pyrup.cpp Merge remote-tracking branch 'origin/2.4' 2013-05-21 17:19:23 +04:00
test_split_merge.cpp fix warnings, unify test names 2013-05-09 17:57:13 +08:00
utility.cpp Make imgproc.hpp independent from C API 2013-04-08 15:47:28 +04:00
utility.hpp Merge remote-tracking branch 'origin/2.4' 2013-05-21 17:19:23 +04:00