Ilya Lavrenov
|
35d9ce0c0c
|
fixed warnings
|
2013-10-08 12:46:43 +04:00 |
|
Roman Donchenko
|
711fb6bd92
|
Boring changes - bioinspired.
|
2013-09-05 18:26:43 +04:00 |
|
Roman Donchenko
|
9218f4976c
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/contrib/src/retina.cpp
modules/gpu/perf/perf_video.cpp
modules/gpuoptflow/src/tvl1flow.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_calib3d.cpp
modules/ocl/perf/perf_color.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/src/precomp.hpp
samples/gpu/stereo_multi.cpp
|
2013-09-02 19:44:51 +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
|
cdbbe0dfbe
|
1. created module bioinspired. 2.transfered Retina module into the new module bioinspired. 3. added a fast tone mapping method to Retina interface and wrapped existing reinafilter dedicated method
|
2013-06-12 22:40:43 +02:00 |
|