 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
|
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
|
c9e6efc263
|
propagated changes for retina filters from trunk to 2.4
|
2012-04-25 17:32:14 +00:00 |
|
|
Alexandre Benoit
|
18fdc6bf1c
|
user can now use the default retia config auatogenerated file to test their own setup
|
2012-04-25 13:55:14 +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
|
e268e0704d
|
enhanced input image format support
|
2011-08-22 20:10:21 +00:00 |
|
|
Alexandre Benoit
|
9d7c0141bb
|
added comments/contacts link
|
2011-08-13 18:24:33 +00:00 |
|
|
Vadim Pisarevsky
|
907fafce5a
|
fixed retinaDemo compile errors
|
2011-08-11 20:45:51 +00:00 |
|
|
Vadim Pisarevsky
|
2842d34611
|
added retina model, by Alexander Benoit
|
2011-08-11 20:42:08 +00:00 |
|