Andrey Kamaev 7b5a45eac4 Merged the trunk r8384:8407 (inclusive)		2012-05-30 08:04:37 +00:00
..
doc	added documentation for ORB (ticket #1835). updated documentation on features2d (Feature2D class is still to be documented) (ticket #1819)	2012-04-28 17:32:02 +00:00
include/opencv2/nonfree	fixed problem with SURF loading in Python tests	2012-04-09 11:45:36 +00:00
perf	lot's of changes; nonfree & photo modules added; SIFT & SURF -> nonfree module; Inpainting -> photo; refactored features2d (ORB is still failing tests), optimized brute-force matcher and made it non-template.	2012-03-15 14:36:01 +00:00
src	Merged the trunk r8384:8407 (inclusive)	2012-05-30 08:04:37 +00:00
test	Increased test threshold for arm	2012-04-27 08:28:40 +00:00
CMakeLists.txt	lot's of changes; nonfree & photo modules added; SIFT & SURF -> nonfree module; Inpainting -> photo; refactored features2d (ORB is still failing tests), optimized brute-force matcher and made it non-template.	2012-03-15 14:36:01 +00:00