Roman Donchenko 4036f6a3d0 Merge remote-tracking branch 'origin/2.4' into merge-2.4 ...

Conflicts:
	apps/CMakeLists.txt
	modules/contrib/CMakeLists.txt
	modules/core/include/opencv2/core/version.hpp
	modules/imgproc/include/opencv2/imgproc/imgproc.hpp
	modules/java/generator/gen_java.py
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/cl_runtime/cl_runtime.cpp
	modules/ocl/src/columnsum.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/test/main.cpp
	modules/ocl/test/test_color.cpp
	modules/ocl/test/test_imgproc.cpp
	samples/gpu/CMakeLists.txt

2013-10-22 14:28:00 +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

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-10-22 14:28:00 +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 pull request #1375 from jet47:gpu-examples-build

2013-10-16 13:22:26 +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