mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-29 05:29:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Olexa Bilaniuk 2015-02-13 08:01:57 -05:00
parent e22678018b
commit e5696bc5e6
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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