Roman Donchenko 4cf9990d4e Merge remote-tracking branch 'origin/2.4' into merge-2.4 ...

Conflicts:
	doc/tutorials/definitions/noContent.rst
	doc/tutorials/gpu/gpu-basics-similarity/gpu-basics-similarity.rst
	doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.rst
	doc/tutorials/introduction/how_to_write_a_tutorial/how_to_write_a_tutorial.rst
	modules/core/include/opencv2/core/core.hpp
	modules/core/include/opencv2/core/internal.hpp
	modules/core/include/opencv2/core/version.hpp
	modules/gpu/CMakeLists.txt
	modules/highgui/perf/perf_output.cpp
	modules/highgui/test/test_video_io.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/main.cpp
	modules/ocl/src/hog.cpp
	modules/ocl/src/initialization.cpp
	modules/ocl/src/moments.cpp
	modules/ocl/src/opencl/moments.cl
	modules/ocl/test/main.cpp
	modules/ocl/test/test_moments.cpp
	modules/python/test/test.py
	modules/ts/include/opencv2/ts/ts_perf.hpp
	modules/ts/src/precomp.hpp
	modules/ts/src/ts_perf.cpp

2013-07-03 19:53:21 +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 branch '2.4'

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

perf_cornerHarris.cpp

Merge branch '2.4'

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

perf_cvt_color.cpp

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

2013-07-03 19:53:21 +04:00

perf_distanceTransform.cpp

disabled whole perf test for distance transform

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

perf_filter2d.cpp

Merge branch '2.4'

2013-04-17 12:07:17 +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

CPU implementation of CLAHE

2013-03-25 17:44:31 +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.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_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' into merge-2.4

2013-07-03 19:53:21 +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

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

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