Marina Kolpakova 37a63523e7 fixed merge problem

2012-06-28 17:54:08 +00:00

..

perf_arithm.cpp

created wrappers for new NPP functions

2012-02-22 10:00:53 +00:00

perf_calib3d.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_features2d.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_filters.cpp

updated image for StereoConstantSpaceBP regression test

2012-03-07 09:49:24 +00:00

perf_imgproc.cpp

merged GPU scan

2012-06-28 16:00:38 +00:00

perf_main.cpp

created wrappers for new NPP functions

2012-02-22 10:00:53 +00:00

perf_matop.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_objdetect.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_precomp.cpp

…

perf_precomp.hpp

Merged the trunk r8589:8653 - all changes related to build warnings

2012-06-15 13:04:17 +00:00

perf_utility.cpp

…

perf_utility.hpp

Merged the trunk r8575:8583 (INTER_AREA interpolation for GPU resize)

2012-06-15 08:52:08 +00:00

perf_video.cpp

merged the trunk r8735:8766, r8769, r8777:8780, r8790 and r8800:8811

2012-06-28 17:07:17 +00:00