third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
b43d6b6858
opencv/modules/features2d/src
History
Roman Donchenko 464a010f53 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/core/include/opencv2/core/operations.hpp
	modules/core/include/opencv2/core/version.hpp
	modules/core/src/gpumat.cpp
	modules/cudaimgproc/src/color.cpp
	modules/features2d/src/orb.cpp
	modules/imgproc/src/samplers.cpp
	modules/ocl/include/opencv2/ocl/matrix_operations.hpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	samples/ocl/facedetect.cpp
2013-12-10 12:51:00 +04:00
..
bagofwords.cpp Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +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 Boring changes - features2d. 2013-09-05 18:26:44 +04:00
descriptors.cpp Boring changes - features2d. 2013-09-05 18:26:44 +04:00
detectors.cpp Boring changes - features2d. 2013-09-05 18:26:44 +04:00
draw.cpp Move border type constants and Moments class to core module 2013-04-10 19:14:24 +04:00
dynamic.cpp Boring changes - features2d. 2013-09-05 18:26:44 +04:00
evaluation.cpp Boring changes - features2d. 2013-09-05 18:26:44 +04:00
fast_score.cpp Normalized file endings. 2013-08-21 18:59:25 +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 fixing compilation on Linux 2013-12-03 17:46:09 +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 Boring changes - features2d. 2013-09-05 18:26:44 +04:00
mser.cpp Added #include <limits> to files that were missing it. 2013-05-06 22:45:11 -04:00
orb.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-12-10 12:51:00 +04:00
precomp.hpp Remove HAVE_CVCONFIG_H - it's always defined. 2013-07-10 16:02:07 +04:00
stardetector.cpp Move border type constants and Moments class to core module 2013-04-10 19:14:24 +04:00