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

Conflicts:
	modules/imgproc/src/opencl/integral_sqrsum.cl
	modules/nonfree/doc/feature_detection.rst
	modules/nonfree/include/opencv2/nonfree/ocl.hpp
	modules/nonfree/src/surf_ocl.cpp
	modules/nonfree/test/test_features2d.cpp
	modules/ocl/doc/image_processing.rst
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_imgproc.cpp
	modules/ocl/perf/perf_match_template.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/match_template.cpp
	modules/ocl/src/opencl/haarobjectdetect.cl
	modules/ocl/src/opencl/haarobjectdetect_scaled2.cl
	modules/ocl/test/test_imgproc.cpp

2014-03-31 14:42:00 +04:00

..

perf_main.cpp

Merge pull request #2527 from apavlenko:ocl_surf_24

2014-03-26 19:03:44 +04:00

perf_precomp.hpp

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

2014-03-24 19:02:16 +04:00

perf_surf.cpp

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

2014-03-31 14:42:00 +04:00

perf_surf.cuda.cpp

replaced GPU -> CUDA

2013-09-02 14:00:44 +04:00

perf_surf.ocl.cpp

rewrote perf tests for SURF

2014-02-03 02:00:29 +04:00