Merge remote-tracking branch 'upstream/3.4' into merge-3.4

This commit is contained in:
Alexander Alekhin
2018-12-05 19:54:52 +00:00
26 changed files with 302 additions and 330 deletions
@@ -35,7 +35,7 @@ int main(int argc, char**argv)
//! [Tonemap HDR image]
Mat ldr;
Ptr<TonemapDurand> tonemap = createTonemapDurand(2.2f);
Ptr<Tonemap> tonemap = createTonemap(2.2f);
tonemap->process(hdr, ldr);
//! [Tonemap HDR image]