Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit e4f0e45

Browse filesBrowse files
authored
Merge pull request opencv#1050 from asmorkalov/5.x-merge-4.x
5.x merge 4.x and submodules update
2 parents 6a181ce + 2d2d5ae commit e4f0e45
Copy full SHA for e4f0e45

File tree

Expand file treeCollapse file tree

7 files changed

+9
-6
lines changed
Filter options
Expand file treeCollapse file tree

7 files changed

+9
-6
lines changed

‎.gitmodules

Copy file name to clipboard
+3Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
[submodule "opencv"]
22
path = opencv
33
url = https://github.com/opencv/opencv.git
4+
branch = 5.x
45
[submodule "opencv_contrib"]
56
path = opencv_contrib
67
url = https://github.com/opencv/opencv_contrib.git
8+
branch = 5.x
79
[submodule "multibuild"]
810
path = multibuild
911
url = https://github.com/multi-build/multibuild.git
1012
[submodule "opencv_extra"]
1113
path = opencv_extra
1214
url = https://github.com/opencv/opencv_extra.git
15+
branch = 5.x

‎find_version.py

Copy file name to clipboardExpand all lines: find_version.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
else:
6666
# local version identifier, not to be published on PyPI
6767
version = git_hash
68-
opencv_version += "+{}".format(version)
68+
opencv_version += ".{}".format(version)
6969

7070
with open("cv2/version.py", "w") as f:
7171
f.write('opencv_version = "{}"\n'.format(opencv_version))

‎opencv

Copy file name to clipboard
Submodule opencv updated 2881 files

‎opencv_contrib

Copy file name to clipboard
Submodule opencv_contrib updated 1240 files

‎opencv_extra

Copy file name to clipboard
Submodule opencv_extra updated 328 files

‎pyproject.toml

Copy file name to clipboardExpand all lines: pyproject.toml
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[build-system]
22
requires = [
3-
"cmake>=3.1",
3+
"cmake>=3.13",
44
"numpy==1.13.3; python_version=='3.6' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
55
"numpy==1.17.0; python_version=='3.7' and platform_machine != 'aarch64' and platform_machine != 'arm64'",
66
"numpy==1.17.5; python_version=='3.8' and platform_machine != 'aarch64' and platform_machine != 'arm64'",

‎setup.py

Copy file name to clipboardExpand all lines: setup.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ def main():
140140
[ r"python/cv2/py.typed" ] if sys.version_info >= (3, 6) else []
141141
,
142142
"cv2.data": [ # OPENCV_OTHER_INSTALL_PATH
143-
("etc" if os.name == "nt" else "share/opencv4") + r"/haarcascades/.*\.xml"
143+
("etc" if os.name == "nt" else "share/opencv5") + r"/haarcascades/.*\.xml"
144144
],
145145
"cv2.gapi": [
146146
"python/cv2" + r"/gapi/.*\.py"

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.