2 Commits

Author	SHA1	Message	Date
Marina Kolpakova	162f9fd7ea	merged the trunk r8735:8766, r8769, r8777:8780, r8790 and r8800:8811	2012-06-28 17:07:17 +00:00
Vadim Pisarevsky	957e80abbd	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