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

Conflicts:
	cmake/OpenCVDetectOpenCL.cmake
	cmake/OpenCVModule.cmake
	modules/imgproc/src/floodfill.cpp
	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/blend.cpp
	modules/ocl/src/build_warps.cpp
	modules/ocl/src/canny.cpp
	modules/ocl/src/cl_programcache.hpp
	modules/ocl/src/columnsum.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/hog.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/initialization.cpp
	modules/ocl/src/match_template.cpp
	modules/ocl/src/matrix_operations.cpp
	modules/ocl/src/mcwutil.cpp
	modules/ocl/src/moments.cpp
	modules/ocl/src/mssegmentation.cpp
	modules/ocl/src/precomp.hpp
	modules/ocl/src/pyrdown.cpp
	modules/ocl/src/pyrlk.cpp
	modules/ocl/src/pyrup.cpp
	modules/ocl/src/split_merge.cpp
	modules/ocl/src/stereo_csbp.cpp
	modules/ocl/src/stereobm.cpp
	modules/ocl/test/main.cpp
	samples/ocl/bgfg_segm.cpp
	samples/ocl/facedetect.cpp
	samples/ocl/pyrlk_optical_flow.cpp
	samples/ocl/squares.cpp
	samples/ocl/stereo_match.cpp
	samples/ocl/surf_matcher.cpp
	samples/ocl/tvl1_optical_flow.cpp

2013-10-08 17:57:23 +04:00

..

main.cpp

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

2013-10-08 17:57:23 +04:00

perf_arithm.cpp

removed ocl::magnitudeSqr

2013-09-24 13:39:07 +04:00

perf_bgfg.cpp

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

2013-10-08 17:57:23 +04:00

perf_blend.cpp

appended ocl::finish to test_cycle defines

2013-08-28 00:39:58 +04:00

perf_brute_force_matcher.cpp

enabled some tests that failed before OCL_TEST_CYCLE*() macroses were defined and for some tests was disabled SANITY_CHECK, because plain and ocl results must not be completely equal

2013-08-29 18:39:09 +04:00

perf_calib3d.cpp

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

2013-09-02 19:44:51 +04:00

perf_canny.cpp

enabled some tests that failed before OCL_TEST_CYCLE*() macroses were defined and for some tests was disabled SANITY_CHECK, because plain and ocl results must not be completely equal

2013-08-29 18:39:09 +04:00

perf_color.cpp

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

2013-09-02 19:44:51 +04:00

perf_fft.cpp

enabled gemm and dft erf test

2013-09-04 20:02:02 +04:00

perf_filters.cpp

increased time limit for bilateral filter performance tests

2013-09-09 18:16:53 +04:00

perf_gemm.cpp

enabled gemm and dft erf test

2013-09-04 20:02:02 +04:00

perf_gftt.cpp

appended ocl::finish to test_cycle defines

2013-08-28 00:39:58 +04:00

perf_haar.cpp

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

2013-09-02 19:44:51 +04:00

perf_hog.cpp

fixed HOG perf test

2013-09-09 17:16:47 +04:00

perf_hough.cpp

added plain branch to HoughCircle perf test

2013-10-04 19:51:26 +04:00

perf_imgproc.cpp

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

2013-10-08 17:57:23 +04:00

perf_kalman.cpp

Revised the code according to the feedback of the community.

2013-09-12 09:43:30 +08:00

perf_match_template.cpp

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

2013-09-02 19:44:51 +04:00

perf_matrix_operation.cpp

ocl: perf test: disable MOG2 (random hungs), enable upload/download

2013-10-01 16:49:11 +04:00

perf_ml.cpp

Added knearest neighbor of OpenCL version.

2013-09-22 10:23:54 +08:00

perf_moments.cpp

appended ocl::finish to test_cycle defines

2013-08-28 00:39:58 +04:00

perf_norm.cpp

enabled ocl::norm perf test

2013-10-02 16:57:15 +04:00

perf_opticalflow.cpp

enabled some tests that failed before OCL_TEST_CYCLE*() macroses were defined and for some tests was disabled SANITY_CHECK, because plain and ocl results must not be completely equal

2013-08-29 18:39:09 +04:00

perf_precomp.hpp

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

2013-09-10 11:30:19 +04:00

perf_pyramid.cpp

appended ocl::finish to test_cycle defines

2013-08-28 00:39:58 +04:00

perf_split_merge.cpp

appended ocl::finish to test_cycle defines

2013-08-28 00:39:58 +04:00