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

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
 ---------------------------
@@ -324,4 +324,4 @@ References
 
 .. [DM97] P. Debevec, J. Malik, "Recovering High Dynamic Range Radiance Maps from Photographs", 1997.
 
-.. [MK07] T. Mertens, J. Kautz, F. Van Reeth, "Exposure Fusion", 2007.
\ No newline at end of file
+.. [MK07] T. Mertens, J. Kautz, F. Van Reeth, "Exposure Fusion", 2007.

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;