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
3bfc69740b
opencv/samples/gpu
History
Roman Donchenko 3bfc69740b Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Merged pull requests:
	#890 from caorong:patch-1
	#893 from jet47:gpu-arm-fixes
	#933 from pengx17:2.4_macfix_cont
	#935 from pengx17:2.4_filter2d_fix
	#936 from bitwangyaoyao:2.4_perf
	#937 from bitwangyaoyao:2.4_fixPyrLK
	#938 from pengx17:2.4_surf_sample
	#939 from pengx17:2.4_getDevice
	#940 from SpecLad:autolock
	#941 from apavlenko:signed_char
	#946 from bitwangyaoyao:2.4_samples2
	#947 from jet47:fix-gpu-arm-build
	#948 from jet47:cuda-5.5-support
	#952 from SpecLad:jepg
	#953 from jet47:fix-bug-3069
	#955 from SpecLad:symlink
	#957 from pengx17:2.4_fix_corner_detector
	#959 from SpecLad:qt4-build
	#960 from SpecLad:extra-modules

Conflicts:
	modules/core/include/opencv2/core/core.hpp
	modules/gpu/CMakeLists.txt
	modules/gpu/include/opencv2/gpu/device/vec_math.hpp
	modules/gpu/perf/perf_video.cpp
	modules/gpuimgproc/src/cuda/hough.cu
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/pyrlk.cpp
	samples/gpu/driver_api_multi.cpp
	samples/gpu/driver_api_stereo_multi.cpp
	samples/ocl/surf_matcher.cpp
2013-06-10 18:18:01 +04:00
..
performance Minimize usages of legacy C API inside the library 2013-04-16 12:00:02 +04:00
768x576.avi added background subtraction sample for gpu module 2012-06-25 12:48:54 +00:00
aloeL.jpg added bigger images for SURF performance test (it shows better results on them) 2011-02-01 09:51:23 +00:00
aloeR.jpg added bigger images for SURF performance test (it shows better results on them) 2011-02-01 09:51:23 +00:00
alpha_comp.cpp Main module headers are moved 1 level up 2013-03-13 17:26:56 +04:00
basketball1.png Added the GPU version of the Farneback's optical flow 2012-02-16 11:23:51 +00:00
basketball2.png Added the GPU version of the Farneback's optical flow 2012-02-16 11:23:51 +00:00
bgfg_segm.cpp Revert "Revert "Merge pull request #836 from jet47:gpu-modules"" 2013-06-07 13:05:39 +04:00
brox_optical_flow.cpp Move non-CV functionality from core.hpp to separate utility.hpp header 2013-03-20 17:56:06 +04:00
cascadeclassifier_nvidia_api.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-06-10 18:18:01 +04:00
cascadeclassifier.cpp Move legacy part of opencv_contrib to separate header 2013-04-12 19:37:40 +04:00
CMakeLists.txt Revert "Revert "Merge pull request #836 from jet47:gpu-modules"" 2013-06-07 13:05:39 +04:00
driver_api_multi.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-06-10 18:18:01 +04:00
driver_api_stereo_multi.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-06-10 18:18:01 +04:00
farneback_optical_flow.cpp Move non-CV functionality from core.hpp to separate utility.hpp header 2013-03-20 17:56:06 +04:00
generalized_hough.cpp Make imgproc.hpp independent from C API 2013-04-08 15:47:28 +04:00
hog.cpp Revert "Revert "Merge pull request #836 from jet47:gpu-modules"" 2013-06-07 13:05:39 +04:00
houghlines.cpp Move C API of opencv_objdetect to separate file 2013-04-12 14:37:01 +04:00
morphology.cpp Make highgui.hpp independent from C API 2013-04-08 15:47:29 +04:00
multi.cpp Make core/internal.hpp a private header 2013-04-01 17:29:10 +04:00
opengl.cpp Main module headers are moved 1 level up 2013-03-13 17:26:56 +04:00
optical_flow.cpp Move non-CV functionality from core.hpp to separate utility.hpp header 2013-03-20 17:56:06 +04:00
opticalflow_nvidia_api.cpp Revert "Revert "Merge pull request #836 from jet47:gpu-modules"" 2013-06-07 13:05:39 +04:00
pyrlk_optical_flow.cpp Move non-CV functionality from core.hpp to separate utility.hpp header 2013-03-20 17:56:06 +04:00
road.png added gpu HOG sample 2010-11-17 12:49:53 +00:00
rubberwhale1.png [+] Added Brox optical flow (implementation courtesy of Michael Smirnov) 2011-09-29 14:46:39 +00:00
rubberwhale2.png [+] Added Brox optical flow (implementation courtesy of Michael Smirnov) 2011-09-29 14:46:39 +00:00
softcascade.cpp Move non-CV functionality from core.hpp to separate utility.hpp header 2013-03-20 17:56:06 +04:00
stereo_match.cpp Make imgproc.hpp independent from C API 2013-04-08 15:47:28 +04:00
stereo_multi.cpp fixed gpu module compilation 2013-04-09 10:41:35 +04:00
super_resolution.cpp Make highgui.hpp independent from C API 2013-04-08 15:47:29 +04:00
surf_keypoint_matcher.cpp Make highgui.hpp independent from C API 2013-04-08 15:47:29 +04:00
tsucuba_left.png added first version of stereo match sample on gpu 2010-12-21 07:35:46 +00:00
tsucuba_right.png added first version of stereo match sample on gpu 2010-12-21 07:35:46 +00:00
video_reader.cpp Revert "Revert "Merge pull request #836 from jet47:gpu-modules"" 2013-06-07 13:05:39 +04:00
video_writer.cpp Revert "Revert "Merge pull request #836 from jet47:gpu-modules"" 2013-06-07 13:05:39 +04:00