From: Christian Richardt <christian@richardt.name>
Date: Wed, 13 May 2015 14:28:14 +0000 (+0200)
Subject: Fixed triangulation bug http://code.opencv.org/issues/4334.
X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~2462^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cbaf0ecaf6a785b6f2f929bd1c6c3028320a8ee9;p=platform%2Fupstream%2Fopencv.git

Fixed triangulation bug code.opencv.org/issues/4334.
---

diff --git a/modules/calib3d/src/triangulate.cpp b/modules/calib3d/src/triangulate.cpp
index a19f96d..0fa5e3d 100644
--- a/modules/calib3d/src/triangulate.cpp
+++ b/modules/calib3d/src/triangulate.cpp
@@ -82,8 +82,8 @@ cvTriangulatePoints(CvMat* projMatr1, CvMat* projMatr2, CvMat* projPoints1, CvMa
         CV_Error( CV_StsUnmatchedSizes, "Size of projection matrices must be 3x4" );
 
     // preallocate SVD matrices on stack
-    cv::Matx<double, 6, 4> matrA;
-    cv::Matx<double, 6, 4> matrU;
+    cv::Matx<double, 4, 4> matrA;
+    cv::Matx<double, 4, 4> matrU;
     cv::Matx<double, 4, 1> matrW;
     cv::Matx<double, 4, 4> matrV;
 
@@ -101,9 +101,8 @@ cvTriangulatePoints(CvMat* projMatr1, CvMat* projMatr2, CvMat* projPoints1, CvMa
             y = cvmGet(projPoints[j],1,i);
             for( int k = 0; k < 4; k++ )
             {
-                matrA(j*3+0, k) = x * cvmGet(projMatrs[j],2,k) -     cvmGet(projMatrs[j],0,k);
-                matrA(j*3+1, k) = y * cvmGet(projMatrs[j],2,k) -     cvmGet(projMatrs[j],1,k);
-                matrA(j*3+2, k) = x * cvmGet(projMatrs[j],1,k) - y * cvmGet(projMatrs[j],0,k);
+                matrA(j*2+0, k) = x * cvmGet(projMatrs[j],2,k) - cvmGet(projMatrs[j],0,k);
+                matrA(j*2+1, k) = y * cvmGet(projMatrs[j],2,k) - cvmGet(projMatrs[j],1,k);
             }
         }
         /* Solve system for current point */