Merge pull request #3222 from dmitrygribanov:dg/2.4-stitching-wave-correction-bugfix

2014-09-17 10:54:02 +00:00 · 2014-09-17 10:54:02 +00:00 · c5de129c36
commit c5de129c36
parent 533dd85299 8a1d3929cc
1 changed files with 8 additions and 1 deletions
--- a/modules/stitching/src/motion_estimators.cpp
+++ b/modules/stitching/src/motion_estimators.cpp
@ -616,7 +616,14 @@ void waveCorrect(vector<Mat> &rmats, WaveCorrectKind kind)
    for (size_t i = 0; i < rmats.size(); ++i)
        img_k += rmats[i].col(2);
    Mat rg0 = rg1.cross(img_k);
-    rg0 /= norm(rg0);
+    double rg0_norm = norm(rg0);
+
+    if( rg0_norm <= DBL_MIN )
+    {
+        return;
+    }
+
+    rg0 /= rg0_norm;

    Mat rg2 = rg0.cross(rg1);