mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-07 17:44:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #23740 from Peekabooc:4.x

Browse Source 
fixing typo in stitching parameter names
This commit is contained in:
Alexander Smorkalov 2023-06-09 13:40:02 +03:00 committed by GitHub
commit 0c8e6e0e68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -353,7 +353,7 @@ void CV_EXPORTS_W waveCorrect(CV_IN_OUT std::vector<Mat> &rmats, WaveCorrectKind
// Auxiliary functions // Auxiliary functions
// Returns matches graph representation in DOT language // Returns matches graph representation in DOT language
String CV_EXPORTS_W matchesGraphAsString(std::vector<String> &pathes, std::vector<MatchesInfo> &pairwise_matches, String CV_EXPORTS_W matchesGraphAsString(std::vector<String> &paths, std::vector<MatchesInfo> &pairwise_matches,
float conf_threshold); float conf_threshold);
CV_EXPORTS_W std::vector<int> leaveBiggestComponent( CV_EXPORTS_W std::vector<int> leaveBiggestComponent(

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

@ -1018,13 +1018,13 @@ void waveCorrect(std::vector<Mat> &rmats, WaveCorrectKind kind)
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
String matchesGraphAsString(std::vector<String> &pathes, std::vector<MatchesInfo> &pairwise_matches, String matchesGraphAsString(std::vector<String> &paths, std::vector<MatchesInfo> &pairwise_matches,
float conf_threshold) float conf_threshold)
{ {
std::stringstream str; std::stringstream str;
str << "graph matches_graph{\n"; str << "graph matches_graph{\n";
const int num_images = static_cast<int>(pathes.size()); const int num_images = static_cast<int>(paths.size());
std::set<std::pair<int,int> > span_tree_edges; std::set<std::pair<int,int> > span_tree_edges;
DisjointSets comps(num_images); DisjointSets comps(num_images);
@ -1050,12 +1050,12 @@ String matchesGraphAsString(std::vector<String> &pathes, std::vector<MatchesInfo
std::pair<int,int> edge = *itr; std::pair<int,int> edge = *itr;
if (span_tree_edges.find(edge) != span_tree_edges.end()) if (span_tree_edges.find(edge) != span_tree_edges.end())
{ {
String name_src = pathes[edge.first]; String name_src = paths[edge.first];
size_t prefix_len = name_src.find_last_of("/\\"); size_t prefix_len = name_src.find_last_of("/\\");
if (prefix_len != 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); name_src = name_src.substr(prefix_len, name_src.size() - prefix_len);
String name_dst = pathes[edge.second]; String name_dst = paths[edge.second];
prefix_len = name_dst.find_last_of("/\\"); prefix_len = name_dst.find_last_of("/\\");
if (prefix_len != 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); name_dst = name_dst.substr(prefix_len, name_dst.size() - prefix_len);
@ -1072,7 +1072,7 @@ String matchesGraphAsString(std::vector<String> &pathes, std::vector<MatchesInfo
{ {
if (comps.size[comps.findSetByElem((int)i)] == 1) if (comps.size[comps.findSetByElem((int)i)] == 1)
{ {
String name = pathes[i]; String name = paths[i];
size_t prefix_len = name.find_last_of("/\\"); size_t prefix_len = name.find_last_of("/\\");
if (prefix_len != 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); name = name.substr(prefix_len, name.size() - prefix_len);