Skip to content

O
opencv
Commit e914fc24 authored by Fedor Morozov's avatar Fedor Morozov
Browse files
Options

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

parents 4a4c5190 3c218717
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
modules/photo/doc/hdr_imaging.rst
View file @ e914fc24
...@@ -272,7 +272,7 @@ createMergeDebevec ...@@ -272,7 +272,7 @@ createMergeDebevec
--------------------------- ---------------------------
Creates MergeDebevec object Creates MergeDebevec object
.. ocv:function:: Ptr<MergeDebevec> createMergeDebevec(); .. ocv:function:: Ptr<MergeDebevec> createMergeDebevec()
MergeMertens MergeMertens
--------------------------- ---------------------------
......
modules/python/src2/cv2.cpp
View file @ e914fc24
...@@ -135,6 +135,7 @@ typedef Ptr<Tonemap> Ptr_Tonemap; ...@@ -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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment