Merge pull request #692 from vpisarev:refactor_calib3d_stereo
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Tue, 26 Mar 2013 14:38:15 +0000 (18:38 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 26 Mar 2013 14:38:16 +0000 (18:38 +0400)
1  2 
modules/calib3d/src/stereobm.cpp
modules/calib3d/test/test_stereomatching.cpp
modules/gpu/perf/perf_calib3d.cpp
modules/python/src2/cv2.cpp

Simple merge
Simple merge
@@@ -126,11 -128,11 +126,15 @@@ typedef Ptr<FeatureDetector> Ptr_Featur
  typedef Ptr<DescriptorExtractor> Ptr_DescriptorExtractor;
  typedef Ptr<Feature2D> Ptr_Feature2D;
  typedef Ptr<DescriptorMatcher> Ptr_DescriptorMatcher;
 +typedef Ptr<BackgroundSubtractor> Ptr_BackgroundSubtractor;
 +typedef Ptr<BackgroundSubtractorMOG> Ptr_BackgroundSubtractorMOG;
 +typedef Ptr<BackgroundSubtractorMOG2> Ptr_BackgroundSubtractorMOG2;
 +typedef Ptr<BackgroundSubtractorGMG> Ptr_BackgroundSubtractorGMG;
  
+ typedef Ptr<StereoMatcher> Ptr_StereoMatcher;
+ typedef Ptr<StereoBM> Ptr_StereoBM;
+ typedef Ptr<StereoSGBM> Ptr_StereoSGBM;
  typedef Ptr<cv::softcascade::ChannelFeatureBuilder> Ptr_ChannelFeatureBuilder;
  
  typedef SimpleBlobDetector::Params SimpleBlobDetector_Params;