third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge tag '3.4.1'

Browse Source
This commit is contained in:
Alexander Alekhin
2018-02-25 16:56:57 +00:00
parent c729fbd652 6ffc48769a
commit 24bed38c2b
11 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/include/opencv2/core/version.hpp
+1 -1
View File
@@ -7,7 +7,7 @@
#define CV_VERSION_MAJOR 3
#define CV_VERSION_MINOR 4
#define CV_VERSION_REVISION 0
#define CV_VERSION_REVISION 1
#define CV_VERSION_STATUS "-dev"
#define CVAUX_STR_EXP(__A) #__A
modules/dnn/include/opencv2/dnn/dnn.hpp
+2 -2
View File
@@ -46,9 +46,9 @@
#include <opencv2/core.hpp>
#if !defined CV_DOXYGEN && !defined CV_DNN_DONT_ADD_EXPERIMENTAL_NS
#define CV__DNN_EXPERIMENTAL_NS_BEGIN namespace experimental_dnn_v3 {
#define CV__DNN_EXPERIMENTAL_NS_BEGIN namespace experimental_dnn_v4 {
#define CV__DNN_EXPERIMENTAL_NS_END }
namespace cv { namespace dnn { namespace experimental_dnn_v3 { } using namespace experimental_dnn_v3; }}
namespace cv { namespace dnn { namespace experimental_dnn_v4 { } using namespace experimental_dnn_v4; }}
#else
#define CV__DNN_EXPERIMENTAL_NS_BEGIN
#define CV__DNN_EXPERIMENTAL_NS_END