mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-25 19:50:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
32eb38ec98
opencv/modules/nonfree/perf
History
Roman Donchenko 78be4f66f7 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	CMakeLists.txt
	modules/calib3d/src/calibration.cpp
	modules/ocl/src/cl_programcache.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/imgproc.cpp
	samples/ocl/adaptive_bilateral_filter.cpp
	samples/ocl/bgfg_segm.cpp
	samples/ocl/clahe.cpp
	samples/ocl/facedetect.cpp
	samples/ocl/pyrlk_optical_flow.cpp
	samples/ocl/squares.cpp
	samples/ocl/surf_matcher.cpp
	samples/ocl/tvl1_optical_flow.cpp
2013-10-28 13:38:25 +04:00
..
perf_main.cpp replaced gpu->cuda in files names 2013-09-02 14:00:44 +04:00
perf_precomp.hpp replaced gpu->cuda in files names 2013-09-02 14:00:44 +04:00
perf_surf.cpp Remove all using directives for STL namespace and members 2013-02-25 15:04:17 +04:00
perf_surf.cuda.cpp replaced GPU -> CUDA 2013-09-02 14:00:44 +04:00
perf_surf.ocl.cpp fixing typo 2013-10-25 18:00:46 +04:00