mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-25 19:50:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
c5ffd1fdea
opencv/modules/ml/src
History
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
..
ann_mlp.cpp Replaced most of the usages of parallel_for with that of parallel_for_. 2013-05-31 12:22:04 +04:00
boost.cpp In CvBoost, delegated update_weights's implementation to a helper method. 2013-04-11 13:50:10 +04:00
cnn.cpp Normalize line endings and whitespace 2012-10-17 15:57:49 +04:00
data.cpp All modules (except ocl and gpu) compiles and pass tests 2013-03-22 22:14:26 +04:00
em.cpp Remove all using directives for STL namespace and members 2013-02-25 15:04:17 +04:00
ertrees.cpp Remove inline sorting algorithms from core headers 2013-03-28 17:22:50 +04:00
estimate.cpp Normalize line endings and whitespace 2012-10-17 15:57:49 +04:00
gbt.cpp Merge remote-tracking branch 'origin/2.4' 2013-06-05 15:42:07 +04:00
inner_functions.cpp Set stricter warning rules for gcc 2012-06-07 17:21:29 +00:00
knearest.cpp Replaced most of the usages of parallel_for with that of parallel_for_. 2013-05-31 12:22:04 +04:00
ml_init.cpp refactored video module; use the new-style algorithms now 2013-03-20 19:51:49 +04:00
nbayes.cpp Replaced most of the usages of parallel_for with that of parallel_for_. 2013-05-31 12:22:04 +04:00
precomp.cpp "atomic bomb" commit. Reorganized OpenCV directory structure 2010-05-11 17:44:00 +00:00
precomp.hpp Make core/internal.hpp a private header 2013-04-01 17:29:10 +04:00
rtrees.cpp Move cv::Mat out of core.hpp 2013-04-01 15:24:34 +04:00
svm.cpp Merge remote-tracking branch 'origin/2.4' 2013-06-05 15:42:07 +04:00
testset.cpp Set stricter warning rules for gcc 2012-06-07 17:21:29 +00:00
tree.cpp Move cv::Mat out of core.hpp 2013-04-01 15:24:34 +04:00