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

removed preset parameter in createStereoBM, updated stereo_match sample

Browse Source
This commit is contained in:
Vadim Pisarevsky
2013-03-02 02:17:49 +04:00
parent b6efe30527
commit df89f30b4a
4 changed files with 37 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/calib3d/include/opencv2/calib3d/calib3d.hpp
View File

@@ -677,10 +677,9 @@ public:
OutputArray disparity ) = 0;
};
enum { STEREO_DISP_SCALE=16, STEREO_PREFILTER_NORMALIZED_RESPONSE = 0, STEREO_PREFILTER_XSOBEL = 1,
STEREOBM_BASIC_PRESET=0, STEREOBM_FISH_EYE_PRESET=1, STEREOBM_NARROW_PRESET=2 };
enum { STEREO_DISP_SCALE=16, STEREO_PREFILTER_NORMALIZED_RESPONSE = 0, STEREO_PREFILTER_XSOBEL = 1 };
CV_EXPORTS Ptr<StereoMatcher> createStereoBM(int preset, int numDisparities=0, int SADWindowSize=21);
CV_EXPORTS Ptr<StereoMatcher> createStereoBM(int numDisparities=0, int SADWindowSize=21);
CV_EXPORTS Ptr<StereoMatcher> createStereoSGBM(int minDisparity, int numDisparities, int SADWindowSize,
int P1=0, int P2=0, int disp12MaxDiff=0,
@@ -695,9 +694,7 @@ class CV_EXPORTS_W StereoBM
{
public:
enum { PREFILTER_NORMALIZED_RESPONSE = 0, PREFILTER_XSOBEL = 1,
BASIC_PRESET=STEREOBM_BASIC_PRESET,
FISH_EYE_PRESET=STEREOBM_FISH_EYE_PRESET,
NARROW_PRESET=STEREOBM_NARROW_PRESET };
BASIC_PRESET=0, FISH_EYE_PRESET=1, NARROW_PRESET=2 };
//! the default constructor
CV_WRAP StereoBM();

5
modules/calib3d/src/compat_stereo.cpp
View File

@@ -95,8 +95,7 @@ void cvFindStereoCorrespondenceBM( const CvArr* leftarr, const CvArr* rightarr,
CV_Assert( state != 0 );
cv::Ptr<cv::StereoMatcher> sm = cv::createStereoBM(cv::STEREOBM_BASIC_PRESET,
state->numberOfDisparities,
cv::Ptr<cv::StereoMatcher> sm = cv::createStereoBM(state->numberOfDisparities,
state->SADWindowSize);
sm->set("preFilterType", state->preFilterType);
sm->set("preFilterSize", state->preFilterSize);
@@ -130,7 +129,7 @@ namespace cv
{
StereoBM::StereoBM()
{ init(STEREOBM_BASIC_PRESET); }
{ init(BASIC_PRESET); }
StereoBM::StereoBM(int _preset, int _ndisparities, int _SADWindowSize)
{ init(_preset, _ndisparities, _SADWindowSize); }

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

@@ -54,7 +54,7 @@ namespace cv
struct StereoBMParams
{
StereoBMParams(int _preset=STEREOBM_BASIC_PRESET, int _numDisparities=64, int _SADWindowSize=21)
StereoBMParams(int _numDisparities=64, int _SADWindowSize=21)
{
preFilterType = STEREO_PREFILTER_XSOBEL;
preFilterSize = 9;
@@ -780,9 +780,9 @@ public:
params = StereoBMParams();
}
StereoBMImpl( int _preset, int _numDisparities, int _SADWindowSize )
StereoBMImpl( int _numDisparities, int _SADWindowSize )
{
params = StereoBMParams(_preset, _numDisparities, _SADWindowSize);
params = StereoBMParams(_numDisparities, _SADWindowSize);
}
void compute( InputArray leftarr, InputArray rightarr, OutputArray disparr )
@@ -927,9 +927,9 @@ CV_INIT_ALGORITHM(StereoBMImpl, "StereoMatcher.BM",
}
cv::Ptr<cv::StereoMatcher> cv::createStereoBM(int _preset, int _numDisparities, int _SADWindowSize)
cv::Ptr<cv::StereoMatcher> cv::createStereoBM(int _numDisparities, int _SADWindowSize)
{
return new StereoBMImpl(_preset, _numDisparities, _SADWindowSize);
return new StereoBMImpl(_numDisparities, _SADWindowSize);
}
/* End of file. */