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

Merge remote-tracking branch 'upstream/master' into rho

Browse Source
This commit is contained in:
Olexa Bilaniuk
2015-01-12 02:11:14 -05:00
parent 46631c4b18 28833421ae
commit c175a86cbb
574 changed files with 32158 additions and 74521 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/calib3d/doc/calib3d.rst
View File

@@ -1,8 +0,0 @@
*************************************************
calib3d. Camera Calibration and 3D Reconstruction
*************************************************
.. toctree::
:maxdepth: 2
camera_calibration_and_3d_reconstruction

1910
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
View File

File diff suppressed because it is too large Load Diff

2
modules/calib3d/src/stereobm.cpp
View File

@@ -666,7 +666,7 @@ findStereoCorrespondenceBM( const Mat& left, const Mat& right,
int thresh = minsad + (minsad * uniquenessRatio/100);
for( d = 0; d < ndisp; d++ )
{
if( sad[d] <= thresh && (d < mind-1 || d > mind+1))
if( (d < mind-1 || d > mind+1) && sad[d] <= thresh)
break;
}
if( d < ndisp )