opencv/modules/gpu/src
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
..
cuda Merge remote-tracking branch 'origin/2.4' 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
arithm.cpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
bgfg_gmg.cpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
bgfg_mog.cpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
bilateral_filter.cpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
blend.cpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
brute_force_matcher.cpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
calib3d.cpp Merge remote-tracking branch 'origin/2.4' 2013-06-05 15:42:07 +04:00
cascadeclassifier.cpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
color.cpp Fix a build error which manifests when building with CUDA < 5. 2013-05-23 14:00:13 +04:00
cuvid_video_source.cpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
cuvid_video_source.h Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
cvt_color_internal.h Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
denoising.cpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
element_operations.cpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
error.cpp fixed NPP error constants usage 2013-06-03 13:37:36 +04:00
fast.cpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
ffmpeg_video_source.cpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
ffmpeg_video_source.h Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
fgd_bgfg.cpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
filtering.cpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
frame_queue.cpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
frame_queue.h Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
gftt.cpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
global_motion.cpp renamed cuda namespace to cudev 2013-04-08 17:25:15 +04:00
graphcuts.cpp moved image labeling to gpu module 2013-04-18 11:33:33 +04:00
hog.cpp removed gpuobjdetect module 2013-04-18 11:33:33 +04:00
hough.cpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
imgproc.cpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
match_template.cpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
matrix_reductions.cpp Merge remote-tracking branch 'origin/2.4' 2013-06-05 15:42:07 +04:00
mssegmentation.cpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
optflowbm.cpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
optical_flow_farneback.cpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
optical_flow.cpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
orb.cpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
precomp.cpp moved common gpu utility functionality to gpu_private.hpp 2013-04-08 17:25:15 +04:00
precomp.hpp fixed NPP error constants usage 2013-06-03 13:37:36 +04:00
pyramids.cpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
pyrlk.cpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
remap.cpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
resize.cpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
speckle_filtering.cpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
split_merge.cpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
stereobm.cpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
stereobp.cpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
stereocsbp.cpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
thread_wrappers.cpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
thread_wrappers.h Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
tvl1flow.cpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
video_decoder.cpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
video_decoder.h Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
video_parser.cpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
video_parser.h Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
video_reader.cpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
video_writer.cpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00
warp.cpp Revert "Merge pull request #836 from jet47:gpu-modules" 2013-04-18 15:03:50 +04:00