generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merged 2.4 into trunk

Browse Source
This commit is contained in:
Vadim Pisarevsky
2012-04-30 14:33:52 +00:00
parent 3f1c6d7357
commit d5a0088bbe
194 changed files with 10158 additions and 8225 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
modules/stitching/perf/perf_stich.cpp
View File

@@ -2,6 +2,7 @@
#include "opencv2/highgui/highgui.hpp"
#include "opencv2/flann/flann.hpp"
#include "opencv2/opencv_modules.hpp"
using namespace std;
using namespace cv;
@@ -16,7 +17,13 @@ using std::tr1::get;
typedef TestBaseWithParam<String> stitch;
typedef TestBaseWithParam<String> match;
PERF_TEST_P(stitch, a123, testing::Values("surf", "orb"))
#if HAVE_OPENCV_NONFREE
#define TEST_DETECTORS testing::Values("surf", "orb")
#else
#define TEST_DETECTORS testing::Values<String>("orb")
#endif
PERF_TEST_P(stitch, a123, TEST_DETECTORS)
{
Mat pano;
@@ -50,7 +57,7 @@ PERF_TEST_P(stitch, a123, testing::Values("surf", "orb"))
}
}
PERF_TEST_P(stitch, b12, testing::Values("surf", "orb"))
PERF_TEST_P(stitch, b12, TEST_DETECTORS)
{
Mat pano;
@@ -83,7 +90,7 @@ PERF_TEST_P(stitch, b12, testing::Values("surf", "orb"))
}
}
PERF_TEST_P( match, bestOf2Nearest, testing::Values("surf", "orb"))
PERF_TEST_P( match, bestOf2Nearest, TEST_DETECTORS)
{
Mat img1, img1_full = imread( getDataPath("stitching/b1.jpg") );
Mat img2, img2_full = imread( getDataPath("stitching/b2.jpg") );