mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-12 15:19:11 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #22971 from alalek:update_version_3.4.19-pre

Browse Source
This commit is contained in:
Alexander Alekhin 2022-12-25 18:39:54 +00:00
commit 26f36f2ff9
9 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/tutorials/introduction/cross_referencing/tutorial_cross_referencing.markdown
View File

@ -39,14 +39,14 @@ Open your Doxyfile using your favorite text editor and search for the key
`TAGFILES`. Change it as follows: `TAGFILES`. Change it as follows:
@code @code
TAGFILES = ./docs/doxygen-tags/opencv.tag=http://docs.opencv.org/3.4.18 TAGFILES = ./docs/doxygen-tags/opencv.tag=http://docs.opencv.org/3.4.19
@endcode @endcode
If you had other definitions already, you can append the line using a `\`: If you had other definitions already, you can append the line using a `\`:
@code @code
TAGFILES = ./docs/doxygen-tags/libstdc++.tag=https://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen \ TAGFILES = ./docs/doxygen-tags/libstdc++.tag=https://gcc.gnu.org/onlinedocs/libstdc++/latest-doxygen \
./docs/doxygen-tags/opencv.tag=http://docs.opencv.org/3.4.18 ./docs/doxygen-tags/opencv.tag=http://docs.opencv.org/3.4.19
@endcode @endcode
Doxygen can now use the information from the tag file to link to the OpenCV Doxygen can now use the information from the tag file to link to the OpenCV

4
modules/core/include/opencv2/core/version.hpp
View File

@ -7,8 +7,8 @@
#define CV_VERSION_MAJOR 3 #define CV_VERSION_MAJOR 3
#define CV_VERSION_MINOR 4 #define CV_VERSION_MINOR 4
#define CV_VERSION_REVISION 18 #define CV_VERSION_REVISION 19
#define CV_VERSION_STATUS "-dev" #define CV_VERSION_STATUS "-pre"
#define CVAUX_STR_EXP(__A) #__A #define CVAUX_STR_EXP(__A) #__A
#define CVAUX_STR(__A) CVAUX_STR_EXP(__A) #define CVAUX_STR(__A) CVAUX_STR_EXP(__A)

4
modules/dnn/include/opencv2/dnn/dnn.hpp
View File

@ -47,9 +47,9 @@
#include "opencv2/core/async.hpp" #include "opencv2/core/async.hpp"
#if !defined CV_DOXYGEN && !defined CV_STATIC_ANALYSIS && !defined CV_DNN_DONT_ADD_EXPERIMENTAL_NS #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_v25 { #define CV__DNN_EXPERIMENTAL_NS_BEGIN namespace experimental_dnn_34_v26 {
#define CV__DNN_EXPERIMENTAL_NS_END } #define CV__DNN_EXPERIMENTAL_NS_END }
namespace cv { namespace dnn { namespace experimental_dnn_34_v25 { } using namespace experimental_dnn_34_v25; }} namespace cv { namespace dnn { namespace experimental_dnn_34_v26 { } using namespace experimental_dnn_34_v26; }}
#else #else
#define CV__DNN_EXPERIMENTAL_NS_BEGIN #define CV__DNN_EXPERIMENTAL_NS_BEGIN
#define CV__DNN_EXPERIMENTAL_NS_END #define CV__DNN_EXPERIMENTAL_NS_END

2
modules/python/package/setup.py
View File

@ -9,7 +9,7 @@ def main():
os.chdir(SCRIPT_DIR) os.chdir(SCRIPT_DIR)
package_name = 'opencv' package_name = 'opencv'
package_version = os.environ.get('OPENCV_VERSION', '3.4.18') # TODO package_version = os.environ.get('OPENCV_VERSION', '3.4.19') # TODO
long_description = 'Open Source Computer Vision Library Python bindings' # TODO long_description = 'Open Source Computer Vision Library Python bindings' # TODO

2
platforms/android/build_sdk.py
View File

@ -269,7 +269,7 @@ class Builder:
# Add extra data # Add extra data
apkxmldest = check_dir(os.path.join(apkdest, "res", "xml"), create=True) apkxmldest = check_dir(os.path.join(apkdest, "res", "xml"), create=True)
apklibdest = check_dir(os.path.join(apkdest, "libs", abi.name), create=True) apklibdest = check_dir(os.path.join(apkdest, "libs", abi.name), create=True)
for ver, d in self.extra_packs + [("3.4.18", os.path.join(self.libdest, "lib"))]: for ver, d in self.extra_packs + [("3.4.19", os.path.join(self.libdest, "lib"))]:
r = ET.Element("library", attrib={"version": ver}) r = ET.Element("library", attrib={"version": ver})
log.info("Adding libraries from %s", d) log.info("Adding libraries from %s", d)

2
platforms/android/service/readme.txt
View File

@ -12,7 +12,7 @@ manually using adb tool:
adb install <path-to-OpenCV-sdk>/apk/OpenCV_<version>_Manager_<app_version>_<platform>.apk adb install <path-to-OpenCV-sdk>/apk/OpenCV_<version>_Manager_<app_version>_<platform>.apk
Example: OpenCV_3.4.18-dev_Manager_3.49_armeabi-v7a.apk Example: OpenCV_3.4.19-dev_Manager_3.49_armeabi-v7a.apk
Use the list of platforms below to determine proper OpenCV Manager package for your device: Use the list of platforms below to determine proper OpenCV Manager package for your device:

2
platforms/maven/opencv-it/pom.xml
View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.opencv</groupId> <groupId>org.opencv</groupId>
<artifactId>opencv-parent</artifactId> <artifactId>opencv-parent</artifactId>
<version>3.4.18</version> <version>3.4.19</version>
</parent> </parent>
<groupId>org.opencv</groupId> <groupId>org.opencv</groupId>
<artifactId>opencv-it</artifactId> <artifactId>opencv-it</artifactId>

2
platforms/maven/opencv/pom.xml
View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>org.opencv</groupId> <groupId>org.opencv</groupId>
<artifactId>opencv-parent</artifactId> <artifactId>opencv-parent</artifactId>
<version>3.4.18</version> <version>3.4.19</version>
</parent> </parent>
<groupId>org.opencv</groupId> <groupId>org.opencv</groupId>
<artifactId>opencv</artifactId> <artifactId>opencv</artifactId>

2
platforms/maven/pom.xml
View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.opencv</groupId> <groupId>org.opencv</groupId>
<artifactId>opencv-parent</artifactId> <artifactId>opencv-parent</artifactId>
<version>3.4.18</version> <version>3.4.19</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>OpenCV Parent POM</name> <name>OpenCV Parent POM</name>
<licenses> <licenses>