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

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

Browse Source
This commit is contained in:
Fedor Morozov 2013-08-06 17:49:29 +04:00
commit e914fc2471
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/photo/doc/hdr_imaging.rst
View File

@ -272,7 +272,7 @@ createMergeDebevec
--------------------------- ---------------------------
Creates MergeDebevec object Creates MergeDebevec object
.. ocv:function:: Ptr<MergeDebevec> createMergeDebevec(); .. ocv:function:: Ptr<MergeDebevec> createMergeDebevec()
MergeMertens MergeMertens
--------------------------- ---------------------------
@ -324,4 +324,4 @@ References
.. [DM97] P. Debevec, J. Malik, "Recovering High Dynamic Range Radiance Maps from Photographs", 1997. .. [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. .. [MK07] T. Mertens, J. Kautz, F. Van Reeth, "Exposure Fusion", 2007.

1
modules/python/src2/cv2.cpp
View File

@ -135,6 +135,7 @@ typedef Ptr<Tonemap> Ptr_Tonemap;
typedef Ptr<TonemapDrago> Ptr_TonemapDrago; typedef Ptr<TonemapDrago> Ptr_TonemapDrago;
typedef Ptr<TonemapReinhardDevlin> Ptr_TonemapReinhardDevlin; typedef Ptr<TonemapReinhardDevlin> Ptr_TonemapReinhardDevlin;
typedef Ptr<TonemapDurand> Ptr_TonemapDurand; typedef Ptr<TonemapDurand> Ptr_TonemapDurand;
typedef Ptr<TonemapMantiuk> Ptr_TonemapMantiuk;
typedef Ptr<AlignMTB> Ptr_AlignMTB; typedef Ptr<AlignMTB> Ptr_AlignMTB;
typedef Ptr<CalibrateDebevec> Ptr_CalibrateDebevec; typedef Ptr<CalibrateDebevec> Ptr_CalibrateDebevec;
typedef Ptr<MergeDebevec> Ptr_MergeDebevec; typedef Ptr<MergeDebevec> Ptr_MergeDebevec;