Conflicts: modules/contrib/src/retina.cpp modules/core/include/opencv2/core/mat.hpp modules/core/src/algorithm.cpp modules/core/src/arithm.cpp modules/features2d/src/features2d_init.cpp modules/gpu/include/opencv2/gpu/gpu.hpp modules/gpu/perf/perf_imgproc.cpp modules/imgproc/src/generalized_hough.cpp modules/ocl/include/opencv2/ocl/ocl.hpp modules/video/src/tvl1flow.cpp modules/video/src/video_init.cpp |
||
|---|---|---|
| .. | ||
| opencl | ||
| basicretinafilter.cpp | ||
| basicretinafilter.hpp | ||
| imagelogpolprojection.cpp | ||
| imagelogpolprojection.hpp | ||
| magnoretinafilter.cpp | ||
| magnoretinafilter.hpp | ||
| parvoretinafilter.cpp | ||
| parvoretinafilter.hpp | ||
| precomp.hpp | ||
| retina_ocl.cpp | ||
| retina_ocl.hpp | ||
| retina.cpp | ||
| retinacolor.cpp | ||
| retinacolor.hpp | ||
| retinafasttonemapping.cpp | ||
| retinafilter.cpp | ||
| retinafilter.hpp | ||
| templatebuffer.hpp | ||