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

Conflicts:
	modules/contrib/src/retina.cpp
	modules/gpu/perf/perf_video.cpp
	modules/gpuoptflow/src/tvl1flow.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_calib3d.cpp
	modules/ocl/perf/perf_color.cpp
	modules/ocl/perf/perf_match_template.cpp
	modules/ocl/src/precomp.hpp
	samples/gpu/stereo_multi.cpp

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

..

main.cpp

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

2013-08-27 19:15:47 +04:00

perf_arithm.cpp

appended ocl::finish to test_cycle defines

2013-08-28 00:39:58 +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

appended ocl::finish to test_cycle defines

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

perf_filters.cpp

appended ocl::finish to test_cycle defines

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

perf_gemm.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_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

appended ocl::finish to test_cycle defines

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

perf_hough.cpp

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

2013-08-19 19:02:36 +04:00

perf_imgproc.cpp

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

2013-09-02 19:44:51 +04: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

appended ocl::finish to test_cycle defines

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

perf_moments.cpp

appended ocl::finish to test_cycle defines

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

perf_norm.cpp

appended ocl::finish to test_cycle defines

2013-08-28 00:39:58 +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-02 19:44:51 +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