Movatterモバイル変換


[0]ホーム

URL:


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

Sign up
Appearance settings

Commitfe3c2a1

Browse files
committed
update 3.4.x specific parts
1 parent3e517ca commitfe3c2a1

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,13 +171,13 @@ On slow systems such as Raspberry Pi the full build may take several hours. On a
171171

172172
Opencv-python package (scripts in this repository) is available under MIT license.
173173

174-
OpenCV itself is available under[Apache 2](https://github.com/opencv/opencv/blob/master/LICENSE) license.
174+
OpenCV itself is available under[3-clause BSD License](https://github.com/opencv/opencv/blob/master/LICENSE).
175175

176176
Third party package licenses are at[LICENSE-3RD-PARTY.txt](https://github.com/skvark/opencv-python/blob/master/LICENSE-3RD-PARTY.txt).
177177

178178
All wheels ship with[FFmpeg](http://ffmpeg.org) licensed under the[LGPLv2.1](http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html).
179179

180-
Non-headless Linuxand MacOSwheels ship with[Qt 5](http://doc.qt.io/qt-5/lgpl.html) licensed under the[LGPLv3](http://www.gnu.org/licenses/lgpl-3.0.html).
180+
Non-headless Linux wheels ship with[Qt 5](http://doc.qt.io/qt-5/lgpl.html) licensed under the[LGPLv3](http://www.gnu.org/licenses/lgpl-3.0.html).
181181

182182
The packages include also other binaries. Full list of licenses can be found from[LICENSE-3RD-PARTY.txt](https://github.com/skvark/opencv-python/blob/master/LICENSE-3RD-PARTY.txt).
183183

‎setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ def main():
9393
# Path regexes with forward slashes relative to CMake install dir.
9494
rearrange_cmake_output_data= {
9595
"cv2": (
96-
[r"bin/opencv_videoio_ffmpeg\d{3}%s\.dll"% ("_64"ifx64else"")]
96+
[r"bin/opencv_ffmpeg\d{3,4}%s\.dll"% ("_64"ifx64else"")]
9797
ifos.name=="nt"
9898
else []
9999
)
@@ -106,7 +106,7 @@ def main():
106106
% {"ext":re.escape(sysconfig.get_config_var("EXT_SUFFIX"))}
107107
],
108108
"cv2.data": [# OPENCV_OTHER_INSTALL_PATH
109-
("etc"ifos.name=="nt"else"share/opencv4")+r"/haarcascades/.*\.xml"
109+
("etc"ifos.name=="nt"else"share/OpenCV")+r"/haarcascades/.*\.xml"
110110
],
111111
}
112112

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp