mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-29 13:47:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
4cc8f7012b
opencv/modules/superres/src
History
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
..
cuda renamed gpufilters -> cudafilters 2013-09-02 14:00:43 +04:00
opencl Merge pull request #1655 from pengx17:2.4_opt_superres_ocl 2013-10-25 19:47:38 +04:00
btv_l1_cuda.cpp Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
btv_l1_ocl.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-01-14 11:53:59 +04:00
btv_l1.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-01-14 11:53:59 +04:00
frame_source.cpp Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
input_array_utility.cpp renamed gpuimgproc -> cudaimgproc 2013-09-02 14:00:43 +04:00
input_array_utility.hpp renamed gpu* source to cuda* in core module 2013-09-02 14:00:42 +04:00
optical_flow.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-01-14 11:53:59 +04:00
precomp.hpp updated patch to bring in the first functions with "transparent API" 2013-11-18 11:48:00 -05:00
ring_buffer.hpp updated license header in whole gpu module 2013-03-22 14:03:15 +04:00
super_resolution.cpp Merge branch '2.4' 2013-03-29 19:38:35 +04:00