mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-26 20:20:20 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
4c102112dd
opencv/samples/gpu
History
Alexander Alekhin e845184843 Merge remote-tracking branch 'upstream/2.4' into merge-2.4 
* #1538 from StevenPuttemans:bugfix_3283
* #1545 from alalek:ocl_test_fix_rng
* #1551 from alalek:cmake_install_win
* #1570 from ilya-lavrenov:ipp_warn_fix
* #1573 from alalek:perf_simple_strategy
* #1574 from alalek:svm_workaround
* #1576 from alalek:ocl_fix_cl_double
* #1577 from ilya-lavrenov:ocl_setto_opencl12
* #1578 from asmorkalov:android_fd_cp_fix
* #1579 from ilya-lavrenov:ocl_norm
* #1582 from sperrholz:ocl-arithm-additions
* #1586 from ilya-lavrenov:ocl_setto_win_fix
* #1589 from ilya-lavrenov:pr1582_fix
* #1591 from alalek:ocl_remove_cl_hpp_h
* #1592 from alalek:ocl_program_cache_update
* #1593 from ilya-lavrenov:ocl_war_on_double
* #1594 from ilya-lavrenov:ocl_perf
* #1595 from alalek:cl_code_cleanup
* #1596 from alalek:test_fix_run_py
* #1597 from alalek:ocl_fix_cleanup
* #1598 from alalek:ocl_fix_build_mac
* #1599 from ilya-lavrenov:ocl_mac_kernel_warnings
* #1601 from ilya-lavrenov:ocl_fix_tvl1_and_sparse
* #1602 from alalek:ocl_test_dump_info
* #1603 from ilya-lavrenov:ocl_disable_svm_noblas
* #1605 from alalek:ocl_fixes
* #1606 from ilya-lavrenov:ocl_imgproc
* #1607 from ilya-lavrenov:ocl_fft_cleanup
* #1608 from alalek:fix_warn_upd_haar
* #1609 from ilya-lavrenov:ocl_some_optimization
* #1610 from alalek:ocl_fix_perf_kalman
* #1612 from alalek:ocl_fix_string_info
* #1614 from ilya-lavrenov:ocl_svm_misprint
* #1616 from ilya-lavrenov:ocl_cvtColor
* #1617 from ilya-lavrenov:ocl_info
* #1622 from a0byte:2.4
* #1625 from ilya-lavrenov:to_string

Conflicts:
	cmake/OpenCVConfig.cmake
	cmake/OpenCVDetectPython.cmake
	cmake/OpenCVGenConfig.cmake
	modules/core/CMakeLists.txt
	modules/nonfree/src/surf.ocl.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/include/opencv2/ocl/private/util.hpp
	modules/ocl/perf/main.cpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/cl_operations.cpp
	modules/ocl/src/cl_programcache.cpp
	modules/ocl/src/color.cpp
	modules/ocl/src/fft.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/gemm.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/matrix_operations.cpp
	modules/ocl/src/pyrlk.cpp
	modules/ocl/src/split_merge.cpp
	modules/ocl/src/svm.cpp
	modules/ocl/test/main.cpp
	modules/ocl/test/test_fft.cpp
	modules/ocl/test/test_moments.cpp
	modules/ocl/test/test_objdetect.cpp
	modules/ocl/test/test_optflow.cpp
	modules/ocl/test/utility.hpp
	modules/python/CMakeLists.txt
	modules/ts/include/opencv2/ts.hpp
	modules/ts/src/ts_perf.cpp
	samples/android/face-detection/jni/DetectionBasedTracker_jni.cpp
2013-10-15 20:08:52 +04:00
..
performance Merge remote-tracking branch 'upstream/2.4' into merge-2.4 2013-10-15 20:08:52 +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 renamed gpuimgproc -> cudaimgproc 2013-09-02 14:00:43 +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 renamed gpubgsegm -> cudabgsegm 2013-09-02 14:00:43 +04:00
brox_optical_flow.cpp renamed gpuoptflow -> cudaoptflow 2013-09-02 14:00:43 +04:00
cascadeclassifier_nvidia_api.cpp replaced GPU -> CUDA 2013-09-02 14:00:44 +04:00
cascadeclassifier.cpp replaced GPU -> CUDA 2013-09-02 14:00:44 +04:00
CMakeLists.txt Merge remote-tracking branch 'upstream/2.4' into merge-2.4 2013-10-15 20:08:52 +04:00
driver_api_multi.cpp replaced GPU -> CUDA 2013-09-02 14:00:44 +04:00
driver_api_stereo_multi.cpp renamed gpustereo -> cudastereo 2013-09-02 14:00:42 +04:00
farneback_optical_flow.cpp renamed gpuoptflow -> cudaoptflow 2013-09-02 14:00:43 +04:00
generalized_hough.cpp renamed gpuimgproc -> cudaimgproc 2013-09-02 14:00:43 +04:00
hog.cpp renmaed gpu module -> cuda 2013-09-02 14:00:44 +04:00
houghlines.cpp renamed gpuimgproc -> cudaimgproc 2013-09-02 14:00:43 +04:00
morphology.cpp renamed gpuimgproc -> cudaimgproc 2013-09-02 14:00:43 +04:00
multi.cpp replaced GPU -> CUDA 2013-09-02 14:00:44 +04:00
opengl.cpp renamed gpu* source to cuda* in core module 2013-09-02 14:00:42 +04:00
optical_flow.cpp replaced GPU -> CUDA 2013-09-02 14:00:44 +04:00
opticalflow_nvidia_api.cpp renamed gpulegacy -> cudalegacy 2013-09-02 14:00:42 +04:00
pyrlk_optical_flow.cpp renamed gpuoptflow -> cudaoptflow 2013-09-02 14:00:43 +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 renmaed gpu module -> cuda 2013-09-02 14:00:44 +04:00
stereo_match.cpp renamed gpustereo -> cudastereo 2013-09-02 14:00:42 +04:00
stereo_multi.cpp Merge branch 'master' into gpu-cuda-rename 2013-09-06 15:44:44 +04:00
super_resolution.cpp Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-10-08 17:57:23 +04:00
surf_keypoint_matcher.cpp replaced GPU -> CUDA 2013-09-02 14:00:44 +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 replaced GPU -> CUDA 2013-09-02 14:00:44 +04:00
video_writer.cpp fixed video_writer sample 2013-09-02 14:00:44 +04:00