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

fixed typo in opencv_stitching

Browse Source
This commit is contained in:
Alexey Spizhevoy 2011-06-17 13:22:38 +00:00
parent 0ec452c152
commit 3be51ded5d
1 changed files with 77 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/stitching/autocalib.cpp
View File

@ -99,19 +99,19 @@ void estimateFocal(const vector<ImageFeatures> &features, const vector<MatchesIn
} }
} }
if (static_cast<int>(all_focals.size()) < num_images - 1) if (static_cast<int>(all_focals.size()) >= num_images - 1)
{ {
LOGLN("Can't estimate focal length, will use anaive approach"); nth_element(all_focals.begin(), all_focals.begin() + all_focals.size()/2, all_focals.end());
for (int i = 0; i < num_images; ++i)
focals[i] = all_focals[all_focals.size()/2];
}
else
{
LOGLN("Can't estimate focal length, will use naive approach");
double focals_sum = 0; double focals_sum = 0;
for (int i = 0; i < num_images; ++i) for (int i = 0; i < num_images; ++i)
focals_sum += features[i].img_size.width + features[i].img_size.height; focals_sum += features[i].img_size.width + features[i].img_size.height;
for (int i = 0; i < num_images; ++i) for (int i = 0; i < num_images; ++i)
focals[i] = focals_sum / num_images; focals[i] = focals_sum / num_images;
} }
else
{
nth_element(all_focals.begin(), all_focals.begin() + all_focals.size()/2, all_focals.end());
for (int i = 0; i < num_images; ++i)
focals[i] = all_focals[all_focals.size()/2];
}
} }