• Roman Donchenko's avatar
    Merge remote-tracking branch 'origin/2.4' into merge-2.4 · 9c2272d5
    Roman Donchenko authored
    Conflicts:
    	.gitignore
    	CMakeLists.txt
    	doc/CMakeLists.txt
    	modules/calib3d/src/stereosgbm.cpp
    	modules/core/include/opencv2/core/mat.hpp
    	modules/highgui/src/cap_openni.cpp
    	modules/ml/include/opencv2/ml/ml.hpp
    	modules/objdetect/src/hog.cpp
    	modules/ocl/perf/perf_color.cpp
    	modules/ocl/src/arithm.cpp
    	modules/ocl/src/filtering.cpp
    	modules/ocl/src/imgproc.cpp
    	modules/ocl/src/optical_flow_farneback.cpp
    	platforms/scripts/camera_build.conf
    	platforms/scripts/cmake_android_all_cameras.py
    	samples/cpp/Qt_sample/main.cpp
    	samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp
    9c2272d5
Name
Last commit
Last update
..
arithm_LUT.cl Loading commit data...
arithm_absdiff_nonsaturate.cl Loading commit data...
arithm_add.cl Loading commit data...
arithm_addWeighted.cl Loading commit data...
arithm_add_mask.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.cl Loading commit data...
arithm_exp.cl Loading commit data...
arithm_flip.cl Loading commit data...
arithm_log.cl Loading commit data...
arithm_magnitude.cl Loading commit data...
arithm_minMax.cl Loading commit data...
arithm_minMaxLoc.cl Loading commit data...
arithm_minMaxLoc_mask.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_setidentity.cl Loading commit data...
arithm_sum.cl Loading commit data...
arithm_transpose.cl Loading commit data...
bgfg_mog.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_adaptive_bilateral.cl Loading commit data...
filtering_boxFilter.cl Loading commit data...
filtering_filter2D.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_clahe.cl Loading commit data...
imgproc_columnsum.cl Loading commit data...
imgproc_convolve.cl Loading commit data...
imgproc_copymakeboder.cl Loading commit data...
imgproc_gftt.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_sobel3.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...
kernel_radix_sort_by_key.cl Loading commit data...
kernel_sort_by_key.cl Loading commit data...
kernel_stablesort_by_key.cl Loading commit data...
kmeans_kernel.cl Loading commit data...
knearest.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...
optical_flow_farneback.cl Loading commit data...
pyr_down.cl Loading commit data...
pyr_up.cl Loading commit data...
pyrlk.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...
svm.cl Loading commit data...
tvl1flow.cl Loading commit data...