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

Merge pull request #256 from znah:2.4

Browse Source
This commit is contained in:
Andrey Kamaev 2012-12-24 16:11:19 +04:00 committed by OpenCV Buildbot
commit 014a500f79
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/calib3d/src/calibration.cpp
View File

@ -2778,17 +2778,13 @@ CV_IMPL int cvStereoRectifyUncalibrated(
cvPerspectiveTransform( _m1, _m1, &H0 ); cvPerspectiveTransform( _m1, _m1, &H0 );
cvPerspectiveTransform( _m2, _m2, &H2 ); cvPerspectiveTransform( _m2, _m2, &H2 );
CvMat A = cvMat( 1, npoints, CV_64FC3, lines1 ), BxBy, B; CvMat A = cvMat( 1, npoints, CV_64FC3, lines1 ), BxBy, B;
double a[9], atb[3], x[3]; double x[3];
CvMat AtA = cvMat( 3, 3, CV_64F, a );
CvMat AtB = cvMat( 3, 1, CV_64F, atb );
CvMat X = cvMat( 3, 1, CV_64F, x ); CvMat X = cvMat( 3, 1, CV_64F, x );
cvConvertPointsHomogeneous( _m1, &A ); cvConvertPointsHomogeneous( _m1, &A );
cvReshape( &A, &A, 1, npoints ); cvReshape( &A, &A, 1, npoints );
cvReshape( _m2, &BxBy, 1, npoints ); cvReshape( _m2, &BxBy, 1, npoints );
cvGetCol( &BxBy, &B, 0 ); cvGetCol( &BxBy, &B, 0 );
cvGEMM( &A, &A, 1, 0, 0, &AtA, CV_GEMM_A_T ); cvSolve( &A, &B, &X, CV_SVD );
cvGEMM( &A, &B, 1, 0, 0, &AtB, CV_GEMM_A_T );
cvSolve( &AtA, &AtB, &X, CV_SVD_SYM );
double ha[] = double ha[] =
{ {