Andrey Kamaev 1ca8f33b4e Merge branch '2.4'

2013-03-21 23:11:54 +04:00

..

perf_gpu.cpp

disable tests that requires video support if it is not available

2013-03-21 13:40:07 +04:00

perf_main.cpp

Fix build errors

2013-03-21 18:37:34 +04:00

perf_precomp.cpp

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

perf_precomp.hpp

Merge branch '2.4'

2013-03-21 23:11:54 +04:00

perf_surf.cpp

Remove all using directives for STL namespace and members

2013-02-25 15:04:17 +04:00

perf_surf.ocl.cpp

Move OpenCl SURF perf tests to nonfree and fix build of samples

2013-03-21 18:19:52 +04:00