mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-26 04:00:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
302250f241
opencv/modules/ocl/test
History
Roman Donchenko bae85660da Merge remote-tracking branch 'origin/2.4' 
Pull requests:
	#943 from jet47:cuda-5.5-support
	#944 from jet47:cmake-2.8.11-cuda-fix
	#912 from SpecLad:contributing
	#934 from SpecLad:parallel-for
	#931 from jet47:gpu-test-fixes
	#932 from bitwangyaoyao:2.4_fixBFM
	#918 from bitwangyaoyao:2.4_samples
	#924 from pengx17:2.4_arithm_fix
	#925 from pengx17:2.4_canny_tmp_fix
	#927 from bitwangyaoyao:2.4_perf
	#930 from pengx17:2.4_haar_ext
	#928 from apavlenko:bugfix_3027
	#920 from asmorkalov:android_move
	#910 from pengx17:2.4_oclgfft
	#913 from janm399:2.4
	#916 from bitwangyaoyao:2.4_fixPyrLK
	#919 from abidrahmank:2.4
	#923 from pengx17:2.4_macfix

Conflicts:
	modules/calib3d/src/stereobm.cpp
	modules/features2d/src/detectors.cpp
	modules/gpu/src/error.cpp
	modules/gpu/src/precomp.hpp
	modules/imgproc/src/distransform.cpp
	modules/imgproc/src/morph.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_color.cpp
	modules/ocl/perf/perf_imgproc.cpp
	modules/ocl/perf/perf_match_template.cpp
	modules/ocl/perf/precomp.cpp
	modules/ocl/perf/precomp.hpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/canny.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/hog.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/opencl/haarobjectdetect.cl
	modules/ocl/src/pyrlk.cpp
	modules/video/src/bgfg_gaussmix2.cpp
	modules/video/src/lkpyramid.cpp
	platforms/linux/scripts/cmake_arm_gnueabi_hardfp.sh
	platforms/linux/scripts/cmake_arm_gnueabi_softfp.sh
	platforms/scripts/ABI_compat_generator.py
	samples/ocl/facedetect.cpp
2013-06-05 15:42:07 +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-05-21 17:19:23 +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 Add ocl's good features to track implementation. 2013-05-22 13:46:42 +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