• Roman Donchenko's avatar
    Merge remote-tracking branch 'origin/2.4' · bae85660
    Roman Donchenko authored
    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
    bae85660
Name
Last commit
Last update
..
arithm_2_mat.cl Loading commit data...
arithm_LUT.cl Loading commit data...
arithm_absdiff.cl Loading commit data...
arithm_add.cl Loading commit data...
arithm_addWeighted.cl Loading commit data...
arithm_add_scalar.cl Loading commit data...
arithm_add_scalar_mask.cl Loading commit data...
arithm_bitwise_binary.cl Loading commit data...
arithm_bitwise_binary_mask.cl Loading commit data...
arithm_bitwise_binary_scalar.cl Loading commit data...
arithm_bitwise_binary_scalar_mask.cl Loading commit data...
arithm_bitwise_not.cl Loading commit data...
arithm_cartToPolar.cl Loading commit data...
arithm_compare_eq.cl Loading commit data...
arithm_compare_ne.cl Loading commit data...
arithm_div.cl Loading commit data...
arithm_exp.cl Loading commit data...
arithm_flip.cl Loading commit data...
arithm_flip_rc.cl Loading commit data...
arithm_log.cl Loading commit data...
arithm_magnitude.cl Loading commit data...
arithm_magnitudeSqr.cl Loading commit data...
arithm_minMax.cl Loading commit data...
arithm_minMaxLoc.cl Loading commit data...
arithm_minMaxLoc_mask.cl Loading commit data...
arithm_minMax_mask.cl Loading commit data...
arithm_mul.cl Loading commit data...
arithm_nonzero.cl Loading commit data...
arithm_phase.cl Loading commit data...
arithm_polarToCart.cl Loading commit data...
arithm_pow.cl Loading commit data...
arithm_sum.cl Loading commit data...
arithm_sum_3.cl Loading commit data...
arithm_transpose.cl Loading commit data...
blend_linear.cl Loading commit data...
brute_force_match.cl Loading commit data...
build_warps.cl Loading commit data...
convertC3C4.cl Loading commit data...
cvt_color.cl Loading commit data...
filter_sep_col.cl Loading commit data...
filter_sep_row.cl Loading commit data...
filtering_boxFilter.cl Loading commit data...
filtering_laplacian.cl Loading commit data...
filtering_morph.cl Loading commit data...
haarobjectdetect.cl Loading commit data...
haarobjectdetect_scaled2.cl Loading commit data...
imgproc_bilateral.cl Loading commit data...
imgproc_calcHarris.cl Loading commit data...
imgproc_calcMinEigenVal.cl Loading commit data...
imgproc_canny.cl Loading commit data...
imgproc_columnsum.cl Loading commit data...
imgproc_convolve.cl Loading commit data...
imgproc_copymakeboder.cl Loading commit data...
imgproc_gfft.cl Loading commit data...
imgproc_histogram.cl Loading commit data...
imgproc_hough.cl Loading commit data...
imgproc_integral.cl Loading commit data...
imgproc_integral_sum.cl Loading commit data...
imgproc_median.cl Loading commit data...
imgproc_mulAndScaleSpectrums.cl Loading commit data...
imgproc_remap.cl Loading commit data...
imgproc_resize.cl Loading commit data...
imgproc_threshold.cl Loading commit data...
imgproc_warpAffine.cl Loading commit data...
imgproc_warpPerspective.cl Loading commit data...
interpolate_frames.cl Loading commit data...
match_template.cl Loading commit data...
meanShift.cl Loading commit data...
merge_mat.cl Loading commit data...
moments.cl Loading commit data...
objdetect_hog.cl Loading commit data...
operator_convertTo.cl Loading commit data...
operator_copyToM.cl Loading commit data...
operator_setTo.cl Loading commit data...
operator_setToM.cl Loading commit data...
pyr_down.cl Loading commit data...
pyr_up.cl Loading commit data...
pyrlk.cl Loading commit data...
pyrlk_no_image.cl Loading commit data...
split_mat.cl Loading commit data...
stereobm.cl Loading commit data...
stereobp.cl Loading commit data...
stereocsbp.cl Loading commit data...
tvl1flow.cl Loading commit data...