Merge branch 2.4

2012-11-30 19:52:59 +04:00
parent 50bebd6f0b f6ca38a579
commit e10ee89ec4
194 changed files with 1359 additions and 147098 deletions
--- a/modules/features2d/perf/perf_batchDistance.cpp
+++ b/modules/features2d/perf/perf_batchDistance.cpp
@@ -92,6 +92,7 @@ PERF_TEST_P(Source_CrossCheck, batchDistance_L2,

    generateData(queryDescriptors, trainDescriptors, sourceType);

+    declare.time(50);
    TEST_CYCLE()
    {
        batchDistance(queryDescriptors, trainDescriptors, dist, CV_32F, (isCrossCheck) ? ndix : noArray(),
@@ -118,6 +119,7 @@ PERF_TEST_P(Norm_CrossCheck, batchDistance_32F,
    Mat ndix;

    generateData(queryDescriptors, trainDescriptors, CV_32F);
+    declare.time(100);

    TEST_CYCLE()
    {