From e5696bc5e6042752f8bce7207ad39e516a923d02 Mon Sep 17 00:00:00 2001 From: Olexa Bilaniuk Date: Fri, 13 Feb 2015 08:01:57 -0500 Subject: [PATCH] Whitespace change reverts to minimize delta w.r.t master. --- modules/calib3d/src/fundam.cpp | 8 +++----- modules/calib3d/src/rhorefc.cpp | 10 +++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/modules/calib3d/src/fundam.cpp b/modules/calib3d/src/fundam.cpp index af7c4dfb0a..5ec12161d6 100644 --- a/modules/calib3d/src/fundam.cpp +++ b/modules/calib3d/src/fundam.cpp @@ -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(), tempMask.ptr(), 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()); createLMSolver(makePtr(src, dst), 10)->run(H8); } diff --git a/modules/calib3d/src/rhorefc.cpp b/modules/calib3d/src/rhorefc.cpp index 2fffadac8a..f60f68a04a 100644 --- a/modules/calib3d/src/rhorefc.cpp +++ b/modules/calib3d/src/rhorefc.cpp @@ -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);