generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
029ffb7c2d
opencv/modules/cudaimgproc/perf
History
Roman Donchenko 029ffb7c2d Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/core/src/gl_core_3_1.cpp
	modules/core/src/opencl/convert.cl
	modules/cudaimgproc/src/cuda/canny.cu
	modules/cudastereo/perf/perf_stereo.cpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/gpu/test/test_denoising.cpp
	modules/ocl/src/opencl/imgproc_resize.cl
	samples/cpp/Qt_sample/main.cpp
2014-02-17 15:24:05 +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 Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-02-17 15:24:05 +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