opencv/modules/gpu/test
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
..
nvidia Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
interpolation.hpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
main_test_nvidia.h Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
main.cpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
test_bgfg.cpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
test_calib3d.cpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
test_color.cpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
test_copy_make_border.cpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
test_core.cpp Merge remote-tracking branch 'origin/2.4' 2013-06-05 15:42:07 +04:00
test_denoising.cpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
test_features2d.cpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
test_filters.cpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
test_global_motion.cpp updated license header in whole gpu module 2013-03-22 14:03:15 +04:00
test_gpumat.cpp fixed compilation errors 2013-04-17 15:24:53 +04:00
test_hough.cpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
test_imgproc.cpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
test_labeling.cpp moved image labeling to gpu module 2013-04-18 11:33:33 +04:00
test_nvidia.cpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
test_objdetect.cpp removed gpuobjdetect module 2013-04-18 11:33:33 +04:00
test_opengl.cpp updated license header in whole gpu module 2013-03-22 14:03:15 +04:00
test_optflow.cpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
test_precomp.cpp updated license header in whole gpu module 2013-03-22 14:03:15 +04:00
test_precomp.hpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
test_pyramids.cpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
test_remap.cpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
test_resize.cpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
test_stream.cpp Merge branch '2.4' 2013-03-29 19:38:35 +04:00
test_threshold.cpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
test_video.cpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
test_warp_affine.cpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
test_warp_perspective.cpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00