Skip to content

O
opencv
Switch branch/tag
History Find file
  • Roman Donchenko's avatar
    Merge remote-tracking branch 'origin/2.4' into merge-2.4 · 5ac3b8d5
    Roman Donchenko authored 
    Pull requests:
	#904 from ograycode:2.4
	#905 from bitwangyaoyao:2.4_TVL1
	#902 from apavlenko:fix_run_py
	#882 from pengx17:2.4_rewrite_query_info

Conflicts:
	modules/nonfree/src/surf.ocl.cpp
	modules/ocl/include/opencv2/ocl/private/util.hpp
	modules/ocl/src/hog.cpp
	modules/ocl/src/pyrlk.cpp
	modules/ocl/src/tvl1flow.cpp
    5ac3b8d5
Name
Last commit
 Last update
..
opencl Loading commit data...
arithm.cpp Loading commit data...
binarycaching.hpp Loading commit data...
blend.cpp Loading commit data...
brute_force_matcher.cpp Loading commit data...
build_warps.cpp Loading commit data...
canny.cpp Loading commit data...
color.cpp Loading commit data...
columnsum.cpp Loading commit data...
error.cpp Loading commit data...
fft.cpp Loading commit data...
filtering.cpp Loading commit data...
gemm.cpp Loading commit data...
haar.cpp Loading commit data...
hog.cpp Loading commit data...
hough.cpp Loading commit data...
imgproc.cpp Loading commit data...
initialization.cpp Loading commit data...
interpolate_frames.cpp Loading commit data...
match_template.cpp Loading commit data...
matrix_operations.cpp Loading commit data...
mcwutil.cpp Loading commit data...
moments.cpp Loading commit data...
mssegmentation.cpp Loading commit data...
precomp.cpp Loading commit data...
precomp.hpp Loading commit data...
pyrdown.cpp Loading commit data...
pyrlk.cpp Loading commit data...
pyrup.cpp Loading commit data...
safe_call.hpp Loading commit data...
split_merge.cpp Loading commit data...
stereo_csbp.cpp Loading commit data...
stereobm.cpp Loading commit data...
stereobp.cpp Loading commit data...
tvl1flow.cpp Loading commit data...