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

Fix sacCalcJacobianErrors arguments. (curr.inl replaced with best.inl)

Browse Source 
Fix the issue given NULL inlMask
This commit is contained in:
Hamid Bazargani 2015-02-13 00:38:19 -05:00
parent e22678018b
commit 44f906eb35
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/calib3d/src/fundam.cpp
View File

@ -398,7 +398,7 @@ cv::Mat cv::findHomography( InputArray _points1, InputArray _points2,
{ {
tempMask = Mat::ones(npoints, 1, CV_8U); tempMask = Mat::ones(npoints, 1, CV_8U);
result = cb->runKernel(src, dst, H) > 0; result = cb->runKernel(src, dst, H) > 0;
} }
else if( method == RANSAC) else if( method == RANSAC)
result = createRANSACPointSetRegistrator(cb, 4, ransacReprojThreshold, confidence, maxIters)->run(src, dst, H, tempMask); result = createRANSACPointSetRegistrator(cb, 4, ransacReprojThreshold, confidence, maxIters)->run(src, dst, H, tempMask);
else if( method == LMEDS ) else if( method == LMEDS )

6
modules/calib3d/src/rhorefc.cpp
View File

@ -624,8 +624,8 @@ unsigned RHO_HEST_REFC::rhoRefC(const float* src, /* Source points */
if(isFinalRefineEnabled() && canRefine()){ if(isFinalRefineEnabled() && canRefine()){
refine(); refine();
} }
outputModel(); outputModel();
finiRun(); finiRun();
return isBestModelGoodEnough() ? best.numInl : 0; return isBestModelGoodEnough() ? best.numInl : 0;
} }
@ -1346,7 +1346,7 @@ inline void RHO_HEST_REFC::nStarOptimize(void){
*/ */
inline void RHO_HEST_REFC::updateBounds(void){ inline void RHO_HEST_REFC::updateBounds(void){
arg.maxI = sacCalcIterBound(arg.cfd, arg.maxI = sacCalcIterBound(arg.cfd,
(double)best.numInl/arg.N, (double)best.numInl/arg.N,
SMPL_SIZE, SMPL_SIZE,
arg.maxI); arg.maxI);