opencv/gpu at aa3c36f545542b6c7f792a04426dd97ae7dba157 - opencv - Atria-soft GIT

generic-library/opencv

History

Roman Donchenko 95a55453df Merge remote-tracking branch 'origin/2.4' into merge-2.4

Conflicts:
	modules/calib3d/perf/perf_pnp.cpp
	modules/contrib/src/imagelogpolprojection.cpp
	modules/contrib/src/templatebuffer.hpp
	modules/core/perf/opencl/perf_gemm.cpp
	modules/cudafeatures2d/doc/feature_detection_and_description.rst
	modules/cudafeatures2d/perf/perf_features2d.cpp
	modules/cudafeatures2d/src/fast.cpp
	modules/cudafeatures2d/test/test_features2d.cpp
	modules/features2d/doc/feature_detection_and_description.rst
	modules/features2d/include/opencv2/features2d/features2d.hpp
	modules/features2d/perf/opencl/perf_brute_force_matcher.cpp
	modules/gpu/include/opencv2/gpu/gpu.hpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/gpu/perf4au/main.cpp
	modules/imgproc/perf/opencl/perf_blend.cpp
	modules/imgproc/perf/opencl/perf_color.cpp
	modules/imgproc/perf/opencl/perf_moments.cpp
	modules/imgproc/perf/opencl/perf_pyramid.cpp
	modules/objdetect/perf/opencl/perf_hogdetect.cpp
	modules/ocl/perf/perf_arithm.cpp
	modules/ocl/perf/perf_bgfg.cpp
	modules/ocl/perf/perf_blend.cpp
	modules/ocl/perf/perf_brute_force_matcher.cpp
	modules/ocl/perf/perf_canny.cpp
	modules/ocl/perf/perf_filters.cpp
	modules/ocl/perf/perf_gftt.cpp
	modules/ocl/perf/perf_haar.cpp
	modules/ocl/perf/perf_imgproc.cpp
	modules/ocl/perf/perf_imgwarp.cpp
	modules/ocl/perf/perf_match_template.cpp
	modules/ocl/perf/perf_matrix_operation.cpp
	modules/ocl/perf/perf_ml.cpp
	modules/ocl/perf/perf_moments.cpp
	modules/ocl/perf/perf_opticalflow.cpp
	modules/ocl/perf/perf_precomp.hpp
	modules/ocl/src/cl_context.cpp
	modules/ocl/src/opencl/haarobjectdetect.cl
	modules/video/src/lkpyramid.cpp
	modules/video/src/precomp.hpp
	samples/gpu/morphology.cpp

2014-03-11 17:20:01 +04:00

..

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

2014-02-03 13:23:59 +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 remote-tracking branch 'origin/2.4' into merge-2.4

2014-02-03 13:23:59 +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

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

2014-03-11 17:20:01 +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

Deleted an assignment to a variable that doesn't exist.

2014-02-14 14:37:56 +04:00

surf_keypoint_matcher.cpp

DescriptorExtractor: added defaultNorm() to return default norm type.

2013-12-09 09:54:42 -02: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