Merge branch 'master' of https://github.com/f-morozov/opencv

12 years ago · e914fc2471
parent 4a4c5190f0 3c218717a9
commit e914fc2471
2 changed files with 3 additions and 2 deletions
--- a/modules/photo/doc/hdr_imaging.rst
+++ b/modules/photo/doc/hdr_imaging.rst
@ -272,7 +272,7 @@ createMergeDebevec
 ---------------------------
 Creates MergeDebevec object

-.. ocv:function:: Ptr<MergeDebevec> createMergeDebevec();
+.. ocv:function:: Ptr<MergeDebevec> createMergeDebevec()

 MergeMertens
 ---------------------------
--- a/modules/python/src2/cv2.cpp
+++ b/modules/python/src2/cv2.cpp
@ -135,6 +135,7 @@ typedef Ptr<Tonemap> Ptr_Tonemap;
 typedef Ptr<TonemapDrago> Ptr_TonemapDrago;
 typedef Ptr<TonemapReinhardDevlin> Ptr_TonemapReinhardDevlin;
 typedef Ptr<TonemapDurand> Ptr_TonemapDurand;
+typedef Ptr<TonemapMantiuk> Ptr_TonemapMantiuk;
 typedef Ptr<AlignMTB> Ptr_AlignMTB;
 typedef Ptr<CalibrateDebevec> Ptr_CalibrateDebevec;
 typedef Ptr<MergeDebevec> Ptr_MergeDebevec;