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 pull request #21280 from alalek:update_version_3.4.17-pre

Browse Source
This commit is contained in:
Alexander Alekhin
2021-12-18 13:46:29 +00:00
parent 91817bffe1 60c093f086
commit a079acc0d9
9 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/include/opencv2/core/version.hpp
+2 -2
View File
@@ -7,8 +7,8 @@
#define CV_VERSION_MAJOR 3
#define CV_VERSION_MINOR 4
#define CV_VERSION_REVISION 16
#define CV_VERSION_STATUS "-dev"
#define CV_VERSION_REVISION 17
#define CV_VERSION_STATUS "-pre"
#define CVAUX_STR_EXP(__A) #__A
#define CVAUX_STR(__A) CVAUX_STR_EXP(__A)
modules/dnn/include/opencv2/dnn/dnn.hpp
+2 -2
View File
@@ -47,9 +47,9 @@
#include "opencv2/core/async.hpp"
#if !defined CV_DOXYGEN && !defined CV_STATIC_ANALYSIS && !defined CV_DNN_DONT_ADD_EXPERIMENTAL_NS
#define CV__DNN_EXPERIMENTAL_NS_BEGIN namespace experimental_dnn_34_v23 {
#define CV__DNN_EXPERIMENTAL_NS_BEGIN namespace experimental_dnn_34_v24 {
#define CV__DNN_EXPERIMENTAL_NS_END }
namespace cv { namespace dnn { namespace experimental_dnn_34_v23 { } using namespace experimental_dnn_34_v23; }}
namespace cv { namespace dnn { namespace experimental_dnn_34_v24 { } using namespace experimental_dnn_34_v24; }}
#else
#define CV__DNN_EXPERIMENTAL_NS_BEGIN
#define CV__DNN_EXPERIMENTAL_NS_END
modules/python/package/setup.py
+1 -1
View File
@@ -9,7 +9,7 @@ def main():
os.chdir(SCRIPT_DIR)
package_name = 'opencv'
package_version = os.environ.get('OPENCV_VERSION', '3.4.16') # TODO
package_version = os.environ.get('OPENCV_VERSION', '3.4.17') # TODO
long_description = 'Open Source Computer Vision Library Python bindings' # TODO