third_party/opencv
1
0
Fork 0
Code Issues Pull Requests 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
2019-04-19 15:43:58 +03:00
parent 1f517b8a02 3abae3c511
commit c024edb9a8
40 changed files with 332 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/dnn/include/opencv2/dnn/version.hpp
+1 -1
View File
@@ -8,7 +8,7 @@
/// Use with major OpenCV version only.
#define OPENCV_DNN_API_VERSION 20190412
#if !defined CV_DOXYGEN && !defined CV_DNN_DONT_ADD_INLINE_NS
#if !defined CV_DOXYGEN && !defined CV_STATIC_ANALYSIS && !defined CV_DNN_DONT_ADD_INLINE_NS
#define CV__DNN_INLINE_NS __CV_CAT(dnn4_v, OPENCV_DNN_API_VERSION)
#define CV__DNN_INLINE_NS_BEGIN namespace CV__DNN_INLINE_NS {
#define CV__DNN_INLINE_NS_END }