mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-02 07:39:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
f04cade607
opencv/modules/superres/src
History
Vladislav Vinogradov 0c7663eb3b Merge branch 'master' into gpu-cuda-rename 
Conflicts:
	modules/core/include/opencv2/core/cuda.hpp
	modules/cudacodec/src/thread.cpp
	modules/cudacodec/src/thread.hpp
	modules/superres/perf/perf_superres.cpp
	modules/superres/src/btv_l1_cuda.cpp
	modules/superres/src/optical_flow.cpp
	modules/videostab/src/global_motion.cpp
	modules/videostab/src/inpainting.cpp
	samples/cpp/stitching_detailed.cpp
	samples/cpp/videostab.cpp
	samples/gpu/stereo_multi.cpp
2013-09-06 15:44:44 +04:00
..
cuda renamed gpufilters -> cudafilters 2013-09-02 14:00:43 +04:00
opencl Normalized file endings. 2013-08-21 18:59:25 +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 branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
btv_l1.cpp Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +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 branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
precomp.hpp renamed gpuoptflow -> cudaoptflow 2013-09-02 14:00:43 +04: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