diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000000..ea2b716934
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1 @@
+Claire Foster
diff --git a/LICENSE-APACHE.md b/LICENSE-APACHE.md
deleted file mode 100644
index 261eeb9e9f..0000000000
--- a/LICENSE-APACHE.md
+++ /dev/null
@@ -1,201 +0,0 @@
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- 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.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "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.
diff --git a/LICENSE.md b/LICENSE.md
index 53ddec1740..261eeb9e9f 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -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/
diff --git a/README.md b/README.md
index 74d8e0e121..816df32902 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
-[![License](https://img.shields.io/badge/license-BSD%203--Clause-blue.svg?style=flat-square)](https://github.com/OpenImageIO/oiio/blob/master/LICENSE.md)
+[![License](https://img.shields.io/badge/license-Apache2.0-blue.svg?style=flat-square)](https://github.com/OpenImageIO/oiio/blob/master/LICENSE.md)
[![CI](https://github.com/OpenImageIO/oiio/actions/workflows/ci.yml/badge.svg)](https://github.com/OpenImageIO/oiio/actions/workflows/ci.yml)
[![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/2694/badge)](https://bestpractices.coreinfrastructure.org/projects/2694)
[![latest packaged version(s)](https://repology.org/badge/latest-versions/openimageio.svg)](https://repology.org/project/openimageio/versions)
@@ -69,10 +69,13 @@ Licensing
OpenImageIO is (c) Copyright Contributors to the OpenImageIO project.
-OpenImageIO is distributed using the [modified BSD license](LICENSE.md)
-(also known as the "new BSD" or "3-clause BSD" license). The documentation
-is licensed under the [Creative Commons Attribution 3.0 Unported
-License](http://creativecommons.org/licenses/by/3.0/).
+OpenImageIO is distributed using primarily the Apache 2.0 license -- see the
+[LICENSE.md](LICENSE.md) file for details. The documentation is licensed
+under the [Creative Commons Attribution 4.0 Unported
+License](http://creativecommons.org/licenses/by/4.0/). A small amount of code
+imported from other projects, and also some pre-July-2023 code that has not
+yet been relicensed under Apache-2.0, is covered by other compatible licenses
+-- see [THIRD-PARTY](THIRD-PARTY.md) file for details.
The plain English bottom line is that OpenImageIO is free, as well as
freely modifiable and redistributable (in both source and binary form).
@@ -129,7 +132,7 @@ security-related issues [security@openimageio.org](security@openimageio.org).
Contributing
------------
-OpenImageIO welcomes code contributions, and [nearly 150 people](CREDITS.md)
+OpenImageIO welcomes code contributions, and [nearly 200 people](CREDITS.md)
have done so over the years. We take code contributions via the usual GitHub
pull request (PR) mechanism. Please see [CONTRIBUTING](CONTRIBUTING.md) for
detailed instructions.
diff --git a/RELICENSING.md b/RELICENSING.md
index 159ac97b59..24b50d593b 100644
--- a/RELICENSING.md
+++ b/RELICENSING.md
@@ -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.
@@ -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)
+- Sony Pictures Imageworks (cstein, olegul, fpsunflower, brianhall77, jeremyselan, drg)
- Richard Shaw (hobbes1069)
- Robert Matusewicz
- Mariusz Szczepańczyk (mszczepanczyk)
@@ -41,6 +41,50 @@ the Developer Certificate of Origin, version 1.1:
- Autodesk (includes Thiago Ize, Elvic Liang, Wayne Arnold, William Krick, Brecht Van Lommel, Marcos Fajardo)
- Thiago Ize
- Nick Black (dankamongmen)
+- Michel Lerenard (micler)
+- Stefan Bruens (StefanBruens)
+- David Gordon
+- Claire Foster (c42f)
+- Konrad Kleine (kwk)
+- Simone Gasparini (simogasp)
+- Radu Arjocu (ra-mt)
+- Dominik Bartkiewicz (fafik23)
+- 360highdynamicrangehdr (?)
+- Leonid Onokhov (sopvop)
+- Nuno Cardoso (npcardoso)
+- Todica Ionut (360highdynamicrangehdr)
+- Till Dechent (ttddee)
+- Tom Knowles (knowlsie)
+- SRHMorris
+- Biswapriyo Nath (Biswa96)
+- Edoardo Dominici (dedoardo)
+- Frédéric Devernay (devernay)
+- Simone Gasparini (simogasp)
+- roelandschoukens
+- Nayden Dochev (nayyden)
+- Yann Lanthony (yann-lty)
+- Benjamin Buch (bebuch)
+- Joris Nijs (joris-nijs)
+- Jan Honsbrok (Latios96)
+- Matteo F. Vescovi (mfvescovi)
+- Patrick Northon (patlefort)
+- Eric Mehl (ericmehl)
+- Xo Wang (GHF)
+- etiam
+- Fabien Servant (servantftechnicolor)
+- Loïc Vital (mugulmd)
+- Thomas Mansencal (Wētā FX)
+- Brent Davis (btdavis)
+- pwm1234-sri
+- toxieainc
+- demoulinv
+- Julien Enche (jenche)
+- Justin Israel
+- xiaoxiaoafeifei
+- Brad Smith (brad0)
+- lmarz
+- Seifeddine Dridi (seifeddinedridi)
+- Daniel Dresser (danieldresser)
- Luc Bournaud (DevilishSpirits)
**Prior authors, please submit a PR against this file that adds your name
diff --git a/THIRD-PARTY.md b/THIRD-PARTY.md
index a865d53512..0341e49738 100644
--- a/THIRD-PARTY.md
+++ b/THIRD-PARTY.md
@@ -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
@@ -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,
diff --git a/src/bmp.imageio/bmp_pvt.cpp b/src/bmp.imageio/bmp_pvt.cpp
index f5137b7b57..35c0f2969e 100644
--- a/src/bmp.imageio/bmp_pvt.cpp
+++ b/src/bmp.imageio/bmp_pvt.cpp
@@ -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
diff --git a/src/bmp.imageio/bmp_pvt.h b/src/bmp.imageio/bmp_pvt.h
index 1f16229b31..317420a07e 100644
--- a/src/bmp.imageio/bmp_pvt.h
+++ b/src/bmp.imageio/bmp_pvt.h
@@ -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
#pragma once
diff --git a/src/bmp.imageio/bmpinput.cpp b/src/bmp.imageio/bmpinput.cpp
index 64df5c59b0..96fb7c2501 100644
--- a/src/bmp.imageio/bmpinput.cpp
+++ b/src/bmp.imageio/bmpinput.cpp
@@ -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
diff --git a/src/build-scripts/build_opencolorio.bash b/src/build-scripts/build_opencolorio.bash
index f3b42fe63a..c1b6881644 100755
--- a/src/build-scripts/build_opencolorio.bash
+++ b/src/build-scripts/build_opencolorio.bash
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
# 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
# Utility script to download and build OpenColorIO
diff --git a/src/cmake/Config.cmake.in b/src/cmake/Config.cmake.in
index bfaddba641..78038b1734 100644
--- a/src/cmake/Config.cmake.in
+++ b/src/cmake/Config.cmake.in
@@ -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
@PACKAGE_INIT@
diff --git a/src/cmake/compiler.cmake b/src/cmake/compiler.cmake
index 41f78624f6..29fefef1ef 100644
--- a/src/cmake/compiler.cmake
+++ b/src/cmake/compiler.cmake
@@ -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
###########################################################################
diff --git a/src/dds.imageio/ddsinput.cpp b/src/dds.imageio/ddsinput.cpp
index bdf3fad121..33274becfa 100644
--- a/src/dds.imageio/ddsinput.cpp
+++ b/src/dds.imageio/ddsinput.cpp
@@ -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
diff --git a/src/doc/CMakeLists.txt b/src/doc/CMakeLists.txt
index 5bf424c374..5be13bb4c2 100644
--- a/src/doc/CMakeLists.txt
+++ b/src/doc/CMakeLists.txt
@@ -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
project(documentation)
diff --git a/src/doc/Makefile b/src/doc/Makefile
index 74ddae5e5f..be3a6a6de3 100644
--- a/src/doc/Makefile
+++ b/src/doc/Makefile
@@ -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
.PHONY: figures
diff --git a/src/doc/help2man_preformat.py b/src/doc/help2man_preformat.py
index bd711f04de..7c37144fd5 100755
--- a/src/doc/help2man_preformat.py
+++ b/src/doc/help2man_preformat.py
@@ -1,7 +1,7 @@
#!/usr/bin/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
# Format the output from various oiio command line "$tool --help" invocations,
diff --git a/src/fits.imageio/fits_pvt.h b/src/fits.imageio/fits_pvt.h
index b6c9ecdc65..b2bcb979ef 100644
--- a/src/fits.imageio/fits_pvt.h
+++ b/src/fits.imageio/fits_pvt.h
@@ -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
#pragma once
diff --git a/src/fits.imageio/fitsinput.cpp b/src/fits.imageio/fitsinput.cpp
index eaa578fc14..2292900620 100644
--- a/src/fits.imageio/fitsinput.cpp
+++ b/src/fits.imageio/fitsinput.cpp
@@ -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
diff --git a/src/fits.imageio/fitsoutput.cpp b/src/fits.imageio/fitsoutput.cpp
index 3469583d45..676874234e 100644
--- a/src/fits.imageio/fitsoutput.cpp
+++ b/src/fits.imageio/fitsoutput.cpp
@@ -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
diff --git a/src/hdr.imageio/hdrinput.cpp b/src/hdr.imageio/hdrinput.cpp
index f6d7aa38e8..6da29a7dd7 100644
--- a/src/hdr.imageio/hdrinput.cpp
+++ b/src/hdr.imageio/hdrinput.cpp
@@ -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
diff --git a/src/hdr.imageio/hdroutput.cpp b/src/hdr.imageio/hdroutput.cpp
index 41489c435e..68cb75efe1 100644
--- a/src/hdr.imageio/hdroutput.cpp
+++ b/src/hdr.imageio/hdroutput.cpp
@@ -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
diff --git a/src/ico.imageio/icoinput.cpp b/src/ico.imageio/icoinput.cpp
index 114162fc2a..2046881a4e 100644
--- a/src/ico.imageio/icoinput.cpp
+++ b/src/ico.imageio/icoinput.cpp
@@ -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
diff --git a/src/include/OpenImageIO/dassert.h b/src/include/OpenImageIO/dassert.h
index 08f964bff6..27cc416834 100644
--- a/src/include/OpenImageIO/dassert.h
+++ b/src/include/OpenImageIO/dassert.h
@@ -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
diff --git a/src/include/OpenImageIO/detail/fmt.h b/src/include/OpenImageIO/detail/fmt.h
index 643c3fca9b..a715433ab0 100644
--- a/src/include/OpenImageIO/detail/fmt.h
+++ b/src/include/OpenImageIO/detail/fmt.h
@@ -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
#pragma once
diff --git a/src/include/OpenImageIO/fstream_mingw.h b/src/include/OpenImageIO/fstream_mingw.h
index a9f0ee6402..634da58bbe 100644
--- a/src/include/OpenImageIO/fstream_mingw.h
+++ b/src/include/OpenImageIO/fstream_mingw.h
@@ -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
diff --git a/src/include/OpenImageIO/imagecache.h b/src/include/OpenImageIO/imagecache.h
index dc96a25e36..b61fe66c77 100644
--- a/src/include/OpenImageIO/imagecache.h
+++ b/src/include/OpenImageIO/imagecache.h
@@ -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
// clang-format off
diff --git a/src/include/OpenImageIO/paramlist.h b/src/include/OpenImageIO/paramlist.h
index 56a078d406..66b9576605 100644
--- a/src/include/OpenImageIO/paramlist.h
+++ b/src/include/OpenImageIO/paramlist.h
@@ -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
diff --git a/src/include/OpenImageIO/refcnt.h b/src/include/OpenImageIO/refcnt.h
index bf6d602e79..051bcd7011 100644
--- a/src/include/OpenImageIO/refcnt.h
+++ b/src/include/OpenImageIO/refcnt.h
@@ -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
diff --git a/src/include/OpenImageIO/ustring.h b/src/include/OpenImageIO/ustring.h
index 52c586e871..c3e6f1a20d 100644
--- a/src/include/OpenImageIO/ustring.h
+++ b/src/include/OpenImageIO/ustring.h
@@ -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
diff --git a/src/include/OpenImageIO/varyingref.h b/src/include/OpenImageIO/varyingref.h
index e41831f280..6914862bf3 100644
--- a/src/include/OpenImageIO/varyingref.h
+++ b/src/include/OpenImageIO/varyingref.h
@@ -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
diff --git a/src/iv/CMakeLists.txt b/src/iv/CMakeLists.txt
index 04ac54c36a..9ee7794a90 100644
--- a/src/iv/CMakeLists.txt
+++ b/src/iv/CMakeLists.txt
@@ -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
set (CMAKE_AUTOMOC ON)
diff --git a/src/iv/imageviewer.cpp b/src/iv/imageviewer.cpp
index fb5c3d9908..3fa6d2843e 100644
--- a/src/iv/imageviewer.cpp
+++ b/src/iv/imageviewer.cpp
@@ -2049,7 +2049,7 @@ ImageViewer::about()
this, tr("About iv"),
tr("iv is the image viewer for OpenImageIO.
"
"(c) Copyright Contributors to the OpenImageIO project.
"
- "See http://openimageio.org for details.
"));
+ "See https://openimageio.org for details.
"));
}
diff --git a/src/iv/ivinfowin.cpp b/src/iv/ivinfowin.cpp
index cfa87e1d01..5501a1f767 100644
--- a/src/iv/ivinfowin.cpp
+++ b/src/iv/ivinfowin.cpp
@@ -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
diff --git a/src/iv/ivpref.cpp b/src/iv/ivpref.cpp
index c557d91bcd..9d1e3d1b76 100644
--- a/src/iv/ivpref.cpp
+++ b/src/iv/ivpref.cpp
@@ -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
diff --git a/src/jpeg2000.imageio/jpeg2000output.cpp b/src/jpeg2000.imageio/jpeg2000output.cpp
index 9da9d39b81..32b2bac17d 100644
--- a/src/jpeg2000.imageio/jpeg2000output.cpp
+++ b/src/jpeg2000.imageio/jpeg2000output.cpp
@@ -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
diff --git a/src/libOpenImageIO/imagebufalgo_draw.cpp b/src/libOpenImageIO/imagebufalgo_draw.cpp
index c7b038d1da..a88aacd182 100644
--- a/src/libOpenImageIO/imagebufalgo_draw.cpp
+++ b/src/libOpenImageIO/imagebufalgo_draw.cpp
@@ -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
diff --git a/src/libOpenImageIO/imagebufalgo_opencv.cpp b/src/libOpenImageIO/imagebufalgo_opencv.cpp
index 2d3f0fd7ee..e541d2e7b6 100644
--- a/src/libOpenImageIO/imagebufalgo_opencv.cpp
+++ b/src/libOpenImageIO/imagebufalgo_opencv.cpp
@@ -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
diff --git a/src/libtexture/imagecache_pvt.h b/src/libtexture/imagecache_pvt.h
index e9c79aa0f6..a029d98b64 100644
--- a/src/libtexture/imagecache_pvt.h
+++ b/src/libtexture/imagecache_pvt.h
@@ -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
diff --git a/src/libutil/timer.cpp b/src/libutil/timer.cpp
index 2e95c3b55b..5afcb5e3c8 100644
--- a/src/libutil/timer.cpp
+++ b/src/libutil/timer.cpp
@@ -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
diff --git a/src/pnm.imageio/CMakeLists.txt b/src/pnm.imageio/CMakeLists.txt
index ebc8cd0782..369d6de3c0 100644
--- a/src/pnm.imageio/CMakeLists.txt
+++ b/src/pnm.imageio/CMakeLists.txt
@@ -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
add_oiio_plugin (pnminput.cpp pnmoutput.cpp)
diff --git a/src/ptex.imageio/ptexinput.cpp b/src/ptex.imageio/ptexinput.cpp
index f16556f0d0..79a2a30ee8 100644
--- a/src/ptex.imageio/ptexinput.cpp
+++ b/src/ptex.imageio/ptexinput.cpp
@@ -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
diff --git a/src/python/py_imagebuf.cpp b/src/python/py_imagebuf.cpp
index 574bf688c1..3c48d61f83 100644
--- a/src/python/py_imagebuf.cpp
+++ b/src/python/py_imagebuf.cpp
@@ -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 "py_oiio.h"
diff --git a/src/python/py_imagecache.cpp b/src/python/py_imagecache.cpp
index 5b5bd47da6..07953e4e7a 100644
--- a/src/python/py_imagecache.cpp
+++ b/src/python/py_imagecache.cpp
@@ -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 "py_oiio.h"
diff --git a/src/python/py_imageinput.cpp b/src/python/py_imageinput.cpp
index 92ba575109..5081b35026 100644
--- a/src/python/py_imageinput.cpp
+++ b/src/python/py_imageinput.cpp
@@ -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 "py_oiio.h"
diff --git a/src/python/py_imageoutput.cpp b/src/python/py_imageoutput.cpp
index 1114f88d05..88793b21fb 100644
--- a/src/python/py_imageoutput.cpp
+++ b/src/python/py_imageoutput.cpp
@@ -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
// Avoid a compiler warning from a duplication in tiffconf.h/pyconfig.h
diff --git a/src/python/py_oiio.h b/src/python/py_oiio.h
index 42a93fe339..33433fe1d0 100644
--- a/src/python/py_oiio.h
+++ b/src/python/py_oiio.h
@@ -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
#ifndef PYOPENIMAGEIO_PY_OIIO_H
diff --git a/src/python/py_paramvalue.cpp b/src/python/py_paramvalue.cpp
index 4f1698c7fd..9ad4f0eaed 100644
--- a/src/python/py_paramvalue.cpp
+++ b/src/python/py_paramvalue.cpp
@@ -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 "py_oiio.h"
diff --git a/src/python/py_typedesc.cpp b/src/python/py_typedesc.cpp
index ca4293f7cc..78c4fdccbf 100644
--- a/src/python/py_typedesc.cpp
+++ b/src/python/py_typedesc.cpp
@@ -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 "py_oiio.h"
diff --git a/src/sgi.imageio/sgiinput.cpp b/src/sgi.imageio/sgiinput.cpp
index 6a9972dc7d..080d5dbf5c 100644
--- a/src/sgi.imageio/sgiinput.cpp
+++ b/src/sgi.imageio/sgiinput.cpp
@@ -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
diff --git a/src/sgi.imageio/sgioutput.cpp b/src/sgi.imageio/sgioutput.cpp
index 625367a7c9..28e89d1600 100644
--- a/src/sgi.imageio/sgioutput.cpp
+++ b/src/sgi.imageio/sgioutput.cpp
@@ -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 "sgi_pvt.h"
diff --git a/src/softimage.imageio/softimage_pvt.cpp b/src/softimage.imageio/softimage_pvt.cpp
index 100d1453c7..d7cfd4db50 100644
--- a/src/softimage.imageio/softimage_pvt.cpp
+++ b/src/softimage.imageio/softimage_pvt.cpp
@@ -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 "softimage_pvt.h"
diff --git a/src/softimage.imageio/softimage_pvt.h b/src/softimage.imageio/softimage_pvt.h
index 68f062c05f..62ba32848d 100644
--- a/src/softimage.imageio/softimage_pvt.h
+++ b/src/softimage.imageio/softimage_pvt.h
@@ -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
#pragma once
diff --git a/src/softimage.imageio/softimageinput.cpp b/src/softimage.imageio/softimageinput.cpp
index 0e692104f2..bfce3064f3 100644
--- a/src/softimage.imageio/softimageinput.cpp
+++ b/src/softimage.imageio/softimageinput.cpp
@@ -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 "softimage_pvt.h"
diff --git a/src/targa.imageio/targainput.cpp b/src/targa.imageio/targainput.cpp
index 57115a722f..0a4e781166 100644
--- a/src/targa.imageio/targainput.cpp
+++ b/src/targa.imageio/targainput.cpp
@@ -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
diff --git a/src/webp.imageio/webpinput.cpp b/src/webp.imageio/webpinput.cpp
index 5630d98923..61b8590465 100644
--- a/src/webp.imageio/webpinput.cpp
+++ b/src/webp.imageio/webpinput.cpp
@@ -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
diff --git a/src/zfile.imageio/zfile.cpp b/src/zfile.imageio/zfile.cpp
index f72bf55f13..8bd837d5d3 100644
--- a/src/zfile.imageio/zfile.cpp
+++ b/src/zfile.imageio/zfile.cpp
@@ -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