third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
539f367d0b
opencv/modules/features2d/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
..
bagofwords.cpp Remove all using directives for STL namespace and members 2013-02-25 15:04:17 +04:00
blobdetector.cpp Added #include <limits> to files that were missing it. 2013-05-06 22:45:11 -04:00
brief.cpp Move border type constants and Moments class to core module 2013-04-10 19:14:24 +04:00
brisk.cpp Move border type constants and Moments class to core module 2013-04-10 19:14:24 +04:00
descriptors.cpp Added #include <limits> to files that were missing it. 2013-05-06 22:45:11 -04:00
detectors.cpp Merge remote-tracking branch 'origin/2.4' 2013-06-05 15:42:07 +04:00
draw.cpp Move border type constants and Moments class to core module 2013-04-10 19:14:24 +04:00
dynamic.cpp Drop cv:: prefix from cv::String used inside the cv namespace 2013-03-22 22:14:50 +04:00
evaluation.cpp Move border type constants and Moments class to core module 2013-04-10 19:14:24 +04:00
fast_score.cpp Fix gcc build error introduced in a9f36df 2012-10-10 13:24:49 +04:00
fast_score.hpp Fix binary compatibility of opencv_features2d 2012-10-17 02:09:14 +04:00
fast.cpp Move border type constants and Moments class to core module 2013-04-10 19:14:24 +04:00
features2d_init.cpp Drop cv:: prefix from cv::String used inside the cv namespace 2013-03-22 22:14:50 +04:00
freak.cpp Move border type constants and Moments class to core module 2013-04-10 19:14:24 +04:00
generated_16.i added COVAR_ and SORT_ enums to core.hpp; fixed many, many VS2005, VS2010 and MinGW (GCC 4.5.2) warnings 2011-07-19 12:27:07 +00:00
generated_32.i added COVAR_ and SORT_ enums to core.hpp; fixed many, many VS2005, VS2010 and MinGW (GCC 4.5.2) warnings 2011-07-19 12:27:07 +00:00
generated_64.i added COVAR_ and SORT_ enums to core.hpp; fixed many, many VS2005, VS2010 and MinGW (GCC 4.5.2) warnings 2011-07-19 12:27:07 +00:00
keypoint.cpp Merge branch '2.4' 2013-04-05 21:11:59 +04:00
matchers.cpp Added #include <limits> to files that were missing it. 2013-05-06 22:45:11 -04:00
mser.cpp Added #include <limits> to files that were missing it. 2013-05-06 22:45:11 -04:00
orb.cpp Move border type constants and Moments class to core module 2013-04-10 19:14:24 +04: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
stardetector.cpp Move border type constants and Moments class to core module 2013-04-10 19:14:24 +04:00