Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -1152,3 +1152,7 @@ For older release notes, see:
* [CHANGES-2.x](https://github.com/AcademySoftwareFoundation/OpenImageIO/blob/main/docs/CHANGES-2.x.md).
* [CHANGES-1.x](https://github.com/AcademySoftwareFoundation/OpenImageIO/blob/main/docs/CHANGES-1.x.md).
* [CHANGES-0.x](https://github.com/AcademySoftwareFoundation/OpenImageIO/blob/main/docs/CHANGES-0.x.md).


<!-- SPDX-License-Identifier: CC-BY-4.0 -->
<!-- Copyright Contributors to the OpenImageIO Project. -->
4 changes: 4 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,7 @@ you can read in full [here](https://lfprojects.org/policies/code-of-conduct).

To report incidents or to appeal reports of incidents, send email to
the Manager of LF Projects at [email protected].


<!-- SPDX-License-Identifier: CC-BY-4.0 -->
<!-- Copyright Contributors to the OpenImageIO Project. -->
4 changes: 4 additions & 0 deletions CREDITS.md
Original file line number Diff line number Diff line change
Expand Up @@ -255,3 +255,7 @@ [email protected]
* Zach Lewis
* Ziad Khouri
* zomgrolf


<!-- SPDX-License-Identifier: CC-BY-4.0 -->
<!-- Copyright Contributors to the OpenImageIO Project. -->
4 changes: 4 additions & 0 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -449,3 +449,7 @@ You do not need any of these packages in order to build or use
OpenImageIO. But if you are going to contribute to OpenImageIO
development, you probably want them, since it is required for executing
OpenImageIO's test suite (when you run "make test").


<!-- SPDX-License-Identifier: CC-BY-4.0 -->
<!-- Copyright Contributors to the OpenImageIO Project. -->
3 changes: 3 additions & 0 deletions RELICENSING.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
<!-- SPDX-License-Identifier: CC-BY-4.0 -->
<!-- Copyright Contributors to the OpenImageIO Project. -->

New code entering the OpenImageIO repository from July 1 2023 onward is
subject to the [Apache 2.0 license](LICENSE.md).

Expand Down
4 changes: 4 additions & 0 deletions conanfile.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Copyright Contributors to the OpenImageIO project.
# SPDX-License-Identifier: Apache-2.0
# https://github.com/AcademySoftwareFoundation/OpenImageIO

[requires]
zlib/1.2.11
libtiff/4.0.9
Expand Down
4 changes: 4 additions & 0 deletions docs/CHANGES-0.x.md
Original file line number Diff line number Diff line change
Expand Up @@ -679,3 +679,7 @@ Initial developer release 0.1 (1 Sep 2008):
* maketx
* API docs for ImageInput, ImageOutput, writing plugins
* Linux and OSX


<!-- SPDX-License-Identifier: CC-BY-4.0 -->
<!-- Copyright Contributors to the OpenImageIO Project. -->
4 changes: 4 additions & 0 deletions docs/CHANGES-1.x.md
Original file line number Diff line number Diff line change
Expand Up @@ -4039,3 +4039,7 @@ Developer goodies:

For older release notes, see:
* [CHANGES-0.x](https://github.com/AcademySoftwareFoundation/OpenImageIO/blob/main/docs/CHANGES-0.x.md).


<!-- SPDX-License-Identifier: CC-BY-4.0 -->
<!-- Copyright Contributors to the OpenImageIO Project. -->
4 changes: 4 additions & 0 deletions docs/QuickStart.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,3 +92,7 @@ output.write_image(pixels)
This is just a simple example to give you a flavor of the different major
interfaces. For more advanced usage, you may want to explore the
[documentation](https://docs.openimageio.org).


<!-- SPDX-License-Identifier: CC-BY-4.0 -->
<!-- Copyright Contributors to the OpenImageIO Project. -->
4 changes: 4 additions & 0 deletions docs/dev/Architecture.md
Original file line number Diff line number Diff line change
Expand Up @@ -197,3 +197,7 @@ image- and file-oriented classes described above. The most important ones are:
sequence point to the same character memory. In addition to saving memory,
this makes string assignment and equality comparison as inexpensive as
integer operations.


<!-- SPDX-License-Identifier: CC-BY-4.0 -->
<!-- Copyright Contributors to the OpenImageIO Project. -->
2 changes: 1 addition & 1 deletion src/include/OpenImageIO/argparse.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/AcademySoftwareFoundation/OpenImageIO


Expand Down
4 changes: 4 additions & 0 deletions src/include/OpenImageIO/detail/detail-README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,7 @@ anything in those headers or in the pvt or detail namespaces.
Therefore, anything in this directory may be changed arbitrarily as part of
a minor version release (but not part of a patch version release, since
changes here may well change the ABI/linkage).


<!-- SPDX-License-Identifier: CC-BY-4.0 -->
<!-- Copyright Contributors to the OpenImageIO Project. -->
5 changes: 0 additions & 5 deletions src/include/OpenImageIO/vecparam.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,6 @@

OIIO_NAMESPACE_3_1_BEGIN

// NOTE: These interoperable type templates were copied from the
// [Imath project](http://github.com/AcademySoftwareFoundation/imath),
// licensed under the same BSD-3-clause license as OpenImageIO.


/// @{
/// @name Detecting interoperable linear algebra types.
///
Expand Down
5 changes: 5 additions & 0 deletions src/include/OpenImageIO/version.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
// Copyright Contributors to the OpenImageIO project.
// SPDX-License-Identifier: Apache-2.0
// https://github.com/AcademySoftwareFoundation/OpenImageIO


// DEPRECATED header OpenImageIO/version.h
// For back compatibility, just include the new name, oiioversion.h.

Expand Down
2 changes: 2 additions & 0 deletions src/libutil/strutil.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1515,6 +1515,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
IN THE SOFTWARE.
*/
// SPDX-License-Identifier: MIT

#define UTF8_ACCEPT 0
#define UTF8_REJECT 12
Expand Down Expand Up @@ -1592,6 +1593,7 @@ Strutil::utf8_to_unicode(string_view str, std::vector<uint32_t>& uvec)

René Nyffenegger [email protected]
*/
// SPDX-License-Identifier: Zlib
std::string
Strutil::base64_encode(string_view str)
{
Expand Down
2 changes: 1 addition & 1 deletion src/oiiotool/expressions.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
4 changes: 4 additions & 0 deletions src/python/stubs/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Copyright Contributors to the OpenImageIO project.
# SPDX-License-Identifier: Apache-2.0
# https://github.com/AcademySoftwareFoundation/OpenImageIO


# Setup the pystub target, which is not built by default.

Expand Down
4 changes: 4 additions & 0 deletions src/python/stubs/generate_stubs.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Copyright Contributors to the OpenImageIO project.
# SPDX-License-Identifier: Apache-2.0
# https://github.com/AcademySoftwareFoundation/OpenImageIO

"""
Script to generate pyi stubs by patching and calling mypy's stubgen tool.

Expand Down
2 changes: 1 addition & 1 deletion src/rla.imageio/CMakeLists.txt
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

add_oiio_plugin (rlainput.cpp rlaoutput.cpp)
2 changes: 1 addition & 1 deletion src/sgi.imageio/CMakeLists.txt
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

add_oiio_plugin (sgiinput.cpp sgioutput.cpp)