Skip to content

Commit

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

Per PR #3905 (#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.

Signed-off-by: Larry Gritz <[email protected]>
  • Loading branch information
lgritz authored Aug 30, 2023
1 parent 554dd02 commit b008158
Show file tree
Hide file tree
Showing 16 changed files with 24 additions and 16 deletions.
10 changes: 9 additions & 1 deletion RELICENSING.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ the Developer Certificate of Origin, version 1.1:
- Nathan Rusch (nrusch)
- Ismael Cortes (leamsi)
- AdamMainsTL
- Sony Pictures Imageworks (cstein, olegul, fpsunflower, brianhall77, jeremyselan, drg, richardssam, lecocqp)
- Sony Pictures Imageworks (cmstein, olegul, fpsunflower, brianhall77, jeremyselan, drg, richardssam, lecocqp)
- Richard Shaw (hobbes1069)
- Robert Matusewicz
- Mariusz Szczepańczyk (mszczepanczyk)
Expand Down Expand Up @@ -111,6 +111,14 @@ the Developer Certificate of Origin, version 1.1:
- Wētā
- Kimball Thurston (kdt3rd)
- Anders Langlands (anderslanglands)
- Алексей (Alexpux)
- Fabien Castan (fabiencastan)
- Grégoire De Lillo (gregoire-dl)
- Edgar Velázquez-Armendáriz (edgarv)
- Malcolm Humphreys (malcolmhumphreys)
- johnfea
- Max Liani (maxliani)
- Michael Görner (v4hn)

**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/ico.imageio/icooutput.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/OpenImageIO/oiio

#include <cmath>
Expand Down
2 changes: 1 addition & 1 deletion src/include/OpenImageIO/export.h
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/OpenImageIO/oiio


Expand Down
2 changes: 1 addition & 1 deletion src/libOpenImageIO/formatspec.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/OpenImageIO/oiio

#include <cstdio>
Expand Down
2 changes: 1 addition & 1 deletion src/libOpenImageIO/imagebufalgo_test.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/OpenImageIO/oiio


Expand Down
2 changes: 1 addition & 1 deletion src/libOpenImageIO/imageinput.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/OpenImageIO/oiio

#include <cmath>
Expand Down
2 changes: 1 addition & 1 deletion src/libOpenImageIO/imageioplugin.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/OpenImageIO/oiio

#include <cstdio>
Expand Down
2 changes: 1 addition & 1 deletion src/libOpenImageIO/imageoutput.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/OpenImageIO/oiio

#include <cmath>
Expand Down
2 changes: 1 addition & 1 deletion src/libtexture/texture_pvt.h
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/OpenImageIO/oiio


Expand Down
2 changes: 1 addition & 1 deletion src/libtexture/texturesys.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/OpenImageIO/oiio


Expand Down
2 changes: 1 addition & 1 deletion src/libutil/filesystem_test.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/OpenImageIO/oiio

#include <fstream>
Expand Down
2 changes: 1 addition & 1 deletion src/libutil/thread.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/OpenImageIO/oiio


Expand Down
2 changes: 1 addition & 1 deletion src/oiiotool/imagerec.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/OpenImageIO/oiio


Expand Down
2 changes: 1 addition & 1 deletion src/testtex/testtex.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/OpenImageIO/oiio


Expand Down
2 changes: 1 addition & 1 deletion testsuite/runtest.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/OpenImageIO/oiio

from __future__ import print_function
Expand Down
2 changes: 1 addition & 1 deletion testsuite/texture-wrapfill/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/OpenImageIO/oiio

# This tests a particular tricky case: the interplay of "black" wrap mode
Expand Down

0 comments on commit b008158

Please sign in to comment.