potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 15:23:05 +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-12-05 17:29:22 +03:00
parent b4a3c92867 c790779a37
commit 8108fb0575
19 changed files with 361 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/misc/java/src/cpp/core_manual.hpp
+2 -2
View File
@@ -9,7 +9,7 @@ CV_EXPORTS_W void setErrorVerbosity(bool verbose);
}
#if 0
#ifdef OPENCV_BINDINGS_PARSER
namespace cv
{
@@ -30,4 +30,4 @@ CV_EXPORTS_W void min(InputArray src1, Scalar src2, OutputArray dst);
CV_EXPORTS_W void max(InputArray src1, Scalar src2, OutputArray dst);
}
#endif //0
#endif