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 |
|
alexandre benoit
|
7fe78efda3
|
retina included in namespace bioinspired + followed suggestions made by Vadim
|
2013-07-14 19:28:37 +02:00 |
|
alexandre benoit
|
7bff79bbeb
|
updated demos and tutorial regarding the Retina class transfer to bioinspired module.
|
2013-06-12 22:43:36 +02:00 |
|
alexandre benoit
|
72742f5316
|
resolved conflicts, updated retina class interface and optimized a heavy retinacolor process
|
2013-04-29 19:06:35 +02:00 |
|
alexandre benoit
|
b62d101115
|
updated retina interface for cleaner use, following OpenCV standards
|
2013-04-27 21:13:45 +02:00 |
|
Andrey Kamaev
|
8f32902ce6
|
Minimize usages of legacy C API inside the library
|
2013-04-16 12:00:02 +04:00 |
|
Andrey Kamaev
|
199a35a105
|
Move C API of opencv_video to separate file
|
2013-04-11 17:38:33 +04:00 |
|
Andrey Kamaev
|
bd0e0b5800
|
Merged the trunk r8589:8653 - all changes related to build warnings
|
2012-06-15 13:04:17 +00:00 |
|
Andrey Kamaev
|
c5aba337e9
|
Fixed number of warnings. Fixed mingw64 build.
|
2012-06-12 14:46:12 +00:00 |
|
Andrey Kamaev
|
49a1ba6038
|
Set stricter warning rules for gcc
|
2012-06-07 17:21:29 +00:00 |
|
Vadim Pisarevsky
|
4985c1b632
|
fixed hundreds of warnings from MSVC 2010.
|
2012-03-16 21:21:04 +00:00 |
|
Alexandre Benoit
|
6ee1f6f66e
|
removing some mistakes
|
2011-12-15 22:45:28 +00:00 |
|
Alexandre Benoit
|
817dca2219
|
corrected small bu on image sequence tone mapping
|
2011-12-13 08:42:39 +00:00 |
|
Alexandre Benoit
|
056d015b38
|
added tone mapping video processing from OpenEXR images sequences
|
2011-12-12 15:53:05 +00:00 |
|