Roman Donchenko 2c4bbb313c Merge commit '43aec5ad' into merge-2.4 ...

Conflicts:
	cmake/OpenCVConfig.cmake
	cmake/OpenCVLegacyOptions.cmake
	modules/contrib/src/retina.cpp
	modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
	modules/gpu/doc/video.rst
	modules/gpu/src/speckle_filtering.cpp
	modules/python/src2/cv2.cv.hpp
	modules/python/test/test2.py
	samples/python/watershed.py

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

..

perf_bilateral.cpp

Eliminate the need of ::testsing::ValuesIn() for CV_ENUM

2013-04-15 19:39:49 +04:00

perf_blur.cpp

Merge branch '2.4'

2013-04-17 12:07:17 +04:00

perf_canny.cpp

Remove all using directives for STL namespace and members

2013-02-25 15:04:17 +04:00

perf_cornerEigenValsAndVecs.cpp

Merge commit '43aec5ad' into merge-2.4

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

perf_cornerHarris.cpp

Merge commit '43aec5ad' into merge-2.4

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

perf_cvt_color.cpp

Merge remote-tracking branch 'origin/2.4'

2013-08-06 13:56:49 +04:00

perf_distanceTransform.cpp

disabled whole perf test for distance transform

2012-08-14 13:01:52 +04:00

perf_filter2d.cpp

Merge commit '43aec5ad' into merge-2.4

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

perf_goodFeaturesToTrack.cpp

Remove all using directives for STL namespace and members

2013-02-25 15:04:17 +04:00

perf_histogram.cpp

fixing warning on shadowing local var (TEST_CYCLE_MULTIRUN uses 'r')

2013-07-30 16:42:45 +04:00

perf_houghLines.cpp

Remove all using directives for STL namespace and members

2013-02-25 15:04:17 +04:00

perf_integral.cpp

Increased time limits, eliminated extra params

2013-01-31 16:18:52 +04:00

perf_main.cpp

Performance testing branch is merged back into trunk

2011-09-06 15:30:28 +00:00

perf_matchTemplate.cpp

Merge branch '2.4'

2013-04-17 12:07:17 +04:00

perf_morph.cpp

add multiruns to fix "unreliable results" error

2013-06-13 21:14:42 +04:00

perf_precomp.hpp

Main module headers are moved 1 level up

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

perf_pyramids.cpp

Refactored performance tests. TEST_CYCLE macro is renamed to TEST_CYCLE_N; SIMPLE_TEST_CYCLE is renamed to TEST_CYCLE; from now 100 iterations are default for performance tests

2011-12-29 16:46:16 +00:00

perf_remap.cpp

add multiruns to fix "unreliable results" error

2013-06-13 21:14:42 +04:00

perf_resize.cpp

Merge remote-tracking branch 'origin/2.4'

2013-08-06 13:56:49 +04:00

perf_sepfilters.cpp

Eliminate the need of ::testsing::ValuesIn() for CV_ENUM

2013-04-15 19:39:49 +04:00

perf_threshold.cpp

multiruns added to avoid the 'unreliable results' error

2013-06-26 15:07:39 +04:00

perf_warp.cpp

Normalized file endings.

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