6 Commits

Author	SHA1	Message	Date
Andrey Kamaev	b368f99d03	Merged the trunk r8852:8880	2012-07-02 11:04:43 +00:00
Marina Kolpakova	162f9fd7ea	merged the trunk r8735:8766, r8769, r8777:8780, r8790 and r8800:8811	2012-06-28 17:07:17 +00:00
Andrey Kamaev	c712f376d5	Fixed warnings about unused return value of fscanf, scanf and system	2012-04-10 15:44:07 +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
Vadim Pisarevsky	6432267de8	corrected angular difference check in MSER test (thanks to Pieter-Jan Busschaert for the patch)	2011-05-03 12:58:58 +00:00
Vadim Pisarevsky	061b49e0b2	reworked nearly all of the OpenCV tests (except for opencv_gpu tests) - they now use the Google Test engine.	2011-02-09 20:55:11 +00:00