diff --git a/modules/stitching/include/opencv2/stitching/detail/motion_estimators.hpp b/modules/stitching/include/opencv2/stitching/detail/motion_estimators.hpp index 95919ea0095560544b89ed51174355b6011cc4a3..c03aa520906b2b117bdcb58c3fa4e72e92f2d96c 100644 --- a/modules/stitching/include/opencv2/stitching/detail/motion_estimators.hpp +++ b/modules/stitching/include/opencv2/stitching/detail/motion_estimators.hpp @@ -353,8 +353,8 @@ void CV_EXPORTS_W waveCorrect(CV_IN_OUT std::vector &rmats, WaveCorrectKind // Auxiliary functions // Returns matches graph representation in DOT language -String CV_EXPORTS_W matchesGraphAsString(std::vector &pathes, std::vector &pairwise_matches, - float conf_threshold); +String CV_EXPORTS_W matchesGraphAsString(std::vector &paths, std::vector &pairwise_matches, + float conf_threshold); CV_EXPORTS_W std::vector leaveBiggestComponent( std::vector &features, diff --git a/modules/stitching/src/motion_estimators.cpp b/modules/stitching/src/motion_estimators.cpp index 29616a4915b657f7d5ebba922d50f7f870a520df..dfe929f9ba629a9adf6d43bb70b408b1012ef8df 100644 --- a/modules/stitching/src/motion_estimators.cpp +++ b/modules/stitching/src/motion_estimators.cpp @@ -1018,13 +1018,13 @@ void waveCorrect(std::vector &rmats, WaveCorrectKind kind) ////////////////////////////////////////////////////////////////////////////// -String matchesGraphAsString(std::vector &pathes, std::vector &pairwise_matches, - float conf_threshold) +String matchesGraphAsString(std::vector &paths, std::vector &pairwise_matches, + float conf_threshold) { std::stringstream str; str << "graph matches_graph{\n"; - const int num_images = static_cast(pathes.size()); + const int num_images = static_cast(paths.size()); std::set > span_tree_edges; DisjointSets comps(num_images); @@ -1050,12 +1050,12 @@ String matchesGraphAsString(std::vector &pathes, std::vector edge = *itr; 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("/\\"); if (prefix_len != String::npos) prefix_len++; else prefix_len = 0; 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("/\\"); if (prefix_len != String::npos) prefix_len++; else prefix_len = 0; name_dst = name_dst.substr(prefix_len, name_dst.size() - prefix_len); @@ -1072,7 +1072,7 @@ String matchesGraphAsString(std::vector &pathes, std::vector