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
5921c77613
opencv/modules/photo
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
..
doc fixed docs 2013-09-02 14:00:44 +04:00
include/opencv2 replaced gpu->cuda in files names 2013-09-02 14:00:44 +04:00
perf replaced GPU -> CUDA 2013-09-02 14:00:44 +04:00
src Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
test replaced GPU -> CUDA 2013-09-02 14:00:44 +04:00
CMakeLists.txt renamed gpuimgproc -> cudaimgproc 2013-09-02 14:00:43 +04:00