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

Merge branch 2.4

Browse Source
This commit is contained in:
Andrey Kamaev
2012-12-24 17:10:07 +04:00
parent 2128bd25e4 014a500f79
commit 13b6a3a15e
20 changed files with 67 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/stitching/src/autocalib.cpp
View File

@@ -122,7 +122,7 @@ void estimateFocal(const vector<ImageFeatures> &features, const vector<MatchesIn
{
double median;
sort(all_focals.begin(), all_focals.end());
std::sort(all_focals.begin(), all_focals.end());
if (all_focals.size() % 2 == 1)
median = all_focals[all_focals.size() / 2];
else

2
modules/stitching/src/stitcher.cpp
View File

@@ -468,7 +468,7 @@ void Stitcher::estimateCameraParams()
focals.push_back(cameras_[i].focal);
}
sort(focals.begin(), focals.end());
std::sort(focals.begin(), focals.end());
if (focals.size() % 2 == 1)
warped_image_scale_ = static_cast<float>(focals[focals.size() / 2]);
else