2 Commits

Author	SHA1	Message	Date
Marina Kolpakova	54ee92e3b0	merged trunk r8815:8827	2012-06-28 17:28:27 +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