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 |
|
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 |
|
peng xiao
|
287c8a3330
|
Let ocl::context only be initialized once in retina_ocl test.
|
2013-08-28 09:17:05 +08:00 |
|
peng xiao
|
3cccded86d
|
Fix build error when WITH_OPENCL is disabled.
|
2013-08-21 11:18:02 +08:00 |
|
peng xiao
|
29eefe52bb
|
Add OpenCL accelerated implementation for Retina.
|
2013-08-13 16:27:12 +08: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 |
|