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

Conflicts:
	modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
	modules/features2d/doc/common_interfaces_of_descriptor_extractors.rst
	modules/features2d/doc/object_categorization.rst
	modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
	modules/gpu/doc/image_filtering.rst
	modules/gpu/doc/image_processing.rst
	modules/gpu/doc/video.rst
	modules/imgproc/doc/miscellaneous_transformations.rst
	modules/imgproc/doc/object_detection.rst
	modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst
	modules/imgproc/src/samplers.cpp
	modules/ml/doc/k_nearest_neighbors.rst
	modules/nonfree/doc/feature_detection.rst
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/photo/doc/inpainting.rst
	modules/ts/include/opencv2/ts.hpp
	platforms/scripts/camera_build.conf
	samples/android/camera-calibration/AndroidManifest.xml

2013-08-13 12:56:39 +04:00

..

perf_abs.cpp

Normalize line endings and whitespace

2012-10-17 15:32:23 +04:00

perf_addWeighted.cpp

Increased time limits, eliminated extra params

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

perf_arithm.cpp

Increased time limits, eliminated extra params

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

perf_bitwise.cpp

Increased time limits, eliminated extra params

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

perf_compare.cpp

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

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

perf_convertTo.cpp

Switched to TEST_CYCLE_MULTIRUN for fast tests

2013-02-20 17:05:54 +04:00

perf_dft.cpp

Normalize line endings and whitespace

2012-10-17 15:32:23 +04:00

perf_dot.cpp

increased time-limits

2012-11-28 18:17:33 +04:00

perf_inRange.cpp

Normalize line endings and whitespace

2012-10-17 15:32:23 +04:00

perf_main.cpp

Performance testing branch is merged back into trunk

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

perf_mat.cpp

Switched to TEST_CYCLE_MULTIRUN for fast tests

2013-02-20 17:05:54 +04:00

perf_math.cpp

added perf test for kmeans

2012-10-10 12:51:11 +04:00

perf_merge.cpp

Switched to TEST_CYCLE_MULTIRUN for fast tests

2013-02-20 17:05:54 +04:00

perf_minmaxloc.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_norm.cpp

Increased time limits, eliminated extra params

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

perf_precomp.cpp

Performance testing branch is merged back into trunk

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

perf_precomp.hpp

Main module headers are moved 1 level up

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

perf_reduce.cpp

add multiruns to fix "unreliable results" error

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

perf_split.cpp

Switched to TEST_CYCLE_MULTIRUN for fast tests

2013-02-20 17:05:54 +04:00

perf_stat.cpp

Add IPP mean and sum functions

2013-07-25 21:27:35 +04:00