third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
029ffb7c2d
opencv/modules/cudaimgproc/src
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
..
cuda Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-02-17 15:24:05 +04:00
bilateral_filter.cpp renamed gpuimgproc -> cudaimgproc 2013-09-02 14:00:43 +04:00
blend.cpp renamed gpuimgproc -> cudaimgproc 2013-09-02 14:00:43 +04:00
canny.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-02-11 12:05:01 +04:00
color.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-12-10 12:51:00 +04:00
corners.cpp Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
cvt_color_internal.h replaced GPU -> CUDA 2013-09-02 14:00:44 +04:00
generalized_hough.cpp Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
gftt.cpp Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
histogram.cpp Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
hough_circles.cpp Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
hough_lines.cpp Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
hough_segments.cpp Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
match_template.cpp Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
mean_shift.cpp replaced GPU -> CUDA 2013-09-02 14:00:44 +04:00
mssegmentation.cpp renamed gpuimgproc -> cudaimgproc 2013-09-02 14:00:43 +04:00
precomp.hpp Add missing limits include 2013-11-12 22:29:41 -05:00