From 85bef283757ec5047770b1cc9d27c195adc993e7 Mon Sep 17 00:00:00 2001 From: James Graves Date: Tue, 26 Jan 2016 10:00:06 -0600 Subject: [PATCH] Remove erroneous ColView() calls. Commit 9360634c0c8f1646cd60caf2418eace3fa4a4db3 inserted calls to ColView() when not needed, causing out-of-bounds errors. This fixes the unit tests. --- gocv/gocv_calib3d.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gocv/gocv_calib3d.go b/gocv/gocv_calib3d.go index 5326402..0368a22 100644 --- a/gocv/gocv_calib3d.go +++ b/gocv/gocv_calib3d.go @@ -24,11 +24,11 @@ func GcvInitCameraMatrix2D(objPts, imgPts *mat64.Dense, dims [2]int, imgPtsVec := NewGcvPoint2f32Vector(int64(nObjPts)) for j := 0; j < nObjPts; j++ { - objPtsVec.Set(j, NewGcvPoint3f32(mat64.Col(nil,j,objPts.ColView(j))...)) + objPtsVec.Set(j, NewGcvPoint3f32(mat64.Col(nil, j, objPts)...)) } for j := 0; j < nObjPts; j++ { - imgPtsVec.Set(j, NewGcvPoint2f32( mat64.Col(nil,j,imgPts.ColView(j))...)) + imgPtsVec.Set(j, NewGcvPoint2f32(mat64.Col(nil, j, imgPts)...)) } _imgSize := NewGcvSize2i(dims[0], dims[1]) @@ -52,11 +52,11 @@ func GcvCalibrateCamera(objPts, imgPts, camMat, distCoeffs *mat64.Dense, imgPtsVec := NewGcvPoint2f32Vector(int64(nObjPts)) for j := 0; j < nObjPts; j++ { - objPtsVec.Set(j, NewGcvPoint3f32(mat64.Col(nil,j,objPts.ColView(j))...)) + objPtsVec.Set(j, NewGcvPoint3f32(mat64.Col(nil, j, objPts)...)) } for j := 0; j < nObjPts; j++ { - imgPtsVec.Set(j, NewGcvPoint2f32(mat64.Col(nil,j,imgPts.ColView(j))...)) + imgPtsVec.Set(j, NewGcvPoint2f32(mat64.Col(nil, j, imgPts)...)) } _camMat := Mat64ToGcvMat(camMat)