Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

admin: Relicense code under Apache 2.0 #3926

Merged
merged 4 commits into from
Jul 29, 2023
Merged

admin: Relicense code under Apache 2.0 #3926

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
afc74e9
admin: Relicense code under Apache 2.0
lgritz Jul 10, 2023
ad35553
Update
lgritz Jul 14, 2023
9359225
License language
lgritz Jul 24, 2023
42860fc
Edit README license explanation
lgritz Jul 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
License language 
Signed-off-by: Larry Gritz <lg@larrygritz.com>
  • Loading branch information
@lgritz
lgritz committed Jul 24, 2023
commit 9359225c908b60c9a27d08a986845a02fedf9483
201 changes: 0 additions & 201 deletions LICENSE-APACHE.md
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions LICENSE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,3 @@
New code entering the OpenImageIO repository from July 1 2023 onward is
subject to the [Apache 2.0 license](LICENSE-APACHE.md), reproduced below.

Code that was contributed to OpenImageIO prior to July 1 2023, and has not
been [relicensed](RELICENSING.md), was contributed under the [BSD 3-clause
license](LICENSE-BSD.md).


---

Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
Expand Down
2 changes: 1 addition & 1 deletion RELICENSING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
New code entering the OpenImageIO repository from July 1 2023 onward is
subject to the [Apache 2.0 license](LICENSE-Apache-2.0.md).
subject to the [Apache 2.0 license](LICENSE.md).

Code dating from earlier than July 1 2023 was contributed under the [BSD
3-clause license](LICENSE-BSD-3-Clause.md), unless relicensed below.
Expand Down
9 changes: 8 additions & 1 deletion THIRD-PARTY.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
See [LICENSE.md](LICENSE.md) for the main open source license of original
code written for the OpenImageIO project.
code written for the OpenImageIO project, which is the Apache-2.0 license.

The remainder of this file reproduces the open source licensing details
of other projects that have been imported, incorporated into, or derived
Expand All @@ -12,6 +12,13 @@ In no particular order:
BSD 3-Clause License
SPDX-License-Identifier: BSD-3-Clause

* OpenImageIO prior to July 1, 2023

Code that was contributed to OpenImageIO prior to July 1 2023, and has not
yet been [relicensed](RELICENSING.md), was contributed under the [BSD
3-clause license](LICENSE-BSD.md). Currently, this is less than 2% of the
codebase (by lines of code).

* Gelato, Copyright (c) 2004 by NVIDIA Corp.

The initial (version 0.1) code found in imageio.h, fmath.h, filter.h,
Expand Down