Commit Graph

25 Commits

Author SHA1 Message Date
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
2c1fb5fd71 minor correction after buildbot warnings 2013-06-13 06:55:35 +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
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
ccdd4ebbb8 update retina module related samples 2011-11-10 13:41:29 +00:00
Alexander Shishkov
09dd13d02e fixed compilation problems after rev. 6925 2011-10-30 15:08:44 +00:00
Alexandre Benoit
77cfdab3ff corrected xml parameters file management in the retina interface 2011-10-21 10:01:48 +00:00
Alexandre Benoit
5de07eb784 corrected wrong parameter sent to retina module for color saturation 2011-10-21 08:49:18 +00:00
Vadim Pisarevsky
60ebe2003f fixed multiple warnings on Windows. fixed bug #1368 2011-10-03 11:00:28 +00:00
Alexandre Benoit
9ea9cbf489 Updated retina access methods and OpenEXR image tone mapping demo cleaned 2011-09-04 08:00:09 +00:00
Alexandre Benoit
bd198d2b7b updated default parameters, more contrast by default 2011-08-21 12:22:27 +00:00
Alexandre Benoit
d5d2290ffd updated GUI photoreceptors sensitivity paramaer management 2011-08-20 12:40:04 +00:00
Alexandre Benoit
cd8d3afe37 enhanced basic error management when input image could not be loaded 2011-08-15 13:24:31 +00:00
Alexandre Benoit
e95618d0b4 nicer default parameters set 2011-08-14 07:01:56 +00:00
Alexandre Benoit
638f3d31cf added more explicit titles on figures and cleaned std output 2011-08-13 21:58:31 +00:00
Alexandre Benoit
23c15d562d added comments/contacts link 2011-08-13 18:24:46 +00:00
Alexandre Benoit
6395a738cb adding openexr images tone mapping demo 2011-08-13 14:19:17 +00:00