• Roman Donchenko's avatar
    Merge remote-tracking branch 'origin/2.4' into merge-2.4 · 2d6f35d6
    Roman Donchenko authored
    Conflicts:
    	modules/gpuwarping/src/cuda/resize.cu
    	modules/gpuwarping/src/resize.cpp
    	modules/gpuwarping/test/test_resize.cpp
    	modules/ocl/perf/main.cpp
    	modules/ocl/perf/perf_calib3d.cpp
    	modules/ocl/perf/perf_canny.cpp
    	modules/ocl/perf/perf_color.cpp
    	modules/ocl/perf/perf_haar.cpp
    	modules/ocl/perf/perf_match_template.cpp
    	modules/ocl/perf/perf_precomp.cpp
    	modules/ocl/perf/perf_precomp.hpp
    2d6f35d6
Name
Last commit
Last update
..
cuda Loading commit data...
bm.cpp Loading commit data...
bm_fast.cpp Loading commit data...
brox.cpp Loading commit data...
farneback.cpp Loading commit data...
interpolate_frames.cpp Loading commit data...
needle_map.cpp Loading commit data...
precomp.cpp Loading commit data...
precomp.hpp Loading commit data...
pyrlk.cpp Loading commit data...
tvl1flow.cpp Loading commit data...