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

cstlove · Apr 4, 2019 · 6db5c52 · 6db5c52
2 parents d352dfa + d62651c
commit 6db5c52
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 0 deletions.
diff --git a/testdata/highgui/readwrite/test32FC3_raw.tiff b/testdata/highgui/readwrite/test32FC3_raw.tiff
diff --git a/testdata/highgui/readwrite/test32FC3_sgilog.tiff b/testdata/highgui/readwrite/test32FC3_sgilog.tiff
diff --git a/testdata/highgui/readwrite/test64FC1.tiff b/testdata/highgui/readwrite/test64FC1.tiff