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 d1a7a54

Browse filesBrowse files
committed
Merge branch 'master' into 3.4
2 parents 2ff72c1 + 11e478c commit d1a7a54
Copy full SHA for d1a7a54

File tree

2 files changed

+5
-5
lines changed
Filter options

2 files changed

+5
-5
lines changed

‎LICENSE-3RD-PARTY.txt

Copy file name to clipboardExpand all lines: LICENSE-3RD-PARTY.txt
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
8181

8282
------------------------------------------------------------------------------
8383
FFmpeg is redistributed within all opencv-python packages.
84-
Qt 4.8.7 is redistributed within opencv-python Linux packages.
84+
Qt 4.8.7 is redistributed within non-headless opencv-python Linux packages.
8585
Libuuid is redistributed within all opencv-python Linux packages.
8686

8787
Libbluray, libgnutls, libnettle, libhogweed, libintl, libmp3lame, libp11,
88-
librtmp, libsoxr, libtasn1, are redistributed within all opencv-python macOS packages.
88+
librtmp, libsoxr and libtasn1 are redistributed within all opencv-python macOS packages.
8989

9090
This license applies to the above library binaries in the directory cv2/.
9191

@@ -549,7 +549,7 @@ DAMAGES.
549549
END OF TERMS AND CONDITIONS
550550

551551
------------------------------------------------------------------------------
552-
Qt 5 is redistributed within opencv-python macOS packages.
552+
Qt 5 is redistributed within non-headless opencv-python macOS packages.
553553
libgmp is redistributed within opencv-python macOS packages.
554554
libidn2 is redistributed within opencv-python macOS packages.
555555
libunistring is redistributed within opencv-python macOS packages.

‎README.md

Copy file name to clipboardExpand all lines: README.md
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,9 @@ Third party package licenses are at [LICENSE-3RD-PARTY.txt](https://github.com/s
139139

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

142-
Linux wheels ship with [Qt 4.8.7](http://doc.qt.io/qt-4.8/lgpl.html) licensed under the [LGPLv2.1](http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html).
142+
Non-headless Linux wheels ship with [Qt 4.8.7](http://doc.qt.io/qt-4.8/lgpl.html) licensed under the [LGPLv2.1](http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html).
143143

144-
MacOS 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).
144+
Non-headless MacOS 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).
145145

146146
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).
147147

0 commit comments

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