OSSForks/opencv
1
0
Fork 0
mirror of https://github.com/zebrajr/opencv.git synced 2025-12-07 00:19:53 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
0c7663eb3b
opencv/samples/cpp/tutorial_code
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
..
bioinspired retina included in namespace bioinspired + followed suggestions made by Vadim 2013-07-14 19:28:37 +02:00
calib3d Move C API of opencv_calib3d to separate file 2013-04-11 21:00:17 +04:00
core Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
features2D Merge remote-tracking branch 'origin/2.4' 2013-06-19 15:25:37 +04:00
gpu/gpu-basics-similarity replaced GPU -> CUDA 2013-09-02 14:00:44 +04:00
HighGUI Make highgui.hpp independent from C API 2013-04-08 15:47:29 +04:00
Histograms_Matching Make highgui.hpp independent from C API 2013-04-08 15:47:29 +04:00
images Erasing two images from cpp/tutorial folder 2011-11-03 06:09:31 +00:00
ImgProc Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
ImgTrans Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
introduction Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
ml Normalized file endings. 2013-08-21 18:59:25 +04:00
objectDetection rebased commits 2013-08-22 18:40:30 +02:00
ShapeDescriptors Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
TrackingMotion Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00