From aebd30457cccd21850efa718f88fa31900ab8f66 Mon Sep 17 00:00:00 2001 From: Doug Walker Date: Fri, 23 Aug 2024 22:43:58 -0400 Subject: [PATCH 1/2] Add config file to fix ReadTheDocs integration Signed-off-by: Doug Walker --- .readthedocs.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 .readthedocs.yml diff --git a/.readthedocs.yml b/.readthedocs.yml new file mode 100644 index 0000000000..1164cbf61f --- /dev/null +++ b/.readthedocs.yml @@ -0,0 +1,23 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright Contributors to the OpenColorIO Project. + +# Read the Docs configuration file +# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details + +version: 2 + +build: + os: ubuntu-20.04 + tools: + python: "3.9" + +sphinx: + configuration: docs/conf.py + +formats: + - pdf + - htmlzip + +python: + install: + - requirements: docs/requirements.txt \ No newline at end of file From b5e5af3c904b3be2bee56d7b86cb5484ba9f4b77 Mon Sep 17 00:00:00 2001 From: Doug Walker Date: Fri, 23 Aug 2024 23:16:51 -0400 Subject: [PATCH 2/2] Miscellaneous minor fixes Signed-off-by: Doug Walker --- src/OpenColorIO/FileRules.cpp | 2 +- src/OpenColorIO/NamedTransform.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/OpenColorIO/FileRules.cpp b/src/OpenColorIO/FileRules.cpp index 61a5e0f152..e0df0d0276 100644 --- a/src/OpenColorIO/FileRules.cpp +++ b/src/OpenColorIO/FileRules.cpp @@ -62,7 +62,7 @@ std::string ConvertToRegularExpression(const char * globPattern, bool ignoreCase if (ignoreCase) { - const size_t length = strlen(globPattern); + const size_t length = std::strlen(globPattern); bool respectCase = false; for (size_t i = 0; i < length; ++i) { diff --git a/src/OpenColorIO/NamedTransform.cpp b/src/OpenColorIO/NamedTransform.cpp index bf8274807e..56a3a9c099 100644 --- a/src/OpenColorIO/NamedTransform.cpp +++ b/src/OpenColorIO/NamedTransform.cpp @@ -244,16 +244,16 @@ std::ostream & operator<< (std::ostream & os, const NamedTransform & t) const auto numAliases = t.getNumAliases(); if (numAliases == 1) { - os << "alias= " << t.getAlias(0) << ", "; + os << ", alias= " << t.getAlias(0); } else if (numAliases > 1) { - os << "aliases=[" << t.getAlias(0); + os << ", aliases=[" << t.getAlias(0); for (size_t aidx = 1; aidx < numAliases; ++aidx) { os << ", " << t.getAlias(aidx); } - os << "], "; + os << "]"; } const std::string strFamily{ t.getFamily() }; if (!strFamily.empty())