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

Conflicts:
	modules/contrib/src/retina.cpp
	modules/core/include/opencv2/core/mat.hpp
	modules/core/src/algorithm.cpp
	modules/core/src/arithm.cpp
	modules/features2d/src/features2d_init.cpp
	modules/gpu/include/opencv2/gpu/gpu.hpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/imgproc/src/generalized_hough.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/video/src/tvl1flow.cpp
	modules/video/src/video_init.cpp

2014-01-14 11:53:59 +04:00

..

main.cpp

core/ocl: temporary move device selection from ocl module

2013-12-25 16:17:40 +04:00

test_api.cpp

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

2013-12-16 15:02:12 +04:00

test_arithm.cpp

OCL: included sqrt matrix operation.

2013-12-12 08:57:27 -02:00

test_bgfg.cpp

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

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

test_blend.cpp

ocl: fix testdata for blendLinear

2013-11-01 14:44:13 +04:00

test_brute_force_matcher.cpp

Some hacks to build and run OpenCL on Qualcomm S800.

2013-11-22 16:13:38 +04:00

test_calib3d.cpp

fixing typo

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

test_canny.cpp

deleted extra semicolons

2014-01-07 02:52:30 +04:00

test_color.cpp

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

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

test_fast.cpp

OCL: including FAST feature detector.

2013-12-11 21:23:27 -02:00

test_fft.cpp

added cv::dft T-API test

2013-12-19 13:42:16 +04:00

test_filters.cpp

Some hacks to build and run OpenCL on Qualcomm S800.

2013-11-22 16:13:38 +04:00

test_gemm.cpp

fixing typo

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

test_hough.cpp

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

2013-10-15 20:08:52 +04:00

test_imgproc.cpp

Merge pull request #1744 from liuxing6666:2.4_fix_harris_test

2013-12-02 20:38:49 +04:00

test_kalman.cpp

fixing typo

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

test_kmeans.cpp

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

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

test_match_template.cpp

deleted extra semicolons

2014-01-07 02:52:30 +04:00

test_matrix_operation.cpp

fixing typo

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

test_mean_shift.cpp

fixing typo

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

test_ml.cpp

Revert "disable SVM when AMD BLAS is not available"

2013-11-05 15:13:30 +04:00

test_moments.cpp

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

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

test_objdetect.cpp

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

2014-01-14 11:53:59 +04:00

test_optflow.cpp

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

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

test_orb.cpp

OCL: included ORB featured detector/descriptor extractor.

2013-12-26 22:36:24 -02:00

test_precomp.hpp

core/ocl: temporary move device selection from ocl module

2013-12-25 16:17:40 +04:00

test_pyramids.cpp

fixing typo

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

test_sort.cpp

fixing typo

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

test_split_merge.cpp

Some hacks to build and run OpenCL on Qualcomm S800.

2013-11-22 16:13:38 +04:00

test_warp.cpp

added INTER_AREA interpolation to ocl::resize

2013-11-18 18:28:49 +04:00

utility.cpp

OCL: included ORB featured detector/descriptor extractor.

2013-12-26 22:36:24 -02:00

utility.hpp

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

2014-01-14 11:53:59 +04:00