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

Merge pull request #1079 from AlexeySpizhevoy:master

Browse Source
This commit is contained in:
Andrey Pavlenko
2013-08-05 10:54:43 +04:00
committed by OpenCV Buildbot
parent 8a3aa1f5b6 dcb049df6a
commit 4c03afe006
6 changed files with 79 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
samples/cpp/stitching_detailed.cpp
View File

@@ -469,7 +469,11 @@ int main(int argc, char* argv[])
HomographyBasedEstimator estimator;
vector<CameraParams> cameras;
estimator(features, pairwise_matches, cameras);
if (!estimator(features, pairwise_matches, cameras))
{
cout << "Homography estimation failed.\n";
return -1;
}
for (size_t i = 0; i < cameras.size(); ++i)
{
@@ -495,7 +499,11 @@ int main(int argc, char* argv[])
if (ba_refine_mask[3] == 'x') refine_mask(1,1) = 1;
if (ba_refine_mask[4] == 'x') refine_mask(1,2) = 1;
adjuster->setRefinementMask(refine_mask);
(*adjuster)(features, pairwise_matches, cameras);
if (!(*adjuster)(features, pairwise_matches, cameras))
{
cout << "Camera parameters adjusting failed.\n";
return -1;
}
// Find median focal length