opencv/modules/features2d/src
Roman Donchenko 3939d78336 Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	modules/core/include/opencv2/core/types_c.h
	modules/gpu/src/cuda/imgproc.cu
	modules/gpu/src/cuda/safe_call.hpp
	modules/gpu/src/error.cpp
	modules/gpu/src/imgproc.cpp
	modules/imgproc/src/distransform.cpp
	modules/imgproc/src/shapedescr.cpp
	modules/python/src2/cv2.cpp
	modules/python/src2/cv2.cv.hpp
2013-07-22 18:38:57 +04:00
..
bagofwords.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-07-22 18:38:57 +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 Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-07-16 11:52:41 +04:00
descriptors.cpp Merge pull request #696 from znah:detect_method 2013-06-13 12:01:59 +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