OSSForks/opencv
1
0
Fork 0
mirror of https://github.com/zebrajr/opencv.git synced 2026-01-15 12:15:17 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Alexander Alekhin
2018-12-05 19:54:52 +00:00
parent 09b3dcb6db 6fbf6f8bea
commit e82e672a93
26 changed files with 302 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
samples/java/tutorial_code/photo/hdr_imaging/HDRImagingDemo.java
View File

@@ -13,7 +13,7 @@ import org.opencv.photo.CalibrateDebevec;
import org.opencv.photo.MergeDebevec;
import org.opencv.photo.MergeMertens;
import org.opencv.photo.Photo;
import org.opencv.photo.TonemapDurand;
import org.opencv.photo.Tonemap;
class HDRImaging {
public void loadExposureSeq(String path, List<Mat> images, List<Float> times) {
@@ -71,7 +71,7 @@ class HDRImaging {
//! [Tonemap HDR image]
Mat ldr = new Mat();
TonemapDurand tonemap = Photo.createTonemapDurand(2.2f, 4.0f, 1.0f, 2.0f, 2.0f);
Tonemap tonemap = Photo.createTonemap(2.2f);
tonemap.process(hdr, ldr);
//! [Tonemap HDR image]