opencv/modules/gpu/src/cuda
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
..
bf_knnmatch.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
bf_match.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
bf_radius_match.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
bgfg_gmg.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
bgfg_mog.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
bilateral_filter.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
blend.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
calib3d.cu Merge remote-tracking branch 'origin/2.4' 2013-06-05 15:42:07 +04:00
canny.cu Merge remote-tracking branch 'origin/2.4' 2013-06-05 15:42:07 +04:00
ccomponetns.cu moved image labeling to gpu module 2013-04-18 11:33:33 +04:00
clahe.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
color.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
column_filter.0.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
column_filter.1.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
column_filter.2.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
column_filter.3.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
column_filter.4.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
column_filter.5.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
column_filter.6.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
column_filter.7.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
column_filter.8.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
column_filter.9.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
column_filter.10.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
column_filter.11.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
column_filter.12.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
column_filter.13.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
column_filter.14.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
column_filter.h Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
copy_make_border.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
debayer.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
disp_bilateral_filter.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
element_operations.cu Merge remote-tracking branch 'origin/2.4' 2013-06-05 15:42:07 +04:00
fast.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
fgd_bgfg_common.hpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
fgd_bgfg.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
gftt.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
global_motion.cu restore cudaSafeCall 2013-04-08 17:25:16 +04:00
hist.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
hog.cu removed gpuobjdetect module 2013-04-18 11:33:33 +04:00
hough.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
imgproc.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
integral_image.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
internal_shared.hpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
lbp.cu removed gpuobjdetect module 2013-04-18 11:33:33 +04:00
lbp.hpp removed gpuobjdetect module 2013-04-18 11:33:33 +04:00
match_template.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
mathfunc.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
matrix_reductions.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
nlm.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
NV12ToARGB.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
optflowbm.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
optical_flow_farneback.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
optical_flow.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
orb.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
pyr_down.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
pyr_up.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
pyrlk.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
remap.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
resize.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
rgb_to_yv12.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
row_filter.0.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
row_filter.1.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
row_filter.2.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
row_filter.3.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
row_filter.4.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
row_filter.5.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
row_filter.6.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
row_filter.7.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
row_filter.8.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
row_filter.9.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
row_filter.10.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
row_filter.11.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
row_filter.12.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
row_filter.13.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
row_filter.14.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
row_filter.h Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
safe_call.hpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
split_merge.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
stereobm.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
stereobp.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
stereocsbp.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
texture_binder.hpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
tvl1flow.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
warp.cu Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00