Fixed solvePnPRansac minInliers parameter changed to confidence in OpenCV3

This commit is contained in:
matlabbe
2015-07-27 16:13:34 -04:00
parent 1d926fe867
commit c717020405
4 changed files with 16 additions and 3 deletions

View File

@@ -244,6 +244,7 @@ Transform OdometryBOW::computeTransform(
UASSERT(data.stereoCameraModel().isValid() || (data.cameraModels().size() == 1 && data.cameraModels()[0].isValid())); UASSERT(data.stereoCameraModel().isValid() || (data.cameraModels().size() == 1 && data.cameraModels()[0].isValid()));
const CameraModel & cameraModel = data.stereoCameraModel().isValid()?data.stereoCameraModel().left():data.cameraModels()[0]; const CameraModel & cameraModel = data.stereoCameraModel().isValid()?data.stereoCameraModel().left():data.cameraModels()[0];
UDEBUG("");
t = util3d::estimateMotion3DTo2D( t = util3d::estimateMotion3DTo2D(
localMap_, localMap_,
newSignature->getWords(), newSignature->getWords(),

View File

@@ -259,7 +259,11 @@ Transform OdometryOpticalFlow::computeTransform(
true, true,
this->getIterations(), this->getIterations(),
this->getPnPReprojError(), this->getPnPReprojError(),
0, #if CV_MAJOR_VERSION < 3
0, // min inliers
#else
0.99, // confidence
#endif
inliersV, inliersV,
this->getPnPFlags()); this->getPnPFlags());

View File

@@ -459,7 +459,11 @@ std::multimap<int, pcl::PointXYZ> generateWords3DMono(
true, true,
pnpIterations, pnpIterations,
pnpReprojError, pnpReprojError,
0, #if CV_MAJOR_VERSION < 3
0, // min inliers
#else
0.99, // confidence
#endif
inliersV, inliersV,
pnpFlags); pnpFlags);

View File

@@ -110,7 +110,11 @@ Transform estimateMotion3DTo2D(
true, true,
iterations, iterations,
reprojError, reprojError,
0, #if CV_MAJOR_VERSION < 3
0, // min inliers
#else
0.99, // confidence
#endif
inliers, inliers,
flagsPnP); flagsPnP);