potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 00:03:03 +04:00
Code Packages Releases Wiki Activity

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

Browse Source
This commit is contained in:
Alexander Alekhin
2019-06-10 19:03:53 +00:00
parent 987061d800 878af7ada8
commit 11b020b9f9
327 changed files with 46020 additions and 13065 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/imgcodecs/test/test_grfmt.cpp
+4
View File
@@ -388,3 +388,7 @@ TEST(Imgcodecs, write_parameter_type)
}
}} // namespace
#ifdef HAVE_OPENEXR
#include "test_exr.impl.hpp"
#endif