avoid infinite loop in CvLevMarq (thanks to João Lima for the patch; ticket #1839)

ad8258f8 · Vadim Pisarevsky · 563fc2d1 · ad8258f8
Commit ad8258f8 authored Apr 24, 2012 by Vadim Pisarevsky
Hide whitespace changes
Inline Side-by-side

Showing with 18 additions and 14 deletions

calibration.cpp modules/calib3d/src/calibration.cpp +18 -14

No files found.
--- a/modules/calib3d/src/calibration.cpp
+++ b/modules/calib3d/src/calibration.cpp
@@ -166,13 +166,15 @@ bool CvLevMarq::update( const CvMat*& _param, CvMat*& matJ, CvMat*& _err )
    errNorm = cvNorm( err, 0, CV_L2 );
    if( errNorm > prevErrNorm )
    {
-        lambdaLg10++;
+        if( ++lambdaLg10 <= 16 )
-        step();
+        {
-        _param = param;
+            step();
-        cvZero( err );
+            _param = param;
-        _err = err;
+            cvZero( err );
-        state = CHECK_ERR;
+            _err = err;
-        return true;
+            state = CHECK_ERR;
+            return true;
+        }
    }
    lambdaLg10 = MAX(lambdaLg10-1, -16);
@@ -233,13 +235,15 @@ bool CvLevMarq::updateAlt( const CvMat*& _param, CvMat*& _JtJ, CvMat*& _JtErr, d
    assert( state == CHECK_ERR );
    if( errNorm > prevErrNorm )
    {
-        lambdaLg10++;
+        if( ++lambdaLg10 <= 16 )
-        step();
+        {
-        _param = param;
+            step();
-        errNorm = 0;
+            _param = param;
-        _errNorm = &errNorm;
+            errNorm = 0;
-        state = CHECK_ERR;
+            _errNorm = &errNorm;
-        return true;
+            state = CHECK_ERR;
+            return true;
+        }
    }
    lambdaLg10 = MAX(lambdaLg10-1, -16);