opencv/modules/cudaimgproc/src/cuda
Roman Donchenko 48432502b6 Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	cmake/OpenCVDetectCUDA.cmake
	doc/tutorials/introduction/linux_gcc_cmake/linux_gcc_cmake.rst
	modules/core/CMakeLists.txt
	modules/features2d/perf/opencl/perf_brute_force_matcher.cpp
	modules/highgui/src/grfmt_tiff.cpp
	modules/imgproc/src/clahe.cpp
	modules/imgproc/src/moments.cpp
	modules/nonfree/CMakeLists.txt
	modules/ocl/perf/perf_ml.cpp
	modules/superres/CMakeLists.txt
2014-02-25 15:02:24 +04:00
..
bilateral_filter.cu renamed gpuimgproc -> cudaimgproc 2013-09-02 14:00:43 +04:00
blend.cu renamed gpuimgproc -> cudaimgproc 2013-09-02 14:00:43 +04:00
build_point_list.cu renamed gpuimgproc -> cudaimgproc 2013-09-02 14:00:43 +04:00
canny.cu Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-02-25 15:02:24 +04:00
clahe.cu renamed gpuimgproc -> cudaimgproc 2013-09-02 14:00:43 +04:00
color.cu replaced GPU -> CUDA 2013-09-02 14:00:44 +04:00
corners.cu renamed gpuimgproc -> cudaimgproc 2013-09-02 14:00:43 +04:00
debayer.cu renamed gpuimgproc -> cudaimgproc 2013-09-02 14:00:43 +04:00
generalized_hough.cu renamed gpuimgproc -> cudaimgproc 2013-09-02 14:00:43 +04:00
gftt.cu renamed gpuimgproc -> cudaimgproc 2013-09-02 14:00:43 +04:00
hist.cu renamed gpuimgproc -> cudaimgproc 2013-09-02 14:00:43 +04:00
hough_circles.cu renamed gpuimgproc -> cudaimgproc 2013-09-02 14:00:43 +04:00
hough_lines.cu renamed gpuimgproc -> cudaimgproc 2013-09-02 14:00:43 +04:00
hough_segments.cu renamed gpuimgproc -> cudaimgproc 2013-09-02 14:00:43 +04:00
match_template.cu replaced GPU -> CUDA 2013-09-02 14:00:44 +04:00
mean_shift.cu renamed gpuimgproc -> cudaimgproc 2013-09-02 14:00:43 +04:00