mirror of
https://github.com/opencv/opencv.git
synced 2024-11-23 18:50:21 +08:00
Merge pull request #18073 from vpisarev:apache2_license
changed OpenCV license from BSD to Apache 2 license * as discussed and announced earlier, changed OpenCV license from BSD to Apache 2. Many files still contain old-style copyrights though * changed wording a bit; preserve the original OpenCV BSD license
This commit is contained in:
parent
8753203df0
commit
5108e3ced6
2
.github/PULL_REQUEST_TEMPLATE.md
vendored
2
.github/PULL_REQUEST_TEMPLATE.md
vendored
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request
|
See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request
|
||||||
|
|
||||||
- [ ] I agree to contribute to the project under OpenCV (BSD) License.
|
- [ ] I agree to contribute to the project under Apache 2 License.
|
||||||
- [ ] To the best of my knowledge, the proposed patch is not based on a code under GPL or other license that is incompatible with OpenCV
|
- [ ] To the best of my knowledge, the proposed patch is not based on a code under GPL or other license that is incompatible with OpenCV
|
||||||
- [ ] The PR is proposed to proper branch
|
- [ ] The PR is proposed to proper branch
|
||||||
- [ ] There is reference to original bug report and related work
|
- [ ] There is reference to original bug report and related work
|
||||||
|
11
COPYRIGHT
Normal file
11
COPYRIGHT
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
Copyright (C) 2000-2020, Intel Corporation, all rights reserved.
|
||||||
|
Copyright (C) 2009-2011, Willow Garage Inc., all rights reserved.
|
||||||
|
Copyright (C) 2009-2016, NVIDIA Corporation, all rights reserved.
|
||||||
|
Copyright (C) 2010-2013, Advanced Micro Devices, Inc., all rights reserved.
|
||||||
|
Copyright (C) 2015-2020, OpenCV Foundation, all rights reserved.
|
||||||
|
Copyright (C) 2008-2016, Itseez Inc., all rights reserved.
|
||||||
|
Copyright (C) 2019-2020, Xperience AI, all rights reserved.
|
||||||
|
Copyright (C) 2019-2020, Shenzhen Institute of Artificial Intelligence and
|
||||||
|
Robotics for Society, all rights reserved.
|
||||||
|
|
||||||
|
Third party copyrights are property of their respective owners.
|
228
LICENSE
228
LICENSE
@ -1,42 +1,202 @@
|
|||||||
By downloading, copying, installing or using the software you agree to this license.
|
|
||||||
If you do not agree to this license, do not download, install,
|
|
||||||
copy or use the software.
|
|
||||||
|
|
||||||
|
Apache License
|
||||||
|
Version 2.0, January 2004
|
||||||
|
http://www.apache.org/licenses/
|
||||||
|
|
||||||
License Agreement
|
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||||
For Open Source Computer Vision Library
|
|
||||||
(3-clause BSD License)
|
|
||||||
|
|
||||||
Copyright (C) 2000-2020, Intel Corporation, all rights reserved.
|
1. Definitions.
|
||||||
Copyright (C) 2009-2011, Willow Garage Inc., all rights reserved.
|
|
||||||
Copyright (C) 2009-2016, NVIDIA Corporation, all rights reserved.
|
|
||||||
Copyright (C) 2010-2013, Advanced Micro Devices, Inc., all rights reserved.
|
|
||||||
Copyright (C) 2015-2016, OpenCV Foundation, all rights reserved.
|
|
||||||
Copyright (C) 2015-2016, Itseez Inc., all rights reserved.
|
|
||||||
Copyright (C) 2019-2020, Xperience AI, all rights reserved.
|
|
||||||
Third party copyrights are property of their respective owners.
|
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without modification,
|
"License" shall mean the terms and conditions for use, reproduction,
|
||||||
are permitted provided that the following conditions are met:
|
and distribution as defined by Sections 1 through 9 of this document.
|
||||||
|
|
||||||
* Redistributions of source code must retain the above copyright notice,
|
"Licensor" shall mean the copyright owner or entity authorized by
|
||||||
this list of conditions and the following disclaimer.
|
the copyright owner that is granting the License.
|
||||||
|
|
||||||
* Redistributions in binary form must reproduce the above copyright notice,
|
"Legal Entity" shall mean the union of the acting entity and all
|
||||||
this list of conditions and the following disclaimer in the documentation
|
other entities that control, are controlled by, or are under common
|
||||||
and/or other materials provided with the distribution.
|
control with that entity. For the purposes of this definition,
|
||||||
|
"control" means (i) the power, direct or indirect, to cause the
|
||||||
|
direction or management of such entity, whether by contract or
|
||||||
|
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||||
|
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||||
|
|
||||||
* Neither the names of the copyright holders nor the names of the contributors
|
"You" (or "Your") shall mean an individual or Legal Entity
|
||||||
may be used to endorse or promote products derived from this software
|
exercising permissions granted by this License.
|
||||||
without specific prior written permission.
|
|
||||||
|
|
||||||
This software is provided by the copyright holders and contributors "as is" and
|
"Source" form shall mean the preferred form for making modifications,
|
||||||
any express or implied warranties, including, but not limited to, the implied
|
including but not limited to software source code, documentation
|
||||||
warranties of merchantability and fitness for a particular purpose are disclaimed.
|
source, and configuration files.
|
||||||
In no event shall copyright holders or contributors be liable for any direct,
|
|
||||||
indirect, incidental, special, exemplary, or consequential damages
|
"Object" form shall mean any form resulting from mechanical
|
||||||
(including, but not limited to, procurement of substitute goods or services;
|
transformation or translation of a Source form, including but
|
||||||
loss of use, data, or profits; or business interruption) however caused
|
not limited to compiled object code, generated documentation,
|
||||||
and on any theory of liability, whether in contract, strict liability,
|
and conversions to other media types.
|
||||||
or tort (including negligence or otherwise) arising in any way out of
|
|
||||||
the use of this software, even if advised of the possibility of such damage.
|
"Work" shall mean the work of authorship, whether in Source or
|
||||||
|
Object form, made available under the License, as indicated by a
|
||||||
|
copyright notice that is included in or attached to the work
|
||||||
|
(an example is provided in the Appendix below).
|
||||||
|
|
||||||
|
"Derivative Works" shall mean any work, whether in Source or Object
|
||||||
|
form, that is based on (or derived from) the Work and for which the
|
||||||
|
editorial revisions, annotations, elaborations, or other modifications
|
||||||
|
represent, as a whole, an original work of authorship. For the purposes
|
||||||
|
of this License, Derivative Works shall not include works that remain
|
||||||
|
separable from, or merely link (or bind by name) to the interfaces of,
|
||||||
|
the Work and Derivative Works thereof.
|
||||||
|
|
||||||
|
"Contribution" shall mean any work of authorship, including
|
||||||
|
the original version of the Work and any modifications or additions
|
||||||
|
to that Work or Derivative Works thereof, that is intentionally
|
||||||
|
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||||
|
or by an individual or Legal Entity authorized to submit on behalf of
|
||||||
|
the copyright owner. For the purposes of this definition, "submitted"
|
||||||
|
means any form of electronic, verbal, or written communication sent
|
||||||
|
to the Licensor or its representatives, including but not limited to
|
||||||
|
communication on electronic mailing lists, source code control systems,
|
||||||
|
and issue tracking systems that are managed by, or on behalf of, the
|
||||||
|
Licensor for the purpose of discussing and improving the Work, but
|
||||||
|
excluding communication that is conspicuously marked or otherwise
|
||||||
|
designated in writing by the copyright owner as "Not a Contribution."
|
||||||
|
|
||||||
|
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||||
|
on behalf of whom a Contribution has been received by Licensor and
|
||||||
|
subsequently incorporated within the Work.
|
||||||
|
|
||||||
|
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||||
|
this License, each Contributor hereby grants to You a perpetual,
|
||||||
|
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||||
|
copyright license to reproduce, prepare Derivative Works of,
|
||||||
|
publicly display, publicly perform, sublicense, and distribute the
|
||||||
|
Work and such Derivative Works in Source or Object form.
|
||||||
|
|
||||||
|
3. Grant of Patent License. Subject to the terms and conditions of
|
||||||
|
this License, each Contributor hereby grants to You a perpetual,
|
||||||
|
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||||
|
(except as stated in this section) patent license to make, have made,
|
||||||
|
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||||
|
where such license applies only to those patent claims licensable
|
||||||
|
by such Contributor that are necessarily infringed by their
|
||||||
|
Contribution(s) alone or by combination of their Contribution(s)
|
||||||
|
with the Work to which such Contribution(s) was submitted. If You
|
||||||
|
institute patent litigation against any entity (including a
|
||||||
|
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||||
|
or a Contribution incorporated within the Work constitutes direct
|
||||||
|
or contributory patent infringement, then any patent licenses
|
||||||
|
granted to You under this License for that Work shall terminate
|
||||||
|
as of the date such litigation is filed.
|
||||||
|
|
||||||
|
4. Redistribution. You may reproduce and distribute copies of the
|
||||||
|
Work or Derivative Works thereof in any medium, with or without
|
||||||
|
modifications, and in Source or Object form, provided that You
|
||||||
|
meet the following conditions:
|
||||||
|
|
||||||
|
(a) You must give any other recipients of the Work or
|
||||||
|
Derivative Works a copy of this License; and
|
||||||
|
|
||||||
|
(b) You must cause any modified files to carry prominent notices
|
||||||
|
stating that You changed the files; and
|
||||||
|
|
||||||
|
(c) You must retain, in the Source form of any Derivative Works
|
||||||
|
that You distribute, all copyright, patent, trademark, and
|
||||||
|
attribution notices from the Source form of the Work,
|
||||||
|
excluding those notices that do not pertain to any part of
|
||||||
|
the Derivative Works; and
|
||||||
|
|
||||||
|
(d) If the Work includes a "NOTICE" text file as part of its
|
||||||
|
distribution, then any Derivative Works that You distribute must
|
||||||
|
include a readable copy of the attribution notices contained
|
||||||
|
within such NOTICE file, excluding those notices that do not
|
||||||
|
pertain to any part of the Derivative Works, in at least one
|
||||||
|
of the following places: within a NOTICE text file distributed
|
||||||
|
as part of the Derivative Works; within the Source form or
|
||||||
|
documentation, if provided along with the Derivative Works; or,
|
||||||
|
within a display generated by the Derivative Works, if and
|
||||||
|
wherever such third-party notices normally appear. The contents
|
||||||
|
of the NOTICE file are for informational purposes only and
|
||||||
|
do not modify the License. You may add Your own attribution
|
||||||
|
notices within Derivative Works that You distribute, alongside
|
||||||
|
or as an addendum to the NOTICE text from the Work, provided
|
||||||
|
that such additional attribution notices cannot be construed
|
||||||
|
as modifying the License.
|
||||||
|
|
||||||
|
You may add Your own copyright statement to Your modifications and
|
||||||
|
may provide additional or different license terms and conditions
|
||||||
|
for use, reproduction, or distribution of Your modifications, or
|
||||||
|
for any such Derivative Works as a whole, provided Your use,
|
||||||
|
reproduction, and distribution of the Work otherwise complies with
|
||||||
|
the conditions stated in this License.
|
||||||
|
|
||||||
|
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||||
|
any Contribution intentionally submitted for inclusion in the Work
|
||||||
|
by You to the Licensor shall be under the terms and conditions of
|
||||||
|
this License, without any additional terms or conditions.
|
||||||
|
Notwithstanding the above, nothing herein shall supersede or modify
|
||||||
|
the terms of any separate license agreement you may have executed
|
||||||
|
with Licensor regarding such Contributions.
|
||||||
|
|
||||||
|
6. Trademarks. This License does not grant permission to use the trade
|
||||||
|
names, trademarks, service marks, or product names of the Licensor,
|
||||||
|
except as required for reasonable and customary use in describing the
|
||||||
|
origin of the Work and reproducing the content of the NOTICE file.
|
||||||
|
|
||||||
|
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||||
|
agreed to in writing, Licensor provides the Work (and each
|
||||||
|
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||||
|
implied, including, without limitation, any warranties or conditions
|
||||||
|
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||||
|
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||||
|
appropriateness of using or redistributing the Work and assume any
|
||||||
|
risks associated with Your exercise of permissions under this License.
|
||||||
|
|
||||||
|
8. Limitation of Liability. In no event and under no legal theory,
|
||||||
|
whether in tort (including negligence), contract, or otherwise,
|
||||||
|
unless required by applicable law (such as deliberate and grossly
|
||||||
|
negligent acts) or agreed to in writing, shall any Contributor be
|
||||||
|
liable to You for damages, including any direct, indirect, special,
|
||||||
|
incidental, or consequential damages of any character arising as a
|
||||||
|
result of this License or out of the use or inability to use the
|
||||||
|
Work (including but not limited to damages for loss of goodwill,
|
||||||
|
work stoppage, computer failure or malfunction, or any and all
|
||||||
|
other commercial damages or losses), even if such Contributor
|
||||||
|
has been advised of the possibility of such damages.
|
||||||
|
|
||||||
|
9. Accepting Warranty or Additional Liability. While redistributing
|
||||||
|
the Work or Derivative Works thereof, You may choose to offer,
|
||||||
|
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||||
|
or other liability obligations and/or rights consistent with this
|
||||||
|
License. However, in accepting such obligations, You may act only
|
||||||
|
on Your own behalf and on Your sole responsibility, not on behalf
|
||||||
|
of any other Contributor, and only if You agree to indemnify,
|
||||||
|
defend, and hold each Contributor harmless for any liability
|
||||||
|
incurred by, or claims asserted against, such Contributor by reason
|
||||||
|
of your accepting any such warranty or additional liability.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
APPENDIX: How to apply the Apache License to your work.
|
||||||
|
|
||||||
|
To apply the Apache License to your work, attach the following
|
||||||
|
boilerplate notice, with the fields enclosed by brackets "[]"
|
||||||
|
replaced with your own identifying information. (Don't include
|
||||||
|
the brackets!) The text should be enclosed in the appropriate
|
||||||
|
comment syntax for the file format. We also recommend that a
|
||||||
|
file or class name and description of purpose be included on the
|
||||||
|
same "printed page" as the copyright notice for easier
|
||||||
|
identification within third-party archives.
|
||||||
|
|
||||||
|
Copyright [yyyy] [name of copyright owner]
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
@ -60,7 +60,7 @@ set(CPACK_RPM_COMPONENT_INSTALL TRUE)
|
|||||||
set(CPACK_RPM_PACKAGE_SUMMARY ${CPACK_PACKAGE_DESCRIPTION_SUMMARY})
|
set(CPACK_RPM_PACKAGE_SUMMARY ${CPACK_PACKAGE_DESCRIPTION_SUMMARY})
|
||||||
set(CPACK_RPM_PACKAGE_DESCRIPTION ${CPACK_PACKAGE_DESCRIPTION})
|
set(CPACK_RPM_PACKAGE_DESCRIPTION ${CPACK_PACKAGE_DESCRIPTION})
|
||||||
set(CPACK_RPM_PACKAGE_URL "http://opencv.org")
|
set(CPACK_RPM_PACKAGE_URL "http://opencv.org")
|
||||||
set(CPACK_RPM_PACKAGE_LICENSE "BSD")
|
set(CPACK_RPM_PACKAGE_LICENSE "Apache 2.0")
|
||||||
|
|
||||||
#deb options
|
#deb options
|
||||||
set(CPACK_DEB_COMPONENT_INSTALL TRUE)
|
set(CPACK_DEB_COMPONENT_INSTALL TRUE)
|
||||||
|
42
doc/LICENSE_BSD.txt
Normal file
42
doc/LICENSE_BSD.txt
Normal file
@ -0,0 +1,42 @@
|
|||||||
|
By downloading, copying, installing or using the software you agree to this license.
|
||||||
|
If you do not agree to this license, do not download, install,
|
||||||
|
copy or use the software.
|
||||||
|
|
||||||
|
|
||||||
|
License Agreement
|
||||||
|
For Open Source Computer Vision Library
|
||||||
|
(3-clause BSD License)
|
||||||
|
|
||||||
|
Copyright (C) 2000-2020, Intel Corporation, all rights reserved.
|
||||||
|
Copyright (C) 2009-2011, Willow Garage Inc., all rights reserved.
|
||||||
|
Copyright (C) 2009-2016, NVIDIA Corporation, all rights reserved.
|
||||||
|
Copyright (C) 2010-2013, Advanced Micro Devices, Inc., all rights reserved.
|
||||||
|
Copyright (C) 2015-2016, OpenCV Foundation, all rights reserved.
|
||||||
|
Copyright (C) 2015-2016, Itseez Inc., all rights reserved.
|
||||||
|
Copyright (C) 2019-2020, Xperience AI, all rights reserved.
|
||||||
|
Third party copyrights are property of their respective owners.
|
||||||
|
|
||||||
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
are permitted provided that the following conditions are met:
|
||||||
|
|
||||||
|
* Redistributions of source code must retain the above copyright notice,
|
||||||
|
this list of conditions and the following disclaimer.
|
||||||
|
|
||||||
|
* Redistributions in binary form must reproduce the above copyright notice,
|
||||||
|
this list of conditions and the following disclaimer in the documentation
|
||||||
|
and/or other materials provided with the distribution.
|
||||||
|
|
||||||
|
* Neither the names of the copyright holders nor the names of the contributors
|
||||||
|
may be used to endorse or promote products derived from this software
|
||||||
|
without specific prior written permission.
|
||||||
|
|
||||||
|
This software is provided by the copyright holders and contributors "as is" and
|
||||||
|
any express or implied warranties, including, but not limited to, the implied
|
||||||
|
warranties of merchantability and fitness for a particular purpose are disclaimed.
|
||||||
|
In no event shall copyright holders or contributors be liable for any direct,
|
||||||
|
indirect, incidental, special, exemplary, or consequential damages
|
||||||
|
(including, but not limited to, procurement of substitute goods or services;
|
||||||
|
loss of use, data, or profits; or business interruption) however caused
|
||||||
|
and on any theory of liability, whether in contract, strict liability,
|
||||||
|
or tort (including negligence or otherwise) arising in any way out of
|
||||||
|
the use of this software, even if advised of the possibility of such damage.
|
47
doc/LICENSE_CHANGE_NOTICE.txt
Normal file
47
doc/LICENSE_CHANGE_NOTICE.txt
Normal file
@ -0,0 +1,47 @@
|
|||||||
|
Starting from OpenCV 4.5-pre (2020 August) OpenCV has changed the license from BSD to Apache 2. See https://opencv.org/opencv-is-to-change-the-license-to-apache-2/ and https://github.com/opencv/opencv/wiki/OE-32.--Change-OpenCV-License-to-Apache-2 for details.
|
||||||
|
|
||||||
|
Here is the original OpenCV license:
|
||||||
|
------------------------------------------------------------------------------------
|
||||||
|
By downloading, copying, installing or using the software you agree to this license.
|
||||||
|
If you do not agree to this license, do not download, install,
|
||||||
|
copy or use the software.
|
||||||
|
|
||||||
|
|
||||||
|
License Agreement
|
||||||
|
For Open Source Computer Vision Library
|
||||||
|
(3-clause BSD License)
|
||||||
|
|
||||||
|
Copyright (C) 2000-2020, Intel Corporation, all rights reserved.
|
||||||
|
Copyright (C) 2009-2011, Willow Garage Inc., all rights reserved.
|
||||||
|
Copyright (C) 2009-2016, NVIDIA Corporation, all rights reserved.
|
||||||
|
Copyright (C) 2010-2013, Advanced Micro Devices, Inc., all rights reserved.
|
||||||
|
Copyright (C) 2015-2016, OpenCV Foundation, all rights reserved.
|
||||||
|
Copyright (C) 2015-2016, Itseez Inc., all rights reserved.
|
||||||
|
Copyright (C) 2019-2020, Xperience AI, all rights reserved.
|
||||||
|
Third party copyrights are property of their respective owners.
|
||||||
|
|
||||||
|
Redistribution and use in source and binary forms, with or without modification,
|
||||||
|
are permitted provided that the following conditions are met:
|
||||||
|
|
||||||
|
* Redistributions of source code must retain the above copyright notice,
|
||||||
|
this list of conditions and the following disclaimer.
|
||||||
|
|
||||||
|
* Redistributions in binary form must reproduce the above copyright notice,
|
||||||
|
this list of conditions and the following disclaimer in the documentation
|
||||||
|
and/or other materials provided with the distribution.
|
||||||
|
|
||||||
|
* Neither the names of the copyright holders nor the names of the contributors
|
||||||
|
may be used to endorse or promote products derived from this software
|
||||||
|
without specific prior written permission.
|
||||||
|
|
||||||
|
This software is provided by the copyright holders and contributors "as is" and
|
||||||
|
any express or implied warranties, including, but not limited to, the implied
|
||||||
|
warranties of merchantability and fitness for a particular purpose are disclaimed.
|
||||||
|
In no event shall copyright holders or contributors be liable for any direct,
|
||||||
|
indirect, incidental, special, exemplary, or consequential damages
|
||||||
|
(including, but not limited to, procurement of substitute goods or services;
|
||||||
|
loss of use, data, or profits; or business interruption) however caused
|
||||||
|
and on any theory of liability, whether in contract, strict liability,
|
||||||
|
or tort (including negligence or otherwise) arising in any way out of
|
||||||
|
the use of this software, even if advised of the possibility of such damage.
|
||||||
|
------------------------------------------------------------------------------------
|
@ -587,4 +587,4 @@ the gap.
|
|||||||
|
|
||||||
Copyright © 2013 Giacomo (Mimmo) Cosenza aka Magomimmo
|
Copyright © 2013 Giacomo (Mimmo) Cosenza aka Magomimmo
|
||||||
|
|
||||||
Distributed under the BSD 3-clause License, the same of OpenCV.
|
Distributed under the BSD 3-clause License.
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
Introduction {#intro}
|
Introduction {#intro}
|
||||||
============
|
============
|
||||||
|
|
||||||
OpenCV (Open Source Computer Vision Library: <http://opencv.org>) is an open-source BSD-licensed
|
OpenCV (Open Source Computer Vision Library: <http://opencv.org>) is an open-source
|
||||||
library that includes several hundreds of computer vision algorithms. The document describes the
|
library that includes several hundreds of computer vision algorithms. The document describes the
|
||||||
so-called OpenCV 2.x API, which is essentially a C++ API, as opposed to the C-based OpenCV 1.x API
|
so-called OpenCV 2.x API, which is essentially a C++ API, as opposed to the C-based OpenCV 1.x API
|
||||||
(C API is deprecated and not tested with "C" compiler since OpenCV 2.4 releases)
|
(C API is deprecated and not tested with "C" compiler since OpenCV 2.4 releases)
|
||||||
|
@ -1,3 +1,7 @@
|
|||||||
|
// This file is a part of OpenCV project.
|
||||||
|
// See opencv/LICENSE and http://opencv.org/license.html for the actual licensing terms.
|
||||||
|
// See also opencv/doc/LICENSE_CHANGE_NOTICE.txt. Below is the original license:
|
||||||
|
|
||||||
/*
|
/*
|
||||||
By downloading, copying, installing or using the software you agree to this license.
|
By downloading, copying, installing or using the software you agree to this license.
|
||||||
If you do not agree to this license, do not download, install,
|
If you do not agree to this license, do not download, install,
|
||||||
|
@ -1,3 +1,7 @@
|
|||||||
|
// This file is a part of OpenCV project.
|
||||||
|
// See opencv/LICENSE and http://opencv.org/license.html for the actual licensing terms.
|
||||||
|
// See also opencv/doc/LICENSE_CHANGE_NOTICE.txt. Below is the original license:
|
||||||
|
|
||||||
/*********************************************************************
|
/*********************************************************************
|
||||||
* Software License Agreement (BSD License)
|
* Software License Agreement (BSD License)
|
||||||
*
|
*
|
||||||
|
@ -11,7 +11,7 @@
|
|||||||
},
|
},
|
||||||
"keywords": [],
|
"keywords": [],
|
||||||
"author": "",
|
"author": "",
|
||||||
"license": "BSD-3-Clause",
|
"license": "Apache 2.0 License",
|
||||||
"bugs": {
|
"bugs": {
|
||||||
"url": "https://github.com/opencv/opencv/issues"
|
"url": "https://github.com/opencv/opencv/issues"
|
||||||
},
|
},
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
},
|
},
|
||||||
"keywords": [],
|
"keywords": [],
|
||||||
"author": "",
|
"author": "",
|
||||||
"license": "BSD-3-Clause",
|
"license": "Apache 2.0 License",
|
||||||
"bugs": {
|
"bugs": {
|
||||||
"url": "https://github.com/opencv/opencv/issues"
|
"url": "https://github.com/opencv/opencv/issues"
|
||||||
},
|
},
|
||||||
|
@ -17,7 +17,7 @@ def main():
|
|||||||
name=package_name,
|
name=package_name,
|
||||||
version=package_version,
|
version=package_version,
|
||||||
url='https://github.com/opencv/opencv',
|
url='https://github.com/opencv/opencv',
|
||||||
license='BSD',
|
license='Apache 2.0',
|
||||||
description='OpenCV python bindings',
|
description='OpenCV python bindings',
|
||||||
long_description=long_description,
|
long_description=long_description,
|
||||||
long_description_content_type="text/markdown",
|
long_description_content_type="text/markdown",
|
||||||
@ -31,7 +31,7 @@ def main():
|
|||||||
'Intended Audience :: Education',
|
'Intended Audience :: Education',
|
||||||
'Intended Audience :: Information Technology',
|
'Intended Audience :: Information Technology',
|
||||||
'Intended Audience :: Science/Research',
|
'Intended Audience :: Science/Research',
|
||||||
'License :: BSD License',
|
'License :: Apache 2.0 License',
|
||||||
'Operating System :: MacOS',
|
'Operating System :: MacOS',
|
||||||
'Operating System :: Microsoft :: Windows',
|
'Operating System :: Microsoft :: Windows',
|
||||||
'Operating System :: POSIX',
|
'Operating System :: POSIX',
|
||||||
|
@ -8,7 +8,7 @@
|
|||||||
<name>OpenCV Parent POM</name>
|
<name>OpenCV Parent POM</name>
|
||||||
<licenses>
|
<licenses>
|
||||||
<license>
|
<license>
|
||||||
<name>License Agreement For Open Source Computer Vision Library (3-clause BSD License)</name>
|
<name>License Agreement For Open Source Computer Vision Library (Apache 2.0 License)</name>
|
||||||
<url>http://opencv.org/license.html</url>
|
<url>http://opencv.org/license.html</url>
|
||||||
</license>
|
</license>
|
||||||
</licenses>
|
</licenses>
|
||||||
|
@ -5,8 +5,8 @@
|
|||||||
|
|
||||||
:description "A simple project to start REPLing with OpenCV"
|
:description "A simple project to start REPLing with OpenCV"
|
||||||
:url "http://example.com/FIXME"
|
:url "http://example.com/FIXME"
|
||||||
:license {:name "BSD 3-Clause License"
|
:license {:name "Apache 2.0 License"
|
||||||
:url "http://opensource.org/licenses/BSD-3-Clause"}
|
:url "https://www.apache.org/licenses/LICENSE-2.0"}
|
||||||
:dependencies [[org.clojure/clojure "1.5.1"]
|
:dependencies [[org.clojure/clojure "1.5.1"]
|
||||||
[opencv/opencv "2.4.7"]
|
[opencv/opencv "2.4.7"]
|
||||||
[opencv/opencv-native "2.4.7"]]
|
[opencv/opencv-native "2.4.7"]]
|
||||||
|
Loading…
Reference in New Issue
Block a user