Skip to content

Commit d502f4c

Browse files
committed
Merge pull request #3284 from alalek:aruco_merge_fixes
2 parents 7b77c35 + 911ab34 commit d502f4c

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

modules/aruco/src/aruco.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1227,6 +1227,7 @@ void estimatePoseSingleMarkers(InputArrayOfArrays _corners, float markerLength,
12271227
Ptr<EstimateParameters> estimateParameters) {
12281228

12291229
CV_Assert(markerLength > 0);
1230+
CV_Assert(estimateParameters);
12301231

12311232
Mat markerObjPoints;
12321233
_getSingleMarkerObjectPoints(markerLength, markerObjPoints, *estimateParameters);
@@ -1243,7 +1244,7 @@ void estimatePoseSingleMarkers(InputArrayOfArrays _corners, float markerLength,
12431244

12441245
for (int i = begin; i < end; i++) {
12451246
solvePnP(markerObjPoints, _corners.getMat(i), _cameraMatrix, _distCoeffs, rvecs.at<Vec3d>(i),
1246-
tvecs.at<Vec3d>(i), estimateParameters->solvePnPMethod);
1247+
tvecs.at<Vec3d>(i), estimateParameters->useExtrinsicGuess, estimateParameters->solvePnPMethod);
12471248
}
12481249
});
12491250

0 commit comments

Comments
 (0)