Vadim Pisarevsky fd68cc768a fixed 2 build problems on MacOSX (highgui with ffmpeg, opencv_world); added macro CV_INIT_ALGORITHM for simpler algorithm registration (ticket #1876)		2012-05-21 14:56:07 +00:00
..
doc	merged 2.4 into trunk	2012-04-30 14:33:52 +00:00
include/opencv2/features2d	merged 2.4 into trunk	2012-04-30 14:33:52 +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	fixed 2 build problems on MacOSX (highgui with ffmpeg, opencv_world); added macro CV_INIT_ALGORITHM for simpler algorithm registration (ticket #1876)	2012-05-21 14:56:07 +00:00
test	merged 2.4 into trunk	2012-04-30 14:33:52 +00:00
CMakeLists.txt	Made dependency of features2d and calib3d from highgui optional	2012-03-13 12:33:16 +00:00