Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
e5696bc5
Commit
e5696bc5
authored
Feb 13, 2015
by
Olexa Bilaniuk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Whitespace change reverts to minimize delta w.r.t master.
parent
e2267801
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
10 deletions
+8
-10
fundam.cpp
modules/calib3d/src/fundam.cpp
+3
-5
rhorefc.cpp
modules/calib3d/src/rhorefc.cpp
+5
-5
No files found.
modules/calib3d/src/fundam.cpp
View file @
e5696bc5
...
...
@@ -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
);
}
...
...
modules/calib3d/src/rhorefc.cpp
View file @
e5696bc5
...
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment