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

Remove all using directives for STL namespace and members

Browse Source 
Made all STL usages explicit to be able automatically find all usages of
particular class or function.
This commit is contained in:
Andrey Kamaev
2013-02-24 20:14:01 +04:00
parent f783f34e0b
commit 2a6fb2867e
310 changed files with 5744 additions and 5964 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,15 +14,15 @@ using std::tr1::get;
#define ORB_MATCH_CONFIDENCE 0.3f
#define WORK_MEGAPIX 0.6
typedef TestBaseWithParam<String> stitch;
typedef TestBaseWithParam<String> match;
typedef std::tr1::tuple<String, int> matchVector_t;
typedef TestBaseWithParam<string> stitch;
typedef TestBaseWithParam<string> match;
typedef std::tr1::tuple<string, int> matchVector_t;
typedef TestBaseWithParam<matchVector_t> matchVector;
#ifdef HAVE_OPENCV_NONFREE_TODO_FIND_WHY_SURF_IS_NOT_ABLE_TO_STITCH_PANOS
#define TEST_DETECTORS testing::Values("surf", "orb")
#else
#define TEST_DETECTORS testing::Values<String>("orb")
#define TEST_DETECTORS testing::Values<string>("orb")
#endif
PERF_TEST_P(stitch, a123, TEST_DETECTORS)
@@ -166,7 +166,7 @@ PERF_TEST_P( matchVector, bestOf2NearestVectorFeatures, testing::Combine(
Ptr<detail::FeaturesFinder> finder;
Ptr<detail::FeaturesMatcher> matcher;
String detectorName = get<0>(GetParam());
string detectorName = get<0>(GetParam());
int featuresVectorSize = get<1>(GetParam());
if (detectorName == "surf")
{