Vadim Pisarevsky
|
d914f20a4c
|
updated patch to bring in the first functions with "transparent API"
|
2013-11-18 11:48:00 -05:00 |
|
Roman Donchenko
|
dfb698dc64
|
Merge pull request #1581 from SpecLad:merge-2.4
|
2013-10-09 12:33:50 +04:00 |
|
Roman Donchenko
|
f07769e9d8
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
cmake/OpenCVDetectOpenCL.cmake
cmake/OpenCVModule.cmake
modules/imgproc/src/floodfill.cpp
modules/nonfree/src/surf.ocl.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/include/opencv2/ocl/private/util.hpp
modules/ocl/perf/main.cpp
modules/ocl/src/arithm.cpp
modules/ocl/src/blend.cpp
modules/ocl/src/build_warps.cpp
modules/ocl/src/canny.cpp
modules/ocl/src/cl_programcache.hpp
modules/ocl/src/columnsum.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/hog.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/match_template.cpp
modules/ocl/src/matrix_operations.cpp
modules/ocl/src/mcwutil.cpp
modules/ocl/src/moments.cpp
modules/ocl/src/mssegmentation.cpp
modules/ocl/src/precomp.hpp
modules/ocl/src/pyrdown.cpp
modules/ocl/src/pyrlk.cpp
modules/ocl/src/pyrup.cpp
modules/ocl/src/split_merge.cpp
modules/ocl/src/stereo_csbp.cpp
modules/ocl/src/stereobm.cpp
modules/ocl/test/main.cpp
samples/ocl/bgfg_segm.cpp
samples/ocl/facedetect.cpp
samples/ocl/pyrlk_optical_flow.cpp
samples/ocl/squares.cpp
samples/ocl/stereo_match.cpp
samples/ocl/surf_matcher.cpp
samples/ocl/tvl1_optical_flow.cpp
|
2013-10-08 17:57:23 +04:00 |
|
Ilya Lavrenov
|
35d9ce0c0c
|
fixed warnings
|
2013-10-08 12:46:43 +04:00 |
|
Roman Donchenko
|
acc2ca484c
|
Merge pull request #1425 from pengx17:master_retina_ocl_fix
|
2013-09-10 18:29:25 +04:00 |
|
peng xiao
|
8767c47463
|
Fix whitespaces.
|
2013-09-10 15:13:53 +08:00 |
|
pengxiao
|
a92721b569
|
Fix retina ocl on NV.
Previously we incorrectly assumed data was aligned in 16 bytes, which should be 32.
|
2013-09-10 14:33:23 +08:00 |
|
Roman Donchenko
|
439e90f4f4
|
retina_ocl.cpp: removed two unused arrays.
|
2013-09-06 12:34:37 +04:00 |
|
Roman Donchenko
|
af594c8e44
|
retina_ocl.hpp: switched BasicRetinaFilter's members around to fix a -Wreorder warning.
|
2013-09-06 12:33:54 +04:00 |
|
Roman Donchenko
|
711fb6bd92
|
Boring changes - bioinspired.
|
2013-09-05 18:26:43 +04:00 |
|
pengxiao
|
e45f92a9e1
|
Fix a bug of ocl retina on NVIDIA platform.
|
2013-09-04 16:38:36 +08:00 |
|
Roman Donchenko
|
18bb951574
|
Nuked the rest of the precomp.cpp files.
Consider this a part of merging #1357.
|
2013-09-02 19:53:45 +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 |
|
peng xiao
|
9f0a88c1d6
|
Remove trailing whitespace.
|
2013-08-28 16:23:46 +08:00 |
|
peng xiao
|
9b20b51389
|
Fix build error on Mac
|
2013-08-21 14:23:10 +08:00 |
|
peng xiao
|
29eefe52bb
|
Add OpenCL accelerated implementation for Retina.
|
2013-08-13 16:27:12 +08:00 |
|
alexandre benoit
|
7fe78efda3
|
retina included in namespace bioinspired + followed suggestions made by Vadim
|
2013-07-14 19:28:37 +02:00 |
|
alexandre benoit
|
c39159069e
|
last warnings solved
|
2013-06-13 07:36: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 |
|