Merge pull request #1474 from f-morozov:for_pr
authorRoman Donchenko <roman.donchenko@itseez.com>
Wed, 2 Oct 2013 07:49:51 +0000 (11:49 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 2 Oct 2013 07:49:54 +0000 (11:49 +0400)
1  2 
doc/tutorials/tutorials.rst
modules/python/src2/cv2.cpp

Simple merge
@@@ -135,9 -135,21 +135,22 @@@ typedef Ptr<StereoMatcher> Ptr_StereoMa
  typedef Ptr<StereoBM> Ptr_StereoBM;
  typedef Ptr<StereoSGBM> Ptr_StereoSGBM;
  
+ typedef Ptr<Tonemap> Ptr_Tonemap;
+ typedef Ptr<TonemapDrago> Ptr_TonemapDrago;
+ typedef Ptr<TonemapReinhard> Ptr_TonemapReinhard;
+ typedef Ptr<TonemapDurand> Ptr_TonemapDurand;
+ typedef Ptr<TonemapMantiuk> Ptr_TonemapMantiuk;
+ typedef Ptr<AlignMTB> Ptr_AlignMTB;
+ typedef Ptr<CalibrateDebevec> Ptr_CalibrateDebevec;
+ typedef Ptr<CalibrateRobertson> Ptr_CalibrateRobertson;
+ typedef Ptr<MergeDebevec> Ptr_MergeDebevec;
+ typedef Ptr<MergeRobertson> Ptr_MergeRobertson;
+ typedef Ptr<MergeMertens> Ptr_MergeMertens;
+ typedef Ptr<MergeRobertson> Ptr_MergeRobertson;
  typedef Ptr<cv::softcascade::ChannelFeatureBuilder> Ptr_ChannelFeatureBuilder;
  typedef Ptr<CLAHE> Ptr_CLAHE;
 +typedef Ptr<LineSegmentDetector > Ptr_LineSegmentDetector;
  
  typedef SimpleBlobDetector::Params SimpleBlobDetector_Params;