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 |
|
Roman Donchenko
|
ac39bfb4cc
|
Remove HAVE_CVCONFIG_H - it's always defined.
|
2013-07-10 16:02:07 +04:00 |
|
Andrey Kamaev
|
517062039e
|
Make core/internal.hpp a private header
|
2013-04-01 17:29:10 +04:00 |
|
Andrey Kamaev
|
ad5cddc007
|
Main module headers are moved 1 level up
e.g. <opencv2/core/core.hpp> become <opencv2/core.hpp>
Also renamed <opencv2/core/opengl_interop.hpp> to <opencv2/core/opengl.hpp>
|
2013-03-13 17:26:56 +04:00 |
|
Alexey Spizhevoy
|
c8b7a8c80c
|
added median-based version of global motion estimation (videostab)
|
2012-08-23 10:48:24 +04: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
|
ecf6b5a87c
|
Making all dependencies from highgui module optional
|
2012-06-26 07:29:36 +00:00 |
|
Alexey Spizhevoy
|
1569c1ed52
|
Added GPU version of PyrLK based global motion estimator (videostab)
|
2012-04-18 13:23:41 +00:00 |
|
Alexey Spizhevoy
|
dfedaff99b
|
Removed unnecessary code (videostab)
|
2012-04-17 09:21:09 +00:00 |
|
Andrey Kamaev
|
97835a8f32
|
Fixed 9 more build warnings
|
2012-04-12 16:21:08 +00:00 |
|
Alexey Spizhevoy
|
efa0717d01
|
Added support of homography estimation into videostab module
|
2012-04-04 11:45:16 +00:00 |
|
Alexey Spizhevoy
|
ecb1f0e288
|
Fixed some bugs in videostab module and refactored it
|
2012-04-04 09:28:47 +00:00 |
|
Andrey Kamaev
|
e64c08d5d9
|
Fixed build
|
2012-03-22 08:22:23 +00:00 |
|
Alexey Spizhevoy
|
984583981c
|
Split stabilizer into OnePassStabilizer and TwoPassStabilizer
|
2012-03-22 07:52:17 +00:00 |
|
Alexey Spizhevoy
|
f58c40bfab
|
Added licence message
|
2012-03-19 14:13:33 +00:00 |
|
Alexey Spizhevoy
|
a60dc947b1
|
Added first version of videostab module
|
2012-03-19 13:39:23 +00:00 |
|