db85c35e69
Conflicts: modules/contrib/src/basicretinafilter.hpp modules/contrib/src/magnoretinafilter.hpp modules/contrib/src/parvoretinafilter.hpp modules/contrib/src/retinacolor.hpp modules/gpu/include/opencv2/gpu/gpu.hpp modules/highgui/src/cap_tyzx.cpp modules/ocl/perf/perf_filters.cpp modules/ocl/src/haar.cpp modules/ocl/src/opencl/haarobjectdetect.cl modules/ocl/test/test_filters.cpp modules/ocl/test/test_objdetect.cpp |
||
---|---|---|
.. | ||
test_drawing.cpp | ||
test_ffmpeg.cpp | ||
test_fourcc.cpp | ||
test_framecount.cpp | ||
test_grfmt.cpp | ||
test_gui.cpp | ||
test_main.cpp | ||
test_positioning.cpp | ||
test_precomp.hpp | ||
test_video_io.cpp | ||
test_video_pos.cpp |