Roman Donchenko 464a010f53 Merge remote-tracking branch 'origin/2.4' into merge-2.4 ...

Conflicts:
	modules/core/include/opencv2/core/operations.hpp
	modules/core/include/opencv2/core/version.hpp
	modules/core/src/gpumat.cpp
	modules/cudaimgproc/src/color.cpp
	modules/features2d/src/orb.cpp
	modules/imgproc/src/samplers.cpp
	modules/ocl/include/opencv2/ocl/matrix_operations.hpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	samples/ocl/facedetect.cpp

2013-12-10 12:51:00 +04:00

..

main.cpp

perf: test-based metrics collection strategy

2013-12-03 18:43:50 +04:00

perf_arithm.cpp

ocl: perf tests: skip tests if we fail check for maxMemoryAllocSize

2013-11-13 14:17:57 +04:00

perf_bgfg.cpp

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

2013-10-28 13:38:25 +04:00

perf_blend.cpp

fixed and generalized ocl::blendLinear

2013-10-28 23:56:40 +04:00

perf_brute_force_matcher.cpp

Merge pull request #1687 from bitwangyaoyao:2.4_fix

2013-10-29 11:03:34 +04:00

perf_calib3d.cpp

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

2013-10-28 13:38:25 +04:00

perf_canny.cpp

fixing typo

2013-10-25 18:00:46 +04:00

perf_color.cpp

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

2013-11-26 15:05:26 +04:00

perf_fft.cpp

fixing typo

2013-10-25 18:00:46 +04:00

perf_filters.cpp

ocl: perf tests: skip tests if we fail check for maxMemoryAllocSize

2013-11-13 14:17:57 +04:00

perf_gemm.cpp

fixing typo

2013-10-25 18:00:46 +04:00

perf_gftt.cpp

fixing typo

2013-10-25 18:00:46 +04:00

perf_haar.cpp

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

2013-11-11 16:55:36 +04:00

perf_hog.cpp

fixing typo

2013-10-25 18:00:46 +04:00

perf_hough.cpp

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

2013-11-05 16:38:23 +04:00

perf_imgproc.cpp

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

2013-11-19 16:21:09 +04:00

perf_imgwarp.cpp

added area fast mode to ocl::resize

2013-11-19 13:43:50 +04:00

perf_kalman.cpp

fixing typo

2013-10-25 18:00:46 +04:00

perf_match_template.cpp

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

2013-11-19 16:21:09 +04:00

perf_matrix_operation.cpp

ocl: perf tests: skip tests if we fail check for maxMemoryAllocSize

2013-11-13 14:17:57 +04:00

perf_ml.cpp

fixing typo

2013-10-25 18:00:46 +04:00

perf_moments.cpp

ocl:perf: fix moments test for plain impl

2013-12-03 16:02:55 +04:00

perf_norm.cpp

fixing typo

2013-10-25 18:00:46 +04:00

perf_opticalflow.cpp

fixing typo

2013-10-25 18:00:46 +04:00

perf_precomp.hpp

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

2013-11-19 16:21:09 +04:00

perf_pyramid.cpp

ocl: perf tests: skip tests if we fail check for maxMemoryAllocSize

2013-11-13 14:17:57 +04:00

perf_split_merge.cpp

ocl: perf tests: skip tests if we fail check for maxMemoryAllocSize

2013-11-13 14:17:57 +04:00