mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-01-24 02:43:06 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
bae85660da
opencv/modules/objdetect/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
..
_latentsvm.h Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
_lsvm_distancetransform.h Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
_lsvm_error.h refactoring latentSVM 2011-07-12 18:43:41 +00:00
_lsvm_fft.h Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
_lsvm_matching.h Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
_lsvm_resizeimg.h fixed several gcc 4.1 warnings 2010-10-21 18:30:57 +00:00
_lsvm_routine.h Move C API of opencv_objdetect to separate file 2013-04-12 14:37:01 +04:00
_lsvm_tbbversion.h Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
_lsvm_types.h Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
_lsvmparser.h Move C API of opencv_objdetect to separate file 2013-04-12 14:37:01 +04:00
cascadedetect.cpp Merge remote-tracking branch 'origin/2.4' 2013-06-05 15:42:07 +04:00
cascadedetect.hpp Remove all using directives for STL namespace and members 2013-02-25 15:04:17 +04:00
datamatrix.cpp Move C API of opencv_objdetect to separate file 2013-04-12 14:37:01 +04:00
distancetransform.cpp Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
featurepyramid.cpp Move border type constants and Moments class to core module 2013-04-10 19:14:24 +04:00
fft.cpp Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
haar.cpp Move C API of opencv_objdetect to separate file 2013-04-12 14:37:01 +04:00
hog.cpp Move C API of opencv_objdetect to separate file 2013-04-12 14:37:01 +04:00
latentsvm.cpp Merge remote-tracking branch 'origin/2.4' 2013-06-05 15:42:07 +04:00
latentsvmdetector.cpp Move C API of opencv_objdetect to separate file 2013-04-12 14:37:01 +04:00
linemod.cpp Move C API of opencv_objdetect to separate file 2013-04-12 14:37:01 +04:00
lsvmparser.cpp Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
lsvmtbbversion.cpp Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
matching.cpp Move C API of opencv_objdetect to separate file 2013-04-12 14:37:01 +04:00
normal_lut.i Initial commit of LINE-MOD source code to objdetect module. 2012-02-26 23:55:18 +00:00
precomp.cpp "atomic bomb" commit. Reorganized OpenCV directory structure 2010-05-11 17:44:00 +00:00
precomp.hpp Move border type constants and Moments class to core module 2013-04-10 19:14:24 +04:00
resizeimg.cpp Move border type constants and Moments class to core module 2013-04-10 19:14:24 +04:00
routine.cpp Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00