mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-01-20 15:59:24 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
c1172b83dd
opencv/modules/cudaimgproc/src
History
Roman Donchenko 464a010f53 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/core/include/opencv2/core/operations.hpp
	modules/core/include/opencv2/core/version.hpp
	modules/core/src/gpumat.cpp
	modules/cudaimgproc/src/color.cpp
	modules/features2d/src/orb.cpp
	modules/imgproc/src/samplers.cpp
	modules/ocl/include/opencv2/ocl/matrix_operations.hpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	samples/ocl/facedetect.cpp
2013-12-10 12:51:00 +04:00
..
cuda replaced GPU -> CUDA 2013-09-02 14:00:44 +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 branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +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