Whitespace change reverts to minimize delta w.r.t master.

pull/3670/head
Olexa Bilaniuk 10 years ago
parent e22678018b
commit e5696bc5e6
  1. 8
      modules/calib3d/src/fundam.cpp
  2. 10
      modules/calib3d/src/rhorefc.cpp

@ -398,8 +398,8 @@ 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 )
result = createLMeDSPointSetRegistrator(cb, 4, confidence, maxIters)->run(src, dst, H, tempMask); result = createLMeDSPointSetRegistrator(cb, 4, confidence, maxIters)->run(src, dst, H, tempMask);
@ -408,7 +408,6 @@ cv::Mat cv::findHomography( InputArray _points1, InputArray _points2,
else else
CV_Error(Error::StsBadArg, "Unknown estimation method"); CV_Error(Error::StsBadArg, "Unknown estimation method");
if( result && npoints > 4 && method != RHO) if( result && npoints > 4 && method != RHO)
{ {
compressPoints( src.ptr<Point2f>(), tempMask.ptr<uchar>(), 1, npoints ); compressPoints( src.ptr<Point2f>(), tempMask.ptr<uchar>(), 1, npoints );
@ -419,9 +418,8 @@ cv::Mat cv::findHomography( InputArray _points1, InputArray _points2,
Mat dst1 = dst.rowRange(0, npoints); Mat dst1 = dst.rowRange(0, npoints);
src = src1; src = src1;
dst = dst1; dst = dst1;
if( method == RANSAC || method == LMEDS) if( method == RANSAC || method == LMEDS )
cb->runKernel( src, dst, H ); cb->runKernel( src, dst, H );
Mat H8(8, 1, CV_64F, H.ptr<double>()); Mat H8(8, 1, CV_64F, H.ptr<double>());
createLMSolver(makePtr<HomographyRefineCallback>(src, dst), 10)->run(H8); createLMSolver(makePtr<HomographyRefineCallback>(src, dst), 10)->run(H8);
} }

@ -614,9 +614,9 @@ unsigned RHO_HEST_REFC::rhoRefC(const float* src, /* Source points */
for(ctrl.i=0; ctrl.i < arg.maxI || ctrl.i < 100; ctrl.i++){ for(ctrl.i=0; ctrl.i < arg.maxI || ctrl.i < 100; ctrl.i++){
hypothesize() && verify(); hypothesize() && verify();
} }
/** /**
* Teardown * Teardown
*/ */
@ -624,8 +624,9 @@ unsigned RHO_HEST_REFC::rhoRefC(const float* src, /* Source points */
if(isFinalRefineEnabled() && canRefine()){ if(isFinalRefineEnabled() && canRefine()){
refine(); refine();
} }
outputModel();
finiRun(); outputModel();
finiRun();
return isBestModelGoodEnough() ? best.numInl : 0; return isBestModelGoodEnough() ? best.numInl : 0;
} }
@ -861,7 +862,6 @@ inline int RHO_HEST_REFC::verify(void){
if(isNREnabled()){ if(isNREnabled()){
nStarOptimize(); nStarOptimize();
} }
} }
return 1; return 1;
@ -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);

Loading…
Cancel
Save