Updated stitcher a little bit

2011-10-21 10:47:48 +00:00
parent 4685f0e9d6
commit b8304ce764
3 changed files with 207 additions and 152 deletions
--- a/modules/stitching/src/motion_estimators.cpp
+++ b/modules/stitching/src/motion_estimators.cpp
@@ -132,7 +132,7 @@ void HomographyBasedEstimator::estimate(const vector<ImageFeatures> &features, c
    // Estimate focal length and set it for all cameras
    vector<double> focals;
    estimateFocal(features, pairwise_matches, focals);
-    cameras.resize(num_images);
+    cameras.assign(num_images, CameraParams());
    for (int i = 0; i < num_images; ++i)
        cameras[i].focal = focals[i];

@@ -612,7 +612,6 @@ void waveCorrect(vector<Mat> &rmats, WaveCorrectKind kind)
    {
        for (size_t i = 0; i < rmats.size(); ++i)
            conf -= rg1.dot(rmats[i].col(0));
-        cout << conf << endl;
        if (conf < 0)
        {
            rg0 *= -1;