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
|
2a6fb2867e
|
Remove all using directives for STL namespace and members
Made all STL usages explicit to be able automatically find all usages of
particular class or function.
|
2013-02-25 15:04:17 +04:00 |
|
Marina Kolpakova
|
680a44189c
|
merged the trunk r8704:8716
|
2012-06-28 16:13:29 +00:00 |
|
Andrey Kamaev
|
d48d7b2b46
|
Updated warning options for GCC; fixed new warnings.
|
2012-06-20 12:27:02 +00:00 |
|
Vadim Pisarevsky
|
d5a0088bbe
|
merged 2.4 into trunk
|
2012-04-30 14:33:52 +00:00 |
|
Maria Dimashova
|
3dfa917879
|
refactored train and predict methods of em
|
2012-04-17 06:29:40 +00:00 |
|
Vadim Pisarevsky
|
2fd1e2ea57
|
merged all the latest changes from 2.4 to trunk
|
2012-04-13 21:50:59 +00:00 |
|
Vadim Pisarevsky
|
b8c310065c
|
modified EM interface; updated tests & samples
|
2012-04-06 15:59:30 +00:00 |
|
Maria Dimashova
|
85fa0e7763
|
added cv::EM, moved CvEM to legacy, added/updated tests
|
2012-04-06 09:26:11 +00:00 |
|
Vadim Pisarevsky
|
60ebe2003f
|
fixed multiple warnings on Windows. fixed bug #1368
|
2011-10-03 11:00:28 +00:00 |
|
Anatoly Baksheev
|
415978b1c9
|
warnings
|
2011-09-05 14:37:27 +00:00 |
|
Vadim Pisarevsky
|
ae83fe7645
|
added hybrid (feature-based & meanshift-based) tracker (by Pushkar)
|
2011-08-26 12:22:19 +00:00 |
|