Roman Donchenko 5e0e1fac87 Merge commit 'b51a1a7d' (PR #895 from 2.4) ...

Conflicts:
	modules/ocl/CMakeLists.txt
	modules/ocl/perf/perf_color.cpp
	modules/ocl/perf/perf_match_template.cpp
	modules/ocl/perf/precomp.cpp
	modules/ocl/perf/precomp.hpp

2013-05-22 18:28:28 +04:00

..

main.cpp

Add ocl::PlatformName to ocl::Info.

2013-04-25 15:00:50 +08:00

precomp.cpp

merged ocl module from ocl branch (it's not quite usable yet; at least on Mac)

2012-07-16 17:08:14 +00:00

precomp.hpp

Merge remote-tracking branch 'origin/2.4'

2013-05-21 17:19:23 +04:00

test_arithm.cpp

fix warnings, unify test names

2013-05-09 17:57:13 +08:00

test_blend.cpp

fix warnings, unify test names

2013-05-09 17:57:13 +08:00

test_brute_force_matcher.cpp

Merge remote-tracking branch 'origin/2.4'

2013-05-21 17:19:23 +04:00

test_calib3d.cpp

Merge pull request #839 from pengx17:2.4_ocl_csbp

2013-05-14 15:56:07 +04:00

test_canny.cpp

Remove my test codes.

2013-04-12 16:21:52 +08:00

test_color.cpp

Merge remote-tracking branch 'origin/2.4'

2013-05-21 17:19:23 +04:00

test_columnsum.cpp

fix warnings, unify test names

2013-05-09 17:57:13 +08:00

test_fft.cpp

Merge remote-tracking branch 'origin/2.4'

2013-05-21 17:19:23 +04:00

test_filters.cpp

fix warnings, unify test names

2013-05-09 17:57:13 +08:00

test_gemm.cpp

fix the waring in gemm test

2013-05-17 13:19:09 +08:00

test_haar.cpp

Merge remote-tracking branch 'origin/2.4'

2013-05-21 17:19:23 +04:00

test_hog.cpp

Merge remote-tracking branch 'origin/2.4'

2013-05-21 17:19:23 +04:00

test_hough.cpp

Move C API of opencv_calib3d to separate file

2013-04-11 21:00:17 +04:00

test_imgproc.cpp

Merge remote-tracking branch 'origin/2.4'

2013-05-21 17:19:23 +04:00

test_match_template.cpp

fix warnings, unify test names

2013-05-09 17:57:13 +08:00

test_matrix_operation.cpp

fix warnings, unify test names

2013-05-09 17:57:13 +08:00

test_moments.cpp

Merge remote-tracking branch 'origin/2.4'

2013-05-21 17:19:23 +04:00

test_optflow.cpp

add OpticalFlowDual_TVL1_OCL function

2013-05-17 15:34:22 +08:00

test_pyrdown.cpp

fix warnings, unify test names

2013-05-09 17:57:13 +08:00

test_pyrup.cpp

Merge remote-tracking branch 'origin/2.4'

2013-05-21 17:19:23 +04:00

test_split_merge.cpp

fix warnings, unify test names

2013-05-09 17:57:13 +08:00

utility.cpp

Make imgproc.hpp independent from C API

2013-04-08 15:47:28 +04:00

utility.hpp

Merge remote-tracking branch 'origin/2.4'

2013-05-21 17:19:23 +04:00