generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bug fixes in mask output.

Browse Source 
Previously, the output mask of inliers could remain completely
uninitialized. This fix is the first part of a solution.
This commit is contained in:
Olexa Bilaniuk 2015-02-05 02:18:41 -05:00
parent b90800f0c7
commit 87c2b8197a
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -286,7 +286,7 @@ static bool createAndRunRHORegistrator(double confidence,
OutputArray _tempMask){
Mat src = _src.getMat();
Mat dst = _dst.getMat();
Mat tempMask = _tempMask.getMat();
Mat tempMask;
bool result;
double beta = 0.35;/* 0.35 is a value that often works. */
@ -294,10 +294,7 @@ static bool createAndRunRHORegistrator(double confidence,
Mat tmpH = Mat(3, 3, CV_32FC1);
/* Create output mask. */
if(!tempMask.data){
tempMask = Mat(npoints, 1, CV_8U);
}
tempMask = Mat(npoints, 1, CV_8U);
/**
* Make use of the RHO estimator API.

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

@ -512,6 +512,9 @@ static inline int sacInitRun(RHO_HEST_REFC* p){
return 0;
}
memset(p->best.inl, 0, p->arg.N);
memset(p->curr.inl, 0, p->arg.N);
/**
* LevMarq workspace alloc.
*
@ -1155,6 +1158,9 @@ static inline void sacUpdateBounds(RHO_HEST_REFC* p){
static inline void sacOutputModel(RHO_HEST_REFC* p){
if(sacIsBestModelGoodEnough(p)){
memcpy(p->arg.finalH, p->best.H, HSIZE);
if(p->arg.inl != p->best.inl){
memcpy(p->arg.inl, p->best.inl, p->arg.N);
}
}else{
sacOutputZeroH(p);
}