Andrey Kamaev 61079547f0 Merge branch '2.4'

2013-02-01 14:59:40 +04:00

..

doc

Eliminate discrepancies between signatures in documentation and OpenCV headers

2012-10-18 13:03:12 +04:00

include/opencv2/photo

Normalize line endings and whitespace

2012-10-17 15:57:49 +04:00

perf

Increased time limits, eliminated extra params

2013-01-31 16:18:52 +04:00

src

Fix integer overflow in NL-Means denoising on white input

2013-01-28 14:35:51 +04:00

test

Add test for issue #2646

2013-01-28 14:35:51 +04:00

CMakeLists.txt

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