opencv/modules/stitching/src
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
..
autocalib.cpp Remove all using directives for STL namespace and members 2013-02-25 15:04:17 +04:00
blenders.cpp Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
camera.cpp Remove all using directives for STL namespace and members 2013-02-25 15:04:17 +04:00
exposure_compensate.cpp Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
matchers.cpp Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
motion_estimators.cpp Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
precomp.hpp replaced gpu->cuda in files names 2013-09-02 14:00:44 +04:00
seam_finders.cpp renmaed gpu module -> cuda 2013-09-02 14:00:44 +04:00
stitcher.cpp Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
util.cpp Remove all using directives for STL namespace and members 2013-02-25 15:04:17 +04:00
warpers.cpp renamed gpuwarping -> cudawarping 2013-09-02 14:00:42 +04:00