1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-21 19:33:03 +04:00

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

This commit is contained in:
Alexander Alekhin
2022-02-19 21:04:35 +00:00
6 changed files with 57 additions and 19 deletions
+2 -2
View File
@@ -587,8 +587,8 @@ void DpSeamFinder::computeGradients(const Mat &image1, const Mat &image2)
bool DpSeamFinder::hasOnlyOneNeighbor(int comp)
{
std::set<std::pair<int, int> >::iterator begin, end;
begin = lower_bound(edges_.begin(), edges_.end(), std::make_pair(comp, std::numeric_limits<int>::min()));
end = upper_bound(edges_.begin(), edges_.end(), std::make_pair(comp, std::numeric_limits<int>::max()));
begin = edges_.lower_bound(std::make_pair(comp, std::numeric_limits<int>::min()));
end = edges_.upper_bound(std::make_pair(comp, std::numeric_limits<int>::max()));
return ++begin == end;
}