Vadim Pisarevsky
|
09df1a286b
|
OpenCV with the refactored features2d compiles! contrib is broken for now; the tests are not tried yet
|
2014-10-17 14:56:58 +04:00 |
|
Roman Donchenko
|
2c4bbb313c
|
Merge commit '43aec5ad' into merge-2.4
Conflicts:
cmake/OpenCVConfig.cmake
cmake/OpenCVLegacyOptions.cmake
modules/contrib/src/retina.cpp
modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
modules/gpu/doc/video.rst
modules/gpu/src/speckle_filtering.cpp
modules/python/src2/cv2.cv.hpp
modules/python/test/test2.py
samples/python/watershed.py
|
2013-08-27 13:26:44 +04:00 |
|
Roman Donchenko
|
e9a28f66ee
|
Normalized file endings.
|
2013-08-21 18:59:25 +04:00 |
|
Andrey Kamaev
|
c98c246fc2
|
Move border type constants and Moments class to core module
|
2013-04-10 19:14:24 +04:00 |
|
Andrey Kamaev
|
b368f99d03
|
Merged the trunk r8852:8880
|
2012-07-02 11:04:43 +00:00 |
|
Andrey Kamaev
|
0584ac525b
|
Quiet MSER tests
|
2012-06-29 08:34:07 +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
|
d9c74f63e1
|
All tests writing temporary files are updated to use cv::tempfile() function
|
2012-06-25 11:24:06 +00:00 |
|
Vadim Pisarevsky
|
2fd1e2ea57
|
merged all the latest changes from 2.4 to trunk
|
2012-04-13 21:50:59 +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 |
|