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

Conflicts:
	modules/core/test/test_arithm.cpp
	modules/cuda/src/cascadeclassifier.cpp
	modules/imgproc/doc/geometric_transformations.rst
	modules/objdetect/src/hog.cpp
	modules/ocl/perf/perf_imgproc.cpp
	modules/ocl/src/gftt.cpp
	modules/ocl/src/moments.cpp

2014-04-14 16:08:02 +04:00

..

ocl

BFMatcher

2014-01-22 15:31:26 +04:00

test_brisk.cpp

Merge commit '43aec5ad' into merge-2.4

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

test_descriptors_regression.cpp

fixed warnings

2013-10-08 12:46:43 +04:00

test_detectors_regression.cpp

Boring changes - features2d.

2013-09-05 18:26:44 +04:00

test_fast.cpp

cv::norm -> cvtest::norm in tests

2014-04-08 14:49:20 +04:00

test_keypoints.cpp

Boring changes - features2d.

2013-09-05 18:26:44 +04:00

test_main.cpp

reworked nearly all of the OpenCV tests (except for opencv_gpu tests) - they now use the Google Test engine.

2011-02-09 20:55:11 +00:00

test_matchers_algorithmic.cpp

Main module headers are moved 1 level up

2013-03-13 17:26:56 +04:00

test_mser.cpp

Merge commit '43aec5ad' into merge-2.4

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

test_nearestneighbors.cpp

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

2014-04-14 16:08:02 +04:00

test_orb.cpp

Main module headers are moved 1 level up

2013-03-13 17:26:56 +04:00

test_precomp.hpp

Move border type constants and Moments class to core module

2013-04-10 19:14:24 +04:00

test_rotation_and_scale_invariance.cpp

DescriptorExtractor: added defaultNorm() to return default norm type.

2013-12-09 09:54:42 -02:00