Skip to content

Commit

Permalink
admin: Relicense code under Apache 2.0 (AcademySoftwareFoundation#4038)
Browse files Browse the repository at this point in the history
This is Update 7, the original PR is ongoing and we will continue to
update as additional people relicense.

Per PR AcademySoftwareFoundation#3905 (AcademySoftwareFoundation#3905), update the
RELICENSING document with the names of people and companies who have
signed on to the relicensing thus far, and update the SPDX license
notices on source files whose extant authorship (per 'git blame')
comprises only authors who have relicensed.

To the best of our estimation, we now have 99.85% of lines of code
relicensed, and 93.2% of all source files now consist of ONLY
Apache-2.0 licensed code with no traces of BSD remaining.

Signed-off-by: Larry Gritz <[email protected]>
  • Loading branch information
lgritz committed Feb 16, 2024
1 parent 372bb8e commit 28abe43
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 7 deletions.
5 changes: 5 additions & 0 deletions RELICENSING.md
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,11 @@ the Developer Certificate of Origin, version 1.1:
- Joseph Goldstone (JGoldstone)
- Matthew Levine (melevine)
- Yang Yang (yangyangl, but now cometyang)
- Merwan Achibet (merwaaan)
- Anthony Nemoff (ix-anemoff)
- Damien Courtois (ix-dcourtois)
- Carl Rand (crand)
- Gregor Mückl (gmueckl)

**Prior authors, please submit a PR against this file that adds your name
above. If, at the time of your prior contributions, you were employed by a
Expand Down
2 changes: 1 addition & 1 deletion src/fits.imageio/fits_pvt.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright Contributors to the OpenImageIO project.
// SPDX-License-Identifier: BSD-3-Clause and Apache-2.0
// SPDX-License-Identifier: Apache-2.0
// https://github.com/AcademySoftwareFoundation/OpenImageIO

#include "fits_pvt.h"
Expand Down
2 changes: 1 addition & 1 deletion src/png.imageio/pnginput.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright Contributors to the OpenImageIO project.
// SPDX-License-Identifier: BSD-3-Clause and Apache-2.0
// SPDX-License-Identifier: Apache-2.0
// https://github.com/AcademySoftwareFoundation/OpenImageIO

#include <cmath>
Expand Down
2 changes: 1 addition & 1 deletion src/pnm.imageio/pnminput.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright Contributors to the OpenImageIO project.
// SPDX-License-Identifier: BSD-3-Clause and Apache-2.0
// SPDX-License-Identifier: Apache-2.0
// https://github.com/AcademySoftwareFoundation/OpenImageIO

#include <cstdlib>
Expand Down
2 changes: 1 addition & 1 deletion src/tiff.imageio/tiffinput.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright Contributors to the OpenImageIO project.
// SPDX-License-Identifier: BSD-3-Clause and Apache-2.0
// SPDX-License-Identifier: Apache-2.0
// https://github.com/AcademySoftwareFoundation/OpenImageIO


Expand Down
2 changes: 1 addition & 1 deletion src/tiff.imageio/tiffoutput.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright Contributors to the OpenImageIO project.
// SPDX-License-Identifier: BSD-3-Clause and Apache-2.0
// SPDX-License-Identifier: Apache-2.0
// https://github.com/AcademySoftwareFoundation/OpenImageIO


Expand Down
2 changes: 1 addition & 1 deletion testsuite/pnm/run.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env python

# Copyright Contributors to the OpenImageIO project.
# SPDX-License-Identifier: BSD-3-Clause and Apache-2.0
# SPDX-License-Identifier: Apache-2.0
# https://github.com/AcademySoftwareFoundation/OpenImageIO

imagedir = OIIO_TESTSUITE_IMAGEDIR + "/pnm"
Expand Down
2 changes: 1 addition & 1 deletion testsuite/texture-udim2/run.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env python

# Copyright Contributors to the OpenImageIO project.
# SPDX-License-Identifier: BSD-3-Clause and Apache-2.0
# SPDX-License-Identifier: Apache-2.0
# https://github.com/AcademySoftwareFoundation/OpenImageIO


Expand Down

0 comments on commit 28abe43

Please sign in to comment.