Roman Donchenko 81eb4bd8be Merge remote-tracking branch 'origin/2.4' ...

Conflicts:
	doc/tutorials/features2d/feature_detection/feature_detection.rst
	modules/bioinspired/doc/retina/index.rst
	modules/core/include/opencv2/core/core.hpp
	modules/core/include/opencv2/core/mat.hpp
	modules/core/include/opencv2/core/operations.hpp
	modules/core/src/stat.cpp
	modules/features2d/include/opencv2/features2d/features2d.hpp
	modules/imgproc/src/filter.cpp
	modules/legacy/src/dpstereo.cpp
	modules/nonfree/src/surf.ocl.cpp
	modules/ocl/doc/image_processing.rst
	modules/ocl/doc/object_detection.rst
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/include/opencv2/ocl/private/util.hpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/canny.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/initialization.cpp
	modules/ocl/src/matrix_operations.cpp
	modules/ocl/src/pyrdown.cpp
	modules/ocl/src/pyrup.cpp
	modules/ocl/src/split_merge.cpp
	modules/ocl/test/test_objdetect.cpp
	modules/ocl/test/utility.hpp

2013-10-01 15:57:33 +04:00

..

main.cpp

OCL: tests: repair/disable failed tests in ocl module

2013-08-22 17:06:47 +04:00

test_arithm.cpp

refactored arithm.cpp. Extended param list for all the tests

2013-09-24 14:13:10 +04:00

test_bgfg.cpp

Merge remote-tracking branch 'origin/2.4'

2013-10-01 15:57:33 +04:00

test_blend.cpp

Normalized file endings.

2013-08-21 18:59:25 +04:00

test_brute_force_matcher.cpp

Deleted all trailing whitespace.

2013-08-21 18:59:24 +04:00

test_calib3d.cpp

Renamed ocl tests' precomp files according to convention.

2013-08-08 18:18:54 +04:00

test_canny.cpp

Normalized file endings.

2013-08-21 18:59:25 +04:00

test_color.cpp

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

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

test_fft.cpp

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

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

test_filters.cpp

add adaptive bilateral filter (cpp and ocl version)

2013-08-29 10:48:15 +08:00

test_gemm.cpp

Renamed ocl tests' precomp files according to convention.

2013-08-08 18:18:54 +04:00

test_hough.cpp

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

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

test_imgproc.cpp

Merge remote-tracking branch 'origin/2.4'

2013-10-01 15:57:33 +04:00

test_kalman.cpp

Removed whitespace.

2013-09-09 17:00:33 +08:00

test_kmeans.cpp

Merge commit '43aec5ad' into merge-2.4

2013-08-27 13:26:44 +04:00

test_match_template.cpp

removed useless output

2013-09-15 22:04:22 +04:00

test_matrix_operation.cpp

fixed ocl::oclMat::setTo for 2-channel images

2013-09-20 15:57:38 +04:00

test_ml.cpp

Fix new blank line at EOF.

2013-09-30 16:20:43 +08:00

test_moments.cpp

removed gpu name usage from ocl module

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

test_norm.cpp

added a test for ocl::norm

2013-08-22 17:37:48 +04:00

test_objdetect.cpp

removed useless output

2013-09-15 22:04:22 +04:00

test_optflow.cpp

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

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

test_precomp.hpp

Merge remote-tracking branch 'origin/2.4'

2013-10-01 15:57:33 +04:00

test_pyramids.cpp

added CV_16UC(1, 3, 4), CV_16SC(1, 3, 4) data types support in ocl::pyrUp and ocl::pyrDown

2013-09-10 17:36:18 +04:00

test_sort.cpp

Deleted all trailing whitespace.

2013-08-21 18:59:24 +04:00

test_split_merge.cpp

fixed ocl::merge in case of 2 and types CV_32S and CV_32F

2013-09-09 16:12:01 +04:00

utility.cpp

Merge branch 'master' into gpu-cuda-rename

2013-09-11 09:41:23 +04:00

utility.hpp

Merge remote-tracking branch 'origin/2.4'

2013-10-01 15:57:33 +04:00