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
1036ce807c
opencv/modules
History
Vladislav Vinogradov 1036ce807c Merge branch 'master' into gpu-cuda-rename 
Conflicts:
	modules/core/include/opencv2/core/cuda.hpp
	modules/cudaimgproc/src/gftt.cpp
	modules/objdetect/include/opencv2/objdetect/erfilter.hpp
	modules/objdetect/src/erfilter.cpp
	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-09 12:57:35 +04:00
..
androidcamera Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
bioinspired Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
calib3d Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
contrib Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
core Merge branch 'master' into gpu-cuda-rename 2013-09-09 12:57:35 +04:00
cuda Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
cudaarithm Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
cudabgsegm Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
cudacodec Merge branch 'master' into gpu-cuda-rename 2013-09-09 12:57:35 +04:00
cudafeatures2d removed precomp.cpp files 2013-09-02 14:00:44 +04:00
cudafilters Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
cudaimgproc Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
cudalegacy Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
cudaoptflow Merge branch 'master' into gpu-cuda-rename 2013-09-04 09:58:32 +04:00
cudastereo Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
cudawarping Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
cudev replaced gpu->cuda in files names 2013-09-02 14:00:44 +04:00
features2d Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
flann War on Whitespace, master edition: file endings. 2013-08-27 14:23:26 +04:00
highgui Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
imgproc Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
java Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
legacy Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
ml Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
nonfree Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
objdetect changed default parameters in CreateERFiltersNM{1,2} functions. They are not needed now in the sample example. 2013-09-06 19:10:53 +02:00
ocl Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
optim Nuked the rest of the precomp.cpp files. 2013-09-02 19:53:45 +04:00
photo Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
python Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
softcascade Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
stitching Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
superres Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
ts replaced GPU -> CUDA 2013-09-02 14:00:44 +04:00
video Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
videostab Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
world Deleted all trailing whitespace. 2013-08-21 18:59:24 +04:00
CMakeLists.txt Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-06-10 18:18:01 +04:00
refman.rst.in