Roman Donchenko
|
9d8d70d6ca
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
doc/tutorials/definitions/tocDefinitions.rst
modules/core/include/opencv2/core/core.hpp
modules/core/src/system.cpp
modules/features2d/src/freak.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/cl_context.cpp
modules/ocl/test/test_api.cpp
|
2013-12-16 15:02:12 +04:00 |
|
Alfonso (the fonz) de la Osa
|
df0c43321d
|
--no-display property fix in stereo_match.cpp sample
|
2013-12-09 10:55:44 +00:00 |
|
Andrey Kamaev
|
909d6fcf51
|
Move legacy part of opencv_contrib to separate header
|
2013-04-12 19:37:40 +04:00 |
|
Vadim Pisarevsky
|
7661625c39
|
converter stereo correspondence algorithms to the new style
|
2013-03-22 01:05:30 +04:00 |
|
Andrey Kamaev
|
89356ff16d
|
Move non-CV functionality from core.hpp to separate utility.hpp header
|
2013-03-20 17:56:06 +04:00 |
|
Vadim Pisarevsky
|
df89f30b4a
|
removed preset parameter in createStereoBM, updated stereo_match sample
|
2013-03-02 02:17:49 +04:00 |
|
OpenCV Buildbot
|
81f826db2b
|
Normalize line endings and whitespace
|
2012-10-17 15:57:49 +04:00 |
|
OpenCV Buildbot
|
04384a71e4
|
Normalize line endings and whitespace
|
2012-10-17 15:32:23 +04:00 |
|
Vadim Pisarevsky
|
a310e2f027
|
fixed the case of scale != 1 in stereo_match.cpp (patch #1936)
|
2012-10-08 22:39:11 +04:00 |
|
Andrey Kamaev
|
49a1ba6038
|
Set stricter warning rules for gcc
|
2012-06-07 17:21:29 +00:00 |
|
Vadim Pisarevsky
|
7702fa4d61
|
added improved version of the variational stereo correspondence algorithm by Sergey Kosov
|
2011-07-14 15:30:28 +00:00 |
|
Vadim Pisarevsky
|
0876f69dbf
|
added variational stereo correspondence (by Sergey Kosov) and polynomial fitting (by Onkar Raut)
|
2011-06-15 12:10:33 +00:00 |
|
Vadim Pisarevsky
|
9a991a2e10
|
fixed build problems on Windows
|
2011-04-18 15:14:32 +00:00 |
|
Gary Bradski
|
67d8f9ae73
|
revamped
|
2010-12-04 08:30:43 +00:00 |
|
Vadim Pisarevsky
|
ee3618243d
|
converted some OpenCV C samples to C++
|
2010-11-27 23:15:16 +00:00 |
|