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

Drop cv:: prefix from cv::String used inside the cv namespace

Browse Source
This commit is contained in:
Andrey Kamaev
2013-03-22 20:37:49 +04:00
parent 75513a46dc
commit be7bbe3aa9
122 changed files with 1077 additions and 1077 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/stitching/include/opencv2/stitching/detail/motion_estimators.hpp
View File

@@ -190,7 +190,7 @@ void CV_EXPORTS waveCorrect(std::vector<Mat> &rmats, WaveCorrectKind kind);
// Auxiliary functions
// Returns matches graph representation in DOT language
cv::String CV_EXPORTS matchesGraphAsString(std::vector<cv::String> &pathes, std::vector<MatchesInfo> &pairwise_matches,
String CV_EXPORTS matchesGraphAsString(std::vector<String> &pathes, std::vector<MatchesInfo> &pairwise_matches,
float conf_threshold);
std::vector<int> CV_EXPORTS leaveBiggestComponent(std::vector<ImageFeatures> &features, std::vector<MatchesInfo> &pairwise_matches,

2
modules/stitching/include/opencv2/stitching/detail/util.hpp
View File

@@ -56,7 +56,7 @@
#include <android/log.h>
#define LOG_STITCHING_MSG(msg) \
do { \
cv::Stringstream _os; \
Stringstream _os; \
_os << msg; \
__android_log_print(ANDROID_LOG_DEBUG, "STITCHING", "%s", _os.str().c_str()); \
} while(0);

14
modules/stitching/src/motion_estimators.cpp
View File

@@ -653,7 +653,7 @@ void waveCorrect(std::vector<Mat> &rmats, WaveCorrectKind kind)
//////////////////////////////////////////////////////////////////////////////
cv::String matchesGraphAsString(std::vector<cv::String> &pathes, std::vector<MatchesInfo> &pairwise_matches,
String matchesGraphAsString(std::vector<String> &pathes, std::vector<MatchesInfo> &pairwise_matches,
float conf_threshold)
{
std::stringstream str;
@@ -685,14 +685,14 @@ cv::String matchesGraphAsString(std::vector<cv::String> &pathes, std::vector<Mat
std::pair<int,int> edge = *itr;
if (span_tree_edges.find(edge) != span_tree_edges.end())
{
cv::String name_src = pathes[edge.first];
String name_src = pathes[edge.first];
size_t prefix_len = name_src.find_last_of("/\\");
if (prefix_len != cv::String::npos) prefix_len++; else prefix_len = 0;
if (prefix_len != String::npos) prefix_len++; else prefix_len = 0;
name_src = name_src.substr(prefix_len, name_src.size() - prefix_len);
cv::String name_dst = pathes[edge.second];
String name_dst = pathes[edge.second];
prefix_len = name_dst.find_last_of("/\\");
if (prefix_len != cv::String::npos) prefix_len++; else prefix_len = 0;
if (prefix_len != String::npos) prefix_len++; else prefix_len = 0;
name_dst = name_dst.substr(prefix_len, name_dst.size() - prefix_len);
int pos = edge.first*num_images + edge.second;
@@ -707,9 +707,9 @@ cv::String matchesGraphAsString(std::vector<cv::String> &pathes, std::vector<Mat
{
if (comps.size[comps.findSetByElem((int)i)] == 1)
{
cv::String name = pathes[i];
String name = pathes[i];
size_t prefix_len = name.find_last_of("/\\");
if (prefix_len != cv::String::npos) prefix_len++; else prefix_len = 0;
if (prefix_len != String::npos) prefix_len++; else prefix_len = 0;
name = name.substr(prefix_len, name.size() - prefix_len);
str << "\"" << name.c_str() << "\";\n";
}