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

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

@ -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 );
@ -421,7 +420,6 @@ cv::Mat cv::findHomography( InputArray _points1, InputArray _points2,
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,6 +624,7 @@ 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;
@ -861,7 +862,6 @@ inline int RHO_HEST_REFC::verify(void){
if(isNREnabled()){ if(isNREnabled()){
nStarOptimize(); nStarOptimize();
} }
} }
return 1; return 1;

Loading…
Cancel
Save