opencv/modules/cudaimgproc/perf
Roman Donchenko fee2ed37fc Merge remote-tracking branch 'origin/2.4' into merge-2.4
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
2014-01-14 11:53:59 +04:00
..
perf_bilateral_filter.cpp replaced GPU -> CUDA 2013-09-02 14:00:44 +04:00
perf_blend.cpp replaced GPU -> CUDA 2013-09-02 14:00:44 +04:00
perf_canny.cpp replaced GPU -> CUDA 2013-09-02 14:00:44 +04:00
perf_color.cpp replaced GPU -> CUDA 2013-09-02 14:00:44 +04:00
perf_corners.cpp replaced GPU -> CUDA 2013-09-02 14:00:44 +04:00
perf_gftt.cpp replaced GPU -> CUDA 2013-09-02 14:00:44 +04:00
perf_histogram.cpp replaced GPU -> CUDA 2013-09-02 14:00:44 +04:00
perf_hough.cpp replaced GPU -> CUDA 2013-09-02 14:00:44 +04:00
perf_main.cpp renamed gpuimgproc -> cudaimgproc 2013-09-02 14:00:43 +04:00
perf_match_template.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-01-14 11:53:59 +04:00
perf_mean_shift.cpp replaced GPU -> CUDA 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